pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
89,746 Commits 1 Branch 0 Tags
f61339b82cd6993f00a91149fb5dca7a2bfb8ab1
Commit Graph
89746 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Antony Lesuisse ca08f5d674 [FIX] website_membership support negative ids 2014-05-15 09:54:13 +02:00
Launchpad Translations on behalf of openerp 10db161454 Launchpad automatic translations update. 2014-05-15 06:10:52 +00:00
Launchpad Translations on behalf of openerp 69e2614641 Launchpad automatic translations update. 2014-05-15 06:10:38 +00:00
Launchpad Translations on behalf of openerp d64c1fb111 Launchpad automatic translations update. 2014-05-15 05:51:59 +00:00
Antony Lesuisse 1501c7e64b [FIX] website_partner remove controller, add support for negative ids 2014-05-15 00:43:38 +02:00
Denis Ledoux cfefd04871 [FIX] account_analytic_analysis: recurring invoices, product_id_change wasnt returning the price get from the pricelist 2014-05-14 23:51:18 +02:00
Denis Ledoux 2bcbebb0d5 [FIX] account_analysis_account: Keep price_unit to 0.0 if passed 2014-05-14 21:36:34 +02:00
Thibault Delavallée f38161608b [FIX] website_forum: fixed commit 9426: values were badly computed for the link_button template 
leading to most buttons being buggy on the forum.
 2014-05-14 18:36:58 +02:00
Martin Trigaux 4e2fe7998e [FIX] website_forum: display it as some kind of table for better display 2014-05-14 18:31:16 +02:00
Thibault Delavallée 37ccbada84 [FIX] website_sale, website_crm: website salesteam value in correct 
module.
 2014-05-14 17:34:43 +02:00
Thibault Delavallée 9b0b918ed6 [FIX] website_sale: removed now unnecessary dependency 
towards crm for website-sale, as sales_team module is a dependancy of sale.

Also reverted some changes in comments.
 2014-05-14 17:34:17 +02:00
Thibault Delavallée ae89496bbc [MERGE] Sync with trunk 2014-05-14 17:21:54 +02:00
Fabien Meghazi 2e0e242c82 [REV] Revert lazy sitemap 2014-05-14 17:11:16 +02:00
Olivier Dony 230a9c34b1 [FIX] website_forum: fix controllers losing paging and query params, allow to see own profile even without karma, add avatar controller to make the images public 2014-05-14 16:32:54 +02:00
Olivier Dony 6130ed3ce0 [IMP] website: refactor website_image controller (and placeholder), move to model to make it reusable 
It is "almost" reusable because it still depends on the global `request` variable,
this could be solved by making it an explicit parameter.
 2014-05-14 16:32:36 +02:00
Martin Trigaux 8f2bbf73ae [FIX] gamification: avoid sending reports for non-reported challenges 2014-05-14 16:15:18 +02:00
Richard Mathot (OpenERP) 8145c52dea [FIX] website_blog: display blog posts in anti-chronological order 2014-05-14 16:11:46 +02:00
Fabien Meghazi a20ccfc7d4 [FIX] lazy sitemap with generators 2014-05-14 15:48:51 +02:00
Martin Trigaux ce5ba45d45 [IMP] gamification: avoid fetching function field while we could reuse the cache system of the browse records (avoid memory errors when updating a large number of records) 2014-05-14 15:41:38 +02:00
Thibault Delavallée eadc8528ca [MERGE] [MOV] [ADD] sales_team module holding sales team related stuff. The sales team implementation has been taken out of crm, allowing to use the sales team concept without having to depend on the crm module. crm and sale now both depend on sales_team module and add their specific fields to the model. sale_crm module has been simplified by removing sales-team related stuff. The default section id on users is now located in sales_team, not in sale_crm anymore, allowing its use in both crm and sale modules. 2014-05-14 15:18:59 +02:00
Xavier Morel 477d7ad803 Merge branch 'web-trunk' 2014-05-14 15:13:35 +02:00
Xavier Morel f4d78ae738 Merge branch 'server-trunk' 
Conflicts:
	addons/mass_mailing/controllers/main.py
 2014-05-14 15:13:04 +02:00
Xavier Morel 9ac3a49257 Merge branches 'server-saas-4', 'web-saas-4' and 'addons-saas-4' into saas-4 2014-05-14 15:02:47 +02:00
Thibault Delavallée 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
Fabien Meghazi 1ce14dbe6a [FIX] survey route that is only accessed with POST verb 2014-05-14 13:58:34 +02:00
Fabien Meghazi 8e3a8bb0fe [FIX] google maps controller should be for POST only 2014-05-14 13:44:14 +02:00
Yannick Vaucher 4ed343455c Fix incompatibility with Windows using tempfile. 2014-05-14 13:22:42 +02:00
Martin Trigaux 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
Thibault Delavallée b24986d8e6 [MERGE] Sync with trunk 2014-05-14 12:51:42 +02:00
Fabien Meghazi 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
Fabien Meghazi e6e5ac048b [FIX] broken routes for pages 2014-05-14 12:11:24 +02:00
Yannick Vaucher e367a54640 fix indentation 2014-05-14 11:50:27 +02:00
Martin Trigaux 0043a58763 Forward-port of latest saas-3, up to revision 9456 (yep I missed one commit) 2014-05-14 11:01:36 +02:00
Martin Trigaux 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
Martin Trigaux 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
Kersten Jeremy 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
Richard Mathot (OpenERP) affeeeda2e [MERGE][FIX] survey: Prevent template crashing while there are no data for the survey 2014-05-14 10:10:35 +02:00
Martin Trigaux 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
Richard Mathot (OpenERP) b00783ab46 [FIX] survey: Prevent template crashing while there are no data for the survey 2014-05-14 09:47:25 +02:00
Fabien Meghazi 0d49bbb8e0 [MERGE] upstream 2014-05-14 09:27:20 +02:00
Launchpad Translations on behalf of openerp 0159a72661 Launchpad automatic translations update. 2014-05-14 06:20:49 +00:00
Launchpad Translations on behalf of openerp 994a6ec022 Launchpad automatic translations update. 2014-05-14 06:20:22 +00:00
Launchpad Translations on behalf of openerp e30348e1e0 Launchpad automatic translations update. 2014-05-14 05:55:34 +00:00
Launchpad Translations on behalf of openerp 7564f528e0 Launchpad automatic translations update. 2014-05-14 05:45:54 +00:00
Christophe Simonis a6f036d43f [FIX] website_membership: correct view and controller 2014-05-13 18:52:37 +02:00
Yannick Vaucher 72ab3e81a5 Make report_webkit thread safe by removing parser_instance attribute, as a WebkitParser instance can be shared by multiple thread and thus we don't want a thread to erase parser_instance of anorther thread. 2014-05-13 18:23:48 +02:00
Yannick Vaucher 494f1686c3 Use NamedTemporaryFile instead of file and of deprecated mktemp. That way we ensure 2 files created at the exact same time will have a unique name 2014-05-13 17:56:10 +02:00
Olivier Dony 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
Martin Trigaux 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
Xavier Morel 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