fix: conflicts
diff --git a/erpnext/selling/doctype/sales_order/sales_order.py b/erpnext/selling/doctype/sales_order/sales_order.py
index 2379a30..5d341b7 100755
--- a/erpnext/selling/doctype/sales_order/sales_order.py
+++ b/erpnext/selling/doctype/sales_order/sales_order.py
@@ -840,7 +840,8 @@
"contact_email",
"contact_person",
"taxes_and_charges",
- "shipping_address"
+ "shipping_address",
+ "terms"
],
"validation": {
"docstatus": ["=", 1]
@@ -859,7 +860,10 @@
"field_no_map": [
"rate",
"price_list_rate",
- "item_tax_template"
+ "item_tax_template",
+ "discount_percentage",
+ "discount_amount",
+ "pricing_rules"
],
"postprocess": update_item,
"condition": lambda doc: doc.ordered_qty < doc.stock_qty and doc.supplier == supplier and doc.item_code in items_to_map