Merge lp:~openerp-dev/openobject-addons/6.1-opw-577189-skh into lp:openobject-addons/6.1

[Somesh Khare]

Hello Sir,

[Fix]: account_invoice: when you set option Skip Draft State for Manual Entries on sale journal invoice sequence number incremented

Steps to reproduce:
1 - Install account_cancel module
2 - Set "Skip 'Draft' State for Manual Entries" on sales journal
3 - Create a new invoice and validate it (eg:invoice number 'SAJ/2012/0001')
4 - Cancel the invoice and validate it again

Get 'SAJ/2012/0002' as invoice number

This branch fixes this issue. Kindly review the branch and please share your views.

Thanks,
Somesh Khare

[lp:~openerp-dev/openobject-addons/6.1-opw-577189-skh]

6926. By Olivier Dony (Odoo) on 2012-07-31

[FIX] portal: avoid making new portal users regular Employees

The menus were properly restricted but the portal users
created through the portal wizard on Partners were
erroneously made members of the Employee and Partner Manager
groups.
+ some cleanup in the context management

6927. By Launchpad Translations on behalf of openerp on 2012-08-01

Launchpad automatic translations update.

6928. By Somesh Khare on 2012-08-01

[FIX]account_invoice: when you set option Skip Draft State for Manual Entries on sale journal invoice sequence number incremented(Case: Ref:577189)

[Naresh(OpenERP) (nch-openerp)]

review: Approve

[Naresh(OpenERP) (nch-openerp)]

Hello,

This bug was qualified as Already Fixed on Trunk (means that it was already fixed and 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

6928. By Somesh Khare on 2012-08-01

[FIX]account_invoice: when you set option Skip Draft State for Manual Entries on sale journal invoice sequence number incremented(Case: Ref:577189)

=== modified file 'account/account_invoice.py'
--- account/account_invoice.py	2012-07-04 16:33:07 +0000
+++ account/account_invoice.py	2012-08-01 06:12:20 +0000
@@ -943,13 +943,13 @@
                 for i in line:
                     i[2]['period_id'] = period_id
 
+            ctx.update(invoice=inv)
             move_id = move_obj.create(cr, uid, move, context=ctx)
             new_move_name = move_obj.browse(cr, uid, move_id, context=ctx).name
             # make the invoice point to that move
             self.write(cr, uid, [inv.id], {'move_id': move_id,'period_id':period_id, 'move_name':new_move_name}, context=ctx)
             # Pass invoice in context in method post: used if you want to get the same
             # account move reference when creating the same invoice after a cancelled one:
-            ctx.update({'invoice':inv})
             move_obj.post(cr, uid, [move_id], context=ctx)
         self._log_event(cr, uid, ids)
         return True