From cadf582d783a0bfb14dd2535f457bc2959185a9b Mon Sep 17 00:00:00 2001 From: Denis Ledoux Date: Tue, 27 May 2014 18:39:00 +0200 Subject: [PATCH 1/4] [FIX] event_sale, website_event_sale: ACLs for event.event.ticket event.event.ticket were set in website_event_sale, while this model is set in event_sale module Manager acl moved from website_event_sale to event_sale Created a new acl for event user in event_sale Left the acl for everyone in website_event_sale, meaning that when this module is installed, everyone can read tickets, event those who aren't event user --- addons/event_sale/__openerp__.py | 1 + addons/event_sale/security/ir.model.access.csv | 3 +++ addons/website_event_sale/security/ir.model.access.csv | 1 - 3 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 addons/event_sale/security/ir.model.access.csv 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/website_event_sale/security/ir.model.access.csv b/addons/website_event_sale/security/ir.model.access.csv index 0538dbe8cc3..ec5ea43cd7d 100644 --- a/addons/website_event_sale/security/ir.model.access.csv +++ b/addons/website_event_sale/security/ir.model.access.csv @@ -1,5 +1,4 @@ id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink access_event_event_ticket_public,event.event.ticket.public,event_sale.model_event_event_ticket,,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 access_event_product_product_public,event.product.product.public,product.model_product_product,base.group_public,1,0,0,0 access_event_product_template_public,event.product.template.public,product.model_product_template,base.group_public,1,0,0,0 \ No newline at end of file From 5f94504c0872f734a9c106c7dc63b4e06499cc07 Mon Sep 17 00:00:00 2001 From: Richard Mathot Date: Wed, 28 May 2014 10:06:42 +0200 Subject: [PATCH 2/4] [TYPO] in crm_partner_assign --- addons/crm_partner_assign/crm_partner_assign.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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', From 00dc3a59dfd89af848f959fabf01157c80c9bfe2 Mon Sep 17 00:00:00 2001 From: Denis Ledoux Date: Wed, 28 May 2014 12:04:41 +0200 Subject: [PATCH 3/4] [FIX] website_sale: force changing pricelist on different account signin opw-607517 --- addons/website_sale/models/website.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/addons/website_sale/models/website.py b/addons/website_sale/models/website.py index 6d07c59970e..b471935f2f0 100644 --- a/addons/website_sale/models/website.py +++ b/addons/website_sale/models/website.py @@ -22,7 +22,7 @@ class Website(orm.Model): # *********************************************************** def ecommerce_get_pricelist_id(self, cr, uid, ids, context=None): - if not request.httprequest.session.get('ecommerce_pricelist'): + if not request.httprequest.session.get('ecommerce_pricelist') or request.httprequest.session.get('ecommerce_pricelist_uid') != uid: self._ecommerce_change_pricelist(cr, uid, None, context=context) return request.httprequest.session.get('ecommerce_pricelist') @@ -41,6 +41,7 @@ class Website(orm.Model): pricelist_id = self.pool.get('sale.order').onchange_partner_id(cr, SUPERUSER_ID, [], partner_id, context=context)['value']['pricelist_id'] request.httprequest.session['ecommerce_pricelist'] = pricelist_id + request.httprequest.session['ecommerce_pricelist_uid'] = uid order = self.ecommerce_get_current_order(cr, uid, context=context) if order: From df0ae7e4d155a180f5e49e85f18ce52bf503c22c Mon Sep 17 00:00:00 2001 From: Denis Ledoux Date: Wed, 28 May 2014 14:02:56 +0200 Subject: [PATCH 4/4] [FIX] payment_paypal: wrong handling fees computation formula --- addons/payment_paypal/models/paypal.py | 7 +++++-- addons/payment_paypal/tests/test_paypal.py | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/addons/payment_paypal/models/paypal.py b/addons/payment_paypal/models/paypal.py index a5e31e9571c..ffa5de1bf7a 100644 --- a/addons/payment_paypal/models/paypal.py +++ b/addons/payment_paypal/models/paypal.py @@ -90,9 +90,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 01f40ddd094..5638c5cd602 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')