Commit Graph

3208 Commits

Author SHA1 Message Date
Laurent Destailleur
0091c31b99 Debug v16 2022-06-28 11:07:06 +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
6e5cbd9f08 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-06-27 12:09:42 +02:00
daraelmin
e381e646b3 Fix css class declared in wrong param
In print_liste_field_titre CSS class name can only be added in prefix parameter (except 'class="right"' for backward compatibility)
If the title is centered, the field should be also
2022-06-25 21:22:30 +02:00
Frédéric France
62c171c26d isModEnabled 2022-06-21 20:54:28 +02:00
Frédéric France
9f32100fef Merge remote-tracking branch 'upstream/develop' into useismodenabled 2022-06-21 20:27:57 +02:00
Frédéric France
1f7fc7a2ae getDolGlobalString 2022-06-21 20:25:25 +02:00
Alexandre SPANGARO
e6a9d48e71 Fix code error 2022-06-19 06:41:05 +02:00
Alexandre SPANGARO
4768502773 Merge remote-tracking branch 'upstream/develop' into 16b2 2022-06-19 06:35:49 +02:00
Laurent Destailleur
18cf0c7a18 Debug v16 2022-06-17 18:57:09 +02:00
Laurent Destailleur
014a62a3a7 Merge branch 'develop' into Fix_accountancy_supplier_index_14 2022-06-17 17:23:55 +02:00
Laurent Destailleur
614ebfeadc Update index.php 2022-06-17 17:20:12 +02:00
Laurent Destailleur
75b50023bf Update index.php 2022-06-17 17:18:05 +02:00
Laurent Destailleur
dd96f6d8d2 Update index.php 2022-06-17 17:17:29 +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
Alexandre SPANGARO
a49062338f Copyright 2022-06-17 04:41:15 +02:00
Alexandre SPANGARO
54a5967a71 FIX Accountancy - Partitioning of the entity on an automatic binding 2022-06-17 04:37:56 +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
Alexandre SPANGARO
e2c9f62796 Fix PHP 8.1.7 2022-06-12 22:58:20 +02:00
Alexandre SPANGARO
05cad50f0e Merge branch '16b2' of https://github.com/aspangaro/dolibarr into 16b2 2022-06-12 22:49:20 +02:00
Alexandre SPANGARO
7cd6df4745 Fix PHP 8.1.7 2022-06-12 22:49:05 +02:00
stickler-ci
5f298f7f69 Fixing style errors. 2022-06-12 20:39:25 +00:00
Alexandre SPANGARO
70e8210339 Fix PHP 8.1.7 2022-06-12 22:33:58 +02:00
Alexandre SPANGARO
c96b6b0bc7 Fix PHP 8.1.7 2022-06-12 22:30:24 +02:00
Alexandre SPANGARO
4f27d7e760 Fix PHP 8.1.7 2022-06-12 22:26:16 +02:00
Alexandre SPANGARO
274dd343f7 Fix PHP 8.1.7 2022-06-12 22:26:12 +02:00
Alexandre SPANGARO
2865b72b65 Fix PHP 8.1.7 2022-06-12 21:56:15 +02:00
Alexandre SPANGARO
ae55ff6a43 Fix PHP 8.1.7 2022-06-12 21:50:09 +02:00
Alexandre SPANGARO
7e3a6116bf Remove patch - Error 2022-06-12 21:30:12 +02:00
Alexandre SPANGARO
6309dbe99b Fix PHP 8.1.7 2022-06-12 07:38:49 +02:00
Alexandre SPANGARO
02f21fae78 Fix PHP 8.1.7 - $newcardbutton not defined 2022-06-12 07:33:28 +02:00
Alexandre SPANGARO
590cb20b41 Fix PHP 8.1.7 - $search_country_id not defined 2022-06-12 07:30:09 +02:00
Alexandre SPANGARO
7967ab402a Fix PHP 8.1.7 2022-06-12 07:19:08 +02:00
Frédéric FRANCE
38b18a68d7 Merge branch 'develop' into useismodenabled 2022-06-10 10:07:41 +02:00
stickler-ci
a1cec27540 Fixing style errors. 2022-06-10 02:53:13 +00:00
Alexandre SPANGARO
4fecd01ddd NEW Accountancy - Manage customer retained warranty 2022-06-10 04:47:15 +02:00
Frédéric France
0b8179d7ef use isModEnabled function 2022-06-09 22:49:48 +02:00
Alexandre SPANGARO
82d1cb4682 FIX #20527 Accountancy Unbalanced entry proposed when an employee are declared on social contribution 2022-06-09 17:30:16 +02:00
Laurent Destailleur
648f4b1d8e Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-06-09 12:51:02 +02:00
Laurent Destailleur
62d2084237 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-06-09 12:49:49 +02:00
Laurent Destailleur
974a1c2c6d Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2022-06-09 12:48:51 +02:00
Laurent Destailleur
a4ca81d4ce FIX #21174 2022-06-09 12:46:13 +02:00
Laurent Destailleur
aeb4287d25 Merge pull request #21143 from fboitel/14.0
FIX #20696
2022-06-09 03:11:23 +02:00
Laurent Destailleur
1ae708ae9a Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-06-09 03:10:37 +02:00
Laurent Destailleur
8280447f3e # WARNING: head commit changed in the meantime
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
2022-06-09 03:09:37 +02:00
Laurent Destailleur
900c71b5d6 Fix can add an empty line in tmp edit mode of transation 2022-06-09 03:07:11 +02:00
Laurent Destailleur
e10d89dd36 Fix regression 2022-06-09 03:00:51 +02:00
Faustin
f0a8765ee6 FIX #20696 2022-06-08 16:05:44 +02:00
daraelmin
0641b66118 Clean code 2022-06-08 01:39:53 +02:00