openerp-dev-web team mailing list archive

["Meera Trambadia \(OpenERP\)" <mtr@xxxxxxxxxxx>]

Meera Trambadia (OpenERP) has proposed merging lp:~openerp-commiter/openobject-addons/trunk-dev-addons3-mtr1 into lp:~openerp-dev/openobject-addons/trunk-dev-addons3.

Requested reviews:
  OpenERP R&D Team (openerp-dev)
Related bugs:
  #600547 Invoice totals not updated when a line is moved (store={...} bug?)
  https://bugs.launchpad.net/bugs/600547
  #690895 copy account.move crash 
  https://bugs.launchpad.net/bugs/690895
  #694144 [6.0] sales manager dashboard - sales by month - sql query error, usabiliy
  https://bugs.launchpad.net/bugs/694144
  #695632 [RC1]Two same fields creating problem in web-client
  https://bugs.launchpad.net/bugs/695632
  #695960 [6.0RC1][hr_timesheet]Problems printing timesheet reports
  https://bugs.launchpad.net/bugs/695960
  #702805 an employee shouldn't be able to see expenses and holidays of others employee
  https://bugs.launchpad.net/bugs/702805
  #703836 [Trunk] hr_expense: Invoice button not working
  https://bugs.launchpad.net/bugs/703836
  #705766 Wrong Picked Widget in Sale Order in OpenERP v6.0.1
  https://bugs.launchpad.net/bugs/705766
  #707144 [6.0] hr_payroll 'C/D' versus 'D/C' 
  https://bugs.launchpad.net/bugs/707144
  #708603 Miscalculation of parent_store data when moving multiple records under same parent
  https://bugs.launchpad.net/bugs/708603
  #711533 v6 hr_attendance - time is rounded to hour
  https://bugs.launchpad.net/bugs/711533
  #712960 [Trunk] - increase size of col. date in payment order pdf
  https://bugs.launchpad.net/bugs/712960
  #715269 [TRUNK] Residual Amount is Wrong referenced and wrong calculated.
  https://bugs.launchpad.net/bugs/715269
  #715365 account_payment error when adding lines to bank statement
  https://bugs.launchpad.net/bugs/715365

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

[IMP] hr_attendance: added missing action in the wizard for 'Weekly Attendance Report'
-- 
https://code.launchpad.net/~openerp-commiter/openobject-addons/trunk-dev-addons3-mtr1/+merge/49207
Your team OpenERP R&D Team is requested to review the proposed merge of lp:~openerp-commiter/openobject-addons/trunk-dev-addons3-mtr1 into lp:~openerp-dev/openobject-addons/trunk-dev-addons3.

=== modified file 'hr_attendance/report/timesheet.py'
--- hr_attendance/report/timesheet.py	2011-02-07 09:43:22 +0000
+++ hr_attendance/report/timesheet.py	2011-02-10 11:11:46 +0000
@@ -28,6 +28,8 @@
 from report.interface import report_rml
 from report.interface import toxml
 
+import tools
+
 one_week = relativedelta(days=7)
 num2day = ['Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday', 'Sunday']
 
@@ -58,7 +60,7 @@
               <name>%s</name>
               %%s
             </user>
-            ''' % ustr(toxml(emp['name']))
+            ''' % tools.ustr(toxml(emp['name']))
             while monday != last_monday:
                 #### Work hour calculation
                 sql = '''

=== modified file 'hr_attendance/wizard/hr_attendance_byweek_view.xml'
--- hr_attendance/wizard/hr_attendance_byweek_view.xml	2011-01-14 00:11:01 +0000
+++ hr_attendance/wizard/hr_attendance_byweek_view.xml	2011-02-10 11:11:46 +0000
@@ -1,6 +1,40 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
+        <record id="view_hr_attendance_week" model="ir.ui.view">
+            <field name="name">Attendances Report Weekly</field>
+            <field name="model">hr.attendance.week</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+            <form string="Print Attendance Report Weekly">
+                <field name="init_date"/>
+                <field name="end_date"/>
+                <newline/>
+                <separator colspan="4"/>
+                <button special="cancel"  string="Cancel" icon='gtk-cancel'/>
+                <button name="print_report" string="Print" type="object"  icon="gtk-print"/>
+            </form>
+            </field>
+        </record>
 
+        <record id="action_hr_attendance_week" model="ir.actions.act_window">
+            <field name="name">Attendances By Week</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">hr.attendance.week</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+        </record>
+        
+        <record model="ir.values" id="hr_attendance_week_values">
+            <field name="model_id" ref="hr.model_hr_employee" />
+            <field name="object" eval="1" />
+            <field name="name">Attendances By Week</field>
+            <field name="key2">client_print_multi</field>
+            <field name="value" eval="'ir.actions.act_window,' + str(ref('action_hr_attendance_week'))" />
+            <field name="key">action</field>
+            <field name="model">hr.employee</field>
+        </record>
+        
 	</data>
 </openerp>