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
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
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
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
57ef91409a
[MERGE] bootstrap3
...
bzr revid: al@openerp.com-20131202132445-oux9j63auh4om284
2013-12-02 14:24:45 +01:00
6b05beecc1
[MERGE] forward port of branch 7.0 up to revid 9651 chs@openerp.com-20131127104459-jb77x7quwcvtifm7
...
bzr revid: dle@openerp.com-20131126171210-jovr7e7efehuq3s2
bzr revid: chs@openerp.com-20131127110046-4ow36dkuuyzgf1pl
2013-11-27 12:00:46 +01:00
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
7baee28221
[MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9642 rev-id: dle@openerp.com-20131125160315-tj8n5bv6e5yv8jku
...
bzr revid: dle@openerp.com-20131125143003-vjtzj1c5051pdnk3
bzr revid: dle@openerp.com-20131125160523-hecq5u2uo0mfyoq0
2013-11-25 17:05:23 +01:00
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
88a79fdaf3
[IMP]improved css for survey kanban, file attach button and my current timesheet in hr.
...
bzr revid: ima@tinyerp.com-20131115101317-3jb422klc3jgdwps
2013-11-15 15:43:17 +05:30
fc70550ca2
[IMP] move html module description and icon
...
bzr revid: al@openerp.com-20130628100441-swpanf2jwcojygh4
2013-06-28 12:04:41 +02:00
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
fcff0fcbea
[IMP] don't format 0 values
...
bzr revid: mat@openerp.com-20130524085534-coh7tjadajiu4bv3
2013-05-24 10:55:34 +02:00
41fd5d657d
[IMP]Change Variable name.
...
bzr revid: vme@tinyerp.com-20130523124117-g6hnj394fndmookq
2013-05-23 18:11:17 +05:30
841accd179
[IMP]Introduce float_time concept in Timesheet Widget.
...
bzr revid: vme@tinyerp.com-20130523120517-y281pkgqj66atthr
2013-05-23 17:35:17 +05:30
aa9e1d83ae
[FIX] hr_timesheet_sheet: analytic items created from timesheet line have amount as blank
...
bzr revid: rha@tinyerp.com-20130320115238-ae1w2p6ae0mytmy8
2013-03-20 17:22:38 +05:30
ad46970208
[FIX] hr_timesheet_sheet: revert stupid fix in 8095.1.1 that created very obvious bug.
...
bzr revid: nicolas.vanhoren@openerp.com-20121217111337-uisq0ym13vhzye8b
2012-12-17 12:13:37 +01:00
10afab6eb6
[MERGE] addons 24
...
bzr revid: fp@openerp.com-20121127212322-soubdlrcgqx4cz88
2012-11-27 22:23:22 +01:00
44450f62e2
[IMP] wording, no default filter for archives
...
bzr revid: fp@tinyerp.com-20121126212903-jbd4kdqc4kcrgbhg
2012-11-26 22:29:03 +01:00
b71f96fb7f
[FIX] stop multiple rpc call of default_get on loading
...
bzr revid: rgaopenerp-20121122130656-up43bbo5jfzd00t4
2012-11-22 18:36:56 +05:30
edaa35737b
[FIX] hr_timesheet_sheet: typo in javascript code
...
bzr revid: nicolas.vanhoren@openerp.com-20121108164053-pcs8qq98ged4hyj7
2012-11-08 17:40:53 +01:00
a2715888c1
[IMP] jQuery deferred API changes refactoring. Changed 'then's in 'done'/'fail' and 'pipe's in 'then'
...
bzr revid: fme@openerp.com-20121031103148-r1slfpl2kcnajjd3
2012-10-31 11:31:48 +01:00
458f6de184
[IMP] typo
...
bzr revid: fp@tinyerp.com-20121026101241-d7j0vaujc73go3bf
2012-10-26 12:12:41 +02:00
030ff3fd73
[IMP] timesheets imrpvoements
...
bzr revid: fp@tinyerp.com-20121026100207-yxbl87kx35to6blo
2012-10-26 12:02:07 +02:00
dbc1176d18
[IMP] hr_timesheet_sheet: in web part, made the analytic account clickable
...
bzr revid: nicolas.vanhoren@openerp.com-20121026095511-d811qw4t6fognkep
2012-10-26 11:55:11 +02:00
052dedaf2c
[IMP] restyled timesheets
...
bzr revid: fp@tinyerp.com-20121026093704-b5q54rwtrkx73igg
2012-10-26 11:37:04 +02:00
dd3e728fb6
[MERGE] + improve hr_timesheet
...
bzr revid: fp@tinyerp.com-20121026075715-kq910tdzhc1uul3l
2012-10-26 09:57:15 +02:00
11c0784d71
[IMP] hr_timesheet_sheet form view
...
bzr revid: fp@tinyerp.com-20121024113728-r3nx6p8c8q0mh64q
2012-10-24 13:37:28 +02:00
6828d97bd5
Added class for today
...
bzr revid: nicolas.vanhoren@openerp.com-20121008163353-1b9kgzg6mg1rjm2r
2012-10-08 18:33:53 +02:00
a8772445c7
fixed bug
...
bzr revid: nicolas.vanhoren@openerp.com-20121008162224-inmlqdcj4jd96g67
2012-10-08 18:22:24 +02:00
46b112f129
Not possible to add an already existing account
...
bzr revid: nicolas.vanhoren@openerp.com-20121008124429-j65gc8s6jb4a8u8f
2012-10-08 14:44:29 +02:00
ea356b175b
Added possibility to add an account
...
bzr revid: nicolas.vanhoren@openerp.com-20121008124248-9fy5q3hk30tgqbjn
2012-10-08 14:42:48 +02:00
3cd2ffe006
[IMP] added lot of stuff
...
bzr revid: nicolas.vanhoren@openerp.com-20121005135352-t43v2rc153ch2gvh
2012-10-05 15:53:52 +02:00
a21489c8c8
Added on_change
...
bzr revid: nicolas.vanhoren@openerp.com-20121004134858-bsjtmlpbr4v9zv4d
2012-10-04 15:48:58 +02:00
add8348f4b
optimized a little total calculus
...
bzr revid: nicolas.vanhoren@openerp.com-20121002150250-6rx77po7v40f6nqn
2012-10-02 17:02:50 +02:00
e644adeca1
wip
...
bzr revid: nicolas.vanhoren@openerp.com-20121002144708-p88zs6a3hjkq0w8h
2012-10-02 16:47:08 +02:00
c64ec6591c
wip
...
bzr revid: nicolas.vanhoren@openerp.com-20121002144105-13tzymf7fj00bml6
2012-10-02 16:41:05 +02:00
43322be885
Added total stuff
...
bzr revid: nicolas.vanhoren@openerp.com-20121002143848-1bgyz62vxn01dsvi
2012-10-02 16:38:48 +02:00
ab97cd9907
minor
...
bzr revid: nicolas.vanhoren@openerp.com-20121002132714-p7hxzd8meo26mwfj
2012-10-02 15:27:14 +02:00
2d8535e473
Added some styling
...
bzr revid: nicolas.vanhoren@openerp.com-20121002132547-p7fi2ra8a0tgxpbn
2012-10-02 15:25:47 +02:00
5b910c668a
added readonly mode
...
bzr revid: nicolas.vanhoren@openerp.com-20121002125055-j01ea26yf9t3uwjg
2012-10-02 14:50:55 +02:00
6d4320a5a6
Fixed NaN problem
...
bzr revid: nicolas.vanhoren@openerp.com-20121002122140-ode98iv2ul3ynks7
2012-10-02 14:21:40 +02:00
6679892393
fixed line duplication bug
...
bzr revid: nicolas.vanhoren@openerp.com-20121002121103-wyvshcyky324nc6r
2012-10-02 14:11:03 +02:00
Denis Ledoux
Anthony Muschang
Christophe Simonis
Martin Trigaux
Christophe Simonis
Denis Ledoux
Antony Lesuisse
ima-openerp
Vidhin Mehta
Rifakat
niv-openerp
Fabien Pinckaers
Fabien Pinckaers
RGA(OpenERP)
Fabien Meghazi