35d51fe71f
[REM] mass_mailing: removed report, a graph view on statistics will be sufficient
...
bzr revid: tde@openerp.com-20140415095817-rx7bokd6qc5rkrhq
2014-04-15 11:58:17 +02:00
68312cf9f8
[MERGE] Sync with trunk
...
bzr revid: tde@openerp.com-20140415093954-f4swocgxl5k5si3r
2014-04-15 11:39:54 +02:00
6179d9b6a2
[IMP] mass_mailing: finishing refactoring for the new func flow.
...
- cleaned reply-to management, now displaying an alert but simplifying the underlying
model about options available / not available for certain documents;
- cleaned a bit the form view;
- date -> create_date, and added a sent_date to distinguish the two;
- removed dead code;
- first draft of improving the chardomain widget
bzr revid: tde@openerp.com-20140415092503-q1hku1rh12ldy9i1
2014-04-15 11:25:03 +02:00
14be899706
[FIX] calendar: fix string quoting mess in email template
...
bzr revid: rco@openerp.com-20140414144754-08fgs7xnzax5uzht
2014-04-14 16:47:54 +02:00
8ff2bb683f
[MERGE][FIX] Mobile preview of blogs
...
bzr revid: rim@openerp.com-20140414144407-cz3fmydj8vpzl7n6
2014-04-14 16:44:07 +02:00
48d7a6fa6c
[CLEAN] mass_mailing: rmeoved dead stuff
...
bzr revid: tde@openerp.com-20140414144011-awu4g35etq9s4gje
2014-04-14 16:40:11 +02:00
bafa8e448d
[FIX] Website_mail - Add selectors to allow drag and drop of snippet in email template
...
bzr revid: jke@openerp.com-20140414143001-26p3ka7dwb1er6y0
2014-04-14 16:30:01 +02:00
afc2685cee
[FIX] wesbite: banner - remove css and use bootstrap for positionning. Now hidden-xs works, we don't lost 50% of width
...
bzr revid: jke@openerp.com-20140414142631-k78shkqjqdtcnp83
2014-04-14 16:26:31 +02:00
6b020549f8
[FIX]modal windows: when pressing esc key, modal-backdrop was not removed
...
bzr revid: csn@openerp.com-20140414140652-g06gl0mguyhta5px
2014-04-14 16:06:52 +02:00
909db628e5
[REM] removing unused and non clean modules
...
bzr revid: fp@tinyerp.com-20140414134026-ruv2o1vnpxtshnoo
2014-04-14 15:40:26 +02:00
e1cebe9003
[REF] hr_timesheet: unused piece of code
...
bzr revid: rim@openerp.com-20140414132634-xaps5ydbic5jriw4
2014-04-14 15:26:34 +02:00
55266ab25d
[MERGE] Merged fp's refactoring branch.
...
bzr revid: tde@openerp.com-20140414131109-7ijlz4gybjd2b2oj
2014-04-14 15:11:09 +02:00
fe6ef26720
[MERGE][IMP] hr_timesheet: Quick create of contract (on timesheet) does not open contract edit window anymore
...
bzr revid: rim@openerp.com-20140414125558-zcwstm1ooa3qecpx
2014-04-14 14:55:58 +02:00
fed6bdcf5e
[MERGE][IMP] hr_timesheet: add a menu to configure Timesheet Accounts under HR/Configuration
...
bzr revid: rim@openerp.com-20140414124251-5u5nu75c9q8g8zi9
2014-04-14 14:42:51 +02:00
1c4b74a7d1
[IMP] translateable event description
...
bzr revid: fp@tinyerp.com-20140414123443-qom78utc45e86lh1
2014-04-14 14:34:43 +02:00
f5ccf4c523
[IMP] Ticket types translateable
...
bzr revid: fp@tinyerp.com-20140414123231-b27qnkaujayk9j84
2014-04-14 14:32:31 +02:00
028b093102
[MERGE] from trunk
...
bzr revid: rim@openerp.com-20140414115604-x1a32wfbxwkn3yhp
2014-04-14 13:56:04 +02:00
91a5db808d
[MERGE] from trunk
...
bzr revid: rim@openerp.com-20140414115354-w8gpo3eks1rnud9k
2014-04-14 13:53:54 +02:00
c34ea0a384
[MERGE][IMP] Terminology uniformisation
...
bzr revid: rim@openerp.com-20140414093342-91n7m8o730om25qm
2014-04-14 11:33:42 +02:00
6d99b1df52
[MERGE][IMP] invoice/sale: Terminology uniformisation
...
bzr revid: rim@openerp.com-20140414093158-pbtttnv57a7nt7y6
2014-04-14 11:31:58 +02:00
96417099b3
[MERGE] Sync with trunk
...
bzr revid: ypa@tinyerp.com-20140404114223-zalha5tvp2l0ov8f
bzr revid: rim@openerp.com-20140414091137-icatnn1humn7kisc
2014-04-14 11:11:37 +02:00
5ea15d56fb
[MERGE] Sync with trunk
...
bzr revid: tde@openerp.com-20140414090428-y435e4tsy4ju5nc3
2014-04-14 11:04:28 +02:00
15725997dd
[MERGE] Sync with trunk
...
bzr revid: rim@openerp.com-20140414090336-vc5283odv5f612es
2014-04-14 11:03:36 +02:00
01d9ea6f64
[MERGE][IMP] crm/sale_crm: Terminology
...
Replacement of the term "category" by "tag", for the sake of consistency
bzr revid: rim@openerp.com-20140414083511-b5qvr4ek4mgxx17x
2014-04-14 10:35:11 +02:00
8da0820a88
[FIX] website: media editor: when the user save the picture, the dialog box re-open automatically. Do not re-active snippet when we save a field image
...
bzr revid: chm@openerp.com-20140414082617-svxpb6kuqfhjm8oa
2014-04-14 10:26:17 +02:00
34e618965a
[IMP] commment
...
bzr revid: fp@tinyerp.com-20140414081035-9ixrag5oly2q0emb
2014-04-14 10:10:35 +02:00
ea167ad7ab
[IMP] test cursor: code cleanup to make it more robust to concurrent accesses
...
bzr revid: rco@openerp.com-20140414075906-2d0i4qhe4x7czsao
2014-04-14 09:59:06 +02:00
72b37e2bbd
[IMP] context_today should apply to function fields also in order to show them in qweb reports
...
bzr revid: jco@openerp.com-20140414074558-irgt7g9st5ongny9
2014-04-14 09:45:58 +02:00
8d42202c92
[FIX] show stages only if campaign is set
...
bzr revid: fp@tinyerp.com-20140413205337-kkr9xtk6x5bzvzo5
2014-04-13 22:53:37 +02:00
3db3160644
[IMP] website_link field removed
...
bzr revid: fp@tinyerp.com-20140413204625-tu2bw7cyj14rjx53
2014-04-13 22:46:25 +02:00
57078f5c12
[IMP] features
...
bzr revid: fp@tinyerp.com-20140413203634-75mf4z8o3xh7i83h
2014-04-13 22:36:34 +02:00
96a750fd03
[IMP] Removing featuer
...
bzr revid: fp@tinyerp.com-20140413203309-digp60hsobgv3i57
2014-04-13 22:33:09 +02:00
2ad0b6e369
[IMP] removing unused code
...
bzr revid: fp@tinyerp.com-20140413202922-glv198j62sqeugz2
2014-04-13 22:29:22 +02:00
b1ccd56368
[IMP] better usability
...
bzr revid: fp@tinyerp.com-20140413201748-u8e26ef40dt7360i
2014-04-13 22:17:48 +02:00
8d6e2b4a15
[iMP] minor bugfixes
...
bzr revid: fp@tinyerp.com-20140413195730-zpzpsmo53fqa4x96
2014-04-13 21:57:30 +02:00
f908137d76
[IMP] Template Editor
...
bzr revid: fp@tinyerp.com-20140413162028-9tqqzis7qbggcrp4
2014-04-13 18:20:28 +02:00
cb544e61c4
[IMP] default recipients to mailing list
...
bzr revid: fp@tinyerp.com-20140413070922-jw7f5s9wrt9g2gek
2014-04-13 09:09:22 +02:00
84fe98085b
[IMP] Adding stats file
...
bzr revid: fp@tinyerp.com-20140412233019-au2omxtet5sfqcxr
2014-04-13 01:30:19 +02:00
227b9a917d
[IMP] Adding stats file
...
bzr revid: fp@tinyerp.com-20140412232548-csyb7j13fyu4cwnw
2014-04-13 01:25:48 +02:00
e9cf53934b
[iMP] small improvements
...
bzr revid: fp@tinyerp.com-20140412232159-1y35hdpaahy633tb
2014-04-13 01:21:59 +02:00
3df4eb0f72
[WIP] Mailing Lists and Contacts cleaned
...
bzr revid: fp@tinyerp.com-20140412203129-5l7w4qr8rf2d1nqo
2014-04-12 22:31:29 +02:00
2feab20dbb
[WIP] started to reduce code
...
bzr revid: fp@tinyerp.com-20140412153339-rr3b1r4cmdeigp0v
2014-04-12 17:33:39 +02:00
ff41711be7
[MERGE] trunk
...
bzr revid: fp@tinyerp.com-20140412140002-lxl2bkmv0liwbiid
2014-04-12 16:00:02 +02:00
e69b086ecd
[FIX] logging, pg logging use thread db
...
bzr revid: al@openerp.com-20140412134728-vzn9247twgyfbcid
2014-04-12 15:47:28 +02:00
915ac89024
[merge]
...
bzr revid: fp@tinyerp.com-20140412130132-6dncdvhrxsciyr7l
2014-04-12 15:01:32 +02:00
e82fbf7d91
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140412083153-3ona1js7o6z421vg
2014-04-12 08:31:53 +00:00
9640e839d8
[ADD] New module: website_forum, a clone of askbot / stackoverflow.
...
This module models a forum: questions, answers, voting and comment system, karma
management. There is a link with gamification, allowing to use badges and reward
users for their participation to the forum.
Badges are temporarily commented out to ease the module beta-testing without having
to wait for some gamification improvements.
This merge also contains some fixes in access rights for gamification.
bzr revid: tde@openerp.com-20140411183646-fmkeng9fzixjrqy5
2014-04-11 20:36:46 +02:00
ac8f4d62a5
[IMP] [FIX] ir_qweb: fixed a call to a parameter considered as being
...
a dict but that could be None; added management of country flag on the
contact widget.
bzr revid: tde@openerp.com-20140411183425-nzhuk6mb80pahvwm
2014-04-11 20:34:25 +02:00
4c8418648f
[FIX] website_forum: fixed badges pgae
...
bzr revid: tde@openerp.com-20140411182751-immtoih95el07n6n
2014-04-11 20:27:51 +02:00
06776da4a9
[IMP] website_forum: karma management for vote
...
bzr revid: tde@openerp.com-20140411182254-0wyvzpcqxk4jyqev
2014-04-11 20:22:54 +02:00
Thibault Delavallée
Raphael Collet
Richard Mathot (OpenERP)
Kersten Jeremy
Cedric Snauwaert
Fabien Pinckaers
chm@openerp.com
Josse Colpaert
Antony Lesuisse