53aa92d3c9
[I18N] Update translations from Launchpad branches
2014-09-18 11:47:16 +02:00
7cad4baa84
[FIX] [CLEAN] Various: fixed / cleaned use of dict.fromkeys.
...
Indeed using fromkeys with a list / dict as argument leads to the creation
of shared list / dict. This could create some ugly side effects when
used in loops. This commit fixes or cleans this kind of statement to avoid
unwanted side effects.
2014-09-18 11:18:30 +02:00
fac96241df
[I18N] Update 8.0 translations with latest changes from Launchpad
2014-09-08 19:04:25 +02:00
1d2fe3330c
[MERGE] forward port of branch saas-5 up to 24c25f5
2014-08-29 11:36:35 +02:00
010dd70894
[MERGE] forward port of branch saas-3 up to c914893
2014-08-28 19:25:08 +02:00
b67eb530b0
[FIX] hr_holidays: remove now invalid xml attribute "model" (introduced by last forward-port)
2014-08-28 17:17:10 +02:00
8046b7367d
[MERGE] forward port of branch saas-5 up to 7e117b1
2014-08-28 16:51:11 +02:00
7e117b18a0
[MERGE] forward port of branch saas-3 up to ada9724
2014-08-28 16:21:27 +02:00
ada9724655
[MERGE] forward port of branch 7.0 up to 3509e15
2014-08-28 16:12:55 +02:00
8aca457e34
[IMP] Updated website urls on modules and info page
2014-08-26 21:40:18 +02:00
f57787e07e
[IMP] Cleaning of reporting (group_by, filters), adding new favourites and default views, some renaming (py and xml files)
2014-08-26 11:56:49 +02:00
9b3f3fecfe
[FIX] hr_holidays: employees cannot approve their holidays
...
Nor modify once approved
It wasn't possible for employees to approve their holidays themself, thanks to the GUI, but this was possible through xmlrpc calls, or when altering the html directly in the browser.
Besides, this was also possible to edit the holiday through the same trick once the holiday validated
2014-08-25 14:51:03 +02:00
5a5f811d23
[REVERT] commit 5e5c73e
...
Branch 8.0 is a **stable** branch. This mean no database schema
changes.
2014-08-22 13:59:22 +02:00
5e5c73e7ba
[IMP] Cleaning of reporting (group_by, filters), adding new favourites and default views, some renaming (py and xml files)
2014-08-22 09:49:09 +02:00
50ef63881a
[I18N] Update 8.0 translation with latest source code
2014-08-14 17:01:54 +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
fd4fd35e32
[MERGE] forward port of branch saas-5 up to e4cb520
2014-07-30 20:52:14 +02:00
e4cb5202a0
[MERGE] forward port of branch saas-4 up to fa07bc8
2014-07-30 20:30:14 +02:00
88c022dfc8
[MERGE] forward port of branch 7.0 up to bbb8d8f25a
2014-07-29 11:42:10 +02:00
6b1a804b29
[MERGE] forward port of branch 7.0 up to b91a75f7ef
...
Conflicts:
addons/base_vat/base_vat.py
openerp/tools/safe_eval.py
2014-07-29 10:42:50 +02:00
ced5852144
[FIX] hr_holidays: do not allow reduce remaining leaves
...
In the Employee form, a remaining legal leaves field is available, which shows remaining validated leaves from allocation requests
As this is not allowed to delete a validated allocation requets, it shouldn't be possible to reduce the validated remaining leaves of an employee.
To reduce the remaining leaves of an employee, the user should cancel and remove the allocation request
2014-07-25 14:45:48 +02:00
6f1b820d33
[REF] OpenERP --> Odoo in various UI texts (2)
...
Some things missed by commit 8b67a7202d
2014-07-18 14:59:38 +02:00
8b67a7202d
[REF] OpenERP --> Odoo in various UI texts
...
Rebranding has been done in:
- data/demo files
- html templates
- help notices
- comments
- logger messages
- and other various messages
(Commit taken from odoo-dev:8.0-improve-openerp-odoo-rlu at rev 7deaa08)
Closes #1260
2014-07-18 13:45:41 +02:00
f654a7719b
[MERGE] forward port of branch saas-5 up to 73d39a0
2014-07-10 22:49:53 +02:00
73d39a0c8c
[MERGE] forward port of branch saas-4 up to a361947
2014-07-10 22:12:16 +02:00
a361947143
[MERGE] forward port of branch saas-3 up to a35aec2
2014-07-10 22:02:58 +02:00
a35aec2a0b
[MERGE] forward port of branch 7.0 up to 6e96ffd
2014-07-10 22:02:01 +02:00
6b274e4451
Merge pull request #946 from joshuajan/7.0_hr_holidays_report_fix
...
skip the inactivate employee in leaves summary
2014-07-07 20:48:19 +02:00
6c776d5406
Update holidays_summary_report.py
2014-07-07 18:17:20 +08:00
9da1214de3
Update holidays_summary_report.py
...
Add context to search method
2014-07-07 17:30:25 +08:00
cbe2dbb672
[MERGE] new v8 api by rco
...
A squashed merge is required as the conversion of the apiculture branch from
bzr to git was not correctly done. The git history contains irrelevant blobs
and commits. This branch brings a lot of changes and fixes, too many to list
exhaustively.
- New orm api, objects are now used instead of ids
- Environements to encapsulates cr uid context while maintaining backward compatibility
- Field compute attribute is a new object oriented way to define function fields
- Shared browse record cache
- New onchange protocol
- Optional copy flag on fields
- Documentation update
- Dead code cleanup
- Lots of fixes
2014-07-06 17:05:41 +02:00
6c623b59b5
skip the inactivate employee in leaves summary
2014-07-06 17:41:07 +08:00
34bfa1b44f
[MERGE] Forward-port saas-5 up to d9cda97
2014-07-05 01:45:45 +02:00
d9cda97cf4
[MERGE] Forward-port saas-4 up to 5ceded9
2014-07-05 01:28:19 +02:00
5ceded9d69
[MERGE] Forward-port saas-3 up to 4fa30f5
2014-07-05 01:04:19 +02:00
f3880a8a09
[MERGE] Forward-port of 7.0 up to 64ac1b0
2014-07-04 17:07:53 +02:00
1279ca0334
[FIX] hr_holidays: proper parameter passing syntax for raw SQL
...
This instance was not actually exploitable for
SQL injection as it is not callable directly
via RPC and guarded by other queries when indirectly
called. Still plain awful.
2014-07-04 16:45:41 +02:00
026e38b48f
[REM] Unnecessary `size` parameters on char fields
2014-06-25 17:13:43 +02:00
eef6330c55
[MERGE] forward port of branch saas-5 up to adf07a9
2014-06-19 16:23:32 +02:00
adf07a9490
[MERGE] forward port of branch saas-4 up to 5087612
2014-06-19 16:13:35 +02:00
5087612d1d
[MERGE] forward port of branch saas-3 up to bf53aed
2014-06-19 15:44:07 +02:00
3c0292645f
[MERGE] Forward-port of 7.0 bugfixes up to 63ea0df73f
2014-06-16 17:37:10 +02:00
2f43cf041d
[FIX] hr_holidays: date_from, date_to required in form view only for leave requests, not for allocation requests
2014-06-13 09:25:48 +02:00
4e0559ef97
[FIX] hr_holidays: display float for leaves remaining / leaves taken in holiday type name get
2014-06-13 08:52:25 +02:00
74168c4e9d
Merge pull request #272 from odoo-dev/master-inline-searchview-ged
...
[MERGP] Inline Searchview
This task split the searchview in two parts: SearchView and SearchViewDrawer. The drawer is displayed inside the main view and the searchview stays in place. It also changes the scrolling behavior of the web client: the main view area can scroll without affecting the UI (so the various menus stays in place)
Because of this, other large changes have been made:
the drawer has been redesigned,
the Custom Filter widget has been split in two (Custom Report and SaveCurrentFilter),
the main view is now scrollable, so the UI stays in place and only the view can change
The text 'Group By...' has been changed into 'Group By' (most addons had to be modified)
bootstrap classes are used when it makes sense (for example, badge)
the left menu is also scrollable (separately from the main view)
It is likely that some stupid bugs have been introduced. Please don't hurt me.
2014-06-12 16:27:11 +02:00
faa09da325
Removed version="7.0" from form views
2014-06-12 09:09:59 +02:00
62900fe01b
Merge remote-tracking branch 'odoo/master' into master-inline-searchview-ged
...
Conflicts:
addons/crm/crm_case_section_view.xml
2014-05-26 10:06:31 +02:00
555677f14d
[IMP] replace all 'Group By...' by 'Group By'
...
in all searchview, the 'Group By...' looks weird, next to the Custom
Reports and Filters. This change was requested by the upper management
2014-05-22 11:44:35 +02:00
a756b82372
[MERGE] forward port of branch saas-4 up to revid bb26dea
2014-05-20 20:19:55 +02:00
583fe74ba2
Forward-port of latest saas-3, up to revision 9455 (rev-id mat@openerp.com-20140514080416-m4t23y0rxx2ot7y6)
2014-05-14 10:37:54 +02:00
8ea4f581ed
Forward-port of latest 7.0, up to rev. 10046 (rev-id: launchpad_translations_on_behalf_of_openerp-20140514062049-vjclnuxlkbto0tsj)
2014-05-14 10:04:16 +02:00
c636fb9dd9
[FIX] hr_holidays: better display of leave counter (opw 605016)
...
The number of leave requests left is based on the employee_id key in the context, when displaying the status of an hr.holidays we don't have the information in the name_get of the hr.holidays.status.
The fallback on the number of employees is done with the uid but we can not rely on it as well as the name_get on m2o field is done with superuser_id.
bzr revid: mat@openerp.com-20140508124946-ttyr84iajg9q6l0y
2014-05-08 14:49:46 +02:00
cc041c516a
[FIX] code cleanup (addon hr_holidays)
...
improves th _leaves_count method, and remove an useless one2many field
(leaves_ids)
bzr revid: ged@openerp.com-20140507083556-rqm5sllj8fc3qfev
2014-05-07 10:35:56 +02:00
868f54780e
[MERGE] Merge with trunk-cal-V8-jke. - Change field datetime into date or datetime according to that event type is in all day or not...
...
bzr revid: jke@openerp.com-20140505162422-k332rm7j21af5ore
2014-05-05 18:24:22 +02:00
6d00292064
[REF] Replace temp name by real name
...
bzr revid: jke@openerp.com-20140505154246-8vahdzf60oiksm62
2014-05-05 17:42:46 +02:00
5aa2fa150c
[MERGE] merge from trunk
...
bzr revid: ged@openerp.com-20140502130753-4z24z1to9pkrckvq
2014-05-02 15:07:53 +02:00
ed6bc9f198
[MERGE] Merge with trunk
...
bzr revid: jke@openerp.com-20140502123149-4g7d7xh07i5z9dct
2014-05-02 14:31:49 +02:00
d9c3c175bd
[REF] Calendar refactoring - Manage allday in date field and not datetime.
...
bzr revid: jke@openerp.com-20140430093613-3tdn2tfiwshcahbz
2014-04-30 11:36:13 +02:00
b7003a382a
[MERGE] upstream
...
bzr revid: fme@openerp.com-20140429154104-csm3jq6uxy9tk1ea
2014-04-29 17:41:04 +02:00
d0e9ba289f
[MERGE] from trunk
...
bzr revid: rim@openerp.com-20140429124452-5cvpmtpyz2daj8w2
2014-04-29 14:44:52 +02:00
65f2db5c21
[MERGE] from trunk
...
bzr revid: rim@openerp.com-20140429081937-hhqcg84o7iha78fq
2014-04-29 10:19:37 +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
98302fca76
[REM] Removed globs from manifest in order to automate bundlification
...
bzr revid: fme@openerp.com-20140424122621-1smlpr1r7izuw369
2014-04-24 14:26:21 +02:00
fa60b90c1f
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140422075247-nxfftok20ltlnea6
2014-04-22 07:52:47 +00:00
cccc7a3d0c
[MERGE]sync with trunk.
...
bzr revid: dka@tinyerp.com-20140417132329-sd2skyprb3nt88uw
2014-04-17 18:53:29 +05:30
f57b767361
[MERGE] merge from trunk
...
bzr revid: ged@openerp.com-20140415150146-5ovdjzta58t5dhd2
2014-04-15 17:01:46 +02:00
8135812d34
[FIX] moves the field definitions of models hr.job and hr.employee that should have been in submodules to their correct place (in hr_something) to avoid dependencies problems (addons hr, hr_*)
...
bzr revid: ged@openerp.com-20140415105419-wy026n5k10wo80wb
2014-04-15 12:54:19 +02:00
c399e1daaf
[MERGE] merge with latest trunk and resolve conflicts
...
bzr revid: rma@tinyerp.com-20140414110149-r3l00xr8l08ex7oc
2014-04-14 16:31:49 +05:30
e82fbf7d91
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140412083153-3ona1js7o6z421vg
2014-04-12 08:31:53 +00:00
2e9ee9c76e
[MERGE] merge from rma branch
...
bzr revid: ged@openerp.com-20140410145131-fj17mdpi13wa5a9m
2014-04-10 16:51:31 +02:00
0811d29337
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140409070627-o5ns6nniq2dc1lme
2014-04-09 07:06:27 +00:00
9dbaa58694
[MERGE] merge with latest trunk
...
bzr revid: rma@tinyerp.com-20140407102440-ngtr58o2w2ypqrol
2014-04-07 15:54:40 +05:30
1d965535b0
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140405053045-3cts3jqyeqsu0x57
2014-04-05 05:30:45 +00:00
8f174e13bd
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140404070722-99m3lomg172fzapc
bzr revid: launchpad_translations_on_behalf_of_openerp-20140404070759-302tyo6k09v8arhz
2014-04-04 07:07:59 +00:00
16ce262c33
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140329073038-m7q4sxpb8tprh00r
bzr revid: launchpad_translations_on_behalf_of_openerp-20140330061549-r3t0pecngy76c2rw
bzr revid: launchpad_translations_on_behalf_of_openerp-20140331064021-x3wjc8s4oa0ncq95
bzr revid: launchpad_translations_on_behalf_of_openerp-20140401065325-w3viflz7c33n4uis
bzr revid: launchpad_translations_on_behalf_of_openerp-20140402064459-d7e3d8nwo8famjh6
2014-04-02 06:44:59 +00:00
51aa261b44
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140327073504-l0fydwct329jhirh
2014-03-27 07:35:04 +00:00
3897de56b7
[IMP]: Convert buttons into stat buttons in hr modules
...
bzr revid: ypa@tinyerp.com-20140326120056-qqauj7pmhf0uxhuj
2014-03-26 17:30:56 +05:30
d504764eff
[MERGE] forward port of branch saas-3 up to revid 9298 chm@openerp.com-20140311130852-3ft0v1mc9ht1any6
...
bzr revid: chs@openerp.com-20140311145205-s56fj113fsrnisc3
2014-03-11 15:52:05 +01: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
9863dbe5c8
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140304075238-yra39uwmwahmrnf3
2014-03-04 07:52:38 +00:00
dd4813e360
[mrg]:lp:openobject-addons
...
bzr revid: sunilsharma.sharma07@gmail.com-20140304063937-vyrt063gzfhsoy4k
2014-03-04 12:09:37 +05:30
f87524a257
[FIX] Set event from hr_holiday with a class confidential by default.
...
bzr revid: jke@openerp.com-20140225213121-hyz46xpsiqtao18o
2014-02-25 22:31:21 +01: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
6185dbf5a2
[FIX]hr_hodlidays: date_from and date_to are required only if leave request, not if leave alloc
...
bzr revid: dle@openerp.com-20140211154827-d1529gkf30e57wz5
2014-02-11 16:48:27 +01:00
b3c6e20e36
[MERGE]sync with trunk and resolve conflicts.
...
bzr revid: dka@tinyerp.com-20140210084803-rjkt9e4rhni8nhlt
2014-02-10 14:18:03 +05:30
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
74ce50fe6e
[FIX] hr.holidays test: adapt assertRaises due to constraint validation change in server
...
See revision odo@openerp.com-20140130094337-7g8ez92viwmbzbft in server
bzr revid: odo@openerp.com-20140130182351-m8mwjz4pbglm8af7
2014-01-30 19:23:51 +01:00
a267d86b29
[rem,imp]:hr:remove hr dashboard and improve hr view
...
bzr revid: sunilsharma.sharma07@gmail.com-20140130064923-35tvo8q3sy4n09vx
2014-01-30 12:19:23 +05:30
033c38c304
[MERGE] trunk
...
bzr revid: al@openerp.com-20140129021916-ckb3rplmcpjbqel3
2014-01-29 03:19:16 +01:00
39c27c72d0
[MERGE] Sync with trunk rev. 9064 rev-id ged@openerp.com-20140127161718-uo6pperke86pqq5v
...
bzr revid: odo@openerp.com-20140128175835-jannyh3cv3gi1sxn
2014-01-28 18:58:35 +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
5585a38ecc
[MERGE] from trunk, need point_of_sale updates
...
bzr revid: fva@openerp.com-20140127160946-yeswyv4o7t2tfbqt
2014-01-27 17:09:46 +01:00
9cd84a5834
[IMP] replace the Leaves analysis views in reporting by the new pivot graph view (addon hr_holidays)
...
bzr revid: ged@openerp.com-20140127103408-8a1fi88gdhl2sud5
2014-01-27 11:34:08 +01:00
805d3757e9
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140123055732-ggft6ftma1kfpaq6
2014-01-23 05:57:32 +00:00
d5bc07f898
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140122061335-z6h1dn3yd94l8850
2014-01-22 06:13:35 +00:00
2bdf3039d0
[MERGE] merge trunk into local branch
...
bzr revid: ged@openerp.com-20140121142943-tuqsdpf6wax7fuqv
2014-01-21 15:29:43 +01:00
698e2de138
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140121062040-gq8r12g3ypksxa4t
2014-01-21 06:20:40 +00:00
28d79433c3
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140118070457-rn2tgdxis2fi3nqo
bzr revid: launchpad_translations_on_behalf_of_openerp-20140119055822-ajy043mntc4jr407
bzr revid: launchpad_translations_on_behalf_of_openerp-20140120055854-z7wtyb24c5t8kcmj
bzr revid: launchpad_translations_on_behalf_of_openerp-20140118070538-2xm86ece1aate8u9
bzr revid: launchpad_translations_on_behalf_of_openerp-20140119055932-sa6vrp2g8ua3u88e
bzr revid: launchpad_translations_on_behalf_of_openerp-20140120055948-lwcyqcfutgamwac1
bzr revid: launchpad_translations_on_behalf_of_openerp-20140118070546-d89xqw56zou7e9p9
bzr revid: launchpad_translations_on_behalf_of_openerp-20140120055955-6wrdxqy1018mo7jq
2014-01-20 05:59:55 +00:00
58907da3ee
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140116051828-hd2t5q9ysbk5wm3p
bzr revid: launchpad_translations_on_behalf_of_openerp-20140119052609-764otsas6xg8r8a2
2014-01-19 05:26:09 +00:00
00c6d55ac9
[MERGE] merge trunk into local branch
...
bzr revid: ged@openerp.com-20140116144326-8kwqab71zp8s7a8e
2014-01-16 15:43:26 +01:00
9cf78e93cc
[MERGE] Sync with trunk, tries to solve conflicts. There are still some new images to convert into images in xml files.
...
bzr revid: tde@openerp.com-20140116103910-qmm2y6kucmngplnk
2014-01-16 11:39:10 +01:00
46b0c7aa00
[REF] Rename model crm.meeting into calendar.event
...
Remove 2 unsused field from calendar.event model (dir,sequence)
bzr revid: jke@openerp.com-20140115093805-1g1j1oymyxsb6kgh
2014-01-15 10:38:05 +01:00
0072915549
[MERGE] Merge with trunk
...
bzr revid: jke@openerp.com-20140114135240-c7r0ma18f1ls2yae
2014-01-14 14:52:40 +01:00
0aadcf42c9
[FIX] hr_holidays: Reverse previous patch with the warning
...
bzr revid: stw@openerp.com-20140114114559-ri5ts0vgv2vmyfth
2014-01-14 12:45:59 +01:00
facb8547db
[MERGE] Merge with trunk
...
bzr revid: jke@openerp.com-20140113193830-igvzvf8gsic5okm8
2014-01-13 20:38:30 +01:00
5626a5a391
[REF] Removing the quick create overriding for hr_holiday - that was a test/sample not used
...
bzr revid: jke@openerp.com-20140113174701-nmvtarylf19d63nx
2014-01-13 18:47:01 +01:00
e091efecb8
[FIX] hr_holidays: Use osv.except_osv instead exceptions.Warning, because
...
Warning does not inherit from osv.except_osv and this exception is not catched
by the system.
bzr revid: stw@openerp.com-20140113162727-5au3iimfz4d1mszw
2014-01-13 17:27:27 +01:00
c2794d0e85
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140111062610-ld24q55cbxo6di5q
bzr revid: launchpad_translations_on_behalf_of_openerp-20140112054746-j34qg10ipyb6kj8g
bzr revid: launchpad_translations_on_behalf_of_openerp-20140113055853-5oqpffj3szw1yrpl
bzr revid: launchpad_translations_on_behalf_of_openerp-20140111062637-m0t50cu2cr5d6yw7
bzr revid: launchpad_translations_on_behalf_of_openerp-20140112054824-hm7ylgrauivbj7h2
bzr revid: launchpad_translations_on_behalf_of_openerp-20140113055913-wo2i3sd1rnblragc
2014-01-13 05:59:13 +00:00
49c0b7a820
[MERGE] Sync with trunk
...
bzr revid: tde@openerp.com-20140106135700-rt0g44w5xmpbtxiu
2014-01-06 14:57:00 +01:00
ecca2f99c3
[Merge] Merge With Trunk
...
bzr revid: jke@openerp.com-20140106082030-e0auqh3l9b2cpuyi
2014-01-06 09:20:30 +01:00
9dfb5de2f8
[MERGE] merge from trunk
...
bzr revid: ged@openerp.com-20131224112327-r1evm1pcw2gpn8dh
bzr revid: ged@openerp.com-20131226132625-33fgmyb0fbu0c9ia
2013-12-26 14:26:25 +01:00
bb5a2662c8
[IMP] changes the xml description of the graphs to use the new graph view (and to make sure the result is as close as possible) (addon hr_holidays)
...
bzr revid: ged@openerp.com-20131224102813-l818l4lp6ml5164i
2013-12-24 11:28:13 +01:00
1aa92dbc46
[FORWARD] Forward port of saas-2 fixes until revision 9058 (revid tde@openerp.com-20131220162158-hbgktly09dv37958)
...
bzr revid: tde@openerp.com-20131220165519-2okhclp3qb3if1ey
2013-12-20 17:55:19 +01:00
1508c5dd00
[MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9718 rev-id: dle@openerp.com-20131224103535-rhtje7dnq1ie7jtb
...
bzr revid: tde@openerp.com-20131220162158-hbgktly09dv37958
bzr revid: dle@openerp.com-20131223155041-8zp8e08fihbr0ie2
bzr revid: dle@openerp.com-20131224112407-aw6dq2q92312kjbk
2013-12-24 12:24:07 +01:00
6bb986a2e5
[FIX] Fix according to APR's Review
...
- Access Right too restrictif for user
- Bug UI between Firefox and Chrome
- Bug UI many2many_tag cursor on bullet
- Temp Fix on email_template to manage partner_to
- Manage attendee from hr_holidays
- Manage avatar_model in sidebar_items for filter (res.partner was hard coded)
- Remove quick add from HR-holiday, because some field (as day) is calculated on event "onchange"
bzr revid: jke@openerp.com-20131220141855-mbhxtr07fn0sroe0
2013-12-20 15:18:55 +01:00
4ca6502d5e
[MERGE] Merge with trunk
...
bzr revid: jke@openerp.com-20131219193521-gs6ty1p0uju8cc21
2013-12-19 20:35:21 +01:00
eeb4e9629f
[TYPO] Replace base_calendar to calendar in csv security
...
bzr revid: jke@openerp.com-20131219160620-kcjrqv0uald99qqe
2013-12-19 17:06:20 +01:00
dd285d23af
[TYPO] Rename base_calendar into calendar
...
bzr revid: jke@openerp.com-20131219144739-9ic700ycef8uklbc
2013-12-19 15:47:39 +01:00
6df572aae4
[FIX] hr_holidays, hr_timesheet: fix XMLSyntaxError when company name contain an ampersand '&' sign
...
bzr revid: xal@openerp.com-20131219135147-jpli369iqlanf3t3
2013-12-19 14:51:47 +01:00
ecb223da04
[FIX] hr: merge of views Leave Request & Allocation request, as they are allmost similar.
...
Moreover, before this fix, when you clicked on an allocation request from a mail.message (for instance, from the messaging inbox page), you were not redirected to the right view: You were redirected to the view of Leave request instead of Allocation request.
bzr revid: dle@openerp.com-20131219130901-nxciudhsacru2tmb
2013-12-19 14:09:01 +01:00
54be818a3b
[MERGE] forward port of latest saas-2 until rev 9051 dle@openerp.com-20131217142126-1lbim47d2m2x4bb0
...
bzr revid: mat@openerp.com-20131218155715-khb909yy99cbmna8
2013-12-18 16:57:15 +01:00
4be9d97332
[MERGE] Merge with trunk
...
bzr revid: jke@openerp.com-20131218130914-w8akdktrpad5pflk
2013-12-18 14:09:14 +01:00
7eda17615b
[IMP] Show button google cal only on crm meeting model
...
bzr revid: jke@openerp.com-20131217121808-miv2zlo2guuxrt1r
2013-12-17 13:18:08 +01:00
08f00af5ab
[TYPO] Continue install module google calendar and descriptions + typo + ...
...
bzr revid: jke@openerp.com-20131216162147-qygweglpl0k6qzux
2013-12-16 17:21:47 +01:00
d9343e2d27
[MERGE] Sync with trunk
...
bzr revid: tde@openerp.com-20131213094016-ylqkilyo4190g81w
2013-12-13 10:40:16 +01:00
6b164eb7b3
[IMP] hr: minor usability improvements
...
- hr_holidays: renamed My Leaves filter by My Requests, more accurate
- hr_recruitment: string of name field is not Subject / Application Name, more accurate; this string is used in the search view also.
bzr revid: tde@openerp.com-20131212104612-2fbn9130emyvxg7s
2013-12-12 11:46:12 +01:00
291bc4a69d
[FIX] hr_holidays: on change holiday type to employee tag, set employee to False.
...
Otherwise, the user who creates the allocation request by employee tag will benefit of the leaves he just entered, twice if he has the employee tag, once if has not the employee tag(and in this last case, he should not have this leave allocation, as he do not have the tag
bzr revid: dle@openerp.com-20131211180025-pg8kf13bt6d1vk9l
2013-12-11 19:00:25 +01:00
f60e279f1c
[MERGE] Merge with trunk
...
bzr revid: jke@openerp.com-20131210165643-q9y3um1wkik52aam
bzr revid: jke@openerp.com-20131211085000-k34jnv099p667is4
2013-12-11 09:50:00 +01:00
cca8bb4d64
[FIX] font: revert previous (use name and not familly in reportlab), fix reports using spaces
...
bzr revid: mat@openerp.com-20131209133431-6gjhq1zmrb2ro6eo
2013-12-09 14:34:31 +01:00
a092227c6e
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20131207063209-2xi8ba5wu6l6ze00
bzr revid: launchpad_translations_on_behalf_of_openerp-20131208054536-mg4w4d6ljq8ji1nj
bzr revid: launchpad_translations_on_behalf_of_openerp-20131207063232-l64v1fhf1qcpxm2l
bzr revid: launchpad_translations_on_behalf_of_openerp-20131208054646-zixed7abpuze4qt1
bzr revid: launchpad_translations_on_behalf_of_openerp-20131123062625-f7inv72rtg2kel8g
bzr revid: launchpad_translations_on_behalf_of_openerp-20131124054801-1ukcpelfukkvwn60
bzr revid: launchpad_translations_on_behalf_of_openerp-20131125060120-nm8tkfbftg8c88v1
bzr revid: launchpad_translations_on_behalf_of_openerp-20131126060753-jnx5ran2accmo0lh
bzr revid: launchpad_translations_on_behalf_of_openerp-20131127054000-wtg675pf33f3bkar
bzr revid: launchpad_translations_on_behalf_of_openerp-20131129053028-abszdj4y76smnacb
bzr revid: launchpad_translations_on_behalf_of_openerp-20131201054555-3u1m1sy1f2og78nn
bzr revid: launchpad_translations_on_behalf_of_openerp-20131202055227-mm70khzdfnp4qcj9
bzr revid: launchpad_translations_on_behalf_of_openerp-20131207063237-vza5vb51xmd2ipl6
bzr revid: launchpad_translations_on_behalf_of_openerp-20131208054653-f4zth8j3iczlzcqz
2013-12-08 05:46:53 +00:00
ef8322273e
[FIX] [TESTS] project, hr_holidays and portal-related modules: fixed tests, because the raised errors have been updated
...
bzr revid: tde@openerp.com-20131206125751-lx5ki1nz10pdo63r
2013-12-06 13:57:51 +01:00
74d698f42f
[MERGE] Merge with trunk
...
bzr revid: jke@openerp.com-20131127175136-3qvs367ud509462n
2013-11-27 18:51:36 +01:00
e6c1545262
[REF] Remove temp field from view and add sequence for view form of crm.metting
...
bzr revid: jke@openerp.com-20131126200506-zr5fp99xa2lq4qno
2013-11-26 21:05:06 +01:00
61cb04c5af
[FIX] Add dependency on web_calendar for base_calendar
...
bzr revid: jke@openerp.com-20131126194120-6lthkig6agf08ngo
2013-11-26 20:41:20 +01:00
b4af563c5e
[FIX] Add right in security of hr_holidays to allow hr user to delete attendee
...
bzr revid: jke@openerp.com-20131126190610-ow8qwiajddi7gvdy
2013-11-26 20:06:10 +01:00
5f21b4bff9
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20131123062620-6obt60lwob64hi98
bzr revid: launchpad_translations_on_behalf_of_openerp-20131124054757-4w9nik6wieeqf0yg
bzr revid: launchpad_translations_on_behalf_of_openerp-20131125060111-rf445xxiinvazinv
2013-11-25 06:01:11 +00:00
5f9ee3b2d2
[IMP] Bck not running
...
bzr revid: jke@openerp.com-20131123113627-csxj0qx8s030dhi7
2013-11-23 12:36:27 +01:00
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
cee1b287d6
rb r2g.
...
bzr revid: jke@openerp.com-20131118084532-6v6fdb3no48gpuv3
2013-11-18 09:45:32 +01:00
ee0c5a5610
rb r2g
...
bzr revid: jke@openerp.com-20131118084244-z82ezh0o1o56r1f9
2013-11-18 09:42:44 +01:00
77ba33003a
rb r2g
...
bzr revid: jke@openerp.com-20131118081557-np5sxps572b578bg
2013-11-18 09:15:57 +01:00
2160342cea
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20131116062538-hsi3j63m1pw01qem
bzr revid: launchpad_translations_on_behalf_of_openerp-20131117054515-0jw3bd84wk546u6j
bzr revid: launchpad_translations_on_behalf_of_openerp-20131118055319-wz4qa3cxwowlonxt
2013-11-18 05:53:19 +00:00
108ccbf108
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20131114062958-ies8xa3pft7n59ms
bzr revid: launchpad_translations_on_behalf_of_openerp-20131106055135-r0xt2vr04710jh1t
bzr revid: launchpad_translations_on_behalf_of_openerp-20131107055120-r8z445ergt50erlx
bzr revid: launchpad_translations_on_behalf_of_openerp-20131108062620-bvfofx1jl1wb1csh
bzr revid: launchpad_translations_on_behalf_of_openerp-20131110064525-ioceogsmu0nmx2qj
bzr revid: launchpad_translations_on_behalf_of_openerp-20131111053908-gbrp09ast5fhr6iw
bzr revid: launchpad_translations_on_behalf_of_openerp-20131112062316-5uf2bvbzdhkq1b7k
bzr revid: launchpad_translations_on_behalf_of_openerp-20131113060841-bkjcuz4e9rtzn6f9
bzr revid: launchpad_translations_on_behalf_of_openerp-20131114063058-rrm2q5lxkyawuvpz
2013-11-14 06:30:58 +00:00
960924195e
[MERGE]merged with main addons
...
bzr revid: dka@tinyerp.com-20131030052926-i9c25mf6wpseioh3
2013-10-30 10:59:26 +05:30
a0fab67694
[FIX] hr_holidays: leave holiday overlap should ignore cancelled/refused ones
...
Obviously a cancelled leave does not really
overlap with a new one.
bzr revid: odo@openerp.com-20131023162928-56vdsjxr8sa4n3jv
2013-10-23 18:29:28 +02:00
fadd46c5cb
hr_holidays: force refuse.@flow_stop to False to correctly update existing databases
...
bzr revid: odo@openerp.com-20131021155120-vn63of44ya0od9e2
2013-10-21 17:51:20 +02:00
fa9905e335
[FIX] hr_holidays: fixed tests about exception raised
...
when trying to validate too much holidays. The exception
is now a Warning, not an except_orm anymore.
bzr revid: tde@openerp.com-20131016120929-1pg7q4bjvpolfevj
2013-10-16 14:09:29 +02:00
43e88e54bf
[FIX] hr_holidays: typo - boolean values should be set with @eval!
...
bzr revid: odo@openerp.com-20131016112857-i29unpw5ee8yv3lx
2013-10-16 13:28:57 +02:00
58928c5c4c
[FIX] hr_holidays: force draft.@flow_start to False to correctly update existing databases + fix validation logic
...
The check_holidays() validation was not working correctly
because it was called both before and after inserting new
leave requests, with inconsistent results.
Using it as a fixed constraint is simpler.
bzr revid: odo@openerp.com-20131015165416-in0rfd7rrjmekv0g
2013-10-15 18:54:16 +02:00
566af6033f
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20131011052941-f4x7ued38x0siu4u
bzr revid: launchpad_translations_on_behalf_of_openerp-20131013053842-x6nja74l8by5vd1q
bzr revid: launchpad_translations_on_behalf_of_openerp-20131014053313-j22u5qen55na9js8
2013-10-14 05:33:13 +00:00
Olivier Dony
Thibault Delavallée
Christophe Simonis
Fabien Pinckaers
qdc
Denis Ledoux
Richard Mathot
rlu-odoo
antonylesuisse
JoshuaJan
Raphael Collet
Jaydeep Barot
ged-odoo
Fabien Meghazi
Martin Trigaux
Gery Debongnie
Kersten Jeremy
Launchpad Translations on behalf of openerp
Darshan Kalola (OpenERP)
Randhir Mayatra rma-openerp
Yogesh Parekh (OpenERP)
Christophe Simonis
Sunil Sharma (OpenERP)
Denis Ledoux
Antony Lesuisse
Frédéric van der Essen
Stephane Wirtel
Xavier ALT