Hardik Ansodariya (OpenERP) has proposed merging
lp:~openerp-dev/openobject-addons/6.1-opw-575741-han into
lp:openobject-addons/6.1.
Requested reviews:
Naresh(OpenERP) (nch-openerp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/6.1-opw-575741-han/+merge/109777
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
--
https://code.launchpad.net/~openerp-dev/openobject-addons/6.1-opw-575741-han/+merge/109777
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/6.1-opw-575741-han.
=== 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, ...)
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
