odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[IMP] access rights 

bzr revid: fp@tinyerp.com-20100625215648-gp42bbgoub9htlhd
This commit is contained in:
Fabien Pinckaers 2010-06-25 23:56:48 +02:00
parent 9e08565c10
commit 6505388521
4 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
addons/marketing/__openerp__.py
View File

@ -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,

5
addons/marketing/marketing_view.xml
View File

@ -1,8 +1,9 @@
<?xml version="1.0"?>
<openerp>
<data>
<data>
<menuitem name="Marketing" icon="terp-crm" id="marketing_menu" sequence="17"/>
<menuitem name="Marketing" icon="terp-crm" id="marketing_menu" sequence="17"
groups="group_marketing_user"/>
<record id="view_marketing_installer" model="ir.ui.view">
<field name="name">marketing.installer.view</field>

10
addons/marketing/security/marketing_security.xml Normal file
View File

@ -0,0 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data>
<record id="group_marketing_user" model="res.groups">
<field name="name">Marketing / User</field>
</record>
</data>
</openerp>

8
addons/stock/stock.py
View File

@ -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")