Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
125,322 Commits 36 Branches 189 Tags
b5036b7a0df6db7edbb49fa57ff8d4e36b2dfc8a
Commit Graph

32638 Commits

Author SHA1 Message Date
Laurent Destailleur
b5036b7a0d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop
 2023-10-08 12:07:01 +02:00
Laurent Destailleur
f4166de704 Fix warning 2023-10-06 16:21:39 +02:00
William Mead
199eeff390 Merge branch 'Dolibarr:develop' into new-fichinter-close-notification 2023-10-06 14:36:29 +02:00
Laurent Destailleur
6cd7ef77fc Merge branch 'develop' into 13.0_fix_sellist_add_order_by_option 2023-10-06 01:42:22 +02:00
Laurent Destailleur
9deebe63d8 Update commonobject.class.php 2023-10-06 01:41:44 +02:00
Laurent Destailleur
c3a9ba5506 Update commonobject.class.php 2023-10-05 21:29:30 +02:00
Laurent Destailleur
b0cc8d7b0d Merge branch '18.0' into 13.0_fix_sellist_add_order_by_option 2023-10-05 21:25:19 +02:00
Laurent Destailleur
b307774dde Update commonobject.class.php 2023-10-05 21:17:40 +02:00
Laurent Destailleur
553776a77a Enhance error message when set character set failed 2023-10-05 12:58:44 +02:00
William Mead
b3ce1af29d NEW Added notification on closed intervention 2023-10-05 12:11:39 +02:00
Laurent Destailleur
6e40408683 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-10-05 11:27:41 +02:00
Laurent Destailleur
76a7801975 Fix warning 2023-10-05 11:27:00 +02:00
Laurent Destailleur
3700b047ec Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-10-04 13:04:54 +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
Laurent Destailleur
1ad05e2a73 Merge pull request #26098 from aspangaro/19a8 
NEW Project - List - use select2 multiselect for status
 2023-10-04 09:41:29 +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
Alexandre SPANGARO
5f6a4bb785 Merge branch 'develop' into 19a8 2023-10-03 03:27:46 +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
Laurent Destailleur
5537ccede2 FIX update_extras must use updateExtraFields 2023-10-03 00:23:06 +02:00
Alexandre SPANGARO
16a0025e93 NEW Project - List - use select2 multiselect for status 2023-10-02 22:57:53 +02:00
Laurent Destailleur
d3dc6615db Remove deprecated use of ->modelpdf (good is ->model_pdf) 2023-10-02 21:49:08 +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
Laurent Destailleur
e8f5f32141 Merge pull request #26093 from solution-libre/fix-reduce--unnecessary-complexity 
FIX Reduce  unnecessary complexity
 2023-10-02 18:17:15 +02:00
Florent Poinsaut
ffee2af478 FiX CI 2023-10-02 17:01:53 +02:00
Florent Poinsaut
25bd19d7e5 Unneccesary else 2023-10-02 16:58:28 +02:00
Florent Poinsaut
17f8bc6c1f Reduce unnecessary complexity 2023-10-02 16:44:44 +02:00
Pascal Hubrecht
8bd9177eba Merge branch 'Dolibarr:develop' into fix-25127 2023-10-02 16:28:01 +02:00
Laurent Destailleur
34fc0f14d2 Fix warnings 2023-10-02 15:41:14 +02:00
Laurent Destailleur
042ce496c7 Fix phpcs 2023-10-02 15:38:38 +02:00
Laurent Destailleur
4cf1dc1a2f Fix picto clear search 2023-10-02 13:21:09 +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
Laurent Destailleur
f9288ce862 Look and feel v18 2023-10-02 11:26:26 +02:00
Pascal Hubrecht
86850e05c6 Merge branch 'Dolibarr:develop' into fix-25127 2023-10-02 11:15:16 +02:00