[MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9677 rev-id: dle@openerp.com-20131206111336-dg01y92jvjnxy5oi

bzr revid: dle@openerp.com-20131206112312-g5vzrrna05iit5ka
This commit is contained in:
Denis Ledoux 2013-12-06 12:23:12 +01:00
commit 2888ad5772
2 changed files with 2 additions and 2 deletions

View File

@ -53,7 +53,7 @@
<!-- Add menu: Billing - Deliveries to invoice -->
<record id="outgoing_picking_list_to_invoice" model="ir.actions.act_window">
<field name="name">Deliveries to Invoice</field>
<field name="res_model">stock.picking</field>
<field name="res_model">stock.picking.out</field>
<field name="type">ir.actions.act_window</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form,calendar</field>

View File

@ -21,7 +21,7 @@
</record>
<act_window name="Create Invoice"
<act_window name="Create Draft Invoices"
res_model="stock.invoice.onshipping"
src_model="stock.picking.out"
key2="client_action_multi"