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

Merge branch 'develop' into patch-tests

Browse Source
This commit is contained in:
gavin 2021-06-04 20:13:15 +05:30 committed by GitHub
commit 203a363cd6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
erpnext/stock/doctype/purchase_receipt/purchase_receipt.py
View File

@ -497,7 +497,7 @@ class PurchaseReceipt(BuyingController):
def update_billing_status(self, update_modified=True): def update_billing_status(self, update_modified=True):
updated_pr = [self.name] updated_pr = [self.name]
for d in self.get("items"): for d in self.get("items"):
if d.purchase_invoice and d.purchase_invoice_item: if d.get("purchase_invoice") and d.get("purchase_invoice_item"):
d.db_set('billed_amt', d.amount, update_modified=update_modified) d.db_set('billed_amt', d.amount, update_modified=update_modified)
elif d.purchase_order_item: elif d.purchase_order_item:
updated_pr += update_billed_amount_based_on_po(d.purchase_order_item, update_modified) updated_pr += update_billed_amount_based_on_po(d.purchase_order_item, update_modified)
@ -748,4 +748,3 @@ def get_item_account_wise_additional_cost(purchase_document):
account.base_amount * item.get(based_on_field) / total_item_cost account.base_amount * item.get(based_on_field) / total_item_cost
return item_account_wise_cost return item_account_wise_cost