Commit Graph

112767 Commits

Author SHA1 Message Date
Frédéric FRANCE
e411e23082
Update card.php 2021-10-22 22:08:13 +02:00
Frédéric FRANCE
6e2f438830
Update accountmodel.php 2021-10-22 22:07:47 +02:00
Frédéric FRANCE
9ca8dfcef9
fix warning 2021-10-22 22:05:04 +02:00
Frédéric FRANCE
2780bb73c3
fix warning 2021-10-22 21:57:34 +02:00
Laurent Destailleur
d45052a6b7
Merge pull request #19101 from atm-kevin/FIX_Missing_Ticket_Property
FIX - Missing ticket's class property
2021-10-22 19:12:15 +02:00
Laurent Destailleur
4b83affa2c
Merge pull request #19107 from evarisk-theo/fix-error-return-after-assigning-category
fix: error return when adding a category to an object
2021-10-22 19:11:20 +02:00
Laurent Destailleur
fc0c4295bd
Merge pull request #19118 from atm-florianm/FIX_12.0_tcpdf_issue_315_roman_numeral_bomb_vulnerability
FIX tcpdf roman numeral rendering bomb, cf. tecnickom/TCPDF PR 315
2021-10-22 19:10:13 +02:00
Laurent Destailleur
91a4326462
Merge pull request #19098 from Hystepik/develop#5
Fix : knowledgerecord_card clone part
2021-10-22 19:03:44 +02:00
Laurent Destailleur
a90afd3180
Merge pull request #19106 from atm-lena/14.0_FIX_Issue_18711_HolidayValidateFiles
Validate Holiday : keep files
2021-10-22 19:03:15 +02:00
Laurent Destailleur
c2afd1be9d
Merge pull request #19109 from nicolas-eoxia/fix_creating_folder_in_manual_GED_tree
fix: error sql creating folder in manual GED tree #19108
2021-10-22 18:59:56 +02:00
Laurent Destailleur
bf098330fe
Merge pull request #19114 from nicolas-eoxia/fix_creation_new_member
fix: error on the creation of a new member #19112
2021-10-22 18:59:24 +02:00
Laurent Destailleur
ac661c67b3
Merge pull request #19104 from frederic34/patch-4
fix warning
2021-10-22 18:47:54 +02:00
Laurent Destailleur
370642213f Fix warning 2021-10-22 18:44:39 +02:00
atm-florian
17773f8414 FIX tcpdf vulnerability to roman numeral bomb, cf. tecnickom/TCPDF issue #315 2021-10-22 18:26:23 +02:00
stickler-ci
070a03724a Fixing style errors. 2021-10-22 15:46:16 +00:00
Florian HENRY
3d8a5d745a fix php 8 warning 2021-10-22 17:42:57 +02:00
Theo
03030685f6 add: quick link categories to account 2021-10-22 17:15:51 +02:00
Alexandre SPANGARO
40a23e4aa4 Update work, thanks Florian 2021-10-22 17:12:44 +02:00
Theo
f4a48e46ff add: quick link categories to user 2021-10-22 16:54:31 +02:00
Alexandre SPANGARO
0cbfdb4219 Merge remote-tracking branch 'upstream/develop' into 15a25 2021-10-22 16:49:47 +02:00
Theo
d5fc28f9b5 add: quick link categories to contacts 2021-10-22 16:46:55 +02:00
Lucas Marcouiller
56ff2412c1 start code to searchfrmbarcode 2021-10-22 16:39:42 +02:00
Laurent Destailleur
622304126e Fix phpcs 2021-10-22 16:35:23 +02:00
Nicolas Domenech
d7dd54549a fix: error on the creation of a new member 2021-10-22 16:34:51 +02:00
Theo
a36c966f15 add: quick link categories to adherent 2021-10-22 16:13:54 +02:00
Laurent Destailleur
ef0b527379 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-10-22 15:57:16 +02:00
Nicolas Domenech
9772168067 fix: error sql creating folder in manual GED tree 2021-10-22 15:57:03 +02:00
Laurent Destailleur
c81bf68578 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/admin/dict.php
	htdocs/compta/cashcontrol/cashcontrol_list.php
	htdocs/fourn/class/fournisseur.facture.class.php
	htdocs/modulebuilder/index.php
	htdocs/modulebuilder/template/myobject_list.php
	htdocs/product/class/api_products.class.php
2021-10-22 15:56:44 +02:00
Theo
29f847c13a add: quick link categories to project 2021-10-22 15:48:39 +02:00
Laurent Destailleur
bede1116a8 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2021-10-22 15:42:32 +02:00
Laurent Destailleur
b5929fb7c4 Fix phpcs 2021-10-22 15:42:18 +02:00
Laurent Destailleur
d54423990d
Merge pull request #19077 from polkiko/email_contentlines
FIX Content line substitution in email
2021-10-22 15:37:45 +02:00
Laurent Destailleur
808e9e030a
Merge pull request #19094 from Hystepik/scrutinizerfix
Fix: scrutinizer errors + boxes activation
2021-10-22 15:37:17 +02:00
Laurent Destailleur
9ea60e5a1d
Merge pull request #19102 from frederic34/patch-2
fix warning
2021-10-22 15:36:12 +02:00
Laurent Destailleur
fc03d2f106
Merge pull request #19103 from moreauftheobald/develop
Fix scrutinizer FHENRY
2021-10-22 15:35:47 +02:00
stickler-ci
87b4805bc0 Fixing style errors. 2021-10-22 13:35:30 +00:00
Theo
311522bf04 fix: error return when adding a category to an object 2021-10-22 15:33:57 +02:00
MOREAU FRANCK
6855d8e91a Fix scrutinizer FHENRY 2021-10-22 15:32:24 +02:00
Frédéric FRANCE
34b9890110
fix warning 2021-10-22 15:29:38 +02:00
Florian HENRY
87ac58efb6 fix php 8 2021-10-22 15:27:36 +02:00
atm-lena
fa21b27ced Validate Holiday : keep files 2021-10-22 15:27:16 +02:00
Frédéric FRANCE
cd52c3da75
fix warning 2021-10-22 15:27:09 +02:00
MOREAU FRANCK
101ec9b3fe Fix scrutinizer FHENRY 2021-10-22 15:25:19 +02:00
polkiko
fd64f8966b Fixed in-line substitution if there is no object 2021-10-22 15:19:11 +02:00
kevin
0a278416f4 Add missing ticket class property 2021-10-22 15:12:56 +02:00
Florian HENRY
5faf5e08b3 fix php8 warning 2021-10-22 15:09:34 +02:00
Florian HENRY
5d0f5439a0 fix php8 warning 2021-10-22 14:59:48 +02:00
Florian HENRY
b94d74f194 fix php8 warning 2021-10-22 14:58:09 +02:00
Giovanni Vella
c77d1206d3 NEW: receipt beep alternative and current date/time
I have added the alternative command for the beep (when that does not work) and the possibility to print the current date and time on the receipt.
2021-10-22 14:45:28 +02:00
Lucas Marcouiller
daafe652b9 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop#2 2021-10-22 14:39:18 +02:00