Commit Graph

100183 Commits

Author SHA1 Message Date
Dorian Vabre
b9408d6c71 email sending added in paymentok 2021-04-21 16:43:57 +02:00
Dorian Vabre
e81637b608 wip on getting the existing attendee 2021-04-21 16:37:02 +02:00
stickler-ci
3b9ff839a7 Fixing style errors. 2021-04-21 14:14:47 +00:00
root
c5b0a1b02c Merge remote-tracking branch 'origin/13.0' into 13-company-disable-workflow 2021-04-21 15:38:46 +02:00
Dorian Vabre
ebf2466d7b no more redirection to subscriptionok after paymentok successful 2021-04-21 15:36:07 +02:00
Dorian Vabre
8e7043eca6 conforbooth class included in paymentok page 2021-04-21 15:31:14 +02:00
Dorian Vabre
4d20079c49 fix: the ref passed in url is now attendee s one, not invoice s 2021-04-21 15:20:08 +02:00
Dorian Vabre
f059cbe89c ref passed in url no longer crypted (useless) and correctly passed through POST at submit 2021-04-21 14:50:50 +02:00
Dorian Vabre
9809179aa4 securekey added to newpayment page, correction in the invoice line created 2021-04-21 14:19:07 +02:00
Dorian Vabre
780b3f4714 target:blank added for the link to the registration pag 2021-04-21 13:41:30 +02:00
Dorian Vabre
7a65a1768a wip on mail content 2021-04-21 11:57:03 +02:00
Dorian Vabre
790ff0c64c mail template working, but info in it not replaced by values 2021-04-21 10:48:37 +02:00
altairis-noe
86812c13ee no double quote 2021-04-21 09:18:40 +02:00
daraelmin
5fe9815570
Update paymentok.php 2021-04-20 23:54:33 +02:00
Florian HENRY
a15d58065f modifié : .gitignore 2021-04-20 20:25:51 +02:00
Florian HENRY
b2d6b73125 add gitingore for modulebuilders 2021-04-20 20:23:45 +02:00
Florian HENRY
95c7657ace add gitingore for modulebuilders 2021-04-20 20:21:24 +02:00
Florian HENRY
4399e55204 Merge branch '13.0' of github.com:Dolibarr/dolibarr into 13.0 2021-04-20 19:22:59 +02:00
Dorian Vabre
4c57a6c207 wip on mail, sending ok but no content 2021-04-20 17:28:18 +02:00
altairis-noe
d25298172f Merge branch 'batch_status_dict' of github.com:altairisfr/dolibarr into batch_status_dict 2021-04-20 17:00:47 +02:00
altairis-noe
f1d68c201b conflict resolution 2021-04-20 16:56:15 +02:00
Dorian Vabre
5ad64640c2 removal of var_dump 2021-04-20 16:26:11 +02:00
Noé Cendrier
31bf48ec0f
Merge pull request #7 from altairis-noe/batch_status_dict
batch status dictionnary
2021-04-20 16:18:46 +02:00
altairis-noe
d340e21cb3 No translation for dictionary labels 2021-04-20 16:13:36 +02:00
Dorian Vabre
a500d83c0b linked invoice and attendee 2021-04-20 16:09:22 +02:00
altairis-noe
07cd751c59 batch status dictionnary 2021-04-20 15:51:02 +02:00
Dorian Vabre
b70e477f47 removal of the mail sending (not functional yet) in the subscriptionok page, it will be moved to the paymentok after payment or the attendeesubscription if no payment has to be done 2021-04-20 14:49:11 +02:00
Dorian Vabre
2cde31d17c creation of ATT and BOO payment event 2021-04-20 14:39:41 +02:00
Alexandre SPANGARO
1729497d62 FIX Accountancy - Quadra export - wrong data on credit 2021-04-20 13:56:58 +02:00
Laurent Destailleur
891de3350f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-04-20 13:30:43 +02:00
Laurent Destailleur
4180a9ef62 FIX pb when saving some export profiles 2021-04-20 13:30:18 +02:00
UT from dolibit
771afbc195
Update llx_20_c_departements.sql
Italy new
2021-04-20 13:10:29 +02:00
Laurent Destailleur
1bd2bd3237 Fix php8 warning 2021-04-20 12:46:41 +02:00
Dorian Vabre
d0d0e0390b wip on mail 2021-04-20 12:28:34 +02:00
Laurent Destailleur
db5fb42c11 css 2021-04-20 12:27:00 +02:00
Laurent Destailleur
14f009f550 Fix CURLOPT_CONNECT_TO 2021-04-20 12:19:46 +02:00
Laurent Destailleur
455d5233e6 Fix trans 2021-04-20 11:58:51 +02:00
Laurent Destailleur
f1f63cd4e2 Enhance detection of update available 2021-04-20 11:56:26 +02:00
Laurent Destailleur
4fde184afb Add the setup page of module accounting to not search where is setup 2021-04-20 11:40:43 +02:00
UT from dolibit
792c865ac0
Update bom_list.php
new: $help_url = 'EN:Module_BOM';

moved up:  llxHeader('', $title, $help_url);
2021-04-20 11:39:27 +02:00
UT from dolibit
634d638a16
Update bom_document.php
$help_url = 'EN:Module_BOM';
2021-04-20 11:35:33 +02:00
Dorian Vabre
529909c3d1 wip on sending mails 2021-04-20 11:35:31 +02:00
UT from dolibit
cce6224c91
Update bom_card.php
$help_url ='EN:Module_BOM';
llxHeader('', $title, $help_url);
2021-04-20 11:33:47 +02:00
UT from dolibit
3a1f70fe34
Update bom_agenda.php
$help_url = 'EN:Module_Agenda_En|FR:Module_Agenda|ES:Módulo_Agenda';
2021-04-20 11:31:45 +02:00
UT from dolibit
53a89180d9
Update element.php
merging by
- if (!empty($conf->facture->enabled))
- if (!empty($conf->loan->enabled))
2021-04-20 11:22:12 +02:00
Dorian Vabre
5c490ca57e security added to subscriptionok page 2021-04-20 10:56:45 +02:00
Dorian Vabre
3b17a0d66a wip on paymentok page 2021-04-20 10:42:50 +02:00
Dorian Vabre
b43e85dbf4 added global dolibarr_main_instance_unique_id in attendeesubscription page 2021-04-20 10:27:32 +02:00
Dorian Vabre
7405813ad0 now displays only buttons if the corresponding boolean is checked 2021-04-20 10:24:36 +02:00
altairis-noe
81907191ca product card typo 2021-04-20 10:17:08 +02:00