Forráskód Böngészése

Merge pull request #26 from M22TechConsulting/add_account_import

[ADD] account import lines
FernizaM22 1 éve
szülő
commit
f453fcc4b0

+ 2 - 2
custom_import_layout/__manifest__.py

@@ -10,8 +10,8 @@
     'author': "M22",
     'website': "https://www.m22.mx",
     'category': 'Import',
-    'version': '16.0.1',
-    'depends': ['base','sale','purchase'],
+    'version': '16.0.3',
+    'depends': ['base','sale','purchase', 'account'],
     'data': [
         'security/ir.model.access.csv',
         'views/import_layout_rule.xml',

BIN
custom_import_layout/__pycache__/__init__.cpython-310.pyc


BIN
custom_import_layout/models/__pycache__/__init__.cpython-310.pyc


BIN
custom_import_layout/models/__pycache__/import_layout.cpython-310.pyc


BIN
custom_import_layout/models/__pycache__/import_layout_rule.cpython-310.pyc


BIN
custom_import_layout/models/__pycache__/import_layout_rule_line.cpython-310.pyc


+ 2 - 4
custom_import_layout/models/import_layout.py

@@ -38,10 +38,8 @@ class ImportLayput(models.TransientModel):
             }
 
     def validate_model_id(self):
-        if self.env.context.get("sale_import") and self.sudo().rule_id.main_model_id.model != "sale.order":
-            raise ValidationError("Es necesario asignar una regla relacionada a las ordenes de venta.")
-        elif self.env.context.get("purchase_import") and self.sudo().rule_id.main_model_id.model != "purchase.order":
-            raise ValidationError("Es necesario asignar una regla relacionada a las ordenes de compra.")
+        if self.env.context.get("sale_import") and self.sudo().rule_id.main_model_id.model not in  ("sale.order", "purchase.order", "account.move"):
+            raise ValidationError("Es necesario asignar una regla relacionada al modelo seleccionado")
 
     def extension_validator(self, file_name):
         name, extension = os.path.splitext(file_name)

+ 3 - 0
custom_import_layout/views/import_layout.xml

@@ -47,5 +47,8 @@
 
         <menuitem id="import_layout_purchase_menu" name="Importación de layout" parent="purchase.menu_procurement_management"
                   action="import_layout_purchase_action" sequence="200"/>
+
+        <menuitem id="import_layout_purchase_menu" name="Importación de layout" parent="account.menu_finance_configuration"
+                  action="import_layout_purchase_action" sequence="200"/>
     </data>
 </odoo>

+ 2 - 2
custom_import_layout/views/import_layout_rule.xml

@@ -28,7 +28,7 @@
                         <notebook>
                             <page string="Cabecero">
                                 <group>
-                                    <field name="main_model_id" domain="[('model','in',['sale.order','purchase.order'])]" options="{'no_create':True, 'no_open': True}"/>
+                                    <field name="main_model_id" domain="[('model','in',['sale.order','purchase.order','account.move'])]" options="{'no_create':True, 'no_open': True}"/>
                                 </group>
                                 <field name="main_columns_ids">
                                     <tree editable="bottom">
@@ -42,7 +42,7 @@
                             </page>
                             <page string="Lineas">
                                 <group>
-                                    <field name="model_id" domain="[('model','in',['sale.order.line','purchase.order.line'])]" options="{'no_create':True, 'no_open': True}"/>
+                                    <field name="model_id" domain="[('model','in',['sale.order.line','purchase.order.line','account.move.line'])]" options="{'no_create':True, 'no_open': True}"/>
                                 </group>
                                 <field name="column_ids">
                                     <tree editable="bottom">