From 58cd8419ed485698d07454f0ef45d376d56d432b Mon Sep 17 00:00:00 2001 From: MonsieurB Date: Wed, 15 Mar 2017 14:56:50 +0100 Subject: [PATCH] Mig to 10.0 --- smsclient_core/README.rst | 7 ++--- smsclient_core/__init__.py | 27 +++---------------- .../{__openerp__.py => __manifest__.py} | 14 +++++----- smsclient_core/models/__init__.py | 7 +++++ smsclient_core/{ => models}/serveraction.py | 6 ++--- smsclient_core/{ => models}/sms_gateway.py | 4 +-- smsclient_core/{ => models}/smstemplate.py | 2 +- .../{ => views}/serveraction_view.xml | 0 .../{ => views}/sms_gateway_data.xml | 0 .../{ => views}/sms_gateway_view.xml | 0 .../{ => views}/smstemplate_view.xml | 0 smsclient_core/wizard/mass_sms.py | 2 +- 12 files changed, 26 insertions(+), 43 deletions(-) rename smsclient_core/{__openerp__.py => __manifest__.py} (74%) create mode 100644 smsclient_core/models/__init__.py rename smsclient_core/{ => models}/serveraction.py (87%) rename smsclient_core/{ => models}/sms_gateway.py (98%) rename smsclient_core/{ => models}/smstemplate.py (93%) rename smsclient_core/{ => views}/serveraction_view.xml (100%) rename smsclient_core/{ => views}/sms_gateway_data.xml (100%) rename smsclient_core/{ => views}/sms_gateway_view.xml (100%) rename smsclient_core/{ => views}/smstemplate_view.xml (100%) diff --git a/smsclient_core/README.rst b/smsclient_core/README.rst index 5792703..5bc7b0a 100644 --- a/smsclient_core/README.rst +++ b/smsclient_core/README.rst @@ -18,6 +18,7 @@ Configuration To configure this module, you need to: +* Configure Keychain key * Configure your provider account Usage @@ -26,14 +27,10 @@ Usage To use this module, you need to: * got to partner menu -* select on or multiple partner +* select one or multiple partner * go to more and will found some wizards to send sms -Known issues / Roadmap -====================== - - Bug Tracker =========== diff --git a/smsclient_core/__init__.py b/smsclient_core/__init__.py index a761e61..e4e7434 100644 --- a/smsclient_core/__init__.py +++ b/smsclient_core/__init__.py @@ -1,26 +1,7 @@ # -*- coding: utf-8 -*- -############################################################################## -# -# OpenERP, Open Source Management Solution -# Copyright (C) 2004-2009 Tiny SPRL (). -# Copyright (C) 2013 Julius Network Solutions SARL -# -# 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 . -# -############################################################################## +# Author: Sébastien BEAU +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). + -from . import sms_gateway -from . import serveraction from . import wizard -from . import smstemplate +from . import models diff --git a/smsclient_core/__openerp__.py b/smsclient_core/__manifest__.py similarity index 74% rename from smsclient_core/__openerp__.py rename to smsclient_core/__manifest__.py index 758bfa4..d7401be 100644 --- a/smsclient_core/__openerp__.py +++ b/smsclient_core/__manifest__.py @@ -7,14 +7,12 @@ { "name": "SMS Client Core", - "version": "8.0.1", + "version": "10.0.1.0.0", "depends": ["base", "email_template", 'base_phone', - 'server_environment', + 'keychain', ], - "author": "Julius Network Solutions,SYLEAM,OpenERP SA,Akretion," - "Odoo Community Association (OCA)", 'images': [ 'images/sms.jpeg', 'images/gateway.jpeg', @@ -33,11 +31,11 @@ Sending SMSs very easily, individually or collectively. "security/groups.xml", "security/ir.model.access.csv", "security/ir.rule.csv", - "sms_gateway_view.xml", - "serveraction_view.xml", - "sms_gateway_data.xml", + "views/sms_gateway_view.xml", + "views/serveraction_view.xml", + "views/sms_gateway_data.xml", "wizard/mass_sms_view.xml", - "smstemplate_view.xml" + "views/smstemplate_view.xml" ], "installable": True, } diff --git a/smsclient_core/models/__init__.py b/smsclient_core/models/__init__.py new file mode 100644 index 0000000..5f76483 --- /dev/null +++ b/smsclient_core/models/__init__.py @@ -0,0 +1,7 @@ +# -*- coding: utf-8 -*- +# Author: Sébastien BEAU +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). + +from . import sms_gateway +from . import serveraction +from . import smstemplate diff --git a/smsclient_core/serveraction.py b/smsclient_core/models/serveraction.py similarity index 87% rename from smsclient_core/serveraction.py rename to smsclient_core/models/serveraction.py index e61c0d2..ffd17d0 100644 --- a/smsclient_core/serveraction.py +++ b/smsclient_core/models/serveraction.py @@ -6,7 +6,7 @@ import logging -from openerp import models, fields +from odoo import models, fields _logger = logging.getLogger('gateway') @@ -25,8 +25,8 @@ class ServerAction(models.Model): "will be the field providing the correct mobile number.") sms = fields.Char('SMS', size=160, translate=True) sms_server = fields.Many2one( - 'sms.gateway', string='SMS Server', + comodel_name='sms.gateway', string='SMS Server', help='Select the SMS Gateway configuration to use with this action.') sms_template_id = fields.Many2one( - 'email.template', string='SMS Template', + comodel_name='email.template', string='SMS Template', help='Select the SMS Template configuration to use with this action.') diff --git a/smsclient_core/sms_gateway.py b/smsclient_core/models/sms_gateway.py similarity index 98% rename from smsclient_core/sms_gateway.py rename to smsclient_core/models/sms_gateway.py index 63116a3..2907228 100644 --- a/smsclient_core/sms_gateway.py +++ b/smsclient_core/models/sms_gateway.py @@ -8,8 +8,8 @@ import logging -from openerp import models, fields, api, _ -from openerp.addons.server_environment import serv_config +from odoo import models, fields, api, _ +from odoo.addons.server_environment import serv_config _logger = logging.getLogger(__name__) diff --git a/smsclient_core/smstemplate.py b/smsclient_core/models/smstemplate.py similarity index 93% rename from smsclient_core/smstemplate.py rename to smsclient_core/models/smstemplate.py index 39b5030..5b5a4e8 100644 --- a/smsclient_core/smstemplate.py +++ b/smsclient_core/models/smstemplate.py @@ -5,7 +5,7 @@ # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). -from openerp import models, fields +from odoo import models, fields class email_template(models.Model): diff --git a/smsclient_core/serveraction_view.xml b/smsclient_core/views/serveraction_view.xml similarity index 100% rename from smsclient_core/serveraction_view.xml rename to smsclient_core/views/serveraction_view.xml diff --git a/smsclient_core/sms_gateway_data.xml b/smsclient_core/views/sms_gateway_data.xml similarity index 100% rename from smsclient_core/sms_gateway_data.xml rename to smsclient_core/views/sms_gateway_data.xml diff --git a/smsclient_core/sms_gateway_view.xml b/smsclient_core/views/sms_gateway_view.xml similarity index 100% rename from smsclient_core/sms_gateway_view.xml rename to smsclient_core/views/sms_gateway_view.xml diff --git a/smsclient_core/smstemplate_view.xml b/smsclient_core/views/smstemplate_view.xml similarity index 100% rename from smsclient_core/smstemplate_view.xml rename to smsclient_core/views/smstemplate_view.xml diff --git a/smsclient_core/wizard/mass_sms.py b/smsclient_core/wizard/mass_sms.py index 0893e16..51d6de0 100644 --- a/smsclient_core/wizard/mass_sms.py +++ b/smsclient_core/wizard/mass_sms.py @@ -19,7 +19,7 @@ # ############################################################################## -from openerp import models, fields, api +from odoo import models, fields, api class WizardSendSms(models.TransientModel):