[MIG] purchase_sale_inter_company: migrate sync pickings for v15

Author: ntsirintanis

account_invoice_inter_company/tests/test_inter_company_invoice.py

@@ -5,12 +5,10 @@
 
 from odoo import _
 from odoo.exceptions import UserError, ValidationError
-from odoo.tests import tagged
-from odoo.tests.common import Form, SavepointCase
+from odoo.tests.common import Form, TransactionCase
 
 
-@tagged("post_install", "-at_install")
-class TestAccountInvoiceInterCompanyBase(SavepointCase):
+class TestAccountInvoiceInterCompanyBase(TransactionCase):
     @classmethod
     def setUpClass(cls):
         super().setUpClass()
@@ -32,7 +30,7 @@ def setUpClass(cls):
                 "invoice_auto_validation": True,
             }
         )
-        cls.chart.try_loading(cls.company_a)
+        cls.chart.try_loading(company=cls.company_a, install_demo=False)
         cls.partner_company_a = cls.company_a.partner_id
         cls.company_b = cls.env["res.company"].create(
             {
@@ -43,7 +41,7 @@ def setUpClass(cls):
                 "invoice_auto_validation": True,
             }
         )
-        cls.chart.try_loading(cls.company_b)
+        cls.chart.try_loading(company=cls.company_b, install_demo=False)
         cls.partner_company_b = cls.company_b.partner_id
         cls.child_partner_company_b = cls.env["res.partner"].create(
             {
@@ -53,6 +51,7 @@ def setUpClass(cls):
                 "parent_id": cls.partner_company_b.id,
             }
         )
+        # cls.partner_company_b = cls.company_b.parent_id.partner_id
         cls.user_company_a = cls.env["res.users"].create(
             {
                 "name": "User A",
@@ -264,8 +263,7 @@ def setUpClass(cls):
                 "code": "SAJ-A",
                 "type": "sale",
                 "secure_sequence_id": cls.sequence_sale_journal_company_a.id,
-                "payment_credit_account_id": cls.a_sale_company_a.id,
-                "payment_debit_account_id": cls.a_sale_company_a.id,
+                "default_account_id": cls.a_sale_company_a.id,
                 "company_id": cls.company_a.id,
             }
         )
@@ -275,8 +273,7 @@ def setUpClass(cls):
                 "name": "Bank Journal - (Company A)",
                 "code": "BNK-A",
                 "type": "bank",
-                "payment_credit_account_id": cls.a_sale_company_a.id,
-                "payment_debit_account_id": cls.a_sale_company_a.id,
+                "default_account_id": cls.a_sale_company_a.id,
                 "company_id": cls.company_a.id,
             }
         )
@@ -295,8 +292,7 @@ def setUpClass(cls):
                 "code": "EXJ-B",
                 "type": "purchase",
                 "secure_sequence_id": cls.sequence_purchase_journal_company_b.id,
-                "payment_credit_account_id": cls.a_expense_company_b.id,
-                "payment_debit_account_id": cls.a_expense_company_b.id,
+                "default_account_id": cls.a_expense_company_b.id,
                 "company_id": cls.company_b.id,
             }
         )
@@ -305,8 +301,7 @@ def setUpClass(cls):
                 "name": "Bank Journal - (Company B)",
                 "code": "BNK-B",
                 "type": "bank",
-                "payment_credit_account_id": cls.a_sale_company_b.id,
-                "payment_debit_account_id": cls.a_sale_company_b.id,
+                "default_account_id": cls.a_sale_company_b.id,
                 "company_id": cls.company_b.id,
             }
         )
@@ -558,46 +553,6 @@ def test_confirm_invoice_with_native_product_rule_and_unshared_product(self):
         with self.assertRaises(UserError):
             self._confirm_invoice_with_product()
 
-    def test_purchase_attachement_out_invoice(self):
-        # Sale Invoice PDF appears as attachment in the purchase invoice form.
-        # From a Sale Invoice.
-        self.invoice_company_a.action_post()
-        invoice_company_b = self.account_move_obj.with_user(
-            self.user_company_b.id
-        ).search([("auto_invoice_id", "=", self.invoice_company_a.id)])
-        invoice_b_pdf = self.env["ir.attachment"].search(
-            [("res_model", "=", "account.move"), ("res_id", "=", invoice_company_b.id)]
-        )
-        self.assertEqual(len(invoice_b_pdf), 1)
-        self.assertEqual(invoice_b_pdf.name, self.invoice_company_a.name + ".pdf")
-
-    def test_purchase_attachement_in_invoice(self):
-        # Sale Invoice PDF appears as attachment in the purchase invoice form.
-        # From a Purchase Invoice.
-        bill_company_a = Form(
-            self.account_move_obj.with_company(self.company_a.id).with_context(
-                default_move_type="in_invoice",
-            )
-        )
-        bill_company_a.partner_id = self.partner_company_b
-        bill_company_a.invoice_date = bill_company_a.date
-        with bill_company_a.invoice_line_ids.new() as line_form:
-            line_form.product_id = self.product_consultant_multi_company
-            line_form.quantity = 1
-            line_form.product_uom_id = self.env.ref("uom.product_uom_hour")
-            line_form.price_unit = 450.0
-        bill_company_a = bill_company_a.save()
-        bill_company_a.action_post()
-
-        invoice_company_b = self.account_move_obj.with_user(
-            self.user_company_b.id
-        ).search([("auto_invoice_id", "=", bill_company_a.id)])
-        bill_a_pdf = self.env["ir.attachment"].search(
-            [("res_model", "=", "account.move"), ("res_id", "=", bill_company_a.id)]
-        )
-        self.assertEqual(len(bill_a_pdf), 1)
-        self.assertEqual(bill_a_pdf.name, invoice_company_b.name + ".pdf")
-
     def _confirm_invoice_with_product(self):
         # Confirm the invoice of company A
         self.invoice_company_a.with_user(self.user_company_a.id).action_post()
@@ -607,21 +562,3 @@ def _confirm_invoice_with_product(self):
         )
         self.assertEqual(len(invoices), 1)
         return invoices
-
-    def test_confirm_invoice_and_full_refund(self):
-        self.env.ref("product.product_comp_rule").write({"active": False})
-        self._confirm_invoice_with_product()
-        wizard = self.env["account.move.reversal"].create(
-            {
-                "refund_method": "cancel",
-                "move_ids": [(6, 0, self.invoice_company_a.ids)],
-            }
-        )
-        action = wizard.reverse_moves()
-        refund_company_a = self.account_move_obj.browse(action["res_id"])
-
-        # Check destination refund created in company B
-        refund = self.account_move_obj.with_user(self.user_company_b.id).search(
-            [("auto_invoice_id", "=", refund_company_a.id)]
-        )
-        self.assertEqual(len(refund), 1)

purchase_sale_inter_company/README.rst

@@ -42,6 +42,20 @@ Imagine you have company A and company B in the same Odoo database:
 .. contents::
    :local:
 
+Use Cases / Context
+===================
+
+Imagine you have company A and company B in the same Odoo database:
+
+
+Company A purchases goods from company B.
+
+Company A will create a purchase order with company B as supplier.
+
+This module automates the creation of the sale order in company B with company A as customer.
+
+Receipt picking(s) created from Company A purchase are synced with quantities delivered in picking(s) by Company B sale.
+
 Installation
 ============
 
@@ -56,6 +70,16 @@ To configure this module, you need to:
 #. Go to the tab *Inter-Company* then the group *Purchase To Sale*.
 #. If you check the option *Sale Auto Validation* in the configuration of company B, then when you validate a *Purchase Order* in company A with company B as supplier, the *Sale Order* will be automatically validated in company B with company A as customer.
 
+Usage
+=====
+
+Create a purchase with Company A, setting Company B as vendor > confirm PO > a SO for Company B with customer Company A is created automatically.
+
+
+Validate SO for Company B > validate delivery picking > in PO for Company A, receipt picking is validated with quantities from Company B delivery picking.
+
+If backorders have been created from delivery picking, they will be synchronized to receipt picking.
+
 Known issues / Roadmap
 ======================
 

purchase_sale_inter_company/models/__init__.py

@@ -3,8 +3,3 @@
 from . import res_company
 from . import res_config
 from . import sale_order
-<<<<<<< HEAD
-=======
-from . import stock_picking
-from . import stock_move
->>>>>>> 5026d8f7 ([FIX] purchase_sale_inter_company: consider moves that contain same products)

purchase_sale_inter_company/models/res_config.py

@@ -33,4 +33,3 @@ class InterCompanyRulesConfig(models.TransientModel):
         "order in another company.",
         readonly=False,
     )
-    

purchase_sale_inter_company/models/sale_order.py

@@ -23,19 +23,6 @@ def action_confirm(self):
                     line.auto_purchase_line_id.price_unit = line.price_unit
         return super().action_confirm()
 
-    
-    def action_cancel(self):
-        purchase_orders = (
-            self.env["purchase.order"]
-            .sudo()
-            .search([("auto_sale_order_id", "in", self.ids)])
-        )
-        for po in purchase_orders:
-            if po.state not in ["draft", "sent", "cancel"]:
-                raise UserError(_("You can't cancel an order that is %s") % po.state)
-        if purchase_orders:
-            purchase_orders.button_cancel()
-        return super().action_cancel()
 
 class SaleOrderLine(models.Model):
     _inherit = "sale.order.line"