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

97633 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
bb70908dac modifications to match @eldy's expectations 2021-04-12 10:09:05 +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
Laurent Destailleur
a50b0e7441 Debug inventory module 2021-04-09 13:15:27 +02:00
Laurent Destailleur
06a7b8f5cb
Merge pull request #17159 from Hystepik/develop#1 
Close #17145 : add link to autofill with expected qty
 2021-04-09 12:50:33 +02:00
Laurent Destailleur
592800555f
Merge pull request #17148 from indelog/fix_empty_website_otherlang 
Fix empty string WEBSITE_OTHERLANG (better fix)
 2021-04-09 12:49:01 +02:00
Laurent Destailleur
95d3dabdf6
Update website2.lib.php 2021-04-09 12:48:06 +02:00
Laurent Destailleur
f7bab13c3c
Merge pull request #17187 from glu000/13.0-fix17186 
FIX email is not case sensitive
 2021-04-09 12:36:49 +02:00
Laurent Destailleur
44ec5ad12f
Merge pull request #17194 from daraelmin/daraelmin-amountbymebertype 
NEW option to select membership type on the online payment page for membership subscription or renewal
 2021-04-09 12:35:04 +02:00
Laurent Destailleur
17b446e8f7
Update adherent.class.php 2021-04-09 12:27:10 +02:00
Laurent Destailleur
445309bef2 Clean code 2021-04-09 12:25:45 +02:00
Laurent Destailleur
725c6be7db CSS 2021-04-09 12:13:02 +02:00
Laurent Destailleur
e34335974c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-04-09 12:09:07 +02:00
Laurent Destailleur
afca96a8ee Enhance barcode scanner tool 2021-04-09 12:08:56 +02:00
Laurent Destailleur
bbb75bd3c3
Merge pull request #17195 from FHenry/fix_dev_right_def_id 
fix: right definition id in modulebuilder
 2021-04-09 11:55:11 +02:00
Laurent Destailleur
5eb9acf3e1
Update modMyModule.class.php 2021-04-09 11:50:34 +02:00
Laurent Destailleur
0864daf2ad
Merge pull request #17189 from altairisfr/wh_project 
add fk_project to warehouse table
 2021-04-09 11:49:08 +02:00
Laurent Destailleur
45f9885978
Merge pull request #17196 from DorianVabre/new_add_config_type_securekey_module_builder 
NEW: add config type securekey module builder
 2021-04-09 11:47:29 +02:00
Laurent Destailleur
c0dc784061
Update eventorganization.php 2021-04-09 11:46:50 +02:00
Laurent Destailleur
e028195769
Merge pull request #17199 from Hystepik/develop#3 
Fix error on module builder delete of a property
 2021-04-09 11:42:23 +02:00
Laurent Destailleur
4959423e5d
Merge pull request #17197 from Hystepik/develo#2 
NEW Can edit object in module builder
 2021-04-09 11:41:48 +02:00
Laurent Destailleur
8a0ef6e17a
Update index.php 2021-04-09 11:41:29 +02:00
Laurent Destailleur
b3c382c02d
Update index.php 2021-04-09 11:38:23 +02:00
Laurent Destailleur
6609ef4941
Update index.php 2021-04-09 11:37:32 +02:00
Laurent Destailleur
9ddd1cf8cd
Merge pull request #17198 from atm-gauthier/12.0_fix_test_string 
FIX : test must be === and not ==
 2021-04-09 11:36:50 +02:00
Gauthier PC portable 024
c35c15e782 FIX : test must be === and not == 2021-04-09 11:31:50 +02:00
lmarcouiller
fdb5b3b3da Fix error on module builder delete of a property 2021-04-09 11:28:40 +02:00
lmarcouiller
b582396afc edit objects in module builder with changes 2021-04-09 11:20:26 +02:00
Dorian Vabre
056143450b NEW: add config type securekey module builder 2021-04-09 10:58:33 +02:00
lmarcouiller
3153966b24 New edit object in module builder 2021-04-09 09:19:52 +02:00
Florian HENRY
5555807104 fix: right definition id in modulebuilder 2021-04-09 08:51:09 +02:00
daraelmin
555a968f93 Fix html style error 2021-04-09 02:54:11 +02:00
daraelmin
071b50debf Copyright 2021-04-09 02:51:05 +02:00