Richard Mathot (OpenERP)
c55057f322
[MERGE] from trunk
...
bzr revid: rim@openerp.com-20140415110438-thh0io5aunro4kfl
2014-04-15 13:04:38 +02:00
Gery Debongnie
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
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
Randhir Mayatra rma-openerp
e25229a6da
[IMP] update depends on sale_team and sale
2014-04-15 16:08:37 +05:30
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
Barad Mahendra
6b5e3eed2e
[IMP]improve css for oe_star_left
...
bzr revid: mba@tinyerp.com-20140415094843-73octusya5941hua
2014-04-15 15:18:43 +05:30
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
Quentin (OpenERP)
b5c85bf11f
[FIX] ondelete cascade on product template of price history
...
bzr revid: qdp-launchpad@openerp.com-20140415094218-ji63eiavpniirjcj
2014-04-15 11:42:18 +02:00
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
Barad Mahendra
16e024512d
[Merge]with trunk
...
bzr revid: mba@tinyerp.com-20140415093106-xb91mel6e85mjwel
2014-04-15 15:01:06 +05:30
Barad Mahendra
12b0dfa9b5
[Merge]with trunk
...
bzr revid: mba@tinyerp.com-20140415093047-1ctqspzbofv1pt3d
2014-04-15 15:00:47 +05:30
Darshan Kalola (OpenERP)
9166c305c1
[MERGE]sync with trunk.
...
bzr revid: dka@tinyerp.com-20140415092844-u9vrtpjvwdr2ke5m
2014-04-15 14:58:44 +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
Darshan Kalola (OpenERP)
9f72ddbeac
[MERGE]sync with trunk.
...
bzr revid: dka@tinyerp.com-20140415092051-ph2i1zzxji7evwuq
2014-04-15 14:50:51 +05:30
Josse Colpaert
888e13d22e
[FIX] Add parameter in readgroup
...
bzr revid: jco@openerp.com-20140415091923-r5ipe0bevxrutxxh
2014-04-15 11:19:23 +02:00
Darshan Kalola (OpenERP)
2f9c0ad1af
[MERGE]sync with trunk.
...
bzr revid: dka@tinyerp.com-20140415091644-v0kfy7qiybm2uccl
2014-04-15 14:46:44 +05:30
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
Quentin (OpenERP)
d568c19f40
[FIX] sale_order_dates: cannot concatenate str and timedelta objects
...
bzr revid: qdp-launchpad@openerp.com-20140415090248-9gixo6c7fngbw9s6
2014-04-15 11:02:48 +02:00
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
Bharat R. Devnani (OpenERP)
aa0e0a9c6a
[MERGE] merged with main addons
...
bzr revid: bde@tinyerp.com-20140415060953-lkos2db3ddxz1i4y
2014-04-15 11:39:53 +05:30
Mehul Mehta (OpenERP)
6925bdad96
[ADD] Added a menu for 'Shopping Cart' which is available after installing website_sale and all the quotations generated in shop are directly accessable through this menu.
2014-04-15 11:14:05 +05:30
Jitendra Prajapati (OpenERP)
3b1b426e0b
[MERGE]with main branch
...
bzr revid: jpr@tinyerp.com-20140415053045-yh8qhduikoqdhz36
2014-04-15 11:00:45 +05:30
Darshan Kalola (OpenERP)
81a5dacbc4
[MERGE]sync with trunk.
...
bzr revid: dka@tinyerp.com-20140415050512-4mww4r7ntghiig37
2014-04-15 10:35:12 +05:30
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
Josse Colpaert
e77ab942f7
[IMP] Check/force availability when waiting, push rule 0 days, partially available also when one move assigned and others not
...
bzr revid: jco@openerp.com-20140414164106-bryfri6py286x0te
2014-04-14 18:41:06 +02:00
Kersten Jeremy
faa899adde
[FIX] Reactive watcher
...
bzr revid: jke@openerp.com-20140414163412-88seef6j58xiamug
2014-04-14 18:34:12 +02:00
Quentin (OpenERP)
613901196b
[FIX] sale_order_dates: date_to_datetime fixed
...
bzr revid: qdp-launchpad@openerp.com-20140414161229-f4s43qt5c5t3gedl
2014-04-14 18:12:29 +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
Simon Lejeune
a36c2fbc97
[MERGE] trunk
...
bzr revid: sle@openerp.com-20140414155333-pic1jf6equk508ml
2014-04-14 17:53:33 +02:00
Simon Lejeune
7be29e97c4
[IMP] Product pricelist converted to QWeb
...
bzr revid: sle@openerp.com-20140414155212-4l3gvys24prccln6
2014-04-14 17:52:12 +02:00
Quentin (OpenERP)
43b8d2aec1
[IMP] fields.date: added date_to_datetime function
...
bzr revid: qdp-launchpad@openerp.com-20140414153613-geu20zacxnf0swol
2014-04-14 17:36:13 +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
Quentin (OpenERP)
35d08a8e4c
[FIX] stock: hide the 'create backorder' button if nothing yet has been processed/scanned
...
bzr revid: qdp-launchpad@openerp.com-20140414145847-au62umujxnvy5nxn
2014-04-14 16:58:47 +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