From f6891975d5c0afa7f175a514ceb678b3fde3cf43 Mon Sep 17 00:00:00 2001 From: Saurabh Date: Wed, 9 Dec 2015 15:03:49 +0530 Subject: [PATCH 1/3] [fixes] pull customer details only if drop shipping is marked --- .../doctype/sales_order/sales_order.py | 26 +++++++++++-------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/erpnext/selling/doctype/sales_order/sales_order.py b/erpnext/selling/doctype/sales_order/sales_order.py index 7712f5ebe69..6ec82a24302 100644 --- a/erpnext/selling/doctype/sales_order/sales_order.py +++ b/erpnext/selling/doctype/sales_order/sales_order.py @@ -533,13 +533,23 @@ def make_purchase_order_for_drop_shipment(source_name, for_supplier, target_doc= default_price_list = frappe.get_value("Supplier", for_supplier, "default_price_list") if default_price_list: target.buying_price_list = default_price_list + + if any( item.delivered_by_supplier==1 for item in source.items): + if source.shipping_address_name: + target.customer_address = source.shipping_address_name + target.customer_address_display = source.shipping_address + else: + target.customer_address = source.customer_address + target.customer_address_display = source.address_display + + target.customer_contact_person = source.contact_person + target.customer_contact_display = source.contact_display + target.customer_contact_mobile = source.contact_mobile + target.customer_contact_email = source.contact_email - if source.shipping_address_name: - target.customer_address = source.shipping_address_name - target.customer_address_display = source.shipping_address else: - target.customer_address = source.customer_address - target.customer_address_display = source.address_display + target.customer = "" + target.customer_name = "" target.run_method("set_missing_values") target.run_method("calculate_taxes_and_totals") @@ -551,12 +561,6 @@ def make_purchase_order_for_drop_shipment(source_name, for_supplier, target_doc= doclist = get_mapped_doc("Sales Order", source_name, { "Sales Order": { "doctype": "Purchase Order", - "field_map": { - "contact_person": "customer_contact_person", - "contact_display": "customer_contact_display", - "contact_mobile": "customer_contact_mobile", - "contact_email": "customer_contact_email", - }, "field_no_map": [ "address_display", "contact_display", From 783e63a8e65cbe052c66e9ca8ae1eecab8e6db52 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Wed, 9 Dec 2015 15:29:13 +0530 Subject: [PATCH 2/3] suomalainen translation fixed for Extra Small and Large --- erpnext/translations/fi.csv | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/translations/fi.csv b/erpnext/translations/fi.csv index 3f10b28750b..5c1a652f6cd 100644 --- a/erpnext/translations/fi.csv +++ b/erpnext/translations/fi.csv @@ -2084,7 +2084,7 @@ DocType: BOM,Item UOM,tuote UOM DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),veron arvomäärä alennusten jälkeen (yrityksen valuutta) apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +149,Target warehouse is mandatory for row {0},tavoite varasto on pakollinen rivin {0} DocType: Quality Inspection,Quality Inspection,laatutarkistus -apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Extra Small,erittäin suuri +apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Extra Small,erittäin pieni apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +545,Warning: Material Requested Qty is less than Minimum Order Qty,varoitus: pyydetty materiaali yksikkömäärä on pienempi kuin vähimmäis ostotilausmäärä apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +191,Account {0} is frozen,tili {0} on jäädytetty DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,"juridinen hlö / tytäryhtiö, jolla on erillinen tilikartta kuuluu organisaatioon" From 7290c79fdf6c9c8f9640c0e6c2e443eeab4eb0b9 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Wed, 9 Dec 2015 16:02:30 +0600 Subject: [PATCH 3/3] bumped to version 6.12.8 --- erpnext/__version__.py | 2 +- erpnext/hooks.py | 2 +- setup.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/erpnext/__version__.py b/erpnext/__version__.py index 4d0568b0478..723e7cecae1 100644 --- a/erpnext/__version__.py +++ b/erpnext/__version__.py @@ -1,2 +1,2 @@ from __future__ import unicode_literals -__version__ = '6.12.7' +__version__ = '6.12.8' diff --git a/erpnext/hooks.py b/erpnext/hooks.py index 3c65a80c333..bed3a914c73 100644 --- a/erpnext/hooks.py +++ b/erpnext/hooks.py @@ -7,7 +7,7 @@ app_publisher = "Frappe Technologies Pvt. Ltd." app_description = """ERP made simple""" app_icon = "icon-th" app_color = "#e74c3c" -app_version = "6.12.7" +app_version = "6.12.8" app_email = "info@erpnext.com" app_license = "GNU General Public License (v3)" source_link = "https://github.com/frappe/erpnext" diff --git a/setup.py b/setup.py index 50ea375ee32..ddc29f8ca6b 100644 --- a/setup.py +++ b/setup.py @@ -1,7 +1,7 @@ from setuptools import setup, find_packages from pip.req import parse_requirements -version = "6.12.7" +version = "6.12.8" requirements = parse_requirements("requirements.txt", session="") setup(