From 496174bbdf32e933919023f9e84afcfab7e354a4 Mon Sep 17 00:00:00 2001 From: rohitwaghchaure Date: Sun, 15 Oct 2017 19:08:42 +0530 Subject: [PATCH 1/3] [Fix] Naming series not copy from referebce document to new document in subscription (#11196) --- erpnext/accounts/doctype/subscription/subscription.py | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/erpnext/accounts/doctype/subscription/subscription.py b/erpnext/accounts/doctype/subscription/subscription.py index b40169a36c..20cf031503 100644 --- a/erpnext/accounts/doctype/subscription/subscription.py +++ b/erpnext/accounts/doctype/subscription/subscription.py @@ -205,6 +205,17 @@ def update_doc(new_document, reference_doc, args, schedule_date): 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) From 8bf7230fcc48ac8e9417bfa2b1f4fdae93ea801e Mon Sep 17 00:00:00 2001 From: rohitwaghchaure Date: Sun, 15 Oct 2017 19:09:14 +0530 Subject: [PATCH 2/3] [Fix] New invoice showing old paid amount if POS Profile is not created (#11160) --- erpnext/selling/page/point_of_sale/point_of_sale.js | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) 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 bf2980ba18..7110d4c199 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 @@ erpnext.pos.PointOfSale = class PointOfSale { 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(); From bbbce5888456d0d3c69b2d2418451f6592c77a74 Mon Sep 17 00:00:00 2001 From: mbauskar Date: Sun, 15 Oct 2017 19:40:55 +0600 Subject: [PATCH 3/3] bumped to version 9.1.5 --- erpnext/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/__init__.py b/erpnext/__init__.py index f9d33eb2c4..1a9883516c 100644 --- a/erpnext/__init__.py +++ b/erpnext/__init__.py @@ -4,7 +4,7 @@ import inspect 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'''