Laurent Destailleur
ec39199b85
Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0
...
Conflicts:
.travis.yml
htdocs/api/class/api_documents.class.php
htdocs/core/db/pgsql.class.php
2023-07-26 01:42:22 +02:00
Laurent Destailleur
8e94ea0504
Fix warning
2023-07-26 00:01:45 +02:00
Laurent Destailleur
9e3eeb0ac6
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2023-07-25 23:47:47 +02:00
Laurent Destailleur
761565cabb
Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop
2023-07-25 23:47:28 +02:00
onhairech
b920dfdbda
qodana fix 4: missing returns ( #25334 )
...
* qodana fix 4: missing returns
* Delete settings.json
* correcting the return info function
* unreachable code fix
* return fix
2023-07-25 23:29:34 +02:00
UT from dolibit
cc3468abe3
Update box_graph_invoices_permonth.php ( #25467 )
2023-07-25 23:17:38 +02:00
UT from dolibit
37937f2a46
Update modHRM.class.php ( #25474 )
...
defgroup brief
2023-07-25 23:15:53 +02:00
UT from dolibit
0d0395fce3
Update modApi.class.php ( #25478 )
2023-07-25 23:14:17 +02:00
UT from dolibit
3d44cb7cb5
Update modFournisseur.class.php ( #25476 )
...
defgroup brief
2023-07-25 23:13:50 +02:00
UT from dolibit
73a82b7d8a
Update modNotification.class.php ( #25477 )
...
defgroup brief
2023-07-25 23:13:42 +02:00
UT from dolibit
54c7e0af2e
Update modMrp.class.php ( #25475 )
...
defgroup brief
2023-07-25 23:11:37 +02:00
UT from dolibit
c96e1de4b0
Update modUser.class.php ( #25482 )
...
defgroup brief
2023-07-25 23:11:21 +02:00
UT from dolibit
161684bc24
Update modEmailCollector.class.php ( #25481 )
...
defgroup brief
2023-07-25 23:11:09 +02:00
UT from dolibit
3915bbaa14
Update modReception.class.php ( #25479 )
...
defgroup brief
2023-07-25 23:10:46 +02:00
UT from dolibit
96b0b3f005
Update modExpedition.class.php ( #25484 )
...
defgroup brief
2023-07-25 23:10:32 +02:00
UT from dolibit
2fee75b81a
Update modECM.class.php ( #25480 )
...
defgroup brief
2023-07-25 23:10:06 +02:00
UT from dolibit
2c8be18715
Update box_clients.php ( #25468 )
2023-07-25 23:09:52 +02:00
UT from dolibit
6c52d2d68f
Update modHoliday.class.php ( #25473 )
...
defgroup brief
2023-07-25 23:09:16 +02:00
UT from dolibit
9c864759a2
Update modSyslog.class.php ( #25483 )
...
defgroup brief
2023-07-25 23:08:49 +02:00
UT from dolibit
29f8ac9171
Update modComptabilite.class.php ( #25485 )
...
defgroup brief
2023-07-25 23:07:57 +02:00
UT from dolibit
d2e15b149b
Update modExport.class.php ( #25486 )
...
defgroup brief
2023-07-25 23:07:28 +02:00
Laurent Destailleur
b1b2736116
Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop
2023-07-24 23:21:50 +02:00
Laurent Destailleur
d4cb845398
Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0
...
Conflicts:
htdocs/core/tpl/list_print_total.tpl.php
2023-07-24 23:20:17 +02:00
Laurent Destailleur
202283b034
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2023-07-24 20:56:40 +02:00
Laurent Destailleur
eec8868cfb
Clean code
2023-07-24 19:52:31 +02:00
UT from dolibit
6f8845a214
Update box_commandes.php ( #25435 )
2023-07-24 19:39:25 +02:00
UT from dolibit
489b632021
Update box_graph_propales_permonth.php ( #25437 )
2023-07-24 19:39:15 +02:00
UT from dolibit
1a6203b5a3
Update modules_boxes.php ( #25436 )
...
* Update modules_boxes.php
* Update modules_boxes.php
---------
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr >
2023-07-24 19:39:00 +02:00
UT from dolibit
1cf187da83
Update box_graph_nb_ticket_last_x_days.php ( #25438 )
2023-07-24 19:38:16 +02:00
UT from dolibit
22becb2ff4
Update box_lastlogin.php ( #25445 )
2023-07-24 19:22:15 +02:00
Oussama
dcc01599d4
New|NEW( #24834 ) new option for hide the footer ( #25464 )
...
* New|NEW new option for hide the footer of tickets on the public interface
* fix condition in index
---------
Co-authored-by: FLIO <oflifli@nltechno.com >
2023-07-24 19:03:54 +02:00
Laurent Destailleur
09b7c870eb
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
2023-07-24 19:02:23 +02:00
Laurent Destailleur
6a79459deb
Fix phpcs
2023-07-24 19:00:56 +02:00
Florian Mortgat
ad24b42a60
FIX php8.1 warning on lists with total due to unset array key ( #25460 )
2023-07-24 18:48:10 +02:00
UT from dolibit
c7729b22c3
Update mod_ticket_universal.php ( #25463 )
...
translations
2023-07-24 18:46:07 +02:00
UT from dolibit
b1befd8bd7
Update mod_project_universal.php ( #25462 )
2023-07-24 18:45:56 +02:00
Maxime Kohlhaas
663ca3d284
Fix : don't display birthdays when 0 years
2023-07-24 12:25:21 +02:00
UT from dolibit
bc23f3c592
Update box_members_last_subscriptions.php ( #25433 )
2023-07-23 23:52:09 +02:00
UT from dolibit
f75024e5b8
Update box_mos.php ( #25431 )
2023-07-23 23:51:51 +02:00
UT from dolibit
6d77cb4511
Update box_members_by_tags.php ( #25432 )
2023-07-23 23:51:41 +02:00
UT from dolibit
3eac209f68
Update box_supplier_orders_awaiting_reception.php ( #25434 )
2023-07-23 23:51:23 +02:00
UT from dolibit
234a9cb1a6
Update box_graph_nb_tickets_type.php ( #25430 )
2023-07-23 23:51:11 +02:00
Laurent Destailleur
5f0080779a
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2023-07-23 23:47:57 +02:00
Laurent Destailleur
ffa2f40a41
Fix for sql int comparison on rowid
2023-07-23 23:47:01 +02:00
Lucas Marcouiller
00fd59bd23
Fix : bookcal database structure adding calendar ( #25352 )
...
* Fix : bookcal database structure adding calendar
* fix avalabilities class
---------
Co-authored-by: Hystepik <lucas.marcouiller@gmail.com >
2023-07-23 23:31:12 +02:00
UT from dolibit
63d9f66657
Update box_graph_invoices_peryear.php ( #25429 )
2023-07-23 23:27:11 +02:00
UT from dolibit
f2b0ca9d42
Update box_graph_orders_permonth.php ( #25428 )
2023-07-23 23:24:24 +02:00
UT from dolibit
87c135d8bd
Update box_goodcustomers.php ( #25427 )
2023-07-23 23:24:12 +02:00
UT from dolibit
5f4cd74ff0
Update box_funnel_of_prospection.php ( #25426 )
2023-07-23 23:07:40 +02:00
UT from dolibit
ed80b052c4
Update box_comptes.php ( #25425 )
2023-07-23 23:07:18 +02:00