diff --git a/locale/ca_ES.po b/locale/ca_ES.po index 4ae994a..a181d30 100644 --- a/locale/ca_ES.po +++ b/locale/ca_ES.po @@ -30,10 +30,18 @@ msgctxt "field:production.bom.input,step:" msgid "Step" msgstr "Pas" +msgctxt "field:production.bom.input,step_sequence:" +msgid "Step Sequence" +msgstr "Ordre al pas" + msgctxt "field:production.bom.output,step:" msgid "Step" msgstr "Pas" +msgctxt "field:production.bom.output,step_sequence:" +msgid "Step Sequence" +msgstr "Ordre al pas" + msgctxt "field:production.process,active:" msgid "Active" msgstr "Actiu" @@ -154,6 +162,10 @@ msgctxt "field:production.route.operation,step:" msgid "Step" msgstr "Pas" +msgctxt "field:stock.move,production_step:" +msgid "Process" +msgstr "Procés" + msgctxt "model:ir.action,name:act_production_process" msgid "Production Process" msgstr "Process de producció" @@ -174,6 +186,14 @@ msgctxt "model:production.process.step,name:" msgid "Production Process Step" msgstr "Pas de process de producció" +msgctxt "view:production.bom.input:" +msgid "BOM Inputs" +msgstr "Entrades de la llista de materials" + +msgctxt "view:production.bom.output:" +msgid "BOM Outputs" +msgstr "Sortides de la llista de materials" + msgctxt "view:production.process.step:" msgid "Description" msgstr "Descripció" diff --git a/locale/es_ES.po b/locale/es_ES.po index 8f68962..3d42718 100644 --- a/locale/es_ES.po +++ b/locale/es_ES.po @@ -30,10 +30,18 @@ msgctxt "field:production.bom.input,step:" msgid "Step" msgstr "Paso" +msgctxt "field:production.bom.input,step_sequence:" +msgid "Step Sequence" +msgstr "Órden en el paso" + msgctxt "field:production.bom.output,step:" msgid "Step" msgstr "Paso" +msgctxt "field:production.bom.output,step_sequence:" +msgid "Step Sequence" +msgstr "Órden en el paso" + msgctxt "field:production.process,active:" msgid "Active" msgstr "Activo" @@ -154,6 +162,10 @@ msgctxt "field:production.route.operation,step:" msgid "Step" msgstr "Paso" +msgctxt "field:stock.move,production_step:" +msgid "Process" +msgstr "Proceso" + msgctxt "model:ir.action,name:act_production_process" msgid "Production Process" msgstr "Proceso de producción" @@ -174,6 +186,14 @@ msgctxt "model:production.process.step,name:" msgid "Production Process Step" msgstr "Paso de proceso de producción" +msgctxt "view:production.bom.input:" +msgid "BOM Inputs" +msgstr "Entradas lista de material" + +msgctxt "view:production.bom.output:" +msgid "BOM Outputs" +msgstr "Salidas lista de material" + msgctxt "view:production.process.step:" msgid "Description" msgstr "Descripción" diff --git a/production.py b/production.py index bf61ef1..c18ca8c 100644 --- a/production.py +++ b/production.py @@ -166,8 +166,13 @@ class Step(ModelSQL, ModelView): name = fields.Char('Name', required=True) description = fields.Text('Description') sequence = fields.Integer('Sequence') - inputs = fields.One2Many('production.bom.input', 'step', 'Inputs') - outputs = fields.One2Many('production.bom.output', 'step', 'Outputs') + inputs = fields.One2Many('production.bom.input', 'step', 'Inputs', order=[ + ('step_sequence', 'ASC'), + ]) + outputs = fields.One2Many('production.bom.output', 'step', 'Outputs', + order=[ + ('step_sequence', 'ASC'), + ]) operations = fields.One2Many('production.route.operation', 'step', 'Operations', context={ @@ -220,6 +225,7 @@ class Step(ModelSQL, ModelView): class BOMMixin: step = fields.Many2One('production.process.step', 'Step') + step_sequence = fields.Integer('Step Sequence') @classmethod def create(cls, vlist): diff --git a/production.xml b/production.xml index 3f79e85..5505a32 100644 --- a/production.xml +++ b/production.xml @@ -83,20 +83,28 @@ - - + production form production_form + + production.bom.input tree bom_input_list + + + production.bom.input + tree + bom_input_list_sequence + + production.bom.input form @@ -104,12 +112,20 @@ bom_input_form + production.bom.output tree bom_output_list + + + production.bom.output + tree + bom_output_list_sequence + + production.bom.output form diff --git a/view/bom_input_list_sequence.xml b/view/bom_input_list_sequence.xml new file mode 100644 index 0000000..2c3e52c --- /dev/null +++ b/view/bom_input_list_sequence.xml @@ -0,0 +1,8 @@ + + + + + + + diff --git a/view/bom_output_list_sequence.xml b/view/bom_output_list_sequence.xml new file mode 100644 index 0000000..957c386 --- /dev/null +++ b/view/bom_output_list_sequence.xml @@ -0,0 +1,8 @@ + + + + + + + diff --git a/view/production_process_step_form.xml b/view/production_process_step_form.xml index 6280a31..8e7e1ae 100644 --- a/view/production_process_step_form.xml +++ b/view/production_process_step_form.xml @@ -12,8 +12,10 @@ - - + +