nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-31 18:59:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into develop

Browse Source
This commit is contained in:
Nabin Hait
2016-11-03 15:17:39 +05:30
parent 57f51f648e 4dc263ee12
commit eab38cd4eb
12 changed files with 76 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/selling/doctype/quotation_item/quotation_item.json
View File

@@ -563,7 +563,7 @@
"columns": 0,
"depends_on": "eval:doc.margin_type && doc.price_list_rate",
"fieldname": "total_margin",
"fieldtype": "Float",
"fieldtype": "Currency",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
@@ -1276,7 +1276,7 @@
"istable": 1,
"max_attachments": 0,
"menu_index": 0,
"modified": "2016-08-26 04:46:21.936481",
"modified": "2016-11-01 13:02:18.665333",
"modified_by": "Administrator",
"module": "Selling",
"name": "Quotation Item",

6
erpnext/selling/doctype/sales_order_item/sales_order_item.json
View File

@@ -563,7 +563,7 @@
"columns": 0,
"depends_on": "eval:doc.margin_type && doc.price_list_rate",
"fieldname": "total_margin",
"fieldtype": "Float",
"fieldtype": "Currency",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
@@ -614,7 +614,7 @@
"columns": 2,
"depends_on": "eval: doc.type != \"\"",
"fieldname": "rate",
"fieldtype": "Float",
"fieldtype": "Currency",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
@@ -1582,7 +1582,7 @@
"istable": 1,
"max_attachments": 0,
"menu_index": 0,
"modified": "2016-08-26 04:50:27.723801",
"modified": "2016-11-01 13:01:13.572400",
"modified_by": "Administrator",
"module": "Selling",
"name": "Sales Order Item",