lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
98,056 Commits 43 Branches 150 Tags 886 MiB
46ea1084f5
Commit Graph

98056 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
46ea1084f5 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/mailing/cibles.php
	htdocs/core/extrafieldsinexport.inc.php
	htdocs/product/stock/card.php
 2021-04-19 20:59:10 +02:00
Laurent Destailleur
28f0c6c7cf Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/product/stock/card.php
 2021-04-19 20:55:09 +02:00
Laurent Destailleur
33532707dc Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-04-19 20:49:42 +02:00
Laurent Destailleur
3df79dd3c8 Avoid error on PHP 5.6 2021-04-19 20:49:31 +02:00
Laurent Destailleur
4fbeda25da
Merge pull request #17328 from dolibit-ut/patch-284 
Update index.php
 2021-04-19 20:29:04 +02:00
Laurent Destailleur
7eed8ce370
Merge pull request #17327 from dolibit-ut/patch-283 
Update document.php
 2021-04-19 20:27:49 +02:00
Laurent Destailleur
d42c330a7c
Merge pull request #17324 from dolibit-ut/patch-281 
Update index.php
 2021-04-19 20:27:28 +02:00
Laurent Destailleur
e2d7e84072
Merge pull request #17326 from atm-greg/FIX_warehouse_label_edition 
fix warehouse label field edition
 2021-04-19 20:26:56 +02:00
Laurent Destailleur
511b138413 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-04-19 20:25:35 +02:00
Laurent Destailleur
2578eb276c Fix phpunit 2021-04-19 20:25:22 +02:00
Laurent Destailleur
168198c156
Merge pull request #17325 from dolibit-ut/patch-282 
Update llx_10_c_regions.sql
 2021-04-19 20:22:13 +02:00
Laurent Destailleur
398800ef68
Merge pull request #17329 from dolibit-ut/patch-285 
Update list.php
 2021-04-19 20:21:36 +02:00
Laurent Destailleur
1a6df3f3cc
Merge pull request #17335 from dolibit-ut/patch-291 
Update comment.php
 2021-04-19 20:21:08 +02:00
Laurent Destailleur
d1fb1e4fea
Merge pull request #17331 from dolibit-ut/patch-287 
Update mo_movements.php
 2021-04-19 20:20:31 +02:00
Laurent Destailleur
1adffc4b05
Update mo_movements.php 2021-04-19 20:20:23 +02:00
Laurent Destailleur
9bf5614922
Merge pull request #17330 from dolibit-ut/patch-286 
Update mo_card.php
 2021-04-19 20:19:39 +02:00
Laurent Destailleur
468d44a23b
Merge pull request #17333 from dolibit-ut/patch-289 
Update admin_establishment.php
 2021-04-19 20:19:16 +02:00
Laurent Destailleur
8f6d842a68
Merge pull request #17332 from dolibit-ut/patch-288 
Update index.php
 2021-04-19 20:19:06 +02:00
Laurent Destailleur
4bf631dc90
Merge pull request #17334 from dolibit-ut/patch-290 
Update admin_hrm.php
 2021-04-19 20:18:58 +02:00
Laurent Destailleur
26d49c6e23
Merge pull request #17336 from dolibit-ut/patch-292 
Update contact.php
 2021-04-19 20:18:51 +02:00
Laurent Destailleur
7b0ed67181
Merge pull request #17337 from dolibit-ut/patch-293 
Update document.php
 2021-04-19 20:18:42 +02:00
Laurent Destailleur
0b634b2a77
Merge pull request #17338 from dolibit-ut/patch-294 
Update element.php
 2021-04-19 20:18:06 +02:00
Laurent Destailleur
e3b0ab42bc
Merge pull request #17340 from dolibit-ut/patch-295 
Update index.php
 2021-04-19 20:17:05 +02:00
UT from dolibit
b8fbfd5078
Update index.php 
new:  $help_url
add  DE:Modul_Projekte
" " => ' '
llxHeader('', $title, $help_url);
 2021-04-19 18:24:19 +02:00
stickler-ci
8437761bb6 Fixing style errors. 2021-04-19 16:15:07 +00:00
UT from dolibit
0f8ef61d34
Update element.php 
$title / $help_url / llxHeader   " " => ' '
add  DE:Modul_Projekte
llxHeader('', $title, $help_url);
 2021-04-19 18:13:06 +02:00
stickler-ci
8db9b5bb22 Fixing style errors. 2021-04-19 16:10:55 +00:00
UT from dolibit
b78f85b959
Update document.php 
$title / $help_url " " => ' '
add  DE:Modul_Projekte
 2021-04-19 18:08:36 +02:00
stickler-ci
6fff8baac5 Fixing style errors. 2021-04-19 16:07:19 +00:00
UT from dolibit
a886725b1c
Update contact.php 
$title / $help_url    " "  =>  ' '
add   DE:Modul_Projekte
 2021-04-19 18:05:18 +02:00
UT from dolibit
00eda15ac6
Update comment.php 
$title = $langs->trans('CommentPage');

llxHeader('', $title, '');
 2021-04-19 17:58:14 +02:00
UT from dolibit
985dc83b8c
Update admin_hrm.php 
$title = $langs->trans('Parameters');

llxHeader('', $title, '');
 2021-04-19 17:53:29 +02:00
UT from dolibit
f2781ee017
Update admin_establishment.php 
$title = $langs->trans('Establishments');

llxHeader('', $title, '');
 2021-04-19 17:51:52 +02:00
UT from dolibit
ec97c5aa09
Update index.php 
$title = $langs->trans('HRMArea');

llxHeader('', $title, '');
 2021-04-19 17:50:13 +02:00
UT from dolibit
38d7143392
Update mo_movements.php 
$help_url = 'EN:Module_Manufacturing_Orders|FR:Module_Ordres_de_Fabrication';
 2021-04-19 17:46:20 +02:00
UT from dolibit
333fb2d881
Update mo_card.php 
$title = $langs->trans('Mo')." - ".$langs->trans("Card");
 2021-04-19 17:40:23 +02:00
UT from dolibit
9b9ddc2c3c
Update list.php 
$xxxx_start / $xxxx_end :   " "  =>  ' '
 2021-04-19 17:37:08 +02:00
stickler-ci
d9db752339 Fixing style errors. 2021-04-19 15:32:00 +00:00
UT from dolibit
e7ee46049f
Update index.php 
$help_url = "EN:Module_Expense_Reports|FR:Module_Notes_de_frais";
 2021-04-19 17:29:52 +02:00
UT from dolibit
8fc3f9c919
Update document.php 
$helpurl  =>  $help_url 

$help_url = "EN:Module_Expense_Reports|FR:Module_Notes_de_frais";
 2021-04-19 17:28:13 +02:00
Laurent Destailleur
4d916f3c9f Fix perm 2021-04-19 17:23:16 +02:00
atm-greg
74345c4f21 fix warehouse label field edition 2021-04-19 16:03:22 +02:00
UT from dolibit
0f0bd34d29
Update llx_10_c_regions.sql 
-- Mauritius
-- Venezuela
-- United Arab Emirates
-- Portugal
-- Slovenia (correction fk_pays)
 2021-04-19 15:38:44 +02:00
Laurent Destailleur
b5868acf18 Fix phpcs 2021-04-19 15:30:30 +02:00
Laurent Destailleur
634c38e948 Fix escape 2021-04-19 15:28:49 +02:00
Laurent Destailleur
474bf5cfd9 Show MAIN_SECURITY_ANTI_SSRF_SERVER_IP option into security page 2021-04-19 15:26:24 +02:00
stickler-ci
1d27bc461a Fixing style errors. 2021-04-19 13:24:14 +00:00
UT from dolibit
e43b180e1b
Update index.php 
add comments
// init API
// init PHPUnit
// init ExtraFields
// init Hook
// init Trigger
// init Widget
// init CSS
// init JS
// init CLI
// init Doc
// add Language
// remove/delete File
 2021-04-19 15:22:07 +02:00
Laurent Destailleur
a8187af8ef Use MAIN_SECURITY_ANTI_SSRF_SERVER_IP as whitelist for local IP. 2021-04-19 15:16:00 +02:00
Laurent Destailleur
2cd9289de1 Fix error message 2021-04-19 15:09:13 +02:00