nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-01 19:29:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixed conflict while merging

Browse Source
This commit is contained in:
Nabin Hait
2012-02-27 12:52:46 +05:30
parent 78805e702e ef041114bb
commit 5b09122264
16 changed files with 517 additions and 407 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
erpnext/website/doctype/product/product.txt
View File

@@ -3,9 +3,9 @@
# These values are common in all dictionaries
{
'creation': '2012-02-14 11:53:45',
'creation': '2012-02-17 15:53:22',
'docstatus': 0,
'modified': '2012-02-22 18:28:20',
'modified': '2012-02-22 18:32:46',
'modified_by': u'Administrator',
'owner': u'Administrator'
},
@@ -249,4 +249,4 @@
'permlevel': 0,
'print_hide': 1
}
]
]