449ab7c433
[MERGE]sync with trunk.
...
bzr revid: dka@tinyerp.com-20140415123511-61vax59dl6476zjb
2014-04-15 18:05:11 +05:30
f13e04ea0c
[MERGE]sync with trunk.
...
bzr revid: dka@tinyerp.com-20140415123258-dx6ynazg52064xfb
2014-04-15 18:02:58 +05:30
577245bc66
[REF] Terminology
...
bzr revid: rim@openerp.com-20140415115017-wfbtidj4eypxyw8r
2014-04-15 13:50:17 +02:00
ea2e59f86b
[FIX] mass_mailing: fixed email sending
...
bzr revid: tde@openerp.com-20140415113944-hjwjc2lh4ydzugr1
2014-04-15 13:39:44 +02:00
4aa717b695
[FIX] mass_mailing: form view: usability imp
...
bzr revid: tde@openerp.com-20140415113934-xu033xxibolvl62w
2014-04-15 13:39:34 +02:00
ecac1a7156
[MERGE] Sync with trunk
...
bzr revid: tde@openerp.com-20140415113817-j38p3rn3j7pz2kxg
2014-04-15 13:38:17 +02:00
1c5ed2973e
[FIX] mail template view - Set body_html field as simple text area without cke by default. Else, the mako code are considered as mal formatted and moved.
...
bzr revid: jke@openerp.com-20140415113751-h0a1tg36tht1bys1
2014-04-15 13:37:51 +02:00
15306066d0
I love the smell of napalm in the morning.
...
bzr revid: mat@openerp.com-20140415113545-31efpjddjwqr4ajl
2014-04-15 13:35:45 +02:00
7e1e475d89
[IMP] mass_mailing :handle attachments for mailings
...
bzr revid: tde@openerp.com-20140415110439-j72v9cnz3nml7g04
2014-04-15 13:04:39 +02:00
c55057f322
[MERGE] from trunk
...
bzr revid: rim@openerp.com-20140415110438-thh0io5aunro4kfl
2014-04-15 13:04:38 +02:00
922e8b610f
[IMP] mass_mailing :improved demo data
...
bzr revid: tde@openerp.com-20140415104337-gokvkpvx36wch132
2014-04-15 12:43:37 +02:00
d538a02c0e
[FIX] mass_mailing: fixed graph buttons in form view + fixed stat computation
...
bzr revid: tde@openerp.com-20140415104328-yll2kgxtjmg6f3hc
2014-04-15 12:43:28 +02:00
1e643d4ce5
[FIX] mass_mailing: fixed demo data: reply_to specified + remove create_date, not allowed
...
bzr revid: tde@openerp.com-20140415102818-zcm9vfc7zalg29f4
2014-04-15 12:28:18 +02:00
14ff39f96e
[FIX] website_forum: mooooore baaaaaadges
...
bzr revid: mat@openerp.com-20140415101842-yf6vndw7h62q0b42
2014-04-15 12:18:42 +02:00
1e93741081
[FIX] Website banner tour - Fix test according to new banner structure
...
bzr revid: jke@openerp.com-20140415101406-54cdr44xayvyq8xo
2014-04-15 12:14:06 +02:00
90d9b497b3
[FIX] mass_mailing: various fixes in campaign view and basic management
...
bzr revid: tde@openerp.com-20140415101342-7vvadykp1udz6hgs
2014-04-15 12:13:42 +02:00
df55b1eb9d
[FIX] Website tour - Click inside the zone before to insert sampleText
...
bzr revid: jke@openerp.com-20140415100834-2pstpw357y9klc89
2014-04-15 12:08:34 +02:00
998b290409
[MERGE][FIX] account: while refuding the invoice with payment term journal items are created wrongly with write-off account
...
bzr revid: dle@openerp.com-20140415100702-s13cuejf89gtlnhc
2014-04-15 12:07:02 +02:00
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
654700fb36
[MERGE] Sync with trunk
...
bzr revid: tde@openerp.com-20140408150638-saavkesrvi58jce1
bzr revid: tde@openerp.com-20140411075558-bhjojsbsivb6erq3
bzr revid: tde@openerp.com-20140414090314-jt83lipdphehyz4e
bzr revid: tde@openerp.com-20140415094006-3zmwct81mqx17mb8
2014-04-15 11:40:06 +02:00
68312cf9f8
[MERGE] Sync with trunk
...
bzr revid: tde@openerp.com-20140415093954-f4swocgxl5k5si3r
2014-04-15 11:39:54 +02:00
9166c305c1
[MERGE]sync with trunk.
...
bzr revid: dka@tinyerp.com-20140415092844-u9vrtpjvwdr2ke5m
2014-04-15 14:58:44 +05:30
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
9f72ddbeac
[MERGE]sync with trunk.
...
bzr revid: dka@tinyerp.com-20140415092051-ph2i1zzxji7evwuq
2014-04-15 14:50:51 +05:30
1085389add
[IMP] survey: imp in views to enable better config of quiz mode
...
bzr revid: rim@openerp.com-20140415091446-hj0xugog2u3almaw
2014-04-15 11:14:46 +02:00
a701934ac7
[FIX] purchase: invoiced based on invoiced bool of purchase order line, instead of rate
...
invoiced bool of purchase order line is set to true on invoice validation, not on invoice creation
bzr revid: dle@openerp.com-20140415081211-jz6if0vzgq3inzzw
2014-04-15 10:12:11 +02:00
6ca81553a0
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140415075130-aqn4mzx05l3txtkb
bzr revid: launchpad_translations_on_behalf_of_openerp-20140415075337-ulie3qkes53t8ivf
2014-04-15 07:53:37 +00:00
81a5dacbc4
[MERGE]sync with trunk.
...
bzr revid: dka@tinyerp.com-20140415050512-4mww4r7ntghiig37
2014-04-15 10:35:12 +05:30
b91bcbf0fc
[FIX] Fix the call of the cron due to a function which has been renamed.
...
[IMP] Add param calendar.block_mail in ir.config.parameters to allow to bypass the sent of mails to attendees.
bzr revid: jke@openerp.com-20140414202936-kh1izog183nwenb7
2014-04-14 22:29:36 +02:00
9c739f12c2
[FIX] Remove watcher, need to be review because it breaks other tests.
...
bzr revid: jke@openerp.com-20140414165721-i8g23jxy66p1p6ao
2014-04-14 18:57:21 +02:00
faa899adde
[FIX] Reactive watcher
...
bzr revid: jke@openerp.com-20140414163412-88seef6j58xiamug
2014-04-14 18:34:12 +02:00
9f3a2f84e0
[ADD] website_forum: more badges
...
bzr revid: mat@openerp.com-20140414155344-v580tpy5l12z9v95
2014-04-14 17:53:44 +02:00
552a23a4bd
[FIX] Remove watcher
...
bzr revid: jke@openerp.com-20140414153537-0qjlnqqnk0q9utn0
2014-04-14 17:35:37 +02:00
a8ce5415ad
[FIX] Watch if jQuery is overwritted by another version in some script. If an override is detected, we check that all old function is always present else we add the missing.
...
The problem was that some websites uses externals libraries which use a jQuery more recent that our version. Jquery by default checks his own version and overwrite itself if the current version is lower.
Once user had their jquery overwritted, function dropdown was missing and it was impossible to the end user to get menu working again... and so impossible to remove the view with the front end.
bzr revid: jke@openerp.com-20140414151423-zhi3tjj52rihltzy
2014-04-14 17:14:23 +02:00
65a6b922b5
[FIX] Add prototype watch in js object. That will allow to listen change on some library for example. It's used to know if jquery is overrided by an external script.
...
bzr revid: jke@openerp.com-20140414145802-osjcjj01f8ehwsqc
2014-04-14 16:58:02 +02:00
c40318a46a
[ADD] website_forum: self_reply field and some badges
...
bzr revid: mat@openerp.com-20140414145415-8g9jtp95d173183i
2014-04-14 16:54:15 +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
0c8539846a
[ADD] website_forum: quality badges
...
bzr revid: mat@openerp.com-20140414135115-onmywwurr03g21dw
2014-04-14 15:51:15 +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
a52e13bd86
[FIX] remove wrong required and readonly fields
...
bzr revid: mat@openerp.com-20140414131720-bzqd1sv0j2t5wywd
2014-04-14 15:17:20 +02:00
2429e04ec2
[MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9980 revid:dle@openerp.com-20140414121930-xbawuj93ddifhf4m
...
bzr revid: dle@openerp.com-20140414131146-1jz0isk58wgdsx2p
2014-04-14 15:11:46 +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
c3300dce7a
[FIX] account: name_search methods used '=' or 'ilike' to search, instead of the actual operator
...
Therefore, for example, searching invoices for journals doesnt containing 'sales' actually returned invoices with journal containing 'sales'.
bzr revid: dle@openerp.com-20140414121930-xbawuj93ddifhf4m
2014-04-14 14:19:30 +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
66e72fec54
[FIX] Website - Don't set active on OpenDialog link else the user cannot click on it again after.
...
bzr revid: jke@openerp.com-20140414094803-bfyvu3wizy09n53c
2014-04-14 11:48:03 +02:00
6d99b1df52
[MERGE][IMP] invoice/sale: Terminology uniformisation
...
bzr revid: rim@openerp.com-20140414093158-pbtttnv57a7nt7y6
2014-04-14 11:31:58 +02:00
a0b26b6cfe
[FIX] mass_mailing: mail_thread model redefined as a osv.Model, while the original mail thread is an AbstractModel. Mass mailing mail thread must be an Abstract Model as well
...
bzr revid: dle@openerp.com-20140414090825-o456mdd9q38m47mw
2014-04-14 11:08:25 +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
3a27186643
[MERGE] [FIX] FormView: avoid multiple creations of the same line in o2m fields when the save action fails (e.g. forgot one required field)
...
This is done by removing the added action 'prepend_on_create' that can be present as many time as we pressed the save button
lp bug: https://launchpad.net/bugs/1265705 fixed
bzr revid: mat@openerp.com-20140414081003-290q4v21q01m4rsi
2014-04-14 10:10:03 +02:00
bf3d4a7d94
[MRG] merge with main branch
...
bzr revid: avo@tinyerp.com-20140414071801-3eaa6iqryfrolxbt
2014-04-14 12:48:01 +05:30
001a034e58
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140412094159-mhy3v2prb3ctx32k
bzr revid: launchpad_translations_on_behalf_of_openerp-20140412094217-3u3f03f0wjhbzyo4
bzr revid: launchpad_translations_on_behalf_of_openerp-20140413062047-z833pejjrtuhfygs
bzr revid: launchpad_translations_on_behalf_of_openerp-20140414055948-intynzk8l823ukei
2014-04-14 05:59:48 +00: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
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
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
2ec3a40334
[FIX] website_forum: cleaning in notification fetch + in profil editoin
...
bzr revid: tde@openerp.com-20140411180637-n1q4rmac5q1amqrw
2014-04-11 20:06:37 +02:00
7d834f0579
[IMP] website_forum: cleaned post cfreate and write
...
+ corrct subtype trigger
bzr revid: tde@openerp.com-20140411180615-bznyth4tv7e89sed
2014-04-11 20:06:15 +02:00
62fde442cb
[CLEAN] website_forum: res_users: cleaned dead code
...
bzr revid: tde@openerp.com-20140411180550-pucr84e70or4jhy0
2014-04-11 20:05:50 +02:00
d0740bedb9
[IMP] gamification: messages posted on user when receiving a badge
...
now have a subtype, to ease their search.
bzr revid: tde@openerp.com-20140411175730-hq06b7qezurzymj6
2014-04-11 19:57:30 +02:00
5a94881b32
[FIX] website_forum: share links now working
...
bzr revid: tde@openerp.com-20140411172658-9wxznhu2rds5y97i
2014-04-11 19:26:58 +02:00
c3cb7762a1
[TMP] website_forum: commented out badges, more tests will have to be
...
done on badges.
bzr revid: tde@openerp.com-20140411172408-b5oq98y4kcz1fzfr
2014-04-11 19:24:08 +02:00
b9b087ffb5
[FIX] [CLEAN] website_forum: cleaned and fixed upvote, downvote and favourite
...
bzr revid: tde@openerp.com-20140411171029-zeqtrko98z1jr3sm
2014-04-11 19:10:29 +02:00
5a3f68a767
[FIX] website_forum: deleting a comment is back and works
...
bzr revid: tde@openerp.com-20140411170114-po5bgwc2z2qgs8f0
2014-04-11 19:01:14 +02:00
a1e5f69cb3
[FIX] website_forum: post edition working again
...
bzr revid: tde@openerp.com-20140411164455-2mx3yic1hquu0pil
2014-04-11 18:44:55 +02:00
df3c6b7502
[FIX] web: do not try to close a destroyed dialog. trigger "closing" signal on close by top-right "X" button
...
bzr revid: chs@openerp.com-20140411162426-60bfybim5aqojsxx
2014-04-11 18:24:26 +02:00
b6a1359b4f
[FIX] website_forum: convert comment to post is back and works
...
bzr revid: tde@openerp.com-20140411161916-rlobfxosniii66m4
2014-04-11 18:19:16 +02:00
907a97b15b
[FIX] website_forum: fixe ddemo data, about create_uid warning.
...
bzr revid: tde@openerp.com-20140411161414-gqyosw7g73r36fer
2014-04-11 18:14:14 +02:00
8540a63aa6
[CLEAN] website_forum: gamification: removed code about ongoing challenges
...
as it is now a feature in trunk.
Also removed unnecessary column redefinition.
Also removed an override in users, will see if necessary.
bzr revid: tde@openerp.com-20140411160003-tffx54f2evjh4r70
2014-04-11 18:00:03 +02:00
f091e9d6e5
[MERGE] Sync with trunk
...
bzr revid: tde@openerp.com-20140411155723-pqe8ofxh060afiuj
2014-04-11 17:57:23 +02:00
133038c722
[FIX] website_forum: fixed toggle_correct for setting answers as correct
...
bzr revid: tde@openerp.com-20140411155622-18bdyddcs6hdln77
2014-04-11 17:56:22 +02:00
668fb8a542
[MERGE] gamification: add batch mode, improve some views, remove inprogess_update state and "realtime" (using cron) badge to recieve badges without needing to close the challenge
...
bzr revid: mat@openerp.com-20140411154740-pzw0v7po7pmci42l
2014-04-11 17:47:40 +02:00
5a402ce73a
[FIX] website_forum: disable the tour as it is not implemented
...
and seems to make other tours crash.
bzr revid: tde@openerp.com-20140411154150-4tn3bfe7wp8n901d
2014-04-11 17:41:50 +02:00
236a4d71be
[MERGE] sync with trunk
...
bzr revid: mat@openerp.com-20140411154002-6557tcjfetqwb0kf
2014-04-11 17:40:02 +02:00
56d8d0afb6
[FIX] website_forum: ask a question was hidden by default, we want the reversal
...
bzr revid: tde@openerp.com-20140411153738-werwgvte4tzrmu6y
2014-04-11 17:37:38 +02:00
68cb0dca6f
[FIX] website_forum: temporary fix to enable the counter
...
computation at creation.
bzr revid: tde@openerp.com-20140411153724-8x7o0o774uf5g2x2
2014-04-11 17:37:24 +02:00
f3bb1036f6
[DEMO] website_forum: better demo dta
...
bzr revid: tde@openerp.com-20140411152340-akpg0q2zg5q3xt90
2014-04-11 17:23:40 +02:00
e937d106af
[FIX] website_forum: display forum description as html
...
bzr revid: tde@openerp.com-20140411152328-ny4aej5vrlj6qrmv
2014-04-11 17:23:28 +02:00
c67c964d5f
[ADD] gamification: realtime badge to recieve badge without closing the challenge
...
bzr revid: mat@openerp.com-20140411151917-21drebbaa1d36jv4
2014-04-11 17:19:17 +02:00
aa48312b98
[MERGE] Sync with trunk
...
bzr revid: tde@openerp.com-20140411145955-91iohb1enc50se5l
2014-04-11 16:59:55 +02:00
926cfb33b2
[REM] website_forum: remove file not used anymore
...
bzr revid: tde@openerp.com-20140411145856-81t6jwbbk7wq2nm1
2014-04-11 16:58:56 +02:00
2e8ef095ae
[REM] website_forum: removed dummy directories
...
bzr revid: tde@openerp.com-20140411145210-in1x6uzhsrn4s7c5
2014-04-11 16:52:10 +02:00
f280c8d2f7
[CLEAN] website_forum: removed some licences, only one is sufficient
...
bzr revid: tde@openerp.com-20140411145018-16dxhi62bkt4l2dg
2014-04-11 16:50:18 +02:00
bf7c16d6d9
[FIX] mail: res_users post: fixed partner_ids computation, could receive
...
a list of ids, or a list of commands. Both cases should be taken into account.
bzr revid: tde@openerp.com-20140411142842-kw0x1vrop6x6i5kf
2014-04-11 16:28:42 +02:00
5d177a9b10
[MERGE] Sync with trunk
...
bzr revid: rim@openerp.com-20140411142817-svp3hp2qfx1xw25k
2014-04-11 16:28:17 +02:00
fb19b54ff9
[MERGE] Forward-port of 7.0 bugfixes up to rev 9976 rev-id: odo@openerp.com-20140411142429-y0rpkzqbrsabxqsg
...
bzr revid: odo@openerp.com-20140411142800-t8sbcmfkj3qgmrh3
2014-04-11 16:28:00 +02:00
9861b5cada
[FIX] mail.thread: avoid overwriting thread_id/model with foreign values when reply-to hostname does not match + fix tests
...
This improve previous commit by making sure we
never consider the thread_id/model values in the
In-Reply-To/References header if the host name
did not match.
Also fixes the tests that were using the
6.1 compatibility mode to post in a mail group
thread instead of specifying the right
message-id.
bzr revid: odo@openerp.com-20140411142429-y0rpkzqbrsabxqsg
2014-04-11 16:24:29 +02:00
21022c5472
[REF] gamification: add batch mode, improve some views, remove inprogess_update state (replaced with boolean 'to update')
...
bzr revid: mat@openerp.com-20140411142257-zpaul4sq3t5j5r64
2014-04-11 16:22:57 +02:00
e2dc6b782d
[FIX] mail: avoid crashing message_post if the subtype does not exists anymore.
...
Using xmlid_to_res_id, subtype_id will be False if not found.
bzr revid: tde@openerp.com-20140411142214-nvvgkduzv51cc2eg
2014-04-11 16:22:14 +02:00
c2f3fffee6
[FIX] Empty all current line(s) when you change template. Before, the display do it, but when you save, you have back the old lines.
...
bzr revid: jke@openerp.com-20140411142022-rceic1ma2axakzpe
2014-04-11 16:20:22 +02:00
563dd0c138
[FIX] website_sale_quote - Make the sale quote template translatable when you edit a template. Force use of the language of partner in quotation, when you use a template.
...
bzr revid: jke@openerp.com-20140411141932-fk41zgsuw9e68t3a
2014-04-11 16:19:32 +02:00
e4d4c00312
[FIX] gamification: allow having False or 0 values as result of a computation.
...
bzr revid: tde@openerp.com-20140411141510-c11djv7qlf9qgek2
2014-04-11 16:15:10 +02:00
f8664c8d97
[MERGE][IMP] Kanban view: Better display of help message when there are no records, especially when displaying empty columns
...
bzr revid: rim@openerp.com-20140411135759-r4fv9g4vucjee6t6
2014-04-11 15:57:59 +02:00
452c77c09b
[FIX] 500 error on connection when using PyWebDAV 0.9.4
...
(and maybe others)
Courtesy of Holger Brunn (Therp)
bzr revid: dle@openerp.com-20140411134203-lxt4mnquiiclv6w3
2014-04-11 15:42:03 +02:00
e51049e8ed
[MERGE] Sync with upstream
...
bzr revid: tde@openerp.com-20140411134052-x74otuwuxoz20qab
2014-04-11 15:40:52 +02:00
d04ee666cc
[MERGE] Sync with trunk
...
bzr revid: tde@openerp.com-20140411133813-4rj4de6dlzna5g5s
2014-04-11 15:38:13 +02:00
6b84615627
[MERGE]change modal windows to only use bootstrap3
...
bzr revid: csn@openerp.com-20140411133113-odansac9am8av3fh
2014-04-11 15:31:13 +02:00
cd4afee17e
[CLEAN] website_forum: cleaning before merging
...
- cleaned models
- cleaned controllers: lots of cleaning, rewriting, simplfiication + updated in views
- added an override of the contact widget, to be able to display partner-related
stuff about karma and badges
- some css tweaking
- badges cleaning
bzr revid: tde@openerp.com-20140411132939-bmvyc9bqpqpkk843
2014-04-11 15:29:39 +02:00
280caaa95c
[MERGE]change modal windows to only use bootstrap3
...
bzr revid: csn@openerp.com-20140411132934-iodyidypjxb7v9ug
2014-04-11 15:29:34 +02:00
fb912d82be
[MERGE] Sync with trunk
...
bzr revid: rim@openerp.com-20140411131028-fqudb40nz71qhwc6
2014-04-11 15:10:28 +02:00
fee0d0100d
[FIX] read_group: someone added a field, thought it was fun to destroy
...
the method call.
bzr revid: tde@openerp.com-20140411124732-e22dzjmav0tuhag5
2014-04-11 14:47:32 +02:00
12e84d59d8
[MERGE][IMP] Large refactoring of "survey" module
...
- surveys are now displayed through website
- new reporting tool
- model refactoring
- usability improvements
(affects also hr_evaluation and hr_recruitment, that use surveys)
bzr revid: rim@openerp.com-20140411124527-cbnd4r2wg38ihnss
2014-04-11 14:45:27 +02:00
23abadb62b
[MERGE] Sync with trunk
...
bzr revid: rim@openerp.com-20140411124318-pgxdmjfidsyny2ob
2014-04-11 14:43:18 +02:00
89d665aa79
[FIX]some cosmetic of code
...
bzr revid: csn@openerp.com-20140411122840-tv1mx2nu5p2is669
2014-04-11 14:28:40 +02:00
c8607c8b81
[FIX]few cosmetic of code
...
bzr revid: csn@openerp.com-20140411122753-qzxb29uwkw89mrxs
2014-04-11 14:27:53 +02:00
2a8232c25e
[IMP] Typo and add link in layout
...
bzr revid: rim@openerp.com-20140411122620-33rcxanaxhf5qxap
2014-04-11 14:26:20 +02:00
63c2093d2c
[IMP] Larger texts
...
bzr revid: fp@tinyerp.com-20140411122232-s8yipnar4tllspm0
2014-04-11 14:22:32 +02:00
22fff5237b
[FIX] Correct prefill for comment answers
...
bzr revid: rim@openerp.com-20140411121541-pj3m0z44hwd0z89w
2014-04-11 14:15:41 +02:00
41447050e5
[FIX] Dirty fix: prevent crash in computing data from SCQ/MCQ/matrices by ignoring comments
...
bzr revid: rim@openerp.com-20140411120735-u04occnkchgm3ztc
2014-04-11 14:07:35 +02:00
57c636fb7a
[MERGE] from trunk
...
bzr revid: fva@openerp.com-20140411120636-o6yuuzphfiq33b8j
2014-04-11 14:06:36 +02:00
d704fb0060
[IMP] hw_proxy, hw_escpos: it is now possible to add support for new printers from the posbox hardware status page + fix backward compatiblity for hardcoded receipts
...
bzr revid: fva@openerp.com-20140411120510-t3a8b3axq1q4wuje
2014-04-11 14:05:10 +02:00
8ce4ac4d94
[MERGE] Sync with trunk
...
bzr revid: rim@openerp.com-20140411115525-87b9wa1ttwphiwf2
2014-04-11 13:55:25 +02:00
511cf0270c
[MERGE] sale_order_dates: several improvements to usability and planned date computing, courtesy of Lionel Sausin (Numerigraphe)
...
bzr revid: odo@openerp.com-20140411113007-yj4x5zui3luckg2n
2014-04-11 13:30:07 +02:00
4ed8413dc7
[FIX] mail.thread: avoid wrongly matching model,id from a foreign OpenERP system
...
When emails transit from an OpenERP system to another
there is a chance of wrongly considering the foreign
model,id pair as local, possibly attaching a reply
to a wrong parent message.
This naive heuristic ignore the foreign identifiers
unless the hostname of the message-id mentioned in
the In-Reply-To header matches the local one.
This may fail after a change of local hostname but
is still better than the alternative.
In OpenERP v8 we should stop including the model,res_id
in outgoing Message-Id headers and only rely on the
stored, opaque, unique Message-Ids, preventing
any future mismatch.
bzr revid: odo@openerp.com-20140411101349-h3jmkdzvbr7lut26
2014-04-11 12:13:49 +02:00
410c82bd6a
[MERGE] Sync with trunk
...
bzr revid: odo@openerp.com-20140411094018-zqw3ac1br991qsnp
2014-04-11 11:40:18 +02:00
a7dae4e741
[MERGE]with latest trunk.
...
bzr revid: kch@tinyerp.com-20140411093642-6o1luwd111qwtirn
2014-04-11 15:06:42 +05:30
aaa3265f47
[MERGE] from trunk
...
bzr revid: chm@openerp.com-20140411081401-0ybuuboo6f3b58kv
2014-04-11 10:14:01 +02:00
94c580e933
[MERGE] Sync with trunk
...
bzr revid: tde@openerp.com-20140411075551-xh4o3k3172cr7scz
2014-04-11 09:55:51 +02:00
67b413dba5
[IMP]improved code for increasing speed pf closing help as per usability review.
...
bzr revid: kch@tinyerp.com-20140411060833-mjf3j2549ya2pre9
2014-04-11 11:38:33 +05:30
63e9150cff
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140411055930-7coykr7rveqsucp3
2014-04-11 05:59:30 +00:00
Darshan Kalola (OpenERP)
Richard Mathot (OpenERP)
Thibault Delavallée
Kersten Jeremy
Martin Trigaux
Denis Ledoux
Launchpad Translations on behalf of openerp
Raphael Collet
Cedric Snauwaert
Fabien Pinckaers
Amit Vora
Christophe Simonis
Olivier Dony
Frédéric van der Essen
Kunal Chavda (Open ERP)