From adcf0dd518360016e291aa9d7e8ebe92d6742c9d Mon Sep 17 00:00:00 2001 From: "diego.barreto" <diego.barreto@eynes.com.ar> Date: Tue, 4 Jun 2024 14:49:13 -0300 Subject: [PATCH 1/5] [ADD][T4500] dnrp field in company model --- tecnitower_custom/__manifest__.py | 6 ++++-- tecnitower_custom/models/res_company.py | 1 + tecnitower_custom/report/stock_picking_qweb.xml | 2 +- tecnitower_custom/views/res_company_views.xml | 15 +++++++++++++++ ...k_picking_view.xml => stock_picking_views.xml} | 0 5 files changed, 21 insertions(+), 3 deletions(-) create mode 100644 tecnitower_custom/views/res_company_views.xml rename tecnitower_custom/views/{stock_picking_view.xml => stock_picking_views.xml} (100%) diff --git a/tecnitower_custom/__manifest__.py b/tecnitower_custom/__manifest__.py index c15929b..86ed87a 100644 --- a/tecnitower_custom/__manifest__.py +++ b/tecnitower_custom/__manifest__.py @@ -24,14 +24,16 @@ 'description': 'Tecnitower Custom', 'category': '', 'depends': [ + 'base', 'stock', 'l10n_ar_eynes', 'delivery', ], 'data': [ - 'views/stock_picking_view.xml', - 'report/stock_picking_qweb.xml', + 'views/stock_picking_views.xml', 'views/res_config_settigs_views.xml', + 'views/res_company_views.xml', + 'report/stock_picking_qweb.xml', ], 'installable': True, 'application': True, diff --git a/tecnitower_custom/models/res_company.py b/tecnitower_custom/models/res_company.py index 5bf1312..fc512d4 100644 --- a/tecnitower_custom/models/res_company.py +++ b/tecnitower_custom/models/res_company.py @@ -7,3 +7,4 @@ class ResCompany(models.Model): autoprinter_num = fields.Char(string="Autoprinter Number") autoprinter_code = fields.Char(string="Autoprinter Code") autoprinter_due_date = fields.Date(string="Autoprinter Due Date") + dnrp_num = fields.Char(string="DNRP number", size=100) diff --git a/tecnitower_custom/report/stock_picking_qweb.xml b/tecnitower_custom/report/stock_picking_qweb.xml index 9e23c1f..aace41d 100644 --- a/tecnitower_custom/report/stock_picking_qweb.xml +++ b/tecnitower_custom/report/stock_picking_qweb.xml @@ -96,7 +96,7 @@ <br/> Inicio de Actividades: <span style="font-weight: normal;">02/10/1995</span> <br/> - DNRP No: <span style="font-weight: normal;">65921230</span> + DNRP No: <span style="font-weight: normal;" t-esc="o.company_id.dnrp_num"/> </div> </td> </tr> diff --git a/tecnitower_custom/views/res_company_views.xml b/tecnitower_custom/views/res_company_views.xml new file mode 100644 index 0000000..979b746 --- /dev/null +++ b/tecnitower_custom/views/res_company_views.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="utf-8"?> +<odoo> + + <record id="res_company_inherit_tecnitower_custom" model="ir.ui.view"> + <field name="name">res.company.inherit.tecnitower.custom</field> + <field name="model">res.company</field> + <field name="inherit_id" ref="base.view_company_form"/> + <field name="arch" type="xml"> + <xpath expr="//field[@name='currency_id']" position="after"> + <field name="dnrp_num" /> + </xpath> + </field> + </record> + +</odoo> diff --git a/tecnitower_custom/views/stock_picking_view.xml b/tecnitower_custom/views/stock_picking_views.xml similarity index 100% rename from tecnitower_custom/views/stock_picking_view.xml rename to tecnitower_custom/views/stock_picking_views.xml -- GitLab From 81f5d590d7f4b48e61d4c499ebc4c96cb5af2c1e Mon Sep 17 00:00:00 2001 From: "diego.barreto" <diego.barreto@eynes.com.ar> Date: Tue, 4 Jun 2024 14:53:32 -0300 Subject: [PATCH 2/5] [ADD][T4500] translation field --- tecnitower_custom/i18n/es_AR.po | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tecnitower_custom/i18n/es_AR.po b/tecnitower_custom/i18n/es_AR.po index 2b9a225..cbec85d 100644 --- a/tecnitower_custom/i18n/es_AR.po +++ b/tecnitower_custom/i18n/es_AR.po @@ -34,3 +34,8 @@ msgstr "Fecha de Vencimiento Autorizado Autoimpresor" #: model_terms:ir.ui.view,arch_db:tecnitower_custom.res_config_settings_view_form_inherit_tecnitower_custom msgid "Auto Print Configuration" msgstr "Configuracion Autorizado Autoimpresor" + +#. module: tecnitower_custom +#: model:ir.model.fields,field_description:tecnitower_custom.field_res_company__dnrp_num +msgid "DNRP number" +msgstr "DNRP" -- GitLab From f184d92dcdbc2d40e36273f5831218298555a247 Mon Sep 17 00:00:00 2001 From: "diego.barreto" <diego.barreto@eynes.com.ar> Date: Fri, 7 Jun 2024 16:59:53 -0300 Subject: [PATCH 3/5] Solve conflicts --- tecnitower_custom/__manifest__.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tecnitower_custom/__manifest__.py b/tecnitower_custom/__manifest__.py index 86ed87a..8fc3bd0 100644 --- a/tecnitower_custom/__manifest__.py +++ b/tecnitower_custom/__manifest__.py @@ -30,10 +30,11 @@ 'delivery', ], 'data': [ - 'views/stock_picking_views.xml', + 'views/stock_picking_view.xml', + 'report/stock_picking_qweb.xml', 'views/res_config_settigs_views.xml', + 'report/account_move_qweb.xml', 'views/res_company_views.xml', - 'report/stock_picking_qweb.xml', ], 'installable': True, 'application': True, -- GitLab From cfbb3aa12c2d2390bf78172640645c2ac4f817d0 Mon Sep 17 00:00:00 2001 From: "diego.barreto" <diego.barreto@eynes.com.ar> Date: Fri, 7 Jun 2024 17:03:00 -0300 Subject: [PATCH 4/5] Solve conflicts --- tecnitower_custom/__manifest__.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tecnitower_custom/__manifest__.py b/tecnitower_custom/__manifest__.py index c6b4098..0aa03d4 100644 --- a/tecnitower_custom/__manifest__.py +++ b/tecnitower_custom/__manifest__.py @@ -29,9 +29,10 @@ 'delivery', ], 'data': [ - 'views/stock_picking_view.xml', - 'report/stock_picking_qweb.xml', + 'views/stock_picking_views.xml', 'views/res_config_settigs_views.xml', + 'views/res_company_views.xml', + 'report/stock_picking_qweb.xml', 'report/account_move_qweb.xml', ], 'installable': True, -- GitLab From 3dc093cf24e1e73207004aea4a60b3b780dbe9d0 Mon Sep 17 00:00:00 2001 From: "diego.barreto" <diego.barreto@eynes.com.ar> Date: Fri, 7 Jun 2024 17:04:08 -0300 Subject: [PATCH 5/5] Solve conflicts --- tecnitower_custom/__manifest__.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tecnitower_custom/__manifest__.py b/tecnitower_custom/__manifest__.py index 8fc3bd0..73069e9 100644 --- a/tecnitower_custom/__manifest__.py +++ b/tecnitower_custom/__manifest__.py @@ -30,11 +30,11 @@ 'delivery', ], 'data': [ - 'views/stock_picking_view.xml', - 'report/stock_picking_qweb.xml', + 'views/stock_picking_views.xml', 'views/res_config_settigs_views.xml', - 'report/account_move_qweb.xml', 'views/res_company_views.xml', + 'report/stock_picking_qweb.xml', + 'report/account_move_qweb.xml', ], 'installable': True, 'application': True, -- GitLab