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

chore: label changes in retail and stock (#19243)

Browse Source
This commit is contained in:
Saqib 2019-10-04 16:24:26 +05:30 committed by Nabin Hait
parent 41a6548acb
commit d5067b4d73
5 changed files with 1011 additions and 3808 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
erpnext/selling/doctype/sales_order/sales_order.json
View File

@ -941,7 +941,7 @@
"collapsible": 1, "collapsible": 1,
"fieldname": "printing_details", "fieldname": "printing_details",
"fieldtype": "Section Break", "fieldtype": "Section Break",
"label": "Printing Details" "label": "Print Settings"
}, },
{ {
"fieldname": "language", "fieldname": "language",
@ -1120,7 +1120,7 @@
"allow_on_submit": 1, "allow_on_submit": 1,
"fieldname": "sales_team", "fieldname": "sales_team",
"fieldtype": "Table", "fieldtype": "Table",
"label": "Sales Team1", "label": "Sales Team",
"oldfieldname": "sales_team", "oldfieldname": "sales_team",
"oldfieldtype": "Table", "oldfieldtype": "Table",
"options": "Sales Team", "options": "Sales Team",
@ -1176,7 +1176,7 @@
"icon": "fa fa-file-text", "icon": "fa fa-file-text",
"idx": 105, "idx": 105,
"is_submittable": 1, "is_submittable": 1,
"modified": "2019-09-12 02:13:56.308839", "modified": "2019-09-27 14:23:52.233323",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Selling", "module": "Selling",
"name": "Sales Order", "name": "Sales Order",

5
erpnext/stock/doctype/delivery_note/delivery_note.json
View File

@ -4,6 +4,7 @@
"creation": "2013-05-24 19:29:09", "creation": "2013-05-24 19:29:09",
"doctype": "DocType", "doctype": "DocType",
"document_type": "Document", "document_type": "Document",
"engine": "InnoDB",
"field_order": [ "field_order": [
"delivery_to_section", "delivery_to_section",
"column_break0", "column_break0",
@ -1026,7 +1027,7 @@
"collapsible": 1, "collapsible": 1,
"fieldname": "printing_details", "fieldname": "printing_details",
"fieldtype": "Section Break", "fieldtype": "Section Break",
"label": "Printing Details" "label": "Print Settings"
}, },
{ {
"allow_on_submit": 1, "allow_on_submit": 1,
@ -1237,7 +1238,7 @@
"icon": "fa fa-truck", "icon": "fa fa-truck",
"idx": 146, "idx": 146,
"is_submittable": 1, "is_submittable": 1,
"modified": "2019-08-26 07:37:39.766014", "modified": "2019-09-27 14:24:20.269682",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Stock", "module": "Stock",
"name": "Delivery Note", "name": "Delivery Note",

4802
erpnext/stock/doctype/purchase_receipt/purchase_receipt.json
View File

File diff suppressed because it is too large Load Diff

4
erpnext/stock/doctype/stock_entry/stock_entry.json
View File

@ -335,7 +335,7 @@
"depends_on": "to_warehouse", "depends_on": "to_warehouse",
"fieldname": "target_warehouse_address", "fieldname": "target_warehouse_address",
"fieldtype": "Link", "fieldtype": "Link",
"label": "Target Warehouse Name", "label": "Target Warehouse Address",
"options": "Address" "options": "Address"
}, },
{ {
@ -627,7 +627,7 @@
"icon": "fa fa-file-text", "icon": "fa fa-file-text",
"idx": 1, "idx": 1,
"is_submittable": 1, "is_submittable": 1,
"modified": "2019-09-09 11:40:05.762003", "modified": "2019-09-27 14:38:20.801420",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Stock", "module": "Stock",
"name": "Stock Entry", "name": "Stock Entry",

2
erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.js
View File

@ -30,7 +30,7 @@ frappe.ui.form.on("Stock Reconciliation", {
refresh: function(frm) { refresh: function(frm) {
if(frm.doc.docstatus < 1) { if(frm.doc.docstatus < 1) {
frm.add_custom_button(__("Items"), function() { frm.add_custom_button(__("Fetch Items from Warehouse"), function() {
frm.events.get_items(frm); frm.events.get_items(frm);
}); });
} }