Commit Graph

60 Commits

Author SHA1 Message Date
Antony Lesuisse 2d296cb779 [MERGE] ir-ui-view split active and show_customize
Split the ternary field application in active and show_customize, all four
possible value are now needed for the customize theme popup.
2014-08-31 16:56:44 +02:00
Olivier Dony e11eddf753 [MERGE] Forward-port of saas-5 up to 20cc18d 2014-08-13 20:46:47 +02:00
Denis Ledoux fe83c11301 [MERGE] forward port of branch saas-4 up to b49755b
The forward port of the fix 3609ba10f2 will be done separately, as the mrp scheduler has been completely refactored from saas-5.

Conflicts:
	addons/l10n_be_coda/wizard/account_coda_import.py
	addons/point_of_sale/static/src/xml/pos.xml
	addons/procurement/schedulers.py
2014-08-13 10:45:36 +02:00
Denis Ledoux fc74431c1a [MERGE] forward port of branch saas-4 up to 7ecaab9 2014-08-12 16:27:57 +02:00
Jeremy Kersten 953359738b [FIX] website: google_map remove trailing slash and add an attribut for disable scrolling 2014-08-12 10:23:38 +02:00
Christophe Simonis e4cb5202a0 [MERGE] forward port of branch saas-4 up to fa07bc8 2014-07-30 20:30:14 +02:00
Martin Trigaux e467946785 [FIX] website: iframe to google maps need the trailing slash, otherwise the path and the id are not separated (e.g.: '/members42') 2014-07-25 09:47:13 +02:00
Richard Mathot 60da9c6417 [FIX] website_crm_partner_assign: make display of all countries work
(bypassing geoip)
2014-06-10 12:04:50 +02:00
Richard Mathot 8eeaabf694 [FIX] website_crm_partner_assign: buggy url 2014-06-03 22:15:24 +02:00
Richard Mathot 623912e477 Revert "[FIX] website_crm_partner_assign infinite crawling"
This reverts commit 267cc63027.
2014-06-03 21:53:51 +02:00
Antony Lesuisse 267cc63027 [FIX] website_crm_partner_assign infinite crawling
disable url query fragment
2014-06-03 21:09:28 +02:00
Richard Mathot f04e6de2e7 [FIX][IMP] Make partner maps work properly
[FIX] website*: unfuck buggy controllers
[IMP] website*: display GoogleMap in a human-usable interface
[IMP] website_google_map: large module cleaning
      - There is now only one controller, data is sent once for all!
      - Map is now fully resizable in its hosting template
      - HTML/CSS cleaning
      - JavaScript is now human-readable ;-)
2014-06-03 16:34:30 +02:00
Richard Mathot 8dc0503aa5 [FIX] website*: make custom footer independant of main layout 2014-06-02 16:56:36 +02:00
Olivier Dony 04211015fc [MERGE] Forward-port of latest saas-4 fixes, up to 0452851 2014-05-27 20:49:49 +02:00
Xavier Morel e06f5b414b [IMP] inherit_option_id -> application 2014-05-27 12:13:51 +02:00
Richard Mathot 15ea4563af [FIX] website_crm_partner_assign: better display of partners logos 2014-05-23 11:58:25 +02:00
Thibault Delavallée 96128a678e [IMP] website_crm_partner_assign: use geoip to display partners in the visitor's country.
Also added a breadcrumb in partners navigation; when going on the partner view
a link to come back to the list view has been added and takes into account
selected grade and country.
2014-05-20 13:24:18 +02:00
Thibault Delavallée eae72dd1c8 [FIX] website_crm_partner_assign: fixed error of used template
to display partner references, use the one defined in website_crm_partner_assign module.
2014-05-19 18:16:10 +02:00
Thibault Delavallée 4837952ad4 [FIX] website_crm_partner_assign: fixed crash when having partners to display
on resellers page that do not have country_id set, leading to some values
not being present in the countries variable holding data about partner
localisation.
2014-05-19 16:40:50 +02:00
Thibault Delavallée a6b9269398 [REF] Achieved the same result with a sorting to avoid having to add a field in stable release 2014-05-16 17:14:03 +02:00
Thibault Delavallée 2ed511855f [IMP] website_partner_crm: display partners in a category ordered by descending
number of references + some tweaking in the view.
2014-05-16 16:29:36 +02:00
Thibault Delavallée 9530ff9fb5 [IMP] website_crm_partner_assign: moved search on top of page, added
references block like for customers modules.
2014-05-16 14:58:11 +02:00
Thibault Delavallée fd15324d65 [FIX] website_crm_partner_assign: clean and fix routes, pager, and grade / country search and propagation.
Routes were still using an old int / str way of matching parameters. They have been
converted into model-based routes. Also cleaned the way grades and countries are
managed and displayed. Pager is now working, taking into account grade and country.
2014-05-16 14:16:56 +02:00
Christophe Simonis 4922c5363e [FIX] website_{customer,partner,crm_partner_assign}: correct views and controllers 2014-05-12 19:51:21 +02:00
chm@openerp.com 353bbdc2c3 [FIX] website: route and redirect: remove all backslash from url
bzr revid: chm@openerp.com-20140314162346-25vohj6ayp65tgiy
2014-03-14 17:23:46 +01:00
Olivier Dony c52cd95348 [IMP] website_crm_partner_assign: move partner grade filter in the left column
bzr revid: odo@openerp.com-20140131104232-62nc8wua8xflrd64
2014-01-31 11:42:32 +01:00
Olivier Dony 1d147f0392 [FIX] website*: no border for customer/reseller/member entries + extra bottom margin on left column
bzr revid: odo@openerp.com-20140131093902-n3h10eflemmjvlyt
2014-01-31 10:39:02 +01:00
openerp-sle d34abbf1cc [FIX] harmonize website_customer, website_crm_partner_assign and website_membership views
bzr revid: openerp-sle@openerp-sle.home-20140130212434-pqvwrrcd355y77id
2014-01-30 22:24:34 +01:00
Denis Ledoux f85065930e [FIX]website_customer, website_crm_partner_assign: keep search if jump between countries, and keep countries if do a new search.
bzr revid: dle@openerp.com-20140130193706-xxn668p2edr69zue
2014-01-30 20:37:06 +01:00
Denis Ledoux 76b74e16c2 [FIX] website_crm_partner_assign: keep search if jump between countries, and keep countries if do a new search
bzr revid: dle@openerp.com-20140130172629-k6qgwd3ongp6bkfl
2014-01-30 18:26:29 +01:00
Antony Lesuisse d4bbe13963 [REM] t-href is now t-attf-href
bzr revid: al@openerp.com-20140128205017-47rxm2xbb84dmjas
2014-01-28 21:50:17 +01:00
Fabien Meghazi 40c7ce4b1c [REV] Revert t-href and t-action removal
bzr revid: fme@openerp.com-20140128161531-t0m0hqpk5u871rwg
2014-01-28 17:15:31 +01:00
Fabien Meghazi 4a9d1489b3 [CHG] Make templates less readable by removing t-href and t-action
bzr revid: fme@openerp.com-20140128154909-oau6aq702rw062gy
2014-01-28 16:49:09 +01:00
Christophe Matthieu 3f0f6b820b [FIX] website: Access rights and Access for: website_crm_partner_assign, website_customer, website_event, website_event_track, website_membership, website_partner, website_sale
bzr revid: chm@openerp.com-20140107135933-h622wxwfhwoulg7q
2014-01-07 14:59:33 +01:00
Christophe Matthieu ee370a837c [IMP] website: Removing unnecessary spaces at beginning of line
bzr revid: chm@openerp.com-20131212105821-mqvxb7yc04cj5k2s
2013-12-12 11:58:21 +01:00
Christophe Matthieu 8f2f589561 [FIX] website: typo, partner order, event demo data
bzr revid: chm@openerp.com-20131211112617-11kdph7cieews0y8
2013-12-11 12:26:17 +01:00
Christophe Matthieu b777fddb30 [FIX] website_partner, website_crm_partner_assign, website_membership, website_customer: display partner without break access right
bzr revid: chm@openerp.com-20131205150801-tquspeo351to77o4
2013-12-05 16:08:01 +01:00
Christophe Matthieu 32ec9cccdd [IMP] website: views for drag and drop snippets
bzr revid: chm@openerp.com-20131128160851-xmepb4h6n0logclo
2013-11-28 17:08:51 +01:00
Fabien Pinckaers e41d8db917 [IMP] most data-publish removed
bzr revid: fp@openerp.com-20131116173636-atrxzu1if4fjumhp
2013-11-16 18:36:36 +01:00
Fabien Pinckaers 471d9671e7 [IMP] wording resellers
bzr revid: fp@tinyerp.com-20131114084005-eofp4nllff4nimdl
2013-11-14 09:40:05 +01:00
Fabien Meghazi 557d887496 [IMP] preprocess static @href|src|action, static url doesn't need t-href anymore
you need to pull server branch

bzr revid: fme@openerp.com-20131112144442-y9bw5q6kkoym8o1i
2013-11-12 15:44:42 +01:00
Christophe Matthieu eae3d77a24 [IMP] website: change name of cutom footer pages
bzr revid: chm@openerp.com-20131107125434-c54n3bv54gon3m43
2013-11-07 13:54:34 +01:00
Fabien Meghazi 9b40e849d6 [WIP] new title managment in templates. expose main_object for seo
bzr revid: fme@openerp.com-20131010132907-xxmg96qmcw9j5f2d
2013-10-10 15:29:07 +02:00
Thibault Delavallée b7f6431a5d [FIX] [IMP] website_crm_partner_assign: fixed countries / grade management in controller + improved search by country in view + headers
bzr revid: tde@openerp.com-20131008154221-82dwudfxn3xnv7bb
2013-10-08 17:42:21 +02:00
Thibault Delavallée c82f6f7ef6 [REF] website_crm_partner_assign: cleaning and improvements
Improved website_crm_partner_assign module to look more like the current
patners page of openerp.com.

Some cleaning in controllers that were quite obfuscated.

bzr revid: tde@openerp.com-20131007145516-0dziszwy0pfg1yje
2013-10-07 16:55:16 +02:00
Fabien Meghazi 4bad1f8362 [IMP] website_crm_partner_assign multilang
bzr revid: fme@openerp.com-20130926150223-mngcp1swvvc5uamu
2013-09-26 17:02:23 +02:00
Christophe Matthieu c66c5d5b6a [IMP] change publish button, fix website_sale product order + push top/bottom
bzr revid: chm@openerp.com-20130926111854-22ikjc2enj0hi0qu
2013-09-26 13:18:54 +02:00
Xavier Morel 89fc31a633 [MERGE] from trunk
bzr revid: xmo@openerp.com-20130923120328-0wgd7wxhl1y5qyhr
2013-09-23 14:03:28 +02:00
Fabien Pinckaers b8c94e2957 [IMP] empty zone CSS
bzr revid: fp@tinyerp.com-20130919075309-irpuwo776frfwb12
2013-09-19 09:53:09 +02:00
Xavier Morel e0662b11d0 [FIX] wrap the wrapper in order to allow RTE on all of the page (except the toolbar)
CKEditor does not work directly on body, and it's a bad idea anyway
(editing the edition toolbar won't end well). 

A big wrapper around all of the page's content can be used as RTE hook
to give access to the body as well as the header and footers.

bzr revid: xmo@openerp.com-20130918145028-6ppi9sro2un0quh5
2013-09-18 16:50:28 +02:00