Ravish Murari(OpenERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-polish2_mrp_operation-rmu into
lp:openobject-addons.
Requested reviews:
Amit (Open ERP) (apa-tiny)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-polish2_mrp_operation-rmu/+merge/82109
Hello sir
I have done following task..
1.In Work orders tab of Manufacturing Orders, move buttons of the one to many
to the end of the line
2. In work order menu item,
2.1 the start and cancel buttons have no effects
2.2 rename the state pause and the pause button tooltip into "Pending"
2.3 the cancel button should not be in the list view
Thanks
Ravish
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-polish2_mrp_operation-rmu/+merge/82109
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-polish2_mrp_operation-rmu.
=== modified file 'mrp/mrp_view.xml'
--- mrp/mrp_view.xml 2011-11-09 18:12:56 +0000
+++ mrp/mrp_view.xml 2011-11-14 09:32:27 +0000
@@ -747,28 +747,6 @@
</tree>
</field>
</page>
- <page string="Work Orders" groups="base.group_extended">
- <button name="action_compute" states="draft"
- string="Compute Data" type="object"
- icon="terp-stock_format-scientific"
- colspan="2" />
- <field colspan="4" name="workcenter_lines" nolabel="1">
- <form string="Production Work Centers">
- <field colspan="4" name="name"/>
- <field name="workcenter_id" widget="selection"/>
- <field name="sequence"/>
- <field name="cycle"/>
- <field name="hour"/>
- </form>
- <tree string="Production Work Centers">
- <field name="sequence"/>
- <field name="name"/>
- <field name="workcenter_id" widget="selection"/>
- <field name="cycle"/>
- <field name="hour"/>
- </tree>
- </field>
- </page>
<page string="Scheduled Products">
<button name="action_compute" states="draft"
string="Compute Data" type="object"
@@ -786,6 +764,28 @@
<field name="picking_id" groups="base.group_extended"/>
<field name="move_prod_id" groups="base.group_extended"/>
</page>
+ <page string="Work Orders" groups="base.group_extended">
+ <button name="action_compute" states="draft"
+ string="Compute Data" type="object"
+ icon="terp-stock_format-scientific"
+ colspan="2" />
+ <field colspan="4" name="workcenter_lines" nolabel="1">
+ <form string="Production Work Centers">
+ <field colspan="4" name="name"/>
+ <field name="workcenter_id" widget="selection"/>
+ <field name="sequence"/>
+ <field name="cycle"/>
+ <field name="hour"/>
+ </form>
+ <tree string="Production Work Centers">
+ <field name="sequence"/>
+ <field name="name"/>
+ <field name="workcenter_id" widget="selection"/>
+ <field name="cycle"/>
+ <field name="hour"/>
+ </tree>
+ </field>
+ </page>
</notebook>
</form>
</field>
=== modified file 'mrp_operations/mrp_operations.py'
--- mrp_operations/mrp_operations.py 2011-10-16 01:28:00 +0000
+++ mrp_operations/mrp_operations.py 2011-11-14 09:32:27 +0000
@@ -86,10 +86,10 @@
_order = "sequence, date_planned"
_columns = {
- 'state': fields.selection([('draft','Draft'),('startworking', 'In Progress'),('pause','Pause'),('cancel','Cancelled'),('done','Finished')],'State', readonly=True,
+ 'state': fields.selection([('draft','Draft'),('startworking', 'In Progress'),('pause','Pending'),('cancel','Cancelled'),('done','Finished')],'State', readonly=True,
help="* When a work order is created it is set in 'Draft' state.\n" \
"* When user sets work order in start mode that time it will be set in 'In Progress' state.\n" \
- "* When work order is in running mode, during that time if user wants to stop or to make changes in order then can set in 'Pause' state.\n" \
+ "* When work order is in running mode, during that time if user wants to stop or to make changes in order then can set in 'Pending' state.\n" \
"* When the user cancels the work order it will be set in 'Canceled' state.\n" \
"* When order is completely processed that time it is set in 'Finished' state."),
'date_start_date': fields.function(_get_date_date, string='Start Date', type='date'),
=== modified file 'mrp_operations/mrp_operations_view.xml'
--- mrp_operations/mrp_operations_view.xml 2011-10-16 01:28:00 +0000
+++ mrp_operations/mrp_operations_view.xml 2011-11-14 09:32:27 +0000
@@ -61,7 +61,6 @@
<button name="button_draft" string="Set Draft" states="cancel" icon="gtk-convert" help="Set to Draft"/>
<button name="button_start_working" string="Start" states="draft" icon="terp-gtk-jump-to-ltr" help="Start Working"/>
<button name="button_resume" string="Resume" states="pause" icon="gtk-media-pause" help="Resume Work Order"/>
- <button name="button_cancel" string="Cancel" states="draft,startworking" icon="gtk-stop" help="Cancel Order"/>
<button name="button_pause" string="Pause" states="startworking" icon="gtk-media-pause" help="Pause Work Order"/>
<button name="button_done" string="Finished" states="startworking" icon="terp-check" help="Finish Order"/>
</tree>
@@ -116,7 +115,7 @@
<button name="button_draft" string="Set Draft" states="cancel" icon="gtk-convert"/>
<button name="button_start_working" string="Start" states="draft" icon="terp-gtk-jump-to-ltr"/>
<button name="button_resume" string="Resume" states="pause" icon="gtk-media-pause"/>
- <button name="button_pause" string="Pause" states="startworking" icon="gtk-media-pause"/>
+ <button name="button_pause" string="Pending" states="startworking" icon="gtk-media-pause"/>
<button name="button_done" string="Finished" states="startworking" icon="terp-check"/>
</group>
</page>
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
