[IMP] delivery on SO
bzr revid: fp@openerp.com-20120714125456-p4qexmx4vvaka1rh
This commit is contained in:
parent
e20a88fb55
commit
7481fe8cfb
|
@ -257,15 +257,18 @@
|
||||||
<field name="inherit_id" ref="sale.view_order_form"/>
|
<field name="inherit_id" ref="sale.view_order_form"/>
|
||||||
<field name="arch" type="xml">
|
<field name="arch" type="xml">
|
||||||
<xpath expr="//group[@name='sale_total']" position="after">
|
<xpath expr="//group[@name='sale_total']" position="after">
|
||||||
<group width="50%%">
|
<group style="width: 65%%">
|
||||||
<label for="carrier_id"/>
|
<label for="carrier_id"/>
|
||||||
<div>
|
<div>
|
||||||
<field name="carrier_id" context="{'order_id':active_id or False}" class="oe_inline"/>
|
<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"
|
<button name="delivery_set" string="Add in Quote" type="object"
|
||||||
attrs="{'invisible':[('carrier_id','=',False)]}"/>
|
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>
|
</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>
|
</group>
|
||||||
</xpath>
|
</xpath>
|
||||||
</field>
|
</field>
|
||||||
|
|
Loading…
Reference in New Issue