audrius/stock-rma
1
0
Fork 0
mirror of https://github.com/ForgeFlow/stock-rma.git synced 2025-01-21 12:57:49 +02:00
Code Issues Packages Projects Releases Wiki Activity

[FIX] rma_purchase: write-off differences in price between rma line and vendor refund

Browse Source
This commit is contained in:
mariadforgeflow
2023-02-27 13:28:52 +01:00
committed by PauBForgeFlow
parent 6b23b90e42
commit 24a652ff4d
2 changed files with 95 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

93
rma_purchase/models/account_move.py
View File

@@ -2,6 +2,7 @@
# License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html)
from odoo import models
from odoo.tools.float_utils import float_compare, float_is_zero
class AccountMove(models.Model):
@@ -40,3 +41,95 @@ class AccountMove(models.Model):
)
amls.reconcile()
return res
def _stock_account_prepare_anglo_saxon_in_lines_vals(self):
lines_vals_list_rma = []
rma_refunds = self.env["account.move"]
price_unit_prec = self.env["decimal.precision"].precision_get("Product Price")
for move in self:
if (
move.move_type != "in_refund"
or not move.company_id.anglo_saxon_accounting
):
continue
move = move.with_company(move.company_id)
for line in move.invoice_line_ids.filtered(lambda l: l.rma_line_id):
if (
line.product_id.type != "product"
or line.product_id.valuation != "real_time"
):
continue
# Retrieve accounts needed to generate the price difference.
debit_pdiff_account = (
line.product_id.property_account_creditor_price_difference
or line.product_id.categ_id.property_account_creditor_price_difference_categ
)
debit_pdiff_account = move.fiscal_position_id.map_account(
debit_pdiff_account
)
if not debit_pdiff_account:
continue
rma_line = line.rma_line_id
valuation_price_unit = rma_line._get_price_unit()
price_unit = line.price_unit * (1 - (line.discount or 0.0) / 100.0)
price_unit_val_dif = price_unit - valuation_price_unit
price_subtotal = line.quantity * price_unit_val_dif
if (
not move.currency_id.is_zero(price_subtotal)
and not float_is_zero(
price_unit_val_dif, precision_digits=price_unit_prec
)
and float_compare(
line["price_unit"],
line.price_unit,
precision_digits=price_unit_prec,
)
== 0
):
# Add price difference account line.
vals = {
"name": line.name[:64],
"move_id": move.id,
"partner_id": line.partner_id.id
or move.commercial_partner_id.id,
"currency_id": line.currency_id.id,
"product_id": line.product_id.id,
"product_uom_id": line.product_uom_id.id,
"quantity": line.quantity,
"price_unit": price_unit_val_dif,
"price_subtotal": line.quantity * price_unit_val_dif,
"account_id": debit_pdiff_account.id,
# "analytic_account_id": line.analytic_account_id.id,
# "analytic_tag_ids": [(6, 0, line.analytic_tag_ids.ids)],
# "exclude_from_invoice_tab": True,
# "is_anglo_saxon_line": True,
"rma_line_id": line.rma_line_id.id,
}
lines_vals_list_rma.append(vals)
# Correct the amount of the current line.
vals = {
"name": line.name[:64],
"move_id": move.id,
"partner_id": line.partner_id.id
or move.commercial_partner_id.id,
"currency_id": line.currency_id.id,
"product_id": line.product_id.id,
"product_uom_id": line.product_uom_id.id,
"quantity": line.quantity,
"price_unit": -price_unit_val_dif,
"price_subtotal": line.quantity * -price_unit_val_dif,
"account_id": line.account_id.id,
# "analytic_account_id": line.analytic_account_id.id,
# "analytic_tag_ids": [(6, 0, line.analytic_tag_ids.ids)],
# "exclude_from_invoice_tab": True,
# "is_anglo_saxon_line": True,
"rma_line_id": line.rma_line_id.id,
}
lines_vals_list_rma.append(vals)
rma_refunds |= move
lines_vals_list = super(
AccountMove, self - rma_refunds
)._stock_account_prepare_anglo_saxon_in_lines_vals()
lines_vals_list += lines_vals_list_rma
return lines_vals_list

6
rma_purchase/tests/test_rma_stock_account_purchase.py
View File

@@ -17,9 +17,8 @@ class TestRmaStockAccountPurchase(TestRmaStockAccount):
cls.rma_operation_supplier_refund = cls.env.ref(
"rma_account.rma_operation_supplier_refund"
)
acc_type = cls._create_account_type("expense", "other")
cls.account_price_diff = cls._create_account(
acc_type, "Refund Price Difference Expense", "rpde", cls.company, False
"expense", "Refund Price Difference Expense", "rpde", cls.company, False
)
def test_01_cost_from_po_move(self):
@@ -203,8 +202,7 @@ class TestRmaStockAccountPurchase(TestRmaStockAccount):
line_form.price_unit = 110
bill = bill_form.save()
bill.action_post()
self.assertEquals(len(bill.invoice_line_ids), 1)
self.assertEquals(bill.invoice_line_ids.rma_line_id, rma_line)
self.assertEqual(bill.invoice_line_ids.rma_line_id, rma_line)
grni_amls = self.env["account.move.line"].search(
[
("account_id", "=", self.account_grni.id),