Commit Graph

116414 Commits

Author SHA1 Message Date
Laurent Destailleur
7318fb1903 Fix filter on active on list of account 2022-12-22 01:42:53 +01:00
Laurent Destailleur
bc43b4f62d Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-12-22 01:20:32 +01:00
Laurent Destailleur
36e634c67f Css 2022-12-22 01:19:50 +01:00
Laurent Destailleur
5a8f20ff9e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-12-22 01:11:14 +01:00
Laurent Destailleur
357b69a90b Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-12-22 01:11:03 +01:00
Laurent Destailleur
d5438f981d Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2022-12-22 01:08:12 +01:00
Laurent Destailleur
5dfd9af695 Removed not required rm 2022-12-22 01:07:02 +01:00
Laurent Destailleur
c7ae67a9be Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-12-22 01:04:56 +01:00
Laurent Destailleur
e75617268b Log 2022-12-22 01:04:06 +01:00
Laurent Destailleur
ad982a76c7
Merge pull request #22912 from frederic34/patch-7
add hook in productlot tooltip
2022-12-22 01:00:09 +01:00
Laurent Destailleur
394c3d5c3c Fix var 2022-12-22 00:59:54 +01:00
Laurent Destailleur
a7216f9738
Merge pull request #23298 from joseplluis/patch-13
NEW option filter in proposals
2022-12-22 00:56:44 +01:00
Laurent Destailleur
bd90d783c7 Reduce code 2022-12-22 00:48:56 +01:00
Laurent Destailleur
599aa6009a Try to solve phpunit regression 2022-12-22 00:37:33 +01:00
Laurent Destailleur
49e8b53fab Try fix for phpunit regression 2022-12-22 00:33:03 +01:00
Laurent Destailleur
d29fde6603 Add log to test phpunit pb 2022-12-22 00:02:22 +01:00
Laurent Destailleur
a0f282d100 Try a fix of phpunit regression 2022-12-21 23:34:32 +01:00
Laurent Destailleur
14d4237ac2 Fix bad version 2022-12-21 22:02:21 +01:00
Laurent Destailleur
a5e5362cb0 FIX Trigger must be inside the transaction 2022-12-21 21:26:17 +01:00
Laurent Destailleur
0842e19f28 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-12-21 21:25:10 +01:00
Laurent Destailleur
a35fe49100 FIX Trigger must be inside the transaction 2022-12-21 21:24:54 +01:00
Laurent Destailleur
e5229f655c
Merge pull request #23306 from frederic34/assetnumbering
fix asset numbering modules
2022-12-21 21:16:05 +01:00
Laurent Destailleur
9c0b2e6abe Too many bug in module. Restore the develop status. 2022-12-21 21:15:21 +01:00
Laurent Destailleur
e06bad5112 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2022-12-21 21:15:00 +01:00
Laurent Destailleur
c193835422
Merge pull request #23270 from fmarcet/develop
New: Register project closing automatically in the agenda
2022-12-21 21:11:24 +01:00
Laurent Destailleur
b0fdf83922 Removed <<<<<<< string 2022-12-21 21:09:50 +01:00
Laurent Destailleur
dc1c31c948 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-12-21 21:00:57 +01:00
Laurent Destailleur
50d4b6c2b2 css 2022-12-21 21:00:44 +01:00
Laurent Destailleur
8d2dde99ae Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-12-21 20:57:13 +01:00
Laurent Destailleur
8e914b2423 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-12-21 20:47:09 +01:00
Laurent Destailleur
c3ada976e1 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-12-21 20:46:56 +01:00
Laurent Destailleur
91f725447a
Merge pull request #23305 from lamrani002/kanbanBomList
New mode view "Kanban" for BOM list
2022-12-21 20:46:05 +01:00
Laurent Destailleur
f87b6d7ede
Merge pull request #23260 from braito4/patch-2
php 8 warning
2022-12-21 20:45:38 +01:00
Laurent Destailleur
1681674cdf
Update card.php 2022-12-21 20:45:11 +01:00
Laurent Destailleur
25c74761f7
Merge pull request #23271 from inovea-conseil/FIX_#21711
FIX #21711
2022-12-21 20:35:25 +01:00
Laurent Destailleur
cc9ccc3b64
Merge pull request #23264 from inovea-conseil/FIX_ISSUE_23087
FIX #23087
2022-12-21 20:24:47 +01:00
Frédéric FRANCE
951ea25459 clean code 2022-12-21 20:11:18 +01:00
Laurent Destailleur
2256df9389
Merge pull request #23278 from OPEN-DSI/develop_new_add_sent_info_on_send_email_after_hook
NEW : Add sent info in the parameters provided to the hook sendMailAfter
2022-12-21 20:04:11 +01:00
Laurent Destailleur
b281924f03
Merge pull request #23279 from frederic34/fixwarnings
fix warnings
2022-12-21 20:01:48 +01:00
Laurent Destailleur
3458fd823d
Merge pull request #23275 from atm-john/17.0_fix_validate
FIX validate class isMinLength method
2022-12-21 20:01:37 +01:00
Frédéric FRANCE
2571a3dc62 Merge remote-tracking branch 'upstream/develop' into assetnumbering 2022-12-21 20:01:37 +01:00
Frédéric FRANCE
e0db1fdbd9 fix asset numbering modules 2022-12-21 19:59:01 +01:00
Laurent Destailleur
0b2a7a79fa
Merge pull request #23280 from frederic34/patch-10
fix typo
2022-12-21 19:34:28 +01:00
Laurent Destailleur
f1f8868a1c
Merge pull request #23282 from dolibit-ut/patch-628
Update ChangeLog
2022-12-21 19:34:07 +01:00
Laurent Destailleur
c83e9ce2dc
Merge pull request #23286 from dolibit-ut/patch-630
Update new.php
2022-12-21 19:33:56 +01:00
Laurent Destailleur
45fdebcda2 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2022-12-21 19:33:02 +01:00
Laurent Destailleur
bee9244747 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2022-12-21 19:27:50 +01:00
Laurent Destailleur
c09751dfd5 FIx #23288 2022-12-21 19:26:17 +01:00
Laurent Destailleur
97a491b56c
Merge pull request #23289 from dolibit-ut/patch-632
Update mailing-read.php
2022-12-21 19:23:49 +01:00
Laurent Destailleur
16c6994219
Merge pull request #23287 from dolibit-ut/patch-631
Update new.php
2022-12-21 19:23:39 +01:00