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

Merge pull request #17629 from nabinhait/multi-fixes-33

Browse Source 
fix: Multiple small fixes
This commit is contained in:
Saurabh
2019-05-16 15:39:31 +05:30
committed by GitHub
parent 9a7681535f 8208f878ff
commit a06a527fe6
3 changed files with 17 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1166,6 +1166,8 @@ class SalesInvoice(SellingController):
self.set_missing_values(for_validate = True) self.set_missing_values(for_validate = True)
def validate_inter_company_party(doctype, party, company, inter_company_invoice_reference): def validate_inter_company_party(doctype, party, company, inter_company_invoice_reference):
if not party:
return
if doctype == "Sales Invoice": if doctype == "Sales Invoice":
partytype, ref_partytype, internal = "Customer", "Supplier", "is_internal_customer" partytype, ref_partytype, internal = "Customer", "Supplier", "is_internal_customer"
ref_doc = "Purchase Invoice" ref_doc = "Purchase Invoice"

26
erpnext/hr/doctype/loan/loan.js
View File

@@ -146,7 +146,7 @@ frappe.ui.form.on('Loan', {
'payment_date': payment.payment_date, 'payment_date': payment.payment_date,
'principal_amount': payment.principal_amount, 'principal_amount': payment.principal_amount,
'interest_amount': payment.interest_amount, 'interest_amount': payment.interest_amount,
'total_payment': payment.total_payment 'total_payment': payment.total_payment
}); });
dialog.fields_dict.payments.grid.refresh(); dialog.fields_dict.payments.grid.refresh();
$(dialog.wrapper.find(".grid-buttons")).hide(); $(dialog.wrapper.find(".grid-buttons")).hide();
@@ -172,18 +172,20 @@ frappe.ui.form.on('Loan', {
}, },
mode_of_payment: function (frm) { mode_of_payment: function (frm) {
frappe.call({ if (frm.doc.mode_of_payment && frm.doc.company) {
method: "erpnext.accounts.doctype.sales_invoice.sales_invoice.get_bank_cash_account", frappe.call({
args: { method: "erpnext.accounts.doctype.sales_invoice.sales_invoice.get_bank_cash_account",
"mode_of_payment": frm.doc.mode_of_payment, args: {
"company": frm.doc.company "mode_of_payment": frm.doc.mode_of_payment,
}, "company": frm.doc.company
callback: function (r, rt) { },
if (r.message) { callback: function (r, rt) {
frm.set_value("payment_account", r.message.account); if (r.message) {
frm.set_value("payment_account", r.message.account);
}
} }
} });
}); }
}, },
loan_application: function (frm) { loan_application: function (frm) {

2
erpnext/projects/doctype/project/project.py
View File

@@ -64,7 +64,7 @@ class Project(Document):
'name': ("not in", self.deleted_task_list) 'name': ("not in", self.deleted_task_list)
}) })
return frappe.get_all("Task", "*", filters, order_by="exp_start_date asc") return frappe.get_all("Task", "*", filters, order_by="exp_start_date asc, status asc")
def validate(self): def validate(self):
self.validate_project_name() self.validate_project_name()