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

[IMP] delivery on SO 

bzr revid: fp@openerp.com-20120714125456-p4qexmx4vvaka1rh
This commit is contained in:
Fabien Pinckaers 2012-07-14 14:54:56 +02:00
parent e20a88fb55
commit 7481fe8cfb
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
addons/delivery/delivery_view.xml
View File

@ -257,15 +257,18 @@
<field name="inherit_id" ref="sale.view_order_form"/>
<field name="arch" type="xml">
<xpath expr="//group[@name='sale_total']" position="after">
<group width="50%%">
<group style="width: 65%%">
<label for="carrier_id"/>
<div>
<field name="carrier_id" context="{'order_id':active_id or False}" class="oe_inline"/>
<button name="delivery_set" states="draft" string="Charge in Sale Order" type="object"
attrs="{'invisible':[('carrier_id','=',False)]}"/>
<button name="delivery_set" string="Add in Quote" type="object"
class="oe_edit_only"
attrs="{'invisible':['|',('carrier_id','=',False),('state','not in',('draft','sent'))]}"/>
<br/>
<label string="If you don't 'Add in Quote', the delivery charges will be invoiced based on real delivery order(s)."
class="oe_edit_only"
attrs="{'invisible':['|',('carrier_id','=',False),('state','not in',('draft','sent'))]}"/>
</div>
<label string="If you do not 'Add to Sale Order', the delivery charges will be added based on the delivery order(s)." colspan="2"
attrs="{'invisible':[('carrier_id','=',False)]}"/>
</group>
</xpath>
</field>