[MERGE] forward port of branch saas-4 up to de696f14

addons/l10n_lu/account.account.template-2011.csv

@@ -402,8 +402,9 @@ lu_2011_account_42261,42261,Taxe sur la valeur ajoutée – TVA,lu_2011_account_
 lu_2011_account_422611,422611,TVA en amont,lu_2011_account_42261,view,account_type_2011_4_creance,f,
 lu_2011_account_4226111,4226111,TVA en amont – Pays,lu_2011_account_422611,other,account_type_2011_4_creance,f,
 lu_2011_account_4226112,4226112,TVA en amont – Intracommunautaire,lu_2011_account_422611,other,account_type_2011_4_creance,f,
-lu_2011_account_4226113,4226113,TVA en amont – Triangulaire,lu_2011_account_422611,other,account_type_2011_4_creance,f,
-lu_2011_account_4226114,4226114,TVA en amont – Exonérations spéciales,lu_2011_account_422611,other,account_type_2011_4_creance,f,
+lu_2011_account_4226113,4226113,TVA en amont – Extracommunautaire,lu_2011_account_422611,other,account_type_2011_4_creance,f,
+lu_2011_account_4226114,4226114,TVA en amont – Triangulaire,lu_2011_account_422611,other,account_type_2011_4_creance,f,
+lu_2011_account_4226115,4226115,TVA en amont – Exonérations spéciales,lu_2011_account_422611,other,account_type_2011_4_creance,f,
 lu_2011_account_422612,422612,TVA à recevoir,lu_2011_account_42261,other,account_type_2011_4_creance,f,
 lu_2011_account_422613,422613,TVA acomptes versés,lu_2011_account_42261,other,account_type_2011_4_creance,f,
 lu_2011_account_422618,422618,TVA – Autres créances,lu_2011_account_42261,other,account_type_2011_4_creance,f,
@@ -883,19 +884,19 @@ lu_2011_account_6541,6541,Parts dans des entreprises liées,lu_2011_account_654,
 lu_2011_account_6542,6542,Parts dans des entreprises avec lesquelles la société a un lien de participation,lu_2011_account_654,other,account_type_2011_6_charge_finance,f,
 lu_2011_account_6543,6543,Actions propres ou parts propres,lu_2011_account_654,other,account_type_2011_6_charge_finance,f,
 lu_2011_account_6548,6548,Autres valeurs mobilières,lu_2011_account_654,other,account_type_2011_6_charge_finance,f,
-lu_2011_account_655,655,Intérêts et escomptes,lu_2011_account_65,view,account_type_2011_6_charge_finance,f,account_financial_report_135
-lu_2011_account_6551,6551,Intérêts des dettes financières,lu_2011_account_655,view,account_type_2011_6_charge_finance,f,
+lu_2011_account_655,655,Intérêts et escomptes,lu_2011_account_65,view,account_type_2011_6_charge_finance,f,
+lu_2011_account_6551,6551,Intérêts des dettes financières,lu_2011_account_655,view,account_type_2011_6_charge_finance,f,account_financial_report_135
 lu_2011_account_65511,65511,Intérêts des dettes subordonnées,lu_2011_account_6551,other,account_type_2011_6_charge_finance,f,
 lu_2011_account_65512,65512,Intérêts des emprunts obligataires,lu_2011_account_6551,other,account_type_2011_6_charge_finance,f,
-lu_2011_account_6552,6552,Intérêts bancaires et assimilés,lu_2011_account_655,view,account_type_2011_6_charge_finance,f,
+lu_2011_account_6552,6552,Intérêts bancaires et assimilés,lu_2011_account_655,view,account_type_2011_6_charge_finance,f,account_financial_report_135
 lu_2011_account_65521,65521,Intérêts bancaires sur comptes courants,lu_2011_account_6552,other,account_type_2011_6_charge_finance,f,
 lu_2011_account_65522,65522,Intérêts bancaires sur opérations de financement,lu_2011_account_6552,other,account_type_2011_6_charge_finance,f,
 lu_2011_account_65523,65523,Intérêts sur leasings financiers,lu_2011_account_6552,other,account_type_2011_6_charge_finance,f,
-lu_2011_account_6553,6553,Intérêts sur dettes commerciales,lu_2011_account_655,other,account_type_2011_6_charge_finance,f,
+lu_2011_account_6553,6553,Intérêts sur dettes commerciales,lu_2011_account_655,other,account_type_2011_6_charge_finance,f,account_financial_report_135
 lu_2011_account_6554,6554,Intérêts sur des entreprises liées et sur des entreprises avec lesquelles la société a un lien de participation,lu_2011_account_655,other,account_type_2011_6_charge_finance,f,account_financial_report_134
-lu_2011_account_6555,6555,Escomptes et frais sur effets,lu_2011_account_655,other,account_type_2011_6_charge_finance,f,
-lu_2011_account_6556,6556,Escomptes accordés,lu_2011_account_655,other,account_type_2011_6_charge_finance,f,
-lu_2011_account_6558,6558,Intérêts sur autres emprunts et dettes,lu_2011_account_655,other,account_type_2011_6_charge_finance,f,
+lu_2011_account_6555,6555,Escomptes et frais sur effets,lu_2011_account_655,other,account_type_2011_6_charge_finance,f,account_financial_report_135
+lu_2011_account_6556,6556,Escomptes accordés,lu_2011_account_655,other,account_type_2011_6_charge_finance,f,account_financial_report_135
+lu_2011_account_6558,6558,Intérêts sur autres emprunts et dettes,lu_2011_account_655,other,account_type_2011_6_charge_finance,f,account_financial_report_135
 lu_2011_account_656,656,Pertes de change,lu_2011_account_65,other,account_type_2011_6_charge_finance,f,account_financial_report_135
 lu_2011_account_657,657,Quote-part de perte dans les entreprises collectives (autres que les sociétés de capitaux),lu_2011_account_65,other,account_type_2011_6_charge_finance,f,account_financial_report_135
 lu_2011_account_658,658,Autres charges financières,lu_2011_account_65,other,account_type_2011_6_charge_finance,f,account_financial_report_135

addons/project/project_view.xml

@@ -131,7 +131,7 @@
                     </group>
                     <notebook>
                         <page string="Team" name="team">
-                            <field colspan="4" name="members" widget="many2many_kanban" context="{'default_groups_ref': ['base.group_user', 'base.group_partner_manager', 'group_project_user']}">
+                            <field colspan="4" name="members" widget="many2many_kanban" context="{'default_groups_ref': ['base.group_user', 'base.group_partner_manager', 'project.group_project_user']}">
                                 <kanban quick_create="false" create="true" delete="true">
                                     <field name="name"/>
                                     <templates>

addons/website_forum/models/forum.py

@@ -302,11 +302,18 @@ class Vote(osv.Model):
 
     def create(self, cr, uid, vals, context=None):
         vote_id = super(Vote, self).create(cr, uid, vals, context=context)
+        post = self.pool['forum.post'].browse(cr, uid, vals['post_id'], context=context)
+        karma = 0
         if vals.get('vote', '1') == '1':
-            karma = self.pool['forum.forum']._karma_upvote
+            if post.parent_id:
+                karma = self.pool['forum.forum']._karma_gen_upvote_ans
+            else:
+                karma = self.pool['forum.forum']._karma_gen_upvote_quest
         elif vals.get('vote', '1') == '-1':
-            karma = self.pool['forum.forum']._karma_downvote
-        post = self.pool['forum.post'].browse(cr, uid, vals['post_id'], context=context)
+            if post.parent_id:
+                karma = self.pool['forum.forum']._karma_gen_downvote_ans
+            else:
+                karma = self.pool['forum.forum']._karma_gen_downvote_quest
         self.pool['res.users'].add_karma(cr, SUPERUSER_ID, [post.create_uid.id], karma, context=context)
         return vote_id
 

openerp/addons/base/ir/ir_attachment.py

@@ -69,7 +69,7 @@ class ir_attachment(osv.osv):
     def _storage(self, cr, uid, context=None):
         return self.pool['ir.config_parameter'].get_param(cr, SUPERUSER_ID, 'ir_attachment.location', 'file')
 
-    @tools.ormcache()
+    @tools.ormcache_context()
     def _filestore(self, cr, uid, context=None):
         return tools.config.filestore(cr.dbname)
 

openerp/tools/mail.py

@@ -502,7 +502,8 @@ def html2plaintext(html, body_id=None, encoding='utf-8'):
     html = html.replace('&lt;', '<')
 
     # strip all lines
-    html = ''.join([x.strip() for x in html.splitlines(True)])
+    html = '\n'.join([x.strip() for x in html.splitlines()])
+    html = html.replace('\n' * 2, '\n')
 
     for i, url in enumerate(url_index):
         if i == 0: