erpnext

mirror of https://github.com/frappe/erpnext.git synced 2026-08-16 16:08:39 +00:00

Files

Mihir Kandoi b25a2f2cdf fix: resolve version-15 backport conflicts

Keep validate_warehouses() and add validate_over_delivery_receipt_allowance();
validate_serial_and_batch_no_settings() does not exist on this branch.

Keep this branch's field labels and add only the non_negative flag the
backported commit introduced.

Drop test_over_order_allowance_against_material_request and
test_blanket_order_over_order_aggregated_across_rows: both are develop-only
context the cherry-pick swallowed into the conflicts, and Buying Settings has
no over_order_allowance field here.

Use frappe.tests.utils.change_settings instead of ERPNextTestSuite, which this
branch does not have.

Revert the valuation_method literal to the three options this branch offers -
Standard Cost rode along from a regenerated develop type block.

2026-08-05 15:16:27 +05:30

tests

chore: resolve conflict

2026-08-03 13:29:37 +05:30

__init__.py

moved modules inside erpnext folder

2013-12-11 10:43:52 +05:30

accounts_controller.py

fix(payment reconciliation): correct supplier gain/loss posting

2026-08-04 18:44:11 +00:00

buying_controller.py

fix: preserve UOM conversion factor precision in transactions