From 4ce7af357317886cfd7f08e7b1e23c6a56d9f431 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@odoo.com>
Date: Mon, 24 Nov 2014 10:51:23 +0100
Subject: [PATCH 1/6] [FIX] product: creation of reference uom

Set a default value for factor when creating a new uom.
Could not create a new UoM with type reference (if creates a reference uom, no need to pass a factor).

Change the readonly filter to (type = bigger) to make the field writable for reference uom.
This is needed to force the reset of the factor when switching of type (onchange_type).
As the field was readonly, kept the old value for factor.
---
 addons/product/product.py       | 1 +
 addons/product/product_view.xml | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/product/product.py b/addons/product/product.py
index ce5b9bacddf..abdbcaf4895 100644
--- a/addons/product/product.py
+++ b/addons/product/product.py
@@ -152,6 +152,7 @@ class product_uom(osv.osv):
     _defaults = {
         'active': 1,
         'rounding': 0.01,
+        'factor': 1,
         'uom_type': 'reference',
     }
 
diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index a59a77c1357..f0908ddc46e 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -424,7 +424,7 @@
                                 <field name="factor"
                                     digits="[42,5]"
                                     attrs="{'invisible':[('uom_type','!=','smaller')],
-                                            'readonly':[('uom_type','!=','smaller')]}"/>
+                                            'readonly':[('uom_type','=','bigger')]}"/>
                                 <field name="factor_inv"
                                     digits="[42,5]"
                                     attrs="{'invisible':[('uom_type','!=','bigger')],

From 73f7a2ba35e21d60ef98fe8ad5f2a9d735afe196 Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@odoo.com>
Date: Tue, 25 Nov 2014 12:33:28 +0100
Subject: [PATCH 2/6] [FIX] project_timesheet: date of created analytic line
 not in user tz

When the user was in timezone UTC + 1, and added a project.task.work which created an analytic entry line (timsheet activity), if the datetime was set to 11/25 00:00:00, the date on the analytic line was set to 11/24, because this was the truncated stored value(UTC Time), which was 11/24 23:00:00
---
 addons/project_timesheet/project_timesheet.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/addons/project_timesheet/project_timesheet.py b/addons/project_timesheet/project_timesheet.py
index 6cbb4e8cf01..3b5bbae7ff1 100644
--- a/addons/project_timesheet/project_timesheet.py
+++ b/addons/project_timesheet/project_timesheet.py
@@ -120,7 +120,9 @@ class project_work(osv.osv):
         vals_line['user_id'] = vals['user_id']
         vals_line['product_id'] = result['product_id']
         if vals.get('date'):
-            vals_line['date' ] = vals['date'][:10]
+            timestamp = datetime.datetime.strptime(vals['date'], tools.DEFAULT_SERVER_DATETIME_FORMAT)
+            ts = fields.datetime.context_timestamp(cr, uid, timestamp, context)
+            vals_line['date'] = ts.strftime(tools.DEFAULT_SERVER_DATE_FORMAT)
 
         # Calculate quantity based on employee's product's uom
         vals_line['unit_amount'] = vals['hours']

From 4ca389a1a60e7f3266c9e8aedb4961bb6d875bae Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@odoo.com>
Date: Tue, 25 Nov 2014 18:18:23 +0100
Subject: [PATCH 3/6] [FIX] account: prevent invoice line duplication on
 partner duplication

If a company contact (a partner with a company set as parent) had invoices, and the company of this contact was duplicated, all the invoices lines were duplicated,  on the original invoice moreover (new lines were added on existing invoices)
---
 addons/account/account_invoice.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/account/account_invoice.py b/addons/account/account_invoice.py
index febddd3c7f2..f90c9661c09 100644
--- a/addons/account/account_invoice.py
+++ b/addons/account/account_invoice.py
@@ -1808,10 +1808,10 @@ class res_partner(osv.osv):
             partner = partner.parent_id
         return partner
 
-    def copy(self, cr, uid, id, default=None, context=None):
+    def copy_data(self, cr, uid, id, default=None, context=None):
         default = default or {}
         default.update({'invoice_ids' : []})
-        return super(res_partner, self).copy(cr, uid, id, default, context)
+        return super(res_partner, self).copy_data(cr, uid, id, default=default, context=context)
 
 
 class mail_compose_message(osv.Model):

From 9f66f98520b89dd66290b7bdc52231b9ee910b9a Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@odoo.com>
Date: Wed, 26 Nov 2014 10:06:22 +0100
Subject: [PATCH 4/6] [FIX] marketing_campaign: typo in manifest

---
 addons/marketing_campaign/__openerp__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/marketing_campaign/__openerp__.py b/addons/marketing_campaign/__openerp__.py
index a51347fd1bb..22ed4abaef1 100644
--- a/addons/marketing_campaign/__openerp__.py
+++ b/addons/marketing_campaign/__openerp__.py
@@ -40,7 +40,7 @@ The campaigns are dynamic and multi-channels. The process is as follows:
       send, reports to print and send by email, custom actions
     * Define input segments that will select the items that should enter the
       campaign (e.g leads from certain countries.)
-    * Run you campaign in simulation mode to test it real-time or accelerated,
+    * Run your campaign in simulation mode to test it real-time or accelerated,
       and fine-tune it
     * You may also start the real campaign in manual mode, where each action
       requires manual validation

From 34da02e730f18b6f314001578bcbc0eb1be985ad Mon Sep 17 00:00:00 2001
From: Danimar Ribeiro <danimaribeiro@gmail.com>
Date: Tue, 25 Nov 2014 16:25:03 -0200
Subject: [PATCH 5/6] [FIX] l10n_br: remove reference to old
 base.group_extended group

Fixes #3879
---
 addons/l10n_br/account_view.xml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/addons/l10n_br/account_view.xml b/addons/l10n_br/account_view.xml
index 4eaffd3e27a..0dd246eb3e8 100644
--- a/addons/l10n_br/account_view.xml
+++ b/addons/l10n_br/account_view.xml
@@ -34,14 +34,14 @@
 			<field name="inherit_id" ref="account.view_account_tax_template_form"/>
 			<field name="arch" type="xml">
 				<field position="after" name="price_include">
-					<field groups="base.group_extended" name="tax_discount"/>
+					<field name="tax_discount"/>
 			    </field>
 	    		<field name="tax_code_id" position="replace" >
 					<field name="tax_code_id" on_change="onchange_tax_code_id(tax_code_id)" />
 			    </field>
-   				<field position="after" name="amount">
-					<field groups="base.group_extended" name="base_reduction"/>
-					<field groups="base.group_extended" name="amount_mva"/>
+				<field position="after" name="tax_discount">
+					<field name="base_reduction"/>
+					<field name="amount_mva"/>
 			    </field>
 			</field>
 		</record>
@@ -52,14 +52,14 @@
 			<field name="inherit_id" ref="account.view_tax_form"/>
 			<field name="arch" type="xml">
 				<field position="after" name="price_include">
-					<field groups="base.group_extended" name="tax_discount"/>
+					<field name="tax_discount"/>
 			    </field>
    				<field name="tax_code_id" position="replace" >
 					<field name="tax_code_id" on_change="onchange_tax_code_id(tax_code_id)" />
 			    </field>
-			    <field position="after" name="amount">
-					<field groups="base.group_extended" name="base_reduction"/>
-					<field groups="base.group_extended" name="amount_mva"/>
+			    <field position="after" name="tax_discount">
+					<field name="base_reduction"/>
+					<field name="amount_mva"/>
 			    </field>
 			</field>
 		</record>

From e2dd18f1e7304040974a81cfacce96848eb89719 Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@odoo.com>
Date: Wed, 26 Nov 2014 12:28:45 +0100
Subject: [PATCH 6/6] [FIX] mrp: prevent recursion from phantom boms with no
 lines

if the bom is phantom and has no line, we attempt to find a new bom with the default product uom
This is possible that we find the same bom that the current one
In such a case, we must not explode, to avoid recursion.
---
 addons/mrp/mrp.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py
index 45b2bcbc047..67f36579f12 100644
--- a/addons/mrp/mrp.py
+++ b/addons/mrp/mrp.py
@@ -334,7 +334,7 @@ class mrp_bom(osv.osv):
         if bom.type == 'phantom' and not bom.bom_lines:
             newbom = self._bom_find(cr, uid, bom.product_id.id, bom.product_uom.id, properties)
 
-            if newbom:
+            if newbom and newbom != bom.id:
                 res = self._bom_explode(cr, uid, self.browse(cr, uid, [newbom])[0], factor*bom.product_qty, properties, addthis=True, level=level+10)
                 result = result + res[0]
                 result2 = result2 + res[1]