Merge lp:~openerp-dev/openobject-addons/6.1-opw-575741-han into lp:openobject-addons/6.1

[Hardik Ansodariya (OpenERP)]

Hello,

project.py: I have removed *args and **keargs from unlink method and add context as it was not able to translate.

Referencing Maintenance case: 575741

Thanks

[Vinay Rana (OpenERP) (vra-openerp)]

The provided patch fixes the issue.

review: Approve

[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-575741-port-mma/+merge/132471 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

6809. By Hardik Ansodariya (OpenERP) on 2012-06-12

[FIX] project: Removed *args and **kwargs from unlink method and add context as it was not able to translate (Maintanence Case: 575741)

6808. By Hardik Ansodariya (OpenERP) on 2012-05-29

[IMP] Removed the string [Different inventory methods (FIFO, LIFO, ...)] from description as FIFO and LIFO methos is not available in current version of OpenERP

=== modified file 'project/project.py'
--- project/project.py	2012-03-02 15:13:47 +0000
+++ project/project.py	2012-06-12 06:34:57 +0000
@@ -149,11 +149,11 @@
                 res[id]['progress_rate'] = 0.0
         return res
 
-    def unlink(self, cr, uid, ids, *args, **kwargs):
-        for proj in self.browse(cr, uid, ids):
+    def unlink(self, cr, uid, ids, context=None):
+        for proj in self.browse(cr, uid, ids, context=context):
             if proj.tasks:
                 raise osv.except_osv(_('Operation Not Permitted !'), _('You cannot delete a project containing tasks. I suggest you to desactivate it.'))
-        return super(project, self).unlink(cr, uid, ids, *args, **kwargs)
+        return super(project, self).unlink(cr, uid, ids, context)
 
     _columns = {
         'complete_name': fields.function(_complete_name, string="Project Name", type='char', size=250),

=== modified file 'stock/__openerp__.py'
--- stock/__openerp__.py	2012-01-31 13:36:57 +0000
+++ stock/__openerp__.py	2012-06-12 06:34:57 +0000
@@ -30,7 +30,6 @@
 
 Thanks to the double entry management, the inventory controlling is powerful and flexible:
     * Moves history and planning,
-    * Different inventory methods (FIFO, LIFO, ...)
     * Stock valuation (standard or average price, ...)
     * Robustness faced with Inventory differences
     * Automatic reordering rules (stock level, JIT, ...)