← Back to team overview

openerp-dev-web team mailing list archive

[Merge] lp:~openerp-dev/openobject-addons/pso-dev-addons3 into lp:~openerp-dev/openobject-addons/trunk-dev-addons3

 

pso (Open ERP) has proposed merging lp:~openerp-dev/openobject-addons/pso-dev-addons3 into lp:~openerp-dev/openobject-addons/trunk-dev-addons3.

Requested reviews:
  OpenERP R&D Team (openerp-dev)
Related bugs:
  #617974 trunk - hr payment - rounding issue payment slip
  https://bugs.launchpad.net/bugs/617974
  #663585 [6.0rc1] suggested improvements to PO and SO form view
  https://bugs.launchpad.net/bugs/663585
  #663967 [RC1] SO -History - can delete related invoice
  https://bugs.launchpad.net/bugs/663967
  #666592 save and close crash adding product in point of sale
  https://bugs.launchpad.net/bugs/666592
  #669360 hr_timeeshet_sheet : installation fails on 1st (and probably last) date of the month.
  https://bugs.launchpad.net/bugs/669360
  #669533 [hr_timesheet] Employee timesheet reports confuse employee id and user id
  https://bugs.launchpad.net/bugs/669533
  #672684 Manual Global Tax
  https://bugs.launchpad.net/bugs/672684


Hello sir,

I have solved issues related hr_holidays modules.

I have improved holidays view and demo file.

Thanks,
pso.
-- 
https://code.launchpad.net/~openerp-dev/openobject-addons/pso-dev-addons3/+merge/41141
Your team OpenERP R&D Team is requested to review the proposed merge of lp:~openerp-dev/openobject-addons/pso-dev-addons3 into lp:~openerp-dev/openobject-addons/trunk-dev-addons3.
=== modified file 'hr_holidays/hr_holidays_demo.xml'
--- hr_holidays/hr_holidays_demo.xml	2010-10-18 09:28:40 +0000
+++ hr_holidays/hr_holidays_demo.xml	2010-11-18 09:01:19 +0000
@@ -6,7 +6,7 @@
         <field name="name">Casual Leave for Fabien Pinckaers</field>
         <field name="holiday_status_id" ref="holiday_status_cl"/>
         <field name="type">add</field>
-        <field name="number_of_days_temp">12</field>
+        <field name="number_of_days_temp">20</field>
         <field name="employee_id" ref="hr.employee1"/>
     </record>
 


Follow ups