pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge

Browse Source 
bzr revid: fp@fp-laptop-20110917172405-4bngdcci9g6zx1ru
This commit is contained in:
fp
2011-09-17 19:24:05 +02:00
parent 7bd05bc9c8 d4570a63e8
commit 5334e5d54b
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/mrp/report/mrp_production_order_view.xml
+1 -1
View File
@@ -62,7 +62,7 @@
<separator orientation="vertical"/>
<filter string="Current" icon="terp-check" domain="[('state','in',('open','draft'))]"/>
<filter icon="terp-check" string="In Production" domain="[('state','=','in_production')]"/>
<filter icon="terp-dialog-close" string="Done" domain="[('state','=','done')]"/>
<filter icon="terp-camera_test" string="Done" domain="[('state','=','done')]"/>
<separator orientation="vertical"/>
<field name="location_src_id" />
<field name="location_dest_id" />
addons/mrp_operations/mrp_operations_view.xml
+4 -4
View File
@@ -17,7 +17,7 @@
<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_pause" string="Pause" states="startworking" icon="gtk-media-pause" help="Pause Work Order"/>
<button name="button_done" string="Finished" states="startworking" icon="terp-dialog-close" help="Finish Order"/>
<button name="button_done" string="Finished" states="startworking" icon="terp-check" help="Finish Order"/>
</group>
</xpath>
</field>
@@ -35,7 +35,7 @@
<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_done" string="Finished" states="startworking" icon="terp-dialog-close"/>
<button name="button_done" string="Finished" states="startworking" icon="terp-check"/>
<field name="state"/>
</xpath>
</field>
@@ -63,7 +63,7 @@
<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-dialog-close" help="Finish Order"/>
<button name="button_done" string="Finished" states="startworking" icon="terp-check" help="Finish Order"/>
</tree>
</field>
</record>
@@ -117,7 +117,7 @@
<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_done" string="Finished" states="startworking" icon="terp-dialog-close"/>
<button name="button_done" string="Finished" states="startworking" icon="terp-check"/>
</group>
</page>
</notebook>
addons/mrp_operations/report/mrp_workorder_analysis_view.xml
+1 -1
View File
@@ -61,7 +61,7 @@
<separator orientation="vertical"/>
<filter string="Current" icon="terp-check" domain="[('state','not in',('draft','cancel','done'))]"/>
<filter icon="terp-check" string="Started" domain="[('state','=','startworking')]"/>
<filter icon="terp-dialog-close" string="Done" domain="[('state','=','done')]"/>
<filter icon="terp-camera_test" string="Done" domain="[('state','=','done')]"/>
<separator orientation="vertical"/>
<field name="product_id" />
<field name="workcenter_id"/>