Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-10 03:28:18 +01:00
Code Issues Packages Projects Releases Wiki Activity
125,218 Commits 36 Branches 190 Tags
c263fccb5f8bedd828ef2fd34b64b51fb8812c06
Commit Graph

32449 Commits

Author SHA1 Message Date
Laurent Destailleur
492bdd4a0e Merge 2023-10-20 13:14:10 +02:00
Laurent Destailleur
519836ea41 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-10-20 04:00:31 +02:00
Laurent Destailleur
ff03e34103 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-10-20 03:59:46 +02:00
Laurent Destailleur
f542b1de38 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2023-10-20 03:33:46 +02:00
Eric
0975b2bbb8 check if $_FILES['userfile'] is an array before getting values (#26269) 2023-10-20 02:30:15 +02:00
Laurent Destailleur
8abde02b85 FIX dol_eval with function starting with ! 2023-10-18 16:26:27 +02:00
Laurent Destailleur
558b6b5762 Fix missing Cash control menu in auguria 2023-10-18 16:24:30 +02:00
Laurent Destailleur
52b65dfd29 FIX Tooltip for search syntax must not appear on date fields 2023-10-18 16:23:41 +02:00
Eric
e4987c8f3b fix #26244 todelete could contains dupplicate val (#26245) 2023-10-18 03:05:05 +02:00
Laurent Destailleur
15e927be31 FIX Bad name for trigger in HRM module 2023-10-17 14:46:51 +02:00
noec764
4675a93fc8 FIX: Error handling for computed values on import (#24897) 
* FIX: Error handling for computed values on import

* Fixing style errors.

---------

Co-authored-by: stickler-ci <support@stickler-ci.com>
 2023-10-15 21:18:03 +02:00
Laurent Destailleur
6311200b36 FIX #26170 2023-10-12 14:31:54 +02:00
Laurent Destailleur
d3dd3dacfe Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2023-10-10 22:52:04 +02:00
Regis Houssin
5476725066 FIX missing load group members for ldap synchro (#26167) 
* FIX missing load group members for ldap synchro

* FIX missing load group members during fetch group
 2023-10-10 18:37:50 +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
Anthony Berton
c2e5311a18 FIX - compare the result of the send mail file function 2023-10-09 11:20:10 +02:00
Laurent Destailleur
e65f32b3aa Merge pull request #26137 from hregis/fix_avoid_lines_breaks 
FIX avoid warning if module not activated
 2023-10-09 10:29:53 +02:00
Laurent Destailleur
793922d468 Fix for compatibility 2023-10-09 09:20:37 +02:00
Laurent Destailleur
60a1ff7cd6 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2023-10-09 09:14:06 +02:00
Laurent Destailleur
b3368514ab NEW Add option MAIN_MAIL_DEBUG_LOG_WITH_DATE to add 1 log file per email 2023-10-09 09:13:27 +02:00
Regis Houssin
fb4ed77d93 FIX avoid warning if module not activated 2023-10-08 21:05:46 +02:00
Regis Houssin
d6b39dc227 FIX avoid warnings 2023-10-07 08:30:07 +02:00
Noé Courtier
06bbb9517b FIX: Use of line->insert instead of line->create 2023-10-06 17:02:26 +02:00
Laurent Destailleur
f4166de704 Fix warning 2023-10-06 16:21:39 +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
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
a0248fe9e3 Merge pull request #26036 from atm-sami/NEW_add_data_in_printObjectLine_hook 
add extrafields and defaulttpldir for hook parameters
 2023-10-02 18:29:50 +02:00
Regis Houssin
9e1b000932 FIX avoid php warnings 2023-10-02 08:22:20 +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
Laurent Destailleur
85b04e018f Merge pull request #26080 from hregis/fix_multicompany18_compatibility 
FIX avoid php8 warning
 2023-10-01 13:30:15 +02:00
Regis Houssin
6e27a6517a FIX avoid excess line breaks 2023-10-01 03:20:37 +02:00