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

Merge pull request #33436 from frappe/mergify/bp/version-13-hotfix/pr-33434

Browse Source 
fix(ux): `shipping_address` in PO (backport #33434)
This commit is contained in:
Sagar Sharma
2022-12-26 11:19:01 +05:30
committed by GitHub
parent 3aa335d36a b634e44fac
commit 7f1574478b
3 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -370,7 +370,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
}, },
@@ -1170,7 +1170,7 @@
"idx": 105, "idx": 105,
"is_submittable": 1, "is_submittable": 1,
"links": [], "links": [],
"modified": "2022-11-17 12:34:36.033363", "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

@@ -1097,8 +1097,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")
@@ -1125,9 +1123,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": {

3
erpnext/stock/doctype/stock_entry/stock_entry.py
View File

@@ -10,7 +10,6 @@ import frappe
from frappe import _ from frappe import _
from frappe.model.mapper import get_mapped_doc from frappe.model.mapper import get_mapped_doc
from frappe.query_builder.functions import Sum from frappe.query_builder.functions import Sum
from six import iteritems, itervalues, string_types
from frappe.utils import ( from frappe.utils import (
add_days, add_days,
cint, cint,
@@ -23,6 +22,7 @@ from frappe.utils import (
nowdate, nowdate,
today, today,
) )
from six import iteritems, itervalues, string_types
import erpnext import erpnext
from erpnext.accounts.general_ledger import process_gl_map from erpnext.accounts.general_ledger import process_gl_map
@@ -2625,4 +2625,3 @@ def get_incorrect_stock_entries() -> Dict:
stock_entries.setdefault(row.name, row) stock_entries.setdefault(row.name, row)
return stock_entries return stock_entries