odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity
72,231 Commits 3 Branches 0 Tags 961 MiB
Commit Graph

1244 Commits

Author SHA1 Message Date
Denis Ledoux 0c16c20c68 [FIX] hr_timesheet: timezone of anayltic sheets in sheet summary 
The timezone of hr_analytic_sheet should be the timezone
of the employee as well, so sheet analytic lines and attendances
lines are grouped within the same timezone, the timezone
of the employees, so the time difference between the analytic
lines and the attendances lines can be properly computed.

Fixes #5809
Fixes #5379
Related to rev. 3bf1615ad4
 2015-03-23 15:26:41 +01:00
Denis Ledoux 3bf1615ad4 [FIX] hr_timesheet: worked hours summary when sign in without sign out 
In a timesheet, when a sign in is added, and a sign out
is not following, the current time is took as sign out value.

Rev. dbb2a669f4 corrected an issue
regarding the worked hours summary not taking into account
the employee timezone.
This timezone has to be applied on the current_time also.

e.g: For an employee being in timezone UTC + 1
If the current_time is presently 12:00 (UTC+1)
If the employee set his sign in to 10:00
and do not entered a sign out
The hours summary table displayed 1:00 of worked hours,
based on computation (11:00 - 10:00)
11:00 being 12:00 but in timezone UTC

Besides, another issue was present when entering
a sign in at midnight exactly without a sign out:
If the employee set his sign in to 00:00:00
and do not set a sign out, worked hours displayed 0 worked hours
whatever the current time.

Fixes #5379
Closes #5378
Closes #5503
 2015-02-27 12:04:49 +01:00
Anthony Muschang 772b213e69 [FIX] hr_timesheet_sheet: hide button "Add a Line" if readonly sheet 
The 'Add a line' button should be hidden when the sheet is readonly.
For instance, for a submitted employee sheet.

closes #4297
opw-628160
 2015-02-17 10:56:14 +01:00
Denis Ledoux c718661ba8 [FIX] hr_timesheet_sheet: default product in analytic lines 
The module analytic_user_function allows to define a specific product
to use, when creating timesheet activities for a specific employee
with a specific contract

Nevertheless, the product was not set accordingly to this feature
for the first timesheet activity, because,
when initilialing the timesheet line,
the on_change_account_id, which returns
the product to use according to the user and contract, was called
without passing the user.

Besides, by default, on_change_account_id does not have a user_id parameter,
this parameter is added by the module analytic_user_function, overriding
this onchange, and adding a new user_id parameter (which is not a good pratice).

We therefore use multi_on_change_account_id, which allow to pass the user_id,
within the context
 2015-02-10 11:54:55 +01:00
Denis Ledoux dd9d8b0c84 [FIX] hr_timesheet_sheet: prevent new activity on confirmed sheets 
Once a timesheet confirmed, the activity hours should not be modified,
for any reasons.

The constraint _check_sheet_state prevents to modify activities
for confirmed timesheets, but does not prevent the addition
of new activities within the current, but confirmed, timesheet.

opw-627415
fixes #5128
 2015-02-09 12:13:17 +01:00
Olivier Dony d0cd92bb9f [I18N] Sync updated 7.0 translations from Launchpad 2015-01-07 17:57:28 +01:00
Denis Ledoux dbb2a669f4 [FIX] hr_timesheet_sheet: display timesheet by day summary in employee tz 
If an employee in UTC + 1 (Europe/Brussels) entered an attendance from January 2 00:00 to Januay 2 23:59, the summary by day table displayed two different lines, for two different days:
 - 1 hour on January 1 from 23:00 to 23:59
 - 22:59 hours on January 2 from 00:00 to 22:59

 Which is obviously wrong, the employee, in its own time zone, worked on January 2 only.
 2015-01-07 12:26:41 +01:00
Christophe Simonis 388732dfa6 [IMP] *: one Makefile to rules them all. 
Create one unique generic Makefile to compile sass files.
 2014-11-05 19:30:28 +01:00
rmu-odoo 16a969214f [FIX] hr_timesheet_sheet: avoid error when sort attendances 
When an attendance line is edited, the tuple has no key 'name' which lead to a traceback.
Fixes #546
 2014-09-17 18:25:08 +02:00
Olivier Dony 96c36e895c [I18N] Update all 7.0 translation templates with latest terms and annotations 
Total new terms: 168
Total deleted terms: 95
Total identical terms: 16329
(Some modules skipped, typically all l10n_* modules)
 2014-08-14 02:24:24 +02:00
Martin Trigaux 9404ab4cfb [FIX] hr_timesheet_sheet: accept custom fields in timesheets 
When creating hr.analytic.timesheet do not filter the list of fields to accept but set the list of fields to remove.
 2014-06-26 15:31:55 +02:00
Laetitia Gangloff 905617b530 hr_timesheet_sheet: for attendance, set default value for employee_id in the context 2014-06-06 12:55:22 +02:00
Yannick Vaucher c1601e75d3 [FIX] sign in and sign out were broken in rev 10019 as it doesn't provide a date to conversion of attendance time to employee timezone 
lp bug: https://launchpad.net/bugs/1314589 fixed

bzr revid: yannick.vaucher@camptocamp.com-20140430113730-cn3xw66fbik8p32n
 2014-04-30 13:37:30 +02:00
Launchpad Translations on behalf of openerp fdfcb6bf47 Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20140429064121-xnusb4mb3r8vgtzh
 2014-04-29 06:41:21 +00:00
Martin Trigaux c393fbcddd [MERGE] [FIX] hr_timesheet_sheet: make it timezone tolerant and avoid errors when comparing datetime and dates, courtesy of Yannick Vaucher (Camptocamp) 
The attendance date recieved by the server is in UTC while the user sees it in his timezone. This means that an attendance could be in a timesheet (bounded by dates) for a user but not for the server which would not accept a valid attendance.
The fix will make the check in the user's timezone.

Only the date part of the attendance is kept for comparison as the boundaries are dates objects.

bzr revid: mat@openerp.com-20140428153216-4s6r5hu1ov0p0ofm
 2014-04-29 01:32:16 +10:00
Yannick Vaucher 22d1c0956f [UPD] resolve conflicts with main branch and fix bug introduced in rev 10015 lp:1313622 
lp bug: https://launchpad.net/bugs/1313622 fixed

bzr revid: yannick.vaucher@camptocamp.com-20140428142017-3warx1ai72cfetj1
 2014-04-28 16:20:17 +02:00
Yannick Vaucher 886c827458 [UPD] 
bzr revid: yannick.vaucher@camptocamp.com-20140428135535-o9512996d18cudgq
 2014-04-28 15:55:35 +02:00
Martin Trigaux bb85882322 [FIX] hr_timesheet_sheet: forbid to record an attendance in a submitted timesheet (opw 592632) 
bzr revid: mat@openerp.com-20140425100856-lcpgyjdk4u632bws
 2014-04-25 12:08:56 +02:00
Martin Trigaux 34067a1f49 [FIX] hr_timesheet_sheet: forbid to record an attendance in a submitted timesheet 
lp bug: https://launchpad.net/bugs/1180769 fixed

bzr revid: mat@openerp.com-20140424142829-ramy830hwkghk1jv
 2014-04-24 16:28:29 +02:00
Denis Ledoux 966a818aa6 [FIX] hr_timesheet_sheet: allow writing attendance line not according to the date order, and check that the attendances satisfy the alternance constraint, even for delete operations 
lp bug: https://launchpad.net/bugs/1180773 fixed

bzr revid: dle@openerp.com-20140423112554-75bpk5k3viroqbh5
 2014-04-23 13:25:54 +02:00
Launchpad Translations on behalf of openerp 89fd1bede4 Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20140419063533-z6kswp5wkioh5jlv
bzr revid: launchpad_translations_on_behalf_of_openerp-20140420055842-traoy17xi60ufook
bzr revid: launchpad_translations_on_behalf_of_openerp-20140421050815-44ydlitvsaj3xdd9
bzr revid: launchpad_translations_on_behalf_of_openerp-20140422082459-bfjqgpt2bpgll64p
 2014-04-22 08:24:59 +00:00
Launchpad Translations on behalf of openerp 1f3c4f852f Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20140319063002-sd17jxb37ycogrrz
bzr revid: launchpad_translations_on_behalf_of_openerp-20140320061944-bwpy0lt1bp5ee0y2
 2014-03-20 06:19:44 +00:00
Launchpad Translations on behalf of openerp f166daf065 Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20140308065427-0he29w0cqe07xmc8
bzr revid: launchpad_translations_on_behalf_of_openerp-20140308065421-4udfyb7xcfq5h1zy
bzr revid: launchpad_translations_on_behalf_of_openerp-20140309060314-64jktl10pkq3inv4
 2014-03-09 06:03:14 +00:00
Launchpad Translations on behalf of openerp b201dc79b7 Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20140218054104-8egkh4jj7hiiwuih
bzr revid: launchpad_translations_on_behalf_of_openerp-20140219054048-688twg0fubtm2x2q
bzr revid: launchpad_translations_on_behalf_of_openerp-20140220054214-237ri67t9rw3l4fu
bzr revid: launchpad_translations_on_behalf_of_openerp-20140221063855-wniw42r27gyg3h6y
bzr revid: launchpad_translations_on_behalf_of_openerp-20140222073328-xpn7nwqz407yzumq
bzr revid: launchpad_translations_on_behalf_of_openerp-20140223074516-0r09cpmma58ylqji
bzr revid: launchpad_translations_on_behalf_of_openerp-20140224060319-535oheaq2w9u2ye3
bzr revid: launchpad_translations_on_behalf_of_openerp-20140225062420-zl7curej0e0warhz
bzr revid: launchpad_translations_on_behalf_of_openerp-20140226073146-3vzhw4hddr81olbs
bzr revid: launchpad_translations_on_behalf_of_openerp-20140227062959-24e2rn98rqb9afpr
bzr revid: launchpad_translations_on_behalf_of_openerp-20140228072152-f9gm4ud1wu19ge27
bzr revid: launchpad_translations_on_behalf_of_openerp-20140301055205-r0df0fqz9yf5z66i
bzr revid: launchpad_translations_on_behalf_of_openerp-20140302052638-bjf11oumy7w15oco
bzr revid: launchpad_translations_on_behalf_of_openerp-20140304082704-k1z2te1tfud43zy3
 2014-03-04 08:27:04 +00:00
Launchpad Translations on behalf of openerp 5d2f1c68ac Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20140216064134-tam102h50au851o1
bzr revid: launchpad_translations_on_behalf_of_openerp-20140215073800-2219ymc7ijxq57aa
bzr revid: launchpad_translations_on_behalf_of_openerp-20140216064223-17h9wz07b2siswzs
bzr revid: launchpad_translations_on_behalf_of_openerp-20140217060328-7qh928zk8ro30qzb
 2014-02-17 06:03:28 +00:00
Launchpad Translations on behalf of openerp 2bebb9cd4d Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20140201065304-8md3g4d14l1b51ii
bzr revid: launchpad_translations_on_behalf_of_openerp-20140202060105-bnt8nw1mcbg2c3m3
bzr revid: launchpad_translations_on_behalf_of_openerp-20140203055609-uxdqgnistwilvo2v
bzr revid: launchpad_translations_on_behalf_of_openerp-20140204064835-qdcrcxldc5zsutio
 2014-02-04 06:48:35 +00:00
Denis Ledoux 3a6b6dd6df [FIX] hr_timesheet_sheet: save correctly if focus is in a timesheet input 
on_change_unit_amount was called manually in the timesheet widget. Normally, save waits for all on_change to be applied, but in this case, as the on_change its called manually in the js, it was not the case.
The fix is to put all deferreds for which we must wait for in an array, and to wait all deferreds to be done before saving.

bzr revid: dle@openerp.com-20140115165114-nqa2ynszgocrnt52
 2014-01-15 17:51:14 +01:00
Launchpad Translations on behalf of openerp 94b4618c13 Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20131215054553-py8zfwrk3bir6m1l
bzr revid: launchpad_translations_on_behalf_of_openerp-20131212055820-zh0fqpweezvphdc6
bzr revid: launchpad_translations_on_behalf_of_openerp-20131213064308-hil3cycv38im8qds
bzr revid: launchpad_translations_on_behalf_of_openerp-20131215054616-uyc9y42oetvmq1cs
bzr revid: launchpad_translations_on_behalf_of_openerp-20131216053557-w3gf0jlw5wrtzllr
 2013-12-16 05:35:57 +00:00
Launchpad Translations on behalf of openerp 9d95656e0c Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20131128060619-0nswl7lls658nujd
 2013-11-28 06:06:19 +00:00
Launchpad Translations on behalf of openerp 6fd5575930 Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20131127053957-ekc1bfm5ohug21aa
 2013-11-27 05:39:57 +00:00
Denis Ledoux d003d8f49a [FIX]hr_timesheet_sheet: add right-padding to timesheet weekly input in order to avoid the value to be partially cut (in ie 9/10, for instance) 
bzr revid: dle@openerp.com-20131126170019-bydxxyk7uqzpsb41
 2013-11-26 18:00:19 +01:00
Denis Ledoux fd080fb745 [FIX]hr_timesheet_sheet: remove useless css rule, which had the effect of erasing the half timesheet weekly input on ie. 
bzr revid: dle@openerp.com-20131125160315-tj8n5bv6e5yv8jku
 2013-11-25 17:03:15 +01:00
Denis Ledoux 40a7a5dc64 [FIX]hr_timesheet_sheet: report, the join clause of the view was wrong, account_analytic_line is join with hr_timesheet_sheet_sheet thanks to the sheet_id (hat.sheet_id=htss.id), not with the line_id (hat.line_id=htss.id) 
bzr revid: dle@openerp.com-20131125142624-wilbjmlgy9yubcgk
 2013-11-25 15:26:24 +01:00
Launchpad Translations on behalf of openerp 271ed43e7b Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20131121054848-007arsnnoa8fs65e
bzr revid: launchpad_translations_on_behalf_of_openerp-20131121063838-blqn6j0yfmrlw5vp
 2013-11-21 06:38:38 +00:00
Martin Trigaux 7bdd9a6ad3 [FIX] hr_timesheet_sheet: use timezone in hour computation for timesheet 
bzr revid: mat@openerp.com-20130916143300-sa3zpm505ac6r145
 2013-09-16 16:33:00 +02:00
Yannick Vaucher c59b97b358 [FIX] hr_timesheet_sheet - remove useless call to AT TIME ZONE in psql request here it isn't current_date but an utc 'timestamp' date. Need a strong tea even if it isn't utc tea time. 
bzr revid: yannick.vaucher@camptocamp.com-20130909103819-i3143f6zenrf8hi9
 2013-09-09 12:38:19 +02:00
Yannick Vaucher 76a0d0acf6 [IMP] hr_timesheet_sheet - set default timezone as UTC if employee has none 
bzr revid: yannick.vaucher@camptocamp.com-20130909103749-sc1ia08hna4o6q8h
 2013-09-09 12:37:49 +02:00
Yannick Vaucher 0ed7f5ef3b [IMP] hr_timesheet_sheet - simplify and improve readability in search for sheet_ids 
bzr revid: yannick.vaucher@camptocamp.com-20130909103724-4w5tkx2bfms07s91
 2013-09-09 12:37:24 +02:00
Yannick Vaucher 372f3d131a [IMP] hr_timesheet_sheet - remove unused variable 
bzr revid: yannick.vaucher@camptocamp.com-20130909103654-wwkpyaaoqpwq1mqu
 2013-09-09 12:36:54 +02:00
Olivier Dony 8a9db0b58f [FIX] account,hr_timesheet_sheet: fix YML assertRaise-like testcases that did not verify the result, courtesy of Laetitia Gangloff (Acsone) 
bzr revid: odo@openerp.com-20130819142314-cirsm5jxg6e0uw02
 2013-08-19 16:23:14 +02:00
Launchpad Translations on behalf of openerp 0e74fd31a4 Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20130815055122-qjjh1oa8122npkdt
bzr revid: launchpad_translations_on_behalf_of_openerp-20130816060311-osd5epg0pjqggizo
bzr revid: launchpad_translations_on_behalf_of_openerp-20130817061650-b596lee67z2gon1h
bzr revid: launchpad_translations_on_behalf_of_openerp-20130818050503-e1c1ferew0px4k1y
bzr revid: launchpad_translations_on_behalf_of_openerp-20130819045737-ef63g3nwk154ezyw
 2013-08-19 04:57:37 +00:00
Laetitia Gangloff (Acsone) c167918f88 test: correct some try/except test 
bzr revid: laetitia.gangloff@acsone.eu-20130809070605-w6ti80ljpv5zsh2p
 2013-08-09 09:06:05 +02:00
Laetitia Gangloff (Acsone) 3a369e15c2 test: correct some try/except test 
bzr revid: laetitia.gangloff@acsone.eu-20130808143622-7kk0p7ve786kg1yd
 2013-08-08 16:36:22 +02:00
Launchpad Translations on behalf of openerp bb90e51a78 Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20130803061336-i8noij4hjz9nxoow
bzr revid: launchpad_translations_on_behalf_of_openerp-20130804053709-rxcnnh17adwk94b4
bzr revid: launchpad_translations_on_behalf_of_openerp-20130805063055-v6y7lrx7lcoemmk0
 2013-08-05 06:30:55 +00:00
Launchpad Translations on behalf of openerp bea114f93a Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20130730045806-pkwhfwt808zjajg9
 2013-07-30 04:58:06 +00:00
Yannick Vaucher e2b7cd17fc [FIX] hr_timesheet_sheet - search sheet_id for attendance using date in users timezone. As attendances depends on timezone but timesheet have from and to date instead of datetime we have to change the attendance to the same timezone expected for timesheet. And as a Timesheet belongs to a user, we can expect this timesheet to be in the same timezone as its owner. Maybe a timezone field should be added on timesheet. In anycase it make no sense to have all timesheet forced with start and end date as UTC. 
lp bug: https://launchpad.net/bugs/1204224 fixed

bzr revid: yannick.vaucher@camptocamp.com-20130723184341-zowaw71f0mpghgrx
 2013-07-23 20:43:41 +02:00
Launchpad Translations on behalf of openerp d1a4e0aef0 Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20130711062622-v4muic3uqckueux5
bzr revid: launchpad_translations_on_behalf_of_openerp-20130712063505-m63repwd0zokfibu
bzr revid: launchpad_translations_on_behalf_of_openerp-20130713063525-b30s09rh63t3zox4
bzr revid: launchpad_translations_on_behalf_of_openerp-20130714055943-xf6jvk2dpoemt6qx
bzr revid: launchpad_translations_on_behalf_of_openerp-20130715051357-59o0nkhplh3e58mi
bzr revid: launchpad_translations_on_behalf_of_openerp-20130704054706-ace1fcr1vtruoc4s
bzr revid: launchpad_translations_on_behalf_of_openerp-20130705061311-4735gtnj7xjmuprg
bzr revid: launchpad_translations_on_behalf_of_openerp-20130712063510-g2yq0kxqgrx9x1df
bzr revid: launchpad_translations_on_behalf_of_openerp-20130713063533-7mjj5a7226xhtob6
bzr revid: launchpad_translations_on_behalf_of_openerp-20130714055945-h6jn755mtdcubvei
bzr revid: launchpad_translations_on_behalf_of_openerp-20130715051400-rra06yzfd7zw4bt0
 2013-07-15 05:14:00 +00:00
Launchpad Translations on behalf of openerp 3e269d1572 Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20130614070428-by6oo1fc0hvfoqc8
bzr revid: launchpad_translations_on_behalf_of_openerp-20130615061319-hikvcj42kmv0fwla
bzr revid: launchpad_translations_on_behalf_of_openerp-20130616053220-l2jj1f2bfhr8s95f
bzr revid: launchpad_translations_on_behalf_of_openerp-20130617062045-ydm23y8oyqt85r6d
bzr revid: launchpad_translations_on_behalf_of_openerp-20130618065045-8n040l4nl7inbsho
bzr revid: launchpad_translations_on_behalf_of_openerp-20130619061621-p7u5tapogm5ao1o2
bzr revid: launchpad_translations_on_behalf_of_openerp-20130620063408-j244y20qpy61d6dn
bzr revid: launchpad_translations_on_behalf_of_openerp-20130615062054-6zhgccaoectf2c0d
bzr revid: launchpad_translations_on_behalf_of_openerp-20130616053235-3eimstk0anu72x9m
bzr revid: launchpad_translations_on_behalf_of_openerp-20130617062114-7wts3fyy6vgqzt8v
bzr revid: launchpad_translations_on_behalf_of_openerp-20130618065127-8w5xbiwnnza5vlo1
bzr revid: launchpad_translations_on_behalf_of_openerp-20130619061719-63jsadfrb1yoqtgz
bzr revid: launchpad_translations_on_behalf_of_openerp-20130620063509-1xk30ymo1f7nn4h0
 2013-06-20 06:35:09 +00:00
Martin Trigaux c895961909 [MERGE] [FIX] hr_timesheet_sheet: compute amount field for timesheets 
bzr revid: mat@openerp.com-20130613150342-hn7u14m223nv0k9q
 2013-06-13 17:03:42 +02:00
Martin Trigaux 79745ca866 [MERGE] [FIX] hr_timesheet_sheet, account_followup: remove create access rights on reports and hide create button from views 
bzr revid: mat@openerp.com-20130613113146-7dim7vh35umf1570
 2013-06-13 13:31:46 +02:00