lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
97,663 Commits 43 Branches 150 Tags 886 MiB
ae69cc93be
Commit Graph

97663 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dorian Vabre
ae69cc93be wip on payment page 2021-04-15 16:16:45 +02:00
Dorian Vabre
208478906c add type product in modulebuilder 2021-04-15 16:10:01 +02:00
Dorian Vabre
12a796fd8e dynamic selector print improved, now using ref instead of id 2021-04-15 12:57:19 +02:00
Dorian Vabre
764d984ebf fix on dynamic selector 2021-04-15 12:28:53 +02:00
Dorian Vabre
98c622446e dynamic selector of service/product used for the invoice added 2021-04-15 12:14:34 +02:00
Dorian Vabre
880d763abe wip on payment page 2021-04-15 11:55:28 +02:00
Dorian Vabre
dd7c09582f payment page structure ok, still need to confirm the attendee after the payment 2021-04-15 10:45:44 +02:00
Dorian Vabre
caf74fe1cb pull problem corrected 2021-04-14 16:20:05 +02:00
Dorian Vabre
c58414c0ca merging with dev_EventOrganization after the changes on it 2021-04-14 16:04:36 +02:00
Dorian Vabre
3d5e439d92 company name is now required if price is set 2021-04-14 15:55:59 +02:00
Dorian Vabre
2f3f2509b2 wip on asking for the company name only if price is set v2 2021-04-14 15:54:21 +02:00
Dorian Vabre
6238ff0321 wip on asking for the company name only if price is set 2021-04-14 15:52:46 +02:00
Dorian Vabre
55afc59db2 removed useless fetch, moved link to the fetch method of the conferenceorbooth class, wip on service to use on the invoice 2021-04-14 14:33:11 +02:00
Dorian Vabre
339596f134 ref add in redirection url to payment page 2021-04-13 15:30:28 +02:00
Dorian Vabre
a3e75c587c adding amount and source to redirection url to newpayment 2021-04-13 15:07:15 +02:00
Dorian Vabre
633a3d39c6 wip on adding taxes and price to invoice 2021-04-13 14:32:17 +02:00
Dorian Vabre
db8dfb219c addition of the subscriptionok page when the subscription price is not set or 0 2021-04-13 14:10:20 +02:00
Dorian Vabre
fa47106ed7 Merge branch 'dev_EventOrganizer' of github.com:DorianVabre/dolibarr into dev_EventOrganizer_payment 2021-04-13 12:21:27 +02:00
Dorian Vabre
0c6431efd5 Merge branch 'dev_EventOrganizer' of github.com:DorianVabre/dolibarr into dev_EventOrganizer 2021-04-13 12:10:15 +02:00
Dorian Vabre
3c265b2a5b fixing style error 2021-04-13 12:09:53 +02:00
stickler-ci
839edb5abe Fixing style errors. 2021-04-13 10:06:42 +00:00
Dorian Vabre
14e64f4a33 security changes: encryption is now with instead of hard coded keys 2021-04-13 11:57:36 +02:00
Dorian Vabre
149aa8e81b email is now used as name, if name is empty 2021-04-13 11:31:22 +02:00
Dorian Vabre
0b4149cb91 removal of subscriptionok page, bad branch 2021-04-13 10:43:23 +02:00
Dorian Vabre
caeb357aab security improvement by adding id to securekey before encryption 2021-04-13 10:40:33 +02:00
Dorian Vabre
7644174c4a subscriptionok page addition 2021-04-12 17:29:44 +02:00
Dorian Vabre
167da1445d securekey added in 2021-04-12 17:16:24 +02:00
Dorian Vabre
358a2bf365 hardcoded label put in ->trans 2021-04-12 17:10:57 +02:00
Dorian Vabre
d9513da8de email now required in the attendee_subscription page, company name no longer required. Check on existing third party now depends on the email. todo: what if the name is empty? 2021-04-12 17:05:09 +02:00
Dorian Vabre
e1fb368d3a wip 2021-04-12 16:50:56 +02:00
Dorian Vabre
15d103e957 subs validation for free conferences added 2021-04-12 15:52:49 +02:00
Dorian Vabre
ebd5f29231 invoice OK except price, wip on the payment page 2021-04-12 15:44:25 +02:00
Dorian Vabre
fd476b6cb9 Merge branch 'dev_EventOrganizer' of github.com:DorianVabre/dolibarr into dev_EventOrganizer_payment 2021-04-12 10:16:38 +02:00
Dorian Vabre
bb70908dac modifications to match @eldy's expectations 2021-04-12 10:09:05 +02:00
Dorian Vabre
58abeb1e1e Merge branch 'dev_EventOrganizer' of github.com:DorianVabre/dolibarr into dev_EventOrganizer_payment 2021-04-12 10:02:04 +02:00
Dorian Vabre
eef5b9514d wip 2021-04-09 16:55:54 +02:00
stickler-ci
2b58bc904b Fixing style errors. 2021-04-09 14:36:02 +00:00
Dorian Vabre
a58e0ac8ac nouveau fichier : public/eventorganization/attendee_subscription.php 2021-04-09 16:25:40 +02:00
Dorian Vabre
b3415f9031 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into dev_EventOrganizer 2021-04-09 16:23:42 +02:00
Dorian Vabre
a99dd2be35 new: add attendees public registration page 2021-04-09 16:20:12 +02:00
Dorian Vabre
a590f945e9 thirdparty creation OK, wip on conforboothattendee creation 2021-04-09 16:12:25 +02:00
Laurent Destailleur
42ddb6e5f0 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/index.php
	htdocs/core/class/html.form.class.php
	htdocs/core/lib/accounting.lib.php
	htdocs/core/lib/website2.lib.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/fourn/class/paiementfourn.class.php
	htdocs/public/ticket/view.php
 2021-04-09 14:17:41 +02:00
Laurent Destailleur
7f91713c4a Fix merge not complete 2021-04-09 14:06:30 +02:00
Laurent Destailleur
4b1974080a Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-04-09 14:02:24 +02:00
Laurent Destailleur
f5881c6199 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/comm/index.php
	htdocs/fourn/class/fournisseur.commande.class.php
 2021-04-09 14:02:14 +02:00
Laurent Destailleur
b008cb6b6f
Merge pull request #17147 from glu000/13.0-fix17146 
13.0-fix17146
 2021-04-09 13:57:50 +02:00
Laurent Destailleur
e8bf09862f
Merge pull request #17152 from marc-dll/FIX_12.0_zero_packaging 
FIX: supplier order: error 500 when using packaging with product where it is not defined
 2021-04-09 13:51:16 +02:00
Laurent Destailleur
4016c300d2 Fix missing lin to thirdparty on some actions 2021-04-09 13:38:29 +02:00
Laurent Destailleur
fe7654c067 Complete doc 2021-04-09 13:34:19 +02:00
Laurent Destailleur
4025488e08 css 2021-04-09 13:19:57 +02:00