From 304605a8ce49e60c317fbff4ca042d3d132cdeda Mon Sep 17 00:00:00 2001
From: "JMA (OpenERP)" <jma@tinyerp.com>
Date: Tue, 12 Oct 2010 17:02:28 +0530
Subject: [PATCH 1/9] [FIX] sale : navigation to associated picking from sale

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

bzr revid: jma@tinyerp.com-20101012113228-qln7mzb4y6a6fki1
---
 addons/sale/stock_view.xml | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/addons/sale/stock_view.xml b/addons/sale/stock_view.xml
index 6b3c0e2c684..73a289af503 100644
--- a/addons/sale/stock_view.xml
+++ b/addons/sale/stock_view.xml
@@ -13,6 +13,29 @@
             </field>
         </record>
         
+        <act_window
+            domain="[('sale_id', '=', active_id)]"
+            id="act_sale_order_2_stock_picking"
+            name="Picking"
+            res_model="stock.picking"
+            src_model="sale.order"
+            context="{'contact_display': 'partner'}" />
+       
+       <record id="action_sale_picking_in_tree_view" model="ir.actions.act_window.view">
+            <field eval="1" name="sequence"/>
+            <field name="view_mode">tree</field>
+            <field name="view_id" ref="stock.view_picking_in_tree"/>
+            <field name="act_window_id" ref="act_sale_order_2_stock_picking"/>
+        </record>
+        <record id="action_sale_picking_in_form_view" model="ir.actions.act_window.view">
+            <field eval="2" name="sequence"/>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="stock.view_picking_in_form"/>
+            <field name="act_window_id" ref="act_sale_order_2_stock_picking"/>
+        </record>
+        
+        
+        
         <!-- Adding Sale Order Reference to outgoing picking -->
         
         <record id="stock_picking_out_inherit_sale" model="ir.ui.view">

From 110e5ac904c3c5bc337eebd68ef553eadc32fa63 Mon Sep 17 00:00:00 2001
From: "JMA (OpenERP)" <jma@tinyerp.com>
Date: Tue, 12 Oct 2010 18:16:16 +0530
Subject: [PATCH 2/9] [FIX] sale : Corrections

bzr revid: jma@tinyerp.com-20101012124616-ab7ia1hc0n5vzdqa
---
 addons/sale/stock_view.xml | 24 ------------------------
 1 file changed, 24 deletions(-)

diff --git a/addons/sale/stock_view.xml b/addons/sale/stock_view.xml
index 2739c8dfdfc..dddcad07932 100644
--- a/addons/sale/stock_view.xml
+++ b/addons/sale/stock_view.xml
@@ -13,8 +13,6 @@
             </field>
         </record>
         
-<<<<<<< TREE
-=======
         <record id="stock_move_sale" model="ir.ui.view">
             <field name="name">stock.move.form</field>
             <field name="model">stock.move</field>
@@ -27,7 +25,6 @@
             </field>
         </record>
         
->>>>>>> MERGE-SOURCE
         <act_window
             domain="[('sale_id', '=', active_id)]"
             id="act_sale_order_2_stock_picking"
@@ -36,41 +33,20 @@
             src_model="sale.order"
             context="{'contact_display': 'partner'}" />
        
-<<<<<<< TREE
-       <record id="action_sale_picking_in_tree_view" model="ir.actions.act_window.view">
-=======
        <record id="action_sale_picking_out_tree_view" model="ir.actions.act_window.view">
->>>>>>> MERGE-SOURCE
             <field eval="1" name="sequence"/>
             <field name="view_mode">tree</field>
-<<<<<<< TREE
-            <field name="view_id" ref="stock.view_picking_in_tree"/>
-=======
             <field name="view_id" ref="stock.view_picking_out_tree"/>
->>>>>>> MERGE-SOURCE
             <field name="act_window_id" ref="act_sale_order_2_stock_picking"/>
         </record>
-<<<<<<< TREE
-        <record id="action_sale_picking_in_form_view" model="ir.actions.act_window.view">
-=======
         
         <record id="action_sale_picking_out_form_view" model="ir.actions.act_window.view">
->>>>>>> MERGE-SOURCE
             <field eval="2" name="sequence"/>
             <field name="view_mode">form</field>
-<<<<<<< TREE
-            <field name="view_id" ref="stock.view_picking_in_form"/>
-=======
             <field name="view_id" ref="stock.view_picking_out_form"/>
->>>>>>> MERGE-SOURCE
             <field name="act_window_id" ref="act_sale_order_2_stock_picking"/>
         </record>
         
-<<<<<<< TREE
-        
-        
-=======
->>>>>>> MERGE-SOURCE
         <!-- Adding Sale Order Reference to outgoing picking -->
         
         <record id="stock_picking_out_inherit_sale" model="ir.ui.view">

From 7c63402f9259ac9681e9886f38c8df81ab9b3e3f Mon Sep 17 00:00:00 2001
From: "RME (OpenERP)" <rme@tinyerp.com>
Date: Wed, 13 Oct 2010 16:58:27 +0530
Subject: [PATCH 3/9] [FIX] account voucher : correction - form view not open

bzr revid: rme@tinyerp.com-20101013112827-p6smqsai4sk7bzsz
---
 addons/account_voucher/voucher_payment_receipt_view.xml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/addons/account_voucher/voucher_payment_receipt_view.xml b/addons/account_voucher/voucher_payment_receipt_view.xml
index 8169cac31e3..cf3f75c1d49 100644
--- a/addons/account_voucher/voucher_payment_receipt_view.xml
+++ b/addons/account_voucher/voucher_payment_receipt_view.xml
@@ -181,9 +181,6 @@
                                     <field name="amount_unreconciled" sum="Open Balance" readonly="1"/>
                                     <field name="amount" sum="Payment"/>
                                 </tree>
-                                <form string="Payment Information">
-                                    <label string="Form view not available for Payment Lines"/>
-                                </form>
                             </field>
                             <field name="line_cr_ids" colspan="4" nolabel="1" attrs="{'invisible': [('pre_line','=',False)]}" default_get="{'journal_id':journal_id, 'partner_id':partner_id}">
                                 <tree string="Credits" editable="bottom">

From 6cfd6625cc4a63ea13d348e0daa7527f65a8c9c9 Mon Sep 17 00:00:00 2001
From: "DHS (OpenERP)" <dhs@tinyerp.com>
Date: Wed, 20 Oct 2010 19:13:59 +0530
Subject: [PATCH 4/9] [FIX] purchase_requition: Corrected Datetime Computing in
 create_order()

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

bzr revid: dhs@tinyerp.com-20101020134359-4l6eh5bxud3fsq0v
---
 .../wizard/purchase_requisition_partner.py               | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/addons/purchase_requisition/wizard/purchase_requisition_partner.py b/addons/purchase_requisition/wizard/purchase_requisition_partner.py
index 2ae3ae795e9..f32e8331784 100644
--- a/addons/purchase_requisition/wizard/purchase_requisition_partner.py
+++ b/addons/purchase_requisition/wizard/purchase_requisition_partner.py
@@ -86,14 +86,19 @@ class purchase_requisition_partner(osv.osv_memory):
                     uom_id = line.product_id.uom_po_id and line.product_id.uom_po_id.id or False
                     newdate = datetime.strptime(tender.date_start, '%Y-%m-%d %H:%M:%S')
                     newdate = newdate - relativedelta(days=company.po_lead)
-                    delay = partner_rec and partner_rec.delay or False
-                    newdate = newdate -(delay or datetime.strptime(tender.date_start, '%Y-%m-%d %H:%M:%S') )
+                    delay = partner_rec and partner_rec.delay or 0.0
+                    newdate = newdate -(delay and relativedelta(days=delay) or datetime.strptime(tender.date_start, '%Y-%m-%d %H:%M:%S') )
                     partner = partner_rec and partner_rec.name or supplier_data
                     pricelist_id = partner.property_product_pricelist_purchase and partner.property_product_pricelist_purchase.id or False
                     price = pricelist_obj.price_get(cr, uid, [pricelist_id], line.product_id.id, line.product_qty, False, {'uom': uom_id})[pricelist_id]
                     product = prod_obj.browse(cr, uid, line.product_id.id, context=context)
                     location_id = self.pool.get('stock.warehouse').read(cr, uid, [tender.warehouse_id.id], ['lot_input_id'])[0]['lot_input_id'][0]
 
+                    if not newdate:
+                        date_planned = datetime.strptime(tender.date_start, '%Y-%m-%d %H:%M:%S')
+                    else:
+                        date_planned = newdate.strftime('%Y-%m-%d %H:%M:%S')
+
                     purchase_order_line= {
                             'name': product.partner_ref,
                             'product_qty': line.product_qty,

From ee6cdce925f885bc6a145f5a668548d4fb6286b1 Mon Sep 17 00:00:00 2001
From: "JMA (OpenERP)" <jma@tinyerp.com>
Date: Thu, 21 Oct 2010 11:54:21 +0530
Subject: [PATCH 5/9] [FIX] account : Unicode corrections for account journal

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

bzr revid: jma@tinyerp.com-20101021062421-29zidtfe74afw31i
---
 addons/account/wizard/account_move_journal.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/account/wizard/account_move_journal.py b/addons/account/wizard/account_move_journal.py
index 4c6784e03e9..5756fed4264 100644
--- a/addons/account/wizard/account_move_journal.py
+++ b/addons/account/wizard/account_move_journal.py
@@ -21,6 +21,7 @@
 
 from osv import osv
 from tools.translate import _
+import tools
 
 class account_move_journal(osv.osv_memory):
     _name = "account.move.journal"
@@ -100,7 +101,7 @@ class account_move_journal(osv.osv_memory):
                 <button icon="gtk-cancel" special="cancel" string="Cancel"/>
                 <button icon="terp-gtk-go-back-rtl" string="Open" name="action_open_window" default_focus="1" type="object"/>
             </group>
-        </form>""" % (str(journal), str(period))
+        </form>""" % (tools.ustr(journal), tools.ustr(period))
 
         res.update({
             'arch':view

From bf71b783038d584dc6f5eee216db0c0f0ee1ff4e Mon Sep 17 00:00:00 2001
From: "RME (OpenERP)" <rme@tinyerp.com>
Date: Thu, 21 Oct 2010 12:50:12 +0530
Subject: [PATCH 6/9] [REV] account_voucher : reverted revision number 4285

bzr revid: rme@tinyerp.com-20101021072012-je9ajep9jp4331lz
---
 addons/account_voucher/voucher_payment_receipt_view.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/addons/account_voucher/voucher_payment_receipt_view.xml b/addons/account_voucher/voucher_payment_receipt_view.xml
index f6b41f318ed..e1122e07674 100644
--- a/addons/account_voucher/voucher_payment_receipt_view.xml
+++ b/addons/account_voucher/voucher_payment_receipt_view.xml
@@ -182,6 +182,9 @@
                                     <field name="amount" sum="Payment"/>
                                 </tree>
                             </field>
+	                <form string="Payment Information">
+	                    <label string="Form view not available for Payment Lines"/>
+	                </form>
                             <field name="line_cr_ids" colspan="4" nolabel="1" attrs="{'invisible': [('pre_line','=',False)]}" default_get="{'journal_id':journal_id, 'partner_id':partner_id}">
                                 <tree string="Credits" editable="bottom">
                                     <field name="move_line_id"/>

From 191fb6f17e7928de380324756289c21e9a12864e Mon Sep 17 00:00:00 2001
From: "Jay (OpenERP)" <jvo@tinyerp.com>
Date: Thu, 21 Oct 2010 14:21:22 +0530
Subject: [PATCH 7/9] [FIX] Account_voucher : Removed the lines which blocked
 the form view of voucher lines

bzr revid: jvo@tinyerp.com-20101021085122-922665s8j329gk3j
---
 addons/account_voucher/voucher_payment_receipt_view.xml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/addons/account_voucher/voucher_payment_receipt_view.xml b/addons/account_voucher/voucher_payment_receipt_view.xml
index e1122e07674..f6b41f318ed 100644
--- a/addons/account_voucher/voucher_payment_receipt_view.xml
+++ b/addons/account_voucher/voucher_payment_receipt_view.xml
@@ -182,9 +182,6 @@
                                     <field name="amount" sum="Payment"/>
                                 </tree>
                             </field>
-	                <form string="Payment Information">
-	                    <label string="Form view not available for Payment Lines"/>
-	                </form>
                             <field name="line_cr_ids" colspan="4" nolabel="1" attrs="{'invisible': [('pre_line','=',False)]}" default_get="{'journal_id':journal_id, 'partner_id':partner_id}">
                                 <tree string="Credits" editable="bottom">
                                     <field name="move_line_id"/>

From a823c78c53c068d1486e902a950d3c37947f12a3 Mon Sep 17 00:00:00 2001
From: "olt@tinyerp.com" <>
Date: Thu, 21 Oct 2010 08:50:03 +0200
Subject: [PATCH 8/9] [IMP] base_calendar: avoid creating context object twice
 when context dict is empty (using 'is None')

bzr revid: olt@tinyerp.com-20101021065003-xo2whz2zn0orqgqz
---
 addons/base_calendar/base_calendar.py | 36 +++++++++++++--------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/addons/base_calendar/base_calendar.py b/addons/base_calendar/base_calendar.py
index df5aaa4287d..7d31e9abbcf 100644
--- a/addons/base_calendar/base_calendar.py
+++ b/addons/base_calendar/base_calendar.py
@@ -477,7 +477,7 @@ property or property parameter."),
         @param context: A standard dictionary for contextual values
         @return: True
         """
-        if not context:
+        if context is None:
             context = {}
 
         company = self.pool.get('res.users').browse(cr, uid, uid, context=context).company_id.name
@@ -555,7 +555,7 @@ property or property parameter."),
         @param context: A standard dictionary for contextual values
         @return: True
         """
-        if not context:
+        if context is None:
             context = {}
 
         for vals in self.browse(cr, uid, ids, context=context):
@@ -575,7 +575,7 @@ property or property parameter."),
         @param ids: List of calendar attendee’s IDs
         @param *args: Get Tupple value
         @param context: A standard dictionary for contextual values """
-        if not context:
+        if context is None:
             context = {}
         return self.write(cr, uid, ids, {'state': 'declined'}, context)
 
@@ -587,7 +587,7 @@ property or property parameter."),
         @param vals: Get Values
         @param context: A standard dictionary for contextual values """
 
-        if not context:
+        if context is None:
             context = {}
         if not vals.get("email") and vals.get("cn"):
             cnval = vals.get("cn").split(':')
@@ -641,7 +641,7 @@ true, it will allow you to hide the event alarm information without removing it.
         @param context: A standard dictionary for contextual values
         @return: True
         """
-        if not context:
+        if context is None:
             context = {}
         alarm_obj = self.pool.get('calendar.alarm')
         res_alarm_obj = self.pool.get('res.alarm')
@@ -713,7 +713,7 @@ true, it will allow you to hide the event alarm information without removing it.
         @param model: Model name for which alarm is to be cleared.
         @return: True
         """
-        if not context:
+        if context is None:
             context = {}
         alarm_obj = self.pool.get('calendar.alarm')
         ir_obj = self.pool.get('ir.model')
@@ -781,7 +781,7 @@ class calendar_alarm(osv.osv):
         @param context: A standard dictionary for contextual values
         @return: new record id for calendar_alarm.
         """
-        if not context:
+        if context is None:
             context = {}
         event_date = vals.get('event_date', False)
         if event_date:
@@ -808,7 +808,7 @@ class calendar_alarm(osv.osv):
         @param context: A standard dictionary for contextual values
         """
         return True # XXX FIXME REMOVE THIS AFTER FIXING get_recurrent_dates!!
-        if not context:
+        if context is None:
             context = {}
         current_datetime = datetime.now()
         request_obj = self.pool.get('res.request')
@@ -943,7 +943,7 @@ class calendar_event(osv.osv):
         @param end_date: Ending Datee
         @param context: A standard dictionary for contextual values
         """
-        if not context:
+        if context is None:
             context = {}
         value = {}
         if not start_date:
@@ -975,7 +975,7 @@ class calendar_event(osv.osv):
         This function deletes event which are linked with the event with recurrent_uid
                 (Removes the events which refers to the same UID value)
         """
-        if not context:
+        if context is None:
             context = {}
         for event_id in ids:
             cr.execute("select id from %s where recurrent_uid=%%s" % (self._table), (event_id,))
@@ -992,7 +992,7 @@ class calendar_event(osv.osv):
         @param context: A standard dictionary for contextual values
         @return: dictionary of rrule value.
         """
-        if not context:
+        if context is None:
             context = {}
         cr.execute("UPDATE %s set freq='None',interval=0,count=0,end_date=Null,\
                     mo=False,tu=False,we=False,th=False,fr=False,sa=False,su=False,\
@@ -1203,7 +1203,7 @@ true, it will allow you to hide the event alarm information without removing it.
         @param context: A standard dictionary for contextual values
         @return: Dictionary value which open Crm Meeting form.
         """
-        if not context:
+        if context is None:
             context = {}
 
         data_obj = self.pool.get('ir.model.data')
@@ -1448,7 +1448,7 @@ true, it will allow you to hide the event alarm information without removing it.
         @param context: A standard dictionary for contextual values
         @return: True
         """
-        if not context:
+        if context is None:
             context = {}
         if isinstance(ids, (str, int, long)):
             select = [ids]
@@ -1520,7 +1520,7 @@ true, it will allow you to hide the event alarm information without removing it.
         @return: List of Dictionary of form [{‘name_of_the_field’: value, ...}, ...]
         """
         # FIXME This whole id mangling has to go!
-        if not context:
+        if context is None:
             context = {}
 
         if isinstance(ids, (str, int, long)):
@@ -1558,7 +1558,7 @@ true, it will allow you to hide the event alarm information without removing it.
         @param context: A standard dictionary for contextual values
         @return: Duplicate record id.
         """
-        if not context:
+        if context is None:
             context = {}
         res = super(calendar_event, self).copy(cr, uid, base_calendar_id2real_id(id), default, context)
         alarm_obj = self.pool.get('res.alarm')
@@ -1607,7 +1607,7 @@ true, it will allow you to hide the event alarm information without removing it.
         @param context: A standard dictionary for contextual values
         @return: new created record id.
         """
-        if not context:
+        if context is None:
             context = {}
         if vals.get('vtimezone', '') and vals.get('vtimezone', '').startswith('/freeassociation.sourceforge.net/tzfile/'):
             vals['vtimezone'] = vals['vtimezone'][40:]
@@ -1770,7 +1770,7 @@ class ir_values(osv.osv):
         @param uid: the current user’s ID for security checks,
         @param model: Get The Model
         """
-        if not context:
+        if context is None:
             context = {}
         new_model = []
         for data in models:
@@ -1798,7 +1798,7 @@ class ir_model(osv.osv):
         @param context: A standard dictionary for contextual values
         """
         new_ids = isinstance(ids, (str, int, long)) and [ids] or ids
-        if not context:
+        if context is None:
             context = {}
         data = super(ir_model, self).read(cr, uid, new_ids, fields=fields, \
                         context=context, load=load)

From 27be0ec7e4213e6a6493c43fc23ad647a42a84dc Mon Sep 17 00:00:00 2001
From: "olt@tinyerp.com" <>
Date: Thu, 21 Oct 2010 11:08:41 +0200
Subject: [PATCH 9/9] [FIX] calendar: try to keep 'duration' and 'end date'
 synchronized

bzr revid: olt@tinyerp.com-20101021090841-xpkv3ljlblx28nsl
---
 addons/base_calendar/base_calendar.py | 28 +++++++++++++++++++++++----
 1 file changed, 24 insertions(+), 4 deletions(-)

diff --git a/addons/base_calendar/base_calendar.py b/addons/base_calendar/base_calendar.py
index 7d31e9abbcf..c4c719c5008 100644
--- a/addons/base_calendar/base_calendar.py
+++ b/addons/base_calendar/base_calendar.py
@@ -945,6 +945,7 @@ class calendar_event(osv.osv):
         """
         if context is None:
             context = {}
+
         value = {}
         if not start_date:
             return value
@@ -967,6 +968,14 @@ class calendar_event(osv.osv):
         elif not end_date:
             end = start + timedelta(hours=duration)
             value['date_deadline'] = end.strftime("%Y-%m-%d %H:%M:%S")
+        elif end_date and duration:
+            # we have both, keep them synchronized:
+            # set duration based on end_date (arbitrary decision: this avoid 
+            # getting dates like 06:31:48 instead of 06:32:00)
+            end = datetime.strptime(end_date, "%Y-%m-%d %H:%M:%S")
+            diff = end - start
+            duration = float(diff.days)* 24 + (float(diff.seconds) / 3600)
+            value['duration'] = round(duration, 2)
 
         return {'value': value}
 
@@ -1477,14 +1486,23 @@ true, it will allow you to hide the event alarm information without removing it.
 
         if vals.get('vtimezone', '').startswith('/freeassociation.sourceforge.net/tzfile/'):
             vals['vtimezone'] = vals['vtimezone'][40:]
+
+        updated_vals = self.onchange_dates(cr, uid, new_ids,
+            vals.get('date', False),
+            vals.get('duration', False),
+            vals.get('date_deadline', False),
+            vals.get('allday', False),
+            context=context)
+        vals.update(updated_vals.get('value', {}))
+
         if new_ids:
             res = super(calendar_event, self).write(cr, uid, new_ids, vals, context=context)
-        if (vals.has_key('alarm_id') or vals.has_key('base_calendar_alarm_id'))\
-                or (vals.has_key('date') or vals.has_key('duration') or vals.has_key('date_deadline')):
+
+        if ('alarm_id' in vals or 'base_calendar_alarm_id' in vals)\
+                or ('date' in vals or 'duration' in vals or 'date_deadline' in vals):
             # change alarm details
             alarm_obj = self.pool.get('res.alarm')
-            alarm_obj.do_alarm_create(cr, uid, new_ids, self._name, 'date', \
-                                            context=context)
+            alarm_obj.do_alarm_create(cr, uid, new_ids, self._name, 'date', context=context)
         return res
 
     def browse(self, cr, uid, ids, context=None, list_class=None, fields_process=None):
@@ -1609,8 +1627,10 @@ true, it will allow you to hide the event alarm information without removing it.
         """
         if context is None:
             context = {}
+
         if vals.get('vtimezone', '') and vals.get('vtimezone', '').startswith('/freeassociation.sourceforge.net/tzfile/'):
             vals['vtimezone'] = vals['vtimezone'][40:]
+
         res = super(calendar_event, self).create(cr, uid, vals, context)
         alarm_obj = self.pool.get('res.alarm')
         alarm_obj.do_alarm_create(cr, uid, [res], self._name, 'date', context=context)