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

This commit is contained in:
Anand Doshi
2013-07-23 17:16:22 +05:30
20 changed files with 379 additions and 55 deletions

View File

@@ -2,7 +2,7 @@
{
"creation": "2013-05-21 16:16:39",
"docstatus": 0,
"modified": "2013-07-09 12:51:06",
"modified": "2013-07-23 15:27:03",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -273,7 +273,7 @@
"label": "Price List Currency",
"options": "Currency",
"print_hide": 1,
"read_only": 0
"read_only": 1
},
{
"depends_on": "price_list_name",

View File

@@ -2,7 +2,7 @@
{
"creation": "2013-05-24 19:29:05",
"docstatus": 0,
"modified": "2013-07-09 12:48:05",
"modified": "2013-07-23 15:28:32",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -279,7 +279,7 @@
"label": "Price List Currency",
"options": "Currency",
"print_hide": 1,
"read_only": 0,
"read_only": 1,
"reqd": 1
},
{