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
Fabien Meghazi 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
Martin Trigaux 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
Fabien Meghazi c321b3f2f7 [MERGE] upstream 2014-05-13 16:00:27 +02:00
Fabien Meghazi 59effb89e3 [FIX] broken domain in route 2014-05-13 15:31:24 +02:00
Anael Closson 5bc76f63e9 [FIX] sale_stock: error message does not match chosen units when not enough stock. 2014-05-13 14:19:45 +02:00
Anael Closson 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
Christophe Simonis 08c504d39e [FIX] web: Dialog: avoid triggering "closing" twice. 2014-05-13 13:38:10 +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
Fabien Meghazi 119823ab84 [IMP] Redirect to language-less url on default language 2014-05-13 12:07:29 +02:00
Fabien Meghazi c73a2f1c57 [FIX] restore request.website_multilang for templates 2014-05-13 12:07:20 +02:00
Xavier Morel 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
Fabien Meghazi 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
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
Xavier Morel 53d859ba9c [FIX] a bunch of incomplete website URLs 2014-05-13 10:49:42 +02:00
Fabien Meghazi 4118f9ed0a [IMP] openerpframework moved in common asset bundle 2014-05-13 10:18:31 +02:00
Fabien Meghazi e15c0513a2 [IMP] Include openerpframework in common assets. Add module list in bundle 2014-05-13 10:17:24 +02:00
Denis Ledoux 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
Launchpad Translations on behalf of openerp f173d926c8 Launchpad automatic translations update. 2014-05-13 06:28:52 +00:00
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