Merge lp:~openerp-dev/openobject-addons/6.1-opw-580457-rgo into lp:openobject-addons/6.1

[Ravi Gohil (OpenERP)]

Hello,

Find the steps to reproduce the issue in bug report lp:1066127

Thanks.

[Alexis de Lattre (alexis-via)]

See my comment #3 on the bug report, in which I give my opinion about this merge proposal :

https://bugs.launchpad.net/openobject-addons/+bug/1066127?comments=all

[lp:~openerp-dev/openobject-addons/6.1-opw-580457-rgo]

7030. By Olivier Dony (Odoo) on 2012-10-16

[FIX] wiki: remove unused 6.0 web addon components - web API was rewritten from scratch in 6.1

7031. By Launchpad Translations on behalf of openerp on 2012-10-17

Launchpad automatic translations update.

7032. By Alexis de Lattre on 2012-10-17

[FIX] stock: The 'Return Products' wizard in 'Delivery Orders' doesn't take into account the field 'Invoicing' : (Maintenance Case : 580457)

[Naresh(OpenERP) (nch-openerp)]

Hello,

This bug was qualified as Confirmed on Trunk (means still existing and reproducible). A Merge Proposal for trunk was created to fix it. Here is the link to follow the MP on Launchpad https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-opw-580457-port-mma/+merge/136145 and be informed once it's been merged in trunk: ... If this Merge Proposal could not be merged in v6.1 at the release of v7.0, it will be closed.

Thanks,
Naresh Soni

Unmerged revisions

7032. By Alexis de Lattre on 2012-10-17

[FIX] stock: The 'Return Products' wizard in 'Delivery Orders' doesn't take into account the field 'Invoicing' : (Maintenance Case : 580457)

=== modified file 'stock/stock.py'
--- stock/stock.py	2012-10-05 07:47:57 +0000
+++ stock/stock.py	2012-10-17 05:41:38 +0000
@@ -697,7 +697,7 @@
             default['name'] = self.pool.get('ir.sequence').get(cr, uid, seq_obj_name)
             default['origin'] = ''
             default['backorder_id'] = False
-        if picking_obj.invoice_state == 'invoiced':
+        if 'invoice_state' not in default and picking_obj.invoice_state == 'invoiced':
             default['invoice_state'] = '2binvoiced'
         res=super(stock_picking, self).copy(cr, uid, id, default, context)
         if res: