Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
130,797 Commits 36 Branches 189 Tags
a2c92f183cc54c35013469638780c28e65df0b51
Commit Graph

10504 Commits

Author SHA1 Message Date
Laurent Destailleur
1f38e54e78 Clean code 2023-10-15 15:32:35 +02:00
Laurent Destailleur
cbb60d8b5e Debug v19 2023-10-14 16:23:28 +02:00
Laurent Destailleur
4594188984 Debug v19 2023-10-14 01:10:25 +02:00
Laurent Destailleur
1a026a7dd6 css 2023-10-14 00:06:34 +02:00
Laurent Destailleur
d11543c806 Debug v19 2023-10-13 20:07:39 +02:00
Laurent Destailleur
a8b4b9ec14 Debug v19 2023-10-13 16:08:30 +02:00
Laurent Destailleur
af186509b9 Fix error management 2023-10-13 15:42:15 +02:00
Laurent Destailleur
c507adeef7 NEW Top menu support picto of modules that are font awesome picto. 2023-10-13 15:00:51 +02:00
Laurent Destailleur
1e720b5d40 Code comment for #23820 2023-10-12 19:51:10 +02:00
Laurent Destailleur
6871c63090 Manual merge for #24883 2023-10-12 19:39:11 +02:00
dolibarr95
879c6d1e1f NEW Add more company informations (ProfId7 to 10) (#25266) 
* Update company.php

Add more "company  professional" Id informations.
4 new constants

* Update pdf.lib.php

pdf page footer add ProfId

* Update pdf.lib.php

add profid10

* Update companies.lang

ProfId 7 to 10
 2023-10-12 17:44:08 +02:00
Laurent Destailleur
f1330e5998 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-10-12 15:01:26 +02:00
Laurent Destailleur
7bc0e6d58c Code comment 2023-10-12 15:00:57 +02:00
Laurent Destailleur
6311200b36 FIX #26170 2023-10-12 14:31:54 +02:00
Anthony Berton
a29616d81a NEW - Row in list higher height (#26177) 
* NEW - Line be most height in list

* Param for height row

* Update style.css.php

* Update style.css.php

---------

Co-authored-by: Anthony Berton <anthony.berton@bb2a.fr>
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
 2023-10-12 13:16:17 +02:00
Laurent Destailleur
43b60b87c3 Debug v19 2023-10-11 03:02:47 +02:00
Laurent Destailleur
616f0e41d4 Clean code 2023-10-11 02:54:19 +02:00
Laurent Destailleur
a7ac0a248f Debug v19 2023-10-11 00:39:38 +02:00
Laurent Destailleur
946239dbf3 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-10-10 23:04:47 +02:00
Laurent Destailleur
30a0d4df26 FIX PHP warning 2023-10-10 22:35:35 +02:00
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