Nicolas Lempereur
1bd50551c5
[FIX] website_membership: free state and not free member
...
A member can be a free member, but still have paid membership.
So we only should display member in a free membership_state and should
not get dupes.
closes #6805
opw-640440
2015-05-22 11:00:44 +02:00
Denis Ledoux
314a0358b7
[FIX] website_membership: include free members in members page
...
This is possible to set a partner as a free member
simply by checking the "free member" box, in the partner form
This leads to the fact there is no membership lines for this partner
Before this rev., only partners having membership lines were displayed
on the website members page.
2015-02-12 11:56:08 +01:00
Christophe Simonis
2e3f59181d
[MERGE] forward port of branch saas-3 up to db75994
2014-10-14 15:13:14 +02:00
Denis Ledoux
695935253a
[FIX] website_membership: crash when member has no country
...
in memberships countries list
2014-10-13 13:09:40 +02:00
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
Xavier Morel
a9a83d00c9
[REM] python-qweb support for as-less foreach
2014-06-05 17:49:08 +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
Xavier Morel
e06f5b414b
[IMP] inherit_option_id -> application
2014-05-27 12:13:51 +02:00
Christophe Simonis
a6f036d43f
[FIX] website_membership: correct view and controller
2014-05-13 18:52:37 +02:00
chm@openerp.com
4aed1443fd
[FIX] website_membership: ending backslash link
...
bzr revid: chm@openerp.com-20140317061419-h26ynajfnfia799w
2014-03-17 07:14:19 +01: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
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
320b840341
[FIX] website_membership, website_customer: keep search, country and assocations when jumping from each other of these filters + count fix between partners displayed and group by country count + fix country orders in website_customer
...
bzr revid: dle@openerp.com-20140130205713-09cbldm9r9pm6r1i
2014-01-30 21:57:13 +01:00
Denis Ledoux
a2fba1c288
[FIX] website_membership: do not display '0' in country list head if there is no result
...
bzr revid: dle@openerp.com-20140130155600-bh412ye3sqsao56p
2014-01-30 16:56:00 +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
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
Fabien Meghazi
d376bd55ca
[IMP] url slug in templates
...
bzr revid: fme@openerp.com-20131202125723-aw66fidrinaolgyo
2013-12-02 13:57:23 +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
5688c6082b
[IMP] simplify template hierarchy and customization
...
bzr revid: fp@tinyerp.com-20131114183837-xlpmpy7znls9lycu
2013-11-14 19:38:37 +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
Xavier Morel
2f2a299689
[IMP] website_membership: map's on first
...
bzr revid: xmo@openerp.com-20131030120216-uslcu3zsnb34h71l
2013-10-30 13:02:16 +01:00
Fabien Meghazi
631b1cbc09
[MERGE] upstream
...
bzr revid: fme@openerp.com-20131014095642-qxl7ceqptfsj215l
2013-10-14 11:56:42 +02:00
Thibault Delavallée
e4dcbbed57
[IMP] website_membership: added country management in website view
...
- controllers: added management of country_id from post
- views: added option to display country list
- + various cleaning in display and controllers
bzr revid: tde@openerp.com-20131011161310-5dfz6vf4y5nc9mj9
2013-10-11 18:13:10 +02: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
e968a8b18c
[IMP] website_membership: slightly improved view (headers)
...
bzr revid: tde@openerp.com-20131008154138-8iuba11tv0pjg0bi
2013-10-08 17:41:38 +02:00
Thibault Delavallée
532ab2333f
[REF] website_membership cleaning
...
Cleaning of controllers and views to hav ea look similar to the one currently existing on
openerp.com
Added dependance towards website_google_map.
bzr revid: tde@openerp.com-20131007145322-zdm3nzye5ir4qn3j
2013-10-07 16:53:22 +02:00
Fabien Meghazi
70cf46fb94
[IMP] website_membership multilang
...
bzr revid: fme@openerp.com-20130926163004-4mbb1v6rs2g32hyb
2013-09-26 18:30:04 +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
Fabien Pinckaers
364995c7f4
[IMP] oe_structure, cleaning of wrap
...
bzr revid: fp@openerp.com-20130915172537-jbd04hmgqvzz71qb
2013-09-15 19:25:37 +02:00
Christophe Matthieu
7fee8f5609
[IMP] website: change footer xml
...
bzr revid: chm@openerp.com-20130905092927-2aixeyk1z5ot4oku
2013-09-05 11:29:27 +02:00
Christophe Matthieu
91052e02c9
[IMP] website: apply publisher css to all website modules
...
bzr revid: chm@openerp.com-20130903110410-cxigps11scpr9dpr
2013-09-03 13:04:10 +02:00
Christophe Matthieu
0216d769cb
[IMP] create website_membership
...
bzr revid: chm@openerp.com-20130902135210-zevplu7bs7w2cpcm
2013-09-02 15:52:10 +02:00