Commit Graph

12123 Commits

Author SHA1 Message Date
Laurent Destailleur
4c4e081997 Debug v16 2022-06-28 13:09:53 +02:00
Laurent Destailleur
bbd2f05e3a Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/comm/propal/card.php
2022-06-27 12:11:40 +02:00
Laurent Destailleur
f09638972c Debug v16 2022-06-27 10:45:04 +02:00
Christian Foellmann
55d90ec560 set the target for SOC links on proposals and invoices to the customer tab 2022-06-25 16:24:55 +02:00
Laurent Destailleur
264f8ab4ce
Merge pull request #21342 from frederic34/useismodenabled
Use getDolGlobalString
2022-06-23 09:55:31 +02:00
Laurent Destailleur
313cff77d0
Merge pull request #21255 from aspangaro/16b4-php8_1
PHP 8 in social contribution
2022-06-22 15:39:29 +02:00
Frédéric France
287f868fbb use getDolGlobalString 2022-06-22 08:36:24 +02:00
Alexandre SPANGARO
f2ef565a0f FIX PHP8 2022-06-20 04:57:38 +02:00
Alexandre SPANGARO
5f5cf4b291 Fix PHP8 2022-06-20 04:28:32 +02:00
Alexandre SPANGARO
2b07d00027 Fix PHP8 2022-06-20 03:29:17 +02:00
Alexandre SPANGARO
b80be7ef7a Fix PHP8 2022-06-19 22:59:49 +02:00
Alexandre SPANGARO
50e5cf1a56 Fix fetch label journal 2022-06-19 21:29:45 +02:00
Alexandre SPANGARO
0903f390c1 Merge remote-tracking branch 'upstream/develop' into 16b4-php8_1 2022-06-19 06:47:29 +02:00
Laurent Destailleur
bc1449f1c2 Fix sepa generation (no special char _) 2022-06-18 20:51:58 +02:00
Laurent Destailleur
227ac2baae
Merge pull request #21172 from aspangaro/17p2
Look & Feel - Align amount to right on card
2022-06-17 18:07:30 +02:00
Laurent Destailleur
08a942dca8 # WARNING: head commit changed in the meantime
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2022-06-17 14:52:51 +02:00
Laurent Destailleur
18d9d6194e # WARNING: head commit changed in the meantime
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
2022-06-17 14:48:27 +02:00
Thomas Negre
3fcaae5ae3 fix private notes not being registered on credit/replacement invoices 2022-06-16 15:33:25 +02:00
Florian HENRY
77d129f79c fix: bad url param search for facrec filter on facture list 2022-06-16 15:05:45 +02:00
Laurent Destailleur
8bd95ae93d Fix char _ not alloed into SEPA 2022-06-15 16:20:27 +02:00
Alexandre SPANGARO
863a18b839 Merge remote-tracking branch 'upstream/develop' into 17p2 2022-06-15 04:16:40 +02:00
Laurent Destailleur
7971683b60
Merge pull request #21277 from badre-agtaib/scru5
FIX BUG: timestamp type is int not tms
2022-06-14 21:10:36 +02:00
bagtaib
3718afb16f timestamp type is int not tms 2022-06-14 17:56:55 +02:00
Laurent Destailleur
dd392143e1 Fix conf->projet conf->project 2022-06-14 17:53:17 +02:00
Alexandre SPANGARO
56e03b9a11 PHP 8 in social contribution 2022-06-14 09:22:53 +02:00
Alexandre SPANGARO
f94b25c837 PHP 8 in social contribution 2022-06-14 09:14:56 +02:00
Alexandre SPANGARO
bba32869a3 PHP 8 in social contribution 2022-06-14 09:14:30 +02:00
Alexandre SPANGARO
4cbe6fb48d PHP 8 in social contribution 2022-06-14 09:14:14 +02:00
Alexandre SPANGARO
489ed743be PHP 8 in social contribution 2022-06-14 09:14:08 +02:00
Alexandre SPANGARO
cfed286e63 PHP 8 in social contribution 2022-06-14 09:14:00 +02:00
Alexandre SPANGARO
37ff10eafc PHP 8 in social contribution 2022-06-14 09:13:53 +02:00
Laurent Destailleur
a2c2ca2074 Fix phpcs 2022-06-13 15:10:35 +02:00
Laurent Destailleur
12ee8eb40b Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
Conflicts:
	htdocs/core/class/commonobject.class.php
2022-06-13 13:32:11 +02:00
Laurent Destailleur
cedf6f8057 # WARNING: head commit changed in the meantime
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
2022-06-13 13:26:59 +02:00
Nicolas F
5decd00149
fix: remove duplication bank transaction
do not duplicate previous bank transaction when value is 0
2022-06-13 10:40:41 +00:00
Laurent Destailleur
071b0a3192
Merge pull request #21231 from aspangaro/16b4-php8_1
FIX PHP8 on bank
2022-06-13 12:39:38 +02:00
Laurent Destailleur
bc11cf62f8 FIX #hunterdev2acfc8fe-247c-4f88-aeaa-042b6b8690a0 2022-06-13 10:44:20 +02:00
Alexandre SPANGARO
10ff061672 Fix PHP8 on bank 2022-06-13 04:38:16 +02:00
Alexandre SPANGARO
3032de261d Fix PHP8 on bank 2022-06-13 04:37:56 +02:00
Alexandre SPANGARO
25c2fb0528 Fix PHP8 on bank 2022-06-13 04:37:41 +02:00
Alexandre SPANGARO
9c8f7bd174 Fix PHP8 on bank 2022-06-13 03:56:46 +02:00
Alexandre SPANGARO
74e74e2377 Fix PHP8 on bank 2022-06-13 03:53:40 +02:00
Alexandre SPANGARO
3d5227918d Fix PHP8 on bank 2022-06-13 03:53:35 +02:00
Laurent Destailleur
9aa48df111
Merge pull request #19566 from vincentjdc/customer-invoices-import
Adds import for customer invoices and invoices lines
2022-06-12 20:32:43 +02:00
Frédéric France
3fdbce7a31 use isModEnabled function 2022-06-11 09:46:28 +02:00
Frédéric France
51462a276a Merge remote-tracking branch 'upstream/develop' into useismodenabled 2022-06-10 17:49:44 +02:00
Laurent Destailleur
d039d35732 FIX php8 compatibility 2022-06-10 16:46:09 +02:00
Frédéric FRANCE
38b18a68d7
Merge branch 'develop' into useismodenabled 2022-06-10 10:07:41 +02:00
Frédéric France
5dcfc28913 use isModEnabled function 2022-06-09 22:41:59 +02:00
Laurent Destailleur
3bb8e9cdda Debug v16 2022-06-09 12:07:35 +02:00