Commit Graph

543 Commits

Author SHA1 Message Date
b745669e40 [FIX]GOLEM Resource Account : bad order for data, views needs wizard XMLID, not found at install 2018-03-26 10:57:10 +02:00
8b85c634a1 Merge branch 'master' into golem_resource_account 2018-03-26 10:39:15 +02:00
e02b9b052b [FIX]GOLEM Membership : bad XML path for card template 2018-03-26 10:38:54 +02:00
eeb07b5e65 Merge branch 'master' into golem_resource_account 2018-03-26 10:34:31 +02:00
82d0df92b4 [TYPO][i18n]On GOLEM Family (form) 2018-03-18 10:32:48 +01:00
1886ab9828 [i18n]GOLEM Updated translations 2018-03-18 10:26:42 +01:00
1948f16110 [IMP]GOLEM Family report : add family info on main card report 2018-03-18 10:12:56 +01:00
39256ec70d [ADD]GOLEM Base : base CSS style for reports 2018-03-18 09:56:07 +01:00
9e3fb079b3 [FIX][REV][TMP]GOLEM Activity Resgistration State : do not use template ATM, need refactoring 2018-03-18 09:08:21 +01:00
545235d71a [REF]GOLEM Membership report : move to right directory 2018-03-18 07:05:06 +01:00
36124d4ac4 [IMP][TMP]GOLEM Activity Resgistration State : do not use template ATM, need refactoring 2018-03-18 07:04:45 +01:00
4fada24ac7 [REF][IMP]GOLEM Family Card templates refactoring 2018-03-17 15:20:59 +01:00
2a3b17d354 [REF][MOV]GOLEM Member should not contain acitivty registration information, move to right module 2018-03-17 15:20:36 +01:00
8d80c1d5b3 [TYPO]Copyright notices on report family 2018-03-17 14:22:22 +01:00
4cd882e5e6 Merge branch 'michel_report_family' 2018-03-17 14:19:54 +01:00
df6f3c60e8 [IMP]GOLEM Resource : bump version and updated dependency (golem_base is needed, for security) 2018-03-17 09:38:29 +01:00
bdbc7177e8 [IMP]GOLEM Resource tests : now in english per default 2018-03-17 09:38:29 +01:00
a3807d0354 [i18n]GOLEM Resource updated translation 2018-03-17 09:38:29 +01:00
da00acea29 [IMP]GOLEM Resource Timetable : usage of default values for time_start/stop on contraint + requirement only on client side 2018-03-17 09:38:29 +01:00
398a3e7f63 [IMP]GOLEM Resource check : better performance with pre-calculation and restricted domain search for conflicts 2018-03-17 08:39:43 +01:00
d5cc394967 [IMP]GOLEM Resource : computes day and hour start for better model sorting 2018-03-17 07:58:04 +01:00
eloyoussef
4aea2c069f suite des modifications : ajout du status de facturation sur reservation list 2018-03-16 18:38:18 +01:00
eloyoussef
5b7627f667 quelque modification non terminé 2018-03-16 16:13:18 +01:00
eloyoussef
c3f7ee1bb4 Ajout du Facturation multi ligne depuis action 2018-03-16 16:04:33 +01:00
eloyoussef
72739a2df6 Facturation individuel depuis reservation_form 2018-03-15 17:28:21 +01:00
eloyoussef
ff70e46612 Ajout du fonction de test multidays + correction du code 2018-03-12 19:28:21 +01:00
eloyoussef
0dda362d78 mise à jours du test avec date_start et date_stop 2018-03-12 15:34:43 +01:00
eloyoussef
41876e19c0 Correction de test 2018-03-12 14:55:47 +01:00
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