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

Merge pull request #33434 from s-aga-r/fix/github-issue/32258

Browse Source 
fix(ux): `shipping_address` in PO
This commit is contained in:
Sagar Sharma 2022-12-25 19:40:09 +05:30 committed by GitHub
commit 9858d9d968
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
erpnext/buying/doctype/purchase_order/purchase_order.json
View File

@ -108,7 +108,7 @@
"contact_display", "contact_display",
"contact_mobile", "contact_mobile",
"contact_email", "contact_email",
"company_shipping_address_section", "shipping_address_section",
"shipping_address", "shipping_address",
"column_break_99", "column_break_99",
"shipping_address_display", "shipping_address_display",
@ -385,7 +385,7 @@
{ {
"fieldname": "shipping_address", "fieldname": "shipping_address",
"fieldtype": "Link", "fieldtype": "Link",
"label": "Company Shipping Address", "label": "Shipping Address",
"options": "Address", "options": "Address",
"print_hide": 1 "print_hide": 1
}, },
@ -1207,11 +1207,6 @@
"fieldtype": "Tab Break", "fieldtype": "Tab Break",
"label": "Address & Contact" "label": "Address & Contact"
}, },
{
"fieldname": "company_shipping_address_section",
"fieldtype": "Section Break",
"label": "Company Shipping Address"
},
{ {
"fieldname": "company_billing_address_section", "fieldname": "company_billing_address_section",
"fieldtype": "Section Break", "fieldtype": "Section Break",
@ -1263,13 +1258,18 @@
"fieldname": "named_place", "fieldname": "named_place",
"fieldtype": "Data", "fieldtype": "Data",
"label": "Named Place" "label": "Named Place"
},
{
"fieldname": "shipping_address_section",
"fieldtype": "Section Break",
"label": "Shipping Address"
} }
], ],
"icon": "fa fa-file-text", "icon": "fa fa-file-text",
"idx": 105, "idx": 105,
"is_submittable": 1, "is_submittable": 1,
"links": [], "links": [],
"modified": "2022-12-12 18:36:37.455134", "modified": "2022-12-25 18:08:59.074182",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Buying", "module": "Buying",
"name": "Purchase Order", "name": "Purchase Order",

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

@ -1031,8 +1031,6 @@ def make_purchase_order(source_name, selected_items=None, target_doc=None):
target.discount_amount = 0.0 target.discount_amount = 0.0
target.inter_company_order_reference = "" target.inter_company_order_reference = ""
target.shipping_rule = "" target.shipping_rule = ""
target.customer = ""
target.customer_name = ""
target.run_method("set_missing_values") target.run_method("set_missing_values")
target.run_method("calculate_taxes_and_totals") target.run_method("calculate_taxes_and_totals")
@ -1059,9 +1057,11 @@ def make_purchase_order(source_name, selected_items=None, target_doc=None):
"contact_email", "contact_email",
"contact_person", "contact_person",
"taxes_and_charges", "taxes_and_charges",
"shipping_address",
"terms", "terms",
], ],
"field_map": [
["shipping_address_name", "shipping_address"],
],
"validation": {"docstatus": ["=", 1]}, "validation": {"docstatus": ["=", 1]},
}, },
"Sales Order Item": { "Sales Order Item": {