From f7641680517fb93423ba94055d5bfc036cf15ba7 Mon Sep 17 00:00:00 2001 From: "Dharmraj Zala (OpenERP Trainee)" Date: Wed, 1 May 2013 17:42:34 +0530 Subject: [PATCH 01/26] [FIX] line break in 'Follow' column by giving padding to left. bzr revid: nco@tinyerp.com-20130501121234-u8gtjzccjw0h7dk1 --- addons/mail/static/src/css/mail.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/mail/static/src/css/mail.css b/addons/mail/static/src/css/mail.css index a3d8dca6490..a41e5824cf7 100644 --- a/addons/mail/static/src/css/mail.css +++ b/addons/mail/static/src/css/mail.css @@ -618,7 +618,7 @@ margin-bottom: 4px; } .openerp .oe_followers .oe_invite{ - float: right; + padding-left: 5px; } .openerp .oe_followers .oe_partner { height: 32px; From 78d642808eec050a208b3f8854999bad8df2b1e8 Mon Sep 17 00:00:00 2001 From: "Dharti Ratani (Open ERP)" Date: Thu, 6 Jun 2013 19:00:01 +0530 Subject: [PATCH 02/26] [Fix]Set the allignment of Total parallel to amount bzr revid: dhr@tinyerp.com-20130606133001-fvpv2t1xlukbfw7d --- addons/account/report/account_print_invoice.rml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/account/report/account_print_invoice.rml b/addons/account/report/account_print_invoice.rml index 3582221df44..6914adfaf20 100644 --- a/addons/account/report/account_print_invoice.rml +++ b/addons/account/report/account_print_invoice.rml @@ -295,7 +295,7 @@ - Total: + Total: [[ formatLang(o.amount_total, digits=get_digits(dp='Account'), currency_obj=o.currency_id) ]] From 4cc85da024eaa821047fb040c857c6f3e2d8aca9 Mon Sep 17 00:00:00 2001 From: Yannick Vaucher Date: Fri, 7 Jun 2013 11:24:05 +0200 Subject: [PATCH 03/26] [FIX] sale - copy customer ref instead of order name in sale_line_invoice wizard lp bug: https://launchpad.net/bugs/1188528 fixed bzr revid: yannick.vaucher@camptocamp.com-20130607092405-1roxnirhtfcxo0d3 --- addons/sale/wizard/sale_line_invoice.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/sale/wizard/sale_line_invoice.py b/addons/sale/wizard/sale_line_invoice.py index e6121b23dd8..d8a7d05a10e 100644 --- a/addons/sale/wizard/sale_line_invoice.py +++ b/addons/sale/wizard/sale_line_invoice.py @@ -61,7 +61,7 @@ class sale_order_line_make_invoice(osv.osv_memory): else: pay_term = False inv = { - 'name': order.name, + 'name': order.client_order_ref or '', 'origin': order.name, 'type': 'out_invoice', 'reference': "P%dSO%d" % (order.partner_id.id, order.id), From d134cd60804eaa96efd4d41bdcc456fd01eced7f Mon Sep 17 00:00:00 2001 From: "RGA(OpenERP)" <> Date: Mon, 1 Jul 2013 15:25:02 +0530 Subject: [PATCH 04/26] [FIX] line should break if url link is too long for readonly etherpad bzr revid: rgaopenerp-20130701095502-c6pgr2dz7i7zmdop --- addons/pad/static/src/css/etherpad.css | 2 ++ 1 file changed, 2 insertions(+) diff --git a/addons/pad/static/src/css/etherpad.css b/addons/pad/static/src/css/etherpad.css index a0002ebe97c..e3019ec8049 100644 --- a/addons/pad/static/src/css/etherpad.css +++ b/addons/pad/static/src/css/etherpad.css @@ -92,6 +92,8 @@ font-family: arial, sans-serif; font-size: 15px; line-height: 19px; + word-wrap: break-word; + max-width: 750px; } .openerp .oe_form_nomargin .etherpad_readonly{ From 0bed10fa7fc506874a6eb5121293140dbd85857c Mon Sep 17 00:00:00 2001 From: "Chandni Machchhar(OpenERP Trainee)" <> Date: Mon, 1 Jul 2013 16:45:43 +0530 Subject: [PATCH 06/26] [FIX] fix the translation issue bzr revid: psi@tinyerp.com-20130701111543-7lgfuf230088gce2 --- addons/sale_stock/sale_stock.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/sale_stock/sale_stock.py b/addons/sale_stock/sale_stock.py index 1cf6f87f4b0..50e0112fec2 100644 --- a/addons/sale_stock/sale_stock.py +++ b/addons/sale_stock/sale_stock.py @@ -600,7 +600,7 @@ class sale_order_line(osv.osv): #check if product is available, and if not: raise an error uom2 = False if uom: - uom2 = product_uom_obj.browse(cr, uid, uom) + uom2 = product_uom_obj.browse(cr, uid, uom, context=context) if product_obj.uom_id.category_id.id != uom2.category_id.id: uom = False if not uom2: From 07282840ac1016c893d5e7213368bf6dd142296c Mon Sep 17 00:00:00 2001 From: "RGA(OpenERP)" <> Date: Wed, 3 Jul 2013 14:59:37 +0530 Subject: [PATCH 07/26] [FIX] fetch mail should uncode attached filename too bzr revid: rgaopenerp-20130703092937-jqrj76i3gzro9isx --- addons/mail/mail_thread.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py index ff8c5cd500e..6fd2c5c4718 100644 --- a/addons/mail/mail_thread.py +++ b/addons/mail/mail_thread.py @@ -756,7 +756,7 @@ class mail_thread(osv.AbstractModel): encoding = part.get_content_charset() # None if attachment # 1) Explicit Attachments -> attachments if filename or part.get('content-disposition', '').strip().startswith('attachment'): - attachments.append((filename or 'attachment', part.get_payload(decode=True))) + attachments.append((decode(filename) or 'attachment', part.get_payload(decode=True))) continue # 2) text/plain -> 
                 if part.get_content_type() == 'text/plain' and (not alternative or not body):

From 63159fee7b19d8eed7b03f008349413276d75c61 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20V=C3=A1squez?= 
Date: Fri, 13 Sep 2013 11:39:12 -0600
Subject: [PATCH 08/26] [FIX] document: check method fails if it is called with
 an id instead of a list of ids

lp bug: https://launchpad.net/bugs/1225107 fixed

bzr revid: carlos.vasquez@clearcorp.co.cr-20130913173912-h4oec41fwh9pg69f
---
 addons/document/document.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/addons/document/document.py b/addons/document/document.py
index a39be42e77c..0b49d581a3c 100644
--- a/addons/document/document.py
+++ b/addons/document/document.py
@@ -71,6 +71,10 @@ class document_file(osv.osv):
     def check(self, cr, uid, ids, mode, context=None, values=None):
         """Overwrite check to verify access on directory to validate specifications of doc/access_permissions.rst"""
         super(document_file, self).check(cr, uid, ids, mode, context=context, values=values)
+        
+        # write method can be called with either the ids list or an id, if the later is used, the ids received here will be a long variable.
+        if not isinstance(ids, list):
+            ids = [ids]
         if ids:
             self.pool.get('ir.model.access').check(cr, uid, 'document.directory', mode)
 

From 0954d2806e8e9883aade0286bc9263734f16a246 Mon Sep 17 00:00:00 2001
From: JoshuaJan 
Date: Tue, 12 Nov 2013 21:04:06 +0800
Subject: [PATCH 09/26] [fix]purchase module typo corrected

lp bug: https://launchpad.net/bugs/1250305 fixed

bzr revid: popkar77@gmail.com-20131112130406-dfzg5gf2nxmebsnz
---
 addons/purchase/purchase_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index 23c153b0ae8..5b41b7708ff 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -196,7 +196,7 @@
                         
                         
                             
-                            
+                            
                             
                             
                         

From 426a643c4f9faf1be1be5c7f23f022c2184a5c1b Mon Sep 17 00:00:00 2001
From: Olivier 
Date: Mon, 25 Nov 2013 15:46:49 +0100
Subject: [PATCH 10/26] [BACKPORT] backport from saas-2 (r4976): ir.model:
 during garbage collection of obsolete records in _process_end, do it in
 anti-chronological order

bzr revid: olt@openerp.com-20131125144649-mib0vqic0nppziew
---
 openerp/addons/base/ir/ir_model.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/openerp/addons/base/ir/ir_model.py b/openerp/addons/base/ir/ir_model.py
index 14061e4522e..357aad7bfc5 100644
--- a/openerp/addons/base/ir/ir_model.py
+++ b/openerp/addons/base/ir/ir_model.py
@@ -1112,7 +1112,8 @@ class ir_model_data(osv.osv):
             return True
         to_unlink = []
         cr.execute("""SELECT id,name,model,res_id,module FROM ir_model_data
-                      WHERE module IN %s AND res_id IS NOT NULL AND noupdate=%s""",
+                      WHERE module IN %s AND res_id IS NOT NULL AND noupdate=%s
+                      ORDER BY id DESC""",
                       (tuple(modules), False))
         for (id, name, model, res_id, module) in cr.fetchall():
             if (module,name) not in self.loads:

From 6bfcee2cb767964a33439e9ce46af9a03c7b45ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= 
Date: Mon, 25 Nov 2013 16:53:49 +0100
Subject: [PATCH 11/26] [FIX] mail: fixed replying to the first message in
 Inbox that was crashing

lp bug: https://launchpad.net/bugs/1212109 fixed

bzr revid: tde@openerp.com-20131125155349-4wfvjxuffnxyumkd
---
 addons/mail/static/src/js/mail.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index ff85ce8e510..63581560810 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -827,7 +827,9 @@ openerp.mail = function (session) {
                 // go to the parented message
                 var message = this.parent_thread.parent_message;
                 var parent_message = message.parent_id ? message.parent_thread.parent_message : message;
-                var messages = [parent_message].concat(parent_message.get_childs());
+                if(parent_message){
+                    var messages = [parent_message].concat(parent_message.get_childs());
+                }
             } else if (this.options.emails_from_on_composer) {
                 // get all wall messages if is not a mail.Wall
                 _.each(this.options.root_thread.messages, function (msg) {messages.push(msg); messages.concat(msg.get_childs());});

From 1284c5c0d4e0c82843a74fafe00de5d677cf0bbe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= 
Date: Mon, 25 Nov 2013 16:58:57 +0100
Subject: [PATCH 12/26] [FIX] mail: fixed reply button in mail_mail form view,
 should reply to a mail.message, not a mail.mail.

lp bug: https://launchpad.net/bugs/1212190 fixed

bzr revid: tde@openerp.com-20131125155857-m04233fbyan7mglt
---
 addons/mail/mail_mail_view.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/mail/mail_mail_view.xml b/addons/mail/mail_mail_view.xml
index fb2b66adb36..e0d1f3e96b2 100644
--- a/addons/mail/mail_mail_view.xml
+++ b/addons/mail/mail_mail_view.xml
@@ -7,12 +7,13 @@
             
                 

                     
+