eloyoussef
|
2a5c426bb2
|
correction des bugs au niveau de la fonction de confirmation d'une reservation
|
2018-03-12 12:48:09 +01:00 |
|
eloyoussef
|
e52c9028fa
|
ajout du fonction de verification de conflit de réservation
|
2018-03-11 21:50:18 +01:00 |
|
|
|
1004254314
|
[FIX]GOLEM Resource Reservation avaibility period should be always visible
|
2018-03-10 08:33:43 +01:00 |
|
|
|
7dac90da95
|
[UPD]Bump GOLEM Resource version for 24/7 avaibility
|
2018-03-10 08:16:26 +01:00 |
|
|
|
9a436aa264
|
[i18n]Updated translation
|
2018-03-10 08:15:46 +01:00 |
|
|
|
0f1043a2fc
|
[i18n]GOLEM Resource : now we have translated, error messages are in the only default installed lang
|
2018-03-10 08:12:10 +01:00 |
|
|
|
57012084fc
|
[ADD]GOLEM Resource avaibility 24/7 unit test
|
2018-03-10 08:11:36 +01:00 |
|
|
|
ac9b1fa4e0
|
[IMP]GOLEM Resource : if avaibility 24/7, no need to see avaibility info on reservation
|
2018-03-10 07:53:04 +01:00 |
|
|
|
7f19960a43
|
[]
|
2018-03-10 07:51:36 +01:00 |
|
|
|
465a25de6e
|
[REF]GOLEM Resource : new calendar and list of reservations should be on resource, not on reservation (+code refactoring)
|
2018-03-10 07:44:24 +01:00 |
|
eloyoussef
|
b3705b95ef
|
depasser la verification du jours et heurs en cas de disponibilité total
|
2018-03-09 14:30:58 +01:00 |
|
eloyoussef
|
5163b7535c
|
Ajout du champs de la disponiblité total sur la resource
|
2018-03-09 13:54:52 +01:00 |
|
eloyoussef
|
b895de05ba
|
correction basique
|
2018-03-09 13:18:52 +01:00 |
|
eloyoussef
|
8e51e46a0b
|
Ajout des smart button pour la liste des reservation et calendrier du resource en cours
|
2018-03-09 13:03:49 +01:00 |
|
|
|
dfe47d1d96
|
[IMP]GOLEM Resouce : new note field
|
2018-03-09 08:44:17 +01:00 |
|
|
|
f8bf3db588
|
[i18n]Updated translations
|
2018-03-08 16:17:10 +01:00 |
|
|
|
75726a8302
|
[IMP]GOLEM Member Report Card : enhance names of printing
|
2018-03-08 16:08:50 +01:00 |
|
|
|
f9067e578f
|
[REF][IMP]GOLEM Membership member card report : do not use multiple pages finally
|
2018-03-08 15:40:04 +01:00 |
|
|
|
027eaf0a9b
|
[MOV]GOLEM Membership member card report move
|
2018-03-08 15:40:04 +01:00 |
|
|
|
9898a98da1
|
[REF][FIX]GOLEM Member card membership section
|
2018-03-08 15:40:04 +01:00 |
|
|
|
8ee4aca5f4
|
[WIP][REF][FIX]GOLEM Member card : only default season and refactoring
|
2018-03-08 15:40:04 +01:00 |
|
|
|
e7c8a4d5e4
|
[FIX][WIP]GOLEM Member membership report : avoid bug if there are multiple lines
|
2018-03-08 11:08:31 +01:00 |
|
|
|
e98cf57228
|
[REF][WIP]GOLEM Member report with better formatting per default
|
2018-03-08 11:07:55 +01:00 |
|
|
|
e5a9f4cd91
|
[IMP]GOLEM Activity : reset dates to season one if boolean fullseason is used
|
2018-03-08 11:06:53 +01:00 |
|
|
|
9c241f4078
|
[MOV]GOLEM Member report renaming / move
|
2018-03-08 09:56:22 +01:00 |
|
|
|
d0f2d9eb89
|
[TYPO]Copyright typos
|
2018-03-08 09:53:20 +01:00 |
|
|
|
da04cd5329
|
Merge branch 'master' into michel_qweb_adherents
|
2018-03-08 09:09:35 +01:00 |
|
|
|
5f2da1db97
|
[ADD]GOLEM Activity Queue : base and french translations
|
2018-03-07 20:05:12 +01:00 |
|
|
|
15019ad0f2
|
[REF][TYPO]GOLEM Activity Queue : remove useless wizard and typo improve last one
|
2018-03-07 11:14:46 +01:00 |
|
|
|
21e7ed9b5c
|
[REF]GOLEM Activity Queue : huge refactoring for tests
|
2018-03-07 11:14:46 +01:00 |
|
|
|
22fbbe4d11
|
[REF]GOLEM Activity Queue : usage of qualified contraint instead of overloading write (more efficient)
|
2018-03-07 11:14:41 +01:00 |
|
|
|
2f5b1a776b
|
[IMP]GOLEM Activity Queue : member model refundation, conflicts with activity avoided
|
2018-03-07 09:36:49 +01:00 |
|
|
|
225ea78f4c
|
[IMP]GOLEM Activity Queue : usage of constrains instead of write, and few enhancements in onchange logic
|
2018-03-07 09:36:06 +01:00 |
|
|
|
b5e7a52789
|
[FIX}GOLEM Activity Queue order should be sequence then older (id asc), thanks Youssef for pointing it
|
2018-03-06 19:48:33 +01:00 |
|
|
|
963bfa7cb1
|
[REF]GOLEM Activity Queue : huge refactoring around activity methods + fixes
|
2018-03-06 11:47:29 +01:00 |
|
|
|
bcfb01e5b0
|
[IMP]GOLEM Activity Queue : activity form UI reorganization, simplification
|
2018-03-06 10:35:12 +01:00 |
|
|
|
c3b21987c9
|
[REF]GOLEM Activity Queue : check if registration is already done can be made from member directly
|
2018-03-06 10:05:50 +01:00 |
|
|
|
80ef3f26a6
|
[REV]GOLEM Activity Queue : partly revert last commit
|
2018-03-06 10:00:09 +01:00 |
|
|
|
b094dcee19
|
[REF]GOLEM Activity Queue : SQL constrains is sufficient, no need to double check with Pytho constraint here
|
2018-03-06 09:53:58 +01:00 |
|
|
|
b717c8fbf5
|
[REF]GOLEM Activity Queue : do not use field full activity, as places_remain is enough
|
2018-03-06 09:45:57 +01:00 |
|
|
|
23a52fe1ea
|
[FIX]GOLEM Season : fix season_id field, in conflict with inherited season_id from golem.activity
|
2018-03-06 08:16:15 +01:00 |
|
|
|
61035a9fb2
|
Merge branch 'youssef_queue'
|
2018-03-06 07:38:36 +01:00 |
|
|
|
4dcfd11a55
|
[FIX]GOLEM Activity Queue form was dependent of golem_activity_place field
|
2018-03-06 07:38:14 +01:00 |
|
|
|
a7173cdb22
|
[QUA][TYPO]GOLEM Activity Queue : little typos / quality enhancements
|
2018-03-06 07:31:41 +01:00 |
|
eloyoussef
|
faee2e5e27
|
mise en forme et correction
|
2018-03-05 12:40:33 +01:00 |
|
eloyoussef
|
cc929e73a9
|
Ajout du test de suppression du membre de l'attente sil s'inscrit sur activité
|
2018-03-05 12:35:32 +01:00 |
|
eloyoussef
|
0a99877589
|
Ajout du test d'inscription en attente à travers l'assistant
|
2018-03-05 12:18:37 +01:00 |
|
|
|
cf5ded7e45
|
Merge branch 'michel_qweb_adherents' of ssh://git.yaltik.net:61722/michel/GOLEM into michel_qweb_adherents
|
2018-03-04 06:38:05 +01:00 |
|
eloyoussef
|
3f3bdcdb0d
|
Ajout du test d'interdiction sur attente si déja inscrit sur activity
|
2018-03-02 23:41:19 +01:00 |
|
eloyoussef
|
a52a5d3901
|
Ajout du test autoregistration from queue sur activité
|
2018-03-02 19:37:01 +01:00 |
|
