odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[IMP] mrp: Improvements in views. 

bzr revid: uco@tinyerp.com-20100920072255-7kxkdk6rtezvl7ia
This commit is contained in:
uco (Open ERP) 2010-09-20 12:52:55 +05:30
parent a30dcb3e1c
commit dcdc8c35a9
10 changed files with 54 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/mrp/mrp_installer.xml
View File

@ -22,7 +22,7 @@
<attribute name='string'></attribute>
</xpath>
<xpath expr="//button[@string='Install Modules']" position="attributes">
<attribute name="string">_Configure</attribute>
<attribute name="string">Configure</attribute>
</xpath>
<group colspan="8">
<field name="stock_location"/>

20
addons/mrp/mrp_view.xml
View File

@ -85,7 +85,7 @@
<field name="group_id" widget="selection" />
</group>
<newline/>
<group expand="0" string="Group By" colspan="4" col="20">
<group expand="0" string="Group By..." colspan="4" col="20">
<filter string="Property Group" icon="terp-personal" domain="[]" context="{'group_by':'group_id'}"/>
</group>
</search>
@ -190,7 +190,7 @@
<field name="resource_type"/>
</group>
<newline/>
<group expand="0" string="Group By" colspan="4" col="20" groups="base.group_extended">
<group expand="0" string="Group By..." colspan="4" col="20" groups="base.group_extended">
<filter string="Resource" icon="terp-personal" domain="[]" context="{'group_by':'resource_id'}"/>
<separator orientation="vertical"/>
<filter string="Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'resource_type'}"/>
@ -375,7 +375,7 @@
<field name="company_id" groups="base.group_multi_company"/>
</group>
<newline/>
<group expand="0" string="Group By" colspan="4" col="8" groups="base.group_extended">
<group expand="0" string="Group By..." colspan="4" col="8" groups="base.group_extended">
<filter string="Product" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'product_id'}"/>
<filter string='Default UOM' icon="terp-mrp" domain="[]" context="{'group_by' : 'product_uom'}" />
<separator orientation="vertical"/>
@ -644,12 +644,12 @@
<group col="9" colspan="4">
<field name="state"/>
<button name="action_compute" states="draft" string="Compute Data" type="object" icon="terp-stock_format-scientific"/>
<button name="button_confirm" states="draft" string="Co_nfirm Production" icon="gtk-apply"/>
<button name="button_produce" states="ready" string="S_tart Production" icon="terp-gtk-jump-to-ltr"/>
<button name="%(act_mrp_product_produce)d" states="in_production" string="Pro_duce" icon="gtk-ok" type="action"/>
<button name="force_production" states="confirmed,picking_except" string="Force _Reservation" type="object" icon="gtk-jump-to"/>
<button name="button_cancel" states="draft,ready,confirmed,in_production,picking_except" string="_Cancel" icon="gtk-stop"/>
<button name="button_recreate" states="picking_except" string="Recreate P_icking" icon="terp-document-new"/>
<button name="button_confirm" states="draft" string="Confirm Production" icon="gtk-apply"/>
<button name="button_produce" states="ready" string="Start Production" icon="terp-gtk-jump-to-ltr"/>
<button name="%(act_mrp_product_produce)d" states="in_production" string="Produce" icon="gtk-ok" type="action"/>
<button name="force_production" states="confirmed,picking_except" string="Force Reservation" type="object" icon="gtk-jump-to"/>
<button name="button_cancel" states="draft,ready,confirmed,in_production,picking_except" string="Cancel" icon="gtk-stop"/>
<button name="button_recreate" states="picking_except" string="Recreate Picking" icon="terp-document-new"/>
</group>
</page>
<page string="Finished Products">
@ -751,7 +751,7 @@
<field name="origin"/>
</group>
<newline/>
<group expand="0" string="Group By" colspan="10" col="8">
<group expand="0" string="Group By..." colspan="10" col="8">
<filter string="Product" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'product_id'}"/>
<separator orientation="vertical"/>
<filter string="Routing" icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'routing_id'}" groups="base.group_extended"/>

14
addons/mrp/report/mrp_production_order_view.xml
View File

@ -48,18 +48,18 @@
<field name="arch" type="xml">
<search string="Search">
<group col="16" colspan="6">
<filter icon="terp-go-year" string="This Year"
<filter icon="terp-go-year" string="Year"
domain="[('year','=',time.strftime('%%Y'))]"
help="Production performed in last 365 Days"/>
<filter icon="terp-go-month" string="This Month"
help="Production performed during current year"/>
<filter icon="terp-go-month" string="Month"
name="month"
domain="[('month','=',time.strftime('%%m'))]"
help="Production performed in last 30 days"/>
help="Production performed during current month"/>
<filter icon="terp-go-week"
string="Month -1"
separator="1"
domain="[('date_start','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date_start','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"
help="Production during last 7 days"/>
help="Production during last month"/>
<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')]"/>
@ -70,7 +70,7 @@
</group>
<newline/>
<group expand="0" string="Group By">
<group expand="0" string="Group By...">
<filter string="Raw Material Location" icon="terp-gtk-jump-to-rtl" context="{'group_by':'location_src_id'}"/>
<filter string="Finished Products Location" icon="terp-gtk-jump-to-ltr" context="{'group_by':'location_dest_id'}"/>
<separator orientation="vertical"/>
@ -88,7 +88,7 @@
<filter string="Year" icon="terp-go-year" context="{'group_by':'year'}"/>
</group>
<newline/>
<group expand="0" string="Extended Filters" groups="base.group_extended">
<group expand="0" string="Extended Filters..." groups="base.group_extended">
<filter icon="terp-emblem-important" string="Picking Exception" domain="[('state','=','picking_except')]"/>
<filter icon="terp-gtk-media-pause" string="Waiting Goods" domain="[('state','=','confirmed')]"/>
<filter icon="terp-camera_test" string="Ready to Produce" domain="[('state','=','ready')]"/>

4
addons/mrp/wizard/change_production_qty_view.xml
View File

@ -17,8 +17,8 @@
<separator colspan="4"/>
<group col="2" colspan="4">
<button icon='gtk-stop' special="cancel"
string="_Cancel" />
<button name="change_prod_qty" string="_Approve"
string="Cancel" />
<button name="change_prod_qty" string="Approve"
colspan="1" type="object" icon="gtk-ok" />
</group>
</form>

4
addons/mrp/wizard/mrp_price_view.xml
View File

@ -16,8 +16,8 @@
<separator string="" colspan="4"/>
<group col="2" colspan="4">
<button icon='gtk-stop' special="cancel"
string="_Cancel" />
<button name="print_report" string="_Print"
string="Cancel" />
<button name="print_report" string="Print"
colspan="1" type="object" icon="gtk-print" />
</group>
</form>

4
addons/mrp/wizard/mrp_product_produce_view.xml
View File

@ -19,8 +19,8 @@
<label string="" colspan="2" />
<group col="2" colspan="1">
<button icon='gtk-stop' special="cancel"
string="_Cancel" />
<button name="do_produce" string="Con_firm"
string="Cancel" />
<button name="do_produce" string="Confirm"
colspan="1" type="object" icon="gtk-ok" />
</group>
</form>

4
addons/mrp/wizard/mrp_workcenter_load_view.xml
View File

@ -16,8 +16,8 @@
<newline/>
<group col="2" colspan="4">
<button icon='gtk-stop' special="cancel"
string="_Cancel" />
<button name="print_report" string="_Print"
string="Cancel" />
<button name="print_report" string="Print"
colspan="1" type="object" icon="gtk-print" />
</group>
</form>

26
addons/mrp_operations/mrp_operations_view.xml
View File

@ -32,12 +32,12 @@
<field name="inherit_id" ref="mrp.mrp_production_form_view"/>
<field name="arch" type="xml">
<xpath expr="/form/notebook/page/field[@name='workcenter_lines']/tree/field[@name='hour']" position="after">
<button name="button_draft" string="Set _Draft" states="cancel" icon="gtk-convert"/>
<button name="button_start_working" string="S_tart" states="draft" icon="terp-gtk-jump-to-ltr"/>
<button name="button_resume" string="_Resume" states="pause" icon="gtk-media-pause"/>
<button name="button_cancel" string="_Cancel" states="draft,startworking" icon="gtk-stop"/>
<button name="button_pause" string="P_ause" states="startworking" icon="gtk-media-pause"/>
<button name="button_done" string="F_inished" states="startworking" icon="terp-dialog-close"/>
<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_cancel" string="Cancel" states="draft,startworking" icon="gtk-stop"/>
<button name="button_pause" string="Pause" states="startworking" icon="gtk-media-pause"/>
<button name="button_done" string="Finished" states="startworking" icon="terp-dialog-close"/>
<field name="state"/>
</xpath>
</field>
@ -114,12 +114,12 @@
<separator string="" colspan="4"/>
<group colspan="8" col="8">
<field name="state"/>
<button name="button_draft" string="Set _Draft" states="cancel" icon="gtk-convert"/>
<button name="button_start_working" string="S_tart" states="draft" icon="terp-gtk-jump-to-ltr"/>
<button name="button_resume" string="_Resume" states="pause" icon="gtk-media-pause"/>
<button name="button_cancel" string="_Cancel" states="draft,startworking" icon="gtk-stop"/>
<button name="button_pause" string="P_ause" states="startworking" icon="gtk-media-pause"/>
<button name="button_done" string="F_inished" states="startworking" icon="terp-dialog-close"/>
<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_cancel" string="Cancel" states="draft,startworking" icon="gtk-stop"/>
<button name="button_pause" string="Pause" states="startworking" icon="gtk-media-pause"/>
<button name="button_done" string="Finished" states="startworking" icon="terp-dialog-close"/>
</group>
</page>
</notebook>
@ -153,7 +153,7 @@
<field name="date_planned" widget="date"/>
</group>
<newline/>
<group expand="0" string="Group By" colspan="10" col="8" groups="base.group_extended">
<group expand="0" string="Group By..." colspan="10" col="8" groups="base.group_extended">
<filter string="Workcenter" icon="terp-go-home" domain="[]" context="{'group_by':'workcenter_id'}"/>
<filter string="Production" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'production_id'}"/>
<separator orientation="vertical"/>

24
addons/mrp_repair/mrp_repair_view.xml
View File

@ -98,17 +98,17 @@
<separator string="" colspan="4"/>
<group col="13" colspan="4">
<field name="state"/>
<button name="repair_confirm" states="draft" string="Co_nfirm Repair" icon="terp-camera_test"/>
<button name="repair_ready" states="confirmed" string="Start _Repair" icon="terp-gtk-jump-to-ltr"/>
<button name="action_repair_start" states="ready" string="Start _Repair" icon="terp-gtk-jump-to-ltr"/>
<button name="action_repair_end" states="under_repair" string="_End Repair" icon="terp-dialog-close"/>
<button name="invoice_recreate" states="invoice_except" string="_Recreate Invoice" icon="terp-dolar"/>
<button name="invoice_corrected" states="invoice_except" string="_Invoice Corrected" icon="terp-emblem-important"/>
<button name="action_invoice_create" states="2binvoiced" string="Make _Invoice" icon="terp-dolar"/>
<button name="%(action_cancel_repair)d" states="invoice_except" string="_Cancel Repair" type="action" icon="gtk-stop"/>
<button name="action_cancel_draft" states="cancel" string="Set to _Draft" type="object" icon="gtk-convert"/>
<button name="cancel" states="draft" string="_Cancel Repair" icon="gtk-stop"/>
<button name="%(action_cancel_repair)d" states="confirmed,2binvoiced,ready,under_repair" string="_Cancel Repair" type="action" icon="gtk-stop"/>
<button name="repair_confirm" states="draft" string="Confirm Repair" icon="terp-camera_test"/>
<button name="repair_ready" states="confirmed" string="Start Repair" icon="terp-gtk-jump-to-ltr"/>
<button name="action_repair_start" states="ready" string="Start Repair" icon="terp-gtk-jump-to-ltr"/>
<button name="action_repair_end" states="under_repair" string="End Repair" icon="terp-dialog-close"/>
<button name="invoice_recreate" states="invoice_except" string="Recreate Invoice" icon="terp-dolar"/>
<button name="invoice_corrected" states="invoice_except" string="Invoice Corrected" icon="terp-emblem-important"/>
<button name="action_invoice_create" states="2binvoiced" string="Make Invoice" icon="terp-dolar"/>
<button name="%(action_cancel_repair)d" states="invoice_except" string="Cancel Repair" type="action" icon="gtk-stop"/>
<button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object" icon="gtk-convert"/>
<button name="cancel" states="draft" string="Cancel Repair" icon="gtk-stop"/>
<button name="%(action_cancel_repair)d" states="confirmed,2binvoiced,ready,under_repair" string="Cancel Repair" type="action" icon="gtk-stop"/>
</group>
</page>
<page string="Invoicing">
@ -190,7 +190,7 @@
<field name="state" />
</group>
<newline/>
<group expand="0" string="Group By" colspan="10" col="8" groups="base.group_extended">
<group expand="0" string="Group By..." colspan="10" col="8" groups="base.group_extended">
<filter string="Partner" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/>
<separator orientation="vertical"/>
<filter string="Product" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'product_id'}"/>

6
addons/resource/resource_view.xml
View File

@ -17,7 +17,7 @@
<field name="company_id" widget="selection" groups="base.group_multi_company"/>
</group>
<newline/>
<group expand="0" string="Group By" colspan="4" col="20" groups="base.group_extended">
<group expand="0" string="Group By..." colspan="4" col="20" groups="base.group_extended">
<filter string="User" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
<separator orientation="vertical"/>
<filter string="Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'resource_type'}"/>
@ -42,7 +42,7 @@
<field name="company_id" widget="selection" groups="base.group_multi_company"/>
</group>
<newline/>
<group expand="0" string="Group By" colspan="4" col="20">
<group expand="0" string="Group By..." colspan="4" col="20">
<filter string="Manager" icon="terp-personal" domain="[]" context="{'group_by':'manager'}"/>
</group>
</search>
@ -62,7 +62,7 @@
<field name="calendar_id" string="Working Time" widget="selection"/>
</group>
<newline/>
<group expand="0" string="Group By" colspan="4" col="20">
<group expand="0" string="Group By..." colspan="4" col="20">
<filter string="Resource" icon="terp-personal" domain="[]" context="{'group_by':'resource_id'}"/>
<separator orientation="vertical"/>
<filter string="Company" icon="terp-go-home" domain="[]" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>