Merge branch 'master' into develop
diff --git a/erpnext/__init__.py b/erpnext/__init__.py
index f9d33eb..1a98835 100644
--- a/erpnext/__init__.py
+++ b/erpnext/__init__.py
@@ -4,7 +4,7 @@
import frappe
from erpnext.hooks import regional_overrides
-__version__ = '9.1.4'
+__version__ = '9.1.5'
def get_default_company(user=None):
'''Get default company for user'''
diff --git a/erpnext/accounts/doctype/subscription/subscription.py b/erpnext/accounts/doctype/subscription/subscription.py
index b40169a..20cf031 100644
--- a/erpnext/accounts/doctype/subscription/subscription.py
+++ b/erpnext/accounts/doctype/subscription/subscription.py
@@ -205,6 +205,17 @@
if new_document.meta.get_field('subscription'):
new_document.set('subscription', args.name)
+ for fieldname in ['naming_series', 'ignore_pricing_rule', 'posting_time'
+ 'select_print_heading', 'remarks', 'owner']:
+ if new_document.meta.get_field(fieldname):
+ new_document.set(fieldname, reference_doc.get(fieldname))
+
+ # copy item fields
+ if new_document.meta.get_field('items'):
+ for i, item in enumerate(new_document.items):
+ for fieldname in ("page_break",):
+ item.set(fieldname, reference_doc.items[i].get(fieldname))
+
if args.from_date and args.to_date:
from_date = get_next_date(args.from_date, mcount)
diff --git a/erpnext/selling/page/point_of_sale/point_of_sale.js b/erpnext/selling/page/point_of_sale/point_of_sale.js
index bf2980b..7110d4c 100644
--- a/erpnext/selling/page/point_of_sale/point_of_sale.js
+++ b/erpnext/selling/page/point_of_sale/point_of_sale.js
@@ -103,9 +103,7 @@
this.make_payment_modal();
} else {
this.frm.doc.payments.map(p => {
- if (p.amount) {
- this.payment.dialog.set_value(p.mode_of_payment, p.amount);
- }
+ this.payment.dialog.set_value(p.mode_of_payment, p.amount);
});
this.payment.set_title();