openerp-dev-web team mailing list archive

["Ashvin Rathod \(OpenERP\)" <ara@xxxxxxxxxxx>]

Ashvin Rathod (OpenERP) has proposed merging lp:~openerp-commiter/openobject-addons/trunk-dev-addons3-ara into lp:~openerp-dev/openobject-addons/trunk-dev-addons3.

Requested reviews:
  OpenERP R&D Team (openerp-dev)
Related bugs:
  #615522 Report Of Invoice  : Payment Term + Due date not printed
  https://bugs.launchpad.net/bugs/615522
  #649029 [sale] incoterm field poorly implemented [direct sql / not translatable]
  https://bugs.launchpad.net/bugs/649029
  #656378 [trunk] general ledger -
  https://bugs.launchpad.net/bugs/656378
  #672553 opening entries from chart of account doesn't use context
  https://bugs.launchpad.net/bugs/672553
  #674480 [6.0 RC2] incorrect creation of Accounting Journals is some localizations prevents multiple charts from being installed
  https://bugs.launchpad.net/bugs/674480
  #675494 [Trunk] - If you delete an invoice entry, invoice still exists
  https://bugs.launchpad.net/bugs/675494
  #681398 sale access right
  https://bugs.launchpad.net/bugs/681398
  #689536 [6.0] partner layout salesman/salesteam issue
  https://bugs.launchpad.net/bugs/689536
  #690326 [6.0RC1] View mode "tree,form,search" in several window actions
  https://bugs.launchpad.net/bugs/690326
  #690753 [6.0] and [5.x] account_analytic_line must not be deleted if the journal etc is deleted
  https://bugs.launchpad.net/bugs/690753
  #691072 [6.0RC1][TRUNK][account_voucher] Wrong definition of field 'company_id' in 'account_voucher_line' object
  https://bugs.launchpad.net/bugs/691072
  #692986 [6.0] hr_payroll_account hr_payroll_account_view.xml - required fields block opening form
  https://bugs.launchpad.net/bugs/692986
  #694833 Salary Structure deduction percentage limitation
  https://bugs.launchpad.net/bugs/694833
  #695960 [6.0RC1][hr_timesheet]Problems printing timesheet reports
  https://bugs.launchpad.net/bugs/695960
  #696914 [6.0 RC2] account bank statement - usability
  https://bugs.launchpad.net/bugs/696914
  #697673 Wrong column title in timesheet view
  https://bugs.launchpad.net/bugs/697673
  #697989 Failed to install module multi_company
  https://bugs.launchpad.net/bugs/697989
  #701410 shouldn't see employee's categories in simplify view
  https://bugs.launchpad.net/bugs/701410
  #701683 [6.0 rc2] Setup/upgrade/run fails for init:module account_analytic_plans
  https://bugs.launchpad.net/bugs/701683

For more details, see:
https://code.launchpad.net/~openerp-commiter/openobject-addons/trunk-dev-addons3-ara/+merge/46451

Hello,

[FIX]: [6.0RC1][hr_timesheet]Problems printing timesheet reports 
https://bugs.launchpad.net/openobject-addons/+bug/695960

Thanks,
ara
-- 
https://code.launchpad.net/~openerp-commiter/openobject-addons/trunk-dev-addons3-ara/+merge/46451
Your team OpenERP R&D Team is requested to review the proposed merge of lp:~openerp-commiter/openobject-addons/trunk-dev-addons3-ara into lp:~openerp-dev/openobject-addons/trunk-dev-addons3.

=== modified file 'hr_timesheet/report/user_timesheet.py'
--- hr_timesheet/report/user_timesheet.py	2011-01-14 00:11:01 +0000
+++ hr_timesheet/report/user_timesheet.py	2011-01-17 09:19:19 +0000
@@ -27,6 +27,7 @@
 import time
 import pooler
 from report import report_sxw
+from tools import ustr
 
 def lengthmonth(year, month):
     if month == 2 and ((year % 4 == 0) and ((year % 100 != 0) or (year % 400 == 0))):
@@ -109,7 +110,7 @@
         <employee>%s</employee>
         %s
         </report>
-        ''' % (header_xml,toxml(empl_name), '\n'.join(date_xml) + '\n'.join(account_xml))
+        ''' % (header_xml, ustr(empl_name), '\n'.join(date_xml) + '\n'.join(account_xml))
         return xml
 
 report_custom('report.hr.analytical.timesheet', 'hr.employee', '', 'addons/hr_timesheet/report/user_timesheet.xsl')

=== modified file 'hr_timesheet/report/users_timesheet.py'
--- hr_timesheet/report/users_timesheet.py	2011-01-14 00:11:01 +0000
+++ hr_timesheet/report/users_timesheet.py	2011-01-17 09:19:19 +0000
@@ -26,6 +26,7 @@
 import pooler
 from tools.translate import _
 from report import report_sxw
+from tools import ustr
 
 
 def lengthmonth(year, month):
@@ -111,7 +112,7 @@
         %s
         %s
         </report>
-        ''' % (header_xml,date_xml, emp_xml)
+        ''' % (header_xml,date_xml, ustr(emp_xml))
         return xml
 
 report_custom('report.hr.analytical.timesheet_users', 'hr.employee', '', 'addons/hr_timesheet/report/users_timesheet.xsl')