Commit Graph

46 Commits

Author SHA1 Message Date
Nicolas Lempereur ba9771d6ec [FIX] website_membership: don't display old as members
Follow-up of 5ac77c9 which solved the issue when an association was
selected, but not when "All Members" was choosen.

Before this commit, the displayed membership lines would only be the
paid ones, if an association (membership product) was selected. With
this commit this is also the case when no such association is selected.

This commit also correct the member counts in the "country" list :

* with "All members" the free members were not in the counts,
* with not "Free member", the counts didn't took the eventual current name search.

closes #9083
opw-648627
2015-10-15 12:08:51 +02:00
Christophe Simonis 0cddf87a77 [FIX] {website_,}membership: membership should start the same day of the invoice 2015-09-23 17:15:01 +02:00
Nicolas Lempereur 5ac77c943b [FIX] membership, website_membership: paid but expired
A paid membership is expired if the validity period (period between
date_from and date_to) doesn't match with the current date.

closes #8505
opw-648627
2015-09-14 10:43:29 +02:00
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
Nicolas Lempereur 5804246e0f [FIX] website_membership: perf, pagination
This fixes :
 * pagination only on /members and sometimes with bad page count,
 * free members could not be searched (were always all displayed),
 * all elements are displayed even if there is a pagination,
 * for members without country, errors happened in some use case,
 * when too much locations were on a map (>2000) it failed,
 * numbers of members by countries was not displayed for guest.

And also as performance improvemnts:
 * only query all partners when the map is enabled (customize > left
   world map),
 * limit partners put on the map to 2000 (even then it's a lot for
   google maps),
 * don't browse all membership_line to get res_partner but use a query.

opw-634653
2015-05-08 11:10:53 +02:00
Denis Ledoux 2996fd0897 [FIX] website_membership: free members while not logged in.
By default public/portal users do not have the access
rights to read the partners.

opw-628857
2015-03-12 10:10:19 +01: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 fd4fd35e32 [MERGE] forward port of branch saas-5 up to e4cb520 2014-07-30 20:52:14 +02:00
Christophe Simonis e4cb5202a0 [MERGE] forward port of branch saas-4 up to fa07bc8 2014-07-30 20:30:14 +02:00
Denis Ledoux 88c022dfc8 [MERGE] forward port of branch 7.0 up to bbb8d8f25a 2014-07-29 11:42:10 +02:00
Raphael Collet cbe2dbb672 [MERGE] new v8 api by rco
A squashed merge is required as the conversion of the apiculture branch from
bzr to git was not correctly done. The git history contains irrelevant blobs
and commits. This branch brings a lot of changes and fixes, too many to list
exhaustively.

- New orm api, objects are now used instead of ids
- Environements to encapsulates cr uid context while maintaining backward compatibility
- Field compute attribute is a new object oriented way to define function fields
- Shared browse record cache
- New onchange protocol
- Optional copy flag on fields
- Documentation update
- Dead code cleanup
- Lots of fixes
2014-07-06 17:05:41 +02:00
Olivier Dony d9cda97cf4 [MERGE] Forward-port saas-4 up to 5ceded9 2014-07-05 01:28:19 +02:00
Jeremy Kersten e77594c3c3 [IMP] website: backport 5112421a (unslug)
Update the regexp to be not case sensitive
2014-06-30 18:29:20 +02:00
Christophe Simonis 5112421a93 [FIX] website: correct slug parsing 2014-06-25 11:08:51 +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
Christophe Simonis a756b82372 [MERGE] forward port of branch saas-4 up to revid bb26dea 2014-05-20 20:19:55 +02:00
Antony Lesuisse ca08f5d674 [FIX] website_membership support negative ids 2014-05-15 09:54:13 +02:00
Christophe Simonis a6f036d43f [FIX] website_membership: correct view and controller 2014-05-13 18:52:37 +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
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
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 255fe082bd [FIX] website_membership: membership displayed order depending on website_sequence
bzr revid: dle@openerp.com-20140129171554-h76n4579xquhdxxv
2014-01-29 18:15:54 +01:00
Olivier Dony e6e8bb3789 [IMP] website_*: remove useless % chars surrounding ilike operand, this is the default
bzr revid: odo@openerp.com-20140129163557-0bb86mx8it57mcvi
2014-01-29 17:35:57 +01:00
Denis Ledoux 0306adbfe3 [FIX] *: using werkzeug.url_encode instead of urllib.urlencode because urliblib.encode does not accept unicode
bzr revid: dle@openerp.com-20140129121316-b5f5e4r6fz9l80kq
2014-01-29 13:13:16 +01:00
Fabien Meghazi d6690455e9 [REM] Removed preload_records
This feature will be stripped down and moved to server's ir.http#_dispatch()

bzr revid: fme@openerp.com-20140123150448-3hhlj4vytr82k88n
2014-01-23 16:04:48 +01:00
Fabien Meghazi 14bb6060d7 [REM] Removed @website.route() decorator
Need trunk-website-al Rev#5151

bzr revid: fme@openerp.com-20140120153733-ve3dn2kwvha7n3yl
2014-01-20 16:37:33 +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
Fabien Meghazi 68f0397609 [IMP] preload all objects
bzr revid: fme@openerp.com-20131217150211-zquu7nn05g23m4r4
2013-12-17 16:02:11 +01:00
ddm d15f3d2b8a [FIX] Main object for members (promote)
bzr revid: ddm@openerp.com-20131216134033-qnrvj06od8y2o868
2013-12-16 14:40:33 +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
Xavier Morel 74c63fe9a0 [FIX] website_membership: unfuck delegation to self.members
should really redirect instead, delegation makes no bloody sense

bzr revid: xmo@openerp.com-20131121143216-qyvf1koz4bwldcpd
2013-11-21 15:32:16 +01:00
Xavier Morel 7da6b2e074 [IMP] website_membership: simplify partner_ref, move to model converter
bzr revid: xmo@openerp.com-20131121143127-1fm1e8xuz1da13tr
2013-11-21 15:31:27 +01:00
Xavier Morel 1ce9f8539b [IMP] style and domain fixes
bzr revid: xmo@openerp.com-20131121142839-aotrh21l5d416hu3
2013-11-21 15:28:39 +01:00
Christophe Matthieu 3b88083958 [FIX] website_membership: access right and demo data
bzr revid: chm@openerp.com-20131114113927-oiuy6zqtkwombvrw
2013-11-14 12:39:27 +01:00
Xavier Morel c511146154 [FIX] I am quite certain there is no website_pushished field on partner objects
bzr revid: xmo@openerp.com-20131030153607-hc5o08zero6q7iio
2013-10-30 16:36:07 +01: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
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
Thibault Delavallée 726cda367e [FIX] website and all derived addons: fixed imports broken when moving
website.py to models/ directory in website (revision 9491 revid:xmo@openerp.com-20130930145358-qh7xdicgg21prsk4).

bzr revid: tde@openerp.com-20131001085739-hoczgpqrv2nrr6lb
2013-10-01 10:57:39 +02:00
Fabien Meghazi 70cf46fb94 [IMP] website_membership multilang
bzr revid: fme@openerp.com-20130926163004-4mbb1v6rs2g32hyb
2013-09-26 18:30:04 +02:00
Fabien Meghazi 0e82448ed8 [IMP] Refactor code + WIP multiwebsite
bzr revid: fme@openerp.com-20130910134133-esdgbhbtt8eguapk
2013-09-10 15:41:33 +02:00
Fabien Meghazi bf09524def [FIX] context set on wrong methods
bzr revid: fme@openerp.com-20130909100059-j7yhkfql3qxaz96b
2013-09-09 12:00:59 +02:00
Fabien Meghazi e980e1c715 [FIX] context merge
bzr revid: fme@openerp.com-20130909075031-rvwxjdc07zhq0m8u
2013-09-09 09:50:31 +02:00
Fabien Meghazi d2e90f0621 [BREAK] request.context everywhere
some stuff broken will be repaired by chm

bzr revid: fme@openerp.com-20130905151803-7d17us7rn9yubnb2
2013-09-05 17:18:03 +02:00
Fabien Meghazi 6621c1275b [IMP] Refactoring using `webcontext`
bzr revid: fme@openerp.com-20130904153236-gc78bs8pxeprktkr
2013-09-04 17:32:36 +02:00
Christophe Matthieu 0216d769cb [IMP] create website_membership
bzr revid: chm@openerp.com-20130902135210-zevplu7bs7w2cpcm
2013-09-02 15:52:10 +02:00