Merge branch 'master' of github.com:webnotes/erpnext
diff --git a/patches/patch_list.py b/patches/patch_list.py
index 236ef45..9c0d9b8 100644
--- a/patches/patch_list.py
+++ b/patches/patch_list.py
@@ -214,4 +214,5 @@
"patches.march_2013.p04_pos_update_stock_check",
"patches.march_2013.p05_payment_reconciliation",
"patches.march_2013.p06_remove_sales_purchase_return_tool",
+ "execute:webnotes.bean('Global Defaults').save()"
]
\ No newline at end of file
diff --git a/setup/doctype/global_defaults/global_defaults.py b/setup/doctype/global_defaults/global_defaults.py
index 6f3ab4a..8d94a03 100644
--- a/setup/doctype/global_defaults/global_defaults.py
+++ b/setup/doctype/global_defaults/global_defaults.py
@@ -43,6 +43,7 @@
'maintain_same_rate' : 'maintain_same_rate',
'session_expiry': 'session_expiry',
'disable_rounded_total': 'disable_rounded_total',
+ "update_stock": "update_stock",
}
class DocType: