Merge remote-tracking branch 'upstream/develop' into develop
This commit is contained in:
Philippe GRAND
commit
b90fabccfe
@ -118,10 +118,10 @@ if (($action == "searchfiles" || $action == "dl")) {
|
|||||||
$error++;
|
$error++;
|
||||||
}
|
}
|
||||||
|
|
||||||
$sql = '';
|
|
||||||
|
|
||||||
if (!$error)
|
if (!$error)
|
||||||
{
|
{
|
||||||
|
$sql = '';
|
||||||
|
|
||||||
$wheretail = " '".$db->idate($date_start)."' AND '".$db->idate($date_stop)."'";
|
$wheretail = " '".$db->idate($date_start)."' AND '".$db->idate($date_stop)."'";
|
||||||
|
|
||||||
// Customer invoices
|
// Customer invoices
|
||||||
@ -178,152 +178,153 @@ if (($action == "searchfiles" || $action == "dl")) {
|
|||||||
$sql .= " AND t.entity IN (".($entity == 1 ? '0,1' : $entity).')';
|
$sql .= " AND t.entity IN (".($entity == 1 ? '0,1' : $entity).')';
|
||||||
//$sql.=" AND fk_statut <> ".ChargeSociales::STATUS_DRAFT;
|
//$sql.=" AND fk_statut <> ".ChargeSociales::STATUS_DRAFT;
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
if ($sql) {
|
if ($sql) {
|
||||||
$sql .= $db->order($sortfield, $sortorder);
|
$sql .= $db->order($sortfield, $sortorder);
|
||||||
//print $sql;
|
//print $sql;
|
||||||
|
|
||||||
$resd = $db->query($sql);
|
$resd = $db->query($sql);
|
||||||
$files = array();
|
$files = array();
|
||||||
$link = '';
|
$link = '';
|
||||||
|
|
||||||
if ($resd)
|
if ($resd)
|
||||||
{
|
{
|
||||||
$numd = $db->num_rows($resd);
|
$numd = $db->num_rows($resd);
|
||||||
|
|
||||||
$tmpinvoice = new Facture($db);
|
$tmpinvoice = new Facture($db);
|
||||||
$tmpinvoicesupplier = new FactureFournisseur($db);
|
$tmpinvoicesupplier = new FactureFournisseur($db);
|
||||||
$tmpdonation = new Don($db);
|
$tmpdonation = new Don($db);
|
||||||
|
|
||||||
$upload_dir = '';
|
$upload_dir = '';
|
||||||
$i = 0;
|
$i = 0;
|
||||||
while ($i < $numd)
|
while ($i < $numd)
|
||||||
{
|
{
|
||||||
$objd = $db->fetch_object($resd);
|
$objd = $db->fetch_object($resd);
|
||||||
|
|
||||||
switch ($objd->item)
|
switch ($objd->item)
|
||||||
{
|
{
|
||||||
case "Invoice":
|
case "Invoice":
|
||||||
$subdir = '';
|
$subdir = '';
|
||||||
$subdir .= ($subdir ? '/' : '').dol_sanitizeFileName($objd->ref);
|
$subdir .= ($subdir ? '/' : '').dol_sanitizeFileName($objd->ref);
|
||||||
$upload_dir = $conf->facture->dir_output.'/'.$subdir;
|
$upload_dir = $conf->facture->dir_output.'/'.$subdir;
|
||||||
$link = "document.php?modulepart=facture&file=".str_replace('/', '%2F', $subdir).'%2F';
|
$link = "document.php?modulepart=facture&file=".str_replace('/', '%2F', $subdir).'%2F';
|
||||||
break;
|
break;
|
||||||
case "SupplierInvoice":
|
case "SupplierInvoice":
|
||||||
$tmpinvoicesupplier->fetch($objd->id);
|
$tmpinvoicesupplier->fetch($objd->id);
|
||||||
$subdir = get_exdir($tmpinvoicesupplier->id, 2, 0, 1, $tmpinvoicesupplier, 'invoice_supplier'); // TODO Use first file
|
$subdir = get_exdir($tmpinvoicesupplier->id, 2, 0, 1, $tmpinvoicesupplier, 'invoice_supplier'); // TODO Use first file
|
||||||
$subdir .= ($subdir ? '/' : '').dol_sanitizeFileName($objd->ref);
|
$subdir .= ($subdir ? '/' : '').dol_sanitizeFileName($objd->ref);
|
||||||
$upload_dir = $conf->fournisseur->facture->dir_output.'/'.$subdir;
|
$upload_dir = $conf->fournisseur->facture->dir_output.'/'.$subdir;
|
||||||
$link = "document.php?modulepart=facture_fournisseur&file=".str_replace('/', '%2F', $subdir).'%2F';
|
$link = "document.php?modulepart=facture_fournisseur&file=".str_replace('/', '%2F', $subdir).'%2F';
|
||||||
break;
|
break;
|
||||||
case "ExpenseReport":
|
case "ExpenseReport":
|
||||||
$subdir = '';
|
$subdir = '';
|
||||||
$subdir .= ($subdir ? '/' : '').dol_sanitizeFileName($objd->ref);
|
$subdir .= ($subdir ? '/' : '').dol_sanitizeFileName($objd->ref);
|
||||||
$upload_dir = $conf->expensereport->dir_output.'/'.$subdir;
|
$upload_dir = $conf->expensereport->dir_output.'/'.$subdir;
|
||||||
$link = "document.php?modulepart=expensereport&file=".str_replace('/', '%2F', $subdir).'%2F';
|
$link = "document.php?modulepart=expensereport&file=".str_replace('/', '%2F', $subdir).'%2F';
|
||||||
break;
|
break;
|
||||||
case "SalaryPayment":
|
case "SalaryPayment":
|
||||||
$subdir = '';
|
$subdir = '';
|
||||||
$subdir .= ($subdir ? '/' : '').dol_sanitizeFileName($objd->id);
|
$subdir .= ($subdir ? '/' : '').dol_sanitizeFileName($objd->id);
|
||||||
$upload_dir = $conf->salaries->dir_output.'/'.$subdir;
|
$upload_dir = $conf->salaries->dir_output.'/'.$subdir;
|
||||||
$link = "document.php?modulepart=salaries&file=".str_replace('/', '%2F', $subdir).'%2F';
|
$link = "document.php?modulepart=salaries&file=".str_replace('/', '%2F', $subdir).'%2F';
|
||||||
break;
|
break;
|
||||||
case "Donation":
|
case "Donation":
|
||||||
$tmpdonation->fetch($objp->id);
|
$tmpdonation->fetch($objp->id);
|
||||||
$subdir = get_exdir(0, 0, 0, 0, $tmpdonation, 'donation');
|
$subdir = get_exdir(0, 0, 0, 0, $tmpdonation, 'donation');
|
||||||
$subdir .= ($subdir ? '/' : '').dol_sanitizeFileName($objd->id);
|
$subdir .= ($subdir ? '/' : '').dol_sanitizeFileName($objd->id);
|
||||||
$upload_dir = $conf->don->dir_output.'/'.$subdir;
|
$upload_dir = $conf->don->dir_output.'/'.$subdir;
|
||||||
$link = "document.php?modulepart=don&file=".str_replace('/', '%2F', $subdir).'%2F';
|
$link = "document.php?modulepart=don&file=".str_replace('/', '%2F', $subdir).'%2F';
|
||||||
break;
|
break;
|
||||||
case "SocialContributions":
|
case "SocialContributions":
|
||||||
$subdir = '';
|
$subdir = '';
|
||||||
$subdir .= ($subdir ? '/' : '').dol_sanitizeFileName($objd->id);
|
$subdir .= ($subdir ? '/' : '').dol_sanitizeFileName($objd->id);
|
||||||
$upload_dir = $conf->tax->dir_output.'/'.$subdir;
|
$upload_dir = $conf->tax->dir_output.'/'.$subdir;
|
||||||
$link = "document.php?modulepart=tax&file=".str_replace('/', '%2F', $subdir).'%2F';
|
$link = "document.php?modulepart=tax&file=".str_replace('/', '%2F', $subdir).'%2F';
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
$subdir = '';
|
$subdir = '';
|
||||||
$upload_dir = '';
|
$upload_dir = '';
|
||||||
$link = '';
|
$link = '';
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!empty($upload_dir))
|
if (!empty($upload_dir))
|
||||||
{
|
{
|
||||||
$result = true;
|
$result = true;
|
||||||
|
|
||||||
$files = dol_dir_list($upload_dir, "files", 0, '', '(\.meta|_preview\.png)$', '', SORT_ASC, 1);
|
$files = dol_dir_list($upload_dir, "files", 0, '', '(\.meta|_preview\.png)$', '', SORT_ASC, 1);
|
||||||
//var_dump($upload_dir);
|
//var_dump($upload_dir);
|
||||||
//var_dump($files);
|
//var_dump($files);
|
||||||
if (count($files) < 1)
|
if (count($files) < 1)
|
||||||
{
|
{
|
||||||
$nofile = array();
|
$nofile = array();
|
||||||
$nofile['id'] = $objd->id;
|
$nofile['id'] = $objd->id;
|
||||||
$nofile['entity'] = $objd->entity;
|
$nofile['entity'] = $objd->entity;
|
||||||
$nofile['date'] = $db->idate($objd->date);
|
$nofile['date'] = $db->idate($objd->date);
|
||||||
$nofile['paid'] = $objd->paid;
|
$nofile['paid'] = $objd->paid;
|
||||||
$nofile['amount_ht'] = $objd->total_ht;
|
$nofile['amount_ht'] = $objd->total_ht;
|
||||||
$nofile['amount_ttc'] = $objd->total_ttc;
|
$nofile['amount_ttc'] = $objd->total_ttc;
|
||||||
$nofile['amount_vat'] = $objd->total_vat;
|
$nofile['amount_vat'] = $objd->total_vat;
|
||||||
$nofile['ref'] = ($objd->ref ? $objd->ref : $objd->id);
|
$nofile['ref'] = ($objd->ref ? $objd->ref : $objd->id);
|
||||||
$nofile['fk'] = $objd->fk_soc;
|
$nofile['fk'] = $objd->fk_soc;
|
||||||
$nofile['item'] = $objd->item;
|
$nofile['item'] = $objd->item;
|
||||||
$nofile['thirdparty_name'] = $objd->thirdparty_name;
|
$nofile['thirdparty_name'] = $objd->thirdparty_name;
|
||||||
$nofile['thirdparty_code'] = $objd->thirdparty_code;
|
$nofile['thirdparty_code'] = $objd->thirdparty_code;
|
||||||
$nofile['country_code'] = $objd->country_code;
|
$nofile['country_code'] = $objd->country_code;
|
||||||
$nofile['vatnum'] = $objd->vatnum;
|
$nofile['vatnum'] = $objd->vatnum;
|
||||||
|
|
||||||
$filesarray[$nofile['item'].'_'.$nofile['id']] = $nofile;
|
$filesarray[$nofile['item'].'_'.$nofile['id']] = $nofile;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
foreach ($files as $key => $file)
|
foreach ($files as $key => $file)
|
||||||
{
|
{
|
||||||
$file['id'] = $objd->id;
|
$file['id'] = $objd->id;
|
||||||
$file['entity'] = $objd->entity;
|
$file['entity'] = $objd->entity;
|
||||||
$file['date'] = $db->idate($objd->date);
|
$file['date'] = $db->idate($objd->date);
|
||||||
$file['paid'] = $objd->paid;
|
$file['paid'] = $objd->paid;
|
||||||
$file['amount_ht'] = $objd->total_ht;
|
$file['amount_ht'] = $objd->total_ht;
|
||||||
$file['amount_ttc'] = $objd->total_ttc;
|
$file['amount_ttc'] = $objd->total_ttc;
|
||||||
$file['amount_vat'] = $objd->total_vat;
|
$file['amount_vat'] = $objd->total_vat;
|
||||||
$file['ref'] = ($objd->ref ? $objd->ref : $objd->id);
|
$file['ref'] = ($objd->ref ? $objd->ref : $objd->id);
|
||||||
$file['fk'] = $objd->fk_soc;
|
$file['fk'] = $objd->fk_soc;
|
||||||
$file['item'] = $objd->item;
|
$file['item'] = $objd->item;
|
||||||
|
|
||||||
$file['thirdparty_name'] = $objd->thirdparty_name;
|
$file['thirdparty_name'] = $objd->thirdparty_name;
|
||||||
$file['thirdparty_code'] = $objd->thirdparty_code;
|
$file['thirdparty_code'] = $objd->thirdparty_code;
|
||||||
$file['country_code'] = $objd->country_code;
|
$file['country_code'] = $objd->country_code;
|
||||||
$file['vatnum'] = $objd->vatnum;
|
$file['vatnum'] = $objd->vatnum;
|
||||||
|
|
||||||
// Save record into array (only the first time it is found)
|
// Save record into array (only the first time it is found)
|
||||||
if (empty($filesarray[$file['item'].'_'.$file['id']])) {
|
if (empty($filesarray[$file['item'].'_'.$file['id']])) {
|
||||||
$filesarray[$file['item'].'_'.$file['id']] = $file;
|
$filesarray[$file['item'].'_'.$file['id']] = $file;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Add or concat file
|
// Add or concat file
|
||||||
if (empty($filesarray[$file['item'].'_'.$file['id']]['files'])) {
|
if (empty($filesarray[$file['item'].'_'.$file['id']]['files'])) {
|
||||||
$filesarray[$file['item'].'_'.$file['id']]['files'] = array();
|
$filesarray[$file['item'].'_'.$file['id']]['files'] = array();
|
||||||
}
|
}
|
||||||
$filesarray[$file['item'].'_'.$file['id']]['files'][] = array('link' => $link.$file['name'], 'name'=>$file['name'], 'ref'=>$file['ref'], 'fullname' => $file['fullname'], 'relpathnamelang' => $langs->trans($file['item']).'/'.$file['name']);
|
$filesarray[$file['item'].'_'.$file['id']]['files'][] = array('link' => $link.$file['name'], 'name'=>$file['name'], 'ref'=>$file['ref'], 'fullname' => $file['fullname'], 'relpathnamelang' => $langs->trans($file['item']).'/'.$file['name']);
|
||||||
//var_dump($file['item'].'_'.$file['id']);
|
//var_dump($file['item'].'_'.$file['id']);
|
||||||
//var_dump($filesarray[$file['item'].'_'.$file['id']]['files']);
|
//var_dump($filesarray[$file['item'].'_'.$file['id']]['files']);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
$i++;
|
$i++;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
dol_print_error($db);
|
dol_print_error($db);
|
||||||
}
|
}
|
||||||
|
|
||||||
$db->free($resd);
|
$db->free($resd);
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
setEventMessages($langs->trans("ErrorAtLeastOneObjectMustBeSelected"), null, 'errors');
|
setEventMessages($langs->trans("ErrorSelectAtLeastOne"), null, 'errors');
|
||||||
|
$error++;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -96,7 +96,7 @@ ErrorBadMaskFailedToLocatePosOfSequence=Error, mask without sequence number
|
|||||||
ErrorBadMaskBadRazMonth=Error, bad reset value
|
ErrorBadMaskBadRazMonth=Error, bad reset value
|
||||||
ErrorMaxNumberReachForThisMask=Maximum number reached for this mask
|
ErrorMaxNumberReachForThisMask=Maximum number reached for this mask
|
||||||
ErrorCounterMustHaveMoreThan3Digits=Counter must have more than 3 digits
|
ErrorCounterMustHaveMoreThan3Digits=Counter must have more than 3 digits
|
||||||
ErrorSelectAtLeastOne=Error. Select at least one entry.
|
ErrorSelectAtLeastOne=Error, select at least one entry.
|
||||||
ErrorDeleteNotPossibleLineIsConsolidated=Delete not possible because record is linked to a bank transaction that is conciliated
|
ErrorDeleteNotPossibleLineIsConsolidated=Delete not possible because record is linked to a bank transaction that is conciliated
|
||||||
ErrorProdIdAlreadyExist=%s is assigned to another third
|
ErrorProdIdAlreadyExist=%s is assigned to another third
|
||||||
ErrorFailedToSendPassword=Failed to send password
|
ErrorFailedToSendPassword=Failed to send password
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user