Skip to content

Commit

Permalink
fix: purchase receipt with stock and asset items
Browse files Browse the repository at this point in the history
  • Loading branch information
vorasmit committed Oct 26, 2023
1 parent c58fefb commit 375be8c
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 5 deletions.
1 change: 1 addition & 0 deletions erpnext/assets/doctype/asset/test_asset.py
Original file line number Diff line number Diff line change
Expand Up @@ -1732,6 +1732,7 @@ def create_asset_category():
"fixed_asset_account": "_Test Fixed Asset - _TC",
"accumulated_depreciation_account": "_Test Accumulated Depreciations - _TC",
"depreciation_expense_account": "_Test Depreciations - _TC",
"capital_work_in_progress_account": "CWIP Account - _TC",
},
)
asset_category.append(
Expand Down
12 changes: 7 additions & 5 deletions erpnext/stock/doctype/purchase_receipt/purchase_receipt.py
Original file line number Diff line number Diff line change
Expand Up @@ -543,17 +543,19 @@ def make_divisional_loss_gl_entry(item, outgoing_amount):
d, gl_entries, self.posting_date, d.get("provisional_expense_account")
)
elif flt(d.qty) and (flt(d.valuation_rate) or self.is_return):
is_asset_pr = any(d.is_fixed_asset for d in self.get("items"))
remarks = self.get("remarks") or _("Accounting Entry for {0}").format(
"Asset" if is_asset_pr else "Stock"
"Asset" if d.is_fixed_asset else "Stock"
)

if not (erpnext.is_perpetual_inventory_enabled(self.company) or is_asset_pr):
return
if not (
(erpnext.is_perpetual_inventory_enabled(self.company) and d.item_code in stock_items)
or d.is_fixed_asset
):
continue

stock_asset_rbnb = (
self.get_company_default("asset_received_but_not_billed")
if is_asset_pr
if d.is_fixed_asset
else self.get_company_default("stock_received_but_not_billed")
)
landed_cost_entries = get_item_account_wise_additional_cost(self.name)
Expand Down

0 comments on commit 375be8c

Please sign in to comment.