6b70b80a0e
[MERGE] forward port of branch 7.0 up to 881c10b
2015-03-25 17:41:53 +01:00
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
4a3c4713e9
[MERGE] forward port of branch 7.0 up to 209ce6f
2015-03-09 11:24:32 +01:00
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. dbb2a669f4Fixes #5379
Closes #5378
Closes #5503
2015-02-27 12:04:49 +01:00
4c7e078478
[MERGE] forward port of branch 7.0 up to 772b213
2015-02-17 10:59:25 +01:00
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
48f527b860
[MERGE] forward port of branch 7.0 up to 368c674
2015-02-10 15:31:51 +01:00
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
9003537222
[MERGE] forward port of branch 7.0 up to dd9d8b0
2015-02-09 12:14:09 +01:00
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
d0cd92bb9f
[I18N] Sync updated 7.0 translations from Launchpad
2015-01-07 17:57:28 +01:00
b2be001257
[MERGE] forward port of branch 7.0 up to dbb2a66
2015-01-07 12:48:39 +01:00
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
ec277732fe
[MERGE] forward port of branch 7.0 up to 3e3e35e
2014-11-05 21:10:15 +01:00
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
5bd0249515
[MERGE] forward port of branch 7.0 up to a218a9e
2014-09-18 16:05:34 +02:00
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
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
bdc4dd4a65
[MERGE] forward port of branch 7.0 up to 95cff0b
2014-06-27 16:00:28 +02:00
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
9f0ecb3572
[MERGE] Forward-port of 7.0 bugfixes up to 4d3a5df
2014-06-12 13:49:32 +02:00
905617b530
hr_timesheet_sheet: for attendance, set default value for employee_id in the context
2014-06-06 12:55:22 +02:00
1953aa442f
[MERGE] forward port of branch 7.0 up to revid 10037 mat@openerp.com-20140507133552-v4qsdp7qdp9iwewi
...
bzr revid: chs@openerp.com-20140507153348-g2qw61dkxvps13br
2014-05-07 17:33:48 +02:00
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
c3e812f34a
[MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 10025 rev-id odo@openerp.com-20140430102552-qkwv20b20nve64th
...
bzr revid: odo@openerp.com-20140430110048-6971xplq8k073tto
2014-04-30 13:00:48 +02:00
fdfcb6bf47
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140429064121-xnusb4mb3r8vgtzh
2014-04-29 06:41:21 +00:00
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
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
886c827458
[UPD]
...
bzr revid: yannick.vaucher@camptocamp.com-20140428135535-o9512996d18cudgq
2014-04-28 15:55:35 +02:00
2832d2ddc9
[MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 10016 revid:dle@openerp.com-20140425125507-njfyl1r6wn11vqwx
...
bzr revid: dle@openerp.com-20140425125926-5nchz1tcq4fx18jx
2014-04-25 14:59:26 +02:00
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
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
52cfc16c2e
[MERGE] forward port of branch 7.0 up to revid 10012 launchpad_translations_on_behalf_of_openerp-20140424063249-gwnojb5kvlq544nz
...
bzr revid: chs@openerp.com-20140424123538-rxk9got9k2on1ki1
2014-04-24 14:35:38 +02:00
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
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
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
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
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
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
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
9cdcf812a6
[MERGE] merge from trunk into local branch
...
bzr revid: ged@openerp.com-20140130135251-ahk515cy0wc87kyr
2014-01-30 14:52:51 +01:00
e96e86b314
[IMP] improves the reporting view Timesheet Sheet Analysis (add some measures to the table) in addon hr_timesheet_sheet
...
bzr revid: ged@openerp.com-20140130132007-uyvddo0eq8yssft8
2014-01-30 14:20:07 +01:00
a768f15038
[IMP] improves the reporting view Timesheet Analysis (add some measures to the table) in addon hr_timesheet_sheet
...
bzr revid: ged@openerp.com-20140130131737-hibhsfqurtxe7weh
2014-01-30 14:17:37 +01:00
3ce5e01eca
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140128064139-6fjg3b236v5d790j
2014-01-28 06:41:39 +00:00
68a466e8a8
[IMP] improves the Timesheet Analysis reporting view : changes the axis, adds a 'this month' filter using the new pivot graph view (addon hr_timesheet_sheet)
...
bzr revid: ged@openerp.com-20140127130351-iu422fkjnu8059wd
2014-01-27 14:03:51 +01:00
00c6d55ac9
[MERGE] merge trunk into local branch
...
bzr revid: ged@openerp.com-20140116144326-8kwqab71zp8s7a8e
2014-01-16 15:43:26 +01:00
91aaaec0a5
[MERGE] forward port of branch saas-2 up to revid 9092 dle@openerp.com-20140115165506-yuux9km39gbv7k4n
...
bzr revid: chs@openerp.com-20140115214454-dhl8xzr429co0j5d
2014-01-15 22:44:54 +01:00
5649e0bbf2
[MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9770 revid:chs@openerp.com-20140116154645-sy4zhdgqc48xaqbx
...
bzr revid: dle@openerp.com-20131224112612-5gjit5uu1aaaqstx
bzr revid: dle@openerp.com-20140103094532-mbczi9ssr3gc90o1
bzr revid: dle@openerp.com-20140108105833-gblxqdw3if1gt35k
bzr revid: dle@openerp.com-20140115121441-bskbyxxbc09ubavh
bzr revid: dle@openerp.com-20140115165506-yuux9km39gbv7k4n
bzr revid: dle@openerp.com-20140116161415-0y9m0kgavcytzj9z
2014-01-16 17:14:15 +01:00
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
0b1f968fc3
[IMP] removes old tree views in reporting and replaces them by the new graph views in pivot mode by default (addon hr_timesheet_sheet)
...
bzr revid: ged@openerp.com-20140102110259-eyxw0qff1w4dwdzu
2014-01-02 12:02:59 +01:00
Christophe Simonis
Denis Ledoux
Anthony Muschang
Olivier Dony
rmu-odoo
Martin Trigaux
Laetitia Gangloff
Christophe Simonis
Yannick Vaucher
Launchpad Translations on behalf of openerp
Denis Ledoux
Gery Debongnie