Commit Graph

88967 Commits

Author SHA1 Message Date
Denis Ledoux dd36a0e509 [FIX] mass_mailing: on mass mailing sending, set same_thread for message composer
same_thread boolean field of mail.compose.message model define wether or not replies should be posted in the thread or not
On composer creation, this boolean should be passed according to the reply_to_mode of the mass_mailing
Otherwise, all replies would be posted in the thread, and the reply_to will be ignored (if same_thread id True, reply_to is poped from the mails values, mail/wizard/mail_compose_message.py:284)
2014-06-01 22:08:56 +02:00
Denis Ledoux d6a2ae642b [FIX] mass_mailing: avoid to eval an undefined domain 2014-06-01 21:45:26 +02:00
Denis Ledoux 97c0dbcd0a [FIX] mail: do not link email to a model/res_id if this model doesn't support new message 2014-06-01 21:27:55 +02:00
Denis Ledoux 9d33ce4900 [FIX] website_sale: missing openerp.tools import 2014-06-01 20:20:21 +02:00
Christophe Simonis ea69325466 [MERGE] forward port of branch saas-5 up to revid c19bb8c 2014-06-01 14:35:54 +02:00
Christophe Simonis c19bb8ce48 [FIX] website: correct "/" redirect to first menu 2014-06-01 14:30:15 +02:00
Christophe Simonis bef99e2b16 [MERGE] forward port of branch saas-5 up to revid 587084f 2014-06-01 11:21:35 +02:00
Christophe Simonis 587084f682 [MERGE] forward port of branch saas-4 up to revid c319dc4 2014-06-01 11:19:03 +02:00
Christophe Simonis c319dc40e7 [FIX] mail: view_mode "list" does not exists, it's "tree" 2014-06-01 11:17:09 +02:00
Christophe Simonis 36f9af78aa [MERGE] forward port of branch saas-3 up to revid faace84 2014-06-01 10:56:39 +02:00
Christophe Simonis faace8493d [FIX] email_template: partners ids are integers, not strings 2014-06-01 10:52:02 +02:00
Christophe Simonis 651614db57 [MERGE] forward port of branch saas-5 up to revid 285e1d5 2014-05-31 16:09:03 +02:00
Christophe Simonis 285e1d5c38 [FIX] website_sale: so javascipt does not like tuples. use a list instead 2014-05-31 15:37:23 +02:00
Christophe Simonis f8714aca02 [MERGE] forward port of branch saas-5 up to revid 960b866 2014-05-31 14:16:10 +02:00
Christophe Simonis 960b86611e [FIX] website_sale: remove invalid (and stupid) function field 2014-05-31 14:05:48 +02:00
Olivier Dony 52501dde7a [FIX] website_mail_group: duplicate preventDefault() call (called before onclick already)
Plus it fails because `event` is not defined nor passed there (e.g. in Firefox)
2014-05-31 01:48:55 +02:00
Christophe Simonis b8d7a1b332 [REL] saas-5 2014-05-30 23:05:34 +02:00
Christophe Simonis 7dd79cb183 Merge pull request #278 from odoo-dev/master-bank-reconcile-ama
[IMP] account: bank statement reconciliation widget
2014-05-30 22:54:05 +02:00
qdp-odoo ee92839465 [FIX] account: fixed inconsistence in yaml test since some demo data was added 2014-05-30 22:25:52 +02:00
Fabien Meghazi d9def2c4a7 Simplify odoo start. Make it work everywhere 2014-05-30 21:54:54 +02:00
Fabien Meghazi fa4ed55d54 Merge remote-tracking branch 'odoo/master' into master-odoo-cmd-fme
Conflicts:
	openerpcommand/common.py
2014-05-30 21:38:15 +02:00
Fabien Pinckaers 84d194d7a1 Merge pull request #269 from sve-odoo/patch-1
[ADD] "Model" Column in base_action_rule tree view.
2014-05-30 21:26:13 +02:00
Fabien Meghazi 227709dd21 Basic support for scaffold --theme 2014-05-30 21:20:39 +02:00
Christophe Simonis 7ce927ab46 [FIX] account_bank_statement_extensions: do not extend dropped form view 2014-05-30 20:34:56 +02:00
Géry Debongnie 52a8c4cf9a [MERGE] merge from master 2014-05-30 20:21:03 +02:00
qdp-odoo f839621f52 [FIX] account_bank_statement_extension: fixed xml path in view 2014-05-30 19:28:40 +02:00
qdp-odoo 07460d7191 [IMP] account: bank statement reconciliation widget (part 3: missing files lost during manual merge (renamed)) 2014-05-30 19:04:13 +02:00
qdp-odoo e3491ccb71 [IMP] account: bank statement reconciliation widget (part 2) 2014-05-30 18:47:50 +02:00
qdp-odoo 7580b6510b [IMP] account: bank statement reconciliation widget 2014-05-30 18:34:13 +02:00
Fabien Meghazi faa60474ce Allow initialize_sys_path() to be called more than once 2014-05-30 18:25:05 +02:00
qdp-odoo 52b799d8d0 [MERGE] master-wmsstaging-jco with fixes on WMS + new barcode reports 2014-05-30 18:09:05 +02:00
Fabien Meghazi 4ca17a2afa Removed odoo.py 2014-05-30 17:37:01 +02:00
Christophe Simonis ee304fa65f [IMP] replace OpenERP by Odoo in backend + change company default logo. 2014-05-30 17:30:36 +02:00
Fabien Meghazi 83c402a93e Added odoo start command 2014-05-30 17:06:16 +02:00
qdp-odoo 0fa755bc89 [MERGE] master 2014-05-30 17:05:44 +02:00
Xavier Morel 46712acaec [FIX] bunch of changes lost in incorrect merge f4d78ae738 2014-05-30 17:00:52 +02:00
Xavier Morel d325c0caef [REV] attempt to revert incorrect removals in f4d78ae738 2014-05-30 16:00:28 +02:00
Richard Mathot 8d822419e7 [FIX] website: fix incomplete refactoring 2014-05-30 15:35:59 +02:00
Richard Mathot 29387c518e [REV][FIX] Reverting regression introduced in forward-port
04211015fc
2014-05-30 15:20:18 +02:00
Géry Debongnie 907546eaf4 Merge remote-tracking branch 'odoo/master' into master-inline-searchview-ged 2014-05-30 15:14:12 +02:00
Géry Debongnie c522fe6add [FIX] compute the correct offset to adjust view
the jquery method length() compute the height of its element, even if
it is diplay:none.  But in our case, we want the offset to be zero if
there is no visible view_manager_header.  (for example, general settings
in settings menu)
2014-05-30 15:10:18 +02:00
Géry Debongnie 3bfdcfd443 [FIX] fix the add to dashboard widget (web client)
The dashboard widget didn't work because it tried to look for its
parent view, but the searchview has been split in searchview and drawer.
This patch makes sure it looks for the data in the correct place.
2014-05-30 14:34:36 +02:00
Géry Debongnie 803b8b0b14 [FIX] change css to prevent unreachable fields
in drawer, advanced search, it can happen that the form extends out
of the drawer.  Overflow:auto at least allows the user to interact
properly with the form.
2014-05-30 12:15:48 +02:00
Géry Debongnie 18581ad851 [FIX] crop the text in drawer when it is too long 2014-05-30 12:12:49 +02:00
Fabien Meghazi 10fb6525e9 Basic support for xml data files 2014-05-30 11:35:28 +02:00
Géry Debongnie 6cbf8c5a28 [FIX] use _.isEmpty instead of Object.keys
Object.keys is not supported by all browsers (*cough* IE *cough*).
Also, bonus, isEmpty is more readable and more 'semantic'
2014-05-30 11:33:56 +02:00
Thibault Delavallée 0b54d8fb3c [FIX] website_mail_group: fixed discussion group data, wrongly forward-ported 2014-05-30 11:22:00 +02:00
Josse Colpaert 742cfe83e0 Merge remote-tracking branch 'odoo/master' into master-wmsstaging-jco 2014-05-30 11:15:51 +02:00
Géry Debongnie 080b473d1d [FIX] fix wrong conflict resolution in merge
The merge #5142037 from odoo/master in local branch was wrong.
I basically overwrote the changes from master.  This commit resolves
the issue correctly.
2014-05-30 11:03:06 +02:00
Fabien Meghazi 7f984dd6ef Added ir.model.access in manifest 2014-05-30 10:45:57 +02:00