[REF] account_factoring_receivable_balance: merge base_factor in this…

… module
OCA · Jun 7, 2024 · 4b4621d · 4b4621d
1 parent 87d5b17
commit 4b4621d
Show file tree

Hide file tree

Showing 20 changed files with 45 additions and 684 deletions.
diff --git a/account_factoring_receivable_balance/__manifest__.py b/account_factoring_receivable_balance/__manifest__.py
@@ -13,14 +13,15 @@
         "alexis-via",
     ],
     "depends": [
-        "base_factoring",
+        "account",
     ],
     "data": [
         "security/ir.model.access.csv",
         "security/misc.xml",
-        "views/subrogation_receipt.xml",
         "views/account_journal.xml",
         "views/company.xml",
+        "views/partner.xml",
+        "views/subrogation_receipt.xml",
     ],
     "demo": [
         "views/company_demo.xml",

diff --git a/account_factoring_receivable_balance/models/account_journal.py b/account_factoring_receivable_balance/models/account_journal.py
@@ -8,7 +8,7 @@
 class AccountJournal(models.Model):
     _inherit = "account.journal"
 
-    factor_type = fields.Selection(string="Factor", selection_add=[("", "")])
+    factor_type = fields.Selection(string="Factor", selection=[("", "")])
     factoring_receivable_account_id = fields.Many2one(
         comodel_name="account.account", string="Receivable Account"
     )

diff --git a/account_factoring_receivable_balance/views/account_journal.xml b/account_factoring_receivable_balance/views/account_journal.xml
@@ -1,21 +1,36 @@
 <odoo>
 
+    <menuitem
+        id="factoring_menu"
+        parent="account.menu_finance_entries"
+        sequence="50"
+        name="Factoring"
+    />
+
     <record id="view_account_journal_form" model="ir.ui.view">
         <field name="model">account.journal</field>
-        <field name="inherit_id" ref="base_factoring.view_account_journal_form" />
+        <field name="inherit_id" ref="account.view_account_journal_form" />
         <field name="arch" type="xml">
-            <xpath expr="//page[@name='factor']" position="inside">
-                <group name="receivable_balance" string="Receiveable Balance">
-                    <group name="balance_left">
-                        <field name="factoring_receivable_account_id" />
-                        <field name="factoring_current_account_id" />
-                        <field name="factoring_holdback_account_id" />
-                    </group>
-                    <group name="balance_right">
-                        <field name="factoring_pending_recharging_account_id" />
-                        <field name="factoring_expense_account_id" />
+            <xpath
+                expr="//page[@name='bank_account']//field[@name='currency_id']"
+                position="after"
+            >
+                <field name="factor_type" invisible="type not in ('general', 'bank')" />
+            </xpath>
+            <xpath expr="//page[last()]" position="after">
+                <page name="factor" string="Factor" invisible="not factor_type">
+                    <group name="receivable_balance" string="Receiveable Balance">
+                        <group name="balance_left">
+                            <field name="factoring_receivable_account_id" />
+                            <field name="factoring_current_account_id" />
+                            <field name="factoring_holdback_account_id" />
+                        </group>
+                        <group name="balance_right">
+                            <field name="factoring_pending_recharging_account_id" />
+                            <field name="factoring_expense_account_id" />
+                        </group>
                     </group>
-                </group>
+                </page>
             </xpath>
         </field>
     </record>

diff --git a/account_factoring_receivable_balance/views/company.xml b/account_factoring_receivable_balance/views/company.xml
@@ -2,14 +2,19 @@
 
     <record id="view_company_form" model="ir.ui.view">
         <field name="model">res.company</field>
-        <field name="inherit_id" ref="base_factoring.view_company_form" />
+        <field name="inherit_id" ref="base.view_company_form" />
         <field name="arch" type="xml">
-            <xpath
-                expr="//page[@name='factor']//group[@name='config_facto']"
-                position="inside"
-            >
-                <field name="factor_config_currency_id" />
-            </xpath>
+
+            <notebook position="inside">
+                <page name="factor" string="Factor">
+                    <group name="factoring" groups="account.group_account_invoice">
+                        <group name="config_facto" string="Configuration">
+                            <field name="factor_config_currency_id" />
+                        </group>
+                    </group>
+                </page>
+            </notebook>
+
         </field>
     </record>
 

diff --git a/account_factoring_receivable_balance/views/company_demo.xml b/account_factoring_receivable_balance/views/company_demo.xml
@@ -2,7 +2,7 @@
 
     <record id="view_company_form_demo" model="ir.ui.view">
         <field name="model">res.company</field>
-        <field name="inherit_id" ref="base_factoring.view_company_form" />
+        <field name="inherit_id" ref="view_company_form" />
         <field name="priority" eval="50" />
         <field name="arch" type="xml">
             <xpath

diff --git a/base_factoring/views/partner.xml → ...ring_receivable_balance/views/partner.xml b/base_factoring/views/partner.xml → ...ring_receivable_balance/views/partner.xml
diff --git a/account_factoring_receivable_balance/views/subrogation_receipt.xml b/account_factoring_receivable_balance/views/subrogation_receipt.xml
@@ -185,7 +185,7 @@
 
 <menuitem
         id="subrogation_receipt_menu"
-        parent="base_factoring.factoring_menu"
+        parent="factoring_menu"
         action="subrogation_receipt_action"
     />
 

diff --git a/base_factoring/README.rst b/base_factoring/README.rst
diff --git a/base_factoring/__init__.py b/base_factoring/__init__.py
diff --git a/base_factoring/__manifest__.py b/base_factoring/__manifest__.py
diff --git a/base_factoring/i18n/base_factoring.pot b/base_factoring/i18n/base_factoring.pot
diff --git a/base_factoring/i18n/fr.po b/base_factoring/i18n/fr.po
diff --git a/base_factoring/models/__init__.py b/base_factoring/models/__init__.py
diff --git a/base_factoring/models/account_journal.py b/base_factoring/models/account_journal.py
diff --git a/base_factoring/pyproject.toml b/base_factoring/pyproject.toml
diff --git a/base_factoring/readme/DESCRIPTION.md b/base_factoring/readme/DESCRIPTION.md