diff --git a/addons/account/__openerp__.py b/addons/account/__openerp__.py index 343512dc271..95ecdc8c35a 100644 --- a/addons/account/__openerp__.py +++ b/addons/account/__openerp__.py @@ -123,7 +123,9 @@ for a particular financial year and for preparation of vouchers there is a modul 'edi/invoice_action_data.xml', 'account_bank_view.xml', 'res_config_view.xml', - 'account_pre_install.yml' + 'account_pre_install.yml', + + 'views/report_vat.xml', ], 'js': [ 'static/src/js/account_move_reconciliation.js', diff --git a/addons/account/account_report.xml b/addons/account/account_report.xml index 6e121c9f5a5..4f9ad1b5c56 100644 --- a/addons/account/account_report.xml +++ b/addons/account/account_report.xml @@ -27,13 +27,13 @@ + id="action_report_vat" + model="account.tax.code" + report_type="qweb-pdf" + string="Account tax" + name="account.report_vat" + file="account.report_vat" + /> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Tax Statement - - - - Chart of Tax - Fiscal Year - Periods - Based On - - - [[ get_account(data) or removeParentNode('para') ]] - [[ get_fiscalyear(data) or '' ]] - - - - Start Period - End Period - - - [[ get_start_period(data) or '' ]] - [[ get_end_period(data) or '' ]] - - - - [[ get_basedon(data) or '' ]] - - - - - - Tax Name - Debit - Credit - Tax Amount - - - [[ repeatIn(get_lines(data['form']['based_on'], data['form']['company_id']), 'o') ]][[ (o['level']) ]] [[ (len(o['level'])<5 and setTag('para','para',{'fontName':'Helvetica-Bold'})) or removeParentNode('font') ]][[ o['code'] ]] [[ o['name'] ]] - [[ len(o['level'])<5 and setTag('para','para',{'fontName':"Helvetica-Bold"}) or removeParentNode('font')]][[ o['type']=='view' and removeParentNode('font') ]][[ formatLang(o['debit']) ]][[ o['type']<>'view' and removeParentNode('font') ]][[ formatLang(o['debit']) ]] - [[ len(o['level'])<5 and setTag('para','para',{'fontName':"Helvetica-Bold"}) or removeParentNode('font')]][[ o['type']=='view' and removeParentNode('font') ]][[ formatLang(o['credit']) ]][[ o['type']<>'view' and removeParentNode('font') ]][[ formatLang(o['credit'])]] - [[ len(o['level'])<5 and setTag('para','para',{'fontName':"Helvetica-Bold"}) or removeParentNode('font')]][[ o['type']=='view' and removeParentNode('font') ]][[ formatLang(o['tax_amount'], currency_obj=company.currency_id) ]][[ o['type']<>'view' and removeParentNode('font') ]][[ formatLang(o['tax_amount'], currency_obj=company.currency_id) ]] - - - - diff --git a/addons/account/report/account_tax_report.py b/addons/account/report/report_vat.py similarity index 77% rename from addons/account/report/account_tax_report.py rename to addons/account/report/report_vat.py index b3cbcb441bf..236e2ffaac2 100644 --- a/addons/account/report/account_tax_report.py +++ b/addons/account/report/report_vat.py @@ -19,16 +19,25 @@ # ############################################################################## -import time - +from openerp.addons.web import http +from openerp.addons.web.http import request from common_report_header import common_report_header -from openerp.report import report_sxw +try: + import cStringIO as StringIO +except ImportError: + import StringIO +import xlwt -class tax_report(report_sxw.rml_parse, common_report_header): - _name = 'report.account.vat.declaration' - def set_context(self, objects, data, ids, report_type=None): - new_ids = ids +class tax_report(http.Controller, common_report_header): + + @http.route(['/report/account.report_vat'], type='http', auth='user', website=True, multilang=True) + def report_account_tax(self, **data): + report_obj = request.registry['report'] + self.cr, self.uid, self.pool = request.cr, request.uid, request.registry + + data = report_obj.eval_params(data) + res = {} self.period_ids = [] period_obj = self.pool.get('account.period') @@ -38,28 +47,16 @@ class tax_report(report_sxw.rml_parse, common_report_header): if data['form'].get('period_from', False) and data['form'].get('period_to', False): self.period_ids = period_obj.build_ctx_periods(self.cr, self.uid, data['form']['period_from'], data['form']['period_to']) - periods_l = period_obj.read(self.cr, self.uid, self.period_ids, ['name']) - for period in periods_l: - if res['periods'] == '': - res['periods'] = period['name'] - else: - res['periods'] += ", "+ period['name'] - return super(tax_report, self).set_context(objects, data, new_ids, report_type=report_type) - def __init__(self, cr, uid, name, context=None): - super(tax_report, self).__init__(cr, uid, name, context=context) - self.localcontext.update({ - 'time': time, - 'get_codes': self._get_codes, - 'get_general': self._get_general, - 'get_currency': self._get_currency, - 'get_lines': self._get_lines, - 'get_fiscalyear': self._get_fiscalyear, - 'get_account': self._get_account, - 'get_start_period': self.get_start_period, - 'get_end_period': self.get_end_period, - 'get_basedon': self._get_basedon, - }) + docargs = { + 'fiscalyear': self._get_fiscalyear(data), + 'account': self._get_account(data), + 'based_on': self._get_basedon(data), + 'period_from': self.get_start_period(data), + 'period_to': self.get_end_period(data), + 'taxlines': self._get_lines(self._get_basedon(data), company_id=data['form']['company_id']), + } + return request.registry['report'].render(self.cr, self.uid, [], 'account.report_vat', docargs) def _get_basedon(self, form): return form['form']['based_on'] @@ -194,7 +191,6 @@ class tax_report(report_sxw.rml_parse, common_report_header): return self.pool.get('res.company').browse(self.cr, self.uid, form['company_id'], context=context).currency_id.name def sort_result(self, accounts, context=None): - # On boucle sur notre rapport result_accounts = [] ind=0 old_level=0 @@ -233,7 +229,43 @@ class tax_report(report_sxw.rml_parse, common_report_header): return result_accounts -report_sxw.report_sxw('report.account.vat.declaration', 'account.tax.code', - 'addons/account/report/account_tax_report.rml', parser=tax_report, header="internal") + @http.route(['/report/account.report_vat_xls'], type='http', auth='user', website=True, multilang=True) + def report_account_tax_xls(self, **data): + report_obj = request.registry['report'] + self.cr, self.uid, self.pool = request.cr, request.uid, request.registry + + data = report_obj.eval_params(data) + + res = {} + self.period_ids = [] + period_obj = self.pool.get('account.period') + self.display_detail = data['form']['display_detail'] + res['periods'] = '' + res['fiscalyear'] = data['form'].get('fiscalyear_id', False) + + if data['form'].get('period_from', False) and data['form'].get('period_to', False): + self.period_ids = period_obj.build_ctx_periods(self.cr, self.uid, data['form']['period_from'], data['form']['period_to']) + + content = '' + lines = self._get_lines(self._get_basedon(data), company_id=data['form']['company_id']) + + if lines: + xls = StringIO.StringIO() + xls_workbook = xlwt.Workbook() + vat_sheet = xls_workbook.add_sheet('report_vat') + + for x in range(0, len(lines)): + for y in range(0, len(lines[0])): + vat_sheet.write(x, y, lines[x].values()[y]) + + xls_workbook.save(xls) + xls.seek(0) + content = xls.read() + + response = request.make_response(content, headers=[ + ('Content-Type', 'application/vnd.ms-excel'), + ('Content-Disposition', 'attachment; filename=report_vat.xls;') + ]) + return response # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/account/views/report_vat.xml b/addons/account/views/report_vat.xml new file mode 100644 index 00000000000..03664045ef4 --- /dev/null +++ b/addons/account/views/report_vat.xml @@ -0,0 +1,68 @@ + + + + + + diff --git a/addons/account/wizard/account_vat.py b/addons/account/wizard/account_vat.py index 37bf4b029a6..6fbfcc9ddf5 100644 --- a/addons/account/wizard/account_vat.py +++ b/addons/account/wizard/account_vat.py @@ -46,18 +46,20 @@ class account_vat_declaration(osv.osv_memory): def create_vat(self, cr, uid, ids, context=None): if context is None: context = {} + datas = {'ids': context.get('active_ids', [])} datas['model'] = 'account.tax.code' datas['form'] = self.read(cr, uid, ids, context=context)[0] + for field in datas['form'].keys(): if isinstance(datas['form'][field], tuple): datas['form'][field] = datas['form'][field][0] - datas['form']['company_id'] = self.pool.get('account.tax.code').browse(cr, uid, [datas['form']['chart_tax_id']], context=context)[0].company_id.id - return { - 'type': 'ir.actions.report.xml', - 'report_name': 'account.vat.declaration', - 'datas': datas, - } + taxcode_obj = self.pool.get('account.tax.code') + taxcode_id = datas['form']['chart_tax_id'] + taxcode = taxcode_obj.browse(cr, uid, [taxcode_id], context=context)[0] + datas['form']['company_id'] = taxcode.company_id.id + + return self.pool['report'].get_action(cr, uid, ids, 'account.report_vat', datas=datas, context=context) # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/auth_oauth/__openerp__.py b/addons/auth_oauth/__openerp__.py index 76f15687eb9..64068fa9b5e 100644 --- a/addons/auth_oauth/__openerp__.py +++ b/addons/auth_oauth/__openerp__.py @@ -31,7 +31,7 @@ Allow users to login through OAuth2 Provider. 'author': 'OpenERP s.a.', 'maintainer': 'OpenERP s.a.', 'website': 'http://www.openerp.com', - 'depends': ['base', 'web', 'base_setup'], + 'depends': ['base', 'web', 'base_setup', 'auth_signup'], 'data': [ 'res_users.xml', 'auth_oauth_data.xml', diff --git a/addons/auth_oauth/controllers/main.py b/addons/auth_oauth/controllers/main.py index 5a22240abac..b62fb31d8b0 100644 --- a/addons/auth_oauth/controllers/main.py +++ b/addons/auth_oauth/controllers/main.py @@ -9,7 +9,7 @@ import openerp from openerp import SUPERUSER_ID from openerp import http from openerp.http import request -from openerp.addons.web.controllers.main import db_monodb, set_cookie_and_redirect, login_and_redirect +from openerp.addons.web.controllers.main import db_monodb, ensure_db, set_cookie_and_redirect, login_and_redirect from openerp.modules.registry import RegistryManager from openerp.tools.translate import _ @@ -61,13 +61,18 @@ class OAuthLogin(openerp.addons.web.controllers.main.Home): return providers def get_state(self, provider): - return dict( + state = dict( d=request.session.db, p=provider['id'] ) + token = request.params.get('token') + if token: + state['t'] = token + return state @http.route() def web_login(self, *args, **kw): + ensure_db() providers = self.list_providers() response = super(OAuthLogin, self).web_login(*args, **kw) @@ -88,6 +93,24 @@ class OAuthLogin(openerp.addons.web.controllers.main.Home): return response + @http.route() + def web_auth_signup(self, *args, **kw): + providers = self.list_providers() + if len(providers) == 1: + werkzeug.exceptions.abort(werkzeug.utils.redirect(providers[0]['auth_link'], 303)) + response = super(OAuthLogin, self).web_auth_signup(*args, **kw) + response.qcontext.update(providers=providers) + return response + + @http.route() + def web_auth_reset_password(self, *args, **kw): + providers = self.list_providers() + if len(providers) == 1: + werkzeug.exceptions.abort(werkzeug.utils.redirect(providers[0]['auth_link'], 303)) + response = super(OAuthLogin, self).web_auth_reset_password(*args, **kw) + response.qcontext.update(providers=providers) + return response + class OAuthController(http.Controller): @http.route('/auth_oauth/signin', type='http', auth='none') diff --git a/addons/auth_oauth/views/auth_oauth_login.xml b/addons/auth_oauth/views/auth_oauth_login.xml index f969d2f5eed..6c5deca924c 100644 --- a/addons/auth_oauth/views/auth_oauth_login.xml +++ b/addons/auth_oauth/views/auth_oauth_login.xml @@ -3,15 +3,35 @@ --> + + + + + + diff --git a/addons/auth_oauth_signup/__init__.py b/addons/auth_oauth_signup/__init__.py deleted file mode 100644 index 7c73af367bd..00000000000 --- a/addons/auth_oauth_signup/__init__.py +++ /dev/null @@ -1,23 +0,0 @@ -# -*- coding: utf-8 -*- -############################################################################## -# -# OpenERP, Open Source Management Solution -# Copyright (C) 2012-today OpenERP SA () -# -# 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 res_users -import controllers diff --git a/addons/auth_oauth_signup/__openerp__.py b/addons/auth_oauth_signup/__openerp__.py deleted file mode 100644 index d3660f7c052..00000000000 --- a/addons/auth_oauth_signup/__openerp__.py +++ /dev/null @@ -1,41 +0,0 @@ -# -*- coding: utf-8 -*- -############################################################################## -# -# OpenERP, Open Source Management Solution -# Copyright (C) 2010-2014 OpenERP SA (). -# -# 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': 'Signup with OAuth2 Authentication', - 'version': '1.0', - 'category': 'Hidden', - 'description': """ -Allow users to sign up through OAuth2 Provider. -=============================================== -""", - 'author': 'OpenERP SA', - 'website': 'http://www.openerp.com', - 'depends': ['auth_oauth', 'auth_signup'], - 'data': [ - 'views/auth_oauth_signup.xml', - ], - 'js': [], - 'css': [], - 'qweb': [], - 'installable': True, - 'auto_install': True, -} diff --git a/addons/auth_oauth_signup/controllers/__init__.py b/addons/auth_oauth_signup/controllers/__init__.py deleted file mode 100644 index e11f9ba81bb..00000000000 --- a/addons/auth_oauth_signup/controllers/__init__.py +++ /dev/null @@ -1,3 +0,0 @@ -import main - -# vim:expandtab:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/auth_oauth_signup/controllers/main.py b/addons/auth_oauth_signup/controllers/main.py deleted file mode 100644 index 0b8ab22cdaa..00000000000 --- a/addons/auth_oauth_signup/controllers/main.py +++ /dev/null @@ -1,20 +0,0 @@ -import openerp -import werkzeug - -from openerp.http import request - -class OAuthSignupLogin(openerp.addons.web.controllers.main.Home): - def list_providers(self): - providers = super(OAuthSignupLogin, self).list_providers() - if len(providers) == 1 and request.params.get('mode') == 'signup': - werkzeug.exceptions.abort(werkzeug.utils.redirect(providers[0]['auth_link'], 303)) - return providers - - def get_state(self, provider): - state = super(OAuthSignupLogin, self).get_state(provider) - token = request.params.get('token') - if token: - state['t'] = token - return state - -# vim:expandtab:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/auth_oauth_signup/i18n/ar.po b/addons/auth_oauth_signup/i18n/ar.po deleted file mode 100644 index 9eeabd19d8b..00000000000 --- a/addons/auth_oauth_signup/i18n/ar.po +++ /dev/null @@ -1,23 +0,0 @@ -# Arabic translation for openobject-addons -# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013 -# This file is distributed under the same license as the openobject-addons package. -# FIRST AUTHOR , 2013. -# -msgid "" -msgstr "" -"Project-Id-Version: openobject-addons\n" -"Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2012-12-21 17:05+0000\n" -"PO-Revision-Date: 2013-11-26 18:16+0000\n" -"Last-Translator: FULL NAME \n" -"Language-Team: Arabic \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-01-28 06:41+0000\n" -"X-Generator: Launchpad (build 16914)\n" - -#. module: auth_oauth_signup -#: model:ir.model,name:auth_oauth_signup.model_res_users -msgid "Users" -msgstr "المستخدمين" diff --git a/addons/auth_oauth_signup/i18n/auth_oauth_signup.pot b/addons/auth_oauth_signup/i18n/auth_oauth_signup.pot deleted file mode 100644 index d4c0a829a7b..00000000000 --- a/addons/auth_oauth_signup/i18n/auth_oauth_signup.pot +++ /dev/null @@ -1,22 +0,0 @@ -# Translation of OpenERP Server. -# This file contains the translation of the following modules: -# * auth_oauth_signup -# -msgid "" -msgstr "" -"Project-Id-Version: OpenERP Server 7.0alpha\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-12-21 17:05+0000\n" -"PO-Revision-Date: 2012-12-21 17:05+0000\n" -"Last-Translator: <>\n" -"Language-Team: \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: \n" -"Plural-Forms: \n" - -#. module: auth_oauth_signup -#: model:ir.model,name:auth_oauth_signup.model_res_users -msgid "Users" -msgstr "" - diff --git a/addons/auth_oauth_signup/i18n/cs.po b/addons/auth_oauth_signup/i18n/cs.po deleted file mode 100644 index bf6f59f24fa..00000000000 --- a/addons/auth_oauth_signup/i18n/cs.po +++ /dev/null @@ -1,23 +0,0 @@ -# Czech translation for openobject-addons -# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013 -# This file is distributed under the same license as the openobject-addons package. -# FIRST AUTHOR , 2013. -# -msgid "" -msgstr "" -"Project-Id-Version: openobject-addons\n" -"Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2012-12-21 17:05+0000\n" -"PO-Revision-Date: 2014-02-03 16:54+0000\n" -"Last-Translator: Jakub Drozd \n" -"Language-Team: Czech \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-02-04 05:51+0000\n" -"X-Generator: Launchpad (build 16916)\n" - -#. module: auth_oauth_signup -#: model:ir.model,name:auth_oauth_signup.model_res_users -msgid "Users" -msgstr "Uživatelé" diff --git a/addons/auth_oauth_signup/i18n/da.po b/addons/auth_oauth_signup/i18n/da.po deleted file mode 100644 index 75b7032c1de..00000000000 --- a/addons/auth_oauth_signup/i18n/da.po +++ /dev/null @@ -1,23 +0,0 @@ -# Danish translation for openobject-addons -# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013 -# This file is distributed under the same license as the openobject-addons package. -# FIRST AUTHOR , 2013. -# -msgid "" -msgstr "" -"Project-Id-Version: openobject-addons\n" -"Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2012-12-21 17:05+0000\n" -"PO-Revision-Date: 2013-09-15 20:08+0000\n" -"Last-Translator: FULL NAME \n" -"Language-Team: Danish \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-01-28 06:41+0000\n" -"X-Generator: Launchpad (build 16914)\n" - -#. module: auth_oauth_signup -#: model:ir.model,name:auth_oauth_signup.model_res_users -msgid "Users" -msgstr "Bruger" diff --git a/addons/auth_oauth_signup/i18n/de.po b/addons/auth_oauth_signup/i18n/de.po deleted file mode 100644 index 57580243777..00000000000 --- a/addons/auth_oauth_signup/i18n/de.po +++ /dev/null @@ -1,23 +0,0 @@ -# German translation for openobject-addons -# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012 -# This file is distributed under the same license as the openobject-addons package. -# FIRST AUTHOR , 2012. -# -msgid "" -msgstr "" -"Project-Id-Version: openobject-addons\n" -"Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2012-12-21 17:05+0000\n" -"PO-Revision-Date: 2012-12-27 22:22+0000\n" -"Last-Translator: FULL NAME \n" -"Language-Team: German \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-01-28 06:41+0000\n" -"X-Generator: Launchpad (build 16914)\n" - -#. module: auth_oauth_signup -#: model:ir.model,name:auth_oauth_signup.model_res_users -msgid "Users" -msgstr "Benutzer" diff --git a/addons/auth_oauth_signup/i18n/en_GB.po b/addons/auth_oauth_signup/i18n/en_GB.po deleted file mode 100644 index 699939d57b7..00000000000 --- a/addons/auth_oauth_signup/i18n/en_GB.po +++ /dev/null @@ -1,23 +0,0 @@ -# English (United Kingdom) translation for openobject-addons -# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013 -# This file is distributed under the same license as the openobject-addons package. -# FIRST AUTHOR , 2013. -# -msgid "" -msgstr "" -"Project-Id-Version: openobject-addons\n" -"Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2012-12-21 17:05+0000\n" -"PO-Revision-Date: 2013-02-06 14:33+0000\n" -"Last-Translator: FULL NAME \n" -"Language-Team: English (United Kingdom) \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-01-28 06:41+0000\n" -"X-Generator: Launchpad (build 16914)\n" - -#. module: auth_oauth_signup -#: model:ir.model,name:auth_oauth_signup.model_res_users -msgid "Users" -msgstr "Users" diff --git a/addons/auth_oauth_signup/i18n/es.po b/addons/auth_oauth_signup/i18n/es.po deleted file mode 100644 index 072378eeaa7..00000000000 --- a/addons/auth_oauth_signup/i18n/es.po +++ /dev/null @@ -1,23 +0,0 @@ -# Spanish translation for openobject-addons -# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012 -# This file is distributed under the same license as the openobject-addons package. -# FIRST AUTHOR , 2012. -# -msgid "" -msgstr "" -"Project-Id-Version: openobject-addons\n" -"Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2012-12-21 17:05+0000\n" -"PO-Revision-Date: 2012-12-27 11:38+0000\n" -"Last-Translator: Pedro Manuel Baeza \n" -"Language-Team: Spanish \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-01-28 06:41+0000\n" -"X-Generator: Launchpad (build 16914)\n" - -#. module: auth_oauth_signup -#: model:ir.model,name:auth_oauth_signup.model_res_users -msgid "Users" -msgstr "Usuarios" diff --git a/addons/auth_oauth_signup/i18n/et.po b/addons/auth_oauth_signup/i18n/et.po deleted file mode 100644 index 25c2888fea1..00000000000 --- a/addons/auth_oauth_signup/i18n/et.po +++ /dev/null @@ -1,23 +0,0 @@ -# Estonian translation for openobject-addons -# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013 -# This file is distributed under the same license as the openobject-addons package. -# FIRST AUTHOR , 2013. -# -msgid "" -msgstr "" -"Project-Id-Version: openobject-addons\n" -"Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2012-12-21 17:05+0000\n" -"PO-Revision-Date: 2013-10-09 14:34+0000\n" -"Last-Translator: FULL NAME \n" -"Language-Team: Estonian \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-01-28 06:41+0000\n" -"X-Generator: Launchpad (build 16914)\n" - -#. module: auth_oauth_signup -#: model:ir.model,name:auth_oauth_signup.model_res_users -msgid "Users" -msgstr "Kasutajad" diff --git a/addons/auth_oauth_signup/i18n/fr.po b/addons/auth_oauth_signup/i18n/fr.po deleted file mode 100644 index 02544f189c5..00000000000 --- a/addons/auth_oauth_signup/i18n/fr.po +++ /dev/null @@ -1,23 +0,0 @@ -# French translation for openobject-addons -# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012 -# This file is distributed under the same license as the openobject-addons package. -# FIRST AUTHOR , 2012. -# -msgid "" -msgstr "" -"Project-Id-Version: openobject-addons\n" -"Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2012-12-21 17:05+0000\n" -"PO-Revision-Date: 2012-12-29 16:08+0000\n" -"Last-Translator: FULL NAME \n" -"Language-Team: French \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-01-28 06:41+0000\n" -"X-Generator: Launchpad (build 16914)\n" - -#. module: auth_oauth_signup -#: model:ir.model,name:auth_oauth_signup.model_res_users -msgid "Users" -msgstr "Utilisateurs" diff --git a/addons/auth_oauth_signup/i18n/gl.po b/addons/auth_oauth_signup/i18n/gl.po deleted file mode 100644 index 463caea11c3..00000000000 --- a/addons/auth_oauth_signup/i18n/gl.po +++ /dev/null @@ -1,23 +0,0 @@ -# Galician translation for openobject-addons -# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014 -# This file is distributed under the same license as the openobject-addons package. -# FIRST AUTHOR , 2014. -# -msgid "" -msgstr "" -"Project-Id-Version: openobject-addons\n" -"Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2012-12-21 17:05+0000\n" -"PO-Revision-Date: 2014-02-05 16:37+0000\n" -"Last-Translator: FULL NAME \n" -"Language-Team: Galician \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-02-06 05:33+0000\n" -"X-Generator: Launchpad (build 16916)\n" - -#. module: auth_oauth_signup -#: model:ir.model,name:auth_oauth_signup.model_res_users -msgid "Users" -msgstr "Usuarios" diff --git a/addons/auth_oauth_signup/i18n/hr.po b/addons/auth_oauth_signup/i18n/hr.po deleted file mode 100644 index c3cc0238ca0..00000000000 --- a/addons/auth_oauth_signup/i18n/hr.po +++ /dev/null @@ -1,23 +0,0 @@ -# Croatian translation for openobject-addons -# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013 -# This file is distributed under the same license as the openobject-addons package. -# FIRST AUTHOR , 2013. -# -msgid "" -msgstr "" -"Project-Id-Version: openobject-addons\n" -"Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2012-12-21 17:05+0000\n" -"PO-Revision-Date: 2013-01-24 12:30+0000\n" -"Last-Translator: FULL NAME \n" -"Language-Team: Croatian \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-01-28 06:41+0000\n" -"X-Generator: Launchpad (build 16914)\n" - -#. module: auth_oauth_signup -#: model:ir.model,name:auth_oauth_signup.model_res_users -msgid "Users" -msgstr "Korisnici" diff --git a/addons/auth_oauth_signup/i18n/hu.po b/addons/auth_oauth_signup/i18n/hu.po deleted file mode 100644 index eaed110eeeb..00000000000 --- a/addons/auth_oauth_signup/i18n/hu.po +++ /dev/null @@ -1,23 +0,0 @@ -# Hungarian translation for openobject-addons -# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013 -# This file is distributed under the same license as the openobject-addons package. -# FIRST AUTHOR , 2013. -# -msgid "" -msgstr "" -"Project-Id-Version: openobject-addons\n" -"Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2012-12-21 17:05+0000\n" -"PO-Revision-Date: 2013-03-19 18:13+0000\n" -"Last-Translator: FULL NAME \n" -"Language-Team: Hungarian \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-01-28 06:41+0000\n" -"X-Generator: Launchpad (build 16914)\n" - -#. module: auth_oauth_signup -#: model:ir.model,name:auth_oauth_signup.model_res_users -msgid "Users" -msgstr "Felhasználók" diff --git a/addons/auth_oauth_signup/i18n/it.po b/addons/auth_oauth_signup/i18n/it.po deleted file mode 100644 index 4c01dc40d00..00000000000 --- a/addons/auth_oauth_signup/i18n/it.po +++ /dev/null @@ -1,23 +0,0 @@ -# Italian translation for openobject-addons -# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012 -# This file is distributed under the same license as the openobject-addons package. -# FIRST AUTHOR , 2012. -# -msgid "" -msgstr "" -"Project-Id-Version: openobject-addons\n" -"Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2012-12-21 17:05+0000\n" -"PO-Revision-Date: 2012-12-27 09:12+0000\n" -"Last-Translator: FULL NAME \n" -"Language-Team: Italian \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-01-28 06:41+0000\n" -"X-Generator: Launchpad (build 16914)\n" - -#. module: auth_oauth_signup -#: model:ir.model,name:auth_oauth_signup.model_res_users -msgid "Users" -msgstr "Utenti" diff --git a/addons/auth_oauth_signup/i18n/lt.po b/addons/auth_oauth_signup/i18n/lt.po deleted file mode 100644 index 6cf0153f69f..00000000000 --- a/addons/auth_oauth_signup/i18n/lt.po +++ /dev/null @@ -1,23 +0,0 @@ -# Lithuanian translation for openobject-addons -# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013 -# This file is distributed under the same license as the openobject-addons package. -# FIRST AUTHOR , 2013. -# -msgid "" -msgstr "" -"Project-Id-Version: openobject-addons\n" -"Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2012-12-21 17:05+0000\n" -"PO-Revision-Date: 2013-04-24 18:21+0000\n" -"Last-Translator: FULL NAME \n" -"Language-Team: Lithuanian \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-01-28 06:41+0000\n" -"X-Generator: Launchpad (build 16914)\n" - -#. module: auth_oauth_signup -#: model:ir.model,name:auth_oauth_signup.model_res_users -msgid "Users" -msgstr "Naudotojai" diff --git a/addons/auth_oauth_signup/i18n/mk.po b/addons/auth_oauth_signup/i18n/mk.po deleted file mode 100644 index 3afed5fe7b3..00000000000 --- a/addons/auth_oauth_signup/i18n/mk.po +++ /dev/null @@ -1,23 +0,0 @@ -# Macedonian translation for openobject-addons -# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013 -# This file is distributed under the same license as the openobject-addons package. -# FIRST AUTHOR , 2013. -# -msgid "" -msgstr "" -"Project-Id-Version: openobject-addons\n" -"Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2012-12-21 17:05+0000\n" -"PO-Revision-Date: 2013-02-28 14:54+0000\n" -"Last-Translator: FULL NAME \n" -"Language-Team: Macedonian \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-01-28 06:41+0000\n" -"X-Generator: Launchpad (build 16914)\n" - -#. module: auth_oauth_signup -#: model:ir.model,name:auth_oauth_signup.model_res_users -msgid "Users" -msgstr "Корисници" diff --git a/addons/auth_oauth_signup/i18n/mn.po b/addons/auth_oauth_signup/i18n/mn.po deleted file mode 100644 index 8c45059310f..00000000000 --- a/addons/auth_oauth_signup/i18n/mn.po +++ /dev/null @@ -1,23 +0,0 @@ -# Mongolian translation for openobject-addons -# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013 -# This file is distributed under the same license as the openobject-addons package. -# FIRST AUTHOR , 2013. -# -msgid "" -msgstr "" -"Project-Id-Version: openobject-addons\n" -"Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2012-12-21 17:05+0000\n" -"PO-Revision-Date: 2013-02-06 07:44+0000\n" -"Last-Translator: FULL NAME \n" -"Language-Team: Mongolian \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-01-28 06:41+0000\n" -"X-Generator: Launchpad (build 16914)\n" - -#. module: auth_oauth_signup -#: model:ir.model,name:auth_oauth_signup.model_res_users -msgid "Users" -msgstr "Хэрэглэгчид" diff --git a/addons/auth_oauth_signup/i18n/nl.po b/addons/auth_oauth_signup/i18n/nl.po deleted file mode 100644 index 5029138c5d9..00000000000 --- a/addons/auth_oauth_signup/i18n/nl.po +++ /dev/null @@ -1,23 +0,0 @@ -# Dutch translation for openobject-addons -# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012 -# This file is distributed under the same license as the openobject-addons package. -# FIRST AUTHOR , 2012. -# -msgid "" -msgstr "" -"Project-Id-Version: openobject-addons\n" -"Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2012-12-21 17:05+0000\n" -"PO-Revision-Date: 2012-12-27 09:12+0000\n" -"Last-Translator: FULL NAME \n" -"Language-Team: Dutch \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-01-28 06:41+0000\n" -"X-Generator: Launchpad (build 16914)\n" - -#. module: auth_oauth_signup -#: model:ir.model,name:auth_oauth_signup.model_res_users -msgid "Users" -msgstr "Gebruikers" diff --git a/addons/auth_oauth_signup/i18n/nl_BE.po b/addons/auth_oauth_signup/i18n/nl_BE.po deleted file mode 100644 index 2366d0844f2..00000000000 --- a/addons/auth_oauth_signup/i18n/nl_BE.po +++ /dev/null @@ -1,23 +0,0 @@ -# Dutch (Belgium) translation for openobject-addons -# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013 -# This file is distributed under the same license as the openobject-addons package. -# FIRST AUTHOR , 2013. -# -msgid "" -msgstr "" -"Project-Id-Version: openobject-addons\n" -"Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2012-12-21 17:05+0000\n" -"PO-Revision-Date: 2013-04-15 16:01+0000\n" -"Last-Translator: Els Van Vossel (Foxy) \n" -"Language-Team: Dutch (Belgium) \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-01-28 06:41+0000\n" -"X-Generator: Launchpad (build 16914)\n" - -#. module: auth_oauth_signup -#: model:ir.model,name:auth_oauth_signup.model_res_users -msgid "Users" -msgstr "Gebruikers" diff --git a/addons/auth_oauth_signup/i18n/pl.po b/addons/auth_oauth_signup/i18n/pl.po deleted file mode 100644 index c0e6153a430..00000000000 --- a/addons/auth_oauth_signup/i18n/pl.po +++ /dev/null @@ -1,23 +0,0 @@ -# Polish translation for openobject-addons -# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013 -# This file is distributed under the same license as the openobject-addons package. -# FIRST AUTHOR , 2013. -# -msgid "" -msgstr "" -"Project-Id-Version: openobject-addons\n" -"Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2012-12-21 17:05+0000\n" -"PO-Revision-Date: 2013-11-14 12:00+0000\n" -"Last-Translator: FULL NAME \n" -"Language-Team: Polish \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-01-28 06:41+0000\n" -"X-Generator: Launchpad (build 16914)\n" - -#. module: auth_oauth_signup -#: model:ir.model,name:auth_oauth_signup.model_res_users -msgid "Users" -msgstr "Użytkownicy" diff --git a/addons/auth_oauth_signup/i18n/pt.po b/addons/auth_oauth_signup/i18n/pt.po deleted file mode 100644 index c0664b109b7..00000000000 --- a/addons/auth_oauth_signup/i18n/pt.po +++ /dev/null @@ -1,23 +0,0 @@ -# Portuguese translation for openobject-addons -# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013 -# This file is distributed under the same license as the openobject-addons package. -# FIRST AUTHOR , 2013. -# -msgid "" -msgstr "" -"Project-Id-Version: openobject-addons\n" -"Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2012-12-21 17:05+0000\n" -"PO-Revision-Date: 2013-01-08 17:56+0000\n" -"Last-Translator: FULL NAME \n" -"Language-Team: Portuguese \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-01-28 06:41+0000\n" -"X-Generator: Launchpad (build 16914)\n" - -#. module: auth_oauth_signup -#: model:ir.model,name:auth_oauth_signup.model_res_users -msgid "Users" -msgstr "Utilizadores" diff --git a/addons/auth_oauth_signup/i18n/pt_BR.po b/addons/auth_oauth_signup/i18n/pt_BR.po deleted file mode 100644 index 2d50e76837a..00000000000 --- a/addons/auth_oauth_signup/i18n/pt_BR.po +++ /dev/null @@ -1,23 +0,0 @@ -# Brazilian Portuguese translation for openobject-addons -# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013 -# This file is distributed under the same license as the openobject-addons package. -# FIRST AUTHOR , 2013. -# -msgid "" -msgstr "" -"Project-Id-Version: openobject-addons\n" -"Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2012-12-21 17:05+0000\n" -"PO-Revision-Date: 2013-01-02 11:56+0000\n" -"Last-Translator: FULL NAME \n" -"Language-Team: Brazilian Portuguese \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-01-28 06:41+0000\n" -"X-Generator: Launchpad (build 16914)\n" - -#. module: auth_oauth_signup -#: model:ir.model,name:auth_oauth_signup.model_res_users -msgid "Users" -msgstr "Usuários" diff --git a/addons/auth_oauth_signup/i18n/ro.po b/addons/auth_oauth_signup/i18n/ro.po deleted file mode 100644 index 5d2593b66b4..00000000000 --- a/addons/auth_oauth_signup/i18n/ro.po +++ /dev/null @@ -1,23 +0,0 @@ -# Romanian translation for openobject-addons -# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013 -# This file is distributed under the same license as the openobject-addons package. -# FIRST AUTHOR , 2013. -# -msgid "" -msgstr "" -"Project-Id-Version: openobject-addons\n" -"Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2012-12-21 17:05+0000\n" -"PO-Revision-Date: 2013-01-14 19:07+0000\n" -"Last-Translator: FULL NAME \n" -"Language-Team: Romanian \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-01-28 06:41+0000\n" -"X-Generator: Launchpad (build 16914)\n" - -#. module: auth_oauth_signup -#: model:ir.model,name:auth_oauth_signup.model_res_users -msgid "Users" -msgstr "Utilizatori" diff --git a/addons/auth_oauth_signup/i18n/ru.po b/addons/auth_oauth_signup/i18n/ru.po deleted file mode 100644 index e60c290f8e3..00000000000 --- a/addons/auth_oauth_signup/i18n/ru.po +++ /dev/null @@ -1,23 +0,0 @@ -# Russian translation for openobject-addons -# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013 -# This file is distributed under the same license as the openobject-addons package. -# FIRST AUTHOR , 2013. -# -msgid "" -msgstr "" -"Project-Id-Version: openobject-addons\n" -"Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2012-12-21 17:05+0000\n" -"PO-Revision-Date: 2013-02-13 09:46+0000\n" -"Last-Translator: FULL NAME \n" -"Language-Team: Russian \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-01-28 06:41+0000\n" -"X-Generator: Launchpad (build 16914)\n" - -#. module: auth_oauth_signup -#: model:ir.model,name:auth_oauth_signup.model_res_users -msgid "Users" -msgstr "Пользователи" diff --git a/addons/auth_oauth_signup/i18n/sl.po b/addons/auth_oauth_signup/i18n/sl.po deleted file mode 100644 index a7acd1ceacc..00000000000 --- a/addons/auth_oauth_signup/i18n/sl.po +++ /dev/null @@ -1,23 +0,0 @@ -# Slovenian translation for openobject-addons -# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012 -# This file is distributed under the same license as the openobject-addons package. -# FIRST AUTHOR , 2012. -# -msgid "" -msgstr "" -"Project-Id-Version: openobject-addons\n" -"Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2012-12-21 17:05+0000\n" -"PO-Revision-Date: 2012-12-30 09:36+0000\n" -"Last-Translator: FULL NAME \n" -"Language-Team: Slovenian \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-01-28 06:41+0000\n" -"X-Generator: Launchpad (build 16914)\n" - -#. module: auth_oauth_signup -#: model:ir.model,name:auth_oauth_signup.model_res_users -msgid "Users" -msgstr "Uporabniki" diff --git a/addons/auth_oauth_signup/i18n/sv.po b/addons/auth_oauth_signup/i18n/sv.po deleted file mode 100644 index 93350614b98..00000000000 --- a/addons/auth_oauth_signup/i18n/sv.po +++ /dev/null @@ -1,23 +0,0 @@ -# Swedish translation for openobject-addons -# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013 -# This file is distributed under the same license as the openobject-addons package. -# FIRST AUTHOR , 2013. -# -msgid "" -msgstr "" -"Project-Id-Version: openobject-addons\n" -"Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2012-12-21 17:05+0000\n" -"PO-Revision-Date: 2013-01-17 23:47+0000\n" -"Last-Translator: FULL NAME \n" -"Language-Team: Swedish \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-01-28 06:41+0000\n" -"X-Generator: Launchpad (build 16914)\n" - -#. module: auth_oauth_signup -#: model:ir.model,name:auth_oauth_signup.model_res_users -msgid "Users" -msgstr "Användare" diff --git a/addons/auth_oauth_signup/i18n/tr.po b/addons/auth_oauth_signup/i18n/tr.po deleted file mode 100644 index 4b61dc5a190..00000000000 --- a/addons/auth_oauth_signup/i18n/tr.po +++ /dev/null @@ -1,23 +0,0 @@ -# Turkish translation for openobject-addons -# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013 -# This file is distributed under the same license as the openobject-addons package. -# FIRST AUTHOR , 2013. -# -msgid "" -msgstr "" -"Project-Id-Version: openobject-addons\n" -"Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2012-12-21 17:05+0000\n" -"PO-Revision-Date: 2013-02-03 12:07+0000\n" -"Last-Translator: Ahmet Altınışık \n" -"Language-Team: Turkish \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-01-28 06:41+0000\n" -"X-Generator: Launchpad (build 16914)\n" - -#. module: auth_oauth_signup -#: model:ir.model,name:auth_oauth_signup.model_res_users -msgid "Users" -msgstr "Kullanıcılar" diff --git a/addons/auth_oauth_signup/i18n/vi.po b/addons/auth_oauth_signup/i18n/vi.po deleted file mode 100644 index 086df785f57..00000000000 --- a/addons/auth_oauth_signup/i18n/vi.po +++ /dev/null @@ -1,23 +0,0 @@ -# Vietnamese translation for openobject-addons -# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013 -# This file is distributed under the same license as the openobject-addons package. -# FIRST AUTHOR , 2013. -# -msgid "" -msgstr "" -"Project-Id-Version: openobject-addons\n" -"Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2012-12-21 17:05+0000\n" -"PO-Revision-Date: 2013-06-27 06:49+0000\n" -"Last-Translator: FULL NAME \n" -"Language-Team: Vietnamese \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-01-28 06:41+0000\n" -"X-Generator: Launchpad (build 16914)\n" - -#. module: auth_oauth_signup -#: model:ir.model,name:auth_oauth_signup.model_res_users -msgid "Users" -msgstr "Người dùng" diff --git a/addons/auth_oauth_signup/i18n/zh_CN.po b/addons/auth_oauth_signup/i18n/zh_CN.po deleted file mode 100644 index f3009f88142..00000000000 --- a/addons/auth_oauth_signup/i18n/zh_CN.po +++ /dev/null @@ -1,23 +0,0 @@ -# Chinese (Simplified) translation for openobject-addons -# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012 -# This file is distributed under the same license as the openobject-addons package. -# FIRST AUTHOR , 2012. -# -msgid "" -msgstr "" -"Project-Id-Version: openobject-addons\n" -"Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2012-12-21 17:05+0000\n" -"PO-Revision-Date: 2013-01-02 10:59+0000\n" -"Last-Translator: Oliver Yuan \n" -"Language-Team: Chinese (Simplified) \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-01-28 06:41+0000\n" -"X-Generator: Launchpad (build 16914)\n" - -#. module: auth_oauth_signup -#: model:ir.model,name:auth_oauth_signup.model_res_users -msgid "Users" -msgstr "用户" diff --git a/addons/auth_oauth_signup/i18n/zh_TW.po b/addons/auth_oauth_signup/i18n/zh_TW.po deleted file mode 100644 index 0e3e0b23c3b..00000000000 --- a/addons/auth_oauth_signup/i18n/zh_TW.po +++ /dev/null @@ -1,23 +0,0 @@ -# Chinese (Traditional) translation for openobject-addons -# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013 -# This file is distributed under the same license as the openobject-addons package. -# FIRST AUTHOR , 2013. -# -msgid "" -msgstr "" -"Project-Id-Version: openobject-addons\n" -"Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2012-12-21 17:05+0000\n" -"PO-Revision-Date: 2013-01-30 13:18+0000\n" -"Last-Translator: FULL NAME \n" -"Language-Team: Chinese (Traditional) \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-01-28 06:41+0000\n" -"X-Generator: Launchpad (build 16914)\n" - -#. module: auth_oauth_signup -#: model:ir.model,name:auth_oauth_signup.model_res_users -msgid "Users" -msgstr "使用者" diff --git a/addons/auth_oauth_signup/res_users.py b/addons/auth_oauth_signup/res_users.py deleted file mode 100644 index a06968fa46f..00000000000 --- a/addons/auth_oauth_signup/res_users.py +++ /dev/null @@ -1,60 +0,0 @@ -# -*- coding: utf-8 -*- -############################################################################## -# -# OpenERP, Open Source Management Solution -# Copyright (C) 2010-2012 OpenERP SA (). -# -# 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 logging -import simplejson - -import openerp -from openerp.addons.auth_signup.res_users import SignupError -from openerp.osv import osv, fields - -_logger = logging.getLogger(__name__) - -class res_users(osv.Model): - _inherit = 'res.users' - - def _auth_oauth_signin(self, cr, uid, provider, validation, params, context=None): - # overridden to use signup method if regular oauth signin fails - try: - login = super(res_users, self)._auth_oauth_signin(cr, uid, provider, validation, params, context=context) - - except openerp.exceptions.AccessDenied, access_denied_exception: - if context and context.get('no_user_creation'): - return None - state = simplejson.loads(params['state']) - token = state.get('t') - oauth_uid = validation['user_id'] - email = validation.get('email', 'provider_%s_user_%s' % (provider, oauth_uid)) - name = validation.get('name', email) - values = { - 'name': name, - 'login': email, - 'email': email, - 'oauth_provider_id': provider, - 'oauth_uid': oauth_uid, - 'oauth_access_token': params['access_token'], - 'active': True, - } - try: - _, login, _ = self.signup(cr, uid, values, token, context=context) - except SignupError: - raise access_denied_exception - return login diff --git a/addons/auth_oauth_signup/views/auth_oauth_signup.xml b/addons/auth_oauth_signup/views/auth_oauth_signup.xml deleted file mode 100644 index 139f36a4c0f..00000000000 --- a/addons/auth_oauth_signup/views/auth_oauth_signup.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - diff --git a/addons/auth_signup/__openerp__.py b/addons/auth_signup/__openerp__.py index 50402207018..2aaaf61d3dd 100644 --- a/addons/auth_signup/__openerp__.py +++ b/addons/auth_signup/__openerp__.py @@ -42,6 +42,6 @@ Allow users to sign up and reset their password 'res_users_view.xml', 'views/auth_signup_login.xml', ], - 'js': ['static/src/js/auth_signup.js'], + 'js': [], 'bootstrap': True, } diff --git a/addons/auth_signup/controllers/main.py b/addons/auth_signup/controllers/main.py index f6c466b7123..78f2833f3d1 100644 --- a/addons/auth_signup/controllers/main.py +++ b/addons/auth_signup/controllers/main.py @@ -19,83 +19,100 @@ # ############################################################################## import logging +import werkzeug import openerp -import openerp.addons.web.controllers.main as webmain from openerp.addons.auth_signup.res_users import SignupError +from openerp.addons.web.controllers.main import ensure_db from openerp import http from openerp.http import request from openerp.tools.translate import _ -from openerp.tools import exception_to_unicode _logger = logging.getLogger(__name__) -class AuthSignup(openerp.addons.web.controllers.main.Home): +class AuthSignupHome(openerp.addons.web.controllers.main.Home): @http.route() def web_login(self, *args, **kw): - mode = request.params.get('mode') + ensure_db() + response = super(AuthSignupHome, self).web_login(*args, **kw) + response.qcontext.update(self.get_auth_signup_config()) + return response + + @http.route('/web/signup', type='http', auth='public', website=True, multilang=True) + def web_auth_signup(self, *args, **kw): + qcontext = self.get_auth_signup_qcontext() + + if not qcontext.get('token') and not qcontext.get('signup_enabled'): + raise werkzeug.exceptions.NotFound() + + if 'error' not in qcontext and request.httprequest.method == 'POST': + try: + self.do_signup(qcontext) + return super(AuthSignupHome, self).web_login(*args, **kw) + except (SignupError, AssertionError), e: + qcontext['error'] = _(e.message) + + return request.render('auth_signup.signup', qcontext) + + @http.route('/web/reset_password', type='http', auth='public', website=True, multilang=True) + def web_auth_reset_password(self, *args, **kw): + qcontext = self.get_auth_signup_qcontext() + + if not qcontext.get('token') and not qcontext.get('reset_password_enabled'): + raise werkzeug.exceptions.NotFound() + + if 'error' not in qcontext and request.httprequest.method == 'POST': + try: + if qcontext.get('token'): + self.do_signup(qcontext) + return super(AuthSignupHome, self).web_login(*args, **kw) + else: + login = qcontext.get('login') + assert login, "No login provided." + res_users = request.registry.get('res.users') + res_users.reset_password(request.cr, openerp.SUPERUSER_ID, login) + qcontext['message'] = _("An email has been sent with credentials to reset your password") + except SignupError: + qcontext['error'] = _("Could not reset your password") + _logger.exception('error when resetting password') + except Exception, e: + qcontext['error'] = _(e.message) + + + return request.render('auth_signup.reset_password', qcontext) + + def get_auth_signup_config(self): + """retrieve the module config (which features are enabled) for the login page""" + + icp = request.registry.get('ir.config_parameter') + return { + 'signup_enabled': icp.get_param(request.cr, openerp.SUPERUSER_ID, 'auth_signup.allow_uninvited') == 'True', + 'reset_password_enabled': icp.get_param(request.cr, openerp.SUPERUSER_ID, 'auth_signup.reset_password') == 'True', + } + + def get_auth_signup_qcontext(self): + """ Shared helper returning the rendering context for signup and reset password """ qcontext = request.params.copy() - super_response = None - if request.httprequest.method != 'POST' or mode not in ('reset', 'signup'): - # Default behavior is to try to login, which in reset or signup mode in a non-sense. - super_response = super(AuthSignup, self).web_login(*args, **kw) - response = webmain.render_bootstrap_template('auth_signup.signup', qcontext) - if super_response.is_qweb: - response.qcontext.update(super_response.qcontext) - token = qcontext.get('token', None) - token_infos = None - if token: + qcontext.update(self.get_auth_signup_config()) + if qcontext.get('token'): try: # retrieve the user info (name, login or email) corresponding to a signup token res_partner = request.registry.get('res.partner') - token_infos = res_partner.signup_retrieve_info(request.cr, openerp.SUPERUSER_ID, token) + token_infos = res_partner.signup_retrieve_info(request.cr, openerp.SUPERUSER_ID, qcontext.get('token')) for k, v in token_infos.items(): qcontext.setdefault(k, v) except: qcontext['error'] = _("Invalid signup token") - response.params['template'] = 'web.login' - return response + return qcontext - # retrieve the module config (which features are enabled) for the login page - icp = request.registry.get('ir.config_parameter') - config = { - 'signup': icp.get_param(request.cr, openerp.SUPERUSER_ID, 'auth_signup.allow_uninvited') == 'True', - 'reset': icp.get_param(request.cr, openerp.SUPERUSER_ID, 'auth_signup.reset_password') == 'True', - } - qcontext.update(config) - - if 'error' in request.params or mode not in ('reset', 'signup') or (not token and not config[mode]): - if super_response.is_qweb: - super_response.qcontext.update(config) - return super_response - - if request.httprequest.method == 'GET': - if token_infos: - qcontext.update(token_infos) - else: - res_users = request.registry.get('res.users') - login = request.params.get('login') - if mode == 'reset' and not token: - try: - res_users.reset_password(request.cr, openerp.SUPERUSER_ID, login) - qcontext['message'] = _("An email has been sent with credentials to reset your password") - response.params['template'] = 'web.login' - except Exception, e: - qcontext['error'] = exception_to_unicode(e) or _("Could not reset your password") - _logger.exception('error when resetting password') - else: - values = dict((key, qcontext.get(key)) for key in ('login', 'name', 'password')) - try: - self._signup_with_values(token, values) - redirect = request.params.get('redirect') - if not redirect: - redirect = '/web?' + request.httprequest.query_string - return http.redirect_with_hash(redirect) - except SignupError, e: - qcontext['error'] = exception_to_unicode(e) - - return response + def do_signup(self, qcontext): + """ Shared helper that creates a res.partner out of a token """ + values = dict((key, qcontext.get(key)) for key in ('login', 'name', 'password')) + assert any([k for k in values.values()]), "The form was not properly filled in." + assert values.get('password') == qcontext.get('confirm_password'), "Passwords do not match; please retype them." + self._signup_with_values(qcontext.get('token'), values) + request.cr.commit() def _signup_with_values(self, token, values): db, login, password = request.registry['res.users'].signup(request.cr, openerp.SUPERUSER_ID, values, token) @@ -104,5 +121,4 @@ class AuthSignup(openerp.addons.web.controllers.main.Home): if not uid: raise SignupError(_('Authentification Failed.')) - # vim:expandtab:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/auth_signup/res_users.py b/addons/auth_signup/res_users.py index e91af657cc2..4c1c1a671b7 100644 --- a/addons/auth_signup/res_users.py +++ b/addons/auth_signup/res_users.py @@ -66,11 +66,12 @@ class res_partner(osv.Model): self.signup_prepare(cr, uid, [partner.id], context=context) partner.refresh() + route = 'login' # the parameters to encode for the query query = dict(db=cr.dbname) signup_type = context.get('signup_force_type_in_url', partner.signup_type or '') if signup_type: - query['mode'] = signup_type + route = 'reset_password' if signup_type == 'reset' else signup_type if partner.signup_token and signup_type: query['token'] = partner.signup_token @@ -89,7 +90,7 @@ class res_partner(osv.Model): if res_id: fragment['id'] = res_id - res[partner.id] = urljoin(base_url, "/web/login?%s#%s" % (urlencode(query), urlencode(fragment))) + res[partner.id] = urljoin(base_url, "/web/%s?%s#%s" % (route, urlencode(query), urlencode(fragment))) return res diff --git a/addons/auth_signup/static/src/js/auth_signup.js b/addons/auth_signup/static/src/js/auth_signup.js deleted file mode 100644 index a317440fd6b..00000000000 --- a/addons/auth_signup/static/src/js/auth_signup.js +++ /dev/null @@ -1,19 +0,0 @@ -openerp.auth_signup = function(instance) { - openerp.web.LoginForm.include({ - start: function () { - var self = this; - this.$el.on('submit', function () { - var password = self.get_password_field('password'); - var confirm_password = self.get_password_field('confirm_password'); - if (password && confirm_password && (password.value != confirm_password.value)) { - alert("Passwords do not match; please retype them."); - return false; - } - }); - }, - get_password_field: function (field) { - var selector = 'input[name="' + field + '"][type="password"]:visible'; - return this.$(selector)[0]; - }, - }); -}; diff --git a/addons/auth_signup/views/auth_signup_login.xml b/addons/auth_signup/views/auth_signup_login.xml index a9e43c86f4f..ae813cc14ac 100644 --- a/addons/auth_signup/views/auth_signup_login.xml +++ b/addons/auth_signup/views/auth_signup_login.xml @@ -5,85 +5,95 @@ - diff --git a/addons/website_event/controllers/main.py b/addons/website_event/controllers/main.py index 2a6e1d134e3..af7f77d080f 100644 --- a/addons/website_event/controllers/main.py +++ b/addons/website_event/controllers/main.py @@ -187,18 +187,6 @@ class website_event(http.Controller): } return request.website.render("website_event.event_description_full", values) - @http.route(['/event/publish'], type='json', auth="public", website=True) - def publish(self, id, object): - # if a user publish an event, he publish all linked res.partner - event = request.registry[object].browse(request.cr, request.uid, int(id)) - if not event.website_published: - if event.organizer_id and not event.organizer_id.website_published: - event.organizer_id.write({'website_published': True}) - if event.address_id and not event.address_id.website_published: - event.address_id.write({'website_published': True}) - - return controllers.publish(id, object) - @http.route('/event/add_event/', type='http', auth="user", multilang=True, methods=['POST'], website=True) def add_event(self, event_name="New Event", **kwargs): return self._add_event(event_name, request.context, **kwargs) diff --git a/addons/website_event/views/website_event.xml b/addons/website_event/views/website_event.xml index d002521b021..b057aaa7c5d 100644 --- a/addons/website_event/views/website_event.xml +++ b/addons/website_event/views/website_event.xml @@ -189,11 +189,6 @@
- - - - /event/publish -
@@ -266,7 +261,6 @@ - /event/publish diff --git a/addons/website_event_track/views/website_event.xml b/addons/website_event_track/views/website_event.xml index 14ed725ba5b..b9db5aaa2f0 100644 --- a/addons/website_event_track/views/website_event.xml +++ b/addons/website_event_track/views/website_event.xml @@ -194,6 +194,12 @@