* refactor(Supplier): custom buttons call make methods (backport #49840) (#49841)
Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
* fix(Common Code): fetch canonical URI from Code List (backport #49882) (#49883)
Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
fix(Common Code): fetch canonical URI from Code List (#49882)
* fix: Set paid amount automatically only if return entry validated and has negative grand total (#49829)
(cherry picked from commit dcbcc596f2)
# Conflicts:
# erpnext/public/js/controllers/taxes_and_totals.js
* fix: resolved conflict
* fix: linter; dont change doc after DB update (backport #49907) (#49909)
Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
Co-authored-by: ruthra kumar <ruthra@erpnext.com>
fix: linter; dont change doc after DB update (#49907)
* fix: do not fetch disabled item tax template
(cherry picked from commit b10cf4a928)
# Conflicts:
# erpnext/public/js/controllers/transaction.js
# erpnext/stock/get_item_details.py
* chore: fix conflicts
* chore: fix conflicts
* chore: fix linters issue
* feat: dynamic due date in payment terms when fetched from order (backport #48864) (#49937)
* feat: dynamic due date in payment terms when fetched from order (#48864)
* fix: dynamic due date when payment terms are fetched from order
* fix(test): use change_settings decorator for settings enable and disable
* fix(test): compare schedule for due_date dynamically
* fix: save conditions for due date at invoice level
* fix: make fields read only and on change of date unset the date condition fields
* fix: remove fetch_form
* fix: correct field assingment
* fix: revert unwanted changes
* refactor: streamline payment term field assignments and enhance discount date handling
* refactor: remove payment_term from fields_to_copy and optimize currency handling in transaction callback
* refactor: ensure default values for payment schedule and discount validity fields
(cherry picked from commit 3c70cbbaf8)
# Conflicts:
# erpnext/accounts/doctype/payment_schedule/payment_schedule.json
# erpnext/accounts/doctype/payment_schedule/payment_schedule.py
# erpnext/public/js/controllers/transaction.js
# erpnext/selling/doctype/sales_order/test_sales_order.py
# erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py
* chore: resolve conflicts
---------
Co-authored-by: Lakshit Jain <ljain112@gmail.com>
---------
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
Co-authored-by: ruthra kumar <ruthra@erpnext.com>
Co-authored-by: ljain112 <ljain112@gmail.com>
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
* feat: dynamic due date in payment terms when fetched from order (#48864)
* fix: dynamic due date when payment terms are fetched from order
* fix(test): use change_settings decorator for settings enable and disable
* fix(test): compare schedule for due_date dynamically
* fix: save conditions for due date at invoice level
* fix: make fields read only and on change of date unset the date condition fields
* fix: remove fetch_form
* fix: correct field assingment
* fix: revert unwanted changes
* refactor: streamline payment term field assignments and enhance discount date handling
* refactor: remove payment_term from fields_to_copy and optimize currency handling in transaction callback
* refactor: ensure default values for payment schedule and discount validity fields
(cherry picked from commit 3c70cbbaf8)
# Conflicts:
# erpnext/accounts/doctype/payment_schedule/payment_schedule.json
# erpnext/accounts/doctype/payment_schedule/payment_schedule.py
# erpnext/public/js/controllers/transaction.js
# erpnext/selling/doctype/sales_order/test_sales_order.py
# erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py
* chore: resolve conflicts
---------
Co-authored-by: Lakshit Jain <ljain112@gmail.com>
* fix: add condition for name
(cherry picked from commit cf5a2d6351)
* test: add test to validate user permission in qb
(cherry picked from commit a5b881ea74)
# Conflicts:
# erpnext/setup/doctype/employee/test_employee.py
---------
Co-authored-by: venkat102 <venkatesharunachalam659@gmail.com>
Co-authored-by: ruthra kumar <ruthra@erpnext.com>
