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

Merge branch 'develop' of github.com:webnotes/erpnext into hotfix

Browse Source
This commit is contained in:
Nabin Hait 2014-01-15 17:36:34 +05:30
commit c0c951b6a9
4 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
accounts/doctype/pos_setting/pos_setting.txt
View File

@ -2,7 +2,7 @@
{ {
"creation": "2013-05-24 12:15:51", "creation": "2013-05-24 12:15:51",
"docstatus": 0, "docstatus": 0,
"modified": "2013-11-02 16:58:38", "modified": "2014-01-15 16:23:58",
"modified_by": "Administrator", "modified_by": "Administrator",
"owner": "Administrator" "owner": "Administrator"
}, },
@ -154,7 +154,7 @@
"reqd": 1 "reqd": 1
}, },
{ {
"depends_on": "eval:sys_defaults.auto_accounting_for_stock", "depends_on": "eval:cint(sys_defaults.auto_accounting_for_stock)",
"doctype": "DocField", "doctype": "DocField",
"fieldname": "expense_account", "fieldname": "expense_account",
"fieldtype": "Link", "fieldtype": "Link",

4
stock/doctype/purchase_receipt_item/purchase_receipt_item.txt
View File

@ -2,7 +2,7 @@
{ {
"creation": "2013-05-24 19:29:10", "creation": "2013-05-24 19:29:10",
"docstatus": 0, "docstatus": 0,
"modified": "2014-01-03 18:28:20", "modified": "2014-01-15 16:00:44",
"modified_by": "Administrator", "modified_by": "Administrator",
"owner": "Administrator" "owner": "Administrator"
}, },
@ -336,7 +336,7 @@
}, },
{ {
"default": ":Company", "default": ":Company",
"depends_on": "eval:sys_defaults.auto_accounting_for_stock", "depends_on": "eval:cint(sys_defaults.auto_accounting_for_stock)",
"doctype": "DocField", "doctype": "DocField",
"fieldname": "cost_center", "fieldname": "cost_center",
"fieldtype": "Link", "fieldtype": "Link",

6
stock/doctype/stock_entry_detail/stock_entry_detail.txt
View File

@ -2,7 +2,7 @@
{ {
"creation": "2013-03-29 18:22:12", "creation": "2013-03-29 18:22:12",
"docstatus": 0, "docstatus": 0,
"modified": "2013-11-08 16:15:44", "modified": "2014-01-15 16:08:45",
"modified_by": "Administrator", "modified_by": "Administrator",
"owner": "Administrator" "owner": "Administrator"
}, },
@ -165,7 +165,7 @@
"read_only": 1 "read_only": 1
}, },
{ {
"depends_on": "eval:sys_defaults.auto_accounting_for_stock", "depends_on": "eval:cint(sys_defaults.auto_accounting_for_stock)",
"doctype": "DocField", "doctype": "DocField",
"fieldname": "expense_account", "fieldname": "expense_account",
"fieldtype": "Link", "fieldtype": "Link",
@ -175,7 +175,7 @@
}, },
{ {
"default": ":Company", "default": ":Company",
"depends_on": "eval:sys_defaults.auto_accounting_for_stock", "depends_on": "eval:cint(sys_defaults.auto_accounting_for_stock)",
"doctype": "DocField", "doctype": "DocField",
"fieldname": "cost_center", "fieldname": "cost_center",
"fieldtype": "Link", "fieldtype": "Link",

5
stock/doctype/stock_reconciliation/stock_reconciliation.txt
View File

@ -2,7 +2,7 @@
{ {
"creation": "2013-03-28 10:35:31", "creation": "2013-03-28 10:35:31",
"docstatus": 0, "docstatus": 0,
"modified": "2013-09-24 15:35:12", "modified": "2014-01-15 15:45:07",
"modified_by": "Administrator", "modified_by": "Administrator",
"owner": "Administrator" "owner": "Administrator"
}, },
@ -102,7 +102,7 @@
"reqd": 1 "reqd": 1
}, },
{ {
"depends_on": "eval:sys_defaults.auto_accounting_for_stock", "depends_on": "eval:cint(sys_defaults.auto_accounting_for_stock)",
"doctype": "DocField", "doctype": "DocField",
"fieldname": "expense_account", "fieldname": "expense_account",
"fieldtype": "Link", "fieldtype": "Link",
@ -110,6 +110,7 @@
"options": "Account" "options": "Account"
}, },
{ {
"depends_on": "eval:cint(sys_defaults.auto_accounting_for_stock)",
"doctype": "DocField", "doctype": "DocField",
"fieldname": "cost_center", "fieldname": "cost_center",
"fieldtype": "Link", "fieldtype": "Link",