pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
85,483 Commits 1 Branch 0 Tags
ba4454ccfb9fc2de2dca0f7cd753ddb453b5f2fe
Commit Graph
85483 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Thibault Delavallée 19a2f350fa [IMP] mass_mailing: cleaned demo data 
bzr revid: tde@openerp.com-20140415135157-blrw8vcv66nzs6wa
 2014-04-15 15:51:57 +02:00
Thibault Delavallée f39fb269a4 [FIX] chardomain field: fixed button action 
bzr revid: tde@openerp.com-20140415135145-1wks35wufs9b1etq
 2014-04-15 15:51:45 +02:00
Martin Trigaux 35c7f4814d Allow overwrite of the serialising method to exclude some categories in the challenge search 
bzr revid: mat@openerp.com-20140415134809-uconkvnp0z32jxjs
 2014-04-15 15:48:09 +02:00
Thibault Delavallée da7cb60cfc [MOVE] Moved mass mailing chardomain widget to web. 
bzr revid: tde@openerp.com-20140415133933-1uqlj3yujdwozz2m
 2014-04-15 15:39:33 +02:00
Thibault Delavallée 02d07ac47e [ADD] web: form: added char domain widget coming from mass_mailing. This widget 
is used to compute the number of records according ot a domain, and to allow
selecting documents.

bzr revid: tde@openerp.com-20140415133914-v8fm6wn7up9ds85i
 2014-04-15 15:39:14 +02:00
Christophe Simonis 3d2e9b4d2b [MERGE] forward port of branch 7.0 up to revid 5281 launchpad_translations_on_behalf_of_openerp-20140412094159-mhy3v2prb3ctx32k 
bzr revid: jke@openerp.com-20140409153527-mic1a8afcvdhsd27
bzr revid: chs@openerp.com-20140410102422-fcwxhjk40z0oy8x5
bzr revid: chs@openerp.com-20140415133650-y46i0o3qkb2atbvi
 2014-04-15 15:36:50 +02:00
Thibault Delavallée c25b816a3b [FIX] web: fixed iamge buttons taking 2 lines 
bzr revid: tde@openerp.com-20140415132655-029ulw9jgeut4bce
 2014-04-15 15:26:55 +02:00
Thibault Delavallée 33ebae745d [REV] Reverted changes about sidebar as we now have 
a widget to handle things like selection in a list view.

bzr revid: tde@openerp.com-20140415132528-0spzmcb2xmphxpwn
 2014-04-15 15:25:28 +02:00
Martin Trigaux bc0738e47e One morning I shot an elephant in my pajamas. How he got in my pajamas, I don't know. 
bzr revid: mat@openerp.com-20140415131929-6pktlodmlgr2fuwz
 2014-04-15 15:19:29 +02:00
Denis Ledoux f8d5ef0f80 [MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 4174 revid:dle@openerp.com-20140415130732-bud8xb3pzgxw2imr 
bzr revid: dle@openerp.com-20140415101427-a6r7lgy50x9bdah3
bzr revid: dle@openerp.com-20140415130951-ckuv8nsl17qkb300
 2014-04-15 15:09:51 +02:00
Denis Ledoux 4a516a4709 [FIX] web_kanban: show more button of kanban view behind the kanban cards on (ie9) 
bzr revid: dle@openerp.com-20140415130732-bud8xb3pzgxw2imr
 2014-04-15 15:07:32 +02:00
Thibault Delavallée 4808ca3796 [FIX] mass_mailing: various fixed in chardomain widget 
bzr revid: tde@openerp.com-20140415125222-uzvzgzo5gx6hmgor
 2014-04-15 14:52:22 +02:00
Richard Mathot (OpenERP) 577245bc66 [REF] Terminology 
bzr revid: rim@openerp.com-20140415115017-wfbtidj4eypxyw8r
 2014-04-15 13:50:17 +02:00
Thibault Delavallée ea2e59f86b [FIX] mass_mailing: fixed email sending 
bzr revid: tde@openerp.com-20140415113944-hjwjc2lh4ydzugr1
 2014-04-15 13:39:44 +02:00
Thibault Delavallée 4aa717b695 [FIX] mass_mailing: form view: usability imp 
bzr revid: tde@openerp.com-20140415113934-xu033xxibolvl62w
 2014-04-15 13:39:34 +02:00
Thibault Delavallée ecac1a7156 [MERGE] Sync with trunk 
bzr revid: tde@openerp.com-20140415113817-j38p3rn3j7pz2kxg
 2014-04-15 13:38:17 +02:00
Kersten Jeremy 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
Martin Trigaux 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
Thibault Delavallée 7e1e475d89 [IMP] mass_mailing :handle attachments for mailings 
bzr revid: tde@openerp.com-20140415110439-j72v9cnz3nml7g04
 2014-04-15 13:04:39 +02:00
Richard Mathot (OpenERP) c55057f322 [MERGE] from trunk 
bzr revid: rim@openerp.com-20140415110438-thh0io5aunro4kfl
 2014-04-15 13:04:38 +02:00
Thibault Delavallée 922e8b610f [IMP] mass_mailing :improved demo data 
bzr revid: tde@openerp.com-20140415104337-gokvkpvx36wch132
 2014-04-15 12:43:37 +02:00
Thibault Delavallée 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
Thibault Delavallée 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
Martin Trigaux 14ff39f96e [FIX] website_forum: mooooore baaaaaadges 
bzr revid: mat@openerp.com-20140415101842-yf6vndw7h62q0b42
 2014-04-15 12:18:42 +02:00
Kersten Jeremy 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
Thibault Delavallée 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
Kersten Jeremy 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
Denis Ledoux 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
Thibault Delavallée 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
Ravi Gohil (OpenERP) d36efd77eb [FIX] account_anglo_saxon: Enabled the multi-currency support for price diff calculation. (Maintenance Case: 606408) 
lp bug: https://launchpad.net/bugs/1304195 fixed

bzr revid: rgo@tinyerp.com-20140415094723-hly42ii5c8hdcnw4
 2014-04-15 15:17:23 +05:30
Thibault Delavallée 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
Thibault Delavallée 68312cf9f8 [MERGE] Sync with trunk 
bzr revid: tde@openerp.com-20140415093954-f4swocgxl5k5si3r
 2014-04-15 11:39:54 +02:00
Ravi Gohil (OpenERP) 87bb4e16f0 [FIX] account_anglo_saxon: Enabled the multi-currency support for price diff calculation. (Maintenance Case: 606408) 
lp bug: https://launchpad.net/bugs/1304195 fixed

bzr revid: rgo@tinyerp.com-20140415093818-ckfck3tc513k3lvv
 2014-04-15 15:08:18 +05:30
Ravi Gohil (OpenERP) 8f59d71f3a [FIX] account_anglo_saxon: Enabled the multi-currency support for price diff calculation. (Maintenance Case: 606408) 
bzr revid: rgo@tinyerp.com-20140415092608-hplfg4ftsuxhu7rh
 2014-04-15 14:56:08 +05:30
Thibault Delavallée 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
Richard Mathot (OpenERP) 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
Ravi Gohil (OpenERP) 4a8168a7dc [FIX] account_anglo_saxon: Enabled the multi-currency support for price diff calculation. (Maintenance Case: 606408) 
bzr revid: rgo@tinyerp.com-20140415091428-az1rx5ngz79j4fh6
 2014-04-15 14:44:28 +05:30
Denis Ledoux 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
Launchpad Translations on behalf of openerp 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
Kersten Jeremy 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
Kersten Jeremy 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
Kersten Jeremy faa899adde [FIX] Reactive watcher 
bzr revid: jke@openerp.com-20140414163412-88seef6j58xiamug
 2014-04-14 18:34:12 +02:00
Martin Trigaux 9f3a2f84e0 [ADD] website_forum: more badges 
bzr revid: mat@openerp.com-20140414155344-v580tpy5l12z9v95
 2014-04-14 17:53:44 +02:00
Kersten Jeremy 552a23a4bd [FIX] Remove watcher 
bzr revid: jke@openerp.com-20140414153537-0qjlnqqnk0q9utn0
 2014-04-14 17:35:37 +02:00
Kersten Jeremy 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
Kersten Jeremy 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
Martin Trigaux 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
Raphael Collet 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
Richard Mathot (OpenERP) 8ff2bb683f [MERGE][FIX] Mobile preview of blogs 
bzr revid: rim@openerp.com-20140414144407-cz3fmydj8vpzl7n6
 2014-04-14 16:44:07 +02:00
Thibault Delavallée 48d7a6fa6c [CLEAN] mass_mailing: rmeoved dead stuff 
bzr revid: tde@openerp.com-20140414144011-awu4g35etq9s4gje
 2014-04-14 16:40:11 +02:00