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

Merge branch 'develop' into contacts-ref

Browse Source
This commit is contained in:
Suraj Shetty 2019-09-02 12:38:45 +05:30 committed by GitHub
commit f33dfc2121
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
erpnext/accounts/doctype/payment_entry/payment_entry.py
View File

@ -947,10 +947,15 @@ def get_payment_entry(dt, dn, party_amount=None, bank_account=None, bank_amount=
paid_amount = abs(outstanding_amount)
if bank_amount:
received_amount = bank_amount
else:
received_amount = paid_amount * doc.conversion_rate
else:
received_amount = abs(outstanding_amount)
if bank_amount:
paid_amount = bank_amount
else:
# if party account currency and bank currency is different then populate paid amount as well
paid_amount = received_amount * doc.conversion_rate
pe = frappe.new_doc("Payment Entry")
pe.payment_type = payment_type

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

@ -96,7 +96,7 @@ class Timesheet(Document):
for time in self.time_logs:
if time.from_time and time.to_time:
if flt(std_working_hours) > 0:
if flt(std_working_hours) and date_diff(time.to_time, time.from_time):
time.hours = flt(std_working_hours) * date_diff(time.to_time, time.from_time)
else:
if not time.hours:

4
erpnext/setup/doctype/item_group/item_group.py
View File

@ -26,6 +26,10 @@ class ItemGroup(NestedSet, WebsiteGenerator):
def validate(self):
super(ItemGroup, self).validate()
if not self.parent_item_group:
self.parent_item_group = 'All Item Groups'
self.make_route()
def on_update(self):