retoques nuevos cuadros todos

models/work_order.py

@@ -37,7 +37,7 @@ class WorkOrder(models.Model):
     line_ids = fields.One2many(
         comodel_name='repair.workorderimproved.line',
         inverse_name='workorder_id',
-        string='Products delivered'
+        string='Lista de pedidos'
     )
     consumed_ids = fields.One2many(
         comodel_name='repair.workorderimproved.consumed',
@@ -60,9 +60,32 @@ class WorkOrder(models.Model):
     contacto_obra = fields.Char(
         string='Contacto de la Obra'
     )
+    nro_factura = fields.Char(
+        string='N° de factura'
+    )
     emergente = fields.Text(
         string='Pedidos adicionales y emergentes'
     )
+    pedidoline_ids = fields.One2many(
+        comodel_name='repair.pedidosorderimproved.line',
+        inverse_name='workorder_id',
+        string='Pedidos adicionales y emergentes'
+    )
+    resumenline_ids = fields.One2many(
+        comodel_name='repair.resumenorderimproved.line',
+        inverse_name='workorder_id',
+        string='Estado y resumen de trabajos'
+    )
+    calidadline_ids = fields.One2many(
+        comodel_name='repair.calidadorderimproved.line',
+        inverse_name='workorder_id',
+        string='Control de calidad, fichas y lacres'
+    )
+    sugerencialine_ids = fields.One2many(
+        comodel_name='repair.sugerenciaorderimproved.line',
+        inverse_name='workorder_id',
+        string='Sugerencias y pendientes'
+    )
     diagnostic = fields.Text(
         string='Diagnostic'
     )
@@ -216,6 +239,51 @@ class WorkOrderLine(models.Model):
     brand = fields.Char(string='Marca')
     number = fields.Char(string="Numero de serie")
 
+class PedidosOrderLine(models.Model):
+    _name = 'repair.pedidosorderimproved.line'
+    _description = 'Pedidos adicionales y emergentes'
+    _inherit = ['mail.thread', 'ir.needaction_mixin']
+
+    workorder_id = fields.Many2one(
+        comodel_name='repair.workorderimproved',
+        string='Work order improved')
+    description = fields.Char(string='Description')
+    quantity = fields.Float(string='Quantity', default=1.0)
+    brand = fields.Char(string='Marca')
+    number = fields.Char(string="Numero de serie")
+
+class ResumenOrderLine(models.Model):
+    _name = 'repair.resumenorderimproved.line'
+    _description = 'Estado y resumen de trabajos'
+    _inherit = ['mail.thread', 'ir.needaction_mixin']
+
+    workorder_id = fields.Many2one(
+        comodel_name='repair.workorderimproved',
+        string='Work order improved')
+    description = fields.Char(string='Description')
+
+class CalidadOrderLine(models.Model):
+    _name = 'repair.calidadorderimproved.line'
+    _description = 'Control de calidad, fichas y lacres'
+    _inherit = ['mail.thread', 'ir.needaction_mixin']
+
+    workorder_id = fields.Many2one(
+        comodel_name='repair.workorderimproved',
+        string='Work order improved')
+    description = fields.Char(string='Description')
+    brand = fields.Char(string='Marca')
+    number = fields.Char(string="Numero de serie")
+
+class SugerenciasOrderLine(models.Model):
+    _name = 'repair.sugerenciaorderimproved.line'
+    _description = 'Sugerencias y pendientes'
+    _inherit = ['mail.thread', 'ir.needaction_mixin']
+
+    workorder_id = fields.Many2one(
+        comodel_name='repair.workorderimproved',
+        string='Work order improved')
+    description = fields.Char(string='Description')
+    number = fields.Char(string="Numero de serie")
 
 class WorkOrderConsumed(models.Model):
     _name = 'repair.workorderimproved.consumed'

views/work_order_mejorado.xml

@@ -108,16 +108,51 @@
                                 <field name="order_date" attrs="{'readonly': [('state','=','invoiced')]}" required="1"/>
                                 <field name="planned_start_date" attrs="{'readonly': [('state','=','invoiced')]}" required="1"/>
                                 <field name="planned_end_date" attrs="{'readonly': [('state','=','invoiced')]}" required="1"/>
+                                <field name="nro_factura"/>
                             </group>
                         </group>
-                        <separator string="Causes"/>
-                        <field name="causes" placeholder="what happens to it" attrs="{'readonly': [('state','=','invoiced')]}"/>
+                        <!-- <separator string="Causes"/>
+                        <field name="causes" placeholder="what happens to it" attrs="{'readonly': [('state','=','invoiced')]}"/> -->
                         <notebook>
-                            <page string="Order Lines">
+                            <page string="Lista de pedidos">
+                                <div class="oe_title">
+                                    <h4>
+                                        <label string="A. Detalle de servicios, pedidos por cliente "/>
+                                    </h4>
+                                </div>
                                 <field name="line_ids" attrs="{'readonly': [('state','=','invoiced')]}"/>
+                                <div class="oe_title">
+                                    <h4>
+                                        <label string="B. Pedidos adicionales y emergentes"/>
+                                    </h4>
+                                </div>
+                                <field name="pedidoline_ids" attrs="{'readonly': [('state','=','invoiced')]}"/>
+                                <div class="oe_title">
+                                    <h4>
+                                        <label string="C. Estado y resumen de trabajos"/>
+                                    </h4>
+                                </div>
+                                <field name="resumenline_ids" attrs="{'readonly': [('state','=','invoiced')]}"/>
+                                <div class="oe_title">
+                                    <h4>
+                                        <label string="D. Control de calidad, fichas y lacres"/>
+                                    </h4>
+                                </div>
+                                <field name="calidadline_ids" attrs="{'readonly': [('state','=','invoiced')]}"/>
+                                <div class="oe_title">
+                                    <h4>
+                                        <label string="E. Sugerencias y pendientes"/>
+                                    </h4>
+                                </div>
+                                <field name="sugerencialine_ids" attrs="{'readonly': [('state','=','invoiced')]}"/>
+                                <div class="oe_title">
+                                    <h4>
+                                        <label string="Facturar"/>
+                                    </h4>
+                                </div> 
                                 <field name="consumed_ids" attrs="{'readonly': [('state','=','invoiced')]}"/>
                             </page>
-                            <page string="Operations">
+                            <!-- <page string="Operations">
                                 <separator string="Pedidos adicionales y emergentes"/>
                                 <field name="emergente" placeholder="describe los pedidos adicionales y emergentes..." attrs="{'readonly': [('state','=','invoiced')]}"/>
                                 <separator string="Diagnóstico y resumen de trabajo"/>
@@ -126,7 +161,7 @@
                                 <field name="actions" placeholder="describe the actions..." attrs="{'readonly': [('state','=','invoiced')]}"/>
                                 <separator string="Recomendaciones y sugerencias"/>
                                 <field name="recommendations" placeholder="describe the recommendations..." attrs="{'readonly': [('state','=','invoiced')]}"/>
-                            </page>
+                            </page> -->
                         </notebook>
                     </sheet>
                     <div class="oe_chatter">
@@ -226,6 +261,225 @@
             <field name="search_view_id" ref="search_repair_workorder_line_mejorado"/>
         </record>
 
+        <!-- pedidos -->
+
+        <!-- tree view -->
+
+        <record id="tree_repair_pedidosorder_line_mejorado" model="ir.ui.view">
+            <field name="name">repair.pedidosorder.line.mejorado.tree</field>
+            <field name="model">repair.pedidosorderimproved.line</field>
+            <field name="arch" type="xml">
+                <tree string="Pedidos Adicionales" editable="bottom">
+                    <field name="description" required="1"/>
+                    <field name="brand" string="Cantidad" required="1"/>
+                    <field name="number" string="Logrado" required="1"/>
+                </tree>
+            </field>
+        </record>
+
+        <!-- search view -->
+
+        <record id="search_repair_pedidosorder_line_mejorado" model="ir.ui.view">
+            <field name="name">repair.pedidosorder.line.mejorado.search</field>
+            <field name="model">repair.pedidosorderimproved.line</field>
+            <field name="arch" type="xml">
+                <search string="Pedidos Adicionales">
+                    <field name="description"/>
+                    <field name="quantity"/>
+                    <newline />
+                    <group expand="0" string="Agrupar por...">
+                    </group>
+                </search>
+            </field>
+        </record>
+
+        <record id="form_repair_pedidosorder_line_mejorado" model="ir.ui.view">
+            <field name="name">repair.pedidosorderimproved.line.form</field>
+            <field name="model">repair.pedidosorderimproved.line</field>
+            <field name="arch" type="xml">
+                <form string="Pedidos Adicionales">
+                    <sheet>
+                        <group>
+                            <field name="description" required="1"/>
+                            <field name="brand" required="1"/>
+                            <field name="number" required="1"/>
+                        </group>
+                    </sheet>
+                </form>
+            </field>
+        </record>
+
+        <record id="action_repair_pedidosorder_line_mejorado" model="ir.actions.act_window">
+            <field name="name">Work order line improved</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">repair.pedidosorderimproved.line</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="search_view_id" ref="search_repair_pedidosorder_line_mejorado"/>
+        </record>
+
+        <!-- estado y resumen -->
+
+        <!-- tree view -->
+
+        <record id="tree_repair_resumenorder_line_mejorado" model="ir.ui.view">
+            <field name="name">repair.resumenorder.line.mejorado.tree</field>
+            <field name="model">repair.resumenorderimproved.line</field>
+            <field name="arch" type="xml">
+                <tree string="Estado y resumen de trabajos" editable="bottom">
+                    <field name="description" required="1"/>
+                </tree>
+            </field>
+        </record>
+
+        <!-- search view -->
+
+        <record id="search_repair_resumenorder_line_mejorado" model="ir.ui.view">
+            <field name="name">repair.resumenorder.line.mejorado.search</field>
+            <field name="model">repair.resumenorderimproved.line</field>
+            <field name="arch" type="xml">
+                <search string="Estado y resumen de trabajos">
+                    <field name="description"/>
+                    <newline />
+                    <group expand="0" string="Agrupar por...">
+                    </group>
+                </search>
+            </field>
+        </record>
+
+        <record id="form_repair_resumenorder_line_mejorado" model="ir.ui.view">
+            <field name="name">repair.resumenorderimproved.line.form</field>
+            <field name="model">repair.resumenorderimproved.line</field>
+            <field name="arch" type="xml">
+                <form string="Estado y resumen de trabajos">
+                    <sheet>
+                        <group>
+                            <field name="description" required="1"/>
+                        </group>
+                    </sheet>
+                </form>
+            </field>
+        </record>
+
+        <record id="action_repair_resumenorder_line_mejorado" model="ir.actions.act_window">
+            <field name="name">Work order line improved</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">repair.resumenorderimproved.line</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="search_view_id" ref="search_repair_resumenorder_line_mejorado"/>
+        </record>
+
+        <!-- control de calidad -->
+
+        <!-- tree view -->
+
+        <record id="tree_repair_calidadorder_line_mejorado" model="ir.ui.view">
+            <field name="name">repair.calidadorder.line.mejorado.tree</field>
+            <field name="model">repair.calidadorderimproved.line</field>
+            <field name="arch" type="xml">
+                <tree string="Control de calidad, fichas y lacres" editable="bottom">
+                    <field name="description" required="1"/>
+                    <field name="brand" string="Ficha" required="1"/>
+                    <field name="number" string="Lacre" required="1"/>
+                </tree>
+            </field>
+        </record>
+
+        <!-- search view -->
+
+        <record id="search_repair_calidadorder_line_mejorado" model="ir.ui.view">
+            <field name="name">repair.calidadorder.line.mejorado.search</field>
+            <field name="model">repair.calidadorderimproved.line</field>
+            <field name="arch" type="xml">
+                <search string="Control de calidad, fichas y lacres">
+                    <field name="description"/>
+                    <newline />
+                    <group expand="0" string="Agrupar por...">
+                    </group>
+                </search>
+            </field>
+        </record>
+
+        <record id="form_repair_calidadorder_line_mejorado" model="ir.ui.view">
+            <field name="name">repair.calidadorderimproved.line.form</field>
+            <field name="model">repair.calidadorderimproved.line</field>
+            <field name="arch" type="xml">
+                <form string="Control de calidad, fichas y lacres">
+                    <sheet>
+                        <group>
+                            <field name="description" required="1"/>
+                            <field name="brand" required="1"/>
+                            <field name="number" required="1"/>
+                        </group>
+                    </sheet>
+                </form>
+            </field>
+        </record>
+
+        <record id="action_repair_calidadorder_line_mejorado" model="ir.actions.act_window">
+            <field name="name">Work order line improved</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">repair.calidadorderimproved.line</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="search_view_id" ref="search_repair_calidadorder_line_mejorado"/>
+        </record>
+
+        <!-- sugerencias y pendientes -->
+
+        <!-- tree view -->
+
+        <record id="tree_repair_sugerenciaorder_line_mejorado" model="ir.ui.view">
+            <field name="name">repair.sugerenciaorder.line.mejorado.tree</field>
+            <field name="model">repair.sugerenciaorderimproved.line</field>
+            <field name="arch" type="xml">
+                <tree string="Control de calidad, fichas y lacres" editable="bottom">
+                    <field name="description" required="1"/>
+                </tree>
+            </field>
+        </record>
+
+        <!-- search view -->
+
+        <record id="search_repair_sugerenciaorder_line_mejorado" model="ir.ui.view">
+            <field name="name">repair.sugerenciaorder.line.mejorado.search</field>
+            <field name="model">repair.sugerenciaorderimproved.line</field>
+            <field name="arch" type="xml">
+                <search string="Control de calidad, fichas y lacres">
+                    <field name="description"/>
+                    <newline />
+                    <group expand="0" string="Agrupar por...">
+                    </group>
+                </search>
+            </field>
+        </record>
+
+        <record id="form_repair_sugerenciaorder_line_mejorado" model="ir.ui.view">
+            <field name="name">repair.sugerenciaorderimproved.line.form</field>
+            <field name="model">repair.sugerenciaorderimproved.line</field>
+            <field name="arch" type="xml">
+                <form string="Control de calidad, fichas y lacres">
+                    <sheet>
+                        <group>
+                            <field name="description" required="1"/>
+                        </group>
+                    </sheet>
+                </form>
+            </field>
+        </record>
+
+        <record id="action_repair_sugerenciaorder_line_mejorado" model="ir.actions.act_window">
+            <field name="name">Work order line improved</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">repair.sugerenciaorderimproved.line</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="search_view_id" ref="search_repair_sugerenciaorder_line_mejorado"/>
+        </record>
+
+        <!-- facturar -->
+
         <record id="tree_repair_workorder_consumed_mejorado" model="ir.ui.view">
             <field name="name">repair.workorder.consumed.mejorado.tree</field>
             <field name="model">repair.workorderimproved.consumed</field>