odoo/odoo.git
10 years ago[MERGE] merged trunk up to revision 9350
Quentin (OpenERP) [Wed, 16 Apr 2014 15:05:51 +0000 (17:05 +0200)]
[MERGE] merged trunk up to revision 9350

bzr revid: qdp-launchpad@openerp.com-20140416150551-lxpscdd74mgv99r1

10 years ago[FIX] a lot a fixes or usability improvements. Includes a branch of jco as well with...
Quentin (OpenERP) [Wed, 16 Apr 2014 14:53:13 +0000 (16:53 +0200)]
[FIX] a lot a fixes or usability improvements. Includes a branch of jco as well with other fixes

bzr revid: qdp-launchpad@openerp.com-20140416145313-eiadz94h9wolhb9b

10 years ago[ADD] *: replace overriden methods get_formview_action by get_formview_id
Denis Ledoux [Wed, 16 Apr 2014 14:37:55 +0000 (16:37 +0200)]
[ADD] *: replace overriden methods get_formview_action by get_formview_id

Methods to override to specify the view/action to launch for many2one links
get_formview_action use get_formview_id to find the view to open. Therefore, it is simplier to override get_formview_id to tell which view should be opened

bzr revid: dle@openerp.com-20140416143755-07slguqn6zadqsg5

10 years ago[ADD] web: in view form, when opening a many2one, use get_formview_action method...
Denis Ledoux [Wed, 16 Apr 2014 14:35:48 +0000 (16:35 +0200)]
[ADD] web: in view form, when opening a many2one, use get_formview_action method of orm to get the window action to open

bzr revid: dle@openerp.com-20140416143548-i5l6kl00ixgd9x4w

10 years ago[ADD] osv: add get_formview_action and get_formview_id methods
Denis Ledoux [Wed, 16 Apr 2014 14:34:31 +0000 (16:34 +0200)]
[ADD] osv: add get_formview_action and get_formview_id methods
return an action to open the document. This method is meant to be
overridden in addons that want to give specific view ids for example

bzr revid: dle@openerp.com-20140416143431-syqu1ko74xt04oo5

10 years ago[FIX] website_report: added transfo.js
Simon Lejeune [Wed, 16 Apr 2014 14:11:00 +0000 (16:11 +0200)]
[FIX] website_report: added transfo.js

bzr revid: sle@openerp.com-20140416141100-11f1s3c5vfahn083

10 years ago[MERGE] hr* reports converted to QWeb
Simon Lejeune [Wed, 16 Apr 2014 14:10:49 +0000 (16:10 +0200)]
[MERGE] hr* reports converted to QWeb

bzr revid: sle@openerp.com-20140416141049-5pjrbaup5wjh9ey0

10 years ago[IMP] website_crm: designer can add input type file in form view. All files create...
chm@openerp.com [Wed, 16 Apr 2014 14:06:10 +0000 (16:06 +0200)]
[IMP] website_crm: designer can add input type file in form view. All files create an ir.attachment linked with the created lead

bzr revid: chm@openerp.com-20140416140610-wdox1ovzgm90ebh1

10 years ago[MERGE] trunk
Simon Lejeune [Wed, 16 Apr 2014 14:05:03 +0000 (16:05 +0200)]
[MERGE] trunk

bzr revid: sle@openerp.com-20140416140503-cq7atc8f1mwq3ond

10 years ago[FIX] char_domain widget: better use of options to compute the model in which
Thibault Delavallée [Wed, 16 Apr 2014 13:34:02 +0000 (15:34 +0200)]
[FIX] char_domain widget: better use of options to compute the model in which
we want to select records.

bzr revid: tde@openerp.com-20140416133402-k3qjrtieevfxz743

10 years ago[IMP] payment: renamed env field to environment, to avoid conflicts
Thibault Delavallée [Wed, 16 Apr 2014 12:10:55 +0000 (14:10 +0200)]
[IMP] payment: renamed env field to environment, to avoid conflicts
with the incoming new API.

bzr revid: tde@openerp.com-20140416121055-01ygh1zer7cfv98a

10 years ago[FIX]modal not correctly destroying from DOM at exit
Cedric Snauwaert [Wed, 16 Apr 2014 12:00:34 +0000 (14:00 +0200)]
[FIX]modal not correctly destroying from DOM at exit

bzr revid: csn@openerp.com-20140416120034-sps3a7dc2mgpwfzt

10 years ago[MERGE] [REF] mass_mailing refactoring. Mass mailing is refactored to be easier to...
Thibault Delavallée [Wed, 16 Apr 2014 11:51:52 +0000 (13:51 +0200)]
[MERGE] [REF] mass_mailing refactoring. Mass mailing is refactored to be easier to use, introducing an easy-to-use way of handling recipients, mailing lists and statistics. This branch comes with a web branch that introduce the char_domain widget, that is a widget on a char field holding a domain. It allows to select and count records without having to deal with the complexity of domains.

This branch comes with a cleaning of marketing modules :
- marketing now holds only the basic stuff for marketing related modules: mainly marketing settings + menu definition
- marketing_crm new module is a bridge between crm and marketing and holds the crm-related stuff previously present in marketing module.

This branch also holds some mail and template improvement in order to speedup the mass mailing process. The template edition in website_mail has also be improved. It is now a page that allows to edit email-like content (content with a subject, an email_from and a body), like templates, emails or mass mailing.

Misc :
- mail_compose_message: removed unnecessary fields coming from the template (partner_to, ...) because they are confusing -> composer should be easier to understand and use; also cleaned method generating the email values in the composer that was splitted in two methods
- fixed removed double body computation when using templates (one for template, then the wizard -> not necessary)
- mail_message: record_name is not a function field anymore, but a char field + a method in create, allowing to speedup mass mailing by avoiding browsing all records to get their name

bzr revid: tde@openerp.com-20140416115152-tnitidd4v6w37hyp

10 years ago[MERGE] [ADD] web: form: added FieldCharDomain widget. This widget works on a char...
Thibault Delavallée [Wed, 16 Apr 2014 11:49:38 +0000 (13:49 +0200)]
[MERGE] [ADD] web: form: added FieldCharDomain widget. This widget works on a char field and is used to manage a domain. It allows to select records in a list view and to store the domain in the field, without having to deal with the complexity of writing domains.

[ADD] web: form: added FieldBarChart widget. This widget works on char field and display a serialized list of values as a barchart. This is used in stat buttons, like percent pie or stat info, to display a summary of some data on form view.

[IMP] web: some fixes and improvements in the stat buttons.

[IMP] web: list view: buttons in list view can now be text button, not only icon-based buttons. Icons are so v6 and not swag.

bzr revid: tde@openerp.com-20140416114938-3qsv8b8dumw5x4pj

10 years ago[MERGE] Sync with trunk
Thibault Delavallée [Wed, 16 Apr 2014 11:17:21 +0000 (13:17 +0200)]
[MERGE] Sync with trunk

bzr revid: tde@openerp.com-20140416111721-g2vw6140a3adhk6y

10 years ago[IMP] website_mail: make the template / mail editor work. We now have a limited
Thibault Delavallée [Wed, 16 Apr 2014 10:59:01 +0000 (12:59 +0200)]
[IMP] website_mail: make the template / mail editor work. We now have a limited
set of fields that we try to edit (body_html and body for body, email_from and email for
email-from, name and subject for subject), because t-field is not dynamic. If the model
that should be edited does not hold those fields, the mail editor won't work.

Also fixed editor not being actiated when going into the body edition.

bzr revid: tde@openerp.com-20140416105901-vavkh9erjsq4mof9

10 years ago[MERGE] qweb-m2o-view - Allow to use many2one for qweb template (work also with view_id)
Kersten Jeremy [Wed, 16 Apr 2014 08:54:07 +0000 (10:54 +0200)]
[MERGE] qweb-m2o-view - Allow to use many2one for qweb template (work also with view_id)

bzr revid: jke@openerp.com-20140416085407-krltmt3jhw802a5c

10 years ago[MERGE] Allow to use many2one for qweb template (work also with view_id)
Kersten Jeremy [Wed, 16 Apr 2014 08:51:36 +0000 (10:51 +0200)]
[MERGE] Allow to use many2one for qweb template (work also with view_id)

bzr revid: jke@openerp.com-20140416085136-xxqsqjyie5vtf6f3

10 years ago[FIX] email_template: back to partner_ids generation when using templates
Thibault Delavallée [Wed, 16 Apr 2014 08:39:46 +0000 (10:39 +0200)]
[FIX] email_template: back to partner_ids generation when using templates

bzr revid: tde@openerp.com-20140416083946-2qlv0liu8doshh9q

10 years ago[MERGE] Sync with trunk
Thibault Delavallée [Wed, 16 Apr 2014 08:29:25 +0000 (10:29 +0200)]
[MERGE] Sync with trunk

bzr revid: tde@openerp.com-20140416082925-eph1x8vnwj6o31rt

10 years ago[MERGE] Sync with trunk
Thibault Delavallée [Wed, 16 Apr 2014 08:29:17 +0000 (10:29 +0200)]
[MERGE] Sync with trunk

bzr revid: tde@openerp.com-20140416082917-lnqc60vm3cid3gl6

10 years ago[IMP] mail, mass_mailing: using a _mail_mass_mailing class attribute
Thibault Delavallée [Wed, 16 Apr 2014 08:28:51 +0000 (10:28 +0200)]
[IMP] mail, mass_mailing: using a _mail_mass_mailing class attribute
it is now possible to compute models allowing mass mailing using mass_mailing_campaign
module. This allows to completely remove the bridges modules, using a more generic
controller for unsubscription.

bzr revid: tde@openerp.com-20140416082851-8duo6yrwr5hwd8c2

10 years ago[IMP] hr* reports converted to qweb
Simon Lejeune [Tue, 15 Apr 2014 19:19:11 +0000 (21:19 +0200)]
[IMP] hr* reports converted to qweb

bzr revid: sle@openerp.com-20140415191911-0rttsd7ayk6exm6u

10 years ago[IMP] gamification and website_forum improvements
Martin Trigaux [Tue, 15 Apr 2014 16:24:00 +0000 (18:24 +0200)]
[IMP] gamification and website_forum improvements

gamification:
- fix batch mode when grouping by id
- fix subquery in batch mode when a ending date is set
- serialisation method can exclude categories of challenge
- view improvements

website_forum:
- enabling bages in batch mode
- fix karma computation when creating a new post
- changing previous vote affects the user karma
- do not display forum challenges on user home page

bzr revid: mat@openerp.com-20140415162400-78cklbdw0bmn94zr

10 years ago[IMP] orm: postprocess function field values in batch
Christophe Simonis [Tue, 15 Apr 2014 16:23:21 +0000 (18:23 +0200)]
[IMP] orm: postprocess function field values in batch

bzr revid: chs@openerp.com-20140415162321-l8hgeh6s48252zhl

10 years ago[FIX] gamification: the subquery domain should use less than for ending dates
Martin Trigaux [Tue, 15 Apr 2014 16:15:38 +0000 (18:15 +0200)]
[FIX] gamification: the subquery domain should use less than for ending dates

bzr revid: mat@openerp.com-20140415161538-mdfadjjih90wuj3d

10 years ago[FIX] mass_mailing: fixed issue when generating unsubscirbe urlé
Thibault Delavallée [Tue, 15 Apr 2014 16:07:43 +0000 (18:07 +0200)]
[FIX] mass_mailing: fixed issue when generating unsubscirbe urlé

bzr revid: tde@openerp.com-20140415160743-5i0pjieo4o031ico

10 years ago[REM] mass_mailing: removed now dead code
Thibault Delavallée [Tue, 15 Apr 2014 15:47:54 +0000 (17:47 +0200)]
[REM] mass_mailing: removed now dead code

bzr revid: tde@openerp.com-20140415154754-60uvhxt8ho78pdqd

10 years ago[IMP] mail, mass_mailing: better recipientsz computation
Thibault Delavallée [Tue, 15 Apr 2014 15:47:00 +0000 (17:47 +0200)]
[IMP] mail, mass_mailing: better recipientsz computation
for mass mailing, composer and template. This allows to have one method computing recipints
and avoid repetiting myself.

bzr revid: tde@openerp.com-20140415154700-zu2izvxfjq1k4h4a

10 years ago[CLEAN] Removed commented print
Thibault Delavallée [Tue, 15 Apr 2014 14:49:43 +0000 (16:49 +0200)]
[CLEAN] Removed commented print

bzr revid: tde@openerp.com-20140415144943-ov6g4n9tzjxtwlk9

10 years ago[REM] mass_mailing sub-modules: removed deda code
Thibault Delavallée [Tue, 15 Apr 2014 14:34:52 +0000 (16:34 +0200)]
[REM] mass_mailing sub-modules: removed deda code

bzr revid: tde@openerp.com-20140415143452-igpz14t4xjqta6dn

10 years ago[REM] mail: compose message: removed unnecessary code
Thibault Delavallée [Tue, 15 Apr 2014 14:33:43 +0000 (16:33 +0200)]
[REM] mail: compose message: removed unnecessary code

bzr revid: tde@openerp.com-20140415143343-on2d3j92o6zifq59

10 years ago[MERGE] forward port of branch saas-3 up to revid 9409 dle@openerp.com-20140415101427...
Christophe Simonis [Tue, 15 Apr 2014 14:29:34 +0000 (16:29 +0200)]
[MERGE] forward port of branch saas-3 up to revid 9409 dle@openerp.com-20140415101427-a6r7lgy50x9bdah3

bzr revid: chs@openerp.com-20140415142934-rlka4vkxd34fkil8

10 years ago[MERGE] forward port of branch saas-3 up to revid 4000 dle@openerp.com-20140415130951...
Christophe Simonis [Tue, 15 Apr 2014 14:29:10 +0000 (16:29 +0200)]
[MERGE] forward port of branch saas-3 up to revid 4000 dle@openerp.com-20140415130951-ckuv8nsl17qkb300

bzr revid: chs@openerp.com-20140415142910-c3fqzce7wju83f5e

10 years ago[MERGE] forward port of branch saas-3 up to revid 5116 chs@openerp.com-20140415133650...
Christophe Simonis [Tue, 15 Apr 2014 14:05:48 +0000 (16:05 +0200)]
[MERGE] forward port of branch saas-3 up to revid 5116 chs@openerp.com-20140415133650-y46i0o3qkb2atbvi

bzr revid: chs@openerp.com-20140415140548-rlg9uypv78pywqhc

10 years ago[FIX] mass_mailing: fixed demo data
Thibault Delavallée [Tue, 15 Apr 2014 13:58:46 +0000 (15:58 +0200)]
[FIX] mass_mailing: fixed demo data

bzr revid: tde@openerp.com-20140415135846-ql9883kwc3skqelo

10 years ago[IMP] mass_mailing: cleaned demo data
Thibault Delavallée [Tue, 15 Apr 2014 13:51:57 +0000 (15:51 +0200)]
[IMP] mass_mailing: cleaned demo data

bzr revid: tde@openerp.com-20140415135157-blrw8vcv66nzs6wa

10 years ago[FIX] chardomain field: fixed button action
Thibault Delavallée [Tue, 15 Apr 2014 13:51:45 +0000 (15:51 +0200)]
[FIX] chardomain field: fixed button action

bzr revid: tde@openerp.com-20140415135145-1wks35wufs9b1etq

10 years agoAllow overwrite of the serialising method to exclude some categories in the challenge...
Martin Trigaux [Tue, 15 Apr 2014 13:48:09 +0000 (15:48 +0200)]
Allow overwrite of the serialising method to exclude some categories in the challenge search

bzr revid: mat@openerp.com-20140415134809-uconkvnp0z32jxjs

10 years ago[MOVE] Moved mass mailing chardomain widget to web.
Thibault Delavallée [Tue, 15 Apr 2014 13:39:33 +0000 (15:39 +0200)]
[MOVE] Moved mass mailing chardomain widget to web.

bzr revid: tde@openerp.com-20140415133933-1uqlj3yujdwozz2m

10 years ago[ADD] web: form: added char domain widget coming from mass_mailing. This widget
Thibault Delavallée [Tue, 15 Apr 2014 13:39:14 +0000 (15:39 +0200)]
[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

10 years ago[MERGE] forward port of branch 7.0 up to revid 5281 launchpad_translations_on_behalf_...
Christophe Simonis [Tue, 15 Apr 2014 13:36:50 +0000 (15:36 +0200)]
[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

10 years ago[FIX] web: fixed iamge buttons taking 2 lines
Thibault Delavallée [Tue, 15 Apr 2014 13:26:55 +0000 (15:26 +0200)]
[FIX] web: fixed iamge buttons taking 2 lines

bzr revid: tde@openerp.com-20140415132655-029ulw9jgeut4bce

10 years ago[REV] Reverted changes about sidebar as we now have
Thibault Delavallée [Tue, 15 Apr 2014 13:25:28 +0000 (15:25 +0200)]
[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

10 years agoOne morning I shot an elephant in my pajamas. How he got in my pajamas, I don't know.
Martin Trigaux [Tue, 15 Apr 2014 13:19:29 +0000 (15:19 +0200)]
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

10 years ago[MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 4174 revid:dle@openerp.com...
Denis Ledoux [Tue, 15 Apr 2014 13:09:51 +0000 (15:09 +0200)]
[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

10 years ago[FIX] web_kanban: show more button of kanban view behind the kanban cards on (ie9)
Denis Ledoux [Tue, 15 Apr 2014 13:07:32 +0000 (15:07 +0200)]
[FIX] web_kanban: show more button of kanban view behind the kanban cards on (ie9)

bzr revid: dle@openerp.com-20140415130732-bud8xb3pzgxw2imr

10 years ago[FIX] mass_mailing: various fixed in chardomain widget
Thibault Delavallée [Tue, 15 Apr 2014 12:52:22 +0000 (14:52 +0200)]
[FIX] mass_mailing: various fixed in chardomain widget

bzr revid: tde@openerp.com-20140415125222-uzvzgzo5gx6hmgor

10 years ago[FIX] mass_mailing: fixed email sending
Thibault Delavallée [Tue, 15 Apr 2014 11:39:44 +0000 (13:39 +0200)]
[FIX] mass_mailing: fixed email sending

bzr revid: tde@openerp.com-20140415113944-hjwjc2lh4ydzugr1

10 years ago[FIX] mass_mailing: form view: usability imp
Thibault Delavallée [Tue, 15 Apr 2014 11:39:34 +0000 (13:39 +0200)]
[FIX] mass_mailing: form view: usability imp

bzr revid: tde@openerp.com-20140415113934-xu033xxibolvl62w

10 years ago[MERGE] Sync with trunk
Thibault Delavallée [Tue, 15 Apr 2014 11:38:17 +0000 (13:38 +0200)]
[MERGE] Sync with trunk

bzr revid: tde@openerp.com-20140415113817-j38p3rn3j7pz2kxg

10 years ago[FIX] mail template view - Set body_html field as simple text area without cke by...
Kersten Jeremy [Tue, 15 Apr 2014 11:37:51 +0000 (13:37 +0200)]
[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

10 years agoI love the smell of napalm in the morning.
Martin Trigaux [Tue, 15 Apr 2014 11:35:45 +0000 (13:35 +0200)]
I love the smell of napalm in the morning.

bzr revid: mat@openerp.com-20140415113545-31efpjddjwqr4ajl

10 years ago[MERGE] stock_account, purchase: better usability in settings to install stock_accoun...
Quentin (OpenERP) [Tue, 15 Apr 2014 11:29:15 +0000 (13:29 +0200)]
[MERGE] stock_account, purchase: better usability in settings to install stock_account and manage options to use costing methods and invenotyr valuation

bzr revid: qdp-launchpad@openerp.com-20140415112915-k8ba71ddo1vgu0tm

10 years ago[IMP] mass_mailing :handle attachments for mailings
Thibault Delavallée [Tue, 15 Apr 2014 11:04:39 +0000 (13:04 +0200)]
[IMP] mass_mailing :handle attachments for mailings

bzr revid: tde@openerp.com-20140415110439-j72v9cnz3nml7g04

10 years ago[IMP] mass_mailing :improved demo data
Thibault Delavallée [Tue, 15 Apr 2014 10:43:37 +0000 (12:43 +0200)]
[IMP] mass_mailing :improved demo data

bzr revid: tde@openerp.com-20140415104337-gokvkpvx36wch132

10 years ago[FIX] mass_mailing: fixed graph buttons in form view + fixed stat computation
Thibault Delavallée [Tue, 15 Apr 2014 10:43:28 +0000 (12:43 +0200)]
[FIX] mass_mailing: fixed graph buttons in form view + fixed stat computation

bzr revid: tde@openerp.com-20140415104328-yll2kgxtjmg6f3hc

10 years ago[FIX] mass_mailing: fixed demo data: reply_to specified + remove create_date, not...
Thibault Delavallée [Tue, 15 Apr 2014 10:28:18 +0000 (12:28 +0200)]
[FIX] mass_mailing: fixed demo data: reply_to specified + remove create_date, not allowed

bzr revid: tde@openerp.com-20140415102818-zcm9vfc7zalg29f4

10 years ago[FIX] website_forum: mooooore baaaaaadges
Martin Trigaux [Tue, 15 Apr 2014 10:18:42 +0000 (12:18 +0200)]
[FIX] website_forum: mooooore baaaaaadges

bzr revid: mat@openerp.com-20140415101842-yf6vndw7h62q0b42

10 years ago[FIX] Website banner tour - Fix test according to new banner structure
Kersten Jeremy [Tue, 15 Apr 2014 10:14:06 +0000 (12:14 +0200)]
[FIX] Website banner tour - Fix test according to new banner structure

bzr revid: jke@openerp.com-20140415101406-54cdr44xayvyq8xo

10 years ago[FIX] mass_mailing: various fixes in campaign view and basic management
Thibault Delavallée [Tue, 15 Apr 2014 10:13:42 +0000 (12:13 +0200)]
[FIX] mass_mailing: various fixes in campaign view and basic management

bzr revid: tde@openerp.com-20140415101342-7vvadykp1udz6hgs

10 years ago[FIX] Website tour - Click inside the zone before to insert sampleText
Kersten Jeremy [Tue, 15 Apr 2014 10:08:34 +0000 (12:08 +0200)]
[FIX] Website tour - Click inside the zone before to insert sampleText

bzr revid: jke@openerp.com-20140415100834-2pstpw357y9klc89

10 years ago[MERGE][FIX] account: while refuding the invoice with payment term journal items...
Denis Ledoux [Tue, 15 Apr 2014 10:07:02 +0000 (12:07 +0200)]
[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

10 years ago[REM] mass_mailing: removed report, a graph view on statistics will be sufficient
Thibault Delavallée [Tue, 15 Apr 2014 09:58:17 +0000 (11:58 +0200)]
[REM] mass_mailing: removed report, a graph view on statistics will be sufficient

bzr revid: tde@openerp.com-20140415095817-rx7bokd6qc5rkrhq

10 years ago[FIX] ondelete cascade on product template of price history
Quentin (OpenERP) [Tue, 15 Apr 2014 09:42:18 +0000 (11:42 +0200)]
[FIX] ondelete cascade on product template of price history

bzr revid: qdp-launchpad@openerp.com-20140415094218-ji63eiavpniirjcj

10 years ago[MERGE] Sync with trunk
Thibault Delavallée [Tue, 15 Apr 2014 09:40:06 +0000 (11:40 +0200)]
[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

10 years ago[MERGE] Sync with trunk
Thibault Delavallée [Tue, 15 Apr 2014 09:39:54 +0000 (11:39 +0200)]
[MERGE] Sync with trunk

bzr revid: tde@openerp.com-20140415093954-f4swocgxl5k5si3r

10 years ago[IMP] mass_mailing: finishing refactoring for the new func flow.
Thibault Delavallée [Tue, 15 Apr 2014 09:25:03 +0000 (11:25 +0200)]
[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

10 years ago[FIX] sale_order_dates: cannot concatenate str and timedelta objects
Quentin (OpenERP) [Tue, 15 Apr 2014 09:02:48 +0000 (11:02 +0200)]
[FIX] sale_order_dates: cannot concatenate str and timedelta objects

bzr revid: qdp-launchpad@openerp.com-20140415090248-9gixo6c7fngbw9s6

10 years ago[FIX] purchase: invoiced based on invoiced bool of purchase order line, instead of...
Denis Ledoux [Tue, 15 Apr 2014 08:12:11 +0000 (10:12 +0200)]
[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

10 years agoLaunchpad automatic translations update.
Launchpad Translations on behalf of openerp [Tue, 15 Apr 2014 07:53:37 +0000 (07:53 +0000)]
Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20140415075130-aqn4mzx05l3txtkb
bzr revid: launchpad_translations_on_behalf_of_openerp-20140415075337-ulie3qkes53t8ivf

10 years ago[FIX] Fix the call of the cron due to a function which has been renamed.
Kersten Jeremy [Mon, 14 Apr 2014 20:29:36 +0000 (22:29 +0200)]
[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

10 years ago[FIX] Remove watcher, need to be review because it breaks other tests.
Kersten Jeremy [Mon, 14 Apr 2014 16:57:21 +0000 (18:57 +0200)]
[FIX] Remove watcher, need to be review because it breaks other tests.

bzr revid: jke@openerp.com-20140414165721-i8g23jxy66p1p6ao

10 years ago[FIX] Reactive watcher
Kersten Jeremy [Mon, 14 Apr 2014 16:34:12 +0000 (18:34 +0200)]
[FIX] Reactive watcher

bzr revid: jke@openerp.com-20140414163412-88seef6j58xiamug

10 years ago[FIX] sale_order_dates: date_to_datetime fixed
Quentin (OpenERP) [Mon, 14 Apr 2014 16:12:29 +0000 (18:12 +0200)]
[FIX] sale_order_dates: date_to_datetime fixed

bzr revid: qdp-launchpad@openerp.com-20140414161229-f4s43qt5c5t3gedl

10 years ago[ADD] website_forum: more badges
Martin Trigaux [Mon, 14 Apr 2014 15:53:44 +0000 (17:53 +0200)]
[ADD] website_forum: more badges

bzr revid: mat@openerp.com-20140414155344-v580tpy5l12z9v95

10 years ago[FIX] Remove watcher
Kersten Jeremy [Mon, 14 Apr 2014 15:35:37 +0000 (17:35 +0200)]
[FIX] Remove watcher

bzr revid: jke@openerp.com-20140414153537-0qjlnqqnk0q9utn0

10 years ago[FIX] Watch if jQuery is overwritted by another version in some script. If an overrid...
Kersten Jeremy [Mon, 14 Apr 2014 15:14:23 +0000 (17:14 +0200)]
[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

10 years ago[FIX] stock: hide the 'create backorder' button if nothing yet has been processed...
Quentin (OpenERP) [Mon, 14 Apr 2014 14:58:47 +0000 (16:58 +0200)]
[FIX] stock: hide the 'create backorder' button if nothing yet has been processed/scanned

bzr revid: qdp-launchpad@openerp.com-20140414145847-au62umujxnvy5nxn

10 years ago[FIX] Add prototype watch in js object. That will allow to listen change on some...
Kersten Jeremy [Mon, 14 Apr 2014 14:58:02 +0000 (16:58 +0200)]
[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

10 years ago[ADD] website_forum: self_reply field and some badges
Martin Trigaux [Mon, 14 Apr 2014 14:54:15 +0000 (16:54 +0200)]
[ADD] website_forum: self_reply field and some badges

bzr revid: mat@openerp.com-20140414145415-8g9jtp95d173183i

10 years ago[FIX] calendar: fix string quoting mess in email template
Raphael Collet [Mon, 14 Apr 2014 14:47:54 +0000 (16:47 +0200)]
[FIX] calendar: fix string quoting mess in email template

bzr revid: rco@openerp.com-20140414144754-08fgs7xnzax5uzht

10 years ago[MERGE][FIX] Mobile preview of blogs
Richard Mathot (OpenERP) [Mon, 14 Apr 2014 14:44:07 +0000 (16:44 +0200)]
[MERGE][FIX] Mobile preview of blogs

bzr revid: rim@openerp.com-20140414144407-cz3fmydj8vpzl7n6

10 years ago[CLEAN] mass_mailing: rmeoved dead stuff
Thibault Delavallée [Mon, 14 Apr 2014 14:40:11 +0000 (16:40 +0200)]
[CLEAN] mass_mailing: rmeoved dead stuff

bzr revid: tde@openerp.com-20140414144011-awu4g35etq9s4gje

10 years ago[FIX] Website_mail - Add selectors to allow drag and drop of snippet in email template
Kersten Jeremy [Mon, 14 Apr 2014 14:30:01 +0000 (16:30 +0200)]
[FIX] Website_mail - Add selectors to allow drag and drop of snippet in email template

bzr revid: jke@openerp.com-20140414143001-26p3ka7dwb1er6y0

10 years ago[FIX] wesbite: banner - remove css and use bootstrap for positionning. Now hidden...
Kersten Jeremy [Mon, 14 Apr 2014 14:26:31 +0000 (16:26 +0200)]
[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

10 years ago[FIX]modal windows: when pressing esc key, modal-backdrop was not removed
Cedric Snauwaert [Mon, 14 Apr 2014 14:06:52 +0000 (16:06 +0200)]
[FIX]modal windows: when pressing esc key, modal-backdrop was not removed

bzr revid: csn@openerp.com-20140414140652-g06gl0mguyhta5px

10 years ago[ADD] website_forum: quality badges
Martin Trigaux [Mon, 14 Apr 2014 13:51:15 +0000 (15:51 +0200)]
[ADD] website_forum: quality badges

bzr revid: mat@openerp.com-20140414135115-onmywwurr03g21dw

10 years ago[REM] removing unused and non clean modules
Fabien Pinckaers [Mon, 14 Apr 2014 13:40:26 +0000 (15:40 +0200)]
[REM] removing unused and non clean modules

bzr revid: fp@tinyerp.com-20140414134026-ruv2o1vnpxtshnoo

10 years ago[REF] hr_timesheet: unused piece of code
Richard Mathot (OpenERP) [Mon, 14 Apr 2014 13:26:34 +0000 (15:26 +0200)]
[REF] hr_timesheet: unused piece of code

bzr revid: rim@openerp.com-20140414132634-xaps5ydbic5jriw4

10 years ago[FIX] remove wrong required and readonly fields
Martin Trigaux [Mon, 14 Apr 2014 13:17:20 +0000 (15:17 +0200)]
[FIX] remove wrong required and readonly fields

bzr revid: mat@openerp.com-20140414131720-bzqd1sv0j2t5wywd

10 years ago[MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9980 revid:dle@openerp.com...
Denis Ledoux [Mon, 14 Apr 2014 13:11:46 +0000 (15:11 +0200)]
[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

10 years ago[MERGE] Merged fp's refactoring branch.
Thibault Delavallée [Mon, 14 Apr 2014 13:11:09 +0000 (15:11 +0200)]
[MERGE] Merged fp's refactoring branch.

bzr revid: tde@openerp.com-20140414131109-7ijlz4gybjd2b2oj

10 years ago[MERGE][IMP] hr_timesheet: Quick create of contract (on timesheet) does not open...
Richard Mathot (OpenERP) [Mon, 14 Apr 2014 12:55:58 +0000 (14:55 +0200)]
[MERGE][IMP] hr_timesheet: Quick create of contract (on timesheet) does not open contract edit window anymore

bzr revid: rim@openerp.com-20140414125558-zcwstm1ooa3qecpx

10 years ago[MERGE][IMP] hr_timesheet: add a menu to configure Timesheet Accounts under HR/Config...
Richard Mathot (OpenERP) [Mon, 14 Apr 2014 12:42:51 +0000 (14:42 +0200)]
[MERGE][IMP] hr_timesheet: add a menu to configure Timesheet Accounts under HR/Configuration

bzr revid: rim@openerp.com-20140414124251-5u5nu75c9q8g8zi9

10 years ago[IMP] translateable event description
Fabien Pinckaers [Mon, 14 Apr 2014 12:34:43 +0000 (14:34 +0200)]
[IMP] translateable event description

bzr revid: fp@tinyerp.com-20140414123443-qom78utc45e86lh1

10 years ago[IMP] Ticket types translateable
Fabien Pinckaers [Mon, 14 Apr 2014 12:32:31 +0000 (14:32 +0200)]
[IMP] Ticket types translateable

bzr revid: fp@tinyerp.com-20140414123231-b27qnkaujayk9j84

10 years ago[FIX] account: name_search methods used '=' or 'ilike' to search, instead of the...
Denis Ledoux [Mon, 14 Apr 2014 12:19:30 +0000 (14:19 +0200)]
[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

10 years ago[MERGE] from trunk
Richard Mathot (OpenERP) [Mon, 14 Apr 2014 11:56:04 +0000 (13:56 +0200)]
[MERGE] from trunk

bzr revid: rim@openerp.com-20140414115604-x1a32wfbxwkn3yhp

10 years ago[MERGE] from trunk
Richard Mathot (OpenERP) [Mon, 14 Apr 2014 11:53:54 +0000 (13:53 +0200)]
[MERGE] from trunk

bzr revid: rim@openerp.com-20140414115354-w8gpo3eks1rnud9k