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 Traceback occurs at the time of "Account" duplication.
  https://bugs.launchpad.net/bugs/708603

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

=>Applied patch of revision 4358 of 6.0.1
=>[FIX] hr_attendance : Correction on wizard of sign in/out [Ref: SaaS maintenance case 3896]" 
-- 
https://code.launchpad.net/~openerp-commiter/openobject-addons/trunk-dev-addons3-mtr1/+merge/48122
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/hr_attendance.py'
--- hr_attendance/hr_attendance.py	2011-01-14 00:11:01 +0000
+++ hr_attendance/hr_attendance.py	2011-02-01 09:44:00 +0000
@@ -75,7 +75,7 @@
             LIMIT 2 '''
             cr.execute(sql,(id,id))
             atts = cr.fetchall()
-            if not ((len(atts)==1 and atts[0][0] == 'sign_in') or (atts[0][0] != atts[1][0] and atts[0][1] != atts[1][1])):
+            if not ((len(atts)==1 and atts[0][0] == 'sign_in') or (len(atts)==2 and atts[0][0] != atts[1][0] and atts[0][1] != atts[1][1])):
                 return False
         return True