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

Merge branch 'master' into develop

Browse Source
This commit is contained in:
mbauskar 2017-10-15 19:10:56 +05:30
commit cd4202c2f7
3 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/__init__.py
View File

@ -4,7 +4,7 @@ import inspect
import frappe import frappe
from erpnext.hooks import regional_overrides from erpnext.hooks import regional_overrides
__version__ = '9.1.4' __version__ = '9.1.5'
def get_default_company(user=None): def get_default_company(user=None):
'''Get default company for user''' '''Get default company for user'''

11
erpnext/accounts/doctype/subscription/subscription.py
View File

@ -205,6 +205,17 @@ def update_doc(new_document, reference_doc, args, schedule_date):
if new_document.meta.get_field('subscription'): if new_document.meta.get_field('subscription'):
new_document.set('subscription', args.name) 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: if args.from_date and args.to_date:
from_date = get_next_date(args.from_date, mcount) from_date = get_next_date(args.from_date, mcount)

4
erpnext/selling/page/point_of_sale/point_of_sale.js
View File

@ -103,9 +103,7 @@ erpnext.pos.PointOfSale = class PointOfSale {
this.make_payment_modal(); this.make_payment_modal();
} else { } else {
this.frm.doc.payments.map(p => { 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(); this.payment.set_title();