pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
91,124 Commits 1 Branch 0 Tags
80984ab33c6bf64c19d9cdf1df80ae492449cdaf
Commit Graph
91124 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Launchpad Translations on behalf of openerp 0e41af84a9 Launchpad automatic translations update. 2014-05-13 06:28:18 +00:00
Launchpad Translations on behalf of openerp 65736e0644 Launchpad automatic translations update. 2014-05-13 05:59:29 +00:00
Christophe Simonis 4922c5363e [FIX] website_{customer,partner,crm_partner_assign}: correct views and controllers 2014-05-12 19:51:21 +02:00
Martin Trigaux 00a4845bc7 [FIX] website_blog: fix broken change cover wizard 2014-05-13 12:31:57 +02:00
Xavier Morel eed75b620d [FIX] website_forum: replace deprecated country by country_id 2014-05-13 12:15:23 +02:00
Xavier Morel ef06e5087a [FIX] various website modules, re-enable crawler tests 
* fix crawler to discard URL fragments before deduplicating and crawling
* fix website_forum links which should not be links (either because their urls
  are JSON-RPC methods or because their urls are side-effecting
* remove stray print statements
* side-improvements (simplifications) to some methods
 2014-05-13 11:42:05 +02:00
Xavier Morel 36bb8acfab [IMP] website_event_track: simplify event_agenda 2014-05-13 10:49:24 +02:00
Thibault Delavallée e863668bc3 [IMP] email_template simplified form view: add link to website 2014-05-13 10:35:09 +02:00
Richard Mathot (OpenERP) f012baf71f [MERGE][FIX] website_event_track: display days in chronological order 2014-05-13 10:01:00 +02:00
Xavier Morel cc9d056711 [FIX] website_crm, website_event_sale: remove stray prints 
also do some trivial cleanup/simplification of website_crm while at it:

* Initialize a dict directly via literal
* Use straightforward dict copy instead of whatever that convoluted crap was
* Use gencomp for set creation
* Lift a pair of keysets to the original dict creation
 2014-05-13 09:56:28 +02:00
Richard Mathot (OpenERP) 5cf2386e72 [FIX] website_event_track: display days in chronological order 2014-05-13 09:28:03 +02:00
Xavier Morel 023aa7acdf [FIX] website_forum links which should not be, post-install crawler 
* move URLs of purely-JS-hook <a> to data-href so the crawler does not try to
  access them (they're JSON-RPC endpoints...)
* replace side-effecting links (...) by styled buttons
* fix crawler to not take fragments in account when deduplicating and
  navigating URLs
 2014-05-12 18:34:55 +02: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
Fabien Meghazi f3c8cc50c8 [IMP] Include openerpframework in common assets. Add module list in bundle 2014-05-12 17:18:12 +02:00
Thibault Delavallée 46235aa78c [MERGE] Sync with turnk 2014-05-12 16:39:45 +02:00
Richard Mathot (OpenERP) 2cc170980d [MERGE][FIX] URL generation in blog template 2014-05-12 16:38:49 +02:00
Richard Mathot (OpenERP) d34c54dbb6 [FIX] URL generation in blog template 2014-05-12 16:20:48 +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
Martin Trigaux fc7a31f842 [FIX] ir_ui_view: remove undetermist order on search for views as the _order on the model is more specific (opw 607262) 
This was problematic on some views where two views with the same priority could be chosen depending on the server, postgresql version and the age of the captain
 2014-05-12 14:56:30 +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
Martin Trigaux 55ac64258f [FIX] gamification: correct name of ir.rule fixing bad copy-paste 
bzr revid: mat@openerp.com-20140512085041-b0euexzgxgvb30oe
 2014-05-12 10:50:41 +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
Martin Trigaux 27a6d2e9f4 Forward-port of latest saas-4, up to revision 3994 (rev-id jke@openerp.com-20140509131203-4gy3nhlj0v6fk7zv) 2014-05-12 10:10:32 +02:00
Thibault Delavallée dd531b3300 [MERGE] Sync with upstream (trunk) 2014-05-12 10:08:48 +02:00
Martin Trigaux 4f5cc00420 Forward-port of latest saas-4, up to revision 5211 (revid fme@openerp.com-20140509164408-rtml4brrhpiv4zz9) 2014-05-12 10:05:23 +02:00
Denis Ledoux e70fc38f2f [FIX] crm: The get_formview_id method does not expect a model arg anymore 
bzr revid: dle@openerp.com-20140512075919-ewldirr5ejd5py13
 2014-05-12 09:59:19 +02:00
Denis Ledoux d2716e2db9 [ADD] hw_escpos: TM-T20II printer added in supported device list 
bzr revid: dle@openerp.com-20140512074150-9wepj7andgwrgj7x
 2014-05-12 09:41:50 +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
Launchpad Translations on behalf of openerp 8c139b01e7 Launchpad automatic translations update. 2014-05-12 06:38:16 +00:00
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