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

Merge pull request #17268 from nabinhait/pr-pi-onload

Browse Source 
fix: Pull items from PR to PI
This commit is contained in:
Nabin Hait
2019-04-16 23:45:48 +05:30
committed by GitHub
parent 332b4171c0 7be0736154
commit 0ea32faf3d
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
erpnext/controllers/accounts_controller.py
View File

@@ -30,9 +30,8 @@ class AccountsController(TransactionBase):
return self.__company_currency return self.__company_currency
def onload(self): def onload(self):
if self.get("__onload"): self.set_onload("make_payment_via_journal_entry",
self.get("__onload").make_payment_via_journal_entry \ frappe.db.get_single_value('Accounts Settings', 'make_payment_via_journal_entry'))
= frappe.db.get_single_value('Accounts Settings', 'make_payment_via_journal_entry')
if self.is_new(): if self.is_new():
relevant_docs = ("Quotation", "Purchase Order", "Sales Order", relevant_docs = ("Quotation", "Purchase Order", "Sales Order",

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

@@ -241,7 +241,7 @@ class Project(Document):
from_expense_claim = frappe.db.sql("""select from_expense_claim = frappe.db.sql("""select
sum(total_sanctioned_amount) as total_sanctioned_amount sum(total_sanctioned_amount) as total_sanctioned_amount
from `tabExpense Claim` where project = %s from `tabExpense Claim` where project = %s
and docstatus = 1""", self.name, as_dict=1, debug=1)[0] and docstatus = 1""", self.name, as_dict=1)[0]
self.actual_start_date = from_time_sheet.start_date self.actual_start_date = from_time_sheet.start_date
self.actual_end_date = from_time_sheet.end_date self.actual_end_date = from_time_sheet.end_date