Commit Graph

1248 Commits

Author SHA1 Message Date
Christophe Simonis 0521d1aab3 [MERGE] forward port of branch saas-2 up to revid 9017 chs@openerp.com-20131127110552-3u2nxwu01gxj9i7m
bzr revid: chs@openerp.com-20131127111208-iclt7a9ib7oucumh
2013-11-27 12:12:08 +01:00
Christophe Simonis 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
Launchpad Translations on behalf of openerp 354afeb8b5 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20131127043735-yp016yh8n07kzusm
2013-11-27 04:37:35 +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 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
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
Christophe Simonis bb1e256f5b [MERGE] forward port of branch saas-2 up to revid 9010 dle@openerp.com-20131125143003-vjtzj1c5051pdnk3
bzr revid: chs@openerp.com-20131125150054-b135qshkx6icakgk
2013-11-25 16:00:54 +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
Denis Ledoux db84e912bd [MERGE] Forward-port of latest saas-1 bugfixes, up to rev. 8781 rev-id: dle@openerp.com-20130923165651-0jt823r5wy37enw6
bzr revid: dle@openerp.com-20130923171310-mav1riq3d2rebmv2
2013-09-23 19:13:10 +02:00
Denis Ledoux 546a191f0a [MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9459 rev-id: fva@openerp.com-20130918153347-fy4nuvbm82ngfb8x
bzr revid: mat@openerp.com-20130826135110-f9q4p65ds2aholcw
bzr revid: dle@openerp.com-20130828141129-ecxl2vlpb8vw0o9f
bzr revid: dle@openerp.com-20130828162659-n8a0ku9o3h01qaov
bzr revid: dle@openerp.com-20130830094205-q3itwd7x0246d9n6
bzr revid: dle@openerp.com-20130830133604-mfnfbscn5wdk4vi4
bzr revid: dle@openerp.com-20130902131244-v9uh0s8rg4889i7j
bzr revid: mat@openerp.com-20130903134105-68ziuaccreu6rs61
bzr revid: chs@openerp.com-20130906171851-jtfsf4au1k30wwlr
bzr revid: dle@openerp.com-20130909103120-k5oefxgebhyslac3
bzr revid: dle@openerp.com-20130909170047-pbzw4ernvcpivbhh
bzr revid: chs@openerp.com-20130910122113-171osvcukxffxcry
bzr revid: tde@openerp.com-20130912121059-k840pi4rwdzpez8g
bzr revid: dle@openerp.com-20130913085251-p906ci2divy82jur
bzr revid: tde@openerp.com-20130913092546-kzshg1a7sls566l8
bzr revid: mat@openerp.com-20130917122102-drf8fj9lrjj0fvju
bzr revid: mat@openerp.com-20130917161614-w8u2c1ayeb5kxm30
bzr revid: dle@openerp.com-20130918161305-7ep1642nxzyy3vhd
2013-09-18 18:13:05 +02:00
Darshan Kalola (OpenERP) d1a23edd2e [IMP]align multi-line string
bzr revid: dka@tinyerp.com-20130917130814-wikgcy25594gk8dx
2013-09-17 18:38:14 +05:30
Darshan Kalola (OpenERP) 21876a5810 [MERGE]merged with main addons
bzr revid: dka@tinyerp.com-20130917123814-wqx07inh0ckcqdgw
2013-09-17 18:08:14 +05:30
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
Launchpad Translations on behalf of openerp 9dba69ba48 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130912064018-3vecn03jcu9fm1m8
2013-09-12 06:40:18 +00:00
Thibault Delavallée 1a6eb52a32 [MERGE] [IMP] hr_payroll: improved demo data and yml tests demo data
bzr revid: tde@openerp.com-20130904141110-svlfpvl3ddu12al7
2013-09-04 16:11:10 +02:00
Launchpad Translations on behalf of openerp cb8f9c5a0d Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130903054857-i15nhvtthlho7chm
2013-09-03 05:48:57 +00:00
Darshan Kalola 9d29902fa5 [MERGE]merged with main addons
bzr revid: darshankalola@gmail.com-20130829063416-3zo337keanlemwe2
2013-08-29 12:04:16 +05:30
Olivier Dony c02afb45fa [MERGE] Forward-port of bugfixes from saas-1 series up to rev.8759 rev-id: odo@openerp.com-20130820152607-0p0fx87v1rqhk3vy
bzr revid: odo@openerp.com-20130820165258-3mjzbo990xg44dfu
2013-08-20 18:52:58 +02:00
Olivier Dony 788eb29237 [MERGE] Forward-port of 7.0 bugfixes up to rev.9369 rev-id: launchpad_translations_on_behalf_of_openerp-20130820051502-deoiql3lru7goosd
bzr revid: odo@openerp.com-20130820152607-0p0fx87v1rqhk3vy
2013-08-20 17:26:07 +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
Darshan Kalola 3cf3519e82 [IMP]improve help of setting/configuration menus
bzr revid: darshankalola@gmail.com-20130724134548-jmgot5zt3xpcx1ct
2013-07-24 19:15:48 +05:30
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
Antony Lesuisse fc70550ca2 [IMP] move html module description and icon
bzr revid: al@openerp.com-20130628100441-swpanf2jwcojygh4
2013-06-28 12:04:41 +02:00
Launchpad Translations on behalf of openerp 122cfc0afd Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130618054659-e58yl66n5zonbly3
2013-06-18 05:46:59 +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
Christophe Simonis aa133b4d29 [MERGE] forward port of branch saas-1 up to revid 8745 chs@openerp.com-20130613181503-82234mo34wxb0oap
bzr revid: chs@openerp.com-20130614091924-z5ta02kwhmwcrgox
2013-06-14 11:19:24 +02:00
Christophe Simonis 6a9adbca62 [MERGE] forward port of branch 7.0 up to revid 9236 mat@openerp.com-20130613160953-itt79mu5xrl7suv4
bzr revid: chs@openerp.com-20130613181503-82234mo34wxb0oap
2013-06-13 20:15:03 +02: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
Launchpad Translations on behalf of openerp 3a296f5386 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130608070127-tu3wr0ejaojeuizk
bzr revid: launchpad_translations_on_behalf_of_openerp-20130609061554-vunz3dsqv73j8io4
bzr revid: launchpad_translations_on_behalf_of_openerp-20130608074839-suk66wcjidodrzyu
bzr revid: launchpad_translations_on_behalf_of_openerp-20130609061704-e1t9mv2alygf4g38
bzr revid: launchpad_translations_on_behalf_of_openerp-20130608075116-643xgspj93t8g1y9
bzr revid: launchpad_translations_on_behalf_of_openerp-20130609061708-y08i6exqm5v36qg7
2013-06-09 06:17:08 +00:00
Olivier Dony 8c33eb76e1 [I18N] Synchronize translation templates with latest source code
bzr revid: odo@openerp.com-20130607194309-eysyrkxpr0dukm07
2013-06-07 21:43:09 +02:00
Launchpad Translations on behalf of openerp bbb628be2a Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130606062901-5gh1mnjepy36whkh
2013-06-06 06:29:01 +00:00
Martin Trigaux ccb38117ee [MERGE] Forward porting of saas-1 until rev 8739
bzr revid: mat@openerp.com-20130605090453-e4mg37kms5j1r18n
2013-06-05 11:04:53 +02:00
Vo Minh Thu 38d9325f66 [MERGE] views: removed unnecessary `model` attribute used with `ref`.
bzr revid: vmt@openerp.com-20130603144446-ara6oli0her5rdm3
2013-06-03 16:44:46 +02:00
Launchpad Translations on behalf of openerp ddc7e6c994 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130531070107-7d2k818beg8965ll
2013-05-31 07:01:07 +00:00
Thibault Delavallée 71df1a41bc [FORWARD] Forward port of addons 7.0 until revision 9172
bzr revid: tde@openerp.com-20130528104500-ds3irrs2u0qpst37
2013-05-28 12:45:00 +02:00
Martin Trigaux fcff0fcbea [IMP] don't format 0 values
bzr revid: mat@openerp.com-20130524085534-coh7tjadajiu4bv3
2013-05-24 10:55:34 +02:00
Vidhin Mehta 41fd5d657d [IMP]Change Variable name.
bzr revid: vme@tinyerp.com-20130523124117-g6hnj394fndmookq
2013-05-23 18:11:17 +05:30
Vidhin Mehta 841accd179 [IMP]Introduce float_time concept in Timesheet Widget.
bzr revid: vme@tinyerp.com-20130523120517-y281pkgqj66atthr
2013-05-23 17:35:17 +05:30
Mohammed Shekha a74fa6ed73 [FIX]Fixed the issue of timezone on total attendance on My current timesheet view.
bzr revid: msh@openerp.com-20130522125350-b6yj2mpqosfwajkc
2013-05-22 18:23:50 +05:30
Thibault Delavallée a05b0bebbe [FORWARD] Forward port of 7.0 branch until revision 9143.
bzr revid: tde@openerp.com-20130521122359-b5vii7gv8arluz06
2013-05-21 14:23:59 +02:00
Launchpad Translations on behalf of openerp 727de3660d Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130519061258-u0iw6lfwponrmlrp
bzr revid: launchpad_translations_on_behalf_of_openerp-20130520063201-x6ngc83h4rru51rx
bzr revid: launchpad_translations_on_behalf_of_openerp-20130521054415-2s1mdz92ybpgx12d
2013-05-21 05:44:15 +00:00
Quentin (OpenERP) 7351a7312d [FIX] hr_timesheet: improved perfomances on the read of timesheet sheets
bzr revid: qdp-launchpad@openerp.com-20130508085938-a2uyalx1cy2musj0
2013-05-08 10:59:38 +02:00