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

fix: sales invoice labels (#19267)

Browse Source
This commit is contained in:
Kenneth Sequeira 2019-10-10 18:50:39 +05:30 committed by Anurag Mishra
parent a1de447662
commit a54b7542f1
2 changed files with 1624 additions and 1623 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
erpnext/accounts/doctype/sales_invoice/sales_invoice.json
View File

@ -1228,7 +1228,7 @@
"collapsible_depends_on": "terms", "collapsible_depends_on": "terms",
"fieldname": "terms_section_break", "fieldname": "terms_section_break",
"fieldtype": "Section Break", "fieldtype": "Section Break",
"label": "Terms", "label": "Terms and Conditions",
"oldfieldtype": "Section Break" "oldfieldtype": "Section Break"
}, },
{ {
@ -1326,6 +1326,7 @@
"print_hide": 1 "print_hide": 1
}, },
{ {
"default": "0",
"fieldname": "is_discounted", "fieldname": "is_discounted",
"fieldtype": "Check", "fieldtype": "Check",
"label": "Is Discounted", "label": "Is Discounted",
@ -1344,7 +1345,7 @@
"in_standard_filter": 1, "in_standard_filter": 1,
"label": "Status", "label": "Status",
"no_copy": 1, "no_copy": 1,
"options": "\nDraft\nReturn\nCredit Note Issued\nSubmitted\nPaid\nUnpaid\nUnpaid and Discounted\nOverdue and Discounted\nOverdue\nOverdue\nCancelled", "options": "\nDraft\nReturn\nCredit Note Issued\nSubmitted\nPaid\nUnpaid\nUnpaid and Discounted\nOverdue and Discounted\nOverdue\nCancelled",
"print_hide": 1, "print_hide": 1,
"read_only": 1 "read_only": 1
}, },
@ -1566,7 +1567,7 @@
"icon": "fa fa-file-text", "icon": "fa fa-file-text",
"idx": 181, "idx": 181,
"is_submittable": 1, "is_submittable": 1,
"modified": "2019-07-04 22:05:03.474745", "modified": "2019-10-05 21:39:49.235990",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "Sales Invoice", "name": "Sales Invoice",

4
erpnext/regional/india/address_template.html
View File

@ -1,6 +1,6 @@
{{ 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 %}PIN: {{ pincode }}<br>{% endif -%}
{{ country }}<br> {{ country }}<br>
{% if phone %}Phone: {{ phone }}<br>{% endif -%} {% if phone %}Phone: {{ phone }}<br>{% endif -%}