-
+
diff --git a/addons/account/views/report_overdue.xml b/addons/account/views/report_overdue.xml
index bc522aa8b9d..df3934ff0de 100644
--- a/addons/account/views/report_overdue.xml
+++ b/addons/account/views/report_overdue.xml
@@ -5,7 +5,7 @@
-
+
diff --git a/addons/account_analytic_analysis/account_analytic_analysis.py b/addons/account_analytic_analysis/account_analytic_analysis.py index 8d470f45637..4b2352bc880 100644 --- a/addons/account_analytic_analysis/account_analytic_analysis.py +++ b/addons/account_analytic_analysis/account_analytic_analysis.py @@ -69,7 +69,7 @@ class account_analytic_invoice_line(osv.osv): if partner_id: part = self.pool.get('res.partner').browse(cr, uid, partner_id, context=local_context) if part.lang: - context.update({'lang': part.lang}) + local_context.update({'lang': part.lang}) result = {} res = self.pool.get('product.product').browse(cr, uid, product, context=local_context) @@ -79,7 +79,12 @@ class account_analytic_invoice_line(osv.osv): price = res.price else: price = res.list_price - result.update({'name': name or res.description or False,'uom_id': uom_id or res.uom_id.id or False, 'price_unit': price}) + if not name: + name = self.pool.get('product.product').name_get(cr, uid, [res.id], context=local_context)[0][1] + if res.description_sale: + name += '\n'+res.description_sale + + result.update({'name': name or False,'uom_id': uom_id or res.uom_id.id or False, 'price_unit': price}) res_final = {'value':result} if result['uom_id'] != res.uom_id.id: diff --git a/addons/account_analytic_analysis/account_analytic_analysis_view.xml b/addons/account_analytic_analysis/account_analytic_analysis_view.xml index 97fb15e9290..af6eb47ffa4 100644 --- a/addons/account_analytic_analysis/account_analytic_analysis_view.xml +++ b/addons/account_analytic_analysis/account_analytic_analysis_view.xml @@ -169,7 +169,7 @@
-
diff --git a/addons/account_analytic_analysis/account_analytic_analysis.py b/addons/account_analytic_analysis/account_analytic_analysis.py index 8d470f45637..4b2352bc880 100644 --- a/addons/account_analytic_analysis/account_analytic_analysis.py +++ b/addons/account_analytic_analysis/account_analytic_analysis.py @@ -69,7 +69,7 @@ class account_analytic_invoice_line(osv.osv): if partner_id: part = self.pool.get('res.partner').browse(cr, uid, partner_id, context=local_context) if part.lang: - context.update({'lang': part.lang}) + local_context.update({'lang': part.lang}) result = {} res = self.pool.get('product.product').browse(cr, uid, product, context=local_context) @@ -79,7 +79,12 @@ class account_analytic_invoice_line(osv.osv): price = res.price else: price = res.list_price - result.update({'name': name or res.description or False,'uom_id': uom_id or res.uom_id.id or False, 'price_unit': price}) + if not name: + name = self.pool.get('product.product').name_get(cr, uid, [res.id], context=local_context)[0][1] + if res.description_sale: + name += '\n'+res.description_sale + + result.update({'name': name or False,'uom_id': uom_id or res.uom_id.id or False, 'price_unit': price}) res_final = {'value':result} if result['uom_id'] != res.uom_id.id: diff --git a/addons/account_analytic_analysis/account_analytic_analysis_view.xml b/addons/account_analytic_analysis/account_analytic_analysis_view.xml index 97fb15e9290..af6eb47ffa4 100644 --- a/addons/account_analytic_analysis/account_analytic_analysis_view.xml +++ b/addons/account_analytic_analysis/account_analytic_analysis_view.xml @@ -169,7 +169,7 @@
-
-
+
-
diff --git a/addons/base_gengo/doc/changelog.rst b/addons/base_gengo/doc/changelog.rst
index fe343069a38..19f93bfa5a8 100644
--- a/addons/base_gengo/doc/changelog.rst
+++ b/addons/base_gengo/doc/changelog.rst
@@ -3,7 +3,7 @@
========================
******
-saas-5
+saas-4
******
- - Library update: ``mygengo`` (https://pypi.python.org/pypi/mygengo/1.3.3) was outdated and has been replaced by ``gengo`` (https://pypi.python.org/pypi/gengo).
+- Library update: ``mygengo`` (https://pypi.python.org/pypi/mygengo/1.3.3) was outdated and has been replaced by ``gengo`` (https://pypi.python.org/pypi/gengo).
diff --git a/addons/crm_partner_assign/crm_partner_assign.py b/addons/crm_partner_assign/crm_partner_assign.py
index 046babccf73..31a042d8685 100644
--- a/addons/crm_partner_assign/crm_partner_assign.py
+++ b/addons/crm_partner_assign/crm_partner_assign.py
@@ -65,7 +65,7 @@ class res_partner(osv.osv):
'date_review_next' : fields.date('Next Partner Review'),
# customer implementation
'assigned_partner_id': fields.many2one(
- 'res.partner', 'Implementedy by',
+ 'res.partner', 'Implemented by',
),
'implemented_partner_ids': fields.one2many(
'res.partner', 'assigned_partner_id',
diff --git a/addons/crm_partner_assign/security/ir.model.access.csv b/addons/crm_partner_assign/security/ir.model.access.csv
index 6a26c574a1c..d5324ba6c53 100644
--- a/addons/crm_partner_assign/security/ir.model.access.csv
+++ b/addons/crm_partner_assign/security/ir.model.access.csv
@@ -3,6 +3,7 @@ access_ crm_lead_report_assign,crm.lead.report.assign,model_crm_lead_report_assi
access_ crm_lead_report_assign_all,crm.lead.report.assign.all,model_crm_lead_report_assign,base.group_user,1,0,0,0
access_crm_partner_report,crm.partner.report.assign.all,model_crm_partner_report_assign,base.group_sale_salesman,1,0,0,0
access_res_partner_grade,res.partner.grade,model_res_partner_grade,base.group_sale_salesman,1,1,1,0
+access_res_partner_grade_public,res.partner.grade,model_res_partner_grade,base.group_public,1,0,0,0
access_res_partner_grade_manager,res.partner.grade.manager,model_res_partner_grade,base.group_sale_manager,1,1,1,1
"access_partner_activation_manager","res.partner.activation.manager","model_res_partner_activation","base.group_partner_manager",1,1,1,1
-partner_access_crm_lead,crm.lead,model_crm_lead,base.group_portal,1,1,0,0
\ No newline at end of file
+partner_access_crm_lead,crm.lead,model_crm_lead,base.group_portal,1,1,0,0
diff --git a/addons/delivery/delivery.py b/addons/delivery/delivery.py
index 46d76180d08..873b7e60662 100644
--- a/addons/delivery/delivery.py
+++ b/addons/delivery/delivery.py
@@ -192,15 +192,16 @@ class delivery_grid(osv.osv):
weight = 0
volume = 0
quantity = 0
+ product_uom_obj = self.pool.get('product.uom')
for line in order.order_line:
if not line.product_id or line.is_delivery:
continue
- weight += (line.product_id.weight or 0.0) * line.product_uom_qty
- volume += (line.product_id.volume or 0.0) * line.product_uom_qty
- quantity += line.product_uom_qty
+ q = product_uom_obj._compute_qty(cr, uid, line.product_uom.id, line.product_uos_qty, line.product_id.uom_id.id)
+ weight += (line.product_id.weight or 0.0) * q
+ volume += (line.product_id.volume or 0.0) * q
+ quantity += q
total = order.amount_total or 0.0
-
return self.get_price_from_picking(cr, uid, id, total,weight, volume, quantity, context=context)
def get_price_from_picking(self, cr, uid, id, total, weight, volume, quantity, context=None):
diff --git a/addons/event_sale/__openerp__.py b/addons/event_sale/__openerp__.py
index 88e27fd9a3d..35d2f51aacc 100644
--- a/addons/event_sale/__openerp__.py
+++ b/addons/event_sale/__openerp__.py
@@ -42,6 +42,7 @@ this event.
'data': [
'event_sale_view.xml',
'event_sale_data.xml',
+ 'security/ir.model.access.csv',
],
'demo': ['event_demo.xml'],
'test': ['test/confirm.yml'],
diff --git a/addons/event_sale/security/ir.model.access.csv b/addons/event_sale/security/ir.model.access.csv
new file mode 100644
index 00000000000..410458d4b0f
--- /dev/null
+++ b/addons/event_sale/security/ir.model.access.csv
@@ -0,0 +1,3 @@
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_event_event_ticket_user,event.event.ticket.user,event_sale.model_event_event_ticket,event.group_event_user,1,0,0,0
+access_event_event_ticket_admin,event.event.ticket.admin,event_sale.model_event_event_ticket,event.group_event_manager,1,1,1,1
\ No newline at end of file
diff --git a/addons/hr_payroll/views/report_payslip.xml b/addons/hr_payroll/views/report_payslip.xml
index 5ac9dfa557e..b30cb089d1a 100644
--- a/addons/hr_payroll/views/report_payslip.xml
+++ b/addons/hr_payroll/views/report_payslip.xml
@@ -19,7 +19,7 @@
Address
-
diff --git a/addons/hr_recruitment/hr_recruitment.py b/addons/hr_recruitment/hr_recruitment.py
index 9c69f5db94b..775b84756ce 100644
--- a/addons/hr_recruitment/hr_recruitment.py
+++ b/addons/hr_recruitment/hr_recruitment.py
@@ -114,6 +114,15 @@ class hr_applicant(osv.Model):
return int(department_ids[0][0])
return None
+ def _get_default_company_id(self, cr, uid, department_id=None, context=None):
+ company_id = False
+ if department_id:
+ department = self.pool['hr.department'].browse(cr, uid, department_id, context=context)
+ company_id = department.company_id.id if department and department.company_id else False
+ if not company_id:
+ company_id = self.pool['res.company']._company_default_get(cr, uid, 'hr.applicant', context=context)
+ return company_id
+
def _read_group_stage_ids(self, cr, uid, ids, domain, read_group_order=None, access_rights_uid=None, context=None):
access_rights_uid = access_rights_uid or uid
stage_obj = self.pool.get('hr.recruitment.stage')
@@ -231,7 +240,7 @@ class hr_applicant(osv.Model):
'user_id': lambda s, cr, uid, c: uid,
'stage_id': lambda s, cr, uid, c: s._get_default_stage_id(cr, uid, c),
'department_id': lambda s, cr, uid, c: s._get_default_department_id(cr, uid, c),
- 'company_id': lambda s, cr, uid, c: s.pool.get('res.company')._company_default_get(cr, uid, 'hr.applicant', context=c),
+ 'company_id': lambda s, cr, uid, c: s._get_default_company_id(cr, uid, s._get_default_department_id(cr, uid, c), c),
'color': 0,
'date_last_stage_update': fields.datetime.now,
}
diff --git a/addons/lunch/views/report_lunchorder.xml b/addons/lunch/views/report_lunchorder.xml
index 93d43f6521d..30401bc142b 100644
--- a/addons/lunch/views/report_lunchorder.xml
+++ b/addons/lunch/views/report_lunchorder.xml
@@ -8,7 +8,7 @@
).
+#
+# 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
+
+
+
+ Buckaroo
+ buckaroo
+ test
+ You will be redirected to the Buckaroo website after cliking on the payment button.]]>
+ dummy
+ dummy
+
+
+
+
diff --git a/addons/payment_buckaroo/models/__init__.py b/addons/payment_buckaroo/models/__init__.py
new file mode 100644
index 00000000000..7e1780a0059
--- /dev/null
+++ b/addons/payment_buckaroo/models/__init__.py
@@ -0,0 +1,3 @@
+# -*- coding: utf-8 -*-
+
+import buckaroo
diff --git a/addons/payment_buckaroo/models/buckaroo.py b/addons/payment_buckaroo/models/buckaroo.py
new file mode 100644
index 00000000000..5b576a24c3b
--- /dev/null
+++ b/addons/payment_buckaroo/models/buckaroo.py
@@ -0,0 +1,191 @@
+# -*- coding: utf-'8' "-*-"
+from hashlib import sha1
+import logging
+import urlparse
+
+from openerp.addons.payment.models.payment_acquirer import ValidationError
+from openerp.addons.payment_buckaroo.controllers.main import BuckarooController
+from openerp.osv import osv, fields
+from openerp.tools.float_utils import float_compare
+
+_logger = logging.getLogger(__name__)
+
+
+class AcquirerBuckaroo(osv.Model):
+ _inherit = 'payment.acquirer'
+
+ def _get_buckaroo_urls(self, cr, uid, environment, context=None):
+ """ Buckaroo URLs
+ """
+ if environment == 'prod':
+ return {
+ 'buckaroo_form_url': 'https://checkout.buckaroo.nl/html/',
+ }
+ else:
+ return {
+ 'buckaroo_form_url': 'https://testcheckout.buckaroo.nl/html/',
+ }
+
+ def _get_providers(self, cr, uid, context=None):
+ providers = super(AcquirerBuckaroo, self)._get_providers(cr, uid, context=context)
+ providers.append(['buckaroo', 'Buckaroo'])
+ return providers
+
+ _columns = {
+ 'brq_websitekey': fields.char('WebsiteKey', required_if_provider='buckaroo'),
+ 'brq_secretkey': fields.char('SecretKey', required_if_provider='buckaroo'),
+ }
+
+ def _buckaroo_generate_digital_sign(self, acquirer, inout, values):
+ """ Generate the shasign for incoming or outgoing communications.
+
+ :param browse acquirer: the payment.acquirer browse record. It should
+ have a shakey in shaky out
+ :param string inout: 'in' (openerp contacting buckaroo) or 'out' (buckaroo
+ contacting openerp).
+ :param dict values: transaction values
+
+ :return string: shasign
+ """
+ assert inout in ('in', 'out')
+ assert acquirer.provider == 'buckaroo'
+
+ keys = "add_returndata Brq_amount Brq_culture Brq_currency Brq_invoicenumber Brq_return Brq_returncancel Brq_returnerror Brq_returnreject brq_test Brq_websitekey".split()
+
+ def get_value(key):
+ if values.get(key):
+ return values[key]
+ return ''
+
+ if inout == 'out':
+ if 'BRQ_SIGNATURE' in values:
+ del values['BRQ_SIGNATURE']
+ items = sorted((k.upper(), v) for k, v in values.items())
+ sign = ''.join('%s=%s' % (k, v) for k, v in items)
+ else:
+ sign = ''.join('%s=%s' % (k,get_value(k)) for k in keys)
+ #Add the pre-shared secret key at the end of the signature
+ sign = sign + acquirer.brq_secretkey
+ if isinstance(sign, str):
+ sign = urlparse.parse_qsl(sign)
+ shasign = sha1(sign).hexdigest()
+ return shasign
+
+
+ def buckaroo_form_generate_values(self, cr, uid, id, partner_values, tx_values, context=None):
+ base_url = self.pool['ir.config_parameter'].get_param(cr, uid, 'web.base.url')
+ acquirer = self.browse(cr, uid, id, context=context)
+ buckaroo_tx_values = dict(tx_values)
+ buckaroo_tx_values.update({
+ 'Brq_websitekey': acquirer.brq_websitekey,
+ 'Brq_amount': tx_values['amount'],
+ 'Brq_currency': tx_values['currency'] and tx_values['currency'].name or '',
+ 'Brq_invoicenumber': tx_values['reference'],
+ 'brq_test' : True,
+ 'Brq_return': '%s' % urlparse.urljoin(base_url, BuckarooController._return_url),
+ 'Brq_returncancel': '%s' % urlparse.urljoin(base_url, BuckarooController._cancel_url),
+ 'Brq_returnerror': '%s' % urlparse.urljoin(base_url, BuckarooController._exception_url),
+ 'Brq_returnreject': '%s' % urlparse.urljoin(base_url, BuckarooController._reject_url),
+ 'Brq_culture': 'en-US',
+ })
+ if buckaroo_tx_values.get('return_url'):
+ buckaroo_tx_values['add_returndata'] = {'return_url': '%s' % buckaroo_tx_values.pop('return_url')}
+ else:
+ buckaroo_tx_values['add_returndata'] = ''
+ buckaroo_tx_values['Brq_signature'] = self._buckaroo_generate_digital_sign(acquirer, 'in', buckaroo_tx_values)
+ return partner_values, buckaroo_tx_values
+
+ def buckaroo_get_form_action_url(self, cr, uid, id, context=None):
+ acquirer = self.browse(cr, uid, id, context=context)
+ return self._get_buckaroo_urls(cr, uid, acquirer.environment, context=context)['buckaroo_form_url']
+
+class TxBuckaroo(osv.Model):
+ _inherit = 'payment.transaction'
+
+ # buckaroo status
+ _buckaroo_valid_tx_status = [190]
+ _buckaroo_pending_tx_status = [790, 791, 792, 793]
+ _buckaroo_cancel_tx_status = [890, 891]
+ _buckaroo_error_tx_status = [490, 491, 492]
+ _buckaroo_reject_tx_status = [690]
+
+ _columns = {
+ 'buckaroo_txnid': fields.char('Transaction ID'),
+ }
+
+
+ # --------------------------------------------------
+ # FORM RELATED METHODS
+ # --------------------------------------------------
+
+ def _buckaroo_form_get_tx_from_data(self, cr, uid, data, context=None):
+ """ Given a data dict coming from buckaroo, verify it and find the related
+ transaction record. """
+ reference, pay_id, shasign = data.get('BRQ_INVOICENUMBER'), data.get('BRQ_PAYMENT'), data.get('BRQ_SIGNATURE')
+ if not reference or not pay_id or not shasign:
+ error_msg = 'Buckaroo: received data with missing reference (%s) or pay_id (%s) or shashign (%s)' % (reference, pay_id, shasign)
+ _logger.error(error_msg)
+ raise ValidationError(error_msg)
+
+ tx_ids = self.search(cr, uid, [('reference', '=', reference)], context=context)
+ if not tx_ids or len(tx_ids) > 1:
+ error_msg = 'Buckaroo: received data for reference %s' % (reference)
+ if not tx_ids:
+ error_msg += '; no order found'
+ else:
+ error_msg += '; multiple order found'
+ _logger.error(error_msg)
+ raise ValidationError(error_msg)
+ tx = self.pool['payment.transaction'].browse(cr, uid, tx_ids[0], context=context)
+
+ #verify shasign
+ shasign_check = self.pool['payment.acquirer']._buckaroo_generate_digital_sign(tx.acquirer_id, 'out' ,data)
+ if shasign_check.upper() != shasign.upper():
+ error_msg = 'Buckaroo: invalid shasign, received %s, computed %s, for data %s' % (shasign, shasign_check, data)
+ _logger.error(error_msg)
+ raise ValidationError(error_msg)
+
+ return tx
+
+ def _buckaroo_form_get_invalid_parameters(self, cr, uid, tx, data, context=None):
+ invalid_parameters = []
+
+ if tx.acquirer_reference and data.get('BRQ_TRANSACTIONS') != tx.acquirer_reference:
+ invalid_parameters.append(('Transaction Id', data.get('BRQ_TRANSACTIONS'), tx.acquirer_reference))
+ # check what is buyed
+ if float_compare(float(data.get('BRQ_AMOUNT', '0.0')), tx.amount, 2) != 0:
+ invalid_parameters.append(('Amount', data.get('BRQ_AMOUNT'), '%.2f' % tx.amount))
+ if data.get('BRQ_CURRENCY') != tx.currency_id.name:
+ invalid_parameters.append(('Currency', data.get('BRQ_CURRENCY'), tx.currency_id.name))
+
+ return invalid_parameters
+
+ def _buckaroo_form_validate(self, cr, uid, tx, data, context=None):
+ status_code = int(data.get('BRQ_STATUSCODE','0'))
+ if status_code in self._buckaroo_valid_tx_status:
+ tx.write({
+ 'state': 'done',
+ 'buckaroo_txnid': data.get('BRQ_TRANSACTIONS'),
+ })
+ return True
+ elif status_code in self._buckaroo_pending_tx_status:
+ tx.write({
+ 'state': 'pending',
+ 'buckaroo_txnid': data.get('BRQ_TRANSACTIONS'),
+ })
+ return True
+ elif status_code in self._buckaroo_cancel_tx_status:
+ tx.write({
+ 'state': 'cancel',
+ 'buckaroo_txnid': data.get('BRQ_TRANSACTIONS'),
+ })
+ return True
+ else:
+ error = 'Buckaroo: feedback error'
+ _logger.info(error)
+ tx.write({
+ 'state': 'error',
+ 'state_message': error,
+ 'buckaroo_txnid': data.get('BRQ_TRANSACTIONS'),
+ })
+ return False
diff --git a/addons/payment_buckaroo/static/description/icon.png b/addons/payment_buckaroo/static/description/icon.png
new file mode 100644
index 00000000000..663fcad1d6d
Binary files /dev/null and b/addons/payment_buckaroo/static/description/icon.png differ
diff --git a/addons/payment_buckaroo/static/src/img/buckaroo_icon.png b/addons/payment_buckaroo/static/src/img/buckaroo_icon.png
new file mode 100644
index 00000000000..819606db730
Binary files /dev/null and b/addons/payment_buckaroo/static/src/img/buckaroo_icon.png differ
diff --git a/addons/payment_buckaroo/static/src/img/logo.png b/addons/payment_buckaroo/static/src/img/logo.png
new file mode 100644
index 00000000000..663fcad1d6d
Binary files /dev/null and b/addons/payment_buckaroo/static/src/img/logo.png differ
diff --git a/addons/payment_buckaroo/tests/__init__.py b/addons/payment_buckaroo/tests/__init__.py
new file mode 100644
index 00000000000..d245ab8339d
--- /dev/null
+++ b/addons/payment_buckaroo/tests/__init__.py
@@ -0,0 +1,7 @@
+# -*- coding: utf-8 -*-
+
+from openerp.addons.payment_buckaroo.tests import test_buckaroo
+
+checks = [
+ test_buckaroo,
+]
diff --git a/addons/payment_buckaroo/tests/test_buckaroo.py b/addons/payment_buckaroo/tests/test_buckaroo.py
new file mode 100644
index 00000000000..b826f3b920e
--- /dev/null
+++ b/addons/payment_buckaroo/tests/test_buckaroo.py
@@ -0,0 +1,178 @@
+# -*- coding: utf-8 -*-
+
+from lxml import objectify
+import urlparse
+
+import openerp
+from openerp.addons.payment.models.payment_acquirer import ValidationError
+from openerp.addons.payment.tests.common import PaymentAcquirerCommon
+from openerp.addons.payment_buckaroo.controllers.main import BuckarooController
+from openerp.tools import mute_logger
+
+
+@openerp.tests.common.at_install(False)
+@openerp.tests.common.post_install(False)
+class BuckarooCommon(PaymentAcquirerCommon):
+
+ def setUp(self):
+ super(BuckarooCommon, self).setUp()
+ cr, uid = self.cr, self.uid
+ self.base_url = self.registry('ir.config_parameter').get_param(cr, uid, 'web.base.url')
+
+ # get the buckaroo account
+ model, self.buckaroo_id = self.registry('ir.model.data').get_object_reference(cr, uid, 'payment_buckaroo', 'payment_acquirer_buckaroo')
+
+
+@openerp.tests.common.at_install(False)
+@openerp.tests.common.post_install(False)
+class BuckarooForm(BuckarooCommon):
+
+ def test_10_Buckaroo_form_render(self):
+ cr, uid, context = self.cr, self.uid, {}
+ # be sure not to do stupid things
+ buckaroo = self.payment_acquirer.browse(self.cr, self.uid, self.buckaroo_id, None)
+ self.assertEqual(buckaroo.environment, 'test', 'test without test environment')
+
+ # ----------------------------------------
+ # Test: button direct rendering
+ # ----------------------------------------
+
+ form_values = {
+ 'add_returndata': None,
+ 'Brq_websitekey': buckaroo.brq_websitekey,
+ 'Brq_amount': '2240.0',
+ 'Brq_currency': 'EUR',
+ 'Brq_invoicenumber': 'SO004',
+ 'Brq_signature': '1b8c10074c622d965272a91a9e88b5b3777d2474', # update me
+ 'brq_test': 'True',
+ 'Brq_return': '%s' % urlparse.urljoin(self.base_url, BuckarooController._return_url),
+ 'Brq_returncancel': '%s' % urlparse.urljoin(self.base_url, BuckarooController._cancel_url),
+ 'Brq_returnerror': '%s' % urlparse.urljoin(self.base_url, BuckarooController._exception_url),
+ 'Brq_returnreject': '%s' % urlparse.urljoin(self.base_url, BuckarooController._reject_url),
+ 'Brq_culture': 'en-US',
+ }
+
+ # render the button
+ res = self.payment_acquirer.render(
+ cr, uid, self.buckaroo_id,
+ 'SO004', 2240.0, self.currency_euro_id,
+ partner_id=None,
+ partner_values=self.buyer_values,
+ context=context)
+
+ # check form result
+ tree = objectify.fromstring(res)
+ self.assertEqual(tree.get('action'), 'https://testcheckout.buckaroo.nl/html/', 'Buckaroo: wrong form POST url')
+ for form_input in tree.input:
+ if form_input.get('name') in ['submit']:
+ continue
+ self.assertEqual(
+ form_input.get('value'),
+ form_values[form_input.get('name')],
+ 'Buckaroo: wrong value for input %s: received %s instead of %s' % (form_input.get('name'), form_input.get('value'), form_values[form_input.get('name')])
+ )
+
+ # ----------------------------------------
+ # Test2: button using tx + validation
+ # ----------------------------------------
+
+ # create a new draft tx
+ tx_id = self.payment_transaction.create(
+ cr, uid, {
+ 'amount': 2240.0,
+ 'acquirer_id': self.buckaroo_id,
+ 'currency_id': self.currency_euro_id,
+ 'reference': 'SO004',
+ 'partner_id': self.buyer_id,
+ }, context=context
+ )
+
+ # render the button
+ res = self.payment_acquirer.render(
+ cr, uid, self.buckaroo_id,
+ 'should_be_erased', 2240.0, self.currency_euro,
+ tx_id=tx_id,
+ partner_id=None,
+ partner_values=self.buyer_values,
+ context=context)
+
+ # check form result
+ tree = objectify.fromstring(res)
+ self.assertEqual(tree.get('action'), 'https://testcheckout.buckaroo.nl/html/', 'Buckaroo: wrong form POST url')
+ for form_input in tree.input:
+ if form_input.get('name') in ['submit']:
+ continue
+ self.assertEqual(
+ form_input.get('value'),
+ form_values[form_input.get('name')],
+ 'Buckaroo: wrong value for form input %s: received %s instead of %s' % (form_input.get('name'), form_input.get('value'), form_values[form_input.get('name')])
+ )
+
+ @mute_logger('openerp.addons.payment_buckaroo.models.buckaroo', 'ValidationError')
+ def test_20_buckaroo_form_management(self):
+ cr, uid, context = self.cr, self.uid, {}
+ # be sure not to do stupid thing
+ buckaroo = self.payment_acquirer.browse(self.cr, self.uid, self.buckaroo_id, None)
+ self.assertEqual(buckaroo.environment, 'test', 'test without test environment')
+
+ # typical data posted by buckaroo after client has successfully paid
+ buckaroo_post_data = {
+ 'BRQ_RETURNDATA': u'',
+ 'BRQ_AMOUNT': u'2240.00',
+ 'BRQ_CURRENCY': u'EUR',
+ 'BRQ_CUSTOMER_NAME': u'Jan de Tester',
+ 'BRQ_INVOICENUMBER': u'SO004',
+ 'BRQ_PAYMENT': u'573311D081B04069BD6336001611DBD4',
+ 'BRQ_PAYMENT_METHOD': u'paypal',
+ 'BRQ_SERVICE_PAYPAL_PAYERCOUNTRY': u'NL',
+ 'BRQ_SERVICE_PAYPAL_PAYEREMAIL': u'fhe@openerp.com',
+ 'BRQ_SERVICE_PAYPAL_PAYERFIRSTNAME': u'Jan',
+ 'BRQ_SERVICE_PAYPAL_PAYERLASTNAME': u'Tester',
+ 'BRQ_SERVICE_PAYPAL_PAYERMIDDLENAME': u'de',
+ 'BRQ_SERVICE_PAYPAL_PAYERSTATUS': u'verified',
+ 'BRQ_SIGNATURE': u'175d82dd53a02bad393fee32cb1eafa3b6fbbd91',
+ 'BRQ_STATUSCODE': u'190',
+ 'BRQ_STATUSCODE_DETAIL': u'S001',
+ 'BRQ_STATUSMESSAGE': u'Transaction successfully processed',
+ 'BRQ_TEST': u'true',
+ 'BRQ_TIMESTAMP': u'2014-05-08 12:41:21',
+ 'BRQ_TRANSACTIONS': u'D6106678E1D54EEB8093F5B3AC42EA7B',
+ 'BRQ_WEBSITEKEY': u'5xTGyGyPyl',
+ }
+
+ # should raise error about unknown tx
+ with self.assertRaises(ValidationError):
+ self.payment_transaction.form_feedback(cr, uid, buckaroo_post_data, 'buckaroo', context=context)
+
+ tx_id = self.payment_transaction.create(
+ cr, uid, {
+ 'amount': 2240.0,
+ 'acquirer_id': self.buckaroo_id,
+ 'currency_id': self.currency_euro_id,
+ 'reference': 'SO004',
+ 'partner_name': 'Norbert Buyer',
+ 'partner_country_id': self.country_france_id,
+ }, context=context
+ )
+ # validate it
+ self.payment_transaction.form_feedback(cr, uid, buckaroo_post_data, 'buckaroo', context=context)
+ # check state
+ tx = self.payment_transaction.browse(cr, uid, tx_id, context=context)
+ self.assertEqual(tx.state, 'done', 'Buckaroo: validation did not put tx into done state')
+ self.assertEqual(tx.buckaroo_txnid, buckaroo_post_data.get('BRQ_TRANSACTIONS'), 'Buckaroo: validation did not update tx payid')
+
+ # reset tx
+ tx.write({'state': 'draft', 'date_validate': False, 'buckaroo_txnid': False})
+
+ # now buckaroo post is ok: try to modify the SHASIGN
+ buckaroo_post_data['BRQ_SIGNATURE'] = '54d928810e343acf5fb0c3ee75fd747ff159ef7a'
+ with self.assertRaises(ValidationError):
+ self.payment_transaction.form_feedback(cr, uid, buckaroo_post_data, 'buckaroo', context=context)
+
+ # simulate an error
+ buckaroo_post_data['BRQ_STATUSCODE'] = 2
+ buckaroo_post_data['BRQ_SIGNATURE'] = '4164b52adb1e6a2221d3d8a39d8c3e18a9ecb90b'
+ self.payment_transaction.form_feedback(cr, uid, buckaroo_post_data, 'buckaroo', context=context)
+ # check state
+ tx = self.payment_transaction.browse(cr, uid, tx_id, context=context)
+ self.assertEqual(tx.state, 'error', 'Buckaroo: erroneous validation did not put tx into error state')
diff --git a/addons/payment_buckaroo/views/buckaroo.xml b/addons/payment_buckaroo/views/buckaroo.xml
new file mode 100644
index 00000000000..567a2691b00
--- /dev/null
+++ b/addons/payment_buckaroo/views/buckaroo.xml
@@ -0,0 +1,34 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/addons/payment_buckaroo/views/payment_acquirer.xml b/addons/payment_buckaroo/views/payment_acquirer.xml
new file mode 100644
index 00000000000..4eb294e49c3
--- /dev/null
+++ b/addons/payment_buckaroo/views/payment_acquirer.xml
@@ -0,0 +1,35 @@
+
+
+
+
+
+ acquirer.form.buckaroo
+ payment.acquirer
+
+
+
+
+
+
+
+
+
+ acquirer.transaction.form.buckaroo
+ payment.transaction
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/addons/payment_paypal/models/paypal.py b/addons/payment_paypal/models/paypal.py
index d71e3d0620b..5dcbd975a4a 100644
--- a/addons/payment_paypal/models/paypal.py
+++ b/addons/payment_paypal/models/paypal.py
@@ -95,9 +95,12 @@ class AcquirerPaypal(osv.Model):
return 0.0
country = self.pool['res.country'].browse(cr, uid, country_id, context=context)
if country and acquirer.company_id.country_id.id == country.id:
- fees = amount * (1 + acquirer.fees_dom_var / 100.0) + acquirer.fees_dom_fixed - amount
+ percentage = acquirer.fees_dom_var
+ fixed = acquirer.fees_dom_fixed
else:
- fees = amount * (1 + acquirer.fees_int_var / 100.0) + acquirer.fees_int_fixed - amount
+ percentage = acquirer.fees_int_var
+ fixed = acquirer.fees_int_fixed
+ fees = (percentage / 100.0 * amount + fixed ) / (1 - percentage / 100.0)
return fees
def paypal_form_generate_values(self, cr, uid, id, partner_values, tx_values, context=None):
diff --git a/addons/payment_paypal/tests/test_paypal.py b/addons/payment_paypal/tests/test_paypal.py
index ccac9b6fdef..a66b90cf0fb 100644
--- a/addons/payment_paypal/tests/test_paypal.py
+++ b/addons/payment_paypal/tests/test_paypal.py
@@ -148,7 +148,7 @@ class PaypalForm(PaypalCommon):
for form_input in tree.input:
if form_input.get('name') in ['handling']:
handling_found = True
- self.assertEqual(form_input.get('value'), '1.56', 'paypal: wrong computed fees')
+ self.assertEqual(form_input.get('value'), '1.57', 'paypal: wrong computed fees')
self.assertTrue(handling_found, 'paypal: fees_active did not add handling input in rendered form')
@mute_logger('openerp.addons.payment_paypal.models.paypal', 'ValidationError')
diff --git a/addons/purchase/edi/purchase_order_action_data.xml b/addons/purchase/edi/purchase_order_action_data.xml
index fc195f86ee4..391c61a8e94 100644
--- a/addons/purchase/edi/purchase_order_action_data.xml
+++ b/addons/purchase/edi/purchase_order_action_data.xml
@@ -111,7 +111,7 @@
-
-
+
diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index acb1793b7bd..11f93e25632 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -669,9 +669,10 @@ class mail_thread(osv.AbstractModel):
def message_get_default_recipients(self, cr, uid, ids, context=None):
if context and context.get('thread_model') and context['thread_model'] in self.pool and context['thread_model'] != self._name:
- sub_ctx = dict(context)
- sub_ctx.pop('thread_model')
- return self.pool[context['thread_model']].message_get_default_recipients(cr, uid, ids, context=sub_ctx)
+ if hasattr(self.pool[context['thread_model']], 'message_get_default_recipients'):
+ sub_ctx = dict(context)
+ sub_ctx.pop('thread_model')
+ return self.pool[context['thread_model']].message_get_default_recipients(cr, uid, ids, context=sub_ctx)
res = {}
for record in self.browse(cr, SUPERUSER_ID, ids, context=context):
recipient_ids, email_to, email_cc = set(), False, False
diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index 99a7751e15e..e5eca724659 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -919,15 +919,45 @@ openerp.mail = function (session) {
this.$('.oe_mail_expand').on('click', this.on_expand);
this.$('.oe_mail_reduce').on('click', this.on_expand);
this.$('.oe_mail_action_model').on('click', this.on_record_clicked);
+ this.$('.oe_mail_action_author').on('click', this.on_record_author_clicked);
},
on_record_clicked: function (event) {
+ event.preventDefault();
+ var self = this;
var state = {
'model': this.model,
'id': this.res_id,
'title': this.record_name
};
session.webclient.action_manager.do_push_state(state);
+ this.context.params = {
+ model: this.model,
+ res_id: this.res_id,
+ };
+ this.thread.ds_thread.call("message_redirect_action", {context: this.context}).then(function(action){
+ self.do_action(action);
+ });
+ },
+
+ on_record_author_clicked: function (event) {
+ event.preventDefault();
+ var partner_id = $(event.target).data('partner');
+ var state = {
+ 'model': 'res.partner',
+ 'id': partner_id,
+ 'title': this.record_name
+ };
+ session.webclient.action_manager.do_push_state(state);
+ var action = {
+ type:'ir.actions.act_window',
+ view_type: 'form',
+ view_mode: 'form',
+ res_model: 'res.partner',
+ views: [[false, 'form']],
+ res_id: partner_id,
+ }
+ this.do_action(action);
},
/* Call the on_compose_message on the thread of this message. */
diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index ec7b0fa2911..3aea4a19555 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -273,7 +273,7 @@
-
updated document
@@ -293,7 +293,7 @@
- ,
diff --git a/addons/mass_mailing/models/mass_mailing.py b/addons/mass_mailing/models/mass_mailing.py
index 2e8a82a8f4d..f721ed2f385 100644
--- a/addons/mass_mailing/models/mass_mailing.py
+++ b/addons/mass_mailing/models/mass_mailing.py
@@ -4,10 +4,9 @@ from datetime import datetime
from dateutil import relativedelta
import json
import random
-import urllib
-import urlparse
from openerp import tools
+from openerp.exceptions import Warning
from openerp.tools.safe_eval import safe_eval as eval
from openerp.tools.translate import _
from openerp.osv import osv, fields
@@ -62,6 +61,12 @@ class MassMailingContact(osv.Model):
rec_id = self.create(cr, uid, {'name': name, 'email': email}, context=context)
return self.name_get(cr, uid, [rec_id], context)[0]
+ def message_get_default_recipients(self, cr, uid, ids, context=None):
+ res = {}
+ for record in self.browse(cr, uid, ids, context=context):
+ res[record.id] = {'partner_ids': [], 'email_to': record.email, 'email_cc': False}
+ return res
+
class MassMailingList(osv.Model):
"""Model of a contact list. """
@@ -549,6 +554,8 @@ class MassMailing(osv.Model):
for mailing in self.browse(cr, uid, ids, context=context):
# instantiate an email composer + send emails
res_ids = self.get_recipients(cr, uid, mailing, context=context)
+ if not res_ids:
+ raise Warning('Please select recipients.')
comp_ctx = dict(context, active_ids=res_ids)
composer_values = {
'author_id': author_id,
diff --git a/addons/mrp_repair/views/report_mrprepairorder.xml b/addons/mrp_repair/views/report_mrprepairorder.xml
index 0ea3f22167c..2897fee1fd9 100644
--- a/addons/mrp_repair/views/report_mrprepairorder.xml
+++ b/addons/mrp_repair/views/report_mrprepairorder.xml
@@ -22,7 +22,7 @@
VAT:
+
diff --git a/addons/pad/static/src/img/pad_link_companies.jpeg b/addons/pad/static/src/img/pad_link_companies.jpeg
new file mode 100644
index 00000000000..1bce3a56186
Binary files /dev/null and b/addons/pad/static/src/img/pad_link_companies.jpeg differ
diff --git a/addons/payment/models/res_config.py b/addons/payment/models/res_config.py
index 70668a296da..a74e595b52e 100644
--- a/addons/payment/models/res_config.py
+++ b/addons/payment/models/res_config.py
@@ -16,4 +16,7 @@ class AccountPaymentConfig(osv.TransientModel):
'module_payment_adyen': fields.boolean(
'Manage Payments Using Adyen',
help='-It installs the module payment_adyen.'),
+ 'module_payment_buckaroo': fields.boolean(
+ 'Manage Payments Using Buckaroo',
+ help='-It installs the module payment_buckaroo.'),
}
diff --git a/addons/payment/views/res_config_view.xml b/addons/payment/views/res_config_view.xml
index 101acb7c9ee..45c0a3d168e 100644
--- a/addons/payment/views/res_config_view.xml
+++ b/addons/payment/views/res_config_view.xml
@@ -20,6 +20,10 @@
+
+
diff --git a/addons/payment_buckaroo/__init__.py b/addons/payment_buckaroo/__init__.py
new file mode 100644
index 00000000000..1f4b1b74e57
--- /dev/null
+++ b/addons/payment_buckaroo/__init__.py
@@ -0,0 +1,23 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+# OpenERP, Open Source Management Solution
+# Copyright (C) 2014-Today OpenERP SA (
REFERENCES
Order number: ${object.name}
- Order total: ${object.amount_total} ${object.pricelist_id.currency_id.name}
+ Order total: ${object.amount_total} ${object.currency_id.name}
Order date: ${object.date_order}
% if object.origin:
Order reference: ${object.origin}
diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py
index 6ff6feae376..67b07644dc4 100644
--- a/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@ -220,7 +220,7 @@ class purchase_order(osv.osv):
'picking_ids': fields.function(_get_picking_ids, method=True, type='one2many', relation='stock.picking', string='Picking List', help="This is the list of reception operations that have been generated for this purchase order."),
'shipped':fields.boolean('Received', readonly=True, select=True, help="It indicates that a picking has been done"),
'shipped_rate': fields.function(_shipped_rate, string='Received Ratio', type='float'),
- 'invoiced': fields.function(_invoiced, string='Invoice Received', type='boolean', help="It indicates that an invoice has been paid"),
+ 'invoiced': fields.function(_invoiced, string='Invoice Received', type='boolean', help="It indicates that an invoice has been validated"),
'invoiced_rate': fields.function(_invoiced_rate, string='Invoiced', type='float'),
'invoice_method': fields.selection([('manual','Based on Purchase Order lines'),('order','Based on generated draft invoice'),('picking','Based on incoming shipments')], 'Invoicing Control', required=True,
readonly=True, states={'draft':[('readonly',False)], 'sent':[('readonly',False)]},
diff --git a/addons/purchase/views/report_purchaseorder.xml b/addons/purchase/views/report_purchaseorder.xml
index 300149e4f1d..91486c035aa 100644
--- a/addons/purchase/views/report_purchaseorder.xml
+++ b/addons/purchase/views/report_purchaseorder.xml
@@ -23,7 +23,7 @@
VAT:
+
diff --git a/addons/purchase/views/report_purchasequotation.xml b/addons/purchase/views/report_purchasequotation.xml
index a18619f99f9..6abd64b2f33 100644
--- a/addons/purchase/views/report_purchasequotation.xml
+++ b/addons/purchase/views/report_purchasequotation.xml
@@ -23,7 +23,7 @@
VAT:
+
diff --git a/addons/report/controllers/main.py b/addons/report/controllers/main.py
index de3bbd63db6..c6bc13d38f8 100644
--- a/addons/report/controllers/main.py
+++ b/addons/report/controllers/main.py
@@ -66,7 +66,7 @@ class ReportController(Controller):
# Misc. route utils
#------------------------------------------------------
@route(['/report/barcode', '/report/barcode//'], type='http', auth="user")
- def report_barcode(self, type, value, width=300, height=50):
+ def report_barcode(self, type, value, width=600, height=100):
"""Contoller able to render barcode images thanks to reportlab.
Samples:
![]()
diff --git a/addons/report/data/report_paperformat.xml b/addons/report/data/report_paperformat.xml
index 275d65edd13..f05e0afb6f0 100644
--- a/addons/report/data/report_paperformat.xml
+++ b/addons/report/data/report_paperformat.xml
@@ -9,7 +9,7 @@
0
Portrait
40
- 20
+ 23
7
7
\ - wkhtmltopdf.org'), true); - report_url = report_url.substring(12) - window.open('/report/html/' + report_url, '_blank', 'height=768,width=1024'); - instance.web.unblockUI(); - return; - } else { - if (presence == 'upgrade') { - self.do_notify(_t('Report'), _t('You should upgrade your version of\ - Wkhtmltopdf to at least 0.12.0 in order to get a correct display of headers and footers as well as\ - support for table-breaking between pages.
wkhtmltopdf.org'), true); - } - } - return trigger_download(self.session, response, c); - }); - } else if (action.report_type == 'controller') { + (wkhtmltopdf_state = wkhtmltopdf_state || openerp.session.rpc('/report/check_wkhtmltopdf')).then(function (presence) { + // Fallback on html if wkhtmltopdf is not installed or if OpenERP is started with one worker + if (presence === 'install') { + self.do_notify(_t('Report'), _t('Unable to find Wkhtmltopdf on this \ +system. The report will be shown in html.
\ +wkhtmltopdf.org'), true); + report_url = report_url.substring(12) + window.open('/report/html/' + report_url, '_blank', 'height=768,width=1024'); + instance.web.unblockUI(); + return; + } else if (presence === 'workers') { + self.do_notify(_t('Report'), _t('You need to start OpenERP with at least two \ +workers to print a pdf version of the reports.'), true); + report_url = report_url.substring(12) + window.open('/report/html/' + report_url, '_blank', 'height=768,width=1024'); + instance.web.unblockUI(); + return; + } else if (presence === 'upgrade') { + self.do_notify(_t('Report'), _t('You should upgrade your version of\ + Wkhtmltopdf to at least 0.12.0 in order to get a correct display of headers and footers as well as\ + support for table-breaking between pages.
wkhtmltopdf.org'), true); + } return trigger_download(self.session, response, c); - } + }); + } else if (action.report_type === 'controller') { + return trigger_download(self.session, response, c); } } else { return self._super(action, options); diff --git a/addons/report/views/layouts.xml b/addons/report/views/layouts.xml index dd7a404196e..f9c0ea7ef73 100644 --- a/addons/report/views/layouts.xml +++ b/addons/report/views/layouts.xml @@ -9,7 +9,8 @@ t-att-data-main-object="repr(main_object) if editable else None" t-att-data-report-margin-top="data_report_margin_top if data_report_margin_top else None" t-att-data-report-header-spacing="data_report_header_spacing if data_report_header_spacing else None" - t-att-data-report-dpi="data_report_dpi if data_report_dpi else None"> + t-att-data-report-dpi="data_report_dpi if data_report_dpi else None" + t-att-data-oe-company-name="res_company.name"> @@ -19,7 +20,6 @@
-
\ - wkhtmltopdf.org'), true); - report_url = report_url.substring(12) - window.open('/report/html/' + report_url, '_blank', 'height=768,width=1024'); - instance.web.unblockUI(); - return; - } else { - if (presence == 'upgrade') { - self.do_notify(_t('Report'), _t('You should upgrade your version of\ - Wkhtmltopdf to at least 0.12.0 in order to get a correct display of headers and footers as well as\ - support for table-breaking between pages.
wkhtmltopdf.org'), true); - } - } - return trigger_download(self.session, response, c); - }); - } else if (action.report_type == 'controller') { + (wkhtmltopdf_state = wkhtmltopdf_state || openerp.session.rpc('/report/check_wkhtmltopdf')).then(function (presence) { + // Fallback on html if wkhtmltopdf is not installed or if OpenERP is started with one worker + if (presence === 'install') { + self.do_notify(_t('Report'), _t('Unable to find Wkhtmltopdf on this \ +system. The report will be shown in html.
\ +wkhtmltopdf.org'), true); + report_url = report_url.substring(12) + window.open('/report/html/' + report_url, '_blank', 'height=768,width=1024'); + instance.web.unblockUI(); + return; + } else if (presence === 'workers') { + self.do_notify(_t('Report'), _t('You need to start OpenERP with at least two \ +workers to print a pdf version of the reports.'), true); + report_url = report_url.substring(12) + window.open('/report/html/' + report_url, '_blank', 'height=768,width=1024'); + instance.web.unblockUI(); + return; + } else if (presence === 'upgrade') { + self.do_notify(_t('Report'), _t('You should upgrade your version of\ + Wkhtmltopdf to at least 0.12.0 in order to get a correct display of headers and footers as well as\ + support for table-breaking between pages.
wkhtmltopdf.org'), true); + } return trigger_download(self.session, response, c); - } + }); + } else if (action.report_type === 'controller') { + return trigger_download(self.session, response, c); } } else { return self._super(action, options); diff --git a/addons/report/views/layouts.xml b/addons/report/views/layouts.xml index dd7a404196e..f9c0ea7ef73 100644 --- a/addons/report/views/layouts.xml +++ b/addons/report/views/layouts.xml @@ -9,7 +9,8 @@ t-att-data-main-object="repr(main_object) if editable else None" t-att-data-report-margin-top="data_report_margin_top if data_report_margin_top else None" t-att-data-report-header-spacing="data_report_header_spacing if data_report_header_spacing else None" - t-att-data-report-dpi="data_report_dpi if data_report_dpi else None"> + t-att-data-report-dpi="data_report_dpi if data_report_dpi else None" + t-att-data-oe-company-name="res_company.name"> @@ -19,7 +20,6 @@
-
+
-
diff --git a/addons/report_webkit/webkit_report.py b/addons/report_webkit/webkit_report.py
index 60fb536ca96..c442ea32549 100644
--- a/addons/report_webkit/webkit_report.py
+++ b/addons/report_webkit/webkit_report.py
@@ -156,8 +156,8 @@ class WebKitParser(report_sxw):
"""Call webkit in order to generate pdf"""
if not webkit_header:
webkit_header = report_xml.webkit_header
- tmp_dir = tempfile.gettempdir()
- out_filename = tempfile.mktemp(suffix=".pdf", prefix="webkit.tmp.")
+ fd, out_filename = tempfile.mkstemp(suffix=".pdf",
+ prefix="webkit.tmp.")
file_to_del = [out_filename]
if comm_path:
command = [comm_path]
@@ -168,25 +168,15 @@ class WebKitParser(report_sxw):
# default to UTF-8 encoding. Use to override.
command.extend(['--encoding', 'utf-8'])
if header :
- head_file = file( os.path.join(
- tmp_dir,
- str(time.time()) + '.head.html'
- ),
- 'w'
- )
- head_file.write(self._sanitize_html(header.encode('utf-8')))
- head_file.close()
+ with tempfile.NamedTemporaryFile(suffix=".head.html",
+ delete=False) as head_file:
+ head_file.write(self._sanitize_html(header.encode('utf-8')))
file_to_del.append(head_file.name)
command.extend(['--header-html', head_file.name])
if footer :
- foot_file = file( os.path.join(
- tmp_dir,
- str(time.time()) + '.foot.html'
- ),
- 'w'
- )
- foot_file.write(self._sanitize_html(footer.encode('utf-8')))
- foot_file.close()
+ with tempfile.NamedTemporaryFile(suffix=".foot.html",
+ delete=False) as foot_file:
+ foot_file.write(self._sanitize_html(footer.encode('utf-8')))
file_to_del.append(foot_file.name)
command.extend(['--footer-html', foot_file.name])
@@ -204,10 +194,10 @@ class WebKitParser(report_sxw):
command.extend(['--page-size', str(webkit_header.format).replace(',', '.')])
count = 0
for html in html_list :
- html_file = file(os.path.join(tmp_dir, str(time.time()) + str(count) +'.body.html'), 'w')
- count += 1
- html_file.write(self._sanitize_html(html.encode('utf-8')))
- html_file.close()
+ with tempfile.NamedTemporaryFile(suffix="%d.body.html" %count,
+ delete=False) as html_file:
+ count += 1
+ html_file.write(self._sanitize_html(html.encode('utf-8')))
file_to_del.append(html_file.name)
command.append(html_file.name)
command.append(out_filename)
@@ -227,9 +217,9 @@ class WebKitParser(report_sxw):
if status :
raise except_osv(_('Webkit error' ),
_("The command 'wkhtmltopdf' failed with error code = %s. Message: %s") % (status, error_message))
- pdf_file = open(out_filename, 'rb')
- pdf = pdf_file.read()
- pdf_file.close()
+ with open(out_filename, 'rb') as pdf_file:
+ pdf = pdf_file.read()
+ os.close(fd)
finally:
if stderr_fd is not None:
os.close(stderr_fd)
diff --git a/addons/sale/views/report_saleorder.xml b/addons/sale/views/report_saleorder.xml
index c23e680e664..5c198c635a3 100644
--- a/addons/sale/views/report_saleorder.xml
+++ b/addons/sale/views/report_saleorder.xml
@@ -19,7 +19,7 @@
VAT:
+
diff --git a/addons/survey/security/ir.model.access.csv b/addons/survey/security/ir.model.access.csv
index 89c001ce44e..e49c976ea1f 100644
--- a/addons/survey/security/ir.model.access.csv
+++ b/addons/survey/security/ir.model.access.csv
@@ -1,11 +1,11 @@
id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
-access_survey_public,survey.survey public,model_survey_survey,base.group_public,1,0,0,0
-access_survey_page_public,survey.page public,model_survey_page,base.group_public,1,0,0,0
-access_survey_question_public,survey.question public,model_survey_question,base.group_public,1,0,0,0
-access_survey_label_public,survey.label public,model_survey_label,base.group_public,1,0,0,0
-access_survey_user_input_public,survey.user_input public,model_survey_user_input,base.group_public,1,1,1,0
-access_survey_user_input_line_public,survey.user_input_line public,model_survey_user_input_line,base.group_public,1,1,1,0
-access_survey_stage_public,survey.stage public,model_survey_stage,base.group_public,1,0,0,0
+access_survey_public,survey.survey public,model_survey_survey,,1,0,0,0
+access_survey_page_public,survey.page public,model_survey_page,,1,0,0,0
+access_survey_question_public,survey.question public,model_survey_question,,1,0,0,0
+access_survey_label_public,survey.label public,model_survey_label,,1,0,0,0
+access_survey_user_input_public,survey.user_input public,model_survey_user_input,,1,1,1,0
+access_survey_user_input_line_public,survey.user_input_line public,model_survey_user_input_line,,1,1,1,0
+access_survey_stage_public,survey.stage public,model_survey_stage,,1,0,0,0
access_survey_user,survey.survey user,model_survey_survey,base.group_survey_user,1,0,0,0
access_survey_page_user,survey.page user,model_survey_page,base.group_survey_user,1,0,0,0
access_survey_question_user,survey.question user,model_survey_question,base.group_survey_user,1,0,0,0
diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index ffe9d268240..a4ecc4e17d9 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -2596,6 +2596,7 @@ instance.web.form.FieldCharDomain = instance.web.form.AbstractField.extend(insta
this.$('.select_records').on('click', self.on_click);
},
on_click: function(ev) {
+ event.preventDefault();
var self = this;
var model = this.options.model || this.field_manager.get_field_value(this.options.model_field);
this.pop = new instance.web.form.SelectCreatePopup(this);
@@ -2614,15 +2615,14 @@ instance.web.form.FieldCharDomain = instance.web.form.AbstractField.extend(insta
});
}
else {
- var domain = ["id", "in", element_ids];
+ var domain = [["id", "in", element_ids]];
var domain_done = $.Deferred().resolve(domain);
}
$.when(domain_done).then(function (domain) {
var domain = self.pop.dataset.domain.concat(domain || []);
- self.set_value(JSON.stringify(domain))
+ self.set_value(domain);
});
});
- event.preventDefault();
},
});
@@ -4463,7 +4463,11 @@ instance.web.form.One2ManyListView = instance.web.ListView.extend({
else
return $.when();
}).done(function () {
- if (!self.o2m.options.reload_on_button) {
+ var ds = self.o2m.dataset;
+ var cached_records = _.any([ds.to_create, ds.to_delete, ds.to_write], function(value) {
+ return value.length;
+ });
+ if (!self.o2m.options.reload_on_button && !cached_records) {
self.handle_button(name, id, callback);
}else {
self.handle_button(name, id, function(){
diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js
index 753d52d497a..ec233159d63 100644
--- a/addons/web/static/src/js/views.js
+++ b/addons/web/static/src/js/views.js
@@ -885,7 +885,20 @@ instance.web.ViewManagerAction = instance.web.ViewManager.extend({
this._super(parent, null, action.views, flags);
this.session = parent.session;
this.action = action;
- var dataset = new instance.web.DataSetSearch(this, action.res_model, action.context, action.domain);
+ var context = action.context;
+ if (action.target === 'current'){
+ var active_context = {
+ active_model: action.res_model,
+ };
+ context = new instance.web.CompoundContext(context, active_context).eval();
+ delete context['active_id'];
+ delete context['active_ids'];
+ if (action.res_id){
+ context['active_id'] = action.res_id;
+ context['active_ids'] = [action.res_id];
+ }
+ }
+ var dataset = new instance.web.DataSetSearch(this, action.res_model, context, action.domain);
if (action.res_id) {
dataset.ids.push(action.res_id);
dataset.index = 0;
diff --git a/addons/website/controllers/main.py b/addons/website/controllers/main.py
index ab024e18197..446080875a6 100644
--- a/addons/website/controllers/main.py
+++ b/addons/website/controllers/main.py
@@ -158,22 +158,25 @@ class Website(openerp.addons.web.controllers.main.Home):
@http.route('/website/theme_change', type='http', auth="user", website=True)
def theme_change(self, theme_id=False, **kwargs):
imd = request.registry['ir.model.data']
- view = request.registry['ir.ui.view']
+ Views = request.registry['ir.ui.view']
- view_model, view_option_id = imd.get_object_reference(
+ _, theme_template_id = imd.get_object_reference(
request.cr, request.uid, 'website', 'theme')
- views = view.search(
- request.cr, request.uid, [('inherit_id', '=', view_option_id)],
- context=request.context)
- view.write(request.cr, request.uid, views, {'inherit_id': False},
- context=request.context)
+ views = Views.search(request.cr, request.uid, [
+ ('inherit_id', '=', theme_template_id),
+ ('application', '=', 'enabled'),
+ ], context=request.context)
+ Views.write(request.cr, request.uid, views, {
+ 'application': 'disabled',
+ }, context=request.context)
if theme_id:
module, xml_id = theme_id.split('.')
- view_model, view_id = imd.get_object_reference(
+ _, view_id = imd.get_object_reference(
request.cr, request.uid, module, xml_id)
- view.write(request.cr, request.uid, [view_id],
- {'inherit_id': view_option_id}, context=request.context)
+ Views.write(request.cr, request.uid, [view_id], {
+ 'application': 'enabled'
+ }, context=request.context)
return request.render('website.themes', {'theme_changed': True})
@@ -197,54 +200,45 @@ class Website(openerp.addons.web.controllers.main.Home):
module_obj.button_immediate_upgrade(request.cr, request.uid, module_ids, context=request.context)
return request.redirect(redirect)
- @http.route('/website/customize_template_toggle', type='json', auth='user', website=True)
- def customize_template_set(self, view_id):
- view_obj = request.registry.get("ir.ui.view")
- view = view_obj.browse(request.cr, request.uid, int(view_id),
- context=request.context)
- if view.inherit_id:
- value = False
- else:
- value = view.inherit_option_id and view.inherit_option_id.id or False
- view_obj.write(request.cr, request.uid, [view_id], {
- 'inherit_id': value
- }, context=request.context)
- return True
-
@http.route('/website/customize_template_get', type='json', auth='user', website=True)
- def customize_template_get(self, xml_id, optional=True):
+ def customize_template_get(self, xml_id, full=False):
+ """ Lists the templates customizing ``xml_id``. By default, only
+ returns optional templates (which can be toggled on and off), if
+ ``full=True`` returns all templates customizing ``xml_id``
+ """
imd = request.registry['ir.model.data']
view_model, view_theme_id = imd.get_object_reference(
request.cr, request.uid, 'website', 'theme')
- user = request.registry['res.users'].browse(request.cr, request.uid, request.uid, request.context)
- group_ids = [g.id for g in user.groups_id]
+ user = request.registry['res.users']\
+ .browse(request.cr, request.uid, request.uid, request.context)
+ user_groups = set(user.groups_id)
- view = request.registry.get("ir.ui.view")
- views = view._views_get(request.cr, request.uid, xml_id, context=request.context)
- done = {}
+ views = request.registry["ir.ui.view"]\
+ ._views_get(request.cr, request.uid, xml_id, context=request.context)
+ done = set()
result = []
for v in views:
- if v.groups_id and [g for g in v.groups_id if g.id not in group_ids]:
+ if not user_groups.issuperset(v.groups_id):
continue
- if v.inherit_option_id and v.inherit_option_id.id != view_theme_id or not optional:
- if v.inherit_option_id.id not in done:
+ if full or (v.application != 'always' and v.inherit_id.id != view_theme_id):
+ if v.inherit_id not in done:
result.append({
- 'name': v.inherit_option_id.name,
+ 'name': v.inherit_id.name,
'id': v.id,
'xml_id': v.xml_id,
'inherit_id': v.inherit_id.id,
'header': True,
'active': False
})
- done[v.inherit_option_id.id] = True
+ done.add(v.inherit_id)
result.append({
'name': v.name,
'id': v.id,
'xml_id': v.xml_id,
'inherit_id': v.inherit_id.id,
'header': False,
- 'active': (v.inherit_id.id == v.inherit_option_id.id) or (not optional and v.inherit_id.id)
+ 'active': v.application in ('always', 'enabled'),
})
return result
@@ -384,7 +378,7 @@ class Website(openerp.addons.web.controllers.main.Home):
"""
response = werkzeug.wrappers.Response()
return request.registry['website']._image(
- request.cr, request.uid, model, id, field, response)
+ request.cr, request.uid, model, id, field, response, max_width, max_height)
#------------------------------------------------------
diff --git a/addons/website/models/ir_http.py b/addons/website/models/ir_http.py
index 360b34c877c..44b3f771f62 100644
--- a/addons/website/models/ir_http.py
+++ b/addons/website/models/ir_http.py
@@ -141,49 +141,50 @@ class ir_http(orm.AbstractModel):
return response
def _handle_exception(self, exception=None, code=500):
- if isinstance(exception, werkzeug.exceptions.HTTPException) and hasattr(exception, 'response') and exception.response:
- return exception.response
+ try:
+ return super(ir_http, self)._handle_exception(exception)
+ except Exception:
- attach = self._serve_attachment()
- if attach:
- return attach
+ attach = self._serve_attachment()
+ if attach:
+ return attach
- if getattr(request, 'website_enabled', False) and request.website:
- values = dict(
- exception=exception,
- traceback=traceback.format_exc(exception),
- )
- if exception:
- code = getattr(exception, 'code', code)
- if isinstance(exception, ir_qweb.QWebException):
- values.update(qweb_exception=exception)
- if isinstance(exception.qweb.get('cause'), openerp.exceptions.AccessError):
- code = 403
- if code == 500:
- logger.error("500 Internal Server Error:\n\n%s", values['traceback'])
- if 'qweb_exception' in values:
- view = request.registry.get("ir.ui.view")
- views = view._views_get(request.cr, request.uid, exception.qweb['template'], request.context)
- to_reset = [v for v in views if v.model_data_id.noupdate is True]
- values['views'] = to_reset
- elif code == 403:
- logger.warn("403 Forbidden:\n\n%s", values['traceback'])
+ if getattr(request, 'website_enabled', False) and request.website:
+ values = dict(
+ exception=exception,
+ traceback=traceback.format_exc(exception),
+ )
+ if exception:
+ code = getattr(exception, 'code', code)
+ if isinstance(exception, ir_qweb.QWebException):
+ values.update(qweb_exception=exception)
+ if isinstance(exception.qweb.get('cause'), openerp.exceptions.AccessError):
+ code = 403
+ if code == 500:
+ logger.error("500 Internal Server Error:\n\n%s", values['traceback'])
+ if 'qweb_exception' in values:
+ view = request.registry.get("ir.ui.view")
+ views = view._views_get(request.cr, request.uid, exception.qweb['template'], request.context)
+ to_reset = [v for v in views if v.model_data_id.noupdate is True]
+ values['views'] = to_reset
+ elif code == 403:
+ logger.warn("403 Forbidden:\n\n%s", values['traceback'])
- values.update(
- status_message=werkzeug.http.HTTP_STATUS_CODES[code],
- status_code=code,
- )
+ values.update(
+ status_message=werkzeug.http.HTTP_STATUS_CODES[code],
+ status_code=code,
+ )
- if not request.uid:
- self._auth_method_public()
+ if not request.uid:
+ self._auth_method_public()
- try:
- html = request.website._render('website.%s' % code, values)
- except Exception:
- html = request.website._render('website.http_error', values)
- return werkzeug.wrappers.Response(html, status=code, content_type='text/html;charset=utf-8')
+ try:
+ html = request.website._render('website.%s' % code, values)
+ except Exception:
+ html = request.website._render('website.http_error', values)
+ return werkzeug.wrappers.Response(html, status=code, content_type='text/html;charset=utf-8')
- return super(ir_http, self)._handle_exception(exception)
+ raise
class ModelConverter(ir.ir_http.ModelConverter):
def __init__(self, url_map, model=False, domain='[]'):
diff --git a/addons/website/models/ir_qweb.py b/addons/website/models/ir_qweb.py
index ad2b63a6dd9..0e1fe2beb89 100644
--- a/addons/website/models/ir_qweb.py
+++ b/addons/website/models/ir_qweb.py
@@ -15,6 +15,7 @@ import urllib2
import urlparse
import re
+import werkzeug.urls
import werkzeug.utils
from dateutil import parser
from lxml import etree, html
@@ -265,10 +266,19 @@ class Image(orm.AbstractModel):
if options is None: options = {}
classes = ['img', 'img-responsive'] + options.get('class', '').split()
- return ir_qweb.HTMLSafe('
' % (
+ url_params = {
+ 'model': record._model._name,
+ 'field': field_name,
+ 'id': record.id,
+ }
+ for options_key in ['max_width', 'max_height']:
+ if options.get(options_key):
+ url_params[options_key] = options[options_key]
+
+ return ir_qweb.HTMLSafe('
' % (
' '.join(itertools.imap(werkzeug.utils.escape, classes)),
- record._model._name,
- field_name, record.id))
+ werkzeug.urls.url_encode(url_params)
+ ))
local_url_re = re.compile(r'^/(?P[^]]+)/static/(?P.+)$')
def from_html(self, cr, uid, model, column, element, context=None):
diff --git a/addons/website/models/ir_ui_view.py b/addons/website/models/ir_ui_view.py
index 9d89665c56f..398bbb6a87b 100644
--- a/addons/website/models/ir_ui_view.py
+++ b/addons/website/models/ir_ui_view.py
@@ -13,8 +13,6 @@ from openerp.osv import osv, fields
class view(osv.osv):
_inherit = "ir.ui.view"
_columns = {
- 'inherit_option_id': fields.many2one('ir.ui.view','Optional Inheritancy'),
- 'inherited_option_ids': fields.one2many('ir.ui.view','inherit_option_id','Optional Inheritancies'),
'page': fields.boolean("Whether this view is a web page template (complete)"),
'website_meta_title': fields.char("Website meta title", size=70, translate=True),
'website_meta_description': fields.text("Website meta description", size=160, translate=True),
@@ -24,25 +22,30 @@ class view(osv.osv):
'page': False,
}
+
+ def _view_obj(self, cr, uid, view_id, context=None):
+ if isinstance(view_id, basestring):
+ return self.pool['ir.model.data'].xmlid_to_object(
+ cr, uid, view_id, raise_if_not_found=True, context=context
+ )
+ elif isinstance(view_id, (int, long)):
+ return self.browse(cr, uid, view_id, context=context)
+
+ # assume it's already a view object (WTF?)
+ return view_id
+
# Returns all views (called and inherited) related to a view
# Used by translation mechanism, SEO and optional templates
- def _views_get(self, cr, uid, view, options=True, context=None, root=True, stack_result=None):
- if not context:
- context = {}
- if not stack_result:
- stack_result = []
-
- def view_obj(view):
- if isinstance(view, basestring):
- mod_obj = self.pool.get("ir.model.data")
- m, n = view.split('.')
- view = mod_obj.get_object(cr, uid, m, n, context=context)
- elif isinstance(view, (int, long)):
- view = self.pool.get("ir.ui.view").browse(cr, uid, view, context=context)
- return view
+ def _views_get(self, cr, uid, view_id, options=True, context=None, root=True):
+ """ For a given view ``view_id``, should return:
+ * the view itself
+ * all views inheriting from it, enabled or not
+ - but not the optional children of a non-enabled child
+ * all views called from it (via t-call)
+ """
try:
- view = view_obj(view)
+ view = self._view_obj(cr, uid, view_id, context=context)
except ValueError:
# Shall we log that ?
return []
@@ -55,19 +58,25 @@ class view(osv.osv):
node = etree.fromstring(view.arch)
for child in node.xpath("//t[@t-call]"):
try:
- call_view = view_obj(child.get('t-call'))
+ called_view = self._view_obj(cr, uid, child.get('t-call'), context=context)
except ValueError:
continue
- if call_view not in result:
- result += self._views_get(cr, uid, call_view, options=options, context=context, stack_result=result)
+ if called_view not in result:
+ result += self._views_get(cr, uid, called_view, options=options, context=context)
- todo = view.inherit_children_ids
- if options:
- todo += filter(lambda x: not x.inherit_id, view.inherited_option_ids)
- # Keep options in a determinitic order whatever their enabled disabled status
- todo.sort(lambda x,y:cmp(x.id,y.id))
- for child_view in todo:
- for r in self._views_get(cr, uid, child_view, options=bool(child_view.inherit_id), context=context, root=False, stack_result=result):
+ extensions = view.inherit_children_ids
+ if not options:
+ # only active children
+ extensions = (v for v in view.inherit_children_ids
+ if v.application in ('always', 'enabled'))
+
+ # Keep options in a deterministic order regardless of their applicability
+ for extension in sorted(extensions, key=lambda v: v.id):
+ for r in self._views_get(
+ cr, uid, extension,
+ # only return optional grandchildren if this child is enabled
+ options=extension.application in ('always', 'enabled'),
+ context=context, root=False):
if r not in result:
result.append(r)
return result
diff --git a/addons/website/models/website.py b/addons/website/models/website.py
index 433d8644698..db02dcce51e 100644
--- a/addons/website/models/website.py
+++ b/addons/website/models/website.py
@@ -541,7 +541,10 @@ class website(osv.osv):
response.mimetype = Image.MIME[image.format]
w, h = image.size
- max_w, max_h = int(max_width), int(max_height)
+ try:
+ max_w, max_h = int(max_width), int(max_height)
+ except:
+ max_w, max_h = (maxint, maxint)
if w < max_w and h < max_h:
response.data = data
diff --git a/addons/website/static/src/js/website.ace.js b/addons/website/static/src/js/website.ace.js
index a8af74bb52d..27e5cd60e62 100644
--- a/addons/website/static/src/js/website.ace.js
+++ b/addons/website/static/src/js/website.ace.js
@@ -97,7 +97,7 @@
var viewId = $(document.documentElement).data('view-xmlid');
openerp.jsonRpc('/website/customize_template_get', 'call', {
'xml_id': viewId,
- 'optional': false,
+ 'full': true,
}).then(function (views) {
self.loadViews.call(self, views);
self.open.call(self);
diff --git a/addons/website/static/src/js/website.editor.js b/addons/website/static/src/js/website.editor.js
index 595df04a088..fcb957cafda 100644
--- a/addons/website/static/src/js/website.editor.js
+++ b/addons/website/static/src/js/website.editor.js
@@ -470,8 +470,14 @@
});
menu.on('click', 'a[data-action!=ace]', function (event) {
var view_id = $(event.currentTarget).data('view-id');
- openerp.jsonRpc('/website/customize_template_toggle', 'call', {
- 'view_id': view_id
+ return openerp.jsonRpc('/web/dataset/call_kw', 'call', {
+ model: 'ir.ui.view',
+ method: 'toggle',
+ args: [],
+ kwargs: {
+ ids: [parseInt(view_id, 10)],
+ context: website.get_context()
+ }
}).then( function() {
window.location.reload();
});
diff --git a/addons/website/static/src/js/website.seo.js b/addons/website/static/src/js/website.seo.js
index 8588b7a3765..1c4bad90ffc 100644
--- a/addons/website/static/src/js/website.seo.js
+++ b/addons/website/static/src/js/website.seo.js
@@ -264,21 +264,21 @@
},
description: function () {
var $description = $('meta[name=description]');
- return ($description.length > 0) && ($description.attr('value') && $description.attr('value').trim());
+ return ($description.length > 0) && ($description.attr('content') && $description.attr('content').trim());
},
changeDescription: function (description) {
// TODO create tag if missing
- $('meta[name=description]').attr('value', description);
+ $('meta[name=description]').attr('content', description);
this.trigger('description-changed', description);
},
keywords: function () {
var $keywords = $('meta[name=keywords]');
- var parsed = ($keywords.length > 0) && $keywords.attr('value') && $keywords.attr('value').split(",");
+ var parsed = ($keywords.length > 0) && $keywords.attr('content') && $keywords.attr('content').split(",");
return (parsed && parsed[0]) ? parsed: [];
},
changeKeywords: function (keywords) {
// TODO create tag if missing
- $('meta[name=keywords]').attr('value', keywords.join(","));
+ $('meta[name=keywords]').attr('content', keywords.join(","));
this.trigger('keywords-changed', keywords);
},
headers: function (tag) {
@@ -296,7 +296,7 @@
});
},
company: function () {
- return $('meta[name="openerp.company"]').attr('value');
+ return $('html').attr('data-oe-company-name');
},
bodyText: function () {
return $('body').children().not('.js_seo_configuration').text();
diff --git a/addons/website/views/themes.xml b/addons/website/views/themes.xml
index 82f5105adcd..a2408133207 100644
--- a/addons/website/views/themes.xml
+++ b/addons/website/views/themes.xml
@@ -203,82 +203,82 @@
All Default Themes
-->
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
diff --git a/addons/website/views/website_templates.xml b/addons/website/views/website_templates.xml
index d5aebd4c686..56d954e8a35 100644
--- a/addons/website/views/website_templates.xml
+++ b/addons/website/views/website_templates.xml
@@ -61,8 +61,10 @@
t-att-data-editable="'1' if editable else None"
t-att-data-translatable="'1' if translatable else None"
t-att-data-view-xmlid="xmlid if editable else None"
- t-att-data-main-object="repr(main_object) if editable else None">
+ t-att-data-main-object="repr(main_object) if editable else None"
+ t-att-data-oe-company-name="res_company.name">
+
@@ -73,10 +75,9 @@
- <t t-esc="title"/>
@@ -137,14 +138,14 @@