fixed conflict

2026-05-15 11:09:17 +00:00 · 2013-03-19 18:29:05 +05:30
parent 80abad2ee0 a2b3eb17e3
commit 364f08a171
57 changed files with 932 additions and 1398 deletions
--- a/setup/doctype/global_defaults/global_defaults.txt
+++ b/setup/doctype/global_defaults/global_defaults.txt
@@ -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",