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

[MERGE] lp:~openerp-dev/openobject-addons/trunk-red-button-purchase-tpa 

bzr revid: jam@tinyerp.com-20120613104253-heensgzj37swt3vk
This commit is contained in:
Jigar Amin - OpenERP 2012-06-13 16:12:53 +05:30
parent fc1157381c ec3144b1ca
commit 82f6efb08c
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
addons/purchase/purchase_view.xml
View File

@ -128,17 +128,17 @@
<field name="arch" type="xml">
<form string="Purchase Order" version="7.0">
<header>
<button name="purchase_confirm" states="draft,sent" string="Confirm Order" class="oe_form_button_hi"/>
<button name="purchase_confirm" states="draft,sent" string="Confirm Order" class="oe_form_button_active_flow"/>
<button name="wkf_send_rfq" states="draft" string="Send RFQ" type="object" context="{'send_rfq':True}"/>
<button name="wkf_send_rfq" states="confirmed" string="Resend Purchase Order" type="object"/>
<button name="wkf_send_rfq" states="confirmed" string="Resend Purchase Order" type="object" class="oe_form_button_active_flow"/>
<button name="action_cancel" states="except_picking,except_invoice,wait" string="Cancel" type="object" />
<button name="picking_ok" states="except_picking" string="Manually Corrected"/>
<button name="invoice_ok" states="except_invoice" string="Manually Corrected"/>
<button name="purchase_appbuyer" states="wait_auth" string="Approve Purchase" class="oe_form_button_hi"/>
<button name="purchase_approve" states="confirmed" string="Approve Order" class="oe_form_button_hi"/>
<button name="view_invoice" string="Receive Invoice" type="object" attrs="{'invisible': ['|', ('invoice_method','=','picking'), '|', ('state','!=', 'approved'), ('invoiced','=',True) ]}"/>
<button name="view_picking" string="Receive Products" type="object" attrs="{'invisible': ['|', ('shipped','=',True), ('state','!=', 'approved')]}"/>
<button name="action_cancel_draft" states="cancel,sent,confirmed" string="Set to Draft" type="object"/>
<button name="purchase_appbuyer" states="wait_auth" string="Approve Purchase" class="oe_form_button_active_flow"/>
<button name="purchase_approve" states="confirmed" string="Approve Order" class="oe_form_button_active_flow"/>
<button name="view_invoice" string="Receive Invoice" type="object" attrs="{'invisible': ['|', ('invoice_method','=','picking'), '|', ('state','!=', 'approved'), ('invoiced','=',True) ]}" class="oe_form_button_active_flow"/>
<button name="view_picking" string="Receive Products" type="object" attrs="{'invisible': ['|', ('shipped','=',True), ('state','!=', 'approved')]}" class="oe_form_button_active_flow"/>
<button name="action_cancel_draft" states="cancel,sent,confirmed" string="Set to Draft" type="object" class="oe_form_button_return_flow"/>
<button name="purchase_cancel" states="draft,confirmed,wait_auth,sent" string="Cancel"/>
<field name="state" widget="statusbar" statusbar_visible="draft,approved,done" statusbar_colors='{"except_picking":"red","except_invoice":"red","confirmed":"blue","wait":"blue"}' readonly="1"/>
</header>
@ -397,7 +397,7 @@
<form string="Purchase Order Line" version="7.0">
<label for="order_id" class="oe_form_readonly_hidden"/>
<h1>
<field name="order_id" class="oe_form_inline"/>,
<field name="order_id" class="oe_form_inline"/>,
<field name="date_order" class="oe_form_inline"/>
</h1>
<label for="partner_id" class="oe_form_readonly_hidden"/>

8
addons/purchase_requisition/purchase_requisition_view.xml
View File

@ -34,16 +34,16 @@
<field name="arch" type="xml">
<form string="Purchase Requisition" version="7.0">
<header>
<button name="tender_in_progress" states="draft" string="Start" type="object" />
<button name="tender_reset" states="done,cancel" string="Reset to Draft" type="object" />
<button name="tender_done" states="in_progress" string="Done" type="object" />
<button name="tender_in_progress" states="draft" string="Start" type="object" class="oe_form_button_active_flow"/>
<button name="tender_reset" states="done,cancel" string="Reset to Draft" type="object" class="oe_form_button_return_flow"/>
<button name="tender_done" states="in_progress" string="Done" type="object" class="oe_form_button_active_flow"/>
<button name="tender_cancel" states="draft,in_progress" string="Cancel" type="object" />
<field name="state" widget="statusbar" statusbar_visible="draft,in_progress,done" statusbar_colors='{"in_progress":"blue"}'/>
</header>
<sheet>
<label for="name" class="oe_form_readonly_hidden"/>
<h1>
<field name="name" class="oe_form_inline"/>,
<field name="name" class="oe_form_inline"/>,
<field name="origin" class="oe_form_inline"/>
</h1>
<group>