pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
88,048 Commits 1 Branch 0 Tags
37ccbada848cf42561d2c0bb68dbee06a1d62170
Commit Graph
88048 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Thibault Delavallée b24986d8e6 [MERGE] Sync with trunk 2014-05-14 12:51:42 +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
Launchpad Translations on behalf of openerp 7564f528e0 Launchpad automatic translations update. 2014-05-14 05:45:54 +00:00
Fabien Meghazi 59effb89e3 [FIX] broken domain in route 2014-05-13 15:31:24 +02:00
Thibault Delavallée 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
Thibault Delavallée 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
Thibault Delavallée e53c7748a0 [IMP] website_sale: toggle multi salesteam mode 2014-05-13 12:21:00 +02:00
Thibault Delavallée 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
Thibault Delavallée 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
Thibault Delavallée e0ea72388f [MERGE] Sync with trunk 2014-05-13 10:56:28 +02:00
Fabien Meghazi 4118f9ed0a [IMP] openerpframework moved in common asset bundle 2014-05-13 10:18:31 +02:00
Launchpad Translations on behalf of openerp 65736e0644 Launchpad automatic translations update. 2014-05-13 05:59:29 +00:00
Thibault Delavallée 7ef0d94d6e [IMP] website_sale: sale_order: add acquirer/tx data (to be improved) 2014-05-12 18:14:42 +02:00
Thibault Delavallée 2b8739cf8b [IMP] website sales salesteam: refactored implementation 
- now having a website sales sales team in website_sale;
- temporarily crm accepted as a dependency of website_sale (will be improved when sales team are
taken out of crm);
- removed website_sale_crm unnecessary module + dead code
- removed shopping cart state + its management
- added acquirer and transaction fields on sale order
- azdded use_opportunities and use_quotations fields on sales team like use_leads
 2014-05-12 17:52:10 +02:00
Fabien Meghazi 1d08697bc1 [FIX] Do not display language choice if multilang=False 2014-05-12 17:42:01 +02:00
Fabien Meghazi 4a29752451 [IMP] openerpframework moved in common asset bundle 2014-05-12 17:19:34 +02:00
Thibault Delavallée 46235aa78c [MERGE] Sync with turnk 2014-05-12 16:39:45 +02:00
Thibault Delavallée 1101c618a5 [FIX] sales_team: fixed kanban view inheritance 2014-05-12 15:58:47 +02:00
Thibault Delavallée 3af0824fa5 [FIX] crm: typo 2014-05-12 15:58:39 +02:00
Thibault Delavallée 03ee7ed00d [FIX] sales_team: indentation issue 2014-05-12 15:58:25 +02:00
Thibault Delavallée e53cadcf2a [FIX] sale: fixed import error about relativedelta 2014-05-12 15:47:12 +02:00
Thibault Delavallée 919bd97509 [MERGE] Sync with upstream (trunk) 2014-05-12 14:56:31 +02:00
Thibault Delavallée 3406b6db39 [CLEAN] sale, sale_crm: cleaning before merging. Cleaned calculation 
of default section id + removed duplicated code.
 2014-05-12 14:56:01 +02:00
Cedric Snauwaert 9d9cfd585f [FIX]sale_report: change type of field date from date to datetime to match field date on sale_order 
bzr revid: csn@openerp.com-20140512114532-726a1z0wqbpz96t8
 2014-05-12 13:45:32 +02:00
Thibault Delavallée 9199587ec9 [CLEAN] crm: cleaned crm module before merging : 
- removed unnecessary changes
- rewrote on_change_user and get_default_sectoin_id to have a correct default section
- removed duplicated code in sales_team module due to code moving not correctly cleaned
 2014-05-12 13:41:49 +02:00
Fabien Meghazi 05c598f0b3 [ADD] website.menu editable list in website config 
bzr revid: fme@openerp.com-20140512113820-oidhod8ovqp3nh9a
 2014-05-12 13:38:20 +02:00
Olivier Dony 4cecbd919f [FIX] mass_mailing,website*,survey: leftover calls to website.get_public_user() 
This method was (partially) removed at rev.9421 
rev-id al@openerp.com-20140507153223-q73u5lhyrfw98o3a

bzr revid: odo@openerp.com-20140512103935-o0ue9wzenm5wjejq
 2014-05-12 12:39:35 +02:00
Xavier Morel b39aac717d [IMP] mail, base_import: context key disabling history tracking 
* added a ``tracking_disable`` context key used by mail to completely disable
  subscriptions setup and events generation during create and write operations
* added import option to optionally set up that context key and speed up
  imports at the cost of not setting up subscriptions and not sending
  create/update events

bzr revid: xmo@openerp.com-20140512100400-d1axjam2d0i2y0tf
 2014-05-12 12:04:00 +02:00
Martin Trigaux f14f632ef5 [IMP] gamification: improve the name of some m2m relations 
bzr revid: mat@openerp.com-20140512092718-s6143ajy2g18ofy4
 2014-05-12 11:27:18 +02:00
Xavier Morel f176e65fae [IMP] mail docs 
* fill-paragraph
* remove sections referring to removed methods with no obvious replacement

bzr revid: xmo@openerp.com-20140512085546-50u4beuvakgfett8
 2014-05-12 10:55:46 +02:00
Thibault Delavallée 443c830bfc [RENAME] sale_team renamed to sales_team. Update module name, file name and reference to the module. 2014-05-12 10:37:47 +02:00
Thibault Delavallée dd531b3300 [MERGE] Sync with upstream (trunk) 2014-05-12 10:08:48 +02:00
Martin Trigaux 555d4879c8 Forward-port of latest saas-4, up to revision 9416 (rev-id fme@openerp.com-20140509164338-gnz7p3qxt8etrh5w) 
bzr revid: mat@openerp.com-20140512072331-0lidgqb6x7fregdj
 2014-05-12 09:23:31 +02:00
Paramjit Singh Sahota cce820565d Missed commit while merging. 2014-05-12 12:11:08 +05:30
Paramjit Singh Sahota 2ac1156925 [MERGE] Merged lp:openobject-addons. 2014-05-12 10:31:53 +05:30
Paramjit Singh Sahota fe9b88a3ba [REVERT] Reverted the changes of rev 9219. 2014-05-12 10:25:20 +05:30
Fabien Pinckaers 106abb6496 [FIX] css edit menu alignment and fix of / handling 
bzr revid: fp@tinyerp.com-20140511154058-kj8nn9fdl3li9nzi
 2014-05-11 17:40:58 +02:00
Fabien Pinckaers cebce64b00 [FIX] better handling of '/'. / is the first menu and not the first menu is /. Allows to move the first menu in another position 
bzr revid: fp@tinyerp.com-20140511153235-6mmygt69z45rcx4r
 2014-05-11 17:32:35 +02:00
Fabien Pinckaers 798e4156fa [IMP] sitemap cleaning: events 
bzr revid: fp@tinyerp.com-20140511143314-nzn1239l00arbxjq
 2014-05-11 16:33:14 +02:00
Fabien Pinckaers 105618443f [IMP] Sitemap 
bzr revid: fp@tinyerp.com-20140511134037-84vnn1b4zfzk8som
 2014-05-11 15:40:37 +02:00
Fabien Pinckaers 54d30d5194 [IMP] clean sitemap, enumerate pages + fixes 
bzr revid: fp@tinyerp.com-20140511115231-g8ke14r9iepyypv4
 2014-05-11 13:52:31 +02:00
Fabien Pinckaers bcbd263214 [IMP] Adding fields 
bzr revid: fp@tinyerp.com-20140511074755-5b3iy2b1xk7cjxmf
 2014-05-11 09:47:55 +02:00
Fabien Pinckaers 80ea7fe099 [IMP] removing static style 
bzr revid: fp@tinyerp.com-20140509202753-p5080kwk8dupfdrc
 2014-05-09 22:27:53 +02:00
Fabien Meghazi 09d530268f [MOV] ir.ui.view#write() forced noupdate moved in website (RTE only) 
bzr revid: fme@openerp.com-20140509164338-gnz7p3qxt8etrh5w
 2014-05-09 18:43:38 +02:00
Fabien Meghazi 501ad7abeb [IMP] dumb code 
bzr revid: fme@openerp.com-20140509151855-7v4hp08qvmac1u2d
 2014-05-09 17:18:55 +02:00