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

Merge branch 'staging' into develop

Browse Source
This commit is contained in:
Sagar Vora
2019-01-29 18:39:14 +05:30
parent f1ff5c24ff 3f1fb9ca7e
commit f97c5dad82
355 changed files with 6308 additions and 4924 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
erpnext/templates/includes/cart/cart_items.html
View File

@@ -21,12 +21,11 @@
+</button>
</span>
</div>
</span>
</span>
</div>
<div class="col-sm-2 col-xs-3 text-right col-amount">
{{ d.get_formatted("amount") }}
<p class="text-muted small item-rate">{{
_("Rate: {0}").format(d.get_formatted("rate")) }}</p>
<p class="text-muted small item-rate">{{ _("Rate") }}&nbsp;{{ d.get_formatted("rate") }}</p>
</div>
</div>
{% endfor %}

1
erpnext/templates/pages/non_profit/join_chapter.py
View File

@@ -1,3 +1,4 @@
from __future__ import unicode_literals
import frappe
def get_context(context):

1
erpnext/templates/pages/non_profit/leave_chapter.py
View File

@@ -1,3 +1,4 @@
from __future__ import unicode_literals
import frappe
def get_context(context):

6
erpnext/templates/pages/order.html
View File

@@ -73,14 +73,12 @@
<div class="col-sm-3 col-xs-3 text-right">
{{ d.qty }}
{% if d.delivered_qty is defined and d.delivered_qty != None %}
<p class="text-muted small">{{
_("Delivered: {0}").format(d.delivered_qty) }}</p>
<p class="text-muted small">{{ _("Delivered") }}&nbsp;{{ d.delivered_qty }}</p>
{% endif %}
</div>
<div class="col-sm-3 col-xs-3 text-right">
{{ d.get_formatted("amount") }}
<p class="text-muted small">{{
_("@ {0}").format(d.get_formatted("rate")) }}</p>
<p class="text-muted small">{{ _("Rate:") }}&nbsp;{{ d.get_formatted("rate") }}</p>
</div>
</div>
{% endfor %}

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

@@ -1,3 +1,4 @@
from __future__ import unicode_literals
import frappe
from frappe import _
from six import iteritems

2
erpnext/templates/utils.py
View File

@@ -15,7 +15,7 @@ def send_message(subject="Website Query", message="", sender="", status="Open"):
customer = frappe.db.sql("""select distinct dl.link_name from `tabDynamic Link` dl
left join `tabContact` c on dl.parent=c.name where dl.link_doctype='Customer'
and c.email_id='{email_id}'""".format(email_id=sender))
and c.email_id = %s""", sender)
if not customer:
lead = frappe.db.get_value('Lead', dict(email_id=sender))