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

address label chages (#22137)

Browse Source 
Co-authored-by: Marica <maricadsouza221197@gmail.com>
This commit is contained in:
Anupam Kumar 2020-06-17 10:53:13 +05:30 committed by GitHub
parent c159556c24
commit 0a3c34de01
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
erpnext/patches.txt
View File

@ -698,3 +698,4 @@ erpnext.patches.v12_0.update_uom_conversion_factor
erpnext.patches.v13_0.delete_old_purchase_reports erpnext.patches.v13_0.delete_old_purchase_reports
erpnext.patches.v12_0.set_italian_import_supplier_invoice_permissions erpnext.patches.v12_0.set_italian_import_supplier_invoice_permissions
erpnext.patches.v13_0.update_sla_enhancements erpnext.patches.v13_0.update_sla_enhancements
erpnext.patches.v12_0.update_address_template_for_india

12
erpnext/patches/v12_0/update_address_template_for_india.py Normal file
View File

@ -0,0 +1,12 @@
# Copyright (c) 2020, Frappe and Contributors
# License: GNU General Public License v3. See license.txt
from __future__ import unicode_literals
import frappe
from erpnext.regional.address_template.setup import set_up_address_templates
def execute():
if frappe.db.get_value('Company', {'country': 'India'}, 'name'):
address_template = frappe.db.get_value('Address Template', 'India', 'template')
if not address_template or "gstin" not in address_template:
set_up_address_templates(default_country='India')

2
erpnext/regional/address_template/templates/india.html
View File

@ -1,7 +1,7 @@
{{ address_line1 }}<br>{% if address_line2 %}{{ address_line2 }}<br>{% endif -%}{{ city }}<br> {{ address_line1 }}<br>{% if address_line2 %}{{ address_line2 }}<br>{% endif -%}{{ city }}<br>
{% if gst_state %}{{ gst_state }}{% endif -%} {% if gst_state %}{{ gst_state }}{% endif -%}
{% if gst_state_number %}, State Code: {{ gst_state_number }}<br>{% endif -%} {% if gst_state_number %}, State Code: {{ gst_state_number }}<br>{% endif -%}
{% if pincode %}PIN: {{ pincode }}<br>{% endif -%} {% if pincode %}Postal Code: {{ pincode }}<br>{% endif -%}
{{ country }}<br> {{ country }}<br>
{% if phone %}Phone: {{ phone }}<br>{% endif -%} {% if phone %}Phone: {{ phone }}<br>{% endif -%}
{% if fax %}Fax: {{ fax }}<br>{% endif -%} {% if fax %}Fax: {{ fax }}<br>{% endif -%}

4
erpnext/shopping_cart/cart.py
View File

@ -42,9 +42,9 @@ def get_cart_quotation(doc=None):
return { return {
"doc": decorate_quotation_doc(doc), "doc": decorate_quotation_doc(doc),
"shipping_addresses": [{"name": address.name, "display": address.display} "shipping_addresses": [{"name": address.name, "title": address.address_title, "display": address.display}
for address in addresses if address.address_type == "Shipping"], for address in addresses if address.address_type == "Shipping"],
"billing_addresses": [{"name": address.name, "display": address.display} "billing_addresses": [{"name": address.name, "title": address.address_title, "display": address.display}
for address in addresses if address.address_type == "Billing"], for address in addresses if address.address_type == "Billing"],
"shipping_rules": get_applicable_shipping_rules(party), "shipping_rules": get_applicable_shipping_rules(party),
"cart_settings": frappe.get_cached_doc("Shopping Cart Settings") "cart_settings": frappe.get_cached_doc("Shopping Cart Settings")

2
erpnext/templates/includes/cart/address_card.html
View File

@ -3,7 +3,7 @@
<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-check"><polyline points="20 6 9 17 4 12"></polyline></svg> <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-check"><polyline points="20 6 9 17 4 12"></polyline></svg>
</div> </div>
<div class="card-body"> <div class="card-body">
<h5 class="card-title">{{ address.name }}</h5> <h5 class="card-title">{{ address.title }}</h5>
<p class="card-text text-muted"> <p class="card-text text-muted">
{{ address.display }} {{ address.display }}
</p> </p>

2
erpnext/templates/includes/cart/cart_address.html
View File

@ -109,7 +109,7 @@ frappe.ready(() => {
reqd: 1 reqd: 1
}, },
{ {
label: __('Pin Code'), label: __('Postal Code'),
fieldname: 'pincode', fieldname: 'pincode',
fieldtype: 'Data' fieldtype: 'Data'
}, },