diff --git a/__unported__/mass_editing/mass_editing_view.xml b/__unported__/mass_editing/mass_editing_view.xml
deleted file mode 100644
index 0a51891ad95..00000000000
--- a/__unported__/mass_editing/mass_editing_view.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-
-
-
-
-
- mass.object.form
- mass.object
-
-
-
-
-
-
- mass.object.tree
- mass.object
-
-
-
-
-
-
-
-
-
- Mass Editing
- mass.object
- form
- tree,form
-
-
-
-
-
- tree
-
-
-
-
-
- form
-
-
-
-
-
-
-
-
-
-
diff --git a/__unported__/mass_editing/ChangeLog.txt b/mass_editing/ChangeLog.txt
similarity index 100%
rename from __unported__/mass_editing/ChangeLog.txt
rename to mass_editing/ChangeLog.txt
diff --git a/__unported__/mass_editing/wizard/__init__.py b/mass_editing/__init__.py
similarity index 83%
rename from __unported__/mass_editing/wizard/__init__.py
rename to mass_editing/__init__.py
index dc5322f1789..686e4a83af1 100644
--- a/__unported__/mass_editing/wizard/__init__.py
+++ b/mass_editing/__init__.py
@@ -2,7 +2,8 @@
##############################################################################
#
# This module uses OpenERP, Open Source Management Solution Framework.
-# Copyright (C) 2012-Today Serpent Consulting Services ()
+# Copyright (C):
+# 2012-Today Serpent Consulting Services (",
+ ],
"category": "Tools",
"website": "http://www.serpentcs.com",
"description": """
-This module provides the functionality to add, update or remove the values"""
- """of more than one records on the fly at the same time.
+ This module provides the functionality to add, update or remove the values
+ of more than one records on the fly at the same time.
You can configure mass editing for any OpenERP model.
- The video explaining the features and how-to for OpenERP Version 6"""
- """ is here http://t.co/wukYMx1A
- The video explaining the features and how-to for OpenERP Version 7 is"""
- """ here : http://www.youtube.com/watch?v=9BH0o74A748&feature=youtu.be
- For more details/customization/feedback contact us on"""
- """ contact@serpentcs.com.
+ The video explaining the features and how-to for OpenERP Version 6
+ is here http://t.co/wukYMx1A
+ The video explaining the features and how-to for OpenERP Version 7 is
+ here : http://www.youtube.com/watch?v=9BH0o74A748&feature=youtu.be
+ For more details/customization/feedback contact us on
+ contact@serpentcs.com.
""",
'depends': ['base'],
'data': [
"security/ir.model.access.csv",
- 'mass_editing_view.xml',
+ 'views/mass_editing_view.xml',
],
- 'installable': False,
+ 'installable': True,
'application': True,
'auto_install': False,
}
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/__unported__/mass_editing/i18n/es.po b/mass_editing/i18n/es.po
similarity index 99%
rename from __unported__/mass_editing/i18n/es.po
rename to mass_editing/i18n/es.po
index 460b91c9ee0..26ef75bb883 100644
--- a/__unported__/mass_editing/i18n/es.po
+++ b/mass_editing/i18n/es.po
@@ -59,7 +59,7 @@ msgstr "Campos"
#: code:addons/mass_editing/mass_editing.py:62
#, python-format
msgid "Mass Editing (%s)"
-msgstr "Edición Masica (%s)"
+msgstr "Edición Masiva (%s)"
#. module: mass_editing
#: view:mass.object:0
diff --git a/__unported__/mass_editing/i18n/fr.po b/mass_editing/i18n/fr.po
similarity index 100%
rename from __unported__/mass_editing/i18n/fr.po
rename to mass_editing/i18n/fr.po
diff --git a/__unported__/mass_editing/i18n/fr_CA.po b/mass_editing/i18n/fr_CA.po
similarity index 100%
rename from __unported__/mass_editing/i18n/fr_CA.po
rename to mass_editing/i18n/fr_CA.po
diff --git a/__unported__/mass_editing/i18n/mass_editing.pot b/mass_editing/i18n/mass_editing.pot
similarity index 100%
rename from __unported__/mass_editing/i18n/mass_editing.pot
rename to mass_editing/i18n/mass_editing.pot
diff --git a/__unported__/mass_editing/__init__.py b/mass_editing/models/__init__.py
similarity index 83%
rename from __unported__/mass_editing/__init__.py
rename to mass_editing/models/__init__.py
index f203ff27f6d..64fd501ae75 100644
--- a/__unported__/mass_editing/__init__.py
+++ b/mass_editing/models/__init__.py
@@ -2,7 +2,8 @@
##############################################################################
#
# This module uses OpenERP, Open Source Management Solution Framework.
-# Copyright (C) 2012-Today Serpent Consulting Services ()
+# Copyright (C):
+# 2012-Today Serpent Consulting Services ()
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -19,8 +20,5 @@
#
##############################################################################
-import mass_editing
-import wizard
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
+from . import ir_model_fields
+from . import mass_object
diff --git a/mass_editing/models/ir_model_fields.py b/mass_editing/models/ir_model_fields.py
new file mode 100644
index 00000000000..72579108314
--- /dev/null
+++ b/mass_editing/models/ir_model_fields.py
@@ -0,0 +1,42 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+# This module uses OpenERP, Open Source Management Solution Framework.
+# Copyright (C):
+# 2012-Today Serpent Consulting Services ()
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see
+#
+##############################################################################
+
+from openerp.osv import orm
+
+
+class IrModelFields(orm.Model):
+ _inherit = 'ir.model.fields'
+
+ def search(
+ self, cr, uid, args, offset=0, limit=0, order=None, context=None,
+ count=False):
+ model_domain = []
+ for domain in args:
+ if domain[0] == 'model_id' and domain[2]\
+ and type(domain[2]) != list:
+ model_domain += [(
+ 'model_id', 'in', map(int, domain[2][1:-1].split(',')))]
+ else:
+ model_domain.append(domain)
+ return super(IrModelFields, self).search(
+ cr, uid, model_domain, offset=offset, limit=limit, order=order,
+ context=context, count=count)
diff --git a/__unported__/mass_editing/mass_editing.py b/mass_editing/models/mass_object.py
similarity index 72%
rename from __unported__/mass_editing/mass_editing.py
rename to mass_editing/models/mass_object.py
index 9f7245743ae..8e7737d2554 100644
--- a/__unported__/mass_editing/mass_editing.py
+++ b/mass_editing/models/mass_object.py
@@ -20,32 +20,12 @@
#
##############################################################################
-from openerp.osv import orm, fields, osv
+from openerp import SUPERUSER_ID
+from openerp.osv import orm, fields
from openerp.tools.translate import _
-class ir_model_fields(orm.Model):
- _inherit = 'ir.model.fields'
-
- def search(
- self, cr, uid, args, offset=0, limit=0, order=None, context=None,
- count=False):
- model_domain = []
- for domain in args:
- if domain[0] == 'model_id' and domain[2]\
- and type(domain[2]) != list:
- model_domain += [(
- 'model_id', 'in', map(int, domain[2][1:-1].split(',')))]
- else:
- model_domain.append(domain)
- return super(ir_model_fields, self).search(
- cr, uid, model_domain, offset=offset, limit=limit, order=order,
- context=context, count=count)
-
-ir_model_fields()
-
-
-class mass_object(orm.Model):
+class MassObject(orm.Model):
_name = "mass.object"
_columns = {
@@ -75,7 +55,7 @@ def onchange_model(self, cr, uid, ids, model_id, context=None):
if not model_id:
return {'value': {'model_ids': [(6, 0, [])]}}
model_ids = [model_id]
- model_obj = self.pool.get('ir.model')
+ model_obj = self.pool['ir.model']
active_model_obj = self.pool.get(model_obj.browse(
cr, uid, model_id).model)
if active_model_obj._inherits:
@@ -87,12 +67,12 @@ def onchange_model(self, cr, uid, ids, model_id, context=None):
def create_action(self, cr, uid, ids, context=None):
vals = {}
- action_obj = self.pool.get('ir.actions.act_window')
- ir_values_obj = self.pool.get('ir.values')
+ action_obj = self.pool['ir.actions.act_window']
+ ir_values_obj = self.pool['ir.values']
for data in self.browse(cr, uid, ids, context=context):
src_obj = data.model_id.model
button_name = _('Mass Editing (%s)') % data.name
- vals['ref_ir_act_window'] = action_obj.create(cr, uid, {
+ vals['ref_ir_act_window'] = action_obj.create(cr, SUPERUSER_ID, {
'name': button_name,
'type': 'ir.actions.act_window',
'res_model': 'mass.editing.wizard',
@@ -103,7 +83,7 @@ def create_action(self, cr, uid, ids, context=None):
'target': 'new',
'auto_refresh': 1,
}, context)
- vals['ref_ir_value'] = ir_values_obj.create(cr, uid, {
+ vals['ref_ir_value'] = ir_values_obj.create(cr, SUPERUSER_ID, {
'name': button_name,
'model': src_obj,
'key2': 'client_action_multi',
@@ -122,28 +102,28 @@ def unlink_action(self, cr, uid, ids, context=None):
for template in self.browse(cr, uid, ids, context=context):
try:
if template.ref_ir_act_window:
- self.pool.get('ir.actions.act_window').unlink(
- cr, uid, template.ref_ir_act_window.id, context)
+ act_window_obj = self.pool['ir.actions.act_window']
+ act_window_obj.unlink(
+ cr, SUPERUSER_ID, [template.ref_ir_act_window.id],
+ context=context)
if template.ref_ir_value:
- ir_values_obj = self.pool.get('ir.values')
+ ir_values_obj = self.pool['ir.values']
ir_values_obj.unlink(
- cr, uid, template.ref_ir_value.id, context)
+ cr, SUPERUSER_ID, template.ref_ir_value.id,
+ context=context)
except:
- raise osv.except_osv(
+ raise orm.except_orm(
_("Warning"),
_("Deletion of the action record failed."))
return True
def unlink(self, cr, uid, ids, context=None):
- self.unlink_action(cr, uid, ids, context)
- return super(mass_object, self).unlink(cr, uid, ids, context)
+ self.unlink_action(cr, uid, ids, context=context)
+ return super(MassObject, self).unlink(cr, uid, ids, context=context)
def copy(self, cr, uid, record_id, default=None, context=None):
if default is None:
default = {}
default.update({'name': '', 'field_ids': []})
- return super(mass_object, self).copy(
- cr, uid, record_id, default, context)
-
-mass_object()
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+ return super(MassObject, self).copy(
+ cr, uid, record_id, default, context=context)
diff --git a/__unported__/mass_editing/security/ir.model.access.csv b/mass_editing/security/ir.model.access.csv
similarity index 100%
rename from __unported__/mass_editing/security/ir.model.access.csv
rename to mass_editing/security/ir.model.access.csv
diff --git a/mass_editing/views/mass_editing_view.xml b/mass_editing/views/mass_editing_view.xml
new file mode 100644
index 00000000000..1ab945f79e4
--- /dev/null
+++ b/mass_editing/views/mass_editing_view.xml
@@ -0,0 +1,98 @@
+
+
+
+
+
+ mass.object.form
+ mass.object
+
+
+
+
+
+
+ mass.object.tree
+ mass.object
+
+
+
+
+
+
+
+
+
+ Mass Editing
+ mass.object
+ form
+ tree,form
+
+
+
+
+
+ tree
+
+
+
+
+
+ form
+
+
+
+
+
+
+
+
+
+
diff --git a/mass_editing/wizard/__init__.py b/mass_editing/wizard/__init__.py
new file mode 100644
index 00000000000..4f383ddc9b8
--- /dev/null
+++ b/mass_editing/wizard/__init__.py
@@ -0,0 +1,23 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+# This module uses OpenERP, Open Source Management Solution Framework.
+# Copyright (C):
+# 2012-Today Serpent Consulting Services (
+#
+##############################################################################
+
+from . import mass_editing_wizard
diff --git a/__unported__/mass_editing/wizard/mass_editing_wizard.py b/mass_editing/wizard/mass_editing_wizard.py
similarity index 95%
rename from __unported__/mass_editing/wizard/mass_editing_wizard.py
rename to mass_editing/wizard/mass_editing_wizard.py
index 64c66833490..4af12c34d59 100644
--- a/__unported__/mass_editing/wizard/mass_editing_wizard.py
+++ b/mass_editing/wizard/mass_editing_wizard.py
@@ -25,19 +25,16 @@
from lxml import etree
-class mass_editing_wizard(orm.TransientModel):
+class MassEditingWizard(orm.TransientModel):
_name = 'mass.editing.wizard'
- _columns = {
- }
-
def fields_view_get(
self, cr, uid, view_id=None, view_type='form', context=None,
toolbar=False, submenu=False):
- result = super(mass_editing_wizard, self).fields_view_get(
+ result = super(MassEditingWizard, self).fields_view_get(
cr, uid, view_id, view_type, context, toolbar, submenu)
if context.get('mass_editing_object'):
- mass_object = self.pool.get('mass.object')
+ mass_object = self.pool['mass.object']
editing_data = mass_object.browse(
cr, uid, context.get('mass_editing_object'), context)
all_fields = {}
@@ -46,8 +43,9 @@ def fields_view_get(
xml_group = etree.SubElement(xml_form, 'group', {'colspan': '4'})
etree.SubElement(xml_group, 'label', {
'string': '', 'colspan': '2'})
- xml_group = etree.SubElement(xml_form, 'group', {'colspan': '4'})
- model_obj = self.pool.get(context.get('active_model'))
+ xml_group = etree.SubElement(xml_form, 'group', {'colspan': '4',
+ 'col': '4'})
+ model_obj = self.pool[context.get('active_model')]
field_info = model_obj.fields_get(cr, uid, [], context)
for field in editing_data.field_ids:
if field.ttype == "many2many":
@@ -174,11 +172,12 @@ def fields_view_get(
etree.SubElement(
xml_form, 'separator', {'string': '', 'colspan': '4'})
xml_group3 = etree.SubElement(xml_form, 'footer', {})
- etree.SubElement(xml_group3, 'button', {
- 'string': 'Close', 'icon': "gtk-close", 'special': 'cancel'})
etree.SubElement(xml_group3, 'button', {
'string': 'Apply', 'icon': "gtk-execute",
- 'type': 'object', 'name': "action_apply"})
+ 'type': 'object', 'name': "action_apply",
+ 'class': "oe_highlight"})
+ etree.SubElement(xml_group3, 'button', {
+ 'string': 'Close', 'icon': "gtk-close", 'special': 'cancel'})
root = xml_form.getroottree()
result['arch'] = etree.tostring(root)
result['fields'] = all_fields
@@ -207,11 +206,8 @@ def create(self, cr, uid, vals, context=None):
if dict:
model_obj.write(
cr, uid, context.get('active_ids'), dict, context)
- result = super(mass_editing_wizard, self).create(cr, uid, {}, context)
+ result = super(MassEditingWizard, self).create(cr, uid, {}, context)
return result
def action_apply(self, cr, uid, ids, context=None):
return {'type': 'ir.actions.act_window_close'}
-
-mass_editing_wizard()
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: