f4d78ae738
Merge branch 'server-trunk'
...
Conflicts:
addons/mass_mailing/controllers/main.py
2014-05-14 15:13:04 +02:00
9ac3a49257
Merge branches 'server-saas-4', 'web-saas-4' and 'addons-saas-4' into saas-4
2014-05-14 15:02:47 +02:00
a5311e6900
[MOV] crm: moved css / js related to salesteam to sales_team module; sale_crm: moved data and demo data into
...
sale and sales_team module.
2014-05-14 14:30:26 +02:00
1ce14dbe6a
[FIX] survey route that is only accessed with POST verb
2014-05-14 13:58:34 +02:00
8e3a8bb0fe
[FIX] google maps controller should be for POST only
2014-05-14 13:44:14 +02:00
29565d96fe
[MERGE] [FIX] account: when computing a tax with include_base_amount enabled, include the child tax amounts into the sum for the next tax
2014-05-14 13:02:01 +02:00
b24986d8e6
[MERGE] Sync with trunk
2014-05-14 12:51:42 +02:00
240e91184b
[MERGE] sitemap backport, merge trunk from 9438 til 9440
...
merge from 9438 revid:fp@tinyerp.com-20140511115231-g8ke14r9iepyypv4 til 9440 revid:fp@tinyerp.com-20140511143314-nzn1239l00arbxjq
2014-05-14 12:44:38 +02:00
e6e5ac048b
[FIX] broken routes for pages
2014-05-14 12:11:24 +02:00
0043a58763
Forward-port of latest saas-3, up to revision 9456 (yep I missed one commit)
2014-05-14 11:01:36 +02:00
3ff7b48a81
[FIX] gamification: make sure than a cron running more than once a day will not report the progress more than once
2014-05-14 10:59:20 +02:00
583fe74ba2
Forward-port of latest saas-3, up to revision 9455 (rev-id mat@openerp.com-20140514080416-m4t23y0rxx2ot7y6)
2014-05-14 10:37:54 +02:00
02be7aa65c
[IMP] Improve Calendar synchronization
...
- Use the new fields from calendar (renamed in 9398.1.7 trunk-cal-v8-jke)
- Manage some google excpetions about token expiration
- Manage some google excpetions about token revokation
- Manage some google excpetions about 410 - Gone from google
- Detect / Allow user to change the calendar and remove all old reference.
- Use by default the since_modified for synchronization and not always a full (updatedTime in google)
- Add some key for ir_parameters :
'calendar.week_synchro' : number of week to synchornize when we are in full mode
'calendar.block_synchro_attendee' : need to synchronize the attendees between google and openerp (creation of partner)
'calendar.block_since_synchro' : Always use the full synchro. (Can be forced in "one time" removing the last synchro from res_users form)
'calendar.debug_print' : _logger is more verbose
- Pep 8
- Change behaviour of do_request to return a tuple with status raquest and response
- Add field from token and synchro date in res_users view form
2014-05-14 10:28:10 +02:00
affeeeda2e
[MERGE][FIX] survey: Prevent template crashing while there are no data for the survey
2014-05-14 10:10:35 +02:00
8ea4f581ed
Forward-port of latest 7.0, up to rev. 10046 (rev-id: launchpad_translations_on_behalf_of_openerp-20140514062049-vjclnuxlkbto0tsj)
2014-05-14 10:04:16 +02:00
b00783ab46
[FIX] survey: Prevent template crashing while there are no data for the survey
2014-05-14 09:47:25 +02:00
0d49bbb8e0
[MERGE] upstream
2014-05-14 09:27:20 +02:00
0159a72661
Launchpad automatic translations update.
2014-05-14 06:20:49 +00:00
994a6ec022
Launchpad automatic translations update.
2014-05-14 06:20:22 +00:00
e30348e1e0
Launchpad automatic translations update.
2014-05-14 05:55:34 +00:00
7564f528e0
Launchpad automatic translations update.
2014-05-14 05:45:54 +00:00
a6f036d43f
[FIX] website_membership: correct view and controller
2014-05-13 18:52:37 +02:00
7e66bd9d55
[FIX] orm.search_read: drop active_test context flag during the read() step
...
The active_test flag is meant for search(),
but when passed to search_read() it was also
propagated to the read() call.
This has little consequence normally because
read() ignores this flag, but it can have
side-effects when reading x2m fields or
function fields. They are likely to call
search() somewhere downstream, still with
the propagated active_test flag, while
it should not be applied anymore.
Ultimately dropping this flag could be
done by read() in all cases, but changing
search_read() is less likely to block
exotic cases where the flag was passed
on purpose. Moving it to read() could
be done as a later step.
2014-05-13 17:29:35 +02:00
7dbfcede36
[FIX] sale_stock: when checkign the available quantity, do not include uom as it is already present in the context and will be included in the computation of product_obj.virtual_available (opw 607150)
...
fixing error message that does not match chosen units when not enough stock
2014-05-13 17:02:13 +02:00
6369400f5b
[FIX] website_forum: restrict a bunch of controllers to POST-only, convert a few more links to buttons
2014-05-13 16:57:12 +02:00
c3cfc4bc32
[MERGE] sitemap backport, merge trunk from 9438 til 9440
...
merge from 9438 revid:fp@tinyerp.com-20140511115231-g8ke14r9iepyypv4 til 9440 revid:fp@tinyerp.com-20140511143314-nzn1239l00arbxjq
2014-05-13 16:38:31 +02:00
c50d82ddea
[FIX] crm: make days to close and days to open simple calendar delta
...
When computing the duration to close or to open a lead, do not use some kind of complex computation with working days. It does not make sense to use the number of intervals with the number of days. The computation was incorrect and very slow.
Replaced by simple calendar delta.
2014-05-13 16:09:26 +02:00
c321b3f2f7
[MERGE] upstream
2014-05-13 16:00:27 +02:00
59effb89e3
[FIX] broken domain in route
2014-05-13 15:31:24 +02:00
5bc76f63e9
[FIX] sale_stock: error message does not match chosen units when not enough stock.
2014-05-13 14:19:45 +02:00
11a9c2d409
[FIX] sale_stock: new product uom is done twice in sale order line on change - opw 607150
...
[FIX] sale_stock: comparing stock and sale order line qty is always done with default uom rounding precision
2014-05-13 14:00:06 +02:00
08c504d39e
[FIX] web: Dialog: avoid triggering "closing" twice.
2014-05-13 13:38:10 +02:00
aa08287d08
[FIX] document, mail, project: re-add tree view for attachments removed at revision 9279 and 9280
...
when adding a kanban view for documents.
2014-05-13 13:18:37 +02:00
28b20d312d
[FIX] Re-added code removed by al at rev 9421: website quotation email was not sent anymore.
2014-05-13 12:32:53 +02:00
e53c7748a0
[IMP] website_sale: toggle multi salesteam mode
2014-05-13 12:21:00 +02:00
a1e70ea0a4
[IMP] website_crm, website_sale: have only one salesteam to handle ecommerce and contact form.
...
The xml_id is now based on website.
2014-05-13 12:09:24 +02:00
119823ab84
[IMP] Redirect to language-less url on default language
2014-05-13 12:07:29 +02:00
c73a2f1c57
[FIX] restore request.website_multilang for templates
2014-05-13 12:07:20 +02:00
3ca44e9324
[FIX] partner website URLs in demo data so they can actually be embedded in website pages
2014-05-13 11:41:20 +02:00
8eed143112
[IMP] Invert multilang logic in route decorator. True by default, can be set to False explicitlty
2014-05-13 11:35:45 +02:00
3385300cb7
[IMP] website: sale_order: display acquirer only when set. The purpose is to
...
avoid maanging it from the sale order view; the website will set the acquirer
for ecommerce related orders. This way the acquirer and tx will be displayed
on the sale order linked to ecommerce sales, and not on other orders.
2014-05-13 11:01:18 +02:00
e0ea72388f
[MERGE] Sync with trunk
2014-05-13 10:56:28 +02:00
53d859ba9c
[FIX] a bunch of incomplete website URLs
2014-05-13 10:49:42 +02:00
4118f9ed0a
[IMP] openerpframework moved in common asset bundle
2014-05-13 10:18:31 +02:00
e15c0513a2
[IMP] Include openerpframework in common assets. Add module list in bundle
2014-05-13 10:17:24 +02:00
709e22c32a
[FIX] sale: sale report view, wrong domain
...
Quotations are sale.order with state draft and sent
Sale orders are sale.order with state other than draft, sent and cancel
2014-05-13 10:15:01 +02:00
f173d926c8
Launchpad automatic translations update.
2014-05-13 06:28:52 +00:00
0e41af84a9
Launchpad automatic translations update.
2014-05-13 06:28:18 +00:00
65736e0644
Launchpad automatic translations update.
2014-05-13 05:59:29 +00:00
4922c5363e
[FIX] website_{customer,partner,crm_partner_assign}: correct views and controllers
2014-05-12 19:51:21 +02:00
Xavier Morel
Thibault Delavallée
Fabien Meghazi
Martin Trigaux
Kersten Jeremy
Richard Mathot (OpenERP)
Launchpad Translations on behalf of openerp
Christophe Simonis
Olivier Dony
Anael Closson
Denis Ledoux