Merge lp:~openerp-dev/openobject-addons/6.0-opw-17109-nep into lp:openobject-addons/6.0

[Nehal Panchal (OpenERP)]

Hello,

From Human Resources > Attendances > Attendances the user was permitted to create new attendance entries into timesheets that were confirmed, validated or refused.

This fixes the issue by permitting entries only into draft or new timesheets.

Thanks.

[Nehal Panchal (OpenERP) (nep-openerp)]

review: Needs Resubmitting

[lp:~openerp-dev/openobject-addons/6.0-opw-17109-nep]

4786. By Launchpad Translations on behalf of openerp on 2011-08-27

Launchpad automatic translations update.

4787. By Launchpad Translations on behalf of openerp on 2011-08-28

Launchpad automatic translations update.

4788. By Launchpad Translations on behalf of openerp on 2011-08-29

Launchpad automatic translations update.

4789. By Priyesh (OpenERP) on 2011-08-29

[MERGE] Merged My branch to fix the AssertionError of Fields in 'groupby' must appear in the list of fields to read(case:16819)

[Nehal Panchal (OpenERP) (nep-openerp)]

review: Needs Resubmitting

[lp:~openerp-dev/openobject-addons/6.0-opw-17109-nep]

4791. By Quentin (OpenERP) <email address hidden> on 2011-08-29

[FIX] sale: backport of revision 3164.118.785 from trunk branch, to fix picked rate on SO

4792. By Launchpad Translations on behalf of openerp on 2011-08-30

Launchpad automatic translations update.

4793. By Priyesh (OpenERP) on 2011-08-30

[MERGE] Merged RHA's branch to fix the problem of showing inactive employees in Holidays report per department.(case:17104)

4794. By Anup(SerpentCS) on 2011-08-30

[MERGE] thunderbird,outlook : Merged Ravi's branch for documentation link fix(Case:17190)

4795. By Anup(SerpentCS) on 2011-08-30

[MERGE] thunderbird : Merged Ravi's branch for thunderbird push mail with accented chars fix(Case:16766)

4796. By Jay Vora (Serpent Consulting Services) on 2011-08-30

[MERGE] Merged Valencia's branch for the fix of creation of menu from wiki group(case 17204)

4797. By Jay Vora (Serpent Consulting Services) on 2011-08-30

[FIX] Hr_payroll,hr_payroll_account : Corrected the views and used xpath tag

4798. By Launchpad Translations on behalf of openerp on 2011-08-31

Launchpad automatic translations update.

4799. By Priyesh (OpenERP) on 2011-08-31

[IMP] account_voucher: Fixed AttributeError: 'bool' object has no attribute 'replace' in the absenece of number and activated sequence in payment journal of Voucher(case:17229)

4800. By Antony Lesuisse (OpenERP) on 2011-08-31

[FIX] account journal create sequence with company_id

4801. By tfr (Openerp) on 2011-09-01

[FIX] Calendar invitation issue

4802. By Quentin (OpenERP) <email address hidden> on 2011-09-01

[FIX] stock: allowed to set 0 as qty, otherwise if you ordered x PC1 and y PC2, and received only the PC1, then you have to delete the line with PC2 in the wizard. With that fix, you can just set it to 0

4803. By Launchpad Translations on behalf of openerp on 2011-09-02

Launchpad automatic translations update.

4804. By Launchpad Translations on behalf of openerp on 2011-09-03

Launchpad automatic translations update.

4805. By Launchpad Translations on behalf of openerp on 2011-09-04

Launchpad automatic translations update.

4806. By Launchpad Translations on behalf of openerp on 2011-09-05

Launchpad automatic translations update.

4807. By Launchpad Translations on behalf of openerp on 2011-09-06

Launchpad automatic translations update.

4808. By Anup(SerpentCS) on 2011-09-06

[Merge] Merged Valencia's branch for decimal precision fix(Case:17325)

4809. By Anup(SerpentCS) on 2011-09-06

[Merge] hr_timesheet_sheet : Merged Riken's branch for Timesheet's workflow correction(Case:17103)

4810. By Launchpad Translations on behalf of openerp on 2011-09-07

Launchpad automatic translations update.

4811. By Husen Daudi <hda@hda-laptop> on 2011-09-07

merged ach branch for issue opw-6306

4812. By Anup(SerpentCS) on 2011-09-07

[Merge] hr : Merged Nehal's branch for domain correction(Case:17165)

[Anup(SerpentCS) (anup-serpent)]

Hello Nehal,

Indeed this was needed.

Thanks for the fix.

review: Approve

[lp:~openerp-dev/openobject-addons/6.0-opw-17109-nep]

4813. By Anup(SerpentCS) on 2011-09-07

[Merge] sale_layout : Merged Nehal's branch for translation fixes in report(Case:17286)

4814. By Anup(SerpentCS) on 2011-09-07

[Merge] hr_holidays : Merged Nehal's branch for fixing the workflow(Case:17349)

4815. By Launchpad Translations on behalf of openerp on 2011-09-08

Launchpad automatic translations update.

4816. By Jay Vora (Serpent Consulting Services) on 2011-09-08

[MERGE] Merged Amit's branch for the fix of RFQ report showing good format of Address

4817. By Jay Vora (Serpent Consulting Services) on 2011-09-08

[MERGE] Analytic : Fixed the problem of search()/name_search() on analytic account,project

4818. By Launchpad Translations on behalf of openerp on 2011-09-09

Launchpad automatic translations update.

4819. By Launchpad Translations on behalf of openerp on 2011-09-10

Launchpad automatic translations update.

4820. By Launchpad Translations on behalf of openerp on 2011-09-13

Launchpad automatic translations update.

4821. By Launchpad Translations on behalf of openerp on 2011-09-14

Launchpad automatic translations update.

4822. By Nehal Panchal (OpenERP) on 2011-09-14

[FIX] hr_timesheet_sheet : Restricts attendance entry in a confirmed and validated/refused timesheet

Unmerged revisions

4822. By Nehal Panchal (OpenERP) on 2011-09-14

[FIX] hr_timesheet_sheet : Restricts attendance entry in a confirmed and validated/refused timesheet

=== modified file 'hr_timesheet_sheet/hr_timesheet_sheet.py'
--- hr_timesheet_sheet/hr_timesheet_sheet.py	2011-01-17 11:20:56 +0000
+++ hr_timesheet_sheet/hr_timesheet_sheet.py	2011-09-14 07:40:52 +0000
@@ -601,12 +601,16 @@
         if 'sheet_id' in context:
             ts = self.pool.get('hr_timesheet_sheet.sheet').browse(cr, uid, context['sheet_id'], context=context)
             if ts.state not in ('draft', 'new'):
-                raise osv.except_osv(_('Error !'), _('You cannot modify an entry in a confirmed timesheet !'))
+                raise osv.except_osv(_('Error !'), _('You cannot modify a timesheet entry in a confirmed or done timesheet!'))
         res = super(hr_attendance,self).create(cr, uid, vals, context=context)
         if 'sheet_id' in context:
             if context['sheet_id'] != self.browse(cr, uid, res, context=context).sheet_id.id:
                 raise osv.except_osv(_('UserError'), _('You cannot enter an attendance ' \
                         'date outside the current timesheet dates!'))
+        else:
+            time_sheet_ids = self.pool.get('hr_timesheet_sheet.sheet').search(cr, uid, [('employee_id','=',vals['employee_id']),('date_to', '>=', vals['name']), ('date_from', '<=' ,vals['name']),('state', 'not in', ('draft', 'new'))])            
+            if time_sheet_ids:
+                raise osv.except_osv(_('Error !'), _('You cannot modify a timesheet entry in a confirmed or done timesheet!'))
         return res
 
     def unlink(self, cr, uid, ids, *args, **kwargs):
@@ -616,8 +620,8 @@
     def write(self, cr, uid, ids, vals, context=None):
         if context is None:
             context = {}
-        self._check(cr, uid, ids)
         res = super(hr_attendance,self).write(cr, uid, ids, vals, context=context)
+        self._check(cr, uid, ids)
         if 'sheet_id' in context:
             for attendance in self.browse(cr, uid, ids, context=context):
                 if context['sheet_id'] != attendance.sheet_id.id: