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

setup/doctype/global_defaults/global_defaults.py

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

setup/doctype/global_defaults/global_defaults.txt

@@ -1,8 +1,8 @@
 [
  {
-  "creation": "2013-02-19 12:28:27", 
+  "creation": "2013-03-08 15:37:09", 
   "docstatus": 0, 
-  "modified": "2013-02-20 14:09:00", 
+  "modified": "2013-03-12 18:48:53", 
   "modified_by": "Administrator", 
   "owner": "Administrator"
  }, 
@@ -249,6 +249,13 @@
   "fieldname": "column_break4", 
   "fieldtype": "Column Break"
  }, 
+ {
+  "description": "If checked, then in POS Sales Invoice, Update Stock gets checked by default", 
+  "doctype": "DocField", 
+  "fieldname": "update_stock", 
+  "fieldtype": "Check", 
+  "label": "Update Stock when using POS Sales Invoice"
+ }, 
  {
   "doctype": "DocField", 
   "fieldname": "account_info",