Commit Graph

89213 Commits

Author SHA1 Message Date
Antony Lesuisse 1a2c3b1029 [FIX] git config for pull 2014-06-23 12:50:57 +02:00
Antony Lesuisse fd21912cfe [FIX] move back setup to root 2014-06-23 12:50:57 +02:00
Christophe Matthieu 2e2e6f8b5b Merge pull request #623 from odoo-dev/master-website-session-geoip-chm
[IMP] website: set geoip in user session
2014-06-23 12:47:56 +02:00
Thibault Delavallée 5739f3a2f9 Merge pull request #683 from odoo-dev/master-ref-reply_to-tde
[REF] mail, crm, hr_recruitment, project, project_issue: simplified repl.y-to of notification emails (now displaying 'YourCompany -docname- ' instead of 'Followers of ...'; added same_thread directly on the mail.message model to ease the reply_to and message-id computation; factorized a bit the reply-to generation for a batch of records; udpated tests accordingly.
2014-06-23 12:11:07 +02:00
odony 5c0804eaef Merge pull request #520 from odoo-dev/master-default-order-ged
[MERGE] Add support for per-view default order in list/kanban views (task #8527)
2014-06-23 11:04:46 +02:00
Thibault Delavallée 719a4f02c9 [REF] mail, crm, hr_recruitment, project, project_issue: simplified reply-to of notification emails (now displaying 'YourCompany -docname- <email>' instead of 'Followers of ...'; added same_thread directly on the mail.message model to ease the reply_to and message-id computation; factorized a bit the reply-to generation for a batch of records; udpated tests accordingly. 2014-06-23 10:47:47 +02:00
Thibault Delavallée 4d779733ec Merge pull request #691 from odoo-dev/master-mail-headers-tde
[IMP] mail: added headers field on mail.mail, allowing to store headers data when sending notification emails. This commit in master improves the commit 839815fdd4 (saas-5) that was using computed but not stored values.
2014-06-23 10:23:54 +02:00
Christophe Matthieu bad13f0234 merge upstream 2014-06-23 10:07:56 +02:00
Thibault Delavallée f62f58174b [IMP] mail: added headers field on mail.mail, allowing to store headers data when sending notification emails. 2014-06-23 09:11:01 +02:00
Géry Debongnie 31a8d3db3c Merge remote-tracking branch 'odoo/master' into master-default-order-list-ged 2014-06-23 08:44:24 +02:00
Christophe Simonis e862ff7033 [MERGE] forward port of branch saas-5 up to 4cb5381
Conflicts:
	openerp/addons/base/module/wizard/base_module_upgrade_view.xml
2014-06-22 15:36:10 +02:00
Christophe Simonis 4cb5381dee [MERGE] forward port of branch saas-4 up to 1f20f61 2014-06-22 15:33:22 +02:00
Christophe Simonis 1f20f61ab4 [MERGE] forward port of branch saas-3 up to 75884c3 2014-06-22 15:30:57 +02:00
Christophe Simonis 75884c3e1a [MERGE] forward port of branch 7.0 up to 7e85786 2014-06-22 13:44:30 +02:00
Christophe Simonis 631e309554 [FIX] server: log network errors via logging. ignore EPIPE 2014-06-22 13:21:34 +02:00
Christophe Simonis 0e595c4186 [FIX] werkzeug logging respect "--log-level" setting for warn, error and critical levels 2014-06-22 11:44:30 +02:00
Christophe Simonis 4cd699df15 [IMP] js testing
- output "error" if any qunit tests failed
- failed js tests are logged as errors
- when running phantomjs considere empty waiting condition or initialisation code as "true"
- lint phantomtest.js file
2014-06-22 11:31:07 +02:00
Jacques-Etienne Baudoux 7e85786b83 web: do not select the first result if click on search more
When searching for a record in a m2o field, if we click on 'search more' we loose the focus on the field and select the first suggestion (which triggers potential on_change). This prevents the selection for this case.
2014-06-20 17:41:09 +02:00
Ruchir Shukla 86c2426555 [IMP] module: warning when uninstalling modules
When a module is uninstalled, this will also uninstall modules depending of it. To avoid unexpected loss of data, this patch list the modules that will get impacted during the installation.
This also affects the configuration pages with on change warnings.
2014-06-20 17:36:26 +02:00
Christophe Matthieu e7ccf52043 Merge pull request #696 from odoo-dev/master-tour-change-retry-delay-chm
[IMP] tour.js: change delay time for retry to load a tour
2014-06-20 17:28:53 +02:00
Christophe Matthieu 081487679f [IMP] tour.js: change delay time for retry to load a tour 2014-06-20 17:27:10 +02:00
Martin Trigaux 584b0fa440 Merge pull request #534 from salvatoretrimarchi/master
l10n_hn: Update TAX amount from 12% to 15%
2014-06-20 17:23:38 +02:00
qdp-odoo 7b32559e22 Merge pull request #598 from odoo-dev/master-wmsstaging3-jco
ooookay
2014-06-20 16:55:29 +02:00
Martin Trigaux 7be384cdf2 Merge pull request #670 from franckbret/slugify
[IMP] website: Unify website slugify method behavior with or without python-slugify
2014-06-20 16:14:19 +02:00
Thibault Delavallée e57fdc074e Merge pull request #679 from odoo-dev/master-crm-claim-issue-adh
[FIX] crm_claim: remove fold checkbox on claim stages
2014-06-20 14:34:38 +02:00
Richard Mathot 866dff79df [REM] Old .bzrignore file 2014-06-20 14:21:32 +02:00
Martin Trigaux bccd75796e [IMP] web: allow fields in list view to use the attrs readonly to dynamically show and hide the fields 2014-06-20 14:11:21 +02:00
Thibault Delavallée 7e6dbf4944 Merge pull request #676 from odoo-dev/master-imp-clear-image-icon-mme
[IMP] web: binary field image: allow to remove an image and set to null
2014-06-20 13:41:55 +02:00
Mehul Mehta a6b9413a78 [ADD] Add a icon for remove pictures from product and partner 2014-06-20 12:52:24 +02:00
Christophe Simonis 6bc5218718 [MERGE] forward port of branch saas-5 up to c9f6587 2014-06-20 12:31:48 +02:00
Christophe Simonis c9f6587dbc [MERGE] forward port of branch saas-4 up to 4be9142 2014-06-20 12:30:44 +02:00
Christophe Simonis 4be9142c11 [FIX] web: regenerate messed up `base.css` during commit 5087612 2014-06-20 12:27:55 +02:00
Richard Mathot 5439be6b3c Merge pull request #672 from odoo-dev/master-survey-fix-rim
[FIX] survey: display labels in the right order in survey reportings
2014-06-20 11:49:38 +02:00
Richard Mathot 6e93af4774 [FIX] survey: display labels in the right order in survey reporting views 2014-06-20 11:45:03 +02:00
Christophe Matthieu d5c386f04a Merge pull request #671 from odoo-dev/master-tour-better-log-chm
[IMP] tour.js: improve log messages
2014-06-20 11:35:28 +02:00
Franck Bret b4afff3618 Unify website slugify method behavior with or without python-slugify, and add some unit tests 2014-06-20 11:25:44 +02:00
qdp-odoo af5ad37486 Merge pull request #666 from odoo-dev/master-statement-fixes-alot-qdp
evil pull request with fixes on the new bank statement reconciliation widget
2014-06-20 11:22:29 +02:00
odony e32cf31fa6 Merge pull request #611 from odoo-dev/saas-3-really-fix-session-expired-fme
[MERGE]  http routing: fix handle_exception logic and _authenticate exceptions

* Better separate JsonRequest and HttpRequest handling
for exceptions, so each type of request handles exception
the right way. Previously HttpRequest would supersede
JsonRequest in some cases and generate pure HTML
responses where a JSON result was expected.
* Also ensure that ir.http._authenticate() only raises
two possible exception types, hiding any other kind
of internal errors:
 - openerp.exceptions.AccessDenied
 - openerp.http.SessionExpiredException
2014-06-20 11:02:22 +02:00
Christophe Matthieu 0da4276838 [IMP] tour.js: improve log messages 2014-06-20 10:53:07 +02:00
qdp-odoo 3ac8b531f5 [IMP] account: improved demo data for bank statement reconciliation 2014-06-20 10:01:44 +02:00
qdp-odoo bc05fe262c [FIX] account: fixed the proposal of reconciliation in the bank statement for negative amounts 2014-06-20 10:01:35 +02:00
qdp-odoo 59b47119c8 [FIX] account: bank statement creation do not confuse anymore with default name 2014-06-20 10:01:23 +02:00
Cedric Snauwaert f133f397b9 [FIX]account reconciliation: filter take partner name into account if no partner defined 2014-06-20 10:01:11 +02:00
Cedric Snauwaert d59a67ed88 [FIX]account reconciliation: fix pager and filter search in widget 2014-06-20 10:00:52 +02:00
qdp-odoo f1d9683147 [IMP] account, bank statement reconciliation: bugfixes related to the use case of clearing accounts where the type is 'other' but can be reconciled (amount_residual can now be used on these accounts) 2014-06-20 10:00:41 +02:00
qdp-odoo b32e3a3f8a [FIX] account: allow to cancel a bank statement if the option is set on the bank journal 2014-06-20 09:59:09 +02:00
qdp-odoo 5e7e7cef41 [IMP] account: learn the res.partner.bank of partners in reconciliation process on bank statement + adapted l10n_be 2014-06-20 09:58:42 +02:00
Cedric Snauwaert cae213974b [FIX]account: reconciliation widget, some usability features 2014-06-20 09:58:25 +02:00
qdp-odoo 1546d022ab [FIX] account: reconciliation on structured communication has to be done on ref field, not move name 2014-06-20 09:58:14 +02:00
qdp-odoo 375dee27f6 [FIX] l10n_be_coda: fixed coda file for structured communication use case 2014-06-20 09:58:02 +02:00