diff --git a/addons/account/i18n/ru.po b/addons/account/i18n/ru.po index 3554acbbb25..7c0e12834fe 100644 --- a/addons/account/i18n/ru.po +++ b/addons/account/i18n/ru.po @@ -7,14 +7,14 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2012-02-08 00:35+0000\n" -"PO-Revision-Date: 2012-05-10 17:32+0000\n" -"Last-Translator: Michael Otcheskih \n" +"PO-Revision-Date: 2012-08-17 11:07+0000\n" +"Last-Translator: Chertykov Denis \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-07 05:06+0000\n" -"X-Generator: Launchpad (build 15745)\n" +"X-Launchpad-Export-Date: 2012-08-18 04:58+0000\n" +"X-Generator: Launchpad (build 15810)\n" #. module: account #: view:account.invoice.report:0 @@ -9872,7 +9872,7 @@ msgstr "Не определен счет доходов для ТМЦ: \"%s\" (i #. module: account #: constraint:account.move.line:0 msgid "You can not create journal items on closed account." -msgstr "" +msgstr "Нельзя создать элемент журнала по закрытому счету ." #. module: account #: field:account.account,unrealized_gain_loss:0 diff --git a/addons/account/test/account_change_currency.yml b/addons/account/test/account_change_currency.yml index 1f1a412c19e..5f06a20b1ab 100644 --- a/addons/account/test/account_change_currency.yml +++ b/addons/account/test/account_change_currency.yml @@ -7,7 +7,7 @@ currency_id: base.EUR invoice_line: - account_id: account.a_sale - name: '[PC1] Basic PC' + name: '[PCSC234] PC Assemble SC234' price_unit: 450.0 quantity: 1.0 product_id: product.product_product_3 diff --git a/addons/account/test/account_invoice_state.yml b/addons/account/test/account_invoice_state.yml index 6553635a781..7b995150af0 100644 --- a/addons/account/test/account_invoice_state.yml +++ b/addons/account/test/account_invoice_state.yml @@ -7,7 +7,7 @@ currency_id: base.EUR invoice_line: - account_id: account.a_sale - name: '[PC1] Basic PC' + name: '[PCSC234] PC Assemble SC234' price_unit: 450.0 quantity: 1.0 product_id: product.product_product_3 diff --git a/addons/account/test/account_sequence_test.yml b/addons/account/test/account_sequence_test.yml index 3bc4a778794..74dcbce56ba 100644 --- a/addons/account/test/account_sequence_test.yml +++ b/addons/account/test/account_sequence_test.yml @@ -20,7 +20,7 @@ currency_id: base.EUR invoice_line: - account_id: account.a_sale - name: '[PC3] Medium PC' + name: '[PC-DEM] PC on Demand' price_unit: 900.0 quantity: 10.0 product_id: product.product_product_5 diff --git a/addons/account/test/account_supplier_invoice.yml b/addons/account/test/account_supplier_invoice.yml index ccebd2ea90c..9c5ce2dea3e 100644 --- a/addons/account/test/account_supplier_invoice.yml +++ b/addons/account/test/account_supplier_invoice.yml @@ -28,7 +28,7 @@ currency_id: base.EUR invoice_line: - account_id: account.a_expense - name: '[PC1] Basic PC' + name: '[PCSC234] PC Assemble SC234' price_unit: 300.0 product_id: product.product_product_3 quantity: 10.0 diff --git a/addons/account/test/test_edi_invoice.yml b/addons/account/test/test_edi_invoice.yml index 516be311cf8..80dc098e770 100644 --- a/addons/account/test/test_edi_invoice.yml +++ b/addons/account/test/test_edi_invoice.yml @@ -24,7 +24,7 @@ uos_id: 1 quantity: 5.0 price_unit: 100.0 - name: 'Medium PC' + name: 'PC on Demand' account_id: account.a_pay tax_line: - name: sale tax @@ -104,9 +104,9 @@ "__model": "account.invoice.line", "__id": "account:b22acf7a-ddcd-11e0-a4db-701a04e25543.account_invoice_line-1RP3so", "uos_id": ["product:b22acf7a-ddcd-11e0-a4db-701a04e25543.product_uom_unit", "Unit"], - "name": "Basic PC", + "name": "PC Assemble SC234", "price_unit": 10.0, - "product_id": ["product:b22acf7a-ddcd-11e0-a4db-701a04e25543.product_product_3", "[PC1] Basic PC"], + "product_id": ["product:b22acf7a-ddcd-11e0-a4db-701a04e25543.product_product_3", "[PCSC234] PC Assemble SC234"], "quantity": 1.0 }, { @@ -114,9 +114,9 @@ "__model": "account.invoice.line", "__id": "account:b22acf7a-ddcd-11e0-a4db-701a04e25543.account_invoice_line-u2XV5", "uos_id": ["product:b22acf7a-ddcd-11e0-a4db-701a04e25543.product_uom_unit", "Unit"], - "name": "Medium PC", + "name": "PC on Demand", "price_unit": 100.0, - "product_id": ["product:b22acf7a-ddcd-11e0-a4db-701a04e25543.product_product_5", "[PC3] Medium PC"], + "product_id": ["product:b22acf7a-ddcd-11e0-a4db-701a04e25543.product_product_5", "[PC-DEM] PC on Demand"], "quantity": 5.0 }] } @@ -137,12 +137,12 @@ assert invoice_new.type == 'in_invoice', "Invoice type was not set properly" assert len(invoice_new.invoice_line) == 2, "invoice lines are not same" for inv_line in invoice_new.invoice_line: - if inv_line.name == 'Basic PC': + if inv_line.name == 'PC Assemble SC234': assert inv_line.uos_id.name == "Unit" , "uom is not same" assert inv_line.price_unit == 10 , "price unit is not same" assert inv_line.quantity == 1 , "product qty is not same" assert inv_line.price_subtotal == 10, "price sub total is not same" - elif inv_line.name == 'Medium PC': + elif inv_line.name == 'PC on Demand': assert inv_line.uos_id.name == "Unit" , "uom is not same" assert inv_line.price_unit == 100 , "price unit is not same" assert inv_line.quantity == 5 , "product qty is not same" diff --git a/addons/account_accountant/account_accountant_data.xml b/addons/account_accountant/account_accountant_data.xml index 57fb229ad12..383b53cf49e 100644 --- a/addons/account_accountant/account_accountant_data.xml +++ b/addons/account_accountant/account_accountant_data.xml @@ -1,10 +1,10 @@ - - - Accounting - + + + @@ -19,10 +19,8 @@ automatic 100 - - - + diff --git a/addons/account_analytic_default/i18n/ru.po b/addons/account_analytic_default/i18n/ru.po index 98ee2f439c2..4a6add5804a 100644 --- a/addons/account_analytic_default/i18n/ru.po +++ b/addons/account_analytic_default/i18n/ru.po @@ -7,14 +7,14 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2012-02-08 00:35+0000\n" -"PO-Revision-Date: 2010-12-23 13:10+0000\n" +"PO-Revision-Date: 2012-08-17 10:54+0000\n" "Last-Translator: Chertykov Denis \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-07 05:17+0000\n" -"X-Generator: Launchpad (build 15745)\n" +"X-Launchpad-Export-Date: 2012-08-18 04:58+0000\n" +"X-Generator: Launchpad (build 15810)\n" #. module: account_analytic_default #: help:account.analytic.default,partner_id:0 @@ -133,7 +133,7 @@ msgstr "Аналитика по умолчанию" #. module: account_analytic_default #: sql_constraint:stock.picking:0 msgid "Reference must be unique per Company!" -msgstr "" +msgstr "Ссылка должна быть уникальна для каждой компании!" #. module: account_analytic_default #: view:account.analytic.default:0 diff --git a/addons/account_voucher/account_voucher.py b/addons/account_voucher/account_voucher.py index 1287c7b3c18..223705af85e 100644 --- a/addons/account_voucher/account_voucher.py +++ b/addons/account_voucher/account_voucher.py @@ -1106,7 +1106,8 @@ class account_voucher(osv.osv): # otherwise we use the rates of the system (giving the voucher date in the context) amount_currency = currency_obj.compute(cr, uid, company_currency, line.move_line_id.currency_id.id, move_line['debit']-move_line['credit'], context=ctx) if line.amount == line.amount_unreconciled and line.move_line_id.currency_id.id == voucher_currency: - foreign_currency_diff = line.move_line_id.amount_residual_currency + amount_currency + sign = voucher_brw.type in ('payment', 'purchase') and -1 or 1 + foreign_currency_diff = sign * line.move_line_id.amount_residual_currency + amount_currency move_line['amount_currency'] = amount_currency voucher_line = move_line_obj.create(cr, uid, move_line) diff --git a/addons/account_voucher/test/account_voucher.yml b/addons/account_voucher/test/account_voucher.yml index 9cfb9d61229..2ea6c0b7890 100644 --- a/addons/account_voucher/test/account_voucher.yml +++ b/addons/account_voucher/test/account_voucher.yml @@ -54,7 +54,7 @@ currency_id: base.EUR journal_id: account.bank_journal name: Voucher Axelor - narration: Basic PC + narration: PC Assemble SC234 line_dr_ids: - account_id: account.cash amount: 1000.0 diff --git a/addons/account_voucher/test/account_voucher_report.yml b/addons/account_voucher/test/account_voucher_report.yml index 85432f747aa..3996e0c27e4 100644 --- a/addons/account_voucher/test/account_voucher_report.yml +++ b/addons/account_voucher/test/account_voucher_report.yml @@ -6,7 +6,7 @@ company_id: base.main_company journal_id: account.bank_journal name: Voucher Axelor - narration: Basic PC + narration: PC Assemble SC234 amount: 1000.0 line_ids: - account_id: account.cash diff --git a/addons/account_voucher/test/case1_usd_usd.yml b/addons/account_voucher/test/case1_usd_usd.yml index 45c352955f4..b706e6f0644 100644 --- a/addons/account_voucher/test/case1_usd_usd.yml +++ b/addons/account_voucher/test/case1_usd_usd.yml @@ -79,7 +79,7 @@ period_id: account.period_1 invoice_line: - account_id: account.a_sale - name: '[PC1] Basic PC' + name: '[PCSC234] PC Assemble SC234' price_unit: 200.0 quantity: 1.0 product_id: product.product_product_3 @@ -112,7 +112,7 @@ period_id: account.period_2 invoice_line: - account_id: account.a_sale - name: '[PC1] Basic PC' + name: '[PCSC234] PC Assemble SC234' price_unit: 100.0 quantity: 1.0 product_id: product.product_product_3 diff --git a/addons/account_voucher/test/case2_suppl_usd_eur.yml b/addons/account_voucher/test/case2_suppl_usd_eur.yml index cc4c238aaaf..1a0c250395e 100644 --- a/addons/account_voucher/test/case2_suppl_usd_eur.yml +++ b/addons/account_voucher/test/case2_suppl_usd_eur.yml @@ -50,7 +50,7 @@ period_id: account.period_1 invoice_line: - account_id: account.a_expense - name: '[PC1] Basic PC' + name: '[PCSC234] PC Assemble SC234' price_unit: 200.0 quantity: 1.0 product_id: product.product_product_3 @@ -85,7 +85,7 @@ type : in_invoice invoice_line: - account_id: account.a_expense - name: '[PC1] Basic PC' + name: '[PCSC234] PC Assemble SC234' price_unit: 100.0 quantity: 1.0 product_id: product.product_product_3 diff --git a/addons/account_voucher/test/case2_usd_eur_debtor_in_eur.yml b/addons/account_voucher/test/case2_usd_eur_debtor_in_eur.yml index c37783247db..91f8a629cbb 100644 --- a/addons/account_voucher/test/case2_usd_eur_debtor_in_eur.yml +++ b/addons/account_voucher/test/case2_usd_eur_debtor_in_eur.yml @@ -85,7 +85,7 @@ period_id: account.period_1 invoice_line: - account_id: account.a_sale - name: '[PC1] Basic PC' + name: '[PCSC234] PC Assemble SC234' price_unit: 200.0 quantity: 1.0 product_id: product.product_product_3 @@ -118,7 +118,7 @@ period_id: account.period_2 invoice_line: - account_id: account.a_sale - name: '[PC1] Basic PC' + name: '[PCSC234] PC Assemble SC234' price_unit: 100.0 quantity: 1.0 product_id: product.product_product_3 diff --git a/addons/account_voucher/test/case2_usd_eur_debtor_in_usd.yml b/addons/account_voucher/test/case2_usd_eur_debtor_in_usd.yml index 36593a2b9cd..cc5e819af30 100644 --- a/addons/account_voucher/test/case2_usd_eur_debtor_in_usd.yml +++ b/addons/account_voucher/test/case2_usd_eur_debtor_in_usd.yml @@ -85,7 +85,7 @@ period_id: account.period_1 invoice_line: - account_id: account.a_sale - name: '[PC1] Basic PC' + name: '[PCSC234] PC Assemble SC234' price_unit: 200.0 quantity: 1.0 product_id: product.product_product_3 @@ -118,7 +118,7 @@ period_id: account.period_2 invoice_line: - account_id: account.a_sale - name: '[PC1] Basic PC' + name: '[PCSC234] PC Assemble SC234' price_unit: 100.0 quantity: 1.0 product_id: product.product_product_3 diff --git a/addons/account_voucher/test/case3_eur_eur.yml b/addons/account_voucher/test/case3_eur_eur.yml index d70bd41a2ff..37ea7ea981a 100644 --- a/addons/account_voucher/test/case3_eur_eur.yml +++ b/addons/account_voucher/test/case3_eur_eur.yml @@ -39,7 +39,7 @@ period_id: account.period_1 invoice_line: - account_id: account.a_sale - name: '[PC1] Basic PC' + name: '[PCSC234] PC Assemble SC234' price_unit: 150.0 quantity: 1.0 product_id: product.product_product_3 @@ -72,7 +72,7 @@ period_id: account.period_1 invoice_line: - account_id: account.a_sale - name: '[PC1] Basic PC' + name: '[PCSC234] PC Assemble SC234' price_unit: 80.0 quantity: 1.0 product_id: product.product_product_3 diff --git a/addons/account_voucher/test/case4_cad_chf.yml b/addons/account_voucher/test/case4_cad_chf.yml index 5ca901cdbca..a78669c95ef 100644 --- a/addons/account_voucher/test/case4_cad_chf.yml +++ b/addons/account_voucher/test/case4_cad_chf.yml @@ -73,7 +73,7 @@ period_id: account.period_1 invoice_line: - account_id: account.a_sale - name: '[PC1] Basic PC' + name: '[PCSC234] PC Assemble SC234' price_unit: 200.0 quantity: 1.0 product_id: product.product_product_3 diff --git a/addons/account_voucher/test/case_eur_usd.yml b/addons/account_voucher/test/case_eur_usd.yml index 2ca2ded1a72..125277191cb 100644 --- a/addons/account_voucher/test/case_eur_usd.yml +++ b/addons/account_voucher/test/case_eur_usd.yml @@ -52,7 +52,7 @@ period_id: account.period_1 invoice_line: - account_id: account.a_sale - name: '[PC1] Basic PC' + name: '[PCSC234] PC Assemble SC234' price_unit: 1000.0 quantity: 1.0 product_id: product.product_product_3 diff --git a/addons/account_voucher/test/sales_payment.yml b/addons/account_voucher/test/sales_payment.yml index 585ce23aace..88f10e55918 100644 --- a/addons/account_voucher/test/sales_payment.yml +++ b/addons/account_voucher/test/sales_payment.yml @@ -7,7 +7,7 @@ currency_id: base.EUR invoice_line: - account_id: account.a_sale - name: '[PC1] Basic PC' + name: '[PCSC234] PC Assemble SC234' price_unit: 450.0 quantity: 1.0 product_id: product.product_product_3 diff --git a/addons/auth_oauth/__init__.py b/addons/auth_oauth/__init__.py index c9acce48a16..a56db75633b 100644 --- a/addons/auth_oauth/__init__.py +++ b/addons/auth_oauth/__init__.py @@ -1,3 +1,4 @@ import controllers import auth_oauth import res_users +import res_config diff --git a/addons/auth_oauth/__openerp__.py b/addons/auth_oauth/__openerp__.py index a6f731f7bbf..f0be1234721 100644 --- a/addons/auth_oauth/__openerp__.py +++ b/addons/auth_oauth/__openerp__.py @@ -31,9 +31,10 @@ Allow users to login through Google OAuth2. 'author': 'Victor Tabuenca', 'maintainer': 'OpenERP s.a.', 'website': 'http://www.openerp.com', - 'depends': ['base', 'web'], - 'data': ['auth_oauth_data.xml', - 'auth_oauth_view.xml' + 'depends': ['base', 'web', 'base_setup'], + 'data': [ + 'auth_oauth_data.xml', + 'auth_oauth_view.xml' ], 'js': ['static/src/js/auth_oauth.js'], 'css': ['static/lib/zocial/css/zocial.css'], diff --git a/addons/auth_oauth/auth_oauth.py b/addons/auth_oauth/auth_oauth.py index e258505868d..34b6aa44936 100644 --- a/addons/auth_oauth/auth_oauth.py +++ b/addons/auth_oauth/auth_oauth.py @@ -1,6 +1,6 @@ from openerp.osv import osv, fields -class auth_oauth_providers(osv.osv): +class auth_oauth_provider(osv.osv): """Class defining the configuration values of an OAuth2 provider""" _name = 'auth.oauth.provider' @@ -8,15 +8,17 @@ class auth_oauth_providers(osv.osv): _order = 'name' _columns = { - 'name' : fields.char('Provider name', required=True), # Name of the OAuth2 entity, Google, LinkedIn, etc - 'client_id' : fields.char('Client ID', required=True), # Our identifier - 'auth_endpoint' : fields.char('Authentication URL', required=True), # OAuth provider URL to authenticate users + 'name' : fields.char('Provider name'), # Name of the OAuth2 entity, Google, LinkedIn, etc + 'client_id' : fields.char('Client ID'), # Our identifier + 'auth_endpoint' : fields.char('Authentication URL'), # OAuth provider URL to authenticate users 'scope' : fields.char('Scope'), # OAUth user data desired to access 'validation_endpoint' : fields.char('Validation URL'), # OAuth provider URL to validate tokens 'data_endpoint' : fields.char('Data URL'), + 'enabled' : fields.boolean('Allowed'), 'css_class' : fields.char('CSS class'), 'body' : fields.char('Body'), - 'active' : fields.boolean('Active'), 'sequence' : fields.integer(), } - + _defaults = { + 'enabled' : False, + } diff --git a/addons/auth_oauth/auth_oauth_data.xml b/addons/auth_oauth/auth_oauth_data.xml index 021a03b2742..7bb95192e5d 100644 --- a/addons/auth_oauth/auth_oauth_data.xml +++ b/addons/auth_oauth/auth_oauth_data.xml @@ -1,38 +1,34 @@ - + + Facebook Graph - facebook_client_id https://www.facebook.com/dialog/oauth https://graph.facebook.com/me/permissions zocial facebook Sign in with facebook - True Google OAuth2 - 108010644258-duuhmp6pu7li4tsmnqg7j9rvdeklg0ki.apps.googleusercontent.com https://accounts.google.com/o/oauth2/auth https://www.googleapis.com/auth/userinfo.email https://www.googleapis.com/auth/userinfo.profile https://www.googleapis.com/oauth2/v1/tokeninfo https://www.googleapis.com/oauth2/v1/userinfo zocial google Sign in with google - True - - Twitter OAuth2 - 108010644258-duuhmp6pu7li4tsmnqg7j9rvdeklg0ki.apps.twitterusercontent.com + + diff --git a/addons/auth_oauth/auth_oauth_view.xml b/addons/auth_oauth/auth_oauth_view.xml index 678c347c84d..475720af9fd 100644 --- a/addons/auth_oauth/auth_oauth_view.xml +++ b/addons/auth_oauth/auth_oauth_view.xml @@ -11,7 +11,7 @@ - + @@ -22,7 +22,7 @@ - + auth.oauth.provider.list auth.oauth.provider @@ -31,7 +31,7 @@ - + diff --git a/addons/auth_oauth/controllers/main.py b/addons/auth_oauth/controllers/main.py index 28f550b4bda..2959fa45db1 100644 --- a/addons/auth_oauth/controllers/main.py +++ b/addons/auth_oauth/controllers/main.py @@ -18,7 +18,7 @@ class OAuthController(openerpweb.Controller): registry = openerp.modules.registry.RegistryManager.get(dbname) with registry.cursor() as cr: providers = registry.get('auth.oauth.provider') - l = providers.read(cr, 1, providers.search(cr, 1, [])) + l = providers.read(cr, 1, providers.search(cr, 1, [('enabled','=',True)])) return l @openerpweb.httprequest diff --git a/addons/auth_oauth/res_config.py b/addons/auth_oauth/res_config.py new file mode 100644 index 00000000000..82d79c767f5 --- /dev/null +++ b/addons/auth_oauth/res_config.py @@ -0,0 +1,63 @@ +# -*- 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 General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see +# +############################################################################## + +from openerp.osv import osv, fields + +import logging +_logger = logging.getLogger(__name__) + +class base_config_settings(osv.TransientModel): + _inherit = 'base.config.settings' + + _columns = { + 'auth_oauth_google_enabled' : fields.boolean('Allow users to sign in with Google'), + 'auth_oauth_google_client_id' : fields.char('Client ID'), + 'auth_oauth_facebook_enabled' : fields.boolean('Allow users to sign in with Facebook'), + 'auth_oauth_facebook_client_id' : fields.char('Client ID'), + } + + def get_oauth_providers(self, cr, uid, fields, context=None): + google_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'auth_oauth', 'provider_google')[1] + facebook_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'auth_oauth', 'provider_facebook')[1] + rg = self.pool.get('auth.oauth.provider').read(cr, uid, [google_id], ['enabled','client_id'], context=context) + rf = self.pool.get('auth.oauth.provider').read(cr, uid, [facebook_id], ['enabled','client_id'], context=context) + return { + 'auth_oauth_google_enabled': rg[0]['enabled'], + 'auth_oauth_google_client_id': rg[0]['client_id'], + 'auth_oauth_facebook_enabled': rf[0]['enabled'], + 'auth_oauth_facebook_client_id': rf[0]['client_id'], + } + + def set_oauth_providers(self, cr, uid, ids, context=None): + google_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'auth_oauth', 'provider_google')[1] + facebook_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'auth_oauth', 'provider_facebook')[1] + config = self.browse(cr, uid, ids[0], context=context) + rg = { + 'enabled':config.auth_oauth_google_enabled, + 'client_id':config.auth_oauth_google_client_id, + } + rf = { + 'enabled':config.auth_oauth_facebook_enabled, + 'client_id':config.auth_oauth_facebook_client_id, + } + self.pool.get('auth.oauth.provider').write(cr, uid, [google_id], rg) + self.pool.get('auth.oauth.provider').write(cr, uid, [facebook_id], rf) + diff --git a/addons/auth_oauth/res_config.xml b/addons/auth_oauth/res_config.xml new file mode 100644 index 00000000000..2b06e05327a --- /dev/null +++ b/addons/auth_oauth/res_config.xml @@ -0,0 +1,50 @@ + + + + + base.config.settings.oauth + base.config.settings + + + +
+
+
+ +
+
+
+ To setup the signin process with Google, first you have to perform the following steps:
+
+ - Go to the Google APIs console
+ - Ceate a new project
+ - Go to Api Access
+ - Create an oauth client_id
+ - Edit settings and set both Authorized Redirect URIs and Authorized JavaScript Origins to your hostname.
+
+ Now copy paste the client_id here: +
+
+
+
+
+ +
+
+
+ To setup the signin process with Google, first you have to perform the following steps:
+
+ Now copy paste the client_id here: +
+ +
+
+
+ + + + + + diff --git a/addons/auth_oauth/static/src/js/auth_oauth.js b/addons/auth_oauth/static/src/js/auth_oauth.js index eae423fae1f..d63631c262d 100644 --- a/addons/auth_oauth/static/src/js/auth_oauth.js +++ b/addons/auth_oauth/static/src/js/auth_oauth.js @@ -21,9 +21,7 @@ openerp.auth_oauth = function(instance) { }, on_oauth_loaded: function(result) { this.oauth_providers = result; - console.log(result); var buttons = QWeb.render("auth_oauth.Login.button",{"widget":this}); - console.log(buttons); this.$(".oe_login_pane form ul").after(buttons); }, on_oauth_sign_in: function(ev) { diff --git a/addons/auth_signup/res_config.py b/addons/auth_signup/res_config.py index a9a490de8c5..6afd1c5b581 100644 --- a/addons/auth_signup/res_config.py +++ b/addons/auth_signup/res_config.py @@ -25,7 +25,8 @@ class base_config_settings(osv.TransientModel): _inherit = 'base.config.settings' _columns = { - 'auth_signup_template_user_id': fields.many2one('res.users', 'Template user for new users created through signup') + 'auth_signup_uninvited': fields.boolean('allow public users to sign up', help="If unchecked only invited users may sign up"), + 'auth_signup_template_user_id': fields.many2one('res.users', 'Template user for new users created through signup'), } def get_default_signup(self, cr, uid, fields, context=None): diff --git a/addons/auth_signup/res_config.xml b/addons/auth_signup/res_config.xml index 3bea8dc2aed..49669d36618 100644 --- a/addons/auth_signup/res_config.xml +++ b/addons/auth_signup/res_config.xml @@ -7,16 +7,15 @@ base.config.settings - - - + +
+ +
+
+
diff --git a/addons/base_calendar/crm_meeting_data.xml b/addons/base_calendar/crm_meeting_data.xml index 44838514935..d1cffddc403 100644 --- a/addons/base_calendar/crm_meeting_data.xml +++ b/addons/base_calendar/crm_meeting_data.xml @@ -16,6 +16,14 @@ Off-site Meeting + + Open Discussion + + + + Feedback Meeting + + Meeting crm.meeting diff --git a/addons/base_calendar/crm_meeting_demo.xml b/addons/base_calendar/crm_meeting_demo.xml index 221653e5fc3..6c098e2f949 100644 --- a/addons/base_calendar/crm_meeting_demo.xml +++ b/addons/base_calendar/crm_meeting_demo.xml @@ -27,7 +27,7 @@ - draft + open @@ -39,7 +39,7 @@ - done + open @@ -61,7 +61,7 @@ - draft + open @@ -72,7 +72,7 @@ - done + open diff --git a/addons/base_calendar/crm_meeting_view.xml b/addons/base_calendar/crm_meeting_view.xml index 51d17ed43f8..6009251a460 100644 --- a/addons/base_calendar/crm_meeting_view.xml +++ b/addons/base_calendar/crm_meeting_view.xml @@ -70,7 +70,7 @@
- +
@@ -115,7 +115,7 @@
+ attrs="{'readonly': [('recurrent_uid','!=',False)]}"/> @@ -171,7 +171,6 @@