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

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

Browse Source
This commit is contained in:
Nabin Hait 2013-03-20 11:43:47 +05:30
commit aa6f939b86
2 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
patches/patch_list.py
View File

@ -214,4 +214,5 @@ patch_list = [
"patches.march_2013.p04_pos_update_stock_check", "patches.march_2013.p04_pos_update_stock_check",
"patches.march_2013.p05_payment_reconciliation", "patches.march_2013.p05_payment_reconciliation",
"patches.march_2013.p06_remove_sales_purchase_return_tool", "patches.march_2013.p06_remove_sales_purchase_return_tool",
"execute:webnotes.bean('Global Defaults').save()"
] ]

1
setup/doctype/global_defaults/global_defaults.py
View File

@ -43,6 +43,7 @@ keydict = {
'maintain_same_rate' : 'maintain_same_rate', 'maintain_same_rate' : 'maintain_same_rate',
'session_expiry': 'session_expiry', 'session_expiry': 'session_expiry',
'disable_rounded_total': 'disable_rounded_total', 'disable_rounded_total': 'disable_rounded_total',
"update_stock": "update_stock",
} }
class DocType: class DocType: