| '.$form->editfieldkey("MailTitle", 'titre', $object->titre, $object, $user->rights->mailing->creer && $object->statut < 3, 'string').' | '; + print ' | ||
| '; + print $form->editfieldkey("MailTitle", 'titre', $object->titre, $object, $user->rights->mailing->creer && $object->statut < 3, 'string'); + print ' | '; print $form->editfieldval("MailTitle", 'titre', $object->titre, $object, $user->rights->mailing->creer && $object->statut < 3, 'string'); print ' | ||
| '.$form->editfieldkey("MailFrom", 'email_from', $object->email_from, $object, $user->rights->mailing->creer && $object->statut < 3, 'string').' | '; + print ' | ||
| '; + print $form->editfieldkey("MailFrom", 'email_from', $object->email_from, $object, $user->rights->mailing->creer && $object->statut < 3, 'string'); + print ' | '; print $form->editfieldval("MailFrom", 'email_from', $object->email_from, $object, $user->rights->mailing->creer && $object->statut < 3, 'string'); print ' | ||
| '.$form->editfieldkey("MailErrorsTo", 'email_errorsto', $object->email_errorsto, $object, $user->rights->mailing->creer && $object->statut < 3, 'string').' | '; + print ' | ||
| '; + print $form->editfieldkey("MailErrorsTo", 'email_errorsto', $object->email_errorsto, $object, $user->rights->mailing->creer && $object->statut < 3, 'string'); + print ' | '; print $form->editfieldval("MailErrorsTo", 'email_errorsto', $object->email_errorsto, $object, $user->rights->mailing->creer && $object->statut < 3, 'string'); print ' | ||
| ';
diff --git a/htdocs/commande/index.php b/htdocs/commande/index.php
index ca9adcbd7e9..33630de2acd 100644
--- a/htdocs/commande/index.php
+++ b/htdocs/commande/index.php
@@ -62,7 +62,8 @@ $help_url="EN:Module_Customers_Orders|FR:Module_Commandes_Clients|ES:Módulo_Ped
llxHeader("", $langs->trans("Orders"), $help_url);
-print load_fiche_titre($langs->trans("OrdersArea"));
+
+print load_fiche_titre($langs->trans("OrdersArea"), '', 'commercial');
print ' ';
diff --git a/htdocs/compta/bank/bankentries_list.php b/htdocs/compta/bank/bankentries_list.php
index c21cd8394c8..3b2a63cd839 100644
--- a/htdocs/compta/bank/bankentries_list.php
+++ b/htdocs/compta/bank/bankentries_list.php
@@ -603,7 +603,7 @@ if ($resql)
print $langs->trans("EventualyAddCategory").': ';
print Form::selectarray('cat', $options, GETPOST('cat'), 1);
}
- print ' '.$langs->trans("ThenCheckLinesAndConciliate").' ';
+ print ' '.$langs->trans("ThenCheckLinesAndConciliate").' ';
print '';
print ' '.$langs->trans("or").' ';
print '';
diff --git a/htdocs/compta/bank/releve.php b/htdocs/compta/bank/releve.php
index 7f5a848fa0d..cca8f6ea9ef 100644
--- a/htdocs/compta/bank/releve.php
+++ b/htdocs/compta/bank/releve.php
@@ -182,169 +182,6 @@ if ($action == 'confirm_editbankreceipt' && ! empty($oldbankreceipt) && ! empty(
$action='view';
}
-// ZIP creation
-if ($action=="dl" && $numref > 0)
-{
- // TODO Replace this with a standard builddoc action that use a document generation module to build the ZIP
- $log = '';
-
- $outdir = $conf->bank->dir_temp.'/'.$numref.'-'.$object->label;
- $outdirinvoices = $outdir.'/'.$langs->trans("BillsCustomers");
- $outdirsupplierinvoices = $outdir.'/'.$langs->trans("BillsSuppliers");
-
- dol_mkdir($outdir);
- dol_mkdir($outdirinvoices);
- dol_mkdir($outdirsupplierinvoices);
-
- //$zipname = $object->label.'-'.$numref . '.zip';
- //$zip = new ZipArchive();
- //$zip->open($zipname, ZipArchive::OVERWRITE);
-
- $sql = $sqlrequestforbankline;
-
- $facturestatic=new Facture($db);
-
- $resd = $db->query($sql);
- if ($resd) {
- $numd = $db->num_rows($resd);
- $i = 0;
- if ($numd > 0)
- {
- $objd = $db->fetch_object($resd);
-
- $log.='Transaction '.$objd->rowid;
- $links = $object->get_url($objd->rowid);
-
- foreach($links as $key=>$val)
- {
- $link = ''; $upload_dir = '';
-
- switch ($val['type']) {
- case "payment":
- $payment = new Paiement($db);
- $payment->fetch($val['url_id']);
- $arraybill = $payment->getBillsArray();
- if (is_array($arraybill) && count($arraybill) > 0)
- {
- foreach ($arraybill as $billid)
- {
- $facturestatic->fetch($billid);
- $subdir = get_exdir($facturestatic->id, 2, 0, 0, $facturestatic, 'invoice');
-
- $arrayofinclusion=array(); // TODO Find a way to get doc ODT or other
- // TODO Use get_exdir
- $arrayofinclusion[]=preg_quote($facturestatic->ref.'.pdf', '/');
- $listoffiles = dol_dir_list($conf->facture->dir_output.$subdir, 'all', 1, implode('|', $arrayofinclusion), '\.meta$|\.png', 'date', SORT_DESC, 0, true);
- // build list of files with full path
- $files = array();
- foreach($listoffiles as $filefound)
- {
- if (strstr($filefound["name"], $facturestatic->ref))
- {
- $files[] = $uploaddir.'/'.$facturestatic->ref.'/'.$filefound["name"];
- break;
- }
- }
- /*var_dump($files);*/
- //var_dump($listoffiles);
- foreach($listoffiles as $key => $srcfileobj)
- {
- $srcfile = $srcfileobj['fullname'];
- $destfile = $outdirinvoices.'/'.$srcfileobj['name'];
- //var_dump($srcfile.' - '.$destfile);
- dol_copy($srcfile, $destfile);
- }
- }
- }
- break;
- case "payment_supplier":
- $payment = new PaiementFourn($db);
- $payment->fetch($val['url_id']);
- $arraybill = $payment->getBillsArray();
- if (is_array($arraybill) && count($arraybill) > 0)
- {
- foreach ($arraybill as $billid)
- {
- $facturestatic->fetch($billid);
- $subdir = get_exdir($facturestatic->id, 2, 0, 0, $facturestatic, 'invoice_supplier');
-
- $arrayofinclusion=array(); // TODO Find a way to get doc ODT or other
- // TODO Use get_exdir
- $arrayofinclusion[]=preg_quote($facturestatic->ref.'.pdf', '/');
- $listoffiles = dol_dir_list($conf->fournisseur->facture->dir_output.$subdir, 'all', 1, implode('|', $arrayofinclusion), '\.meta$|\.png', 'date', SORT_DESC, 0, true);
- // build list of files with full path
- $files = array();
- foreach($listoffiles as $filefound)
- {
- if (strstr($filefound["name"], $facturestatic->ref))
- {
- $files[] = $uploaddir.'/'.$facturestatic->ref.'/'.$filefound["name"];
- break;
- }
- }
- /*var_dump($files);*/
- //var_dump($listoffiles);
- foreach($listoffiles as $key => $srcfileobj)
- {
- $srcfile = $srcfileobj['fullname'];
- $destfile = $outdirinvoices.'/'.$srcfileobj['name'];
- //var_dump($srcfile.' - '.$destfile);
- dol_copy($srcfile, $destfile);
- }
- }
- }
- break;
- case "payment_expensereport":
- /*$subdir = dol_sanitizeFileName($objd->refe);
- $upload_dir = $conf->expensereport->dir_output . '/' . $subdir;*/
- break;
- case "payment_salary":
- /*$subdir = dol_sanitizeFileName($objd->ids);
- $upload_dir = $conf->salaries->dir_output . '/' . $subdir;*/
- break;
- case "payment_donation":
- /*$subdir = get_exdir(null, 2, 0, 1, $objd, 'donation') . '/' . dol_sanitizeFileName($objd->idd);
- $upload_dir = $conf->don->dir_output . '/' . $subdir;*/
- break;
- default:
- break;
- }
- }
- $log.="\n";
-
- /*if (! empty($upload_dir))
- {
- $files = dol_dir_list($upload_dir, "files", 0, '', '(\.meta|_preview.*\.png)$', '', SORT_ASC, 1);
-
- if (is_array($files)) {
- foreach ($files as $file) {
- $zip->addFile($file["fullname"], $file["name"]); //
- $log .= $key . ',' . $file["name"] . "\n";
- }
- } else {
- $log .= $key . ',' . $langs->trans("Nofile") . "\n";
- }
-
- }*/
- }
- }
-
- $db->free($resd);
-
-
- //$zip->addFromString('log '.$numref.'.csv', $log);
- //$zip->close();
-
- // /Then download the zipped file.
- /*header('Content-Type: application/zip');
- header('Content-disposition: attachment; filename=' . $zipname);
- header('Content-Length: ' . filesize($zipname));
-
- readfile($zipname);
-
- exit;*/
-}
-
/*
* View
@@ -801,16 +638,10 @@ else
print ' '.price(price2num($total, 'MT'))." | | ";
print " |