Merge lp:~openerp-dev/openobject-addons/trunk-opw-579812-port-dhr into lp:openobject-addons

[Dharti Ratani(OpenERP)]

Hello,

This MP contains fix for below issues:

Currently, when the mail is sent by the event reminder scheduler, `Event Date` is set to alarm's trigger date instead of actual event date.

When synchronizing the invitation.ics file with calendar client, the calendar client shows meeting datetime as it received, that is in UTC, meeting datetime should be converted to local timezone.

Kindly review the fix.

Code is forward port from 6.1

Thanks.

[lp:~openerp-dev/openobject-addons/trunk-opw-579812-port-dhr]

8267. By Dharti Ratani(OpenERP) on 2012-12-17

[MERGE]

Unmerged revisions

8267. By Dharti Ratani(OpenERP) on 2012-12-17

[MERGE]

8266. By Ravi Gohil (OpenERP) on 2012-12-10

[FIX] base_calendar: Synchronizing the invitation.ics file with calendar client shows meeting time in UTC and setting mail date to actual event's date

=== modified file 'base_calendar/base_calendar.py'
--- base_calendar/base_calendar.py	2012-12-15 16:35:56 +0000
+++ base_calendar/base_calendar.py	2012-12-17 10:24:26 +0000
@@ -426,11 +426,12 @@
         @return: .ics file content
         """
         res = None
-        def ics_datetime(idate, short=False):
+        def ics_datetime(idate, short=False, dtfield=False):
             if idate:
                 if short or len(idate)<=10:
                     return date.fromtimestamp(time.mktime(time.strptime(idate, '%Y-%m-%d')))
                 else:
+                    dtfield.params['TZID'] = ['UTC']
                     return datetime.strptime(idate, '%Y-%m-%d %H:%M:%S')
             else:
                 return False
@@ -443,9 +444,12 @@
         event = cal.add('vevent')
         if not event_obj.date_deadline or not event_obj.date:
             raise osv.except_osv(_('Warning!'),_("First you have to specify the date of the invitation."))
-        event.add('created').value = ics_datetime(time.strftime('%Y-%m-%d %H:%M:%S'))
-        event.add('dtstart').value = ics_datetime(event_obj.date)
-        event.add('dtend').value = ics_datetime(event_obj.date_deadline)
+        dtfield = event.add('created')
+        dtfield.value = ics_datetime(time.strftime('%Y-%m-%d %H:%M:%S'), dtfield=dtfield)
+        dtfield = event.add('dtstart')
+        dtfield.value = ics_datetime(event_obj.date, dtfield=dtfield)
+        dtfield = event.add('dtend')
+        dtfield.value = ics_datetime(event_obj.date_deadline, dtfield=dtfield)
         event.add('summary').value = event_obj.name
         if  event_obj.description:
             event.add('description').value = event_obj.description
@@ -890,7 +894,7 @@
 ----
 %s
 </pre>
-"""  % (alarm.name, alarm.trigger_date, alarm.description, \
+"""  % (alarm.name, alarm.event_date, alarm.description, \
                         alarm.user_id.name, alarm.user_id.signature)
                     mail_to = [alarm.user_id.email]
                     for att in alarm.attendee_ids:

=== modified file 'delivery/delivery_view.xml'
--- delivery/delivery_view.xml	2012-11-30 17:11:30 +0000
+++ delivery/delivery_view.xml	2012-12-17 10:24:26 +0000
@@ -243,8 +243,12 @@
             <field name="inherit_id" ref="stock.view_picking_form"/>
             <field name="arch" type="xml">
                 <field name="company_id" position="before">
-                    <field name="weight"/>
-                    <field name="weight_net" groups="base.group_no_one"/>
+                    <label for="weight" string="Weight"/>
+                    <div>
+                        <field name="weight" class="oe_inline"/>
+                        <field name="weight_uom_id" nolabel="1" class="oe_inline"/>
+                    </div>
+                     <field name="weight_net"  groups="base.group_no_one" class="oe_inline"/>
                 </field>
             </field>
         </record>
@@ -279,8 +283,12 @@
             <field name="inherit_id" ref="stock.view_move_form"/>
             <field name="arch" type="xml">
                 <xpath expr="//group[@name='main_grp']" position="inside">
-                    <field name="weight"/>
-                    <field name="weight_net" groups="base.group_no_one"/>
+                    <label for="weight" string="Weight"/>
+                    <div>
+                        <field name="weight" class="oe_inline"/>
+                        <field name="weight_uom_id" nolabel="1" class="oe_inline"/>
+                    </div>
+                    <field name="weight_net" groups="base.group_no_one" class="oe_inline"/>
                 </xpath>
             </field>
         </record>

=== modified file 'delivery/stock.py'
--- delivery/stock.py	2012-11-29 22:26:45 +0000
+++ delivery/stock.py	2012-12-17 10:24:26 +0000
@@ -66,6 +66,7 @@
                  }),
         'carrier_tracking_ref': fields.char('Carrier Tracking Ref', size=32),
         'number_of_packages': fields.integer('Number of Packages'),
+        'weight_uom_id': fields.many2one('product.uom', 'Unit of Measure', required=True,readonly="1",help="Unit of measurement for Weight",),
         }
 
     def _prepare_shipping_invoice_line(self, cr, uid, picking, invoice, context=None):
@@ -132,6 +133,12 @@
                 invoice_line_obj.create(cr, uid, invoice_line)
                 invoice_obj.button_compute(cr, uid, [invoice.id], context=context)
         return result
+    def _get_default_uom(self,cr,uid,c):
+        uom_categ, uom_categ_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'product', 'product_uom_categ_kgm')
+        return self.pool.get('product.uom').search(cr, uid, [('category_id', '=', uom_categ_id),('factor','=',1)])[0]
+    _defaults = {
+        'weight_uom_id': lambda self,cr,uid,c: self._get_default_uom(cr,uid,c)
+    }
 
 stock_picking()
 
@@ -169,8 +176,14 @@
                   store={
                  'stock.move': (lambda self, cr, uid, ids, c=None: ids, ['product_id', 'product_qty', 'product_uom'], 20),
                  }),
+        'weight_uom_id': fields.many2one('product.uom', 'Unit of Measure', required=True,readonly="1",help="Unit of Measure (Unit of Measure) is the unit of measurement for Weight",),
         }
-
+    def _get_default_uom(self,cr,uid,c):
+        uom_categ, uom_categ_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'product', 'product_uom_categ_kgm')
+        return self.pool.get('product.uom').search(cr, uid, [('category_id', '=', uom_categ_id),('factor','=',1)])[0]
+    _defaults = {
+        'weight_uom_id': lambda self,cr,uid,c: self._get_default_uom(cr,uid,c)
+    }
 stock_move()
 
 # Redefinition of the new fields in order to update the model stock.picking.out in the orm

=== modified file 'stock/product.py'
--- stock/product.py	2012-11-29 22:26:45 +0000
+++ stock/product.py	2012-12-17 10:24:26 +0000
@@ -530,7 +530,7 @@
     _columns = {
         'property_stock_journal': fields.property('account.journal',
             relation='account.journal', type='many2one',
-            string='Stock journal', view_load=True,
+            string='Stock Journal', view_load=True,
             help="When doing real-time inventory valuation, this is the Accounting Journal in which entries will be automatically posted when stock moves are processed."),
         'property_stock_account_input_categ': fields.property('account.account',
             type='many2one', relation='account.account',

=== modified file 'stock/stock.py'
--- stock/stock.py	2012-12-15 17:47:43 +0000
+++ stock/stock.py	2012-12-17 10:24:26 +0000
@@ -655,7 +655,7 @@
         'min_date': fields.function(get_min_max_date, fnct_inv=_set_minimum_date, multi="min_max_date",
                  store=True, type='datetime', string='Scheduled Time', select=1, help="Scheduled time for the shipment to be processed"),
         'date': fields.datetime('Time', help="Creation time, usually the time of the order.", select=True, states={'done':[('readonly', True)], 'cancel':[('readonly',True)]}),
-        'date_done': fields.datetime('Date Done', help="Date of Completion", states={'done':[('readonly', True)], 'cancel':[('readonly',True)]}),
+        'date_done': fields.datetime('Date of Transfer', help="Date of Completion", states={'done':[('readonly', True)], 'cancel':[('readonly',True)]}),
         'max_date': fields.function(get_min_max_date, fnct_inv=_set_maximum_date, multi="min_max_date",
                  store=True, type='datetime', string='Max. Expected Date', select=2),
         'move_lines': fields.one2many('stock.move', 'picking_id', 'Internal Moves', states={'done': [('readonly', True)], 'cancel': [('readonly', True)]}),

=== modified file 'stock/stock_view.xml'
--- stock/stock_view.xml	2012-12-09 10:55:27 +0000
+++ stock/stock_view.xml	2012-12-17 10:24:26 +0000
@@ -890,37 +890,37 @@
             <field name="model">stock.picking.out</field>
             <field name="inherit_id" ref="view_picking_form"/>
             <field name="arch" type="xml">
-                <data>
-                    <xpath expr="/form/header//button[@name='%(act_stock_return_picking)d']" position="replace">
-                        <button name="%(report_picking_list_out)d" string="Print Delivery Slip" type="action" states="done" class="oe_highlight"/>
-                        <button name="%(act_stock_return_picking)d" string="Return Products" states="done" type="action"/>
-                    </xpath>
-                    <xpath expr="/form/header//button[@name='draft_validate']" position="replace">
-                        <button name="draft_validate" states="draft" string="Confirm &amp; Deliver" type="object" class="oe_highlight"/>
-                        <button name="action_assign" states="confirmed" string="Check Availability" type="object" class="oe_highlight"/>
-                    </xpath>
-                    <xpath expr="/form/header//button[@name='action_process']" position="replace">
-                        <button name="action_process" states="assigned" string="Deliver" type="object" class="oe_highlight"/>
-                    </xpath>
-                    <xpath expr="/form/header//field[@name='state']" position="replace">
-                        <field name="state" nolabel="1" readonly="1" widget="statusbar" statusbar_visible="draft,confirmed,assigned,done" statusbar_colors='{"auto":"blue", "confirmed":"blue"}'/>
-                    </xpath>
-                    <xpath expr="//field[@name='partner_id']" position="replace">
-                        <field name="partner_id" on_change="onchange_partner_in(partner_id)"  string="Customer"/>
-                    </xpath>
-                    <xpath expr="//field[@name='move_lines']" position="replace">
-                        <field name="move_lines" context="{'address_out_id': partner_id, 'picking_type': 'out', 'form_view_ref':'view_move_picking_form', 'tree_view_ref':'view_move_picking_tree'}"/>
-                    </xpath>
-                    <xpath expr="/form/sheet" position="after">
-                        <div class="oe_chatter">
-                            <field name="message_follower_ids" widget="mail_followers"/>
-                            <field name="message_ids" widget="mail_thread"/>
-                        </div>
-                    </xpath>
-                </data>
+                <field name="date_done" position="attributes" version="7.0">
+                    <attribute name="string">Date of Delivery</attribute>
+                </field>
+                <xpath expr="/form/header//button[@name='%(act_stock_return_picking)d']" position="replace">
+                    <button name="%(report_picking_list_out)d" string="Print Delivery Slip" type="action" states="done" class="oe_highlight"/>
+                    <button name="%(act_stock_return_picking)d" string="Return Products" states="done" type="action"/>
+                </xpath>
+                <xpath expr="/form/header//button[@name='draft_validate']" position="replace">
+                    <button name="draft_validate" states="draft" string="Confirm &amp; Deliver" type="object" class="oe_highlight"/>
+                    <button name="action_assign" states="confirmed" string="Check Availability" type="object" class="oe_highlight"/>
+                </xpath>
+                <xpath expr="/form/header//button[@name='action_process']" position="replace">
+                    <button name="action_process" states="assigned" string="Deliver" type="object" class="oe_highlight"/>
+                </xpath>
+                <xpath expr="/form/header//field[@name='state']" position="replace">
+                    <field name="state" nolabel="1" readonly="1" widget="statusbar" statusbar_visible="draft,confirmed,assigned,done" statusbar_colors='{"auto":"blue", "confirmed":"blue"}'/>
+                </xpath>
+                <xpath expr="//field[@name='partner_id']" position="replace">
+                    <field name="partner_id" on_change="onchange_partner_in(partner_id)"  string="Customer"/>
+                </xpath>
+                <xpath expr="//field[@name='move_lines']" position="replace">
+                    <field name="move_lines" context="{'address_out_id': partner_id, 'picking_type': 'out', 'form_view_ref':'view_move_picking_form', 'tree_view_ref':'view_move_picking_tree'}"/>
+                </xpath>
+                <xpath expr="/form/sheet" position="after">
+                    <div class="oe_chatter">
+                        <field name="message_follower_ids" widget="mail_followers"/>
+                        <field name="message_ids" widget="mail_thread"/>
+                    </div>
+                </xpath>
             </field>
         </record>
-
         <record id="view_picking_out_search" model="ir.ui.view">
             <field name="name">stock.picking.out.search</field>
             <field name="model">stock.picking</field>
@@ -1021,29 +1021,30 @@
             <field name="model">stock.picking.in</field>
             <field name="inherit_id" ref="view_picking_form"/>
             <field name="arch" type="xml">
-                <data>
-                    <xpath expr="/form/header//button[@name='%(act_stock_return_picking)d']" position="replace">
-                        <button name="%(act_stock_return_picking)d" string="Return Products" states="done" type="action"/>
-                    </xpath>
-                    <xpath expr="//button[@name='draft_validate']" position="replace">
-                        <button name="draft_validate" states="draft" string="Confirm &amp; Receive" type="object" class="oe_highlight"/>
-                    </xpath>
-                    <xpath expr="//button[@name='action_process']" position="replace">
-                        <button name="action_process" states="assigned" string="Receive" type="object" class="oe_highlight"/>
-                    </xpath>
-                    <xpath expr="//field[@name='partner_id']" position="replace">
-                        <field name="partner_id" on_change="onchange_partner_in(partner_id)"  string="Supplier"/>
-                    </xpath>
-                    <xpath expr="//field[@name='move_lines']" position="replace">
-                        <field name="move_lines" context="{'address_in_id': partner_id, 'picking_type': 'in', 'form_view_ref':'view_move_picking_form', 'tree_view_ref':'view_move_picking_tree'}"/>
-                    </xpath>
-                    <xpath expr="/form/sheet" position="after">
-                        <div class="oe_chatter">
-                            <field name="message_follower_ids" widget="mail_followers"/>
-                            <field name="message_ids" widget="mail_thread"/>
-                        </div>
-                    </xpath>
-                </data>
+                <field name="date_done" position="attributes" version="7.0">
+                    <attribute name="string">Date of Reception</attribute>
+                </field>
+                <xpath expr="/form/header//button[@name='%(act_stock_return_picking)d']" position="replace">
+                    <button name="%(act_stock_return_picking)d" string="Return Products" states="done" type="action"/>
+                </xpath>
+                <xpath expr="//button[@name='draft_validate']" position="replace">
+                    <button name="draft_validate" states="draft" string="Confirm &amp; Receive" type="object" class="oe_highlight"/>
+                </xpath>
+                <xpath expr="//button[@name='action_process']" position="replace">
+                    <button name="action_process" states="assigned" string="Receive" type="object" class="oe_highlight"/>
+                </xpath>
+                <xpath expr="//field[@name='partner_id']" position="replace">
+                    <field name="partner_id" on_change="onchange_partner_in(partner_id)"  string="Supplier"/>
+                </xpath>
+                <xpath expr="//field[@name='move_lines']" position="replace">
+                    <field name="move_lines" context="{'address_in_id': partner_id, 'picking_type': 'in', 'form_view_ref':'view_move_picking_form', 'tree_view_ref':'view_move_picking_tree'}"/>
+                </xpath>
+                <xpath expr="/form/sheet" position="after">
+                    <div class="oe_chatter">
+                        <field name="message_follower_ids" widget="mail_followers"/>
+                        <field name="message_ids" widget="mail_thread"/>
+                    </div>
+                </xpath>
             </field>
         </record>
         <record id="view_picking_in_search" model="ir.ui.view">