schuetz3/schuetz3-erpnext
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: Error on any new doc from Shipping Rule. (#21207)

Browse Source
This commit is contained in:
Marica
2020-04-09 12:01:29 +05:30
committed by GitHub
parent bf5c7fc4d3
commit b225ffa003
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/accounts/doctype/shipping_rule/shipping_rule.py
View File

@@ -82,7 +82,7 @@ class ShippingRule(Document):
if not shipping_country: if not shipping_country:
frappe.throw(_('Shipping Address does not have country, which is required for this Shipping Rule')) frappe.throw(_('Shipping Address does not have country, which is required for this Shipping Rule'))
if shipping_country not in [d.country for d in self.countries]: if shipping_country not in [d.country for d in self.countries]:
frappe.throw(_('Shipping rule not applicable for country {0}'.format(shipping_country))) frappe.throw(_('Shipping rule not applicable for country {0} in Shipping Address').format(shipping_country))
def add_shipping_rule_to_tax_table(self, doc, shipping_amount): def add_shipping_rule_to_tax_table(self, doc, shipping_amount):
shipping_charge = { shipping_charge = {

2
erpnext/public/js/controllers/transaction.js
View File

@@ -856,7 +856,7 @@ erpnext.TransactionController = erpnext.taxes_and_totals.extend({
shipping_rule: function() { shipping_rule: function() {
var me = this; var me = this;
if(this.frm.doc.shipping_rule) { if(this.frm.doc.shipping_rule && this.frm.doc.shipping_address) {
return this.frm.call({ return this.frm.call({
doc: this.frm.doc, doc: this.frm.doc,
method: "apply_shipping_rule", method: "apply_shipping_rule",