mirror of
https://github.com/frappe/erpnext.git
synced 2026-06-03 20:29:09 +00:00
merge
This commit is contained in:
@@ -2,9 +2,9 @@
|
||||
{
|
||||
"owner": "Administrator",
|
||||
"docstatus": 0,
|
||||
"creation": "2013-01-16 11:35:56",
|
||||
"creation": "2013-01-17 10:57:15",
|
||||
"modified_by": "Administrator",
|
||||
"modified": "2013-01-19 12:09:54"
|
||||
"modified": "2013-01-17 11:22:07"
|
||||
},
|
||||
{
|
||||
"allow_attach": 1,
|
||||
@@ -35,6 +35,7 @@
|
||||
"parenttype": "DocType",
|
||||
"report": 1,
|
||||
"permlevel": 0,
|
||||
"amend": 0,
|
||||
"parentfield": "permissions"
|
||||
},
|
||||
{
|
||||
@@ -50,15 +51,6 @@
|
||||
"fieldtype": "Section Break",
|
||||
"permlevel": 0
|
||||
},
|
||||
{
|
||||
"oldfieldtype": "Small Text",
|
||||
"doctype": "DocField",
|
||||
"label": "Trash Reason",
|
||||
"oldfieldname": "trash_reason",
|
||||
"fieldname": "trash_reason",
|
||||
"fieldtype": "Small Text",
|
||||
"permlevel": 1
|
||||
},
|
||||
{
|
||||
"description": "Item will be saved by this name in the data base.",
|
||||
"oldfieldtype": "Data",
|
||||
@@ -598,18 +590,6 @@
|
||||
"depends_on": "eval:doc.is_sales_item==\"Yes\"",
|
||||
"permlevel": 0
|
||||
},
|
||||
{
|
||||
"description": "Create a price list from Price List master and enter standard ref rates against each of them. On selection of a price list in Quotation, Sales Order or Delivery Note, corresponding ref rate will be fetched for this item.",
|
||||
"oldfieldtype": "Table",
|
||||
"doctype": "DocField",
|
||||
"label": "Item Prices",
|
||||
"oldfieldname": "ref_rate_details",
|
||||
"options": "Item Price",
|
||||
"fieldname": "ref_rate_details",
|
||||
"fieldtype": "Table",
|
||||
"depends_on": "eval:doc.is_sales_item==\"Yes\"",
|
||||
"permlevel": 0
|
||||
},
|
||||
{
|
||||
"description": "For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes",
|
||||
"depends_on": "eval:doc.is_sales_item==\"Yes\"",
|
||||
@@ -638,6 +618,25 @@
|
||||
"fieldtype": "Table",
|
||||
"permlevel": 0
|
||||
},
|
||||
{
|
||||
"doctype": "DocField",
|
||||
"label": "Price Lists and Rates",
|
||||
"fieldname": "price_list_section",
|
||||
"fieldtype": "Section Break",
|
||||
"permlevel": 0
|
||||
},
|
||||
{
|
||||
"description": "Create a price list from Price List master and enter standard ref rates against each of them. On selection of a price list in Quotation, Sales Order or Delivery Note, corresponding ref rate will be fetched for this item.",
|
||||
"oldfieldtype": "Table",
|
||||
"doctype": "DocField",
|
||||
"label": "Item Prices",
|
||||
"oldfieldname": "ref_rate_details",
|
||||
"options": "Item Price",
|
||||
"fieldname": "ref_rate_details",
|
||||
"fieldtype": "Table",
|
||||
"depends_on": "eval:doc.is_sales_item==\"Yes\"",
|
||||
"permlevel": 0
|
||||
},
|
||||
{
|
||||
"oldfieldtype": "Section Break",
|
||||
"doctype": "DocField",
|
||||
|
||||
Reference in New Issue
Block a user