[MERGE] Forward-port of latest saas-3 bugfixes, up to rev. df0ae7e4d1

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',

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'],

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

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):

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')

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

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.session.get('ecommerce_pricelist'):
+        if not request.session.get('ecommerce_pricelist') or request.session.get('ecommerce_pricelist_uid') != uid:
             self._ecommerce_change_pricelist(cr, uid, None, context=context)
         return request.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.session['ecommerce_pricelist'] = pricelist_id
+        request.session['ecommerce_pricelist_uid'] = uid
 
         order = self.ecommerce_get_current_order(cr, uid, context=context)
         if order: