Commit Graph

97571 Commits

Author SHA1 Message Date
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
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
daraelmin
9ee80be23f fix code style errors 2021-04-09 02:40:21 +02:00
daraelmin
8de7db9afb Merge branch 'daraelmin-amountbymebertype' of https://github.com/daraelmin/dolibarr into daraelmin-amountbymebertype 2021-04-09 02:37:10 +02:00
daraelmin
51d327e99c Revert "fix code style"
This reverts commit 6248565551.
2021-04-09 02:36:57 +02:00
daraelmin
6248565551 fix code style 2021-04-09 02:32:40 +02:00
stickler-ci
dce5c6be8f Fixing style errors. 2021-04-09 00:28:07 +00:00
daraelmin
f2a49ef72f New option amount by member type 2021-04-09 02:23:22 +02:00
Laurent Destailleur
475bdc24f4 Fix sql error 2021-04-09 01:31:55 +02:00
Laurent Destailleur
2d771704d0 Better suggestion for data after clone of social contribution 2021-04-09 00:36:08 +02:00
Laurent Destailleur
60711f415d Fix permission on external user 2021-04-08 19:52:07 +02:00
Laurent Destailleur
667481acd5 Fix #yogosha5832 - Missin test on permission for /index routes on APIs 2021-04-08 19:05:28 +02:00
Laurent Destailleur
6c84b858ee Fix #yogosha5832 2021-04-08 18:51:42 +02:00
Laurent Destailleur
dfdae71e42 Update phpspeadsheet to 1.8.2 2021-04-08 18:33:01 +02:00
Laurent Destailleur
76c3229c97 Update to phpspreadsheet 1.8.2 2021-04-08 18:32:02 +02:00
Laurent Destailleur
04536f9ec8 Fix import 2021-04-08 17:49:13 +02:00
Laurent Destailleur
d098bf412d Move directory to match the one of composer package for phpspreadsheet 2021-04-08 17:35:52 +02:00
Christophe Battarel
4f413ca983 add fk_project to warehouse table 2021-04-08 16:46:52 +02:00
Laurent Destailleur
de7c3f5e0c
Merge pull request #17139 from OPEN-DSI/fix_00001
FIX: Fix when add or modify ressources on events with duplicate entries
2021-04-08 15:50:00 +02:00
Laurent Destailleur
91847a1783
Merge pull request #17155 from Hystepik/develop#4
NEW #17113 : Can upload a favicon in website module
2021-04-08 15:44:45 +02:00
Laurent Destailleur
5fd9ee20eb
Merge branch 'develop' into develop#4 2021-04-08 15:42:07 +02:00
Laurent Destailleur
b37cf2eb1c
Merge pull request #17157 from DorianVabre/fix_member_public_page
fix: new member public page firstname test
2021-04-08 15:40:24 +02:00
Laurent Destailleur
385053f107
Merge pull request #17158 from dolibit-ut/patch-239
Update llx_20_c_departements.sql
2021-04-08 15:34:48 +02:00
Laurent Destailleur
e548478929
Merge pull request #17188 from dolibit-ut/patch-254
Update llx_10_c_regions.sql
2021-04-08 15:33:47 +02:00
UT from dolibit
f609d03acc
Update llx_20_c_departements.sql
Chile
2021-04-08 15:24:59 +02:00
UT from dolibit
539c29b05f
Update llx_10_c_regions.sql
Chile
2021-04-08 14:38:43 +02:00
Laurent Destailleur
f8b5bee9eb Add function getListOfPossibleImageExt 2021-04-08 14:20:59 +02:00
Laurent Destailleur
638a4a6194
Merge pull request #17161 from Hystepik/develop#3
Close #17108 : New button to convert images in webp format
2021-04-08 14:06:45 +02:00
Laurent Destailleur
80582a4d7e
Merge pull request #17160 from dolibit-ut/patch-240
Update llx_10_c_regions.sql
2021-04-08 14:02:34 +02:00