Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
D
dolibarr
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Container registry
Model registry
Analyze
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Software_Artifact_Infrastructure_Repository
dolibarr
Commits
9f44161e
Commit
9f44161e
authored
Jan 24, 2013
by
Laurent Destailleur
Browse files
Options
Downloads
Patches
Plain Diff
New: Can attach file for trip and expenses module
parent
8682d3c9
Branches
Branches containing commit
No related tags found
No related merge requests found
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
htdocs/compta/deplacement/document.php
+171
-0
171 additions, 0 deletions
htdocs/compta/deplacement/document.php
htdocs/core/lib/trip.lib.php
+8
-3
8 additions, 3 deletions
htdocs/core/lib/trip.lib.php
htdocs/document.php
+11
-0
11 additions, 0 deletions
htdocs/document.php
with
190 additions
and
3 deletions
htdocs/compta/deplacement/document.php
0 → 100644
+
171
−
0
View file @
9f44161e
<?php
/* Copyright (C) 2003-2007 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2004-2010 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2005 Marc Barilley / Ocebo <marc@ocebo.com>
* Copyright (C) 2005-2009 Regis Houssin <regis.houssin@capnetworks.com>
* Copyright (C) 2005 Simon TOSSER <simon@kornog-computing.com>
* Copyright (C) 2011-2012 Juanjo Menent <jmenent@2byte.es>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
/**
* \file htdocs/compta/deplacement/document.php
* \ingroup deplacement
* \brief Page of linked files onto trip and expenses
*/
require
'../../main.inc.php'
;
require_once
DOL_DOCUMENT_ROOT
.
'/compta/deplacement/class/deplacement.class.php'
;
require_once
DOL_DOCUMENT_ROOT
.
'/core/lib/files.lib.php'
;
require_once
DOL_DOCUMENT_ROOT
.
'/core/lib/images.lib.php'
;
require_once
DOL_DOCUMENT_ROOT
.
'/core/lib/trip.lib.php'
;
require_once
DOL_DOCUMENT_ROOT
.
'/core/class/html.formfile.class.php'
;
$langs
->
load
(
"other"
);
$langs
->
load
(
"trips"
);
$langs
->
load
(
"companies"
);
$langs
->
load
(
"interventions"
);
$id
=
GETPOST
(
'id'
,
'int'
);
$ref
=
GETPOST
(
'ref'
,
'alpha'
);
$action
=
GETPOST
(
'action'
,
'alpha'
);
$confirm
=
GETPOST
(
'confirm'
,
'alpha'
);
// Security check
if
(
$user
->
societe_id
)
$socid
=
$user
->
societe_id
;
$result
=
restrictedArea
(
$user
,
'deplacement'
,
$id
,
''
);
// Get parameters
$sortfield
=
GETPOST
(
'sortfield'
,
'alpha'
);
$sortorder
=
GETPOST
(
'sortorder'
,
'alpha'
);
$page
=
GETPOST
(
'page'
,
'int'
);
if
(
$page
==
-
1
)
{
$page
=
0
;
}
$offset
=
$conf
->
liste_limit
*
$page
;
$pageprev
=
$page
-
1
;
$pagenext
=
$page
+
1
;
if
(
!
$sortorder
)
$sortorder
=
"ASC"
;
if
(
!
$sortfield
)
$sortfield
=
"name"
;
$object
=
new
Deplacement
(
$db
);
$object
->
fetch
(
$id
,
$ref
);
$upload_dir
=
$conf
->
deplacement
->
dir_output
.
'/'
.
dol_sanitizeFileName
(
$object
->
ref
);
$modulepart
=
'trip'
;
/*
* Actions
*/
if
(
GETPOST
(
'sendit'
,
'alpha'
)
&&
!
empty
(
$conf
->
global
->
MAIN_UPLOAD_DOC
))
{
require_once
DOL_DOCUMENT_ROOT
.
'/core/lib/files.lib.php'
;
dol_add_file_process
(
$upload_dir
,
0
,
1
,
'userfile'
);
}
// Delete
else
if
(
$action
==
'confirm_deletefile'
&&
$confirm
==
'yes'
)
{
if
(
$object
->
id
>
0
)
{
$langs
->
load
(
"other"
);
$object
->
fetch_thirdparty
();
$file
=
$upload_dir
.
'/'
.
GETPOST
(
'urlfile'
);
// Do not use urldecode here ($_GET and $_REQUEST are already decoded by PHP).
$ret
=
dol_delete_file
(
$file
,
0
,
0
,
0
,
$object
);
if
(
$ret
)
setEventMessage
(
$langs
->
trans
(
"FileWasRemoved"
,
GETPOST
(
'urlfile'
)));
else
setEventMessage
(
$langs
->
trans
(
"ErrorFailToDeleteFile"
,
GETPOST
(
'urlfile'
)),
'errors'
);
header
(
'Location: '
.
$_SERVER
[
"PHP_SELF"
]
.
'?id='
.
$id
);
exit
;
}
}
/*
* View
*/
$form
=
new
Form
(
$db
);
llxHeader
(
""
,
""
,
$langs
->
trans
(
"TripCard"
));
if
(
$object
->
id
)
{
$object
->
fetch_thirdparty
();
$head
=
trip_prepare_head
(
$object
,
$user
);
dol_fiche_head
(
$head
,
'documents'
,
$langs
->
trans
(
"TripCard"
),
0
,
'trip'
);
// Construit liste des fichiers
$filearray
=
dol_dir_list
(
$upload_dir
,
"files"
,
0
,
''
,
'\.meta$'
,
$sortfield
,(
strtolower
(
$sortorder
)
==
'desc'
?
SORT_DESC
:
SORT_ASC
),
1
);
$totalsize
=
0
;
foreach
(
$filearray
as
$key
=>
$file
)
{
$totalsize
+=
$file
[
'size'
];
}
print
'<table class="border" width="100%">'
;
$linkback
=
'<a href="'
.
DOL_URL_ROOT
.
'/compta/deplacement/list.php'
.
(
!
empty
(
$socid
)
?
'?socid='
.
$socid
:
''
)
.
'">'
.
$langs
->
trans
(
"BackToList"
)
.
'</a>'
;
// Ref
print
'<tr><td width="30%">'
.
$langs
->
trans
(
"Ref"
)
.
'</td><td>'
;
print
$form
->
showrefnav
(
$object
,
'id'
,
$linkback
,
1
,
'rowid'
,
'ref'
,
''
);
print
'</td></tr>'
;
// Societe
//print "<tr><td>".$langs->trans("Company")."</td><td>".$object->client->getNomUrl(1)."</td></tr>";
print
'<tr><td>'
.
$langs
->
trans
(
"NbOfAttachedFiles"
)
.
'</td><td colspan="3">'
.
count
(
$filearray
)
.
'</td></tr>'
;
print
'<tr><td>'
.
$langs
->
trans
(
"TotalSizeOfAttachedFiles"
)
.
'</td><td colspan="3">'
.
$totalsize
.
' '
.
$langs
->
trans
(
"bytes"
)
.
'</td></tr>'
;
print
'</table>'
;
print
'</div>'
;
/*
* Confirmation suppression fichier
*/
if
(
$action
==
'delete'
)
{
$ret
=
$form
->
form_confirm
(
$_SERVER
[
"PHP_SELF"
]
.
'?id='
.
$object
->
id
.
'&urlfile='
.
urlencode
(
$_GET
[
"urlfile"
]),
$langs
->
trans
(
'DeleteFile'
),
$langs
->
trans
(
'ConfirmDeleteFile'
),
'confirm_deletefile'
,
''
,
0
,
1
);
if
(
$ret
==
'html'
)
print
'<br>'
;
}
// Affiche formulaire upload
$formfile
=
new
FormFile
(
$db
);
$formfile
->
form_attach_new_file
(
DOL_URL_ROOT
.
'/compta/deplacement/document.php?id='
.
$object
->
id
,
''
,
0
,
0
,
$user
->
rights
->
deplacement
->
creer
,
50
,
$object
);
// List of document
$param
=
'&id='
.
$object
->
id
;
$formfile
->
list_of_documents
(
$filearray
,
$object
,
'deplacement'
,
$param
);
}
else
{
print
$langs
->
trans
(
"UnkownError"
);
}
llxFooter
();
$db
->
close
();
?>
This diff is collapsed.
Click to expand it.
htdocs/core/lib/trip.lib.php
+
8
−
3
View file @
9f44161e
...
...
@@ -45,6 +45,11 @@ function trip_prepare_head($object)
// $this->tabs = array('entity:-tabname); to remove a tab
complete_head_from_modules
(
$conf
,
$langs
,
$object
,
$head
,
$h
,
'trip'
);
$head
[
$h
][
0
]
=
DOL_URL_ROOT
.
'/compta/deplacement/document.php?id='
.
$object
->
id
;
$head
[
$h
][
1
]
=
$langs
->
trans
(
"Documents"
);
$head
[
$h
][
2
]
=
'documents'
;
$h
++
;
$head
[
$h
][
0
]
=
DOL_URL_ROOT
.
'/compta/deplacement/info.php?id='
.
$object
->
id
;
$head
[
$h
][
1
]
=
$langs
->
trans
(
"Info"
);
$head
[
$h
][
2
]
=
'info'
;
...
...
This diff is collapsed.
Click to expand it.
htdocs/document.php
+
11
−
0
View file @
9f44161e
...
...
@@ -137,6 +137,17 @@ if ($modulepart)
$sqlprotectagainstexternals
=
"SELECT fk_soc as fk_soc FROM "
.
MAIN_DB_PREFIX
.
"fichinter WHERE ref='"
.
$refname
.
"' AND entity="
.
$conf
->
entity
;
}
// Wrapping pour les deplacements et notes de frais
else
if
(
$modulepart
==
'deplacement'
)
{
if
(
$user
->
rights
->
deplacement
->
lire
||
preg_match
(
'/^specimen/i'
,
$original_file
))
{
$accessallowed
=
1
;
}
$original_file
=
$conf
->
deplacement
->
dir_output
.
'/'
.
$original_file
;
//$sqlprotectagainstexternals = "SELECT fk_soc as fk_soc FROM ".MAIN_DB_PREFIX."fichinter WHERE ref='".$refname."' AND entity=".$conf->entity;
}
// Wrapping pour les prelevements
else
if
(
$modulepart
==
'prelevement'
)
{
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment