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:
Nabin Hait 2018-03-14 13:33:38 +05:30
commit bb5caf8fad
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/__init__.py
View File

@ -5,7 +5,7 @@ import frappe
from erpnext.hooks import regional_overrides from erpnext.hooks import regional_overrides
from frappe.utils import getdate from frappe.utils import getdate
__version__ = '10.1.11' __version__ = '10.1.12'
def get_default_company(user=None): def get_default_company(user=None):
'''Get default company for user''' '''Get default company for user'''

4
erpnext/selling/doctype/sales_order/sales_order.js
View File

@ -53,8 +53,8 @@ frappe.ui.form.on("Sales Order Item", {
if (frm.doc.delivery_date) { if (frm.doc.delivery_date) {
row.delivery_date = frm.doc.delivery_date; row.delivery_date = frm.doc.delivery_date;
refresh_field("delivery_date", cdn, "items"); refresh_field("delivery_date", cdn, "items");
} else if((frm.doc.items || []).length > 1) { } else {
this.frm.script_manager.copy_from_first_row("items", row, ["delivery_date"]); frm.script_manager.copy_from_first_row("items", row, ["delivery_date"]);
} }
}, },
delivery_date: function(frm, cdt, cdn) { delivery_date: function(frm, cdt, cdn) {