nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-21 14:09:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

[fix] [minor] merge conflict fixes

Browse Source
This commit is contained in:
Akhilesh Darjee
2013-12-10 18:01:18 +05:30
parent 7b1d9409f1 4e677a3f52
commit aebb9f422b
14 changed files with 187 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2,7 +2,7 @@
{
"creation": "2013-01-22 15:11:38",
"docstatus": 0,
"modified": "2013-12-06 18:48:23",
"modified": "2013-12-09 16:25:50",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -120,6 +120,10 @@
"options": "Price List"
},
{
<<<<<<< HEAD
=======
"depends_on": "with_operations",
>>>>>>> 4e677a3f5235c96e86c5fe5acd8d2f59dff895dc
"description": "Specify the operations, operating cost and give a unique Operation no to your operations.",
"doctype": "DocField",
"fieldname": "operations",