Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-12 04:21:30 +01:00
Code Issues Packages Projects Releases Wiki Activity
127,354 Commits 36 Branches 190 Tags
0d7bbcb996a0f9050b8c80e98497b51f65be5973
Commit Graph

10133 Commits

Author SHA1 Message Date
Laurent Destailleur
94b56cc0ca Code comment 2023-10-10 22:25:52 +02:00
Laurent Destailleur
98ca102e1c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop
 2023-10-10 21:48:07 +02:00
Laurent Destailleur
feb5d6aa99 Fix Better protection if decryption fails 2023-10-10 14:55:23 +02:00
Laurent Destailleur
f7e4353b10 Doc 2023-10-10 14:49:11 +02:00
thibdrev
985c9b0219 fix #22501 (#22502) 
* Update functions.lib.php

Add NAF/APE formatting option to dol_print_profids().

* Update card.php

Format NAF/APE code with a point as separator (such as "69.20Z")

* Fixing style errors.

* Update card.php

* Fixing style errors.

* Update functions.lib.php

* Update card.php

* Update functions.lib.php

* Update functions.lib.php

---------

Co-authored-by: stickler-ci <support@stickler-ci.com>
 2023-10-09 14:44:29 +02:00
Laurent Destailleur
19aea3d9b5 CSS 2023-10-09 13:23:22 +02:00
Laurent Destailleur
39b6b34820 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop
 2023-10-09 09:36:30 +02:00
Dev2a
fcd4c4e429 Fix: Change access to $conf->global to function getDolGlobal (automatique) 2023-10-08 23:19:49 +02:00
Andrés Maldonado
54a0245c4d FIX: modification of complementary attributes in commercial proposals 
The db object must not be cloned in order to avoid a PHP Fatal error:  Uncaught Exception: Serialization of 'PgSql\Connection' is not allowed

This commit replaces the dol_clone function by the one in the 17.0 branch
 2023-10-04 17:48:30 +02:00
Laurent Destailleur
40f10588e3 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-10-04 13:04:31 +02:00
Laurent Destailleur
78db102acd Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2023-10-04 13:03:27 +02:00
Laurent Destailleur
2a96ac6428 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-10-04 13:02:09 +02:00
Laurent Destailleur
342cdc81ac Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-10-04 13:01:09 +02:00
Laurent Destailleur
a201f54777 css 2023-10-04 12:59:00 +02:00
Laurent Destailleur
9bd3bb0594 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 
Conflicts:
	htdocs/compta/bank/various_payment/card.php
	htdocs/compta/bank/various_payment/list.php
	htdocs/core/lib/security.lib.php
	htdocs/core/lib/signature.lib.php
 2023-10-04 12:43:03 +02:00
Laurent Destailleur
a2ea4d77c3 Merge 2023-10-04 10:43:14 +02:00
Laurent Destailleur
0a015a82b4 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-10-04 10:39:40 +02:00
Laurent Destailleur
9ac5270626 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 
Conflicts:
	htdocs/core/lib/signature.lib.php
 2023-10-04 10:38:46 +02:00
Laurent Destailleur
8fc2beda1f Fix regression 2023-10-04 10:36:07 +02:00
Laurent Destailleur
f6f25e1117 Fix regression 2023-10-04 10:34:47 +02:00
Laurent Destailleur
517b19cc6f Fix regression 2023-10-04 10:33:38 +02:00
Laurent Destailleur
726258ff4f Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 
Conflicts:
	htdocs/core/lib/signature.lib.php
 2023-10-04 10:32:24 +02:00
Laurent Destailleur
4298150413 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 
Conflicts:
	htdocs/core/class/commonobject.class.php
	htdocs/core/lib/signature.lib.php
 2023-10-04 10:22:33 +02:00
Laurent Destailleur
74f486bd60 Merge pull request #26034 from atm-quentin/FIX_rights_paiement_sc 
FIX rights paymentsc paiementcharge
 2023-10-04 09:47:49 +02:00
Eric Seigne
563cdcefb3 fix #26104 : remove global object 2023-10-04 00:10:19 +02:00
Laurent Destailleur
5bcd89d66c Debug v19 2023-10-03 19:39:22 +02:00
Laurent Destailleur
6e18d1b7ab Start to introduce dolibarr_main_dolcrypt_key 2023-10-03 02:00:00 +02:00
Laurent Destailleur
4fe2c674f1 Set log as a warning 2023-10-03 00:52:26 +02:00
Pascal Hubrecht
8bd9177eba Merge branch 'Dolibarr:develop' into fix-25127 2023-10-02 16:28:01 +02:00
Laurent Destailleur
669386d45c Fix error message 2023-10-02 12:53:50 +02:00
Laurent Destailleur
7f0eb701d7 Fix decrypt 2023-10-02 11:48:28 +02:00
Pascal Hubrecht
86850e05c6 Merge branch 'Dolibarr:develop' into fix-25127 2023-10-02 11:15:16 +02:00
pascal
c6803b5c10 Add console log message 2023-10-02 11:08:55 +02:00
Laurent Destailleur
b8bd760e28 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-10-01 16:06:58 +02:00
Laurent Destailleur
998b5a6dd8 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2023-10-01 16:05:13 +02:00
Laurent Destailleur
d5443010f2 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2023-10-01 16:04:16 +02:00
Laurent Destailleur
5e76fea64d Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-10-01 15:53:36 +02:00
Laurent Destailleur
5560aab98e Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-10-01 15:50:25 +02:00
Laurent Destailleur
b0b3d0e1e0 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2023-10-01 15:43:40 +02:00
Regis Houssin
6e27a6517a FIX avoid excess line breaks 2023-10-01 03:20:37 +02:00
pascal
1a10894e88 FIX #25127 2023-09-30 17:51:14 +02:00
Laurent Destailleur
f5bf4a6ec4 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-09-30 11:54:12 +02:00
Laurent Destailleur
c1b74f9338 Fix phpunit regression 2023-09-29 17:04:11 +02:00
Laurent Destailleur
e25ffc5fef NEW Add the picto phone of thirdparty on the kanban view of projects 2023-09-29 12:04:18 +02:00
Regis Houssin
c616251b61 FIX missing 'overwrite_trans' for $addzero (Multicompany) 2023-09-28 07:09:21 +02:00
Laurent Destailleur
992726e424 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-09-27 17:20:18 +02:00
Laurent Destailleur
7bbc3bab05 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-09-27 17:17:41 +02:00
Alexandre SPANGARO
0fd8123606 NEW FontAwesome - Add possibility to select another version 2023-09-26 21:49:15 +02:00
Laurent Destailleur
e1217a8911 Fix phpcs 2023-09-26 21:11:23 +02:00
Quentin VIAL-GOUTEYRON
f4c6beac74 FIX rights paymentsc paiementcharge 2023-09-26 14:54:15 +02:00