Commit Graph

100555 Commits

Author SHA1 Message Date
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
NextGestion
d51001af31 Declare visibility for method "__construct 2021-04-08 17:42:59 +01: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
altairis-noe
7c0d3d4d14 create custom masks in product cards 2021-04-08 18:03:46 +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
Dorian Vabre
60341e8a14 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into dev_EventOrganizer 2021-04-08 17:29:16 +02:00
Dorian Vabre
6f51c69588 securekey ok 2021-04-08 17:15:49 +02:00
Christophe Battarel
4f413ca983 add fk_project to warehouse table 2021-04-08 16:46:52 +02:00
Dorian Vabre
af5b623b59 securekey added 2021-04-08 16:32:50 +02:00
Laurent Destailleur
c4a4d238f7
Merge pull request #17151 from OGPayet/fix/fournPayment
fix paiementfourn ref is now different from id
2021-04-08 16:26:34 +02:00
Laurent Destailleur
62bd93cd08
Merge pull request #17153 from OGPayet/fix/missingHooksInFournInvoiceList
add missing hooks in fourn invoice list
2021-04-08 16:24:27 +02:00
lmarcouiller
482b4e808b chnages with eldy's advices 2021-04-08 16:21:50 +02:00
Laurent Destailleur
91bf759242
Merge pull request #17117 from ptibogxiv/patch-423
Fix order status label in comm index page
2021-04-08 16:21:24 +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
altairis-noe
b7280f6524 product masks are relevant only if we are in advanced mode 2021-04-08 15:15:58 +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
stickler-ci
0b1e3ce7e4 Fixing style errors. 2021-04-08 12:15:35 +00: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
Günter Lukas
11700f2162 Fix Ticket-Module public interface: uppercase/lowercaser in e-mail should be ignored #17186 2021-04-08 13:52:29 +02:00
Laurent Destailleur
244e83e18d
Merge pull request #17164 from draceo/art261-7
Add bill tax code article for non profit organization VAT (fixes #17163)
2021-04-08 13:46:22 +02:00
Laurent Destailleur
aacea00460
Merge pull request #17167 from OPEN-DSI/fix_00004
NEW : Add new permok for edit extrafields on contact card
2021-04-08 13:43:39 +02:00
Laurent Destailleur
a39d45e111
Merge pull request #17170 from dolibit-ut/patch-243
Create index.html
2021-04-08 13:32:42 +02:00
Laurent Destailleur
602d6e0265
Merge pull request #17169 from dolibit-ut/patch-242
Create index.html
2021-04-08 13:32:30 +02:00
Laurent Destailleur
65e1d70232
Merge pull request #17172 from dolibit-ut/patch-245
Create index.html
2021-04-08 13:32:18 +02:00
Laurent Destailleur
cbf3c1c62e
Merge pull request #17173 from dolibit-ut/patch-246
Create index.html
2021-04-08 13:32:04 +02:00
Laurent Destailleur
4ef425da69
Merge pull request #17175 from dolibit-ut/patch-248
Create index.html
2021-04-08 13:29:59 +02:00
Laurent Destailleur
5ffcc9f5f4
Merge pull request #17174 from dolibit-ut/patch-247
Create index.html
2021-04-08 13:18:34 +02:00
Laurent Destailleur
30355d05c9
Merge pull request #17176 from dolibit-ut/patch-249
Create index.html
2021-04-08 13:18:26 +02:00
Laurent Destailleur
d395c21152
Merge pull request #17177 from dolibit-ut/patch-250
Create index.html
2021-04-08 13:18:14 +02:00