Merge lp:~openerp-dev/openobject-addons/7.0-opw-594962-fka into lp:openobject-addons/7.0

[Foram Katharotiya (OpenERP)]

Hello,

When we create invoice of contract, fixed following two issue of description field.
 - The date format change into DD-MM-YYYY from YY-MM-DD (depends on date formate).
 - made all hours rounded properly in the created text.

Thanks,
FKA

Unmerged revisions

9301. By Foram Katharotiya (OpenERP) on 2013-07-29

[MERGE] with 7.0

9300. By Foram Katharotiya (OpenERP) on 2013-07-18

[IMP] change date formate

9299. By Foram Katharotiya (OpenERP) on 2013-07-15

[IMP]change date format and display hours in rounded value when create invoice of contract

=== modified file 'analytic/analytic.py'
--- analytic/analytic.py	2013-06-07 11:38:29 +0000
+++ analytic/analytic.py	2013-07-29 05:24:27 +0000
@@ -320,7 +320,7 @@
         'name': fields.char('Description', size=256, required=True),
         'date': fields.date('Date', required=True, select=True),
         'amount': fields.float('Amount', required=True, help='Calculated by multiplying the quantity and the price given in the Product\'s cost price. Always expressed in the company main currency.', digits_compute=dp.get_precision('Account')),
-        'unit_amount': fields.float('Quantity', help='Specifies the amount of quantity to count.'),
+        'unit_amount': fields.float('Quantity', help='Specifies the amount of quantity to count.', digits_compute=dp.get_precision('Account')),
         'account_id': fields.many2one('account.analytic.account', 'Analytic Account', required=True, ondelete='restrict', select=True, domain=[('type','<>','view')]),
         'user_id': fields.many2one('res.users', 'User'),
         'company_id': fields.related('account_id', 'company_id', type='many2one', relation='res.company', string='Company', store=True, readonly=True),
 
=== modified file 'hr_timesheet_invoice/hr_timesheet_invoice.py'
--- hr_timesheet_invoice/hr_timesheet_invoice.py	2013-07-25 10:04:02 +0000
+++ hr_timesheet_invoice/hr_timesheet_invoice.py	2013-07-29 05:24:27 +0000
@@ -20,6 +20,7 @@
 ##############################################################################
 
 import time
+from datetime import datetime
 
 from openerp.osv import fields, osv
 from openerp.tools.translate import _
@@ -274,11 +275,15 @@
 
                     line_ids = cr.dictfetchall()
                     note = []
+                    lang_obj = self.pool.get('res.lang')
+                    user_lang = self.pool.get('res.users').browse(cr, uid, uid, context=context).lang
+                    lang_id = lang_obj.search(cr, uid, [('code','like',user_lang)])
+                    date_format = lang_obj.browse(cr, uid, lang_id[0], context=context).date_format
                     for line in line_ids:
                         # set invoice_line_note
                         details = []
                         if data.get('date', False):
-                            details.append(line['date'])
+                            details.append(datetime.strptime(line['date'], '%Y-%m-%d').strftime(date_format))
                         if data.get('time', False):
                             if line['product_uom_id']:
                                 details.append("%s %s" % (line['unit_amount'], product_uom_obj.browse(cr, uid, [line['product_uom_id']],context2)[0].name))