Frédéric van der Essen [Thu, 24 Apr 2014 17:12:59 +0000 (19:12 +0200)]
[IMP] point_of_sale, hw_scale: first commit for the hw_scale module, which handles scale connections for the POS
bzr revid: fva@openerp.com-
20140424171259-hi9ma6w0fkdfrqnv
Kunal Chavda [Thu, 17 Apr 2014 16:28:20 +0000 (18:28 +0200)]
[MERGE] [IMP] website: tour: nice smooth cool and sexy effect when closing
or ending the tour.
bzr revid: tde@openerp.com-
20140417162820-bdcpdenddqxzj949
Amit Vora [Thu, 17 Apr 2014 14:56:45 +0000 (16:56 +0200)]
[MERGE] [IMP] crm: improved call / meeting buttons and behavior on lead and partner form view.
- improved behavior of schedule a meeting, for both opportunities and partner, with correct
attendees and options;
- removed wizard to schedule a cal, jumping to the list view with correct default values
is sufficient;
- scheduled calls is now accessible using a group, accessible through sales configuration;
bzr revid: tde@openerp.com-
20140417145645-cpohfrfpqnskpok6
Darshan Kalola [Thu, 17 Apr 2014 14:55:22 +0000 (16:55 +0200)]
[MERGE] [IMP] res_partner: correctly take the 'use parent address'
into account in the onchange. Slightly updated the view that was weird with this parameter.
bzr revid: tde@openerp.com-
20140417145522-yte3976um2a1t0dr
Cedric Snauwaert [Thu, 17 Apr 2014 14:15:19 +0000 (16:15 +0200)]
[MERGE]tooltip: replace tipsy by bootstrap tooltip
bzr revid: csn@openerp.com-
20140417141519-2gbldof1uboli23s
Cedric Snauwaert [Thu, 17 Apr 2014 14:14:47 +0000 (16:14 +0200)]
[MERGE]tooltip: replace tipsy by bootstrap tooltip
bzr revid: csn@openerp.com-
20140417141447-8ou48355igzbggaw
Cedric Snauwaert [Thu, 17 Apr 2014 14:04:52 +0000 (16:04 +0200)]
[FIX]tooltip: when not in debug mode, display tooltip in form view with bootstrat as well
bzr revid: csn@openerp.com-
20140417140452-afqwxqv8pbvpbs3m
Cedric Snauwaert [Thu, 17 Apr 2014 12:29:46 +0000 (14:29 +0200)]
[FIX]tooltip: remove old and not necessary tooltip line from pos start widget
bzr revid: csn@openerp.com-
20140417122946-n8pq7ln66yg0n49m
Darshan Kalola [Thu, 17 Apr 2014 11:42:32 +0000 (13:42 +0200)]
[MERGE] [IMP] kanban: take into account information
about whether creating / deleting / editing coumns in the kanban view is allowed
for the current user. This revision comes with a server revision that adds the
info, and an addons branch that fixes the rights in project and recruitment.
bzr revid: tde@openerp.com-
20140417114232-zd7ppgr9agrwuv4j
Darshan Kalola [Thu, 17 Apr 2014 11:41:33 +0000 (13:41 +0200)]
[MERGE] [IMP] project, hr_recruitment: fixed access rights on stages.
Projec/Recruitment Users can now just read columns; managers can edit and unlink them.
With the server and web branch, this allows to restrict the actions the user can perform
on columns according to its access rights.
bzr revid: tde@openerp.com-
20140417114133-qhi281thgsy39tlj
Darshan Kalola [Thu, 17 Apr 2014 11:40:33 +0000 (13:40 +0200)]
[MERGE] [IMP] ir_ui_view: kanban view: also add action_enabled information
about the columns in kanban view. This allows to display the 'create a new column', as well as 'edit' or 'delete'
options on column in kanban view, based on the users' access rights.
bzr revid: tde@openerp.com-
20140417114033-39rez93cmcwask69
Darshan Kalola (OpenERP) [Thu, 17 Apr 2014 10:20:52 +0000 (15:50 +0530)]
[MERGE]sync with trunk.
bzr revid: dka@tinyerp.com-
20140417102052-b84zv8e1m32jo19j
Darshan Kalola (OpenERP) [Thu, 17 Apr 2014 10:12:19 +0000 (15:42 +0530)]
[IMP]removed use_company_address method, added same feature in single method, to achive this added new parameter 'empty_fields' to empty all address field when use compny address is unchecked.
bzr revid: dka@tinyerp.com-
20140417101219-gs68pfe64a7l97hc
Cedric Snauwaert [Thu, 17 Apr 2014 09:59:44 +0000 (11:59 +0200)]
[FIX]tooltip: should not use placement auto since it is currently bugged in bootstrap
(see: https://github.com/twbs/bootstrap/issues/13268)
bzr revid: csn@openerp.com-
20140417095944-3k2c8829tm6lmxmo
Amit Vora [Thu, 17 Apr 2014 09:41:33 +0000 (11:41 +0200)]
[MERGE] [IMP] mail: Inbox usability improvements :
- notficiation_email_send field, renamed into notify_email, has now 2 values: always or never, in
order to ease the choice and simplify options.
- inbox: removed 'compose a new messages or write to my followers', because those 2 options are
already available. The first one is accessible using the top-right email icon, the second one
is accessible with the 'write to my followers' text box alread present in the inbox.
bzr revid: tde@openerp.com-
20140417094133-8ip7vuy6b30xlc32
Richard Mathot (OpenERP) [Thu, 17 Apr 2014 09:16:21 +0000 (11:16 +0200)]
[MERGE][FIX] sale: disallow line creation on confirmed sales orders
[patch by Divyesh Makwana (OpenERP)]
bzr revid: rim@openerp.com-
20140417091621-tztz9tzhi8g85ymq
Amit Vora [Thu, 17 Apr 2014 09:10:32 +0000 (11:10 +0200)]
[MERGE] [FIX] web: fixed layout of radio buttons that were
a bit lower than the following text.
bzr revid: tde@openerp.com-
20140417091032-qu9uto3g535f2ej5
Cedric Snauwaert [Thu, 17 Apr 2014 09:05:15 +0000 (11:05 +0200)]
[FIX]bootstrap tooltip cleaned from trunk-tipsy-to-bootstrap
bzr revid: csn@openerp.com-
20140417090515-l1ku2kdc0lzadjxg
Cedric Snauwaert [Thu, 17 Apr 2014 09:01:53 +0000 (11:01 +0200)]
[MERGE]merge with latest trunk
bzr revid: csn@openerp.com-
20140417090153-m6d65ubew0wlr9ic
Cedric Snauwaert [Thu, 17 Apr 2014 08:59:54 +0000 (10:59 +0200)]
[FIX]tooltip: overwrite bootstrap default for tooltip
bzr revid: csn@openerp.com-
20140417085954-mirh4eeotsorlyeo
Thibault Delavallée [Thu, 17 Apr 2014 08:21:33 +0000 (10:21 +0200)]
[MERGE] [IMP] Hide the group 'Manage resources planning on gantt view' from project settings
bzr revid: tde@openerp.com-
20140417082133-r6te0x6x0gtop70n
Quentin (OpenERP) [Wed, 16 Apr 2014 15:44:50 +0000 (17:44 +0200)]
[FIX] fields.date's date_to_datime function fixed
bzr revid: qdp-launchpad@openerp.com-
20140416154450-ws9w6wzf9s5kmjjj
Launchpad Translations on behalf of openerp [Thu, 17 Apr 2014 05:55:23 +0000 (05:55 +0000)]
Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-
20140417055523-1cxq9nzdf7w0rr20
Christophe Simonis [Wed, 16 Apr 2014 17:01:52 +0000 (19:01 +0200)]
[FIX] hr*: must depend on "report" module
bzr revid: chs@openerp.com-
20140416170152-v8gzd8jfqts88vdb
Christophe Simonis [Wed, 16 Apr 2014 16:11:59 +0000 (18:11 +0200)]
[MERGE] {gamification,gamification_sale_crm,website_forum}: Removing the field autojoin_group_id to replace the subscription by a domain
bzr revid: chs@openerp.com-
20140416161159-bmwz40dyce0hporw
Richard Mathot (OpenERP) [Wed, 16 Apr 2014 15:40:25 +0000 (17:40 +0200)]
[MERGE][IMP] survey: basic usability for quiz mode
Users with Technical Featurs are now able to enable a "quiz mode" on surveys:
- questions with simple and multiple choice can be autocorrected
- an answer with positive mark is considered as correct
- users that finish a survey can see a detailed correction with correct answers and their scores
- other questions types can be manually rated by a human corrector
bzr revid: rim@openerp.com-
20140416154025-jxv05o8buhtverau
Martin Trigaux [Wed, 16 Apr 2014 15:34:28 +0000 (17:34 +0200)]
[FIX] gamification_sale_crm: incorrect domain
bzr revid: mat@openerp.com-
20140416153428-l1p4ju4vvgwe6e5z
Martin Trigaux [Wed, 16 Apr 2014 15:31:53 +0000 (17:31 +0200)]
[FIX] gamification: test needs cron to run
bzr revid: mat@openerp.com-
20140416153153-f6r85uc8ibztzvup
Martin Trigaux [Wed, 16 Apr 2014 15:22:08 +0000 (17:22 +0200)]
[IMP] use char_domain widget
bzr revid: mat@openerp.com-
20140416152208-1rnyyvr35m0kj5cm
Cedric Snauwaert [Wed, 16 Apr 2014 15:16:46 +0000 (17:16 +0200)]
[FIX]modal: missing new object instanciation in dashboard
bzr revid: csn@openerp.com-
20140416151646-aoc4myqsxruqovc3
Cedric Snauwaert [Wed, 16 Apr 2014 15:15:43 +0000 (17:15 +0200)]
[FIX]modal: button were not showing in calendar
bzr revid: csn@openerp.com-
20140416151543-im41f9rpqj6ll742
Richard Mathot (OpenERP) [Wed, 16 Apr 2014 15:14:20 +0000 (17:14 +0200)]
[MERGE] from trunk
bzr revid: rim@openerp.com-
20140416151420-akuf1ocyljk1d1zw
Martin Trigaux [Wed, 16 Apr 2014 15:14:10 +0000 (17:14 +0200)]
[FIX] forum: conversion of incorrect group to domain
bzr revid: mat@openerp.com-
20140416151410-d59osro704v2zfdq
Richard Mathot (OpenERP) [Wed, 16 Apr 2014 15:13:20 +0000 (17:13 +0200)]
[IMP] Score for each question
bzr revid: rim@openerp.com-
20140416151320-1zsxsss60zi9w11y
Martin Trigaux [Wed, 16 Apr 2014 15:10:26 +0000 (17:10 +0200)]
[FIX] gamification: convert autojoin_group_id to a domain representing the list of users
bzr revid: mat@openerp.com-
20140416151026-lmvyo8k0wo4hw9gn
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
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
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
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
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
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
Simon Lejeune [Wed, 16 Apr 2014 14:05:03 +0000 (16:05 +0200)]
[MERGE] trunk
bzr revid: sle@openerp.com-
20140416140503-cq7atc8f1mwq3ond
Cedric Snauwaert [Wed, 16 Apr 2014 13:46:55 +0000 (15:46 +0200)]
[FIX]few errors
bzr revid: csn@openerp.com-
20140416134655-1e4q8e8i30qj9y7t
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
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
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
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
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
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
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
Cedric Snauwaert [Wed, 16 Apr 2014 10:26:59 +0000 (12:26 +0200)]
[MERGE]clean and refactored tooltip from branch trunk-tipsy-to-boostrap
bzr revid: csn@openerp.com-
20140416102659-vft9tfuqmax0qx3q
Richard Mathot (OpenERP) [Wed, 16 Apr 2014 10:14:00 +0000 (12:14 +0200)]
[MERGE] from trunk
bzr revid: rim@openerp.com-
20140416101400-4hvdv1z59sl6zqgw
Richard Mathot (OpenERP) [Wed, 16 Apr 2014 10:11:29 +0000 (12:11 +0200)]
[IMP] Highlight the right answer in MCQ correction mode
bzr revid: rim@openerp.com-
20140416101129-t33z38q7ez0358gh
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
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
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
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
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
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
DJ Patel [Wed, 16 Apr 2014 04:32:34 +0000 (10:02 +0530)]
[Merge] Merged with trunk.
bzr revid: mdi@tinyerp.com-
20140416043234-ygtv29jxhiq1io0e
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
Darshan Kalola (OpenERP) [Tue, 15 Apr 2014 12:35:11 +0000 (18:05 +0530)]
[MERGE]sync with trunk.
bzr revid: dka@tinyerp.com-
20140415123511-61vax59dl6476zjb
Darshan Kalola (OpenERP) [Tue, 15 Apr 2014 12:32:58 +0000 (18:02 +0530)]
[MERGE]sync with trunk.
bzr revid: dka@tinyerp.com-
20140415123258-dx6ynazg52064xfb
Richard Mathot (OpenERP) [Tue, 15 Apr 2014 11:50:17 +0000 (13:50 +0200)]
[REF] Terminology
bzr revid: rim@openerp.com-
20140415115017-wfbtidj4eypxyw8r
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
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
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
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
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
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
Richard Mathot (OpenERP) [Tue, 15 Apr 2014 11:04:38 +0000 (13:04 +0200)]
[MERGE] from trunk
bzr revid: rim@openerp.com-
20140415110438-thh0io5aunro4kfl
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
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
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
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