diff --git a/erpnext/accounts/doctype/pricing_rule/pricing_rule.json b/erpnext/accounts/doctype/pricing_rule/pricing_rule.json index c099cec90dd..170bf6fa727 100644 --- a/erpnext/accounts/doctype/pricing_rule/pricing_rule.json +++ b/erpnext/accounts/doctype/pricing_rule/pricing_rule.json @@ -764,7 +764,7 @@ "label": "Type of Margin", "length": 0, "no_copy": 0, - "options": "Percentage\nAmount", + "options": "\nPercentage\nAmount", "permlevel": 0, "precision": "", "print_hide": 0, @@ -1024,7 +1024,7 @@ "issingle": 0, "istable": 0, "max_attachments": 0, - "modified": "2016-01-18 15:04:26.489659", + "modified": "2016-01-18 17:00:59.492217", "modified_by": "Administrator", "module": "Accounts", "name": "Pricing Rule", diff --git a/erpnext/selling/doctype/quotation_item/quotation_item.json b/erpnext/selling/doctype/quotation_item/quotation_item.json index b58568f46ad..061e972a57b 100644 --- a/erpnext/selling/doctype/quotation_item/quotation_item.json +++ b/erpnext/selling/doctype/quotation_item/quotation_item.json @@ -458,6 +458,7 @@ "allow_on_submit": 0, "bold": 1, "collapsible": 0, + "depends_on": "", "fieldname": "rate", "fieldtype": "Currency", "hidden": 0, diff --git a/erpnext/selling/doctype/sales_order_item/sales_order_item.json b/erpnext/selling/doctype/sales_order_item/sales_order_item.json index 9710e39c78a..3a44befd9c8 100644 --- a/erpnext/selling/doctype/sales_order_item/sales_order_item.json +++ b/erpnext/selling/doctype/sales_order_item/sales_order_item.json @@ -468,7 +468,7 @@ "label": "Margin Type", "length": 0, "no_copy": 0, - "options": "Percentage\nAmount", + "options": "\nPercentage\nAmount", "permlevel": 0, "precision": "", "print_hide": 0,