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

fix: purchase receipt tests

Browse Source
This commit is contained in:
Gursheen Anand 2023-10-03 15:19:33 +05:30
parent f705bf2efe
commit fcfdb9b566
2 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
erpnext/controllers/stock_controller.py
View File

@ -824,6 +824,7 @@ class StockController(AccountsController):
credit, credit,
remarks, remarks,
against_account, against_account,
against_type="Account",
debit_in_account_currency=None, debit_in_account_currency=None,
credit_in_account_currency=None, credit_in_account_currency=None,
account_currency=None, account_currency=None,
@ -838,7 +839,7 @@ class StockController(AccountsController):
"cost_center": cost_center, "cost_center": cost_center,
"debit": debit, "debit": debit,
"credit": credit, "credit": credit,
"against_type": "Account", "against_type": against_type,
"against": against_account, "against": against_account,
"remarks": remarks, "remarks": remarks,
} }

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

@ -449,6 +449,7 @@ class PurchaseReceipt(BuyingController):
debit=0.0, debit=0.0,
credit=discrepancy_caused_by_exchange_rate_difference, credit=discrepancy_caused_by_exchange_rate_difference,
remarks=remarks, remarks=remarks,
against_type="Supplier",
against_account=self.supplier, against_account=self.supplier,
debit_in_account_currency=-1 * discrepancy_caused_by_exchange_rate_difference, debit_in_account_currency=-1 * discrepancy_caused_by_exchange_rate_difference,
account_currency=credit_currency, account_currency=credit_currency,
@ -462,6 +463,7 @@ class PurchaseReceipt(BuyingController):
debit=discrepancy_caused_by_exchange_rate_difference, debit=discrepancy_caused_by_exchange_rate_difference,
credit=0.0, credit=0.0,
remarks=remarks, remarks=remarks,
against_type="Supplier",
against_account=self.supplier, against_account=self.supplier,
debit_in_account_currency=-1 * discrepancy_caused_by_exchange_rate_difference, debit_in_account_currency=-1 * discrepancy_caused_by_exchange_rate_difference,
account_currency=credit_currency, account_currency=credit_currency,
@ -666,7 +668,7 @@ class PurchaseReceipt(BuyingController):
(self.name, expenses_included_in_valuation), (self.name, expenses_included_in_valuation),
) )
against_account = ", ".join([d.account for d in gl_entries if flt(d.debit) > 0]) against_accounts = [d.account for d in gl_entries if flt(d.debit) > 0]
total_valuation_amount = sum(valuation_tax.values()) total_valuation_amount = sum(valuation_tax.values())
amount_including_divisional_loss = negative_expense_to_be_booked amount_including_divisional_loss = negative_expense_to_be_booked
stock_rbnb = self.get_company_default("stock_received_but_not_billed") stock_rbnb = self.get_company_default("stock_received_but_not_billed")
@ -687,14 +689,15 @@ class PurchaseReceipt(BuyingController):
) )
amount_including_divisional_loss -= applicable_amount amount_including_divisional_loss -= applicable_amount
for against in against_accounts:
self.add_gl_entry( self.add_gl_entry(
gl_entries=gl_entries, gl_entries=gl_entries,
account=account, account=account,
cost_center=tax.cost_center, cost_center=tax.cost_center,
debit=0.0, debit=0.0,
credit=applicable_amount, credit=flt(applicable_amount) / len(against_accounts),
remarks=self.remarks or _("Accounting Entry for Stock"), remarks=self.remarks or _("Accounting Entry for Stock"),
against_account=against_account, against_account=against,
item=tax, item=tax,
) )