Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: Resolve merge conflicts in purchase_receipt_item

Browse Source
This commit is contained in:
deepeshgarg007 2019-06-01 23:26:09 +05:30
parent 55b894bfef
commit e19abb162a
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json
View File

@ -79,10 +79,7 @@
"batch_no", "batch_no",
"column_break_48", "column_break_48",
"rejected_serial_no", "rejected_serial_no",
"section_break_50",
"project",
"expense_account", "expense_account",
"cost_center",
"col_break5", "col_break5",
"allow_zero_valuation_rate", "allow_zero_valuation_rate",
"bom", "bom",
@ -782,11 +779,20 @@
"label": "Expense Account", "label": "Expense Account",
"options": "Account", "options": "Account",
"read_only": 1 "read_only": 1
},
{
"fieldname": "accounting_dimensions_section",
"fieldtype": "Section Break",
"label": "Accounting Dimensions"
},
{
"fieldname": "dimension_col_break",
"fieldtype": "Column Break"
} }
], ],
"idx": 1, "idx": 1,
"istable": 1, "istable": 1,
"modified": "2019-05-30 18:09:21.648599", "modified": "2019-06-01 23:25:20.732134",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Stock", "module": "Stock",
"name": "Purchase Receipt Item", "name": "Purchase Receipt Item",