Commit Graph

100308 Commits

Author SHA1 Message Date
Damien BENOIT
51176deb41
Merge pull request #20 from Dolibarr/develop
Update fork
2021-04-22 18:18:47 +02:00
Indelog
78a6284bd2 Fix : missig ext_payment_id on adh public pay
When pay a mebership contibution whit public link the payment add add in
database don't have a "ext_payment_id". This fix it.
2021-04-22 18:01:52 +02:00
stickler-ci
ed923253bd Fixing style errors. 2021-04-22 15:23:37 +00:00
Robin-Yann
4505ba0fc8
Merge branch 'develop' into 13-fix-contact_filer-fournisseur 2021-04-22 17:21:09 +02:00
Robin
379cb74cd9 FIX tag selector error if supplier disable 2021-04-22 17:09:33 +02:00
Indelog
4d907ef443 Fix Stickler 2021-04-22 17:04:35 +02:00
stickler-ci
d6954b2826 Fixing style errors. 2021-04-22 14:56:15 +00:00
Indelog
eb52f5daa0 Add : register donation payment when public payment
- When we paid a donation whit public link, create the associated payment and
  put its status to payed if all the promised amount is it.

- Set the amount to pay on public page depending to the rest to pay for
  the don.
2021-04-22 16:32:05 +02:00
Dorian Vabre
f832434ce3 removing mistake from last commit: source is already given in urlok 2021-04-22 16:17:22 +02:00
Marc de Lima Lucio
ce022ab36c FIX: payment validation: invoices PDF were no re-generated, make it with correct display options 2021-04-22 15:57:06 +02:00
Marc de Lima Lucio
ee96fb6470 FIX: payment creation: re-generate invoice PDF with correct display options 2021-04-22 15:56:12 +02:00
Dorian Vabre
804547997b removed obsolete post information and now giving the source in the url 2021-04-22 15:52:45 +02:00
ksar
efcc5e714a FIX #17363 2021-04-22 15:49:37 +02:00
Dorian Vabre
eb96d5bd58 added comments 2021-04-22 15:27:16 +02:00
Christian Foellmann
3573baf3ed fix bookmarks to allow Public items to be set and deleted by admins 2021-04-22 15:24:26 +02:00
Dorian Vabre
467595ce60 an already subscribed attendee will not be redirected to a payment page, now 2021-04-22 14:53:32 +02:00
Dorian Vabre
e6318eb4f4 style 2021-04-22 12:06:33 +02:00
Dorian Vabre
e05c318fd8 various modifications on the way existing attendees and thirdparties are handled at registration 2021-04-22 11:45:00 +02:00
UT from dolibit
c43863c2a8
Update llx_10_c_regions.sql
Peru
Hungary
2021-04-22 11:22:40 +02:00
daraelmin
be9986f47b
Missing $ 2021-04-21 21:23:14 +02:00
Givriz
3c49a2b49a Compatibility phpv8 2021-04-21 18:59:25 +02:00
Dorian Vabre
22dab0e0af fix on creating attendee 2021-04-21 17:26:46 +02:00
Dorian Vabre
1700ac937a wip on looking for existing attendees instead of creating them each time 2021-04-21 17:25:28 +02:00
stickler-ci
166a23004c Fixing style errors. 2021-04-21 15:04:44 +00:00
Robin-Yann
3227b97898
Merge branch 'develop' into 13-company-disable-workflow 2021-04-21 17:02:37 +02:00
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