From 650538852129d7adcf5b82ee9a03cbcbf8264427 Mon Sep 17 00:00:00 2001 From: Fabien Pinckaers Date: Fri, 25 Jun 2010 23:56:48 +0200 Subject: [PATCH] [IMP] access rights bzr revid: fp@tinyerp.com-20100625215648-gp42bbgoub9htlhd --- addons/marketing/__openerp__.py | 7 ++++--- addons/marketing/marketing_view.xml | 5 +++-- addons/marketing/security/marketing_security.xml | 10 ++++++++++ addons/stock/stock.py | 8 ++++---- 4 files changed, 21 insertions(+), 9 deletions(-) create mode 100644 addons/marketing/security/marketing_security.xml diff --git a/addons/marketing/__openerp__.py b/addons/marketing/__openerp__.py index 6db46333985..e3890ffe8f6 100644 --- a/addons/marketing/__openerp__.py +++ b/addons/marketing/__openerp__.py @@ -30,9 +30,10 @@ 'website': 'http://www.openerp.com', 'init_xml': [], 'update_xml': [ - 'marketing_view.xml', - 'security/ir.model.access.csv' - ], + 'security/marketing_security.xml', + 'security/ir.model.access.csv', + 'marketing_view.xml' + ], 'demo_xml': [], 'installable': True, 'active': False, diff --git a/addons/marketing/marketing_view.xml b/addons/marketing/marketing_view.xml index 64ea6111bd5..a3288fb471f 100644 --- a/addons/marketing/marketing_view.xml +++ b/addons/marketing/marketing_view.xml @@ -1,8 +1,9 @@ - + - + marketing.installer.view diff --git a/addons/marketing/security/marketing_security.xml b/addons/marketing/security/marketing_security.xml new file mode 100644 index 00000000000..232b3ecce79 --- /dev/null +++ b/addons/marketing/security/marketing_security.xml @@ -0,0 +1,10 @@ + + + + + + Marketing / User + + + + diff --git a/addons/stock/stock.py b/addons/stock/stock.py index 16646440685..151c21ef437 100644 --- a/addons/stock/stock.py +++ b/addons/stock/stock.py @@ -1833,10 +1833,10 @@ class stock_move(osv.osv): wf_service.trg_trigger(uid, 'stock.move', id, cr) # We should remove this - picking_obj = self.pool.get('stock.picking') - for pick in picking_obj.browse(cr, uid, picking_ids): - if len([(move.state in ('done','cancelled')) for move in pick.move_lines]) == len(pick.move_lines): - picking_obj.action_done(cr, uid, [pick.id]) + #picking_obj = self.pool.get('stock.picking') + #for pick in picking_obj.browse(cr, uid, picking_ids): + # if len([(move.state in ('done','cancelled')) for move in pick.move_lines]) == len(pick.move_lines): + # picking_obj.action_done(cr, uid, [pick.id]) for (id,name) in picking_obj.name_get(cr, uid, picking_ids): message = _('Document') + " '" + name + "' "+ _("is processed")