From 81a3a4fcbb1d6aa74ca06db8e98df11324403827 Mon Sep 17 00:00:00 2001
From: "Somesh Khare(OpenERP)" <skh@openerp.com>
Date: Wed, 24 Jul 2013 14:37:27 +0530
Subject: [PATCH 1/3] [FIX]Delivery: carrier information not propagated from
 sale order to pickings (Case: ref 595240)

closes lp:1192115
---
 addons/delivery/sale.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/addons/delivery/sale.py b/addons/delivery/sale.py
index d2916eb2085..c5ae43a4546 100644
--- a/addons/delivery/sale.py
+++ b/addons/delivery/sale.py
@@ -72,8 +72,7 @@ class sale_order(osv.osv):
                 'tax_id': [(6,0,taxes_ids)],
                 'type': 'make_to_stock'
             })
-        #remove the value of the carrier_id field on the sale order
-        return self.write(cr, uid, ids, {'carrier_id': False}, context=context)
+        return True
         #return {'type': 'ir.actions.act_window_close'} action reload?
 
 sale_order()

From fdd00fe635a9666d337a4ef420e08d49973ff307 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Tue, 10 Jun 2014 12:26:46 +0200
Subject: [PATCH 2/3] [FIX] account_voucher: better pay invoice wizard

If the writeoff_amount is above 0, the fields writeoff_acc_id can be displayed and is required depending of the payment option. If the writeoff_amount is reset to 0, this field should no longer be required.
---
 addons/account_voucher/voucher_payment_receipt_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account_voucher/voucher_payment_receipt_view.xml b/addons/account_voucher/voucher_payment_receipt_view.xml
index 1169d5ef7c3..b4578c9b035 100644
--- a/addons/account_voucher/voucher_payment_receipt_view.xml
+++ b/addons/account_voucher/voucher_payment_receipt_view.xml
@@ -334,7 +334,7 @@
                                 <field name="writeoff_amount" widget="monetary" options="{'currency_field': 'currency_id'}"/>
                                 <field name="payment_option" required="1" attrs="{'invisible':[('writeoff_amount','=',0)]}"/>
                                 <field name="writeoff_acc_id"
-                                        attrs="{'invisible':['|', ('payment_option','!=','with_writeoff'), ('writeoff_amount','=',0)], 'required':[('payment_option','=','with_writeoff')]}"
+                                        attrs="{'invisible':['|', ('payment_option','!=','with_writeoff'), ('writeoff_amount','=',0)], 'required':[('payment_option','=','with_writeoff'), ('writeoff_amount','!=',0)]}"
                                         domain="[('type','=','other')]"/>
                                 <field name="comment"
                                         attrs="{'invisible':['|', ('payment_option','!=','with_writeoff'), ('writeoff_amount','=',0)]}"/>

From 100eba8eaf478fc1d6cb71ab7ca7d021aa7eca40 Mon Sep 17 00:00:00 2001
From: Jeremy Kersten <jke@odoo.com>
Date: Wed, 11 Jun 2014 10:30:00 +0200
Subject: [PATCH 3/3] [FIX] fields.py - avoid dict comprehension inside a dict
 comprehension

---
 openerp/osv/fields.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openerp/osv/fields.py b/openerp/osv/fields.py
index 529f0563f8d..18aa3aad8c2 100644
--- a/openerp/osv/fields.py
+++ b/openerp/osv/fields.py
@@ -1148,7 +1148,7 @@ class function(_column):
         if values and not multi and name in values[0]:
             result = {v['id']: v[name] for v in values}
         elif values and multi and all(n in values[0] for n in name):
-            result = {v['id']: dict({n: v[n]} for n in name) for v in values}
+            result = {v['id']: dict((n, v[n]) for n in name) for v in values}
         else:
             result = self._fnct(obj, cr, uid, ids, name, self._arg, context)
         for id in ids: