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

fix: Purchase Receipt GL Entries (#37642)

Browse Source 
* fix: Purchase Receipt GL Entries

* chore: cleanup

* test: set cwip account
This commit is contained in:
Deepesh Garg 2023-10-24 14:28:19 +05:30 committed by GitHub
parent 8e523961dc
commit 11d956fa18
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
erpnext/assets/doctype/asset/test_asset.py
View File

@ -1789,6 +1789,7 @@ def create_asset_category():
"fixed_asset_account": "_Test Fixed Asset - _TC", "fixed_asset_account": "_Test Fixed Asset - _TC",
"accumulated_depreciation_account": "_Test Accumulated Depreciations - _TC", "accumulated_depreciation_account": "_Test Accumulated Depreciations - _TC",
"depreciation_expense_account": "_Test Depreciations - _TC", "depreciation_expense_account": "_Test Depreciations - _TC",
"capital_work_in_progress_account": "CWIP Account - _TC",
}, },
) )
asset_category.append( asset_category.append(

7
erpnext/controllers/stock_controller.py
View File

@ -76,8 +76,6 @@ class StockController(AccountsController):
gl_entries = self.get_gl_entries(warehouse_account) gl_entries = self.get_gl_entries(warehouse_account)
make_gl_entries(gl_entries, from_repost=from_repost) make_gl_entries(gl_entries, from_repost=from_repost)
update_regional_gl_entries(gl_entries, self)
def validate_serialized_batch(self): def validate_serialized_batch(self):
from erpnext.stock.doctype.serial_no.serial_no import get_serial_nos from erpnext.stock.doctype.serial_no.serial_no import get_serial_nos
@ -1226,8 +1224,3 @@ def create_item_wise_repost_entries(voucher_type, voucher_no, allow_zero_rate=Fa
repost_entries.append(repost_entry) repost_entries.append(repost_entry)
return repost_entries return repost_entries
@erpnext.allow_regional
def update_regional_gl_entries(gl_list, doc):
return

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

@ -542,17 +542,19 @@ class PurchaseReceipt(BuyingController):
d, gl_entries, self.posting_date, d.get("provisional_expense_account") d, gl_entries, self.posting_date, d.get("provisional_expense_account")
) )
elif flt(d.qty) and (flt(d.valuation_rate) or self.is_return): 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( 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): if not (
return (erpnext.is_perpetual_inventory_enabled(self.company) and d.item_code in stock_items)
or d.is_fixed_asset
):
continue
stock_asset_rbnb = ( stock_asset_rbnb = (
self.get_company_default("asset_received_but_not_billed") 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") else self.get_company_default("stock_received_but_not_billed")
) )
landed_cost_entries = get_item_account_wise_additional_cost(self.name) landed_cost_entries = get_item_account_wise_additional_cost(self.name)
@ -758,8 +760,6 @@ class PurchaseReceipt(BuyingController):
pr_doc = self if (pr == self.name) else frappe.get_doc("Purchase Receipt", pr) pr_doc = self if (pr == self.name) else frappe.get_doc("Purchase Receipt", pr)
update_billing_percentage(pr_doc, update_modified=update_modified) update_billing_percentage(pr_doc, update_modified=update_modified)
self.load_from_db()
def reserve_stock_for_sales_order(self): def reserve_stock_for_sales_order(self):
if self.is_return or not cint( if self.is_return or not cint(
frappe.db.get_single_value("Stock Settings", "auto_reserve_stock_for_sales_order_on_purchase") frappe.db.get_single_value("Stock Settings", "auto_reserve_stock_for_sales_order_on_purchase")