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

resolved merge conflicts

Browse Source
This commit is contained in:
mbauskar 2017-06-29 12:11:07 +05:30
commit ec252c806f
3 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/__init__.py
View File

@ -2,7 +2,7 @@
from __future__ import unicode_literals from __future__ import unicode_literals
import frappe import frappe
__version__ = '8.1.6' __version__ = '8.1.7'
def get_default_company(user=None): def get_default_company(user=None):

12
erpnext/templates/pages/regional/india/update-gstin.html
View File

@ -5,8 +5,16 @@
{% block header %}<h2>Update GSTIN</h2>{% endblock %} {% block header %}<h2>Update GSTIN</h2>{% endblock %}
{% block page_content %} {% block page_content %}
<h3>{{ party.name }}</h3> <h3>{{ party_name }}</h3>
{% if invalid_gstin %} {% if not_found %}
<p class='alert alert-danger' style='max-width: 300px;'>
Company Not Found
</p>
<p>
If this problem persists, please contact the company.
</p>
{% elif invalid_gstin %}
<p class='alert alert-danger' style='max-width: 300px;'> <p class='alert alert-danger' style='max-width: 300px;'>
Invalid GSTIN Invalid GSTIN
</p> </p>

4
erpnext/templates/pages/regional/india/update_gstin.py
View File

@ -4,6 +4,7 @@ from frappe import _
def get_context(context): def get_context(context):
context.no_cache = 1 context.no_cache = 1
party = frappe.form_dict.party party = frappe.form_dict.party
context.party_name = party
try: try:
update_gstin(context) update_gstin(context)
@ -18,7 +19,8 @@ def get_context(context):
party_name = frappe.db.get_value('Supplier', party) party_name = frappe.db.get_value('Supplier', party)
if not party_name: if not party_name:
frappe.throw(_("Not Found"), frappe.DoesNotExistError) context.not_found = 1
return
context.party = frappe.get_doc(party_type, party_name) context.party = frappe.get_doc(party_type, party_name)
context.party.onload() context.party.onload()