浏览代码

Agregar fecha de pedido en MRP.

sebas 3 年之前
父节点
当前提交
d078c628b7
共有 7 个文件被更改,包括 44 次插入11 次删除
  1. 1 1
      __openerp__.py
  2. 3 2
      models/mrp_machine.py
  3. 4 0
      models/mrp_production.py
  4. 0 1
      models/sale_order.py
  5. 28 7
      views/mrp_machine_data.xml
  6. 4 0
      views/mrp_machine_view.xml
  7. 4 0
      views/mrp_production.xml

+ 1 - 1
__openerp__.py

@@ -25,8 +25,8 @@ Funcionalidad:
 
     'data': [
         'views/mrp_machine_view.xml',
-        'views/mrp_machine_data.xml',
         'views/mrp_production.xml',
+        'views/mrp_machine_data.xml',
         'views/sale_order_view.xml'
     ],
 

+ 3 - 2
models/mrp_machine.py

@@ -24,6 +24,7 @@ from openerp.osv import orm, fields
 class mrp_machine(orm.Model):
     _name = 'mrp.machine'
     _columns = {
-        'name': fields.char('Descripción de la Maquina'),
-
+        'name': fields.char('Descripción de la Máquina'),
+        'nro_serie': fields.char('Número de Serie'),
+        'lector_clic': fields.float('Contador clic', size=15, digits=(15, 0)),
     }

+ 4 - 0
models/mrp_production.py

@@ -14,5 +14,9 @@ class MrpProduction(models.Model):
         related='move_prod_id.procurement_id.sale_line_id')
     mrp_machine_id = fields.Many2one(related='sale_line_id.mrp_machine_id',
         string='Maquina', store=True)
+    # product_name = fields.Many2one(related='sale_line_id.name',
+    #     string='Producto a Fabricar', store=True)
     partner_id = fields.Many2one(related='sale_id.partner_id',
         string='Customer', store=True)
+    date_order = fields.Datetime(related='sale_id.date_order',
+        string='Fecha del Pedido', store=True)

+ 0 - 1
models/sale_order.py

@@ -10,5 +10,4 @@ class MaqSaleOrderLine(models.Model):
         'mrp.machine',
         'Maquina',
         help='Seleccione la máquina con que se producirá la producción.',
-        ondelete='restrict',
         required=False)

+ 28 - 7
views/mrp_machine_data.xml

@@ -1,19 +1,40 @@
 <openerp>
     <data>
         <record model="mrp.machine" id="1">
-            <field name="name">Maquina 1</field>
+            <field name="name">RICOH MP C6502 - TAG</field>
         </record>
         <record model="mrp.machine" id="2">
-            <field name="name">Maquina 2</field>
+            <field name="name">RICOH MP C6502 - JFLEISCHMAN</field>
         </record>
        <record model="mrp.machine" id="3">
-            <field name="name">Maquina 3</field>
+            <field name="name">RICOH Pro C7100</field>
         </record>
         <record model="mrp.machine" id="4">
-            <field name="name">Maquina 4</field>
+            <field name="name">RICOH Pro 8120s</field>
         </record>
-      <record model="mrp.machine" id="5">
-            <field name="name">Maquina 5</field>
+        <record model="mrp.machine" id="5">
+            <field name="name">ROLAND 1440 DPI</field>
+        </record>
+        <record model="mrp.machine" id="6">
+            <field name="name">UCJV 150-160 MIMAKI UV</field>
+        </record>
+        <record model="mrp.machine" id="7">
+            <field name="name">ECO VERMILION 3,20 MTS</field>
+        </record>
+        <record model="mrp.machine" id="8">
+            <field name="name">ROUTER RUIJIE</field>
+        </record>
+       <record model="mrp.machine" id="9">
+            <field name="name">MIMAKI CORTE DE PLOTTER</field>
+        </record>
+        <record model="mrp.machine" id="10">
+            <field name="name">MIMAKI LAMINADORA EN FRIO</field>
+        </record>
+        <record model="mrp.machine" id="11">
+            <field name="name">Epson L3150</field>
+        </record>
+        <record model="mrp.machine" id="12">
+            <field name="name">Hiti DIGITAL</field>
         </record>
     </data>
-</openerp>
+</openerp>

+ 4 - 0
views/mrp_machine_view.xml

@@ -18,6 +18,8 @@
                 <form string="Maquina" version="7.0">
                   <group>
                       <field name="name"/>
+                      <field name="nro_serie"/>
+                      <field name="lector_clic"/>
                   </group>
                 </form>
             </field>
@@ -29,6 +31,8 @@
             <field name="arch" type="xml">
                 <tree string="mrp.machine">
                     <field name="name"/>
+                    <field name="nro_serie"/>
+                    <field name="lector_clic"/>
                 </tree>
             </field>
         </record>

+ 4 - 0
views/mrp_production.xml

@@ -13,6 +13,10 @@
                 <field name="sale_line_id" invisible="1"/>
                 <field name="partner_id" string="Cliente"/>
             </field>
+            <field name="origin" position="after">
+                <field name="date_order" string="Fecha de Pedido"/>
+                <!-- <field name="product_name" string="Producto a Fabricar"/> -->
+            </field>
         </field>
     </record>