Merge branch 'master' of github.com:webnotes/erpnext

This commit is contained in:
Nabin Hait 2013-03-21 18:37:48 +05:30
commit 4c56220089
2 changed files with 6 additions and 6 deletions

View File

@ -1,8 +1,8 @@
[
{
"creation": "2013-02-22 01:28:01",
"creation": "2013-03-08 15:37:16",
"docstatus": 0,
"modified": "2013-03-07 07:03:22",
"modified": "2013-03-21 17:29:45",
"modified_by": "Administrator",
"owner": "Administrator"
},
@ -10,7 +10,7 @@
"autoname": "ITEMCUST/.#####",
"description": "For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes",
"doctype": "DocType",
"in_create": 1,
"in_create": 0,
"istable": 1,
"module": "Stock",
"name": "__common__",

View File

@ -1,15 +1,15 @@
[
{
"creation": "2013-02-22 01:28:01",
"creation": "2013-03-08 15:37:16",
"docstatus": 0,
"modified": "2013-03-07 07:03:22",
"modified": "2013-03-21 17:29:15",
"modified_by": "Administrator",
"owner": "Administrator"
},
{
"autoname": "RFD/.#####",
"doctype": "DocType",
"in_create": 1,
"in_create": 0,
"istable": 1,
"module": "Stock",
"name": "__common__",