nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-20 13:39:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: Merge Conflicts

Browse Source
This commit is contained in:
Marica
2022-07-27 16:22:17 +05:30
committed by GitHub
parent 2381b81aac
commit 49fb177f86
1 changed files with 0 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
erpnext/stock/doctype/pick_list/pick_list.json
View File

@@ -127,61 +127,19 @@
"fieldtype": "Check", "fieldtype": "Check",
"label": "Group Same Items", "label": "Group Same Items",
"print_hide": 1 "print_hide": 1
<<<<<<< HEAD
=======
},
{
"fieldname": "section_break_15",
"fieldtype": "Section Break"
},
{
"fieldname": "scan_barcode",
"fieldtype": "Data",
"label": "Scan Barcode",
"options": "Barcode"
},
{
"fieldname": "column_break_13",
"fieldtype": "Column Break"
},
{
"default": "0",
"description": "If checked, picked qty won't automatically be fulfilled on submit of pick list.",
"fieldname": "scan_mode",
"fieldtype": "Check",
"label": "Scan Mode"
},
{
"default": "0",
"fieldname": "prompt_qty",
"fieldtype": "Check",
"label": "Prompt Qty"
}, },
{ {
"depends_on": "eval:doc.purpose==='Delivery' && doc.customer", "depends_on": "eval:doc.purpose==='Delivery' && doc.customer",
"fetch_from": "customer.customer_name", "fetch_from": "customer.customer_name",
"fieldname": "customer_name", "fieldname": "customer_name",
"fieldtype": "Data", "fieldtype": "Data",
<<<<<<< HEAD
"label": "Customer Name"
>>>>>>> 0a633a212d (fix: display customer name on picking list)
=======
"label": "Customer Name", "label": "Customer Name",
"read_only": 1 "read_only": 1
>>>>>>> 7083b3148b (fix: make customer_name field read only.)
} }
], ],
"is_submittable": 1, "is_submittable": 1,
"links": [], "links": [],
<<<<<<< HEAD
<<<<<<< HEAD
"modified": "2022-04-21 07:56:40.646473",
=======
"modified": "2022-07-12 13:03:04.442174",
>>>>>>> 0a633a212d (fix: display customer name on picking list)
=======
"modified": "2022-07-19 11:03:04.442174", "modified": "2022-07-19 11:03:04.442174",
>>>>>>> 7083b3148b (fix: make customer_name field read only.)
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Stock", "module": "Stock",
"name": "Pick List", "name": "Pick List",