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

small fixes 

bzr revid: fp@tinyerp.com-20101018152641-ui9wrnop052jb14r
This commit is contained in:
Fabien Pinckaers 2010-10-18 17:26:41 +02:00
parent 4e9fac6337
commit b9dd925c8f
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/sale/sale.py
View File

@ -237,7 +237,7 @@ class sale_order(osv.osv):
('prepaid', 'Payment Before Delivery'),
('manual', 'Shipping & Manual Invoice'),
('postpaid', 'Invoice on Order After Delivery'),
('picking', 'Invoice from Picking'),
('picking', 'Invoice from Delivery'),
], 'Shipping Policy', required=True, readonly=True, states={'draft': [('readonly', False)]},
help="""The Shipping Policy is used to synchronise invoice and delivery operations.
- The 'Pay before delivery' choice will first generate the invoice and then generate the picking order after the payment of this invoice.

4
addons/stock/stock_view.xml
View File

@ -726,9 +726,7 @@
<button name="action_assign" states="confirmed" string="Check Availability" type="object" icon="gtk-find"/>
<button name="force_assign" states="confirmed" string="Force Availability" type="object" icon="gtk-jump-to"/>
<button name="%(action_partial_picking)d" states="assigned" string="Process" type="action" icon="gtk-go-forward"/>
<group colspan="1" states="done">
<button name="%(action_stock_invoice_onshipping)d" string="Create Invoice" type="action" icon="terp-gtk-go-back-rtl" attrs="{'invisible':[('invoice_state','!=','2binvoiced')]}"/>
</group>
<button states="done" name="%(action_stock_invoice_onshipping)d" string="Create Invoice" type="action" icon="terp-gtk-go-back-rtl" attrs="{'invisible':[('invoice_state','!=','2binvoiced')]}"/>
</group>
</page>
<page string="Additional info" groups="base.group_extended,base.group_multi_company">