From 0fe62818be94baafed55c0a734b3b71afa279deb Mon Sep 17 00:00:00 2001 From: Sylvain LE GAL Date: Wed, 2 Apr 2014 11:17:53 +0200 Subject: [PATCH] [REF] pep8; [REF] change copyright header in each file; [REF] typos in __openerp__.py file; --- web_easy_switch_company/__init__.py | 23 ++++++- web_easy_switch_company/__openerp__.py | 66 +++++++++++-------- .../controllers/__init__.py | 25 +++++-- web_easy_switch_company/controllers/main.py | 24 ++++++- web_easy_switch_company/model/__init__.py | 23 ++++++- web_easy_switch_company/model/res_company.py | 55 +++++++++++----- web_easy_switch_company/model/res_users.py | 26 ++++++-- .../static/src/js/switch_company.js | 22 ++++++- .../static/src/xml/switch_company.xml | 22 ++++++- 9 files changed, 221 insertions(+), 65 deletions(-) diff --git a/web_easy_switch_company/__init__.py b/web_easy_switch_company/__init__.py index a39596d7..f9951759 100644 --- a/web_easy_switch_company/__init__.py +++ b/web_easy_switch_company/__init__.py @@ -1,7 +1,24 @@ # -*- encoding: utf-8 -*- -################################################################################ -# See __openerp__.py file for Copyright and Licence Informations. -################################################################################ +############################################################################## +# +# Web Easy Switch Company module for OpenERP +# Copyright (C) 2014 GRAP (http://www.grap.coop) +# @author Sylvain LE GAL (https://twitter.com/legalsylvain) +# +# 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 (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 Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . +# +############################################################################## from . import model from . import controllers diff --git a/web_easy_switch_company/__openerp__.py b/web_easy_switch_company/__openerp__.py index c1b00a58..05f0ea9d 100644 --- a/web_easy_switch_company/__openerp__.py +++ b/web_easy_switch_company/__openerp__.py @@ -1,7 +1,24 @@ # -*- encoding: utf-8 -*- -################################################################################ -# See Copyright and Licence Informations undermentioned. -################################################################################ +############################################################################## +# +# Web Easy Switch Company module for OpenERP +# Copyright (C) 2014 GRAP (http://www.grap.coop) +# @author Sylvain LE GAL (https://twitter.com/legalsylvain) +# +# 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 (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 Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . +# +############################################################################## { 'name': 'Multicompany - Easy Switch Company', @@ -11,49 +28,44 @@ Add menu to allow user to switch to another company more easily =============================================================== -Functionnality: ---------------- +Functionality: +-------------- * Add a new menu in the top bar to switch to another company more easily; * Remove the old behaviour to switch company; Documentations: --------------- * Video : http://www.youtube.com/watch?v=Cpm6dg-IEQQ - -Technical informations: ------------------------ - * Create a field function 'logo_topbar' in res_company to have a good resized logo; -Limits : --------- +Technical information: +---------------------- + * Create a field function 'logo_topbar' in res_company to have a good""" + """resized logo; + +Limits: +------- * It would be interesting to show the structure of the companies; Copyright, Author and Licence: ------------------------------ - * Copyright: 2014, Groupement Régional Alimentaire de Proximité + * Copyright: 2014, Groupement Régional Alimentaire de Proximité; * Author: Sylvain LE GAL (https://twitter.com/legalsylvain); - * Licence: AGPL-3 (http://www.gnu.org/licenses/) - """, + * Licence: AGPL-3 (http://www.gnu.org/licenses/)""", 'author': 'GRAP', 'website': 'http://www.grap.coop', 'license': 'AGPL-3', 'depends': [ - 'web', - ], + 'web', + ], 'data': [ - 'view/res_users_view.xml', - ], - 'demo': [], + 'view/res_users_view.xml', + ], 'js': [ - 'static/src/js/switch_company.js', - ], - 'css': [], + 'static/src/js/switch_company.js', + ], 'qweb': [ - 'static/src/xml/switch_company.xml', - ], - 'images': [], - 'post_load': '', - 'application': False, + 'static/src/xml/switch_company.xml', + ], 'installable': True, 'auto_install': False, } diff --git a/web_easy_switch_company/controllers/__init__.py b/web_easy_switch_company/controllers/__init__.py index f02a4515..b40fe569 100644 --- a/web_easy_switch_company/controllers/__init__.py +++ b/web_easy_switch_company/controllers/__init__.py @@ -1,6 +1,23 @@ # -*- encoding: utf-8 -*- -################################################################################ -# See __openerp__.py file for Copyright and Licence Informations. -################################################################################ +############################################################################## +# +# Web Easy Switch Company module for OpenERP +# Copyright (C) 2014 GRAP (http://www.grap.coop) +# @author Sylvain LE GAL (https://twitter.com/legalsylvain) +# +# 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 (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 Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . +# +############################################################################## -import main +from . import main diff --git a/web_easy_switch_company/controllers/main.py b/web_easy_switch_company/controllers/main.py index d9a7c18f..40387f90 100644 --- a/web_easy_switch_company/controllers/main.py +++ b/web_easy_switch_company/controllers/main.py @@ -1,10 +1,28 @@ # -*- encoding: utf-8 -*- -################################################################################ -# See __openerp__.py file for Copyright and Licence Informations. -################################################################################ +############################################################################## +# +# Web Easy Switch Company module for OpenERP +# Copyright (C) 2014 GRAP (http://www.grap.coop) +# @author Sylvain LE GAL (https://twitter.com/legalsylvain) +# +# 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 (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 Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . +# +############################################################################## import openerp + class WebEasySwitchCompanyController(openerp.addons.web.http.Controller): _cp_path = '/web_easy_switch_company/switch' diff --git a/web_easy_switch_company/model/__init__.py b/web_easy_switch_company/model/__init__.py index 372fe8b0..e1bd2b92 100644 --- a/web_easy_switch_company/model/__init__.py +++ b/web_easy_switch_company/model/__init__.py @@ -1,7 +1,24 @@ # -*- encoding: utf-8 -*- -################################################################################ -# See __openerp__.py file for Copyright and Licence Informations. -################################################################################ +############################################################################## +# +# Web Easy Switch Company module for OpenERP +# Copyright (C) 2014 GRAP (http://www.grap.coop) +# @author Sylvain LE GAL (https://twitter.com/legalsylvain) +# +# 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 (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 Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . +# +############################################################################## from . import res_users from . import res_company diff --git a/web_easy_switch_company/model/res_company.py b/web_easy_switch_company/model/res_company.py index 8b1fa532..000e21e1 100644 --- a/web_easy_switch_company/model/res_company.py +++ b/web_easy_switch_company/model/res_company.py @@ -1,32 +1,57 @@ -## -*- encoding: utf-8 -*- -################################################################################# -## See __openerp__.py file for Copyright and Licence Informations. -################################################################################# +# -*- encoding: utf-8 -*- +############################################################################## +# +# Web Easy Switch Company module for OpenERP +# Copyright (C) 2014 GRAP (http://www.grap.coop) +# @author Sylvain LE GAL (https://twitter.com/legalsylvain) +# +# 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 (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 Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . +# +############################################################################## -from openerp.osv.orm import Model from openerp.osv import fields +from openerp.osv.orm import Model from openerp.tools import image_resize_image + class res_company(Model): _inherit = 'res.company' - ### Custom Section - def _switch_company_get_companies_from_partner(self, cr, uid, ids, context=None): - return self.pool['res.company'].search(cr, uid, [('partner_id', 'in', ids)], context=context) + # Custom Section + def _switch_company_get_companies_from_partner( + self, cr, uid, ids, context=None): + return self.pool['res.company'].search( + cr, uid, [('partner_id', 'in', ids)], context=context) - ### Fields function Section + # Fields function Section def _get_logo_topbar(self, cr, uid, ids, _field_name, _args, context=None): result = dict.fromkeys(ids, False) for record in self.browse(cr, uid, ids, context=context): size = (48, 48) - result[record.id] = image_resize_image(record.partner_id.image, size) + result[record.id] = image_resize_image( + record.partner_id.image, size) return result - ### Columns Section + # Columns Section _columns = { - 'logo_topbar': fields.function(_get_logo_topbar, string="Logo displayed in the switch company menu", + 'logo_topbar': fields.function( + _get_logo_topbar, + string="Logo displayed in the switch company menu", type="binary", store={ - 'res.company': (lambda s, c, u, i, x: i, ['partner_id'], 10), - 'res.partner': (_switch_company_get_companies_from_partner, ['image'], 10), - }), + 'res.company': (lambda s, c, u, i, x: i, ['partner_id'], 10), + 'res.partner': (_switch_company_get_companies_from_partner, + ['image'], 10), + } + ), } diff --git a/web_easy_switch_company/model/res_users.py b/web_easy_switch_company/model/res_users.py index 09dba3d8..68c6fdfa 100644 --- a/web_easy_switch_company/model/res_users.py +++ b/web_easy_switch_company/model/res_users.py @@ -1,13 +1,31 @@ # -*- encoding: utf-8 -*- -################################################################################ -# See __openerp__.py file for Copyright and Licence Informations. -################################################################################ +############################################################################## +# +# Web Easy Switch Company module for OpenERP +# Copyright (C) 2014 GRAP (http://www.grap.coop) +# @author Sylvain LE GAL (https://twitter.com/legalsylvain) +# +# 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 (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 Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . +# +############################################################################## from openerp.osv.orm import Model + class res_users(Model): _inherit = 'res.users' - ### Custom Function Section + # Custom Function Section def change_current_company(self, cr, uid, company_id, context=None): return self.write(cr, uid, uid, {'company_id': company_id}) diff --git a/web_easy_switch_company/static/src/js/switch_company.js b/web_easy_switch_company/static/src/js/switch_company.js index aac876e3..05ed6f41 100644 --- a/web_easy_switch_company/static/src/js/switch_company.js +++ b/web_easy_switch_company/static/src/js/switch_company.js @@ -1,6 +1,21 @@ -/******************************************************************************/ -/* See __openerp__.py file for Copyright and Licence Informations. */ -/******************************************************************************/ +/****************************************************************************** + Web Easy Switch Company module for OpenERP + Copyright (C) 2014 GRAP (http://www.grap.coop) + @author Sylvain LE GAL (https://twitter.com/legalsylvain) + + 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 (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 Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . +******************************************************************************/ openerp.web_easy_switch_company = function (instance) { @@ -58,6 +73,7 @@ openerp.web_easy_switch_company = function (instance) { } }, + /*********************************************************************** Custom section ***********************************************************************/ diff --git a/web_easy_switch_company/static/src/xml/switch_company.xml b/web_easy_switch_company/static/src/xml/switch_company.xml index ac3880d4..9f540b23 100644 --- a/web_easy_switch_company/static/src/xml/switch_company.xml +++ b/web_easy_switch_company/static/src/xml/switch_company.xml @@ -1,7 +1,23 @@ - - - + + + + + + + + + + + + + + + + + + +