Merge pull request #66 from agaldona/8.0-mrp_operations_time_control

[IMP] mrp_operations_time_control: new requirement
This commit is contained in:
Pedro M. Baeza
2015-12-14 14:23:58 +01:00
5 changed files with 18 additions and 1 deletions

View File

@@ -58,6 +58,7 @@ Contributors
* Mikel Arregi <mikelarregi@avanzosc.es>
* Oihane Crucelaegui <oihanecrucelaegi@avanzosc.es>
* Ainara Galdona <ainaragaldona@avanzosc.es>
* Pedro M. Baeza <pedro.baeza@serviciosbaeza.com>
* Ana Juaristi <ajuaristio@gmail.com>

View File

@@ -20,6 +20,7 @@
"contributors": [
"Mikel Arregi <mikelarregi@avanzosc.es>",
"Oihane Crucelaegui <oihanecrucelaegi@avanzosc.es>",
"Ainara Galdona <ainaragaldona@avanzosc.es>",
"Pedro M. Baeza <pedro.baeza@serviciosbaeza.com>",
"Ana Juaristi <ajuaristio@gmail.com>"
],
@@ -28,6 +29,7 @@
"views/operation_time_view.xml",
"views/mrp_production_view.xml",
"security/ir.model.access.csv",
"data/mrp_production_workcenter_line_workflow.xml"
],
"installable": True,
}

View File

@@ -0,0 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<openerp>
<data>
<record id="prod_trans_wc_pause_done" model="workflow.transition">
<field name="act_from" ref="mrp_operations.prod_act_wc_pause" />
<field name="act_to" ref="mrp_operations.prod_act_wc_done" />
<field name="signal">button_done</field>
</record>
</data>
</openerp>

View File

@@ -42,8 +42,9 @@ class MrpProductionWorkcenterLine(models.Model):
@api.multi
def action_done(self):
not_paused_records = self.filtered(lambda x: x.state != 'pause')
result = super(MrpProductionWorkcenterLine, self).action_done()
self._write_end_date_operation_line()
not_paused_records._write_end_date_operation_line()
return result

View File

@@ -36,6 +36,9 @@
<field name="operation_time_lines" />
</page>
</page>
<button name="button_done" position="attributes">
<attribute name="states">startworking,pause</attribute>
</button>
</field>
</record>