Commit Graph
85041 Commits
Author SHA1 Message Date
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
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
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
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
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
Christophe Simonis a6f036d43f [FIX] website_membership: correct view and controller 2014-05-13 18:52:37 +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
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
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
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
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
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
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
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
Launchpad Translations on behalf of openerp 1397b7aa34 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140510075539-empsrh7k5l6q44ln
bzr revid: launchpad_translations_on_behalf_of_openerp-20140510075505-nu0zmfg57i2352lz
bzr revid: launchpad_translations_on_behalf_of_openerp-20140511070820-8xp1e2jxonp4i750
bzr revid: launchpad_translations_on_behalf_of_openerp-20140503064840-v6n2wyrm1l162bh4
bzr revid: launchpad_translations_on_behalf_of_openerp-20140504062728-9tmsk2r01vvs3avi
bzr revid: launchpad_translations_on_behalf_of_openerp-20140506072722-8xpshoxb4um6ef30
bzr revid: launchpad_translations_on_behalf_of_openerp-20140511070841-lboiasc73m8h3fb2
2014-05-11 07:08:41 +00:00
Fabien Meghazi dbd6e4362a [MOV] ir.ui.view#write() forced noupdate moved in website (RTE only)
bzr revid: fme@openerp.com-20140509164408-rtml4brrhpiv4zz9
2014-05-09 18:44:08 +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
Fabien Meghazi 7caabb8f75 [MERGE] upsteam
bzr revid: fme@openerp.com-20140509144608-btah4s8zorzon2jo
2014-05-09 16:46:08 +02:00
Fabien Meghazi f506fc45a3 [MOV] ir.ui.view#write() forced noupdate moved in website (RTE only)
bzr revid: fme@openerp.com-20140509141106-vbokuh0prptxavvg
2014-05-09 16:11:06 +02:00
Fabien Meghazi 69a93b07c7 [MOV] ir.ui.view#write() forced noupdate moved in website (RTE only)
bzr revid: fme@openerp.com-20140509141024-xa9mawoye3o8e6c1
2014-05-09 16:10:24 +02:00
Thibault Delavallée b9c62c7adb [MERGE] [ADD] mass_mailing: add a snippet to allow subscribing to a contact list (newsletter). Also cleaned the wording of the snippet allowing to subscribe do a discussion group to avoid confusion.
bzr revid: tde@openerp.com-20140509135051-tt1blzojwtpt86lr
2014-05-09 15:50:51 +02:00
Martin Trigaux dab3557253 [FIX] website_forum: correct the 'Editor' goal definition, the field author_id on a mail_message is a m2o to res.partner and not res.users
bzr revid: mat@openerp.com-20140509134434-6u2ft2gyv0hcryxq
2014-05-09 15:44:34 +02:00