fix: Test Cases
This commit is contained in:
parent
e1320c7e47
commit
e5e2ad646a
@ -443,7 +443,7 @@ class PurchaseInvoice(BuyingController):
|
||||
else:
|
||||
self.stock_received_but_not_billed = None
|
||||
self.expenses_included_in_valuation = None
|
||||
|
||||
|
||||
self.negative_expense_to_be_booked = 0.0
|
||||
gl_entries = []
|
||||
|
||||
@ -457,7 +457,7 @@ class PurchaseInvoice(BuyingController):
|
||||
self.make_internal_transfer_gl_entries(gl_entries)
|
||||
|
||||
gl_entries = make_regional_gl_entries(gl_entries, self)
|
||||
|
||||
|
||||
gl_entries = merge_similar_entries(gl_entries)
|
||||
|
||||
self.make_payment_gl_entries(gl_entries)
|
||||
@ -582,7 +582,8 @@ class PurchaseInvoice(BuyingController):
|
||||
"against": item.expense_account,
|
||||
"cost_center": item.cost_center,
|
||||
"remarks": self.get("remarks") or _("Accounting Entry for Stock"),
|
||||
"credit": flt(amount),
|
||||
"credit": flt(amount["base_amount"]),
|
||||
"credit_in_account_currency": flt(amount["amount"]),
|
||||
"project": item.project or self.project
|
||||
}, item=item))
|
||||
|
||||
@ -999,10 +1000,10 @@ class PurchaseInvoice(BuyingController):
|
||||
self.delete_auto_created_batches()
|
||||
|
||||
self.make_gl_entries_on_cancel()
|
||||
|
||||
|
||||
if self.update_stock == 1:
|
||||
self.repost_future_sle_and_gle()
|
||||
|
||||
|
||||
self.update_project()
|
||||
frappe.db.set(self, 'status', 'Cancelled')
|
||||
|
||||
|
@ -92,14 +92,14 @@ class LandedCostVoucher(Document):
|
||||
total_item_cost += item.get(based_on_field)
|
||||
|
||||
for item in self.get('items'):
|
||||
item.applicable_charges = flt(flt(item.get(based_on_field)) * flt(self.total_taxes_and_charges) / flt(total_item_cost),
|
||||
item.applicable_charges = flt(flt(item.get(based_on_field)) * (flt(self.total_taxes_and_charges) / flt(total_item_cost)),
|
||||
item.precision('applicable_charges'))
|
||||
total_charges += item.applicable_charges
|
||||
item_count += 1
|
||||
|
||||
if total_charges != self.total_taxes_and_charges:
|
||||
diff = self.total_taxes_and_charges - total_charges
|
||||
self.get('items')[item_count - 1].applicable_charges += diff
|
||||
if total_charges != self.total_taxes_and_charges:
|
||||
diff = self.total_taxes_and_charges - total_charges
|
||||
self.get('items')[item_count - 1].applicable_charges += diff
|
||||
|
||||
def set_account_currency(self):
|
||||
company_currency = erpnext.get_company_currency(self.company)
|
||||
|
@ -163,8 +163,8 @@ class TestLandedCostVoucher(unittest.TestCase):
|
||||
|
||||
lcv = create_landed_cost_voucher("Purchase Receipt", pr.name, pr.company, 123.22)
|
||||
|
||||
self.assertEqual(lcv.items[0].applicable_charges, 41.07)
|
||||
self.assertEqual(lcv.items[2].applicable_charges, 41.08)
|
||||
self.assertEqual(flt(lcv.items[0].applicable_charges, 2), 41.07)
|
||||
self.assertEqual(flt(lcv.items[2].applicable_charges, 2), 41.08)
|
||||
|
||||
def test_multiple_landed_cost_voucher_against_pr(self):
|
||||
pr = make_purchase_receipt(company="_Test Company with perpetual inventory", warehouse = "Stores - TCP1",
|
||||
|
Loading…
x
Reference in New Issue
Block a user