|
@@ -1,5 +1,5 @@
|
|
|
<?php
|
|
|
-/* Copyright (C) 2017 Alexandre Spangaro <aspangaro@zendsi.com>
|
|
|
+/* Copyright (C) 2017 Alexandre Spangaro <aspangaro@zendsi.com>
|
|
|
*
|
|
|
* 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
|
|
@@ -17,9 +17,9 @@
|
|
|
*/
|
|
|
|
|
|
/**
|
|
|
- * \file htdocs/compta/bank/various_payment/document.php
|
|
|
- * \ingroup banque
|
|
|
- * \brief Page of linked files onto various_payment
|
|
|
+ * \file htdocs/compta/bank/various_payment/document.php
|
|
|
+ * \ingroup bank
|
|
|
+ * \brief Page of linked files onto various payment
|
|
|
*/
|
|
|
|
|
|
require '../../../main.inc.php';
|
|
@@ -28,9 +28,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
|
|
|
require_once DOL_DOCUMENT_ROOT.'/core/lib/bank.lib.php';
|
|
|
require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/paymentvarious.class.php';
|
|
|
|
|
|
-$langs->load("other");
|
|
|
-$langs->load("bank");
|
|
|
-$langs->load("companies");
|
|
|
+$langs->loadLangs(array("compta", "banks", "bills", "users", "accountancy"));
|
|
|
|
|
|
$id = GETPOST('id','int');
|
|
|
$ref = GETPOST('ref', 'alpha');
|
|
@@ -38,9 +36,9 @@ $action = GETPOST('action','alpha');
|
|
|
$confirm = GETPOST('confirm','alpha');
|
|
|
|
|
|
// Security check
|
|
|
+$socid = GETPOST("socid","int");
|
|
|
if ($user->societe_id) $socid=$user->societe_id;
|
|
|
-$result = restrictedArea($user, 'salaries', $id, '');
|
|
|
-
|
|
|
+$result = restrictedArea($user, 'banque', '', '', '');
|
|
|
|
|
|
// Get parameters
|
|
|
$sortfield = GETPOST('sortfield','alpha');
|
|
@@ -74,8 +72,9 @@ include_once DOL_DOCUMENT_ROOT . '/core/actions_linkedfiles.inc.php';
|
|
|
|
|
|
$form = new Form($db);
|
|
|
|
|
|
-llxHeader("",$langs->trans("VariousPayment"));
|
|
|
-
|
|
|
+$title = $langs->trans("VariousPayment") . ' - ' . $langs->trans("Documents");
|
|
|
+$help_url = '';
|
|
|
+llxHeader("",$title,$help_url);
|
|
|
|
|
|
if ($object->id)
|
|
|
{
|
|
@@ -83,6 +82,46 @@ if ($object->id)
|
|
|
|
|
|
dol_fiche_head($head, 'documents', $langs->trans("VariousPayment"), 0, 'payment');
|
|
|
|
|
|
+ $morehtmlref='<div class="refidno">';
|
|
|
+ // Project
|
|
|
+ if (! empty($conf->projet->enabled))
|
|
|
+ {
|
|
|
+ $langs->load("projects");
|
|
|
+ $morehtmlref.=$langs->trans('Project') . ' ';
|
|
|
+ if ($user->rights->tax->charges->creer)
|
|
|
+ {
|
|
|
+ if ($action != 'classify')
|
|
|
+ $morehtmlref.='<a href="' . $_SERVER['PHP_SELF'] . '?action=classify&id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
|
|
|
+ if ($action == 'classify') {
|
|
|
+ //$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
|
|
|
+ $morehtmlref.='<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
|
|
|
+ $morehtmlref.='<input type="hidden" name="action" value="classin">';
|
|
|
+ $morehtmlref.='<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
|
|
|
+ $morehtmlref.=$formproject->select_projects(0, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
|
|
|
+ $morehtmlref.='<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
|
|
|
+ $morehtmlref.='</form>';
|
|
|
+ } else {
|
|
|
+ $morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
|
|
|
+ }
|
|
|
+ } else {
|
|
|
+ if (! empty($object->fk_project)) {
|
|
|
+ $proj = new Project($db);
|
|
|
+ $proj->fetch($object->fk_project);
|
|
|
+ $morehtmlref.='<a href="'.DOL_URL_ROOT.'/projet/card.php?id=' . $object->fk_project . '" title="' . $langs->trans('ShowProject') . '">';
|
|
|
+ $morehtmlref.=$proj->ref;
|
|
|
+ $morehtmlref.='</a>';
|
|
|
+ } else {
|
|
|
+ $morehtmlref.='';
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ $morehtmlref.='</div>';
|
|
|
+ $linkback = '<a href="'.DOL_URL_ROOT.'/compta/bank/various_payment/index.php'.(! empty($socid)?'?socid='.$socid:'').'">'.$langs->trans("BackToList").'</a>';
|
|
|
+
|
|
|
+ dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'ref', $morehtmlref, '', 0, '', $morehtmlright);
|
|
|
+
|
|
|
+ print '<div class="fichecenter">';
|
|
|
+ print '<div class="underbanner clearboth"></div>';
|
|
|
|
|
|
// Construit liste des fichiers
|
|
|
$filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview.*\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1);
|
|
@@ -92,30 +131,22 @@ if ($object->id)
|
|
|
$totalsize+=$file['size'];
|
|
|
}
|
|
|
|
|
|
+ print '<table class="border" width="100%">';
|
|
|
|
|
|
- print '<table class="border" width="100%">';
|
|
|
-
|
|
|
- $linkback = '<a href="'.DOL_URL_ROOT.'/compta/bank/various_payment/index.php'.(! empty($socid)?'?socid='.$socid:'').'">'.$langs->trans("BackToList").'</a>';
|
|
|
-
|
|
|
- // Ref
|
|
|
- print '<tr><td class="titlefield">'.$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 '<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>';
|
|
|
|
|
|
- print '</div>';
|
|
|
+ print '<div class="clearboth"></div>';
|
|
|
|
|
|
- $modulepart = 'banque';
|
|
|
- $permission = $user->rights->banque->modifier;
|
|
|
- $param = '&id=' . $object->id;
|
|
|
- include_once DOL_DOCUMENT_ROOT . '/core/tpl/document_actions_post_headers.tpl.php';
|
|
|
+ dol_fiche_end();
|
|
|
|
|
|
+ $modulepart = 'banque';
|
|
|
+ $permission = $user->rights->banque->modifier;
|
|
|
+ $param = '&id=' . $object->id;
|
|
|
+ include_once DOL_DOCUMENT_ROOT . '/core/tpl/document_actions_post_headers.tpl.php';
|
|
|
}
|
|
|
else
|
|
|
{
|