UT from dolibit
|
a18e27688d
|
Update dav.php
$help_url = 'EN:Module_DAV';
llxHeader('', $langs->trans("DAVSetup"), $help_url);
|
2021-03-16 16:54:58 +01:00 |
|
Laurent Destailleur
|
8246eb814b
|
Enhance the page for security advices
|
2021-03-16 16:02:15 +01:00 |
|
Laurent Destailleur
|
17031fdad8
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2021-03-16 15:16:01 +01:00 |
|
Laurent Destailleur
|
0e645aefbd
|
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2021-03-16 15:15:50 +01:00 |
|
Laurent Destailleur
|
59174315ae
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
|
2021-03-16 15:15:12 +01:00 |
|
Laurent Destailleur
|
a29a9e5435
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
|
2021-03-16 15:14:46 +01:00 |
|
Laurent Destailleur
|
dd2f1a547d
|
Merge pull request #16733 from dolibit-ut/patch-96
Update import.php
|
2021-03-16 15:13:57 +01:00 |
|
Laurent Destailleur
|
07ab1b5a43
|
Merge pull request #16732 from dolibit-ut/patch-95
Update card.php
|
2021-03-16 15:13:46 +01:00 |
|
Laurent Destailleur
|
84042abf5f
|
Merge pull request #16731 from dolibit-ut/patch-94
Update index.php
|
2021-03-16 15:13:35 +01:00 |
|
Laurent Destailleur
|
03f6201bdf
|
Merge pull request #16728 from dolibit-ut/patch-91
Update card.php
|
2021-03-16 15:13:27 +01:00 |
|
Laurent Destailleur
|
f33acb1a9b
|
Merge pull request #16729 from dolibit-ut/patch-92
Update card.php
|
2021-03-16 15:13:17 +01:00 |
|
Laurent Destailleur
|
88321d2778
|
Merge pull request #16730 from dolibit-ut/patch-93
Update card.php
|
2021-03-16 15:13:07 +01:00 |
|
Laurent Destailleur
|
bb76b3a9be
|
Merge pull request #16727 from dolibit-ut/patch-90
Update card.php
|
2021-03-16 15:12:56 +01:00 |
|
Laurent Destailleur
|
2b7a167615
|
Merge pull request #16726 from dolibit-ut/patch-89
Update card.php
|
2021-03-16 15:12:38 +01:00 |
|
Laurent Destailleur
|
66bbc7f54f
|
Merge pull request #16734 from AlexisLaurier/11.0
correct nb_expedition count
|
2021-03-16 15:12:18 +01:00 |
|
Laurent Destailleur
|
e40ba085e1
|
Add package php-intl into debian package
|
2021-03-16 15:05:12 +01:00 |
|
Alexis LAURIER
|
971b97d78f
|
correct nb_expedition count
|
2021-03-16 15:00:46 +01:00 |
|
Laurent Destailleur
|
e366d2c379
|
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
ChangeLog
htdocs/admin/tools/export_files.php
htdocs/compta/paiement_charge.php
htdocs/compta/sociales/card.php
htdocs/core/lib/functions.lib.php
htdocs/cron/list.php
htdocs/filefunc.inc.php
test/phpunit/FilesLibTest.php
|
2021-03-16 14:57:04 +01:00 |
|
Laurent Destailleur
|
f514dec6ab
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts:
htdocs/compta/paiement_charge.php
htdocs/compta/sociales/card.php
|
2021-03-16 14:50:06 +01:00 |
|
Laurent Destailleur
|
3a3c0bad2f
|
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
|
2021-03-16 14:46:15 +01:00 |
|
Laurent Destailleur
|
95ede60de2
|
Fix css
|
2021-03-16 14:46:00 +01:00 |
|
UT from dolibit
|
914702fa8f
|
Update import.php
$help_url = 'EN:Module_Imports_En|FR:Module_Imports|ES:Módulo_Importaciones';
use of $help_url
|
2021-03-16 14:00:25 +01:00 |
|
UT from dolibit
|
e35dc732e2
|
Update card.php
$help_url = 'EN:Module_Interventions';
llxHeader('', $langs->trans("Intervention"), $help_url);
|
2021-03-16 13:49:34 +01:00 |
|
UT from dolibit
|
272bf984a1
|
Update index.php
$help_url = 'EN:Module_Exports_En|FR:Module_Exports|ES:Módulo_Exportaciones';
llxHeader('', $langs->trans("ExportsArea"), $help_url);
|
2021-03-16 13:45:33 +01:00 |
|
UT from dolibit
|
edd7de7abf
|
Update card.php
changed: $helpurl to $help-url
add: FR:Module_Notes_de_frais
$help_url = "EN:Module_Expense_Reports|FR:Module_Notes_de_frais";
llxHeader("", $title, $help_url);
|
2021-03-16 13:42:30 +01:00 |
|
UT from dolibit
|
d4777e76be
|
Update card.php
$help_url = 'EN:Module_Shipments|FR:Module_Expéditions|ES:Módulo_Expediciones|DE:Modul_Lieferungen';
llxHeader('', $langs->trans('Shipment'), 'Expedition', $help_url);
|
2021-03-16 13:38:46 +01:00 |
|
UT from dolibit
|
1e2093ebb3
|
Update card.php
$help_url = 'EN:Module_Donations|FR:Module_Dons|ES:Módulo_Donaciones';
llxHeader('', $langs->trans("Donation"), $help_url);
|
2021-03-16 13:32:38 +01:00 |
|
UT from dolibit
|
59f581bc71
|
Update card.php
add: $help_url = 'EN:Module_Contracts|FR:Module_Contrat';
changed: llxHeader('', $langs->trans("Contract"), $help_url);
|
2021-03-16 13:28:46 +01:00 |
|
UT from dolibit
|
6157fd4c79
|
Update card.php
$help_url add -> DE:Modul_Geschäftspartner
|
2021-03-16 13:16:03 +01:00 |
|
Laurent Destailleur
|
ceba8146c6
|
Fix phpunit
|
2021-03-16 12:40:20 +01:00 |
|
Laurent Destailleur
|
9a474602a8
|
Fix #yogosha5644
|
2021-03-16 11:58:03 +01:00 |
|
Laurent Destailleur
|
882a9c0792
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2021-03-16 10:59:17 +01:00 |
|
Laurent Destailleur
|
1495630254
|
Fix #yogosha5645
|
2021-03-16 10:59:01 +01:00 |
|
Laurent Destailleur
|
efaeeb2d06
|
Merge pull request #16701 from dolibit-ut/patch-82
Update card.php
|
2021-03-16 10:43:08 +01:00 |
|
Laurent Destailleur
|
017120f017
|
Merge pull request #16697 from frederic34/patch-3
fix syntax
|
2021-03-16 10:42:49 +01:00 |
|
Laurent Destailleur
|
7bbcb62795
|
Merge pull request #16695 from dolibit-ut/patch-79
Update hook_document.php
|
2021-03-16 10:42:28 +01:00 |
|
Laurent Destailleur
|
9aa72e8c06
|
Update hook_document.php
|
2021-03-16 10:42:15 +01:00 |
|
Laurent Destailleur
|
1f4a3dee5f
|
Merge pull request #16696 from dolibit-ut/patch-80
Update list.php
|
2021-03-16 10:40:13 +01:00 |
|
Laurent Destailleur
|
57481bdb88
|
Merge pull request #16699 from dolibit-ut/patch-81
Update index.php
|
2021-03-16 10:39:43 +01:00 |
|
Laurent Destailleur
|
71e7f10a54
|
FIX #16698
|
2021-03-16 10:39:10 +01:00 |
|
Laurent Destailleur
|
9480e15755
|
Merge pull request #16703 from dolibit-ut/patch-84
Update card.php
|
2021-03-16 10:37:07 +01:00 |
|
Laurent Destailleur
|
a733275559
|
Merge pull request #16702 from dolibit-ut/patch-83
Update card.php
|
2021-03-16 10:36:53 +01:00 |
|
Laurent Destailleur
|
3c3bb67e51
|
Merge pull request #16704 from dolibit-ut/patch-85
Update card.php
|
2021-03-16 10:36:39 +01:00 |
|
Laurent Destailleur
|
26931a7e52
|
Merge pull request #16705 from dolibit-ut/patch-86
Update card.php
|
2021-03-16 10:36:27 +01:00 |
|
Laurent Destailleur
|
87ab711a0f
|
Merge pull request #16707 from FHenry/dev_EventOrganisation
new: working on conference or booth object and event type #FoundationFunding
|
2021-03-16 10:34:55 +01:00 |
|
Laurent Destailleur
|
310b03b770
|
Merge pull request #16710 from frederic34/patch-7
fix php8 warnings
|
2021-03-16 10:34:15 +01:00 |
|
Laurent Destailleur
|
a357ab0ee7
|
Merge pull request #16708 from frederic34/patch-4
fix php8 warning
|
2021-03-16 10:34:02 +01:00 |
|
Laurent Destailleur
|
bcf7fa1fc8
|
Merge pull request #16711 from frederic34/patch-8
fix php8 warnings
|
2021-03-16 10:33:21 +01:00 |
|
Laurent Destailleur
|
897f4be033
|
Merge pull request #16712 from frederic34/patch-9
fix php8 warnings
|
2021-03-16 10:33:01 +01:00 |
|
Laurent Destailleur
|
401aeb8a7f
|
Merge pull request #16706 from frederic34/htmlforcc
decompose code
|
2021-03-16 10:32:44 +01:00 |
|