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

[fix] [minor] merge conflict fix

Browse Source
This commit is contained in:
Akhilesh Darjee 2013-12-10 18:11:31 +05:30
parent aebb9f422b
commit f0dad52aaa
1 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
manufacturing/doctype/bom/bom.txt
View File

@ -120,24 +120,18 @@
"options": "Price List" "options": "Price List"
}, },
{ {
<<<<<<< HEAD
=======
"depends_on": "with_operations", "depends_on": "with_operations",
>>>>>>> 4e677a3f5235c96e86c5fe5acd8d2f59dff895dc
"description": "Specify the operations, operating cost and give a unique Operation no to your operations.", "description": "Specify the operations, operating cost and give a unique Operation no to your operations.",
"doctype": "DocField", "doctype": "DocField",
"fieldname": "operations", "fieldname": "operations",
"fieldtype": "Section Break", "fieldtype": "Section Break",
"hidden": 0,
"label": "Operations", "label": "Operations",
"oldfieldtype": "Section Break" "oldfieldtype": "Section Break"
}, },
{ {
"depends_on": "with_operations",
"doctype": "DocField", "doctype": "DocField",
"fieldname": "bom_operations", "fieldname": "bom_operations",
"fieldtype": "Table", "fieldtype": "Table",
"hidden": 0,
"label": "BOM Operations", "label": "BOM Operations",
"oldfieldname": "bom_operations", "oldfieldname": "bom_operations",
"oldfieldtype": "Table", "oldfieldtype": "Table",