mirror of
https://github.com/Dolibarr/dolibarr.git
synced 2025-02-20 13:46:52 +01:00
Look and feel v11. Picto are fontawesome.
This commit is contained in:
parent
34c4de3287
commit
24570f7165
|
|
@ -132,12 +132,15 @@ if ($action == 'update') {
|
|||
* View
|
||||
*/
|
||||
|
||||
llxHeader();
|
||||
|
||||
$form = new Form($db);
|
||||
|
||||
$title = $langs->trans('ConfigAccountingExpert');
|
||||
llxHeader('', $title);
|
||||
|
||||
|
||||
$linkback='';
|
||||
// $linkback = '<a href="' . DOL_URL_ROOT . '/admin/modules.php?restore_lastsearch_values=1">' . $langs->trans("BackToModuleList") . '</a>';
|
||||
print load_fiche_titre($langs->trans('ConfigAccountingExpert'), $linkback, 'title_setup');
|
||||
print load_fiche_titre($langs->trans('ConfigAccountingExpert'), $linkback, 'accountancy');
|
||||
|
||||
|
||||
print "\n".'<script type="text/javascript" language="javascript">'."\n";
|
||||
|
|
|
|||
|
|
@ -160,12 +160,12 @@ if ($action == 'setenablesubsidiarylist') {
|
|||
* View
|
||||
*/
|
||||
|
||||
llxHeader();
|
||||
|
||||
$form = new Form($db);
|
||||
$title= $langs->trans('ConfigAccountingExpert');
|
||||
llxHeader('', $title);
|
||||
|
||||
$linkback='';
|
||||
//$linkback = '<a href="' . DOL_URL_ROOT . '/admin/modules.php?restore_lastsearch_values=1">' . $langs->trans("BackToModuleList") . '</a>';
|
||||
print load_fiche_titre($langs->trans('ConfigAccountingExpert'), $linkback, 'title_setup');
|
||||
print load_fiche_titre($langs->trans('ConfigAccountingExpert'), $linkback, 'accountancy');
|
||||
|
||||
print '<form action="' . $_SERVER["PHP_SELF"] . '" method="post">';
|
||||
print '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">';
|
||||
|
|
|
|||
|
|
@ -938,34 +938,35 @@ if ($action == 'disable_favorite')
|
|||
$form = new Form($db);
|
||||
$formadmin=new FormAdmin($db);
|
||||
|
||||
llxHeader();
|
||||
$title=$langs->trans("DictionarySetup");
|
||||
|
||||
llxHeader('', $title);
|
||||
|
||||
$titre=$langs->trans("DictionarySetup");
|
||||
$linkback='';
|
||||
if ($id)
|
||||
{
|
||||
$titre.=' - '.$langs->trans($tablib[$id]);
|
||||
$title.=' - '.$langs->trans($tablib[$id]);
|
||||
$linkback='<a href="'.$_SERVER['PHP_SELF'].'">'.$langs->trans("BackToDictionaryList").'</a>';
|
||||
}
|
||||
$titlepicto='title_setup';
|
||||
if ($id == 10 && GETPOST('from') == 'accountancy')
|
||||
{
|
||||
$titre=$langs->trans("MenuVatAccounts");
|
||||
$titlepicto='title_accountancy';
|
||||
$title=$langs->trans("MenuVatAccounts");
|
||||
$titlepicto='accountancy';
|
||||
}
|
||||
if ($id == 7 && GETPOST('from') == 'accountancy')
|
||||
{
|
||||
$titre=$langs->trans("MenuTaxAccounts");
|
||||
$titlepicto='title_accountancy';
|
||||
$title=$langs->trans("MenuTaxAccounts");
|
||||
$titlepicto='accountancy';
|
||||
}
|
||||
|
||||
print load_fiche_titre($titre, $linkback, $titlepicto);
|
||||
print load_fiche_titre($title, $linkback, $titlepicto);
|
||||
|
||||
if (empty($id))
|
||||
{
|
||||
print $langs->trans("DictionaryDesc");
|
||||
print '<span class="opacitymedium">'.$langs->trans("DictionaryDesc");
|
||||
print " ".$langs->trans("OnlyActiveElementsAreShown")."<br>\n";
|
||||
print '<br>';
|
||||
print '</span><br>';
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -1697,7 +1698,6 @@ if ($id)
|
|||
dol_print_error($db);
|
||||
}
|
||||
|
||||
|
||||
print '</form>';
|
||||
}
|
||||
else
|
||||
|
|
@ -1711,7 +1711,6 @@ else
|
|||
print '<div class="div-table-responsive-no-min">';
|
||||
print '<table class="noborder" width="100%">';
|
||||
print '<tr class="liste_titre">';
|
||||
//print '<td>'.$langs->trans("Module").'</td>';
|
||||
print '<td colspan="2">'.$langs->trans("Dictionary").'</td>';
|
||||
print '<td>'.$langs->trans("Table").'</td>';
|
||||
print '</tr>';
|
||||
|
|
@ -1726,7 +1725,7 @@ else
|
|||
if ($showemptyline)
|
||||
{
|
||||
|
||||
print '<tr class="oddeven"><td width="30%"> </td><td> </td><td> </td></tr>';
|
||||
print '<tr class="oddeven"><td width="50%"> </td><td> </td><td> </td></tr>';
|
||||
$showemptyline=0;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -142,7 +142,7 @@ jQuery(document).ready(function() {
|
|||
// Part to create
|
||||
if ($action == 'create')
|
||||
{
|
||||
print load_fiche_titre($langs->trans("NewAsset"));
|
||||
print load_fiche_titre($langs->trans("NewAsset"), '', 'accountancy');
|
||||
|
||||
print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
|
||||
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
|
||||
|
|
|
|||
|
|
@ -316,7 +316,7 @@ print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
|
|||
print '<input type="hidden" name="page" value="'.$page.'">';
|
||||
print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
|
||||
|
||||
print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'title_companies', 0, $newcardbutton, '', $limit);
|
||||
print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'accountancy', 0, $newcardbutton, '', $limit);
|
||||
|
||||
// Add code for pre mass action (confirmation or email presend form)
|
||||
$topicmail="SendAssetsRef";
|
||||
|
|
|
|||
|
|
@ -197,6 +197,7 @@ if ($action == 'confirm_delete' && $user->rights->asset->write)
|
|||
*/
|
||||
|
||||
$form=new Form($db);
|
||||
|
||||
$helpurl='';
|
||||
llxHeader('', $langs->trans("AssetsTypeSetup"), $helpurl);
|
||||
|
||||
|
|
@ -237,7 +238,7 @@ if (! $rowid && $action != 'create' && $action != 'edit')
|
|||
print '<input type="hidden" name="page" value="'.$page.'">';
|
||||
print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
|
||||
|
||||
print_barre_liste($langs->trans("AssetsTypes"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'generic', 0, $newcardbutton, '', $limit);
|
||||
print_barre_liste($langs->trans("AssetsTypes"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'accountancy', 0, $newcardbutton, '', $limit);
|
||||
|
||||
$moreforfilter = '';
|
||||
|
||||
|
|
|
|||
|
|
@ -252,7 +252,7 @@ if ($conf->product->enabled || $conf->product->service)
|
|||
|
||||
$nbno=$nbtotal=0;
|
||||
|
||||
print load_fiche_titre($langs->trans("BarcodeInitForProductsOrServices"), '', 'title_products');
|
||||
print load_fiche_titre($langs->trans("BarcodeInitForProductsOrServices"), '', 'products');
|
||||
print '<br>'."\n";
|
||||
|
||||
$sql ="SELECT count(rowid) as nb, fk_product_type, datec";
|
||||
|
|
|
|||
|
|
@ -204,7 +204,7 @@ jQuery(document).ready(function() {
|
|||
// Part to create
|
||||
if ($action == 'create')
|
||||
{
|
||||
print load_fiche_titre($langs->trans("NewBOM"));
|
||||
print load_fiche_titre($langs->trans("NewBOM"), '', 'cubes');
|
||||
|
||||
print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
|
||||
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
|
||||
|
|
@ -237,7 +237,7 @@ if ($action == 'create')
|
|||
// Part to edit record
|
||||
if (($id || $ref) && $action == 'edit')
|
||||
{
|
||||
print load_fiche_titre($langs->trans("BillOfMaterials"));
|
||||
print load_fiche_titre($langs->trans("BillOfMaterials"), '', 'cubes');
|
||||
|
||||
print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
|
||||
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
|
||||
|
|
|
|||
|
|
@ -329,7 +329,7 @@ $newcardbutton='';
|
|||
// $newcardbutton.= '</a>';
|
||||
//}
|
||||
|
||||
print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'title_companies', 0, $newcardbutton, '', $limit);
|
||||
print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'cubes', 0, $newcardbutton, '', $limit);
|
||||
|
||||
// Add code for pre mass action (confirmation or email presend form)
|
||||
$topicmail="SendBillOfMaterialsRef";
|
||||
|
|
|
|||
|
|
@ -58,7 +58,7 @@ $help_url="EN:Module_Commercial_Proposals|FR:Module_Propositions_commerciales|ES
|
|||
|
||||
llxHeader("", $langs->trans("ProspectionArea"), $help_url);
|
||||
|
||||
print load_fiche_titre($langs->trans("ProspectionArea"));
|
||||
print load_fiche_titre($langs->trans("ProspectionArea"), '', 'commercial');
|
||||
|
||||
//print '<table width="100%" class="notopnoleftnoright">';
|
||||
//print '<tr><td valign="top" width="30%" class="notopnoleft">';
|
||||
|
|
|
|||
|
|
@ -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 '<div class="fichecenter"><div class="fichethirdleft">';
|
||||
|
|
|
|||
|
|
@ -603,7 +603,7 @@ if ($resql)
|
|||
print $langs->trans("EventualyAddCategory").': ';
|
||||
print Form::selectarray('cat', $options, GETPOST('cat'), 1);
|
||||
}
|
||||
print '<br><div style="margin-top: 5px;">'.$langs->trans("ThenCheckLinesAndConciliate").' ';
|
||||
print '<br><div style="margin-top: 5px;"><span class="opacitymedium">'.$langs->trans("ThenCheckLinesAndConciliate").'</span> ';
|
||||
print '<input class="button" name="confirm_savestatement" type="submit" value="'.$langs->trans("SaveStatementOnly").'">';
|
||||
print ' '.$langs->trans("or").' ';
|
||||
print '<input class="button" name="confirm_reconcile" type="submit" value="'.$langs->trans("Conciliate").'">';
|
||||
|
|
|
|||
|
|
@ -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 '<td class="right"><b>'.price(price2num($total, 'MT'))."</b></td><td> </td>";
|
||||
print "</tr>\n";
|
||||
print "</table>";
|
||||
|
||||
print "</div>";
|
||||
|
||||
print "</form>\n";
|
||||
|
||||
// Add a download button
|
||||
if ($conf->global->MAIN_FEATURES_LEVEL >= 2) // Started a rewrite to make this feature more Dolibarr compliant. Still need dev to be completed.
|
||||
{
|
||||
// TODO Replace this with standard box to generate document.
|
||||
print '<a href="'.DOL_URL_ROOT.'/compta/bank/releve.php?num='.$numref.'&account='.$id.'&action=dl" class="butAction" name="Send" >'.$langs->trans('DownloadPackageWithAllDocuments')." </a>\n";
|
||||
}
|
||||
}
|
||||
|
||||
// End of page
|
||||
|
|
|
|||
|
|
@ -263,7 +263,7 @@ if ($action == 'create')
|
|||
print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
|
||||
print '<input type="hidden" name="action" value="add">';
|
||||
|
||||
print load_fiche_titre($langs->trans("NewVariousPayment"), '', 'title_accountancy.png');
|
||||
print load_fiche_titre($langs->trans("NewVariousPayment"), '', 'invoicing');
|
||||
|
||||
dol_fiche_head('', '');
|
||||
|
||||
|
|
|
|||
|
|
@ -172,7 +172,7 @@ if ($result)
|
|||
print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
|
||||
print '<input type="hidden" name="page" value="'.$page.'">';
|
||||
|
||||
print_barre_liste($langs->trans("VariousPayments"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $totalnboflines, 'title_accountancy.png', 0, $newcardbutton, '', $limit);
|
||||
print_barre_liste($langs->trans("VariousPayments"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $totalnboflines, 'invoicing', 0, $newcardbutton, '', $limit);
|
||||
|
||||
print '<div class="div-table-responsive">';
|
||||
print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'">'."\n";
|
||||
|
|
|
|||
|
|
@ -315,7 +315,7 @@ if ($action=="create" || $action=="start")
|
|||
}
|
||||
}
|
||||
|
||||
print load_fiche_titre($langs->trans("CashControl")." - ".$langs->trans("New"), '', 'title_bank.png');
|
||||
print load_fiche_titre($langs->trans("CashControl")." - ".$langs->trans("New"), '', 'cash-register');
|
||||
|
||||
print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
|
||||
if ($action == 'start' && GETPOST('posnumber', 'int') != '' && GETPOST('posnumber', 'int') != '' && GETPOST('posnumber', 'int') != '-1')
|
||||
|
|
|
|||
|
|
@ -342,7 +342,7 @@ $newcardbutton.= '<span class="fa fa-plus-circle valignmiddle"></span>';
|
|||
$newcardbutton.= '</a>';
|
||||
//}
|
||||
|
||||
print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'title_companies', 0, $newcardbutton, '', $limit);
|
||||
print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'cash-register', 0, $newcardbutton, '', $limit);
|
||||
|
||||
// Add code for pre mass action (confirmation or email presend form)
|
||||
$topicmail="SendCashControlRef";
|
||||
|
|
|
|||
|
|
@ -2587,7 +2587,7 @@ if ($action == 'create')
|
|||
$facturestatic = new Facture($db);
|
||||
$extralabels = $extrafields->fetch_name_optionals_label($facturestatic->table_element);
|
||||
|
||||
print load_fiche_titre($langs->trans('NewBill'));
|
||||
print load_fiche_titre($langs->trans('NewBill'), '', 'invoicing');
|
||||
|
||||
$soc = new Societe($db);
|
||||
if ($socid > 0)
|
||||
|
|
|
|||
|
|
@ -972,7 +972,7 @@ $today = dol_mktime(23, 59, 59, $tmparray['mon'], $tmparray['mday'], $tmparray['
|
|||
*/
|
||||
if ($action == 'create')
|
||||
{
|
||||
print load_fiche_titre($langs->trans("CreateRepeatableInvoice"), '', 'title_accountancy.png');
|
||||
print load_fiche_titre($langs->trans("CreateRepeatableInvoice"), '', 'invoicing');
|
||||
|
||||
$object = new Facture($db); // Source invoice
|
||||
$product_static = new Product($db);
|
||||
|
|
|
|||
|
|
@ -314,7 +314,7 @@ if ($resql)
|
|||
print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
|
||||
print '<input type="hidden" name="viewstatut" value="'.$viewstatut.'">';
|
||||
|
||||
print_barre_liste($langs->trans("RepeatableInvoices"), $page, $_SERVER['PHP_SELF'], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'title_accountancy.png', 0, '', '', $limit);
|
||||
print_barre_liste($langs->trans("RepeatableInvoices"), $page, $_SERVER['PHP_SELF'], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'invoicing', 0, '', '', $limit);
|
||||
|
||||
print $langs->trans("ToCreateAPredefinedInvoice", $langs->transnoentitiesnoconv("ChangeIntoRepeatableInvoice")).'<br><br>';
|
||||
|
||||
|
|
|
|||
|
|
@ -636,7 +636,7 @@ if ($resql)
|
|||
print '<input type="hidden" name="viewstatut" value="'.$viewstatut.'">';
|
||||
print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
|
||||
|
||||
print_barre_liste($langs->trans('BillsCustomers').' '.($socid?' '.$soc->name:''), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'title_accountancy.png', 0, $newcardbutton, '', $limit);
|
||||
print_barre_liste($langs->trans('BillsCustomers').' '.($socid?' '.$soc->name:''), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'invoicing', 0, $newcardbutton, '', $limit);
|
||||
|
||||
$topicmail="SendBillRef";
|
||||
$modelmail="facture_send";
|
||||
|
|
|
|||
|
|
@ -75,7 +75,7 @@ if ($mode == 'supplier')
|
|||
$dir=$conf->fournisseur->facture->dir_temp;
|
||||
}
|
||||
|
||||
print load_fiche_titre($title, $mesg, 'title_accountancy.png');
|
||||
print load_fiche_titre($title, '', 'invoicing');
|
||||
|
||||
dol_mkdir($dir);
|
||||
|
||||
|
|
|
|||
|
|
@ -250,7 +250,7 @@ llxHeader('', $name);
|
|||
|
||||
//$textprevyear="<a href=\"index.php?localTaxType=".$localTaxType."&year=" . ($year_current-1) . "\">".img_previous()."</a>";
|
||||
//$textnextyear=" <a href=\"index.php?localTaxType=".$localTaxType."&year=" . ($year_current+1) . "\">".img_next()."</a>";
|
||||
//print load_fiche_titre($langs->transcountry($LT,$mysoc->country_code),"$textprevyear ".$langs->trans("Year")." $year_start $textnextyear", 'title_accountancy.png');
|
||||
//print load_fiche_titre($langs->transcountry($LT,$mysoc->country_code),"$textprevyear ".$langs->trans("Year")." $year_start $textnextyear", 'invoicing');
|
||||
|
||||
report_header($name, '', $period, $periodlink, $description, $builddate, $exportlink, array(), $calcmode);
|
||||
//report_header($name,'',$textprevyear.$langs->trans("Year")." ".$year_start.$textnextyear,'',$description,$builddate,$exportlink,array(),$calcmode);
|
||||
|
|
|
|||
|
|
@ -48,7 +48,7 @@ if ($user->rights->tax->charges->creer)
|
|||
$newcardbutton.= dolGetButtonTitle($langs->trans('NewLocalTaxPayment', ($ltt+1)), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/compta/localtax/card.php?action=create&localTaxType='.$ltt);
|
||||
}
|
||||
|
||||
print load_fiche_titre($langs->transcountry($ltt==2?"LT2Payments":"LT1Payments", $mysoc->country_code), $newcardbutton);
|
||||
print load_fiche_titre($langs->transcountry($ltt==2?"LT2Payments":"LT1Payments", $mysoc->country_code), $newcardbutton, 'invoicing');
|
||||
|
||||
$sql = "SELECT rowid, amount, label, f.datev, f.datep";
|
||||
$sql.= " FROM ".MAIN_DB_PREFIX."localtax as f ";
|
||||
|
|
|
|||
|
|
@ -46,7 +46,7 @@ $accountstatic=new Account($db);
|
|||
|
||||
llxHeader('', $langs->trans("ChequesArea"));
|
||||
|
||||
print load_fiche_titre($langs->trans("ChequesArea"));
|
||||
print load_fiche_titre($langs->trans("ChequesArea"), '', 'bank');
|
||||
|
||||
print '<div class="fichecenter"><div class="fichethirdleft">';
|
||||
|
||||
|
|
|
|||
|
|
@ -222,7 +222,7 @@ if ($resql)
|
|||
print '<input type="hidden" name="page" value="'.$page.'">';
|
||||
print '<input type="hidden" name="viewstatut" value="'.$viewstatut.'">';
|
||||
|
||||
print_barre_liste($langs->trans("ReceivedCustomersPayments"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'title_accountancy.png', 0, '', '', $limit);
|
||||
print_barre_liste($langs->trans("ReceivedCustomersPayments"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'invoicing', 0, '', '', $limit);
|
||||
|
||||
print '<div class="div-table-responsive">';
|
||||
print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'">'."\n";
|
||||
|
|
|
|||
|
|
@ -88,7 +88,7 @@ $formother=new FormOther($db);
|
|||
llxHeader();
|
||||
|
||||
$titre=($year?$langs->trans("PaymentsReportsForYear", $year):$langs->trans("PaymentsReports"));
|
||||
print load_fiche_titre($titre, '', 'title_accountancy.png');
|
||||
print load_fiche_titre($titre, '', 'invoicing');
|
||||
|
||||
// Formulaire de generation
|
||||
print '<form method="post" action="rapport.php?year='.$year.'">';
|
||||
|
|
@ -152,7 +152,7 @@ if ($year)
|
|||
{
|
||||
if (preg_match('/^payment/i', $file))
|
||||
{
|
||||
|
||||
|
||||
$tfile = $dir . '/'.$year.'/'.$file;
|
||||
$relativepath = $year.'/'.$file;
|
||||
print '<tr class="oddeven">'.'<td><a data-ajax="false" href="'.DOL_URL_ROOT . '/document.php?modulepart=facture_paiement&file='.urlencode($relativepath).'">'.img_pdf().' '.$file.'</a></td>';
|
||||
|
|
|
|||
|
|
@ -243,7 +243,7 @@ if ($resql)
|
|||
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
|
||||
print '<input type="hidden" name="page" value="'.$page.'">';
|
||||
|
||||
print_barre_liste($langs->trans("InvoiceWaitingWithdraw"), $page, $_SERVER['PHP_SELF'], $param, '', '', '', $num, $nbtotalofrecords, 'title_accountancy.png', 0, '', '', $limit);
|
||||
print_barre_liste($langs->trans("InvoiceWaitingWithdraw"), $page, $_SERVER['PHP_SELF'], $param, '', '', '', $num, $nbtotalofrecords, 'invoicing', 0, '', '', $limit);
|
||||
|
||||
print '<table class="noborder" width="100%">';
|
||||
print '<tr class="liste_titre">';
|
||||
|
|
|
|||
|
|
@ -188,11 +188,11 @@ if ($resql)
|
|||
if ($year)
|
||||
{
|
||||
$center=($year?"<a href='list.php?year=".($year-1)."'>".img_previous()."</a> ".$langs->trans("Year")." $year <a href='list.php?year=".($year+1)."'>".img_next()."</a>":"");
|
||||
print_barre_liste($langs->trans("SocialContributions"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $center, $num, $totalnboflines, 'title_accountancy.png', 0, $newcardbutton, '', $limit);
|
||||
print_barre_liste($langs->trans("SocialContributions"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $center, $num, $totalnboflines, 'invoicing', 0, $newcardbutton, '', $limit);
|
||||
}
|
||||
else
|
||||
{
|
||||
print_barre_liste($langs->trans("SocialContributions"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $totalnboflines, 'title_accountancy.png', 0, $newcardbutton, '', $limit);
|
||||
print_barre_liste($langs->trans("SocialContributions"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $totalnboflines, 'invoicing', 0, $newcardbutton, '', $limit);
|
||||
}
|
||||
|
||||
if (empty($mysoc->country_id) && empty($mysoc->country_code))
|
||||
|
|
|
|||
|
|
@ -231,7 +231,7 @@ llxHeader('', $name);
|
|||
|
||||
//$textprevyear="<a href=\"index.php?year=" . ($year_current-1) . "\">".img_previous($langs->trans("Previous"), 'class="valignbottom"')."</a>";
|
||||
//$textnextyear=" <a href=\"index.php?year=" . ($year_current+1) . "\">".img_next($langs->trans("Next"), 'class="valignbottom"')."</a>";
|
||||
//print load_fiche_titre($langs->transcountry("VAT", $mysoc->country_code), $textprevyear." ".$langs->trans("Year")." ".$year_start." ".$textnextyear, 'title_accountancy.png');
|
||||
//print load_fiche_titre($langs->transcountry("VAT", $mysoc->country_code), $textprevyear." ".$langs->trans("Year")." ".$year_start." ".$textnextyear, 'invoicing');
|
||||
|
||||
report_header($name, '', $period, $periodlink, $description, $builddate, $exportlink, array(), $calcmode);
|
||||
//report_header($name,'',$textprevyear.$langs->trans("Year")." ".$year_start.$textnextyear,'',$description,$builddate,$exportlink,array(),$calcmode);
|
||||
|
|
|
|||
|
|
@ -506,7 +506,7 @@ else
|
|||
|
||||
$title = $addcontact = (! empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT) ? $langs->trans("AddContact") : $langs->trans("AddContactAddress"));
|
||||
$linkback='';
|
||||
print load_fiche_titre($title, $linkback, 'title_companies.png');
|
||||
print load_fiche_titre($title, $linkback, 'building');
|
||||
|
||||
// Show errors
|
||||
dol_htmloutput_errors(is_numeric($error)?'':$error, $errors);
|
||||
|
|
|
|||
|
|
@ -468,7 +468,7 @@ print '<input type="hidden" name="page" value="'.$page.'">';
|
|||
print '<input type="hidden" name="type" value="'.$type.'">';
|
||||
print '<input type="hidden" name="view" value="'.dol_escape_htmltag($view).'">';
|
||||
|
||||
print_barre_liste($titre, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'title_companies.png', 0, $newcardbutton, '', $limit);
|
||||
print_barre_liste($titre, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'building', 0, $newcardbutton, '', $limit);
|
||||
|
||||
$topicmail="Information";
|
||||
$modelmail="contact";
|
||||
|
|
|
|||
|
|
@ -1571,7 +1571,7 @@ class ExtraFields
|
|||
elseif ($type == 'datetime') $out.=' (YYYY-MM-DD HH:MM:SS)';
|
||||
*/
|
||||
if (! empty($help)) {
|
||||
$out .= $form->textwithpicto("", $help);
|
||||
$out .= $form->textwithpicto('', $help, 1, 'help', '', 0, 3);
|
||||
}
|
||||
return $out;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3025,13 +3025,14 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
|
|||
|
||||
//if (in_array($picto, array('switch_off', 'switch_on', 'off', 'on')))
|
||||
if (empty($srconly) && in_array($pictowithouttext, array(
|
||||
'bank', 'close_title', 'delete', 'edit', 'ellipsis-h', 'filter', 'grip', 'grip_title', 'list', 'listlight', 'note',
|
||||
'bank', 'building', 'cash-register', 'close_title', 'cubes', 'delete', 'edit', 'ellipsis-h', 'filter', 'grip', 'grip_title', 'list', 'listlight', 'note',
|
||||
'object_list','object_calendar', 'object_calendarweek', 'object_calendarmonth', 'object_calendarday', 'object_calendarperuser',
|
||||
'off', 'on', 'play', 'playdisabled', 'printer', 'resize',
|
||||
'note', 'setup', 'sign-out', 'split', 'switch_off', 'switch_on', 'tools', 'unlink', 'uparrow', '1downarrow', '1uparrow', '1leftarrow', '1rightarrow', '1uparrow_selected', '1downarrow_selected', '1leftarrow_selected', '1rightarrow_selected',
|
||||
'jabber','skype','twitter','facebook','linkedin',
|
||||
'chevron-left','chevron-right','chevron-down','chevron-top',
|
||||
'home', 'companies', 'products', 'commercial', 'invoicing', 'accountancy', 'project', 'hrm', 'members', 'ticket', 'generic'
|
||||
'home', 'companies', 'products', 'commercial', 'invoicing', 'accountancy', 'project', 'hrm', 'members', 'ticket', 'generic',
|
||||
'title_setup', 'title_accountancy', 'title_bank'
|
||||
)
|
||||
)) {
|
||||
$fa='fa';
|
||||
|
|
@ -3040,11 +3041,12 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
|
|||
$facolor = ''; $fasize = '';
|
||||
|
||||
$arrayconvpictotofa = array(
|
||||
'setup'=>'cog', 'companies'=>'building', 'products'=>'box_open', 'commercial'=>'box-tie', 'invoicing'=>'file-invoice', 'accountancy'=>'coins', 'project'=>'project-diagram',
|
||||
'setup'=>'cog', 'companies'=>'building', 'products'=>'cube', 'commercial'=>'suitcase', 'invoicing'=>'coins', 'accountancy'=>'money-check-alt', 'project'=>'sitemap',
|
||||
'hrm'=>'umbrella-beach', 'members'=>'user-friends', 'ticket'=>'sticky-note', 'generic'=>'folder-open',
|
||||
'switch_off'=>'toggle-off', 'switch_on'=>'toggle-on',
|
||||
'bank'=>'bank', 'close_title'=>'window-close', 'delete'=>'trash', 'edit'=>'pencil', 'filter'=>'filter', 'split'=>'code-fork',
|
||||
'object_list'=>'list-alt','object_calendar'=>'calendar-alt', 'object_calendarweek'=>'calendar-week', 'object_calendarmonth'=>'calendar-alt', 'object_calendarday'=>'calendar-day', 'object_calendarperuser'=>'table'
|
||||
'object_list'=>'list-alt','object_calendar'=>'calendar-alt', 'object_calendarweek'=>'calendar-week', 'object_calendarmonth'=>'calendar-alt', 'object_calendarday'=>'calendar-day', 'object_calendarperuser'=>'table',
|
||||
'title_setup'=>'tools', 'title_accountancy'=>'money-check-alt', 'title_bank'=>'bank'
|
||||
);
|
||||
|
||||
if ($pictowithouttext == 'switch_off') {
|
||||
|
|
|
|||
|
|
@ -318,7 +318,7 @@ if (! empty($conf->projet->enabled)) { $formproject = new FormProjets($db); }
|
|||
|
||||
if ($action == 'create')
|
||||
{
|
||||
print load_fiche_titre($langs->trans("AddDonation"));
|
||||
print load_fiche_titre($langs->trans("AddDonation"), '', 'invoicing');
|
||||
|
||||
print '<form name="add" action="' . $_SERVER["PHP_SELF"] . '" method="POST">';
|
||||
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
|
||||
|
|
@ -500,7 +500,7 @@ if (! empty($id) && $action == 'edit')
|
|||
print '<input type="hidden" name="amount" value="'.$object->amount.'">';
|
||||
|
||||
|
||||
dol_fiche_head($head, $hselected, $langs->trans("Donation"), 0, 'generic');
|
||||
dol_fiche_head($head, $hselected, $langs->trans("Donation"), 0, 'invoicing');
|
||||
|
||||
print '<table class="border" width="100%">';
|
||||
|
||||
|
|
|
|||
|
|
@ -85,7 +85,7 @@ if ($result)
|
|||
dol_print_error($db);
|
||||
}
|
||||
|
||||
print load_fiche_titre($langs->trans("DonationsArea"));
|
||||
print load_fiche_titre($langs->trans("DonationsArea"), '', 'invoicing');
|
||||
|
||||
|
||||
print '<div class="fichecenter"><div class="fichethirdleft">';
|
||||
|
|
|
|||
|
|
@ -154,7 +154,7 @@ if ($resql)
|
|||
print '<input type="hidden" name="page" value="'.$page.'">';
|
||||
print '<input type="hidden" name="type" value="'.$type.'">';
|
||||
|
||||
print_barre_liste($langs->trans("Donations"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'generic', 0, $newcardbutton);
|
||||
print_barre_liste($langs->trans("Donations"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'invoicing', 0, $newcardbutton);
|
||||
|
||||
if ($search_all)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -54,7 +54,7 @@ $commandestatic = new CommandeFournisseur($db);
|
|||
$userstatic=new User($db);
|
||||
$formfile = new FormFile($db);
|
||||
|
||||
print load_fiche_titre($langs->trans("SuppliersOrdersArea"));
|
||||
print load_fiche_titre($langs->trans("SuppliersOrdersArea"), '', 'commercial');
|
||||
|
||||
print '<div class="fichecenter"><div class="fichethirdleft">';
|
||||
|
||||
|
|
|
|||
|
|
@ -484,7 +484,7 @@ if ($resql)
|
|||
print '<input type="hidden" name="viewstatut" value="'.$viewstatut.'">';
|
||||
print '<input type="hidden" name="socid" value="'.$socid.'">';
|
||||
|
||||
print_barre_liste($langs->trans("BillsSuppliers").($socid?' '.$soc->name:''), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'title_accountancy', 0, $newcardbutton, '', $limit);
|
||||
print_barre_liste($langs->trans("BillsSuppliers").($socid?' '.$soc->name:''), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'invoicing', 0, $newcardbutton, '', $limit);
|
||||
|
||||
$topicmail="SendBillRef";
|
||||
$modelmail="invoice_supplier_send";
|
||||
|
|
|
|||
|
|
@ -873,7 +873,7 @@ if (empty($action) || $action == 'list')
|
|||
|
||||
$massactionbutton=$form->selectMassAction('', $massaction == 'presend' ? array() : array('presend'=>$langs->trans("SendByMail"), 'builddoc'=>$langs->trans("PDFMerge")));
|
||||
|
||||
print_barre_liste($langs->trans('SupplierPayments'), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'title_accountancy.png', 0, '', '', $limit);
|
||||
print_barre_liste($langs->trans('SupplierPayments'), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'invoicing', 0, '', '', $limit);
|
||||
|
||||
print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
|
||||
if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
|
||||
|
|
|
|||
|
|
@ -91,7 +91,7 @@ $titre=($year?$langs->trans("PaymentsReportsForYear", $year):$langs->trans("Paym
|
|||
|
||||
llxHeader('', $titre);
|
||||
|
||||
print load_fiche_titre($titre, '', 'title_accountancy.png');
|
||||
print load_fiche_titre($titre, '', 'invoicing');
|
||||
|
||||
// Formulaire de generation
|
||||
print '<form method="post" action="rapport.php?year='.$year.'">';
|
||||
|
|
|
|||
|
|
@ -48,7 +48,7 @@ $staticbom = new BOM($db);
|
|||
|
||||
llxHeader('', $langs->trans("MRP"), '');
|
||||
|
||||
print load_fiche_titre($langs->trans("MRPArea"));
|
||||
print load_fiche_titre($langs->trans("MRPArea"), '', 'cubes');
|
||||
|
||||
|
||||
print '<div class="fichecenter"><div class="fichethirdleft">';
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@ $statutarray=array('1' => $langs->trans("OnSell"), '0' => $langs->trans("NotOnSe
|
|||
<!-- BEGIN PHP TEMPLATE -->
|
||||
|
||||
<?php
|
||||
print load_fiche_titre($langs->trans("NewProduct"), '', 'title_products.png');
|
||||
print load_fiche_titre($langs->trans("NewProduct"), '', 'products');
|
||||
dol_fiche_head('');
|
||||
?>
|
||||
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@ $statutarray=array('1' => $langs->trans("OnSell"), '0' => $langs->trans("NotOnSe
|
|||
<!-- BEGIN PHP TEMPLATE CREATE.TPL -->
|
||||
|
||||
<?php
|
||||
print load_fiche_titre($langs->trans("NewService"), '', 'title_products.png');
|
||||
print load_fiche_titre($langs->trans("NewService"), '', 'products');
|
||||
dol_fiche_head('');
|
||||
?>
|
||||
|
||||
|
|
|
|||
|
|
@ -938,7 +938,7 @@ else
|
|||
if ($type==1) $title=$langs->trans("NewService");
|
||||
else $title=$langs->trans("NewProduct");
|
||||
$linkback="";
|
||||
print load_fiche_titre($title, $linkback, 'title_products.png');
|
||||
print load_fiche_titre($title, $linkback, 'products');
|
||||
|
||||
dol_fiche_head('');
|
||||
|
||||
|
|
|
|||
|
|
@ -145,7 +145,7 @@ jQuery(document).ready(function() {
|
|||
// Part to create
|
||||
if ($action == 'create')
|
||||
{
|
||||
print load_fiche_titre($langs->trans("NewInventory", $langs->transnoentitiesnoconv("MyInventory")));
|
||||
print load_fiche_titre($langs->trans("NewInventory", $langs->transnoentitiesnoconv("MyInventory")), '', 'products');
|
||||
|
||||
print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
|
||||
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
|
||||
|
|
|
|||
|
|
@ -321,7 +321,7 @@ print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
|
|||
print '<input type="hidden" name="page" value="'.$page.'">';
|
||||
print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
|
||||
|
||||
print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'title_companies', 0, '', '', $limit);
|
||||
print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'products', 0, '', '', $limit);
|
||||
|
||||
// Add code for pre mass action (confirmation or email presend form)
|
||||
$topicmail="Information";
|
||||
|
|
|
|||
|
|
@ -505,7 +505,7 @@ if ($resql)
|
|||
print '<input type="hidden" name="type" value="'.$type.'">';
|
||||
if (empty($arrayfields['p.fk_product_type']['checked'])) print '<input type="hidden" name="search_type" value="'.dol_escape_htmltag($search_type).'">';
|
||||
|
||||
print_barre_liste($texte, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'title_products.png', 0, $newcardbutton, '', $limit);
|
||||
print_barre_liste($texte, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'products', 0, $newcardbutton, '', $limit);
|
||||
|
||||
$topicmail="Information";
|
||||
$modelmail="product";
|
||||
|
|
|
|||
|
|
@ -76,7 +76,7 @@ $title=$langs->trans("Statistics");
|
|||
|
||||
llxHeader('', $title, $helpurl);
|
||||
|
||||
print load_fiche_titre($title, $mesg, 'title_products.png');
|
||||
print load_fiche_titre($title, $mesg, 'products');
|
||||
|
||||
|
||||
$param = '';
|
||||
|
|
|
|||
|
|
@ -218,7 +218,7 @@ if ($resql)
|
|||
print '<input type="hidden" name="page" value="'.$page.'">';
|
||||
print '<input type="hidden" name="type" value="'.$type.'">';
|
||||
|
||||
print_barre_liste($texte, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'title_products', 0, '', '', $limit);
|
||||
print_barre_liste($texte, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'products', 0, '', '', $limit);
|
||||
|
||||
if (! empty($catid))
|
||||
{
|
||||
|
|
|
|||
|
|
@ -233,7 +233,7 @@ if ($resql)
|
|||
print '<input type="hidden" name="page" value="'.$page.'">';
|
||||
print '<input type="hidden" name="type" value="'.$type.'">';
|
||||
|
||||
print_barre_liste($texte, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'title_products', 0, '', '', $limit);
|
||||
print_barre_liste($texte, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'products', 0, '', '', $limit);
|
||||
|
||||
|
||||
if (! empty($catid))
|
||||
|
|
|
|||
|
|
@ -103,7 +103,7 @@ if (! $id && empty($ref))
|
|||
$title=$langs->trans("Statistics");
|
||||
}
|
||||
|
||||
print load_fiche_titre($title, $mesg, 'title_products.png');
|
||||
print load_fiche_titre($title, $mesg, 'products');
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
|
|||
|
|
@ -294,7 +294,7 @@ if ($resql)
|
|||
print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
|
||||
print '<input type="hidden" name="page" value="'.$page.'">';
|
||||
|
||||
print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'title_products', 0, '', '', $limit);
|
||||
print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'products', 0, '', '', $limit);
|
||||
|
||||
$topicmail="Information";
|
||||
$modelmail="productlot";
|
||||
|
|
|
|||
|
|
@ -85,8 +85,8 @@ $morehtml.='<option name="mine" value="'.$user->id.'"'.(($search_project_user ==
|
|||
$morehtml.='</SELECT>';
|
||||
$morehtml.='<input type="submit" class="button" name="refresh" value="'.$langs->trans("Refresh").'">';
|
||||
|
||||
print_barre_liste($title, 0, $_SERVER["PHP_SELF"], '', '', '', '', 0, -1, 'title_project.png', 0, $morehtml);
|
||||
//print load_fiche_titre($title, '', 'title_project');
|
||||
print_barre_liste($title, 0, $_SERVER["PHP_SELF"], '', '', '', '', 0, -1, 'project', 0, $morehtml);
|
||||
//print load_fiche_titre($title, '', 'project');
|
||||
|
||||
if ($mine) print $langs->trans("MyTasksDesc").'<br><br>';
|
||||
else
|
||||
|
|
|
|||
|
|
@ -417,7 +417,7 @@ $tasksrole=$taskstatic->getUserRolesForProjectsOrTasks(0, $usertoprocess, ($proj
|
|||
|
||||
llxHeader("", $title, "", '', '', '', array('/core/js/timesheet.js'));
|
||||
|
||||
//print_barre_liste($title, $page, $_SERVER["PHP_SELF"], "", $sortfield, $sortorder, "", $num, '', 'title_project');
|
||||
//print_barre_liste($title, $page, $_SERVER["PHP_SELF"], "", $sortfield, $sortorder, "", $num, '', 'project');
|
||||
|
||||
$param='';
|
||||
$param.=($mode?'&mode='.urlencode($mode):'');
|
||||
|
|
|
|||
|
|
@ -435,7 +435,7 @@ $tasksrole=$taskstatic->getUserRolesForProjectsOrTasks(0, $usertoprocess, ($proj
|
|||
|
||||
llxHeader("", $title, "", '', '', '', array('/core/js/timesheet.js'));
|
||||
|
||||
//print_barre_liste($title, $page, $_SERVER["PHP_SELF"], "", $sortfield, $sortorder, "", $num, '', 'title_project');
|
||||
//print_barre_liste($title, $page, $_SERVER["PHP_SELF"], "", $sortfield, $sortorder, "", $num, '', 'project');
|
||||
|
||||
$param='';
|
||||
$param.=($mode?'&mode='.urlencode($mode):'');
|
||||
|
|
|
|||
|
|
@ -498,7 +498,7 @@ if ($action == 'create' && $user->rights->projet->creer)
|
|||
$thirdparty=new Societe($db);
|
||||
if ($socid > 0) $thirdparty->fetch($socid);
|
||||
|
||||
print load_fiche_titre($titlenew, '', 'title_project');
|
||||
print load_fiche_titre($titlenew, '', 'project');
|
||||
|
||||
print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
|
||||
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
|
||||
|
|
|
|||
|
|
@ -461,7 +461,7 @@ else
|
|||
else $texthelp.=$langs->trans("ProjectsPublicDesc");
|
||||
}
|
||||
|
||||
print_barre_liste($form->textwithpicto($title, $texthelp), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'title_project', 0, $newcardbutton, '', $limit);
|
||||
print_barre_liste($form->textwithpicto($title, $texthelp), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'project', 0, $newcardbutton, '', $limit);
|
||||
|
||||
|
||||
$topicmail="Information";
|
||||
|
|
|
|||
|
|
@ -67,7 +67,7 @@ llxHeader('', $langs->trans('Projects'));
|
|||
$title=$langs->trans("ProjectsStatistics");
|
||||
$dir=$conf->projet->dir_output.'/temp';
|
||||
|
||||
print load_fiche_titre($title, '', 'title_project.png');
|
||||
print load_fiche_titre($title, '', 'project');
|
||||
|
||||
dol_mkdir($dir);
|
||||
|
||||
|
|
|
|||
|
|
@ -506,7 +506,7 @@ if ($action == 'create' && $user->rights->projet->creer && (empty($object->third
|
|||
{
|
||||
if ($id > 0 || ! empty($ref)) print '<br>';
|
||||
|
||||
print load_fiche_titre($langs->trans("NewTask"), '', 'title_project');
|
||||
print load_fiche_titre($langs->trans("NewTask"), '', 'project');
|
||||
|
||||
if ($object->statut == Project::STATUS_CLOSED)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -428,7 +428,7 @@ else
|
|||
else $texthelp.=$langs->trans("TasksOnProjectsPublicDesc");
|
||||
}
|
||||
|
||||
print_barre_liste($form->textwithpicto($title, $texthelp), $page, $_SERVER["PHP_SELF"], "", $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'title_project', 0, $newcardbutton, '', $limit);
|
||||
print_barre_liste($form->textwithpicto($title, $texthelp), $page, $_SERVER["PHP_SELF"], "", $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'project', 0, $newcardbutton, '', $limit);
|
||||
|
||||
$topicmail="Information";
|
||||
$modelmail="task";
|
||||
|
|
|
|||
|
|
@ -67,7 +67,7 @@ llxHeader('', $langs->trans('Tasks'));
|
|||
$title=$langs->trans("TasksStatistics");
|
||||
$dir=$conf->projet->dir_output.'/temp';
|
||||
|
||||
print load_fiche_titre($title, '', 'title_project.png');
|
||||
print load_fiche_titre($title, '', 'project');
|
||||
|
||||
dol_mkdir($dir);
|
||||
|
||||
|
|
|
|||
|
|
@ -1047,7 +1047,7 @@ else
|
|||
/* Show create form */
|
||||
|
||||
$linkback="";
|
||||
print load_fiche_titre($langs->trans("NewThirdParty"), $linkback, 'title_companies.png');
|
||||
print load_fiche_titre($langs->trans("NewThirdParty"), $linkback, 'building');
|
||||
|
||||
if (! empty($conf->use_javascript_ajax) && ! empty($conf->global->THIRDPARTY_SUGGEST_ALSO_ADDRESS_CREATION))
|
||||
{
|
||||
|
|
|
|||
|
|
@ -598,7 +598,7 @@ print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
|
|||
print '<input type="hidden" name="page" value="'.$page.'">';
|
||||
print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
|
||||
|
||||
print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'title_companies', 0, $newcardbutton, '', $limit);
|
||||
print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'building', 0, $newcardbutton, '', $limit);
|
||||
|
||||
$langs->load("other");
|
||||
$textprofid=array();
|
||||
|
|
|
|||
|
|
@ -58,7 +58,7 @@ $help_url="EN:Module_Ask_Price_Supplier|FR:Module_Demande_de_prix_fournisseur";
|
|||
|
||||
llxHeader("", $langs->trans("SupplierProposalArea"), $help_url);
|
||||
|
||||
print load_fiche_titre($langs->trans("SupplierProposalArea"));
|
||||
print load_fiche_titre($langs->trans("SupplierProposalArea"), '', 'commercial');
|
||||
|
||||
print '<div class="fichecenter"><div class="fichethirdleft">';
|
||||
|
||||
|
|
|
|||
|
|
@ -3509,7 +3509,8 @@ div.boximport {
|
|||
|
||||
.fieldrequired { font-weight: bold; color: #000055; }
|
||||
|
||||
.widthpictotitle { width: 40px; font-size: 1.5em; text-align: <?php echo $left; ?>; }
|
||||
.widthpictotitle { width: 44px; text-align: <?php echo $left; ?>; }
|
||||
span.widthpictotitle { font-size: 2.5em; };
|
||||
|
||||
.dolgraphtitle { margin-top: 6px; margin-bottom: 4px; }
|
||||
.dolgraphtitlecssboxes { /* margin: 0px; */ }
|
||||
|
|
@ -3863,13 +3864,14 @@ tr.visible {
|
|||
float: right;
|
||||
}
|
||||
.websiteselection, .websitetools {
|
||||
margin-top: 3px;
|
||||
/* margin-top: 3px;
|
||||
padding-top: 3px;
|
||||
padding-bottom: 3px;
|
||||
padding-bottom: 3px; */
|
||||
}
|
||||
.websiteinputurl {
|
||||
display: inline-block;
|
||||
vertical-align: top;
|
||||
line-height: 28px;
|
||||
}
|
||||
.websiteiframenoborder {
|
||||
border: 0px;
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@ div.mainmenu.home::before{
|
|||
}
|
||||
|
||||
div.mainmenu.billing::before {
|
||||
content: "\f3d1";
|
||||
content: "\f51e";
|
||||
}
|
||||
|
||||
div.mainmenu.accountancy::before {
|
||||
|
|
|
|||
|
|
@ -62,7 +62,7 @@ if ($user->rights->produit->creer)
|
|||
$newcardbutton.= dolGetButtonTitle($langs->trans('Create'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/variants/create.php');
|
||||
}
|
||||
|
||||
print load_fiche_titre($title, $newcardbutton, 'title_products');
|
||||
print load_fiche_titre($title, $newcardbutton, 'products');
|
||||
|
||||
$forcereloadpage=empty($conf->global->MAIN_FORCE_RELOAD_PAGE)?0:1;
|
||||
?>
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user