lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

WIP Save link to file in expensereport lines

Browse Source
This commit is contained in:
Laurent Destailleur 2019-03-22 18:03:08 +01:00
parent 8ca5b2e45f
commit aab9734f52
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
htdocs/expensereport/card.php
View File

@ -1091,12 +1091,17 @@ if (empty($reshook))
// First save uploaded file // First save uploaded file
$fk_ecm_files = 0; $fk_ecm_files = 0;
if (! empty($_FILES)) if (GETPOSTISSET('attachfile'))
{ {
// Get ID of ECM file $arrayoffiles=GETPOST('attachfile','array');
$idofecmfile = 0; if (is_array($arrayoffiles) && ! empty($arrayoffiles[0]))
{
$fk_ecm_files = $idofecmfile; include_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmfiles.class.php';
$relativepath='expensereport/'.$object->ref.'/'.$arrayoffiles[0];
$ecmfiles=new EcmFiles($db);
$ecmfiles->fetch(0, '', $relativepath);
$fk_ecm_files = $ecmfiles->id;
}
} }
// if VAT is not used in Dolibarr, set VAT rate to 0 because VAT rate is necessary. // if VAT is not used in Dolibarr, set VAT rate to 0 because VAT rate is necessary.

5
htdocs/expensereport/class/expensereport.class.php
View File

@ -1696,7 +1696,7 @@ class ExpenseReport extends CommonObject
* @param int $fk_project Project id * @param int $fk_project Project id
* @param int $fk_c_exp_tax_cat Car category id * @param int $fk_c_exp_tax_cat Car category id
* @param int $type Type line * @param int $type Type line
* @param int $fk_ecm_files Id of ECM file to link to this expensereport line * @param int $fk_ecm_files Id of ECM file to link to this expensereport line
* @return int <0 if KO, >0 if OK * @return int <0 if KO, >0 if OK
*/ */
public function addline($qty = 0, $up = 0, $fk_c_type_fees = 0, $vatrate = 0, $date = '', $comments = '', $fk_project = 0, $fk_c_exp_tax_cat = 0, $type = 0, $fk_ecm_files = 0) public function addline($qty = 0, $up = 0, $fk_c_type_fees = 0, $vatrate = 0, $date = '', $comments = '', $fk_project = 0, $fk_c_exp_tax_cat = 0, $type = 0, $fk_ecm_files = 0)
@ -2500,6 +2500,9 @@ class ExpenseReportLine
public $total_tva; public $total_tva;
public $total_ttc; public $total_ttc;
public $fk_ecm_files;
/** /**
* Constructor * Constructor
* *