odoo-addon-l10n-ro-stock-price-difference 15.0.5.1.1__py3-none-any.whl → 15.0.5.2.0.2__py3-none-any.whl

odoo/addons/l10n_ro_stock_price_difference/__manifest__.py

@@ -2,7 +2,7 @@
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 {
     "name": "Romania - Stock Accounting Price Difference",
-    "version": "15.0.5.1.1",
+    "version": "15.0.5.2.0",
     "category": "Localization",
     "summary": "Romania - Stock Accounting Price Difference",
     "author": "NextERP Romania," "Dorin Hongu," "Odoo Community Association (OCA)",

odoo/addons/l10n_ro_stock_price_difference/i18n/l10n_ro_stock_price_difference.pot

@@ -55,7 +55,6 @@ msgid "Invoice"
 msgstr ""
 
 #. module: l10n_ro_stock_price_difference
-#: model:ir.model.fields,field_description:l10n_ro_stock_price_difference.field_account_move__is_l10n_ro_record
 #: model:ir.model.fields,field_description:l10n_ro_stock_price_difference.field_account_move_line__is_l10n_ro_record
 msgid "Is Romanian Record"
 msgstr ""

odoo/addons/l10n_ro_stock_price_difference/models/account_move.py

@@ -11,8 +11,7 @@ _logger = logging.getLogger(__name__)
 
 
 class AccountMove(models.Model):
-    _name = "account.move"
-    _inherit = ["account.move", "l10n.ro.mixin"]
+    _inherit = "account.move"
 
     def action_post(self):
         l10n_ro_records = self.filtered("is_l10n_ro_record")
@@ -22,13 +21,14 @@ class AccountMove(models.Model):
         if (
             len(self) == 1
             and self.move_type in ["in_invoice", "in_refund"]
+            and self.company_id.l10n_ro_accounting
             and not self.env.context.get("l10n_ro_approved_price_difference")
         ):
             action = self._l10n_ro_get_price_difference_check_action()
             if action:
                 return action
-        l10n_ro_records.l10n_ro_fix_price_difference_svl()
         res = super().action_post()
+        l10n_ro_records.l10n_ro_fix_price_difference_svl()
         return res
 
     def _l10n_ro_get_price_difference_check_action(self):
@@ -113,7 +113,10 @@ class AccountMove(models.Model):
 
     def l10n_ro_fix_price_difference_svl(self):
         for invoice in self:
-            if invoice.move_type in ["in_invoice", "in_refund"]:
+            if invoice.state == "posted" and invoice.move_type in [
+                "in_invoice",
+                "in_refund",
+            ]:
                 invoice_lines = invoice.invoice_line_ids.filtered(
                     lambda l: not l.display_type and l.purchase_line_id
                 )
@@ -132,10 +135,9 @@ class AccountMove(models.Model):
                             line.l10n_ro_modify_stock_valuation(price_diff)
 
     def _stock_account_prepare_anglo_saxon_in_lines_vals(self):
-        lines_vals_list = []
-        l10n_ro_records = self.filtered(lambda m: m.is_l10n_ro_record)
-        if self - l10n_ro_records:
-            lines_vals_list = super(
-                AccountMove, self - l10n_ro_records
-            )._stock_account_prepare_anglo_saxon_in_lines_vals()
-        return lines_vals_list
+        l10n_ro_moves = self.filtered(lambda m: m.company_id.l10n_ro_accounting)
+        if l10n_ro_moves == self:
+            return []
+        return super(
+            AccountMove, self - l10n_ro_moves
+        )._stock_account_prepare_anglo_saxon_in_lines_vals()

odoo/addons/l10n_ro_stock_price_difference/models/account_move_line.py

@@ -32,13 +32,14 @@ class AccountMoveLine(models.Model):
         valuation_total = 0
         valuation_total_qty = 0
         for val_stock_move in valuation_stock_moves:
-            # Take svl generated by price difference, they are not
-            # included upper since quantity is 0, even if we write
-            # 1e-50 on it.
+            # Take normal svl and svl generated by price difference.
             svl = (
                 val_stock_move.sudo()
                 .mapped("stock_valuation_layer_ids")
-                .filtered(lambda l: not l.stock_landed_cost_id)
+                .filtered(
+                    lambda l: not l.stock_landed_cost_id
+                    or l.stock_landed_cost_id.l10n_ro_cost_type == "price_diff"
+                )
             )
             layers_qty = sum(svl.mapped("quantity"))
             layers_values = sum(svl.mapped("value"))
@@ -62,6 +63,7 @@ class AccountMoveLine(models.Model):
                 line.quantity, line.product_id.uom_id
             )
             inv_qty += (-1 if line.move_id.move_type == "in_refund" else 1) * line_qty
+
         if inv_qty * valuation_total_qty:
             accc_balance = sum(lines.mapped("balance")) / inv_qty * valuation_total_qty
         else:
@@ -89,7 +91,7 @@ class AccountMoveLine(models.Model):
         # trebuie cantitate din factura in unitatea produsului si apoi
         value = self.product_uom_id._compute_price(value, self.product_id.uom_id)
 
-        lc = self._l10n_ro_create_price_difference_landed_cost(value, self.move_id)
+        lc = self._l10n_ro_create_price_difference_landed_cost(value)
         lc.compute_landed_cost()
         lc.with_context(
             l10n_ro_price_difference_move_ids=valuation_stock_move
@@ -97,25 +99,22 @@ class AccountMoveLine(models.Model):
 
         lc.stock_valuation_layer_ids.mapped("account_move_id")
 
-        # svl-ul creat trebuie sa aiba quantity diferit de 0,
-        # pentru a fi inclus data viitoare in get_stock_valuation_difference
         lc.stock_valuation_layer_ids.filtered(
             lambda svl: svl.value == lc.amount_total
         ).write(
             {
-                "quantity": 1e-50,
+                "quantity": 0,
+                "remaining_qty": 0,
                 "description": "Price Difference",
-                "stock_landed_cost_id": None,
             }
         )
 
-    def l10n_ro_prepare_price_difference_landed_cost(self, value, account_move):
+    def l10n_ro_prepare_price_difference_landed_cost(self, value):
         price_diff_product = self._l10n_ro_get_or_create_price_difference_product()
         stock_journal_id = self.product_id.categ_id.property_stock_journal or False
         return dict(
             account_journal_id=stock_journal_id and stock_journal_id.id,
             l10n_ro_cost_type="price_diff",
-            vendor_bill_id=account_move.id,
             cost_lines=[
                 (
                     0,
@@ -131,8 +130,8 @@ class AccountMoveLine(models.Model):
             ],
         )
 
-    def _l10n_ro_create_price_difference_landed_cost(self, value, account_move):
-        vals = self.l10n_ro_prepare_price_difference_landed_cost(value, account_move)
+    def _l10n_ro_create_price_difference_landed_cost(self, value):
+        vals = self.l10n_ro_prepare_price_difference_landed_cost(value)
         return self.env["stock.landed.cost"].sudo().create(vals)
 
     def _l10n_ro_get_or_create_price_difference_product(self):

odoo/addons/l10n_ro_stock_price_difference/tests/common.py

@@ -20,7 +20,9 @@ class TestStockCommonPriceDiff(TestStockCommon):
         self.product_1.uom_po_id = self.env.ref("uom.product_uom_dozen")
         self.qty_po_p1 = 1
         self.price_p1 = 12
-        self.diff_p1 = 1
+
+        self.diff_p1 = 0
+        self.diff_p2 = 0
 
         self.product_2.uom_po_id = self.env.ref("uom.product_uom_dozen")
         self.qty_po_p2 = 1
@@ -28,5 +30,6 @@ class TestStockCommonPriceDiff(TestStockCommon):
 
         self.val_p1_i = round(self.qty_po_p1 * self.price_p1, 2)
         self.val_p2_i = round(self.qty_po_p2 * self.price_p2, 2)
+
         self.val_p1_f = round(self.qty_po_p1 * (self.price_p1 + self.diff_p1), 2)
         self.val_p2_f = round(self.qty_po_p2 * (self.price_p2 + self.diff_p2), 2)

odoo/addons/l10n_ro_stock_price_difference/tests/test_purchase.py

@@ -26,7 +26,6 @@ class TestStockPurchase(TestStockCommonPriceDiff):
         self.check_account_valuation(0, 0)
 
         self.create_invoice(self.diff_p1, self.diff_p2)
-
         # in stocul  are valoarea cu diferenta de pret inregistrata
         self.check_stock_valuation(self.val_p1_f, self.val_p2_f)
 
@@ -88,8 +87,8 @@ class TestStockPurchase(TestStockCommonPriceDiff):
         location_dest_id = self.picking_type_transfer.default_location_dest_id.copy(
             {"usage": "consume"}
         )
-        self.trasfer(location_id, location_dest_id, self.product_1)
-        self.trasfer(location_id, location_dest_id, self.product_2)
+        self.transfer(location_id, location_dest_id, self.product_1)
+        self.transfer(location_id, location_dest_id, self.product_2)
 
         # Validare factura pret 51 pt product1, 49 pt product2
         self.create_invoice(self.diff_p1, self.diff_p2)
@@ -160,7 +159,7 @@ class TestStockPurchase(TestStockCommonPriceDiff):
         self.create_po(partial=True)
 
         # in stoc produsele sunt la valoarea de achizitie 0
-        self.check_stock_valuation(self.val_p1_i + 10, self.val_p2_i - 10)
+        self.check_stock_valuation(self.val_p1_i + 5, self.val_p2_i - 5)
 
         self.check_account_valuation(self.val_p1_f / 2, self.val_p2_f / 2)
 
@@ -187,7 +186,7 @@ class TestStockPurchase(TestStockCommonPriceDiff):
         self.check_account_valuation(0, 0)
 
         # Validare factura pret 51 pt product1, 49 pt product2
-        self.create_invoice(self.diff_p1, self.diff_p2, 10, 10)
+        self.create_invoice(self.diff_p1, self.diff_p2, 5, 5)
 
         # in stoc produsele sunt la valoarea din factura
         self.check_stock_valuation(self.val_p1_f / 2, self.val_p2_f / 2)
@@ -198,7 +197,7 @@ class TestStockPurchase(TestStockCommonPriceDiff):
         self.create_po(partial=True)
 
         # in stoc produsele sunt la valoarea din factura minus diferenta pe receptia partiala
-        self.check_stock_valuation(self.val_p1_f - 10, self.val_p2_f + 10)
+        self.check_stock_valuation(self.val_p1_f - 5, self.val_p2_f + 5)
 
         # in contabilitate stocul are valoarea din factura
         self.check_account_valuation(self.val_p1_f, self.val_p2_f)

odoo/addons/l10n_ro_stock_price_difference/tests/test_purchase_refund.py

@@ -17,10 +17,9 @@ class TestStockPurchaseRefund(TestStockCommonPriceDiff):
         self.create_invoice(auto_post=False)
 
         pick = po.picking_ids
-        self.make_return(pick, 10)
-
-        stock_value_final_p1 = self.val_p1_i - round(10 * self.price_p1, 2)
-        stock_value_final_p2 = self.val_p1_i - round(10 * self.price_p2, 2)
+        self.make_return(pick, 5)
+        stock_value_final_p1 = self.val_p1_i / 2
+        stock_value_final_p2 = self.val_p2_i / 2
         self.check_stock_valuation(stock_value_final_p1, stock_value_final_p2)
 
         self.check_account_valuation(0.0, 0.0)
@@ -51,7 +50,7 @@ class TestStockPurchaseRefund(TestStockCommonPriceDiff):
         self.create_invoice()
 
         pick = po.picking_ids
-        self.make_return(pick, 20)
+        self.make_return(pick, 10)
 
         self.check_stock_valuation(0.0, 0.0)
 

odoo/addons/l10n_ro_stock_price_difference/tests/test_sale.py

@@ -45,7 +45,7 @@ class TestStockSale(TestStockCommonPriceDiff):
 
         self.create_sale_invoice()
 
-        _logger.info("Verifcare valoare ramas in stoc")
+        _logger.info("Verificare valoare ramas in stoc")
         self.check_stock_valuation(val_stock_p1, val_stock_p2)
         self.check_account_valuation(val_stock_p1, val_stock_p2)
 

{odoo_addon_l10n_ro_stock_price_difference-15.0.5.1.1.dist-info → odoo_addon_l10n_ro_stock_price_difference-15.0.5.2.0.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: odoo-addon-l10n-ro-stock-price-difference
-Version: 15.0.5.1.1
+Version: 15.0.5.2.0.2
 Summary: Romania - Stock Accounting Price Difference
 Home-page: https://github.com/OCA/l10n-romania
 Author: NextERP Romania,Dorin Hongu,Odoo Community Association (OCA)

{odoo_addon_l10n_ro_stock_price_difference-15.0.5.1.1.dist-info → odoo_addon_l10n_ro_stock_price_difference-15.0.5.2.0.2.dist-info}/RECORD

@@ -1,10 +1,10 @@
 odoo/addons/l10n_ro_stock_price_difference/README.rst,sha256=pIAl39y4wjNdRHWdO7PNqbztfQM9FqByOgYLIfPzIH4,3727
 odoo/addons/l10n_ro_stock_price_difference/__init__.py,sha256=R3l5zcM1DHY7iqr3kt92069kmImpPafRbNSzv6p_hBE,42
-odoo/addons/l10n_ro_stock_price_difference/__manifest__.py,sha256=V2FLxJMJ6RX9xjIPEw1F-meam_URWW9VsgpnwpbLivE,785
-odoo/addons/l10n_ro_stock_price_difference/i18n/l10n_ro_stock_price_difference.pot,sha256=DWsNxCeBZSH7_IcggU78-HvNBkXDxa60d7KS5Nd_lMM,4571
+odoo/addons/l10n_ro_stock_price_difference/__manifest__.py,sha256=w26tYgG82hjpmmBKutPEykgg0uEimRqqAg2Jgf6LeqE,785
+odoo/addons/l10n_ro_stock_price_difference/i18n/l10n_ro_stock_price_difference.pot,sha256=pZIb6pPdB-lFhOd16KwS4Jy0dLP8_l1JY1rL1Nbs-B0,4459
 odoo/addons/l10n_ro_stock_price_difference/models/__init__.py,sha256=IziDGW2M2uyUtaLJGSWQsaF6Zz4Qxrtvu9emLMLoEpI,91
-odoo/addons/l10n_ro_stock_price_difference/models/account_move.py,sha256=quGmG9rm_TaR3W20MESqV4-lR-1ukakmqEzU3F9Rmtw,5488
-odoo/addons/l10n_ro_stock_price_difference/models/account_move_line.py,sha256=P9NFChD_uQYnbvL_ye6j2RyKsVJH6I6jjmvloCcx_GU,6277
+odoo/addons/l10n_ro_stock_price_difference/models/account_move.py,sha256=NZj8-PqZUV5xt04BQadfXJlYPFTvtDPjdaYGjVglHpg,5516
+odoo/addons/l10n_ro_stock_price_difference/models/account_move_line.py,sha256=BqvBGhNtgL63c7J9-wr8CrWbqJuGOaAM0TlDUCbTOdg,6051
 odoo/addons/l10n_ro_stock_price_difference/models/stock_landed_cost.py,sha256=4gRotUV448LZFO780umrFig8jjrIxnTn2vIJsUYd69c,599
 odoo/addons/l10n_ro_stock_price_difference/readme/CONTRIBUTORS.rst,sha256=imooaJThv-eiLh7K10cko5NoFQKfEbaU4OcGDn9WKqM,301
 odoo/addons/l10n_ro_stock_price_difference/readme/DESCRIPTION.rst,sha256=WREtcKsSvyty_YnHiOsXvzuFkD1DzE3pH0vZOmgdjzE,168
@@ -12,15 +12,15 @@ odoo/addons/l10n_ro_stock_price_difference/security/ir.model.access.csv,sha256=x
 odoo/addons/l10n_ro_stock_price_difference/static/description/icon.png,sha256=MND3TYqrnM623pd0tf3WhoHU-3X5Ns6ho-Yz_HcYlTk,566
 odoo/addons/l10n_ro_stock_price_difference/static/description/index.html,sha256=iIXRtHnpBHmBhb32nC-8qCmjY8xlnchi_aWkFYPi3xk,13122
 odoo/addons/l10n_ro_stock_price_difference/tests/__init__.py,sha256=PcHbRHAWEYgzNHB4jfqDxzRCYr22mPq6ZOI621w2seE,121
-odoo/addons/l10n_ro_stock_price_difference/tests/common.py,sha256=j8Df8Uin_Hl2psgqPKgJfacXmAGktJ_ZuvOH-C3aKhU,1182
-odoo/addons/l10n_ro_stock_price_difference/tests/test_purchase.py,sha256=T8j-7Yeco6Hgn3LDUZtU-nbb1l3f6dnZ1se6zlx-TnA,8099
+odoo/addons/l10n_ro_stock_price_difference/tests/common.py,sha256=Y-Sj9yqArm2n0pKqcIe4-d7YaJ7nMk4Hr8qLj3akpEc,1209
+odoo/addons/l10n_ro_stock_price_difference/tests/test_purchase.py,sha256=sBJI4ntNIiOuObAgbfa4bxPT-uRRlpKBK4qHcbA_hWw,8094
 odoo/addons/l10n_ro_stock_price_difference/tests/test_purchase_dozen.py,sha256=PP4E101pnw0BQJShvWRVN-46FMd9aAU-iRyQPtS_rJ8,2426
-odoo/addons/l10n_ro_stock_price_difference/tests/test_purchase_refund.py,sha256=Ae3FQr_3ko3C6EXB_7kL88jblcLdiZlsH4hkaAq1750,2380
-odoo/addons/l10n_ro_stock_price_difference/tests/test_sale.py,sha256=zBQHU6areIQSNC0CSfZHpZDkTZKl9wnwR3TqzM99pUY,2060
+odoo/addons/l10n_ro_stock_price_difference/tests/test_purchase_refund.py,sha256=EDOf9_bFf5foD3bt39OhkgfT_Mdf8C7AQgwUcfTL1Uk,2324
+odoo/addons/l10n_ro_stock_price_difference/tests/test_sale.py,sha256=GKl253rDrndcPsjEOWx98QSRz1p5UDJlrZooZksVfAs,2061
 odoo/addons/l10n_ro_stock_price_difference/wizard/__init__.py,sha256=c6_T4TE-Z_2FeKUsIDsq8aRC2I9ITMIJ-4WTt9Kz9og,44
 odoo/addons/l10n_ro_stock_price_difference/wizard/price_difference_confirmation.py,sha256=SZOkpnaB1QIorkGXM4LImwPt8as7hR1wT9HNtoaXfUE,575
 odoo/addons/l10n_ro_stock_price_difference/wizard/price_difference_confirmation.xml,sha256=QjEABFMmvQsVDrqXM2J06VbDMCNUTO3_YptVcuAuRC8,1043
-odoo_addon_l10n_ro_stock_price_difference-15.0.5.1.1.dist-info/METADATA,sha256=N7dpA-k2IPlB_Qd1Mk2uFkJt8MUuGtsUhBhEBqYVxrw,4434
-odoo_addon_l10n_ro_stock_price_difference-15.0.5.1.1.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
-odoo_addon_l10n_ro_stock_price_difference-15.0.5.1.1.dist-info/top_level.txt,sha256=qBj40grFkGOfDZ2WDSw3y1RnDlgG0u8rP8pvGNdbz4w,5
-odoo_addon_l10n_ro_stock_price_difference-15.0.5.1.1.dist-info/RECORD,,
+odoo_addon_l10n_ro_stock_price_difference-15.0.5.2.0.2.dist-info/METADATA,sha256=QtXVwonsbUG2f_Kvs-FH_W-161FNrvZR5n1wYvAsC14,4436
+odoo_addon_l10n_ro_stock_price_difference-15.0.5.2.0.2.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
+odoo_addon_l10n_ro_stock_price_difference-15.0.5.2.0.2.dist-info/top_level.txt,sha256=qBj40grFkGOfDZ2WDSw3y1RnDlgG0u8rP8pvGNdbz4w,5
+odoo_addon_l10n_ro_stock_price_difference-15.0.5.2.0.2.dist-info/RECORD,,