Merge lp:~vauxoo/addons-vauxoo/7.0-pylint-addons-vauxoo-4-dev-sergio into lp:addons-vauxoo/7.0

[Sergio Ernesto Tostado Sánchez - http://www.vauxoo.com]

Pylint was applied to this modules:

- sale_order_copy_line
- sale_order_line_seq
- project_contract_validations
- group_xml_id

[lp:~vauxoo/addons-vauxoo/7.0-pylint-addons-vauxoo-4-dev-sergio]

1154. By Sergio Ernesto Tostado Sánchez - http://www.vauxoo.com on 2014-11-13

[FIX][email_template_att_dinamic] Pylint and conflict troubleshooting was resolved

Unmerged revisions

1154. By Sergio Ernesto Tostado Sánchez - http://www.vauxoo.com on 2014-11-13

[FIX][email_template_att_dinamic] Pylint and conflict troubleshooting was resolved

1153. By Sergio Ernesto Tostado Sánchez - http://www.vauxoo.com on 2014-11-13

[PYLINT][sale_order_copy_line,sale_order_line_seq,project_contract_validations,group_xml_id] Pylint was applied to this modules

1152. By Luis Torres - http://www.vauxoo.com on 2014-10-16

[IMP][email_template_att_dinamic]Added pylint to module.

1151. By Luis Torres - http://www.vauxoo.com on 2014-10-15

[IMP][bzr_to_task]Completed pylint

=== modified file 'bzr_to_task/bzr_to_task.py'
--- bzr_to_task/bzr_to_task.py	2014-09-30 14:38:46 +0000
+++ bzr_to_task/bzr_to_task.py	2014-11-13 21:54:59 +0000
@@ -1,4 +1,4 @@
-#-*- coding:utf-8 -*-
+# -*- coding:utf-8 -*-
 #
 #
 #    OpenERP, Open Source Management Solution
@@ -31,9 +31,10 @@
     _columns = {
         'sprint_id': fields.many2one('sprint.kanban', 'Sprint',
                                      ondelete="cascade"),
-        'url_branch': fields.char('Url Branch', 264, help="Here you must place"
-             " the bazar url without 's' in the protocol ie."
-             " http://bazaar.launchpad.net/~vauxoo/addons-vauxoo/7.0"),
+        'url_branch': fields.char(
+            'Url Branch', 264, help="Here you must place the bazar url "
+            "without 's' in the protocol ie."
+            " http://bazaar.launchpad.net/~vauxoo/addons-vauxoo/7.0"),
         'merge_proposal': fields.char('Merge Proposal', 264),
         'blueprint': fields.char('Blueprint', 264),
         'res_id': fields.char('Revno', 64),
@@ -73,15 +74,19 @@
                         }
                         if user_ids:
                             task_data['user_id'] = user_ids[0]
-                        task_ids = task_obj.search(cr, uid, [('project_id', '=', ids[
-                                                   0]), ('revno', '=', task_data['revno'])])
+                        task_ids = task_obj.search(
+                            cr, uid, [('project_id', '=', ids[0]),
+                                      ('revno', '=', task_data['revno'])])
                         if not task_ids:
-                            if inferior and inferior <= task_data['revno'] and int(res_id) >= task_data['revno']:
-                                self.write(cr, uid, ids, {
-                                           'tasks': [(0, 0, task_data)]})
+                            if inferior and inferior <= task_data['revno'] and\
+                                    int(res_id) >= task_data['revno']:
+                                self._write(cr, uid, ids, {
+                                            'tasks': [(0, 0, task_data)]})
         else:
-            raise osv.except_osv(('Error'), ('Fields: URL Branch, From Revno and Revno are required to execute this operation, \
-                also From Revno must be minor than Revno'))
+            raise osv.except_osv(('Error'), (
+                'Fields: URL Branch, From Revno and Revno are required to '
+                'execute this operation, also From Revno must be minor than '
+                'Revno'))
         return True
 
 
@@ -90,9 +95,10 @@
     _columns = {
         'revno': fields.integer('Revno'),
         'from_revno': fields.integer('From Revno'),
-        'url_branch': fields.char('Url Branch', 264, help="Here you must place"
-             " the bazar url without 's' in the protocol ie."
-             " http://bazaar.launchpad.net/~vauxoo/addons-vauxoo/7.0"),
+        'url_branch': fields.char(
+            'Url Branch', 264, help="Here you must place the bazar url "
+            "without 's' in the protocol ie. "
+            "http://bazaar.launchpad.net/~vauxoo/addons-vauxoo/7.0"),
     }
     _defaults = {
         'res_id': 0,
@@ -157,17 +163,21 @@
                             tw_data['user_id'] = user_ids[0]
                         else:
                             tw_data['user_id'] = uid
-                        tw_ids = tw_obj.search(cr, uid, [('task_id', '=', ids[
-                                               0]), ('revno', '=', tw_data['revno'])])
+                        tw_ids = tw_obj.search(
+                            cr, uid, [('task_id', '=', ids[0]),
+                                      ('revno', '=', tw_data['revno'])])
                         if not tw_ids:
-                            if inferior and inferior <= tw_data['revno'] and int(res_id) >= tw_data['revno']:
-                                self.write(cr, uid, ids, {
-                                           'work_ids': [(0, 0, tw_data), ], })
+                            if inferior and inferior <= tw_data['revno'] and\
+                                    int(res_id) >= tw_data['revno']:
+                                self._write(cr, uid, ids, {
+                                            'work_ids': [(0, 0, tw_data), ], })
                     deadline = self.set_work_time(cr, uid, ids, context)
-                    self.write(cr, uid, ids, {'date_deadline': deadline})
+                    self._write(cr, uid, ids, {'date_deadline': deadline})
         else:
-            raise osv.except_osv(('Error'), ('Fields: URL Branch, From Revno and Revno are required to execute this operation, \
-                also From Revno must be minor than Revno'))
+            raise osv.except_osv(('Error'), (
+                'Fields: URL Branch, From Revno and Revno are required to '
+                'execute this operation, also From Revno must be minor than '
+                'Revno'))
         return True
 
 

=== modified file 'email_template_att_dinamic/model/email_template.py'
--- email_template_att_dinamic/model/email_template.py	2014-11-12 22:19:44 +0000
+++ email_template_att_dinamic/model/email_template.py	2014-11-13 21:54:59 +0000
@@ -4,12 +4,12 @@
 #    Module Writen to OpenERP, Open Source Management Solution
 #    Copyright (C) 2013 Vauxoo (<http://vauxoo.com>).
 #    All Rights Reserved
-###############Credits######################################################
+# ##############Credits######################################################
 #    Coded by: vauxoo consultores ([e-mail])
 #############################################################################
 #    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
+#    it under the terms of the GNU Affero 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,
@@ -19,7 +19,7 @@
 #
 #    You should have received a copy of the GNU Affero General Public License
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-################################################################################
+#############################################################################
 
 
 from openerp.osv import osv, fields
@@ -31,10 +31,12 @@
     _inherit = "email.template"
 
     _columns = {
-        'att_default': fields.boolean('Add attachment', help='Add attachment of record by default'),
-        'att_other_field': fields.text('Add attachment from other filed',
-                help='specify from which fields are to get attachments'
-                '(only fields with relation to ir.attachment)')
+        'att_default': fields.boolean(
+            'Add attachment', help='Add attachment of record by default'),
+        'att_other_field': fields.text(
+            'Add attachment from other filed', help='specify from which fields'
+            ' are to get attachments (only fields with relation to ir.'
+            'attachment)')
     }
 
 
@@ -42,28 +44,32 @@
     _inherit = 'mail.compose.message'
 
     def onchange_template_id(self, cr, uid, ids, template_id,
-                        composition_mode, model, res_id, context=None):
+                             composition_mode, model, res_id, context=None):
         if not context:
             context = {}
 
         template_obj = self.pool.get('email.template')
 
         res = super(mail_compose_message,
-                    self).onchange_template_id(cr, uid, ids, template_id,
-                            composition_mode, model, res_id, context=context)
+                    self).onchange_template_id(
+                        cr, uid, ids, template_id,
+                        composition_mode, model, res_id, context=context)
         attach = []
         if template_id:
 
             template = template_obj.browse(cr, uid, template_id, context)
 
             if template and template.att_default:
-                attach = self.pool.get('ir.attachment').search(cr, uid,
-                    [('res_id', '=', res_id), ('res_model', '=', model)])
+                attach = self.pool.get('ir.attachment').search(
+                    cr, uid, [('res_id', '=', res_id),
+                              ('res_model', '=', model)])
 
             if template and template.att_other_field:
-                att_field_render = template_obj.render_template(cr, uid,
-                    template.att_other_field, template.model, res_id, context=context)
-                attach += [id_att for id_att in ast.literal_eval("[" + att_field_render + "]") if att_field_render]
+                att_field_render = template_obj.render_template(
+                    cr, uid, template.att_other_field, template.model,
+                    res_id, context=context)
+                attach += [id_att for id_att in ast.literal_eval(
+                    "[" + att_field_render + "]") if att_field_render]
 
         attach += res.get('value', {}).pop('attachment_ids', [])
         res.get('value', {}).update({'attachment_ids': [(6, 0, attach)]})

=== modified file 'group_xml_id/groups.py'
--- group_xml_id/groups.py	2014-10-03 07:19:35 +0000
+++ group_xml_id/groups.py	2014-11-13 21:54:59 +0000
@@ -8,8 +8,8 @@
 #    Coded by: Rodo([e-mail])
 #############################################################################
 #    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
+#    it under the terms of the GNU Affero 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,
@@ -28,6 +28,10 @@
     _inherit = 'res.groups'
 
     _columns = {
-        'xml_id': fields.function(osv.osv.get_xml_id, type='char', size=128, string="External ID",
-                                  help="ID of the view defined in xml file"),
+        'xml_id': fields.function(
+            osv.osv.get_xml_id,
+            type='char',
+            size=128,
+            string="External ID",
+            help="ID of the view defined in xml file"),
     }

=== modified file 'project_contract_validations/__init__.py'
--- project_contract_validations/__init__.py	2014-08-01 23:10:00 +0000
+++ project_contract_validations/__init__.py	2014-11-13 21:54:59 +0000
@@ -1,1 +0,0 @@
-

=== modified file 'sale_order_copy_line/__init__.py'
--- sale_order_copy_line/__init__.py	2014-10-03 00:28:23 +0000
+++ sale_order_copy_line/__init__.py	2014-11-13 21:54:59 +0000
@@ -21,6 +21,5 @@
 #
 #    You should have received a copy of the GNU Affero General Public License
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-#
+
 from . import model

=== modified file 'sale_order_copy_line/model/__init__.py'
--- sale_order_copy_line/model/__init__.py	2014-10-03 00:28:23 +0000
+++ sale_order_copy_line/model/__init__.py	2014-11-13 21:54:59 +0000
@@ -21,6 +21,5 @@
 #
 #    You should have received a copy of the GNU Affero General Public License
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-#
+
 from . import sale_order_line

=== modified file 'sale_order_copy_line/model/sale_order_line.py'
--- sale_order_copy_line/model/sale_order_line.py	2014-10-03 07:19:35 +0000
+++ sale_order_copy_line/model/sale_order_line.py	2014-11-13 21:54:59 +0000
@@ -1,4 +1,4 @@
-##############################################################################
+# #############################################################################
 #
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
@@ -18,7 +18,7 @@
 #    You should have received a copy of the GNU General Public License
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
-##############################################################################
+# #############################################################################
 
 from openerp.osv import osv
 from openerp.tools.translate import _
@@ -34,7 +34,7 @@
         data_sale_order = sale_order_obj.browse(cr, uid, data.get('order_id'))
 
         if data_sale_order.state == 'draft':
-            sale_order_id = self.create(cr, uid, data, context=context)
+            self.create(cr, uid, data, context=context)
             return {
                 'type': 'ir.actions.act_window',
                 'name': _('Sales Order'),
@@ -45,4 +45,5 @@
                 'target': 'current',
                 'nodestroy': True, }
         else:
-            raise osv.except_osv(_('Error!'), _("This sale order is not in draft state"))
+            raise osv.except_osv(_('Error!'),
+                                 _("This sale order is not in draft state"))

=== modified file 'sale_order_line_seq/__init__.py'
--- sale_order_line_seq/__init__.py	2014-10-03 00:28:23 +0000
+++ sale_order_line_seq/__init__.py	2014-11-13 21:54:59 +0000
@@ -21,6 +21,5 @@
 #
 #    You should have received a copy of the GNU Affero General Public License
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-#
+
 from . import model

=== modified file 'sale_order_line_seq/model/__init__.py'
--- sale_order_line_seq/model/__init__.py	2014-10-03 00:28:23 +0000
+++ sale_order_line_seq/model/__init__.py	2014-11-13 21:54:59 +0000
@@ -21,6 +21,5 @@
 #
 #    You should have received a copy of the GNU Affero General Public License
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-#
+
 from . import sale_order

=== modified file 'sale_order_line_seq/model/sale_order.py'
--- sale_order_line_seq/model/sale_order.py	2014-10-03 07:19:35 +0000
+++ sale_order_line_seq/model/sale_order.py	2014-11-13 21:54:59 +0000
@@ -21,8 +21,7 @@
 #
 #    You should have received a copy of the GNU Affero General Public License
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-#
+
 from openerp.osv import osv, fields
 
 
@@ -30,6 +29,10 @@
     _inherit = 'sale.order.line'
 
     _columns = {
-        'sequence2': fields.related('sequence', type='integer', relation='sale.order.line',
-            string='Sequence', help='Field to show the number of sequence in line')
+        'sequence2': fields.related(
+            'sequence',
+            type='integer',
+            relation='sale.order.line',
+            string='Sequence',
+            help='Field to show the number of sequence in line')
     }