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

Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop

Browse Source
This commit is contained in:
Laurent Destailleur 2017-05-18 18:00:29 +02:00
commit 932d3aab9d
77 changed files with 232 additions and 245 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/accountancy/admin/categories_list.php
View File

@ -661,8 +661,8 @@ if ($id)
print '<td class="liste_titre" align="center">';
if ($filterfound)
{
$searchpitco=$form->showFilterAndCheckAddButtons(0);
print $searchpitco;
$searchpicto=$form->showFilterAndCheckAddButtons(0);
print $searchpicto;
}
print '</td>';
print '</tr>';

4
htdocs/accountancy/admin/journals_list.php
View File

@ -577,8 +577,8 @@ if ($id)
print '<td class="liste_titre" align="center">';
if ($filterfound)
{
$searchpitco=$form->showFilterAndCheckAddButtons(0);
print $searchpitco;
$searchpicto=$form->showFilterAndCheckAddButtons(0);
print $searchpicto;
}
print '</td>';
print '</tr>';

4
htdocs/accountancy/admin/productaccount.php
View File

@ -329,8 +329,8 @@ if ($result)
print '</td>';
print '<td class="liste_titre">&nbsp;</td>';
print '<td align="center" class="liste_titre">';
$searchpitco=$form->showFilterButtons();
print $searchpitco;
$searchpicto=$form->showFilterButtons();
print $searchpicto;
print '</td>';
print '</tr>';

4
htdocs/accountancy/bookkeeping/balance.php
View File

@ -192,8 +192,8 @@ else {
print $formventilation->select_account($search_accountancy_code_end, 'search_accountancy_code_end', 1, array(), 1, 1, '');
print '</td>';
print '<td align="right" class="liste_titre">';
$searchpitco=$form->showFilterAndCheckAddButtons(0);
print $searchpitco;
$searchpicto=$form->showFilterAndCheckAddButtons(0);
print $searchpicto;
print '</td>';
print '</tr>';

4
htdocs/accountancy/bookkeeping/listbyaccount.php
View File

@ -239,8 +239,8 @@ print '<td class="liste_titre">&nbsp;</td>';
print '<td class="liste_titre">&nbsp;</td>';
print '<td class="liste_titre" align="right"><input type="text" name="search_ledger_code" size="3" value="' . $search_ledger_code . '"></td>';
print '<td class="liste_titre" align="right" colspan="2">';
$searchpitco=$form->showFilterAndCheckAddButtons(0);
print $searchpitco;
$searchpicto=$form->showFilterAndCheckAddButtons(0);
print $searchpicto;
print '</td>';
print '<tr class="liste_titre">';

4
htdocs/adherents/list.php
View File

@ -560,8 +560,8 @@ if (! empty($arrayfields['d.statut']['checked']))
}
// Action column
print '<td class="liste_titre" align="middle">';
$searchpitco=$form->showFilterButtons();
print $searchpitco;
$searchpicto=$form->showFilterButtons();
print $searchpicto;
print '</td>';
print "</tr>\n";

4
htdocs/adherents/subscription/list.php
View File

@ -239,8 +239,8 @@ if ($result)
// Action column
print '<td class="liste_titre" align="right">';
$searchpitco=$form->showFilterButtons();
print $searchpitco;
$searchpicto=$form->showFilterButtons();
print $searchpicto;
print '</td>';
print "</tr>\n";

4
htdocs/admin/dict.php
View File

@ -1188,8 +1188,8 @@ if ($id)
print '<td class="liste_titre" colspan="2" align="right">';
if ($filterfound)
{
$searchpitco=$form->showFilterAndCheckAddButtons(0);
print $searchpitco;
$searchpicto=$form->showFilterAndCheckAddButtons(0);
print $searchpicto;
}
print '</td>';
print '</tr>';

4
htdocs/admin/tools/listevents.php
View File

@ -249,8 +249,8 @@ if ($result)
print '</td>';
print '<td align="right" class="liste_titre">';
$searchpitco=$form->showFilterAndCheckAddButtons(0);
print $searchpitco;
$searchpicto=$form->showFilterAndCheckAddButtons(0);
print $searchpicto;
print '</td>';
print "</tr>\n";

4
htdocs/admin/translation.php
View File

@ -421,8 +421,8 @@ if ($mode == 'searchkey')
print '</td>';
// Action column
print '<td class="liste_titre nowrap" align="right">';
$searchpitco=$form->showFilterAndCheckAddButtons($massactionbutton?1:0, 'checkforselect', 1);
print $searchpitco;
$searchpicto=$form->showFilterAndCheckAddButtons($massactionbutton?1:0, 'checkforselect', 1);
print $searchpicto;
print '</td>';
print '</tr>';

4
htdocs/comm/action/listactions.php
View File

@ -361,8 +361,8 @@ if ($resql)
print '</td>';
// Action column
print '<td class="liste_titre" align="middle">';
$searchpitco=$form->showFilterButtons();
print $searchpitco;
$searchpicto=$form->showFilterButtons();
print $searchpicto;
print '</td>';
print "</tr>\n";

4
htdocs/comm/mailing/cibles.php
View File

@ -484,8 +484,8 @@ if ($object->fetch($id) >= 0)
print '</td>';
// Action column
print '<td class="liste_titre" align="right">';
$searchpitco=$form->showFilterAndCheckAddButtons($massactionbutton?1:0, 'checkforselect', 1);
print $searchpitco;
$searchpicto=$form->showFilterAndCheckAddButtons($massactionbutton?1:0, 'checkforselect', 1);
print $searchpicto;
print '</td>';
print '</tr>';

4
htdocs/comm/mailing/list.php
View File

@ -135,8 +135,8 @@ if ($result)
print '<td class="liste_titre">&nbsp;</td>';
print '<td class="liste_titre">&nbsp;</td>';
print '<td class="liste_titre" align="right">';
$searchpitco=$form->showFilterAndCheckAddButtons(0);
print $searchpitco;
$searchpicto=$form->showFilterAndCheckAddButtons(0);
print $searchpicto;
print '</td>';
print "</tr>\n";

4
htdocs/comm/propal/list.php
View File

@ -696,8 +696,8 @@ if ($resql)
}
// Action column
print '<td class="liste_titre" align="middle">';
$searchpitco=$form->showFilterButtons();
print $searchpitco;
$searchpicto=$form->showFilterButtons();
print $searchpicto;
print '</td>';
print "</tr>\n";

4
htdocs/commande/list.php
View File

@ -989,8 +989,8 @@ if ($resql)
}
// Action column
print '<td class="liste_titre" align="middle">';
$searchpitco=$form->showFilterButtons();
print $searchpitco;
$searchpicto=$form->showFilterButtons();
print $searchpicto;
print '</td>';
print "</tr>\n";

4
htdocs/compta/bank/bankentries.php
View File

@ -797,8 +797,8 @@ if ($resql)
print '<td class="liste_titre" align="middle">';
print '</td>';
print '<td class="liste_titre" align="middle">';
$searchpitco=$form->showFilterAndCheckAddButtons($massactionbutton?1:0, 'checkforselect', 1);
print $searchpitco;
$searchpicto=$form->showFilterAndCheckAddButtons($massactionbutton?1:0, 'checkforselect', 1);
print $searchpicto;
print '</td>';
print "</tr>\n";

51
htdocs/compta/bank/card.php
View File

@ -101,7 +101,8 @@ if ($action == 'add')
$account_number = GETPOST('account_number','alpha');
if ($account_number <= 0) { $object->account_number = ''; } else { $object->account_number = $account_number; }
$object->fk_accountancy_journal = trim($_POST["fk_accountancy_journal"]);
$fk_accountancy_journal = GETPOST('fk_accountancy_journal','int');
if ($fk_accountancy_journal <= 0) { $object->fk_accountancy_journal = ''; } else { $object->fk_accountancy_journal = $fk_accountancy_journal; }
$object->solde = $_POST["solde"];
$object->date_solde = dol_mktime(12,0,0,$_POST["remonth"],$_POST["reday"],$_POST["reyear"]);
@ -199,7 +200,8 @@ if ($action == 'update')
$account_number = GETPOST('account_number', 'int');
if ($account_number <= 0) { $object->account_number = ''; } else { $object->account_number = $account_number; }
$object->fk_accountancy_journal = trim($_POST["fk_accountancy_journal"]);
$fk_accountancy_journal = GETPOST('fk_accountancy_journal','int');
if ($fk_accountancy_journal <= 0) { $object->fk_accountancy_journal = ''; } else { $object->fk_accountancy_journal = $fk_accountancy_journal; }
$object->currency_code = trim($_POST["account_currency_code"]);
@ -502,35 +504,20 @@ if ($action == 'create')
print '<table class="border" width="100%">';
// Accountancy code
if (! empty($conf->global->MAIN_BANK_ACCOUNTANCY_CODE_ALWAYS_REQUIRED))
{
if (! empty($conf->accounting->enabled))
{
print '<tr><td class="fieldrequired titlefieldcreate">'.$langs->trans("AccountancyCode").'</td>';
print '<td>';
print $formaccountancy->select_account($object->account_number, 'account_number', 1, '', 1, 1);
print '</td></tr>';
}
else
{
print '<tr><td class="fieldrequired titlefieldcreate">'.$langs->trans("AccountancyCode").'</td>';
print '<td colspan="3"><input type="text" name="account_number" value="'.(GETPOST("account_number")?GETPOST('account_number', 'alpha'):$object->account_number).'"></td></tr>';
}
$fieldrequired='';
if (! empty($conf->global->MAIN_BANK_ACCOUNTANCY_CODE_ALWAYS_REQUIRED)) $fieldrequired='fieldrequired ';
if (! empty($conf->accounting->enabled))
{
print '<tr><td class="'.$fieldrequired.'titlefieldcreate">'.$langs->trans("AccountancyCode").'</td>';
print '<td>';
print $formaccountancy->select_account($object->account_number, 'account_number', 1, '', 1, 1);
print '</td></tr>';
}
else
{
if (! empty($conf->accounting->enabled))
{
print '<tr><td class="titlefieldcreate">'.$langs->trans("AccountancyCode").'</td>';
print '<td>';
print $formaccountancy->select_account($object->account_number, 'account_number', 1, '', 1, 1);
print '</td></tr>';
}
else
{
print '<tr><td class="titlefieldcreate">'.$langs->trans("AccountancyCode").'</td>';
print '<td colspan="3"><input type="text" name="account_number" value="'.(GETPOST("account_number")?GETPOST('account_number', 'alpha'):$object->account_number).'"></td></tr>';
}
else
{
print '<tr><td class="'.$fieldrequired.'titlefieldcreate">'.$langs->trans("AccountancyCode").'</td>';
print '<td colspan="3"><input type="text" name="account_number" value="'.(GETPOST("account_number")?GETPOST('account_number', 'alpha'):$object->account_number).'"></td></tr>';
}
// Accountancy journal
@ -538,7 +525,7 @@ if ($action == 'create')
{
print '<tr><td>'.$langs->trans("AccountancyJournal").'</td>';
print '<td>';
print $formaccountancy2->select_journal($object->fk_accountancy_journal, 'fk_accountancy_journal', 4, 1, '', 1, 1);
print $formaccountancy2->select_journal($object->fk_accountancy_journal, 'fk_accountancy_journal', 4, 1, '', 0, 0);
print '</td></tr>';
}
@ -994,7 +981,7 @@ else
{
print '<tr><td>'.$langs->trans("AccountancyJournal").'</td>';
print '<td>';
print $formaccountancy2->select_journal($object->fk_accountancy_journal, 'fk_accountancy_journal', 4, 1, '', 1, 1);
print $formaccountancy2->select_journal($object->fk_accountancy_journal, 'fk_accountancy_journal', 4, 1, '', 0, 0);
print '</td></tr>';
}

2
htdocs/compta/bank/class/account.class.php
View File

@ -1259,7 +1259,7 @@ class Account extends CommonObject
include_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
$langs->load("accountancy");
$label .= '<br><b>' . $langs->trans('AccountAccounting') . ':</b> ' . length_accountg($this->account_number);
$label .= '<br><b>' . $langs->trans('AccountancyJournal') . ':</b> ' . $this->fk_accountancy_journal;
$label .= '<br><b>' . $langs->trans('AccountancyJournal') . ':</b> ' . $this->accountancy_journal;
}
$linkclose = '" title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip">';

4
htdocs/compta/bank/index.php
View File

@ -393,8 +393,8 @@ if (! empty($arrayfields['balance']['checked']))
}
// Action column
print '<td class="liste_titre" align="middle">';
$searchpitco=$form->showFilterAndCheckAddButtons($massactionbutton?1:0, 'checkforselect', 1);
print $searchpitco;
$searchpicto=$form->showFilterAndCheckAddButtons($massactionbutton?1:0, 'checkforselect', 1);
print $searchpicto;
print '</td>';
print '</tr>';

4
htdocs/compta/deplacement/list.php
View File

@ -165,8 +165,8 @@ if ($resql)
// print '<input class="flat" size="10" type="text" name="search_amount" value="'.$search_amount.'">';
print '</td>';
print '<td class="liste_titre" align="right">';
$searchpitco=$form->showFilterAndCheckAddButtons(0);
print $searchpitco;
$searchpicto=$form->showFilterAndCheckAddButtons(0);
print $searchpicto;
print '</td>';
print "</tr>\n";

17
htdocs/compta/facture/card.php
View File

@ -59,6 +59,9 @@ require_once DOL_DOCUMENT_ROOT . '/core/class/doleditor.class.php';
if (!empty($conf->variants->enabled)) {
require_once DOL_DOCUMENT_ROOT.'/variants/class/ProductCombination.class.php';
}
if (! empty($conf->accounting->enabled)) {
require_once DOL_DOCUMENT_ROOT . '/accountancy/class/accountingjournal.class.php';
}
$langs->load('bills');
$langs->load('companies');
@ -3685,7 +3688,7 @@ else if ($id > 0 || ! empty($ref))
$sql = 'SELECT p.datep as dp, p.ref, p.num_paiement, p.rowid, p.fk_bank,';
$sql .= ' c.code as payment_code, c.libelle as payment_label,';
$sql .= ' pf.amount,';
$sql .= ' ba.rowid as baid, ba.ref as baref, ba.label';
$sql .= ' ba.rowid as baid, ba.ref as baref, ba.label, ba.number as banumber, ba.account_number, ba.fk_accountancy_journal';
$sql .= ' FROM ' . MAIN_DB_PREFIX . 'c_paiement as c, ' . MAIN_DB_PREFIX . 'paiement_facture as pf, ' . MAIN_DB_PREFIX . 'paiement as p';
$sql .= ' LEFT JOIN ' . MAIN_DB_PREFIX . 'bank as b ON p.fk_bank = b.rowid';
$sql .= ' LEFT JOIN ' . MAIN_DB_PREFIX . 'bank_account as ba ON b.fk_account = ba.rowid';
@ -3717,7 +3720,17 @@ else if ($id > 0 || ! empty($ref))
$bankaccountstatic->id = $objp->baid;
$bankaccountstatic->ref = $objp->baref;
$bankaccountstatic->label = $objp->baref;
print '<td align="right">';
$bankaccountstatic->number = $objp->banumber;
if (! empty($conf->accounting->enabled)) {
$bankaccountstatic->account_number = $objp->account_number;
$accountingjournal = new AccountingJournal($db);
$accountingjournal->fetch($objp->fk_accountancy_journal);
$bankaccountstatic->accountancy_journal = $accountingjournal->getNomUrl(0,1,1,'',1);
}
print '<td align="right">';
if ($bankaccountstatic->id)
print $bankaccountstatic->getNomUrl(1, 'transactions');
print '</td>';

4
htdocs/compta/facture/fiche-rec.php
View File

@ -1770,8 +1770,8 @@ else
}
// Action column
print '<td class="liste_titre" align="middle">';
$searchpitco=$form->showFilterAndCheckAddButtons(0, 'checkforselect', 1);
print $searchpitco;
$searchpicto=$form->showFilterAndCheckAddButtons(0, 'checkforselect', 1);
print $searchpicto;
print '</td>';
print "</tr>\n";

4
htdocs/compta/facture/list.php
View File

@ -936,8 +936,8 @@ if ($resql)
}
// Action column
print '<td class="liste_titre" align="middle">';
$searchpitco=$form->showFilterButtons();
print $searchpitco;
$searchpicto=$form->showFilterButtons();
print $searchpicto;
print '</td>';
print "</tr>\n";

4
htdocs/compta/paiement/cheque/list.php
View File

@ -175,8 +175,8 @@ if ($resql)
print '</td>';
print '<td class="liste_titre"></td>';
print '<td class="liste_titre" align="right">';
$searchpitco=$form->showFilterAndCheckAddButtons(0);
print $searchpitco;
$searchpicto=$form->showFilterAndCheckAddButtons(0);
print $searchpicto;
print '</td>';
print "</tr>\n";

4
htdocs/compta/paiement/list.php
View File

@ -254,8 +254,8 @@ if ($resql)
print '<input class="flat" type="text" size="4" name="search_amount" value="'.$search_amount.'">';
print '</td>';
print '<td class="liste_titre" align="right">';
$searchpitco=$form->showFilterAndCheckAddButtons(0);
print $searchpitco;
$searchpicto=$form->showFilterAndCheckAddButtons(0);
print $searchpicto;
print '</td>';
if (! empty($conf->global->BILL_ADD_PAYMENT_VALIDATION))
{

4
htdocs/compta/prelevement/bons.php
View File

@ -124,8 +124,8 @@ if ($result)
print '<td class="liste_titre"><input type="text" class="flat maxwidth100" name="search_ref" value="'. $db->escape($search_ref).'"></td>';
print '<td class="liste_titre">&nbsp;</td>';
print '<td class="liste_titre" align="right">';
$searchpitco=$form->showFilterAndCheckAddButtons(0);
print $searchpitco;
$searchpicto=$form->showFilterAndCheckAddButtons(0);
print $searchpicto;
print '</td>';
print '</tr>';

4
htdocs/compta/prelevement/demandes.php
View File

@ -124,8 +124,8 @@ if ($resql)
print '<td class="liste_titre"></td>';
// Action column
print '<td class="liste_titre" align="middle">';
$searchpitco=$form->showFilterAndCheckAddButtons($massactionbutton?1:0, 'checkforselect', 1);
print $searchpitco;
$searchpicto=$form->showFilterAndCheckAddButtons($massactionbutton?1:0, 'checkforselect', 1);
print $searchpicto;
print '</td>';
print '</tr>';

4
htdocs/compta/prelevement/list.php
View File

@ -154,8 +154,8 @@ if ($result)
print '<td class="liste_titre">&nbsp;</td>';
print '<td class="liste_titre">&nbsp;</td>';
print '<td class="liste_titre" align="right">';
$searchpitco=$form->showFilterAndCheckAddButtons(0);
print $searchpitco;
$searchpicto=$form->showFilterAndCheckAddButtons(0);
print $searchpicto;
print '</td>';
print '</tr>';

67
htdocs/compta/resultat/clientfourn.php
View File

@ -231,13 +231,11 @@ $result = $db->query($sql);
if ($result) {
$num = $db->num_rows($result);
$i = 0;
$var=true;
while ($i < $num)
{
$objp = $db->fetch_object($result);
print "<tr ".$bc[$var]."><td>&nbsp;</td>";
print '<tr class="oddeven"><td>&nbsp;</td>';
print "<td>".$langs->trans("Bills").' <a href="'.DOL_URL_ROOT.'/compta/facture/list.php?socid='.$objp->socid.'">'.$objp->name."</td>\n";
if ($modecompta == 'CREANCES-DETTES')
@ -282,7 +280,7 @@ if ($modecompta != 'CREANCES-DETTES')
$objp = $db->fetch_object($result);
print "<tr ".$bc[$var]."><td>&nbsp;</td>";
print '<tr class="oddeven"><td>&nbsp;</td>';
print "<td>".$langs->trans("Bills")." ".$langs->trans("Other")." (".$langs->trans("PaymentsNotLinkedToInvoice").")\n";
if ($modecompta == 'CREANCES-DETTES')
@ -303,9 +301,8 @@ if ($modecompta != 'CREANCES-DETTES')
}
if ($total_ttc == 0)
{
print "<tr ".$bc[$var]."><td>&nbsp;</td>";
{
print '<tr class="oddeven"><td>&nbsp;</td>';
print '<td colspan="3" class="opacitymedium">'.$langs->trans("None").'</td>';
print '</tr>';
}
@ -361,15 +358,13 @@ $result = $db->query($sql);
if ($result) {
$num = $db->num_rows($result);
$i = 0;
$var=true;
if ($num > 0)
{
while ($i < $num)
{
$objp = $db->fetch_object($result);
print "<tr ".$bc[$var]."><td>&nbsp;</td>";
print '<tr class="oddeven"><td>&nbsp;</td>';
print "<td>".$langs->trans("Bills")." <a href=\"".DOL_URL_ROOT."/fourn/facture/list.php?socid=".$objp->socid."\">".$objp->name."</a></td>\n";
if ($modecompta == 'CREANCES-DETTES')
@ -386,9 +381,8 @@ if ($result) {
}
}
else
{
print "<tr ".$bc[$var]."><td>&nbsp;</td>";
{
print '<tr class="oddeven"><td>&nbsp;</td>';
print '<td colspan="3" class="opacitymedium">'.$langs->trans("None").'</td>';
print '</tr>';
}
@ -447,7 +441,6 @@ $subtotal_ht = 0;
$subtotal_ttc = 0;
if ($result) {
$num = $db->num_rows($result);
$var=true;
$i = 0;
if ($num) {
while ($i < $num) {
@ -458,8 +451,7 @@ if ($result) {
$subtotal_ht += $obj->amount;
$subtotal_ttc += $obj->amount;
$var = !$var;
print "<tr ".$bc[$var]."><td>&nbsp;</td>";
print '<tr class="oddeven"><td>&nbsp;</td>';
print '<td>'.$obj->label.'</td>';
if ($modecompta == 'CREANCES-DETTES') print '<td align="right">'.price(-$obj->amount).'</td>';
print '<td align="right">'.price(-$obj->amount).'</td>';
@ -468,8 +460,7 @@ if ($result) {
}
}
else {
$var = !$var;
print "<tr ".$bc[$var]."><td>&nbsp;</td>";
print '<tr class="oddeven"><td>&nbsp;</td>';
print '<td colspan="3" class="opacitymedium">'.$langs->trans("None").'</td>';
print '</tr>';
}
@ -526,7 +517,6 @@ $subtotal_ht = 0;
$subtotal_ttc = 0;
if ($result) {
$num = $db->num_rows($result);
$var=true;
$i = 0;
if ($num) {
while ($i < $num) {
@ -537,8 +527,7 @@ if ($result) {
$subtotal_ht += $obj->amount;
$subtotal_ttc += $obj->amount;
$var = !$var;
print "<tr ".$bc[$var]."><td>&nbsp;</td>";
print '<tr class="oddeven"><td>&nbsp;</td>';
print '<td>'.$obj->label.'</td>';
if ($modecompta == 'CREANCES-DETTES')
print '<td align="right">'.price(-$obj->amount).'</td>';
@ -548,8 +537,7 @@ if ($result) {
}
}
else {
$var = !$var;
print "<tr ".$bc[$var]."><td>&nbsp;</td>";
print '<tr class="oddeven"><td>&nbsp;</td>';
print '<td colspan="3" class="opacitymedium">'.$langs->trans("None").'</td>';
print '</tr>';
}
@ -615,7 +603,6 @@ if (! empty($conf->salaries->enabled))
if ($result)
{
$num = $db->num_rows($result);
$var=true;
$i = 0;
if ($num)
{
@ -628,8 +615,7 @@ if (! empty($conf->salaries->enabled))
$subtotal_ht += $obj->amount;
$subtotal_ttc += $obj->amount;
$var = !$var;
print "<tr ".$bc[$var]."><td>&nbsp;</td>";
print '<tr class="oddeven"><td>&nbsp;</td>';
print "<td>".$langs->trans("Salary")." <a href=\"".DOL_URL_ROOT."/compta/salaries/index.php?filtre=s.fk_user=".$obj->fk_user."\">".$obj->firstname." ".$obj->lastname."</a></td>\n";
@ -641,8 +627,7 @@ if (! empty($conf->salaries->enabled))
}
else
{
$var = !$var;
print "<tr ".$bc[$var]."><td>&nbsp;</td>";
print '<tr class="oddeven"><td>&nbsp;</td>';
print '<td colspan="3" class="opacitymedium">'.$langs->trans("None").'</td>';
print '</tr>';
}
@ -704,7 +689,6 @@ if (! empty($conf->expensereport->enabled))
if ($result)
{
$num = $db->num_rows($result);
$var=true;
if ($num)
{
while ($obj = $db->fetch_object($result))
@ -714,8 +698,7 @@ if (! empty($conf->expensereport->enabled))
$subtotal_ht += $obj->amount_ht;
$subtotal_ttc += $obj->amount_ttc;
$var = !$var;
print "<tr ".$bc[$var]."><td>&nbsp;</td>";
print '<tr class="oddeven"><td>&nbsp;</td>';
print "<td>".$langs->trans("ExpenseReport")." <a href=\"".DOL_URL_ROOT."/expensereport/list.php?search_user=".$obj->userid."\">".$obj->firstname." ".$obj->lastname."</a></td>\n";
@ -726,8 +709,7 @@ if (! empty($conf->expensereport->enabled))
}
else
{
$var = !$var;
print "<tr ".$bc[$var]."><td>&nbsp;</td>";
print '<tr class="oddeven"><td>&nbsp;</td>';
print '<td colspan="3" class="opacitymedium">'.$langs->trans("None").'</td>';
print '</tr>';
}
@ -782,7 +764,6 @@ if (! empty($conf->don->enabled))
if ($result)
{
$num = $db->num_rows($result);
$var=true;
$i = 0;
if ($num)
{
@ -795,8 +776,7 @@ if (! empty($conf->don->enabled))
$subtotal_ht += $obj->amount;
$subtotal_ttc += $obj->amount;
$var = !$var;
print "<tr ".$bc[$var]."><td>&nbsp;</td>";
print '<tr class="oddeven"><td>&nbsp;</td>';
print "<td>".$langs->trans("Donation")." <a href=\"".DOL_URL_ROOT."/don/list.php?search_company=".$obj->name."&search_name=".$obj->firstname." ".$obj->lastname."\">".$obj->name. " ".$obj->firstname." ".$obj->lastname."</a></td>\n";
@ -808,8 +788,7 @@ if (! empty($conf->don->enabled))
}
else
{
$var = !$var;
print "<tr ".$bc[$var]."><td>&nbsp;</td>";
print '<tr class="oddeven"><td>&nbsp;</td>';
print '<td colspan="3" class="opacitymedium">'.$langs->trans("None").'</td>';
print '</tr>';
}
@ -859,7 +838,6 @@ if ($modecompta == 'CREANCES-DETTES')
if ($result)
{
$num = $db->num_rows($result);
$var=false;
$i = 0;
if ($num)
{
@ -878,7 +856,7 @@ if ($modecompta == 'CREANCES-DETTES')
} else {
dol_print_error($db);
}
print "<tr ".$bc[$var]."><td>&nbsp;</td>";
print '<tr class="oddeven"><td>&nbsp;</td>';
print "<td>".$langs->trans("VATToPay")."</td>\n";
print "<td align=\"right\">&nbsp;</td>\n";
print "<td align=\"right\">".price($amount)."</td>\n";
@ -908,7 +886,6 @@ if ($modecompta == 'CREANCES-DETTES')
if ($result)
{
$num = $db->num_rows($result);
$var=true;
$i = 0;
if ($num)
{
@ -928,7 +905,7 @@ if ($modecompta == 'CREANCES-DETTES')
} else {
dol_print_error($db);
}
print "<tr ".$bc[$var]."><td>&nbsp;</td>";
print '<tr class="oddeven"><td>&nbsp;</td>';
print "<td>".$langs->trans("VATToCollect")."</td>\n";
print "<td align=\"right\">&nbsp;</td>\n";
print "<td align=\"right\">".price($amount)."</td>\n";
@ -955,7 +932,6 @@ else
$result=$db->query($sql);
if ($result) {
$num = $db->num_rows($result);
$var=false;
$i = 0;
if ($num) {
while ($i < $num) {
@ -974,7 +950,7 @@ else
} else {
dol_print_error($db);
}
print "<tr ".$bc[$var]."><td>&nbsp;</td>";
print '<tr class="oddeven"><td>&nbsp;</td>';
print "<td>".$langs->trans("VATPaid")."</td>\n";
if ($modecompta == 'CREANCES-DETTES')
print "<td align=\"right\">".price($amount)."</td>\n";
@ -1000,7 +976,6 @@ else
$result=$db->query($sql);
if ($result) {
$num = $db->num_rows($result);
$var=true;
$i = 0;
if ($num) {
while ($i < $num) {
@ -1021,7 +996,7 @@ else
{
dol_print_error($db);
}
print "<tr ".$bc[$var]."><td>&nbsp;</td>";
print '<tr class="oddeven"><td>&nbsp;</td>';
print "<td>".$langs->trans("VATCollected")."</td>\n";
if ($modecompta == 'CREANCES-DETTES')
print "<td align=\"right\">".price($amount)."</td>\n";

19
htdocs/compta/salaries/index.php
View File

@ -26,6 +26,7 @@
require '../../main.inc.php';
require_once DOL_DOCUMENT_ROOT.'/compta/salaries/class/paymentsalary.class.php';
require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
if (! empty($conf->accounting->enabled)) require_once DOL_DOCUMENT_ROOT . '/accountancy/class/accountingjournal.class.php';
$langs->load("compta");
$langs->load("salaries");
@ -94,7 +95,7 @@ $accountstatic = new Account($db);
$sql = "SELECT u.rowid as uid, u.lastname, u.firstname, u.login, u.email, u.admin, u.salary as current_salary, u.fk_soc as fk_soc,";
$sql.= " s.rowid, s.fk_user, s.amount, s.salary, s.label, s.datep as datep, s.datev as datev, s.fk_typepayment as type, s.num_payment, s.fk_bank,";
$sql.= " ba.rowid as bid, ba.ref as bref, ba.number as bnumber, ba.account_number, ba.accountancy_journal, ba.label as blabel,";
$sql.= " ba.rowid as bid, ba.ref as bref, ba.number as bnumber, ba.account_number, ba.fk_accountancy_journal, ba.label as blabel,";
$sql.= " pst.code as payment_code";
$sql.= " FROM ".MAIN_DB_PREFIX."payment_salary as s";
$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_paiement as pst ON s.fk_typepayment = pst.id";
@ -183,8 +184,8 @@ if ($result)
print '<td class="liste_titre" align="right"><input name="search_amount" class="flat" type="text" size="8" value="'.$search_amount.'"></td>';
print '<td class="liste_titre" align="right">';
$searchpitco=$form->showFilterAndCheckAddButtons(0);
print $searchpitco;
$searchpicto=$form->showFilterAndCheckAddButtons(0);
print $searchpicto;
print '</td>';
print '<tr class="liste_titre">';
@ -236,8 +237,16 @@ if ($result)
$accountstatic->id=$obj->bid;
$accountstatic->ref=$obj->bref;
$accountstatic->number=$obj->bnumber;
$accountstatic->accountancy_number=$obj->account_number;
$accountstatic->accountancy_journal=$obj->accountancy_journal;
if (! empty($conf->accounting->enabled))
{
$accountstatic->account_number=$obj->account_number;
$accountingjournal = new AccountingJournal($db);
$accountingjournal->fetch($obj->fk_accountancy_journal);
$accountstatic->accountancy_journal = $accountingjournal->getNomUrl(0,1,1,'',1);
}
$accountstatic->label=$obj->blabel;
print $accountstatic->getNomUrl(1);
}

4
htdocs/compta/sociales/index.php
View File

@ -202,8 +202,8 @@ if ($resql)
print '</td>';
print '<td class="liste_titre" align="right">';
$searchpitco=$form->showFilterAndCheckAddButtons(0);
print $searchpitco;
$searchpicto=$form->showFilterAndCheckAddButtons(0);
print $searchpicto;
print '</td>';
print "</tr>\n";

4
htdocs/compta/tva/reglement.php
View File

@ -182,8 +182,8 @@ if ($result)
}
print '<td class="liste_titre" align="right"><input name="search_amount" class="flat" type="text" size="8" value="'.$search_amount.'"></td>';
print '<td class="liste_titre" align="right">';
$searchpitco=$form->showFilterAndCheckAddButtons(0);
print $searchpitco;
$searchpicto=$form->showFilterAndCheckAddButtons(0);
print $searchpicto;
print '</td>';
print "</tr>\n";

4
htdocs/contrat/list.php
View File

@ -509,8 +509,8 @@ if ($resql)
print '<td class="liste_titre" colspan="4" align="right"></td>';
}
print '<td class="liste_titre" align="middle">';
$searchpitco=$form->showFilterButtons();
print $searchpitco;
$searchpicto=$form->showFilterButtons();
print $searchpicto;
print '</td>';
print "</tr>\n";

4
htdocs/contrat/services.php
View File

@ -503,8 +503,8 @@ if (! empty($arrayfields['status']['checked']))
}
// Action column
print '<td class="liste_titre" align="right">';
$searchpitco=$form->showFilterAndCheckAddButtons(0);
print $searchpitco;
$searchpicto=$form->showFilterAndCheckAddButtons(0);
print $searchpicto;
print '</td>';
print "</tr>\n";

4
htdocs/core/class/html.formaccounting.class.php
View File

@ -1,5 +1,5 @@
<?php
/* Copyright (C) 2016 Alexandre Spangaro <aspangaro.dolibarr@gmail.com>
/* Copyright (C) 2016-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
@ -121,7 +121,7 @@ class FormAccounting extends Form
}
}
$out .= Form::selectarray($htmlname, $options, $select, $showempty, 0, 0, '', 0, 0, 0, '', $morecss, 1);
$out .= Form::selectarray($htmlname, $options, $selected, $showempty, 0, 0, '', 0, 0, 0, '', $morecss, 1);
return $out;
}

4
htdocs/core/lib/company.lib.php
View File

@ -1264,8 +1264,8 @@ function show_actions_done($conf, $langs, $db, $filterobj, $objcon='', $noprint=
$out.='<td class="liste_titre"></td>';
// Action column
$out.='<td class="liste_titre" align="middle">';
$searchpitco=$form->showFilterAndCheckAddButtons($massactionbutton?1:0, 'checkforselect', 1);
$out.=$searchpitco;
$searchpicto=$form->showFilterAndCheckAddButtons($massactionbutton?1:0, 'checkforselect', 1);
$out.=$searchpicto;
$out.='</td>';
$out.='</tr>';

8
htdocs/core/lib/functions2.lib.php
View File

@ -1530,8 +1530,10 @@ function getListOfModels($db,$type,$maxfilenamelength=0)
include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
$const=$obj->description;
$dirtoscan.=($dirtoscan?',':'').preg_replace('/[\r\n]+/',',',trim($conf->global->$const));
$listoffiles=array();
//irtoscan.=($dirtoscan?',':'').preg_replace('/[\r\n]+/',',',trim($conf->global->$const));
$dirtoscan= preg_replace('/[\r\n]+/',',',trim($conf->global->$const));
$listoffiles=array();
// Now we add models found in directories scanned
$listofdir=explode(',',$dirtoscan);
@ -2111,4 +2113,4 @@ function cartesianArray(array $input) {
}
return $result;
}
}

4
htdocs/don/list.php
View File

@ -183,8 +183,8 @@ if ($resql)
print '<td class="liste_titre" align="right"><input name="search_amount" class="flat" type="text" size="8" value="'.$search_amount.'"></td>';
print '<td class="liste_titre" align="right"></td>';
print '<td class="liste_titre" align="right">';
$searchpitco=$form->showFilterAndCheckAddButtons(0);
print $searchpitco;
$searchpicto=$form->showFilterAndCheckAddButtons(0);
print $searchpicto;
print '</td>';
print "</tr>\n";

2
htdocs/expedition/card.php
View File

@ -1013,7 +1013,7 @@ if ($action == 'create')
{
$img=img_warning($langs->trans("StockTooLow"));
}
print "<tr ".$bc[$var]."><td>&nbsp; &nbsp; &nbsp; ->
print "<tr class=\"oddeven\"><td>&nbsp; &nbsp; &nbsp; ->
<a href=\"".DOL_URL_ROOT."/product/card.php?id=".$value['id']."\">".$value['fullpath']."
</a> (".$value['nb'].")</td><td align=\"center\"> ".$value['nb_total']."</td><td>&nbsp</td><td>&nbsp</td>
<td align=\"center\">".$value['stock']." ".$img."</td></tr>";

22
htdocs/expedition/index.php
View File

@ -90,17 +90,15 @@ if ($resql)
print '<tr class="liste_titre">';
print '<th colspan="3">'.$langs->trans("SendingsToValidate").'</th></tr>';
$i = 0;
$var = True;
while ($i < $num)
{
$obj = $db->fetch_object($resql);
$shipment->id=$obj->rowid;
$shipment->ref=$obj->ref;
$shipment->ref_customer=$obj->ref_customer;
$shipment->ref_customer=$obj->ref_customer;
print "<tr ".$bc[$var].'><td class="nowrap">';
print '<tr class="oddeven"><td class="nowrap">';
print $shipment->getNomUrl(1);
print "</td>";
print '<td>';
@ -142,7 +140,6 @@ if ($resql)
print '<table class="noborder" width="100%">';
print '<tr class="liste_titre">';
print '<th colspan="3">'.$langs->trans("OrdersToProcess").'</th></tr>';
$var = True;
while ($i < $num)
{
$obj = $db->fetch_object($resql);
@ -154,8 +151,7 @@ if ($resql)
$orderstatic->facturee=0;
$companystatic->name=$obj->name;
$companystatic->id=$obj->socid;
$companystatic->id=$obj->socid;
print '<tr class="oddeven">';
print '<td class="nowrap">';
@ -204,7 +200,6 @@ if ( $resql )
print '<table class="noborder" width="100%">';
print '<tr class="liste_titre">';
print '<th colspan="3">'.$langs->trans("OrdersInProcess").'</th></tr>';
$var = True;
while ($i < $num)
{
$obj = $db->fetch_object($resql);
@ -216,10 +211,9 @@ if ( $resql )
$orderstatic->facturee=$obj->billed;
$companystatic->name=$obj->name;
$companystatic->id=$obj->socid;
$companystatic->id=$obj->socid;
print "<tr ".$bc[$var]."><td>";
print '<tr class="oddeven"><td>';
print $orderstatic->getNomUrl(1);
print '</td>';
print '<td>';
@ -264,16 +258,14 @@ if ($resql)
$i = 0;
print '<table class="noborder" width="100%">';
print '<tr class="liste_titre">';
print '<th colspan="3">'.$langs->trans("LastSendings",$num).'</th></tr>';
$var = True;
print '<th colspan="3">'.$langs->trans("LastSendings", $num).'</th></tr>';
while ($i < $num)
{
$obj = $db->fetch_object($resql);
$shipment->id=$obj->rowid;
$shipment->ref=$obj->ref;
$shipment->ref_customer=$obj->ref_customer;
$shipment->ref_customer=$obj->ref_customer;
print '<tr class="oddeven"><td>';
print $shipment->getNomUrl(1);

4
htdocs/expedition/list.php
View File

@ -421,8 +421,8 @@ if ($resql)
}
// Action column
print '<td class="liste_titre" align="middle">';
$searchpitco=$form->showFilterAndCheckAddButtons(0);
print $searchpitco;
$searchpicto=$form->showFilterAndCheckAddButtons(0);
print $searchpicto;
print '</td>';
print "</tr>\n";

6
htdocs/expedition/stats/index.php
View File

@ -269,7 +269,6 @@ print '<td align="center">'.$langs->trans("AmountAverage").'</td>';*/
print '</tr>';
$oldyear=0;
$var=true;
foreach ($data as $val)
{
$year = $val['year'];
@ -278,7 +277,7 @@ foreach ($data as $val)
$oldyear--;
print '<tr '.$bc[$var].' height="24">';
print '<tr class="oddeven" height="24">';
print '<td align="center"><a href="'.$_SERVER["PHP_SELF"].'?year='.$oldyear.'&amp;mode='.$mode.'">'.$oldyear.'</a></td>';
print '<td align="right">0</td>';
@ -286,9 +285,8 @@ foreach ($data as $val)
print '<td align="right">0</td>';*/
print '</tr>';
}
print '<tr '.$bc[$var].' height="24">';
print '<tr class="oddeven" height="24">';
print '<td align="center">';
if ($year) print '<a href="'.$_SERVER["PHP_SELF"].'?year='.$year.'&amp;mode='.$mode.'">'.$year.'</a>';
else print $langs->trans("ValidationDateNotDefinedEvenIfShipmentValidated");

4
htdocs/expensereport/list.php
View File

@ -461,8 +461,8 @@ if ($resql)
}
// Action column
print '<td class="liste_titre" align="middle">';
$searchpitco=$form->showFilterButtons();
print $searchpitco;
$searchpicto=$form->showFilterButtons();
print $searchpicto;
print '</td>';
print "</tr>\n";

4
htdocs/fichinter/list.php
View File

@ -402,8 +402,8 @@ if ($resql)
print '</td>';
}
print '<td class="liste_titre" align="right">';
$searchpitco=$form->showFilterButtons();
print $searchpitco;
$searchpicto=$form->showFilterButtons();
print $searchpicto;
print '</td>';
print "</tr>\n";

4
htdocs/fourn/commande/list.php
View File

@ -1019,8 +1019,8 @@ if ($resql)
}
// Action column
print '<td class="liste_titre" align="middle">';
$searchpitco=$form->showFilterButtons();
print $searchpitco;
$searchpicto=$form->showFilterButtons();
print $searchpicto;
print '</td>';
print "</tr>\n";

15
htdocs/fourn/facture/card.php
View File

@ -8,7 +8,7 @@
* Copyright (C) 2013-2015 Philippe Grand <philippe.grand@atoo-net.com>
* Copyright (C) 2013 Florian Henry <florian.henry@open-concept.pro>
* Copyright (C) 2014-2016 Marcos García <marcosgdf@gmail.com>
* Copyright (C) 2016 Alexandre Spangaro <aspangaro@zendsi.com>
* Copyright (C) 2016-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
@ -49,6 +49,7 @@ if (!empty($conf->projet->enabled)) {
if (!empty($conf->variants->enabled)) {
require_once DOL_DOCUMENT_ROOT.'/variants/class/ProductCombination.class.php';
}
if (! empty($conf->accounting->enabled)) require_once DOL_DOCUMENT_ROOT . '/accountancy/class/accountingjournal.class.php';
$langs->load('bills');
@ -2317,7 +2318,7 @@ else
$sql = 'SELECT p.datep as dp, p.ref, p.num_paiement, p.rowid, p.fk_bank,';
$sql.= ' c.id as paiement_type,';
$sql.= ' pf.amount,';
$sql.= ' ba.rowid as baid, ba.ref as baref, ba.label';
$sql.= ' ba.rowid as baid, ba.ref as baref, ba.label, ba.number as banumber, ba.account_number, ba.fk_accountancy_journal';
$sql.= ' FROM '.MAIN_DB_PREFIX.'paiementfourn as p';
$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'bank as b ON p.fk_bank = b.rowid';
$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'bank_account as ba ON b.fk_account = ba.rowid';
@ -2365,6 +2366,16 @@ else
$bankaccountstatic->id=$objp->baid;
$bankaccountstatic->ref=$objp->baref;
$bankaccountstatic->label=$objp->baref;
$bankaccountstatic->number = $objp->banumber;
if (! empty($conf->accounting->enabled)) {
$bankaccountstatic->account_number = $objp->account_number;
$accountingjournal = new AccountingJournal($db);
$accountingjournal->fetch($objp->fk_accountancy_journal);
$bankaccountstatic->accountancy_journal = $accountingjournal->getNomUrl(0,1,1,'',1);
}
print '<td align="right">';
if ($objp->baid > 0) print $bankaccountstatic->getNomUrl(1,'transactions');
print '</td>';

4
htdocs/fourn/facture/impayees.php
View File

@ -216,8 +216,8 @@ if ($user->rights->fournisseur->facture->lire)
print '<input class="flat" type="text" size="8" name="search_amount_all_tax" value="'.$search_amount_all_tax.'">';
print '</td>';
print '<td class="liste_titre" align="right">';
$searchpitco=$form->showFilterAndCheckAddButtons(0);
print $searchpitco;
$searchpicto=$form->showFilterAndCheckAddButtons(0);
print $searchpicto;
print '</td>';
print "</tr>\n";

4
htdocs/fourn/facture/list.php
View File

@ -818,8 +818,8 @@ if ($resql)
}
// Action column
print '<td class="liste_titre" align="middle">';
$searchpitco=$form->showFilterButtons('checkforselect', 0);
print $searchpitco;
$searchpicto=$form->showFilterButtons('checkforselect', 0);
print $searchpicto;
print '</td>';
print "</tr>\n";

4
htdocs/fourn/facture/paiement.php
View File

@ -722,8 +722,8 @@ if (empty($action))
print '<input class="flat" type="text" size="4" name="search_amount" value="'.dol_escape_htmltag($search_amount).'">';
print '</td>';
print '<td class="liste_titre" align="right">';
$searchpitco=$form->showFilterAndCheckAddButtons(0);
print $searchpitco;
$searchpicto=$form->showFilterAndCheckAddButtons(0);
print $searchpicto;
print '</td>';
print "</tr>\n";

4
htdocs/holiday/list.php
View File

@ -373,8 +373,8 @@ print '</td>';
// ACTION
print '<td class="liste_titre" align="right">';
$searchpitco=$form->showFilterAndCheckAddButtons(0);
print $searchpitco;
$searchpicto=$form->showFilterAndCheckAddButtons(0);
print $searchpicto;
print '</td>';
print "</tr>\n";

4
htdocs/modulebuilder/skeletons/skeleton_list.php
View File

@ -420,8 +420,8 @@ if (! empty($arrayfields['t.tms']['checked']))
}*/
// Action column
print '<td class="liste_titre" align="right">';
$searchpitco=$form->showFilterAndCheckAddButtons($massactionbutton?1:0, 'checkforselect', 1);
print $searchpitco;
$searchpicto=$form->showFilterAndCheckAddButtons($massactionbutton?1:0, 'checkforselect', 1);
print $searchpicto;
print '</td>';
print '</tr>'."\n";

4
htdocs/opensurvey/list.php
View File

@ -105,8 +105,8 @@ $arraystatus=array(''=>'&nbsp;','expired'=>$langs->trans("Expired"),'opened'=>$l
print '<td class="liste_titre" align="center">'. $form->selectarray('status', $arraystatus, $status).'</td>';
print '<td class="liste_titre"></td>';
print '<td class="liste_titre" align="right">';
$searchpitco=$form->showFilterAndCheckAddButtons(0);
print $searchpitco;
$searchpicto=$form->showFilterAndCheckAddButtons(0);
print $searchpicto;
print '</td>';
print '</tr>'."\n";

4
htdocs/product/canvas/product/tpl/list.tpl.php
View File

@ -71,8 +71,8 @@
<td class="liste_titre" align="<?php echo $searchfield['align']; ?>"><input class="flat" type="text" name="s<?php echo $searchfield['alias']; ?>" value=""></td>
<?php } else if ($key == $num) {
print '<td class="liste_titre" align="right">';
$searchpitco=$form->showFilterAndCheckAddButtons(0);
print $searchpitco;
$searchpicto=$form->showFilterAndCheckAddButtons(0);
print $searchpicto;
print '</td>';
} else { ?>
<td class="liste_titre">&nbsp;</td>

4
htdocs/product/canvas/service/tpl/list.tpl.php
View File

@ -71,8 +71,8 @@
<td class="liste_titre" align="<?php echo $searchfield['align']; ?>"><input class="flat" type="text" name="s<?php echo $searchfield['alias']; ?>" value=""></td>
<?php } else if ($key == $num) {
print '<td class="liste_titre" align="right">';
$searchpitco=$form->showFilterAndCheckAddButtons(0);
print $searchpitco;
$searchpicto=$form->showFilterAndCheckAddButtons(0);
print $searchpicto;
print '</td>';
} else { ?>
<td class="liste_titre">&nbsp;</td>

4
htdocs/product/list.php
View File

@ -611,8 +611,8 @@ else
print '</td>';
}
print '<td class="liste_titre" align="middle">';
$searchpitco=$form->showFilterButtons();
print $searchpitco;
$searchpicto=$form->showFilterButtons();
print $searchpicto;
print '</td>';
print '</tr>';

4
htdocs/product/price.php
View File

@ -1800,8 +1800,8 @@ if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES))
print '<td class="liste_titre" colspan="8">&nbsp;</td>';
// Print the search button
print '<td class="liste_titre" align="right">';
$searchpitco=$form->showFilterAndCheckAddButtons(0);
print $searchpitco;
$searchpicto=$form->showFilterAndCheckAddButtons(0);
print $searchpicto;
print '</td>';
print '</tr>';
}

4
htdocs/product/reassort.php
View File

@ -276,8 +276,8 @@ if ($resql)
print '<td class="liste_titre" colspan="'.$colspan_warehouse.'">&nbsp;</td>';
print '<td class="liste_titre"></td>';
print '<td class="liste_titre" align="right">';
$searchpitco=$form->showFilterAndCheckAddButtons(0);
print $searchpitco;
$searchpicto=$form->showFilterAndCheckAddButtons(0);
print $searchpicto;
print '</td>';
print '</tr>';

4
htdocs/product/reassortlot.php
View File

@ -280,8 +280,8 @@ if ($resql)
print '<td class="liste_titre">&nbsp;</td>';
print '<td class="liste_titre">&nbsp;</td>';
print '<td class="liste_titre" align="right">';
$searchpitco=$form->showFilterAndCheckAddButtons(0);
print $searchpitco;
$searchpicto=$form->showFilterAndCheckAddButtons(0);
print $searchpicto;
print '</td>';
print '</tr>';

4
htdocs/product/stock/list.php
View File

@ -168,8 +168,8 @@ if ($result)
print '</td>';
print '<td class="liste_titre" align="right">';
$searchpitco=$form->showFilterAndCheckAddButtons(0);
print $searchpitco;
$searchpicto=$form->showFilterAndCheckAddButtons(0);
print $searchpicto;
print '</td>';
print '</tr>';

4
htdocs/product/stock/mouvement.php
View File

@ -861,8 +861,8 @@ if ($resql)
}
// Actions
print '<td class="liste_titre" align="right">';
$searchpitco=$form->showFilterAndCheckAddButtons(0);
print $searchpitco;
$searchpicto=$form->showFilterAndCheckAddButtons(0);
print $searchpicto;
print '</td>';
print "</tr>\n";

4
htdocs/product/stock/productlot_list.php
View File

@ -399,8 +399,8 @@ if ($resql)
}*/
// Action column
print '<td class="liste_titre" align="right">';
$searchpitco=$form->showFilterAndCheckAddButtons($massactionbutton?1:0, 'checkforselect', 1);
print $searchpitco;
$searchpicto=$form->showFilterAndCheckAddButtons($massactionbutton?1:0, 'checkforselect', 1);
print $searchpicto;
print '</td>';
print '</tr>'."\n";

4
htdocs/product/stock/replenish.php
View File

@ -513,8 +513,8 @@ print '<td class="liste_titre" align="right">' . $langs->trans('AlertOnly') . '&
print '<td class="liste_titre" align="right">' . $langs->trans('Draft') . '&nbsp;<input type="checkbox" id="draftorder" name="draftorder" ' . (!empty($draftchecked)?$draftchecked:'') . '></td>';
print '<td class="liste_titre">&nbsp;</td>';
print '<td class="liste_titre" align="right">';
$searchpitco=$form->showFilterAndCheckAddButtons(0);
print $searchpitco;
$searchpicto=$form->showFilterAndCheckAddButtons(0);
print $searchpicto;
print '</td>';
print '</tr>';

4
htdocs/product/stock/replenishorders.php
View File

@ -179,8 +179,8 @@ if ($resql)
$form->select_date('', 'search_date', 0, 0, 1, '', 1, 0, 1, 0, '').
'</td>'.
'<td class="liste_titre" align="right">';
$searchpitco=$form->showFilterAndCheckAddButtons(0);
print $searchpitco;
$searchpicto=$form->showFilterAndCheckAddButtons(0);
print $searchpicto;
'</td>'.
'</tr>';

4
htdocs/projet/activity/perday.php
View File

@ -421,8 +421,8 @@ print '<td class="liste_titre"></td>';
print '<td class="liste_titre"></td>';
// Action column
print '<td class="liste_titre nowrap" align="right">';
$searchpitco=$form->showFilterAndCheckAddButtons(0);
print $searchpitco;
$searchpicto=$form->showFilterAndCheckAddButtons(0);
print $searchpicto;
print '</td>';
print "</tr>\n";

4
htdocs/projet/activity/perweek.php
View File

@ -417,8 +417,8 @@ for($i=0;$i<7;$i++)
}
// Action column
print '<td class="liste_titre nowrap" align="right">';
$searchpitco=$form->showFilterAndCheckAddButtons(0);
print $searchpitco;
$searchpicto=$form->showFilterAndCheckAddButtons(0);
print $searchpicto;
print '</td>';
print "</tr>\n";

4
htdocs/projet/list.php
View File

@ -605,8 +605,8 @@ if (! empty($arrayfields['p.fk_statut']['checked']))
}
// Action column
print '<td class="liste_titre" align="right">';
$searchpitco=$form->showFilterButtons();
print $searchpitco;
$searchpicto=$form->showFilterButtons();
print $searchpicto;
print '</td>';
print '</tr>'."\n";

4
htdocs/projet/tasks.php
View File

@ -504,8 +504,8 @@ else if ($id > 0 || ! empty($ref))
// Action column
print '<td class="liste_titre" align="right">';
$searchpitco=$form->showFilterButtons();
print $searchpitco;
$searchpicto=$form->showFilterButtons();
print $searchpicto;
print '</td>';
}

4
htdocs/projet/tasks/list.php
View File

@ -579,8 +579,8 @@ if (! empty($arrayfields['t.tms']['checked']))
}
// Action column
print '<td class="liste_titre" align="right">';
$searchpitco=$form->showFilterButtons();
print $searchpitco;
$searchpicto=$form->showFilterButtons();
print $searchpicto;
print '</td>';
print "</tr>\n";

4
htdocs/projet/tasks/time.php
View File

@ -779,8 +779,8 @@ if (($id > 0 || ! empty($ref)) || $projectidforalltimes > 0)
print $hookmanager->resPrint;
// Action column
print '<td class="liste_titre center">';
$searchpitco=$form->showFilterAndCheckAddButtons($massactionbutton?1:0, 'checkforselect', 1);
print $searchpitco;
$searchpicto=$form->showFilterAndCheckAddButtons($massactionbutton?1:0, 'checkforselect', 1);
print $searchpicto;
print '</td>';
print '</tr>'."\n";

4
htdocs/resource/list.php
View File

@ -232,8 +232,8 @@ if (is_array($extrafields->attribute_label) && count($extrafields->attribute_lab
}
// Action column
print '<td class="liste_titre" align="right">';
$searchpitco=$form->showFilterAndCheckAddButtons(0);
print $searchpitco;
$searchpicto=$form->showFilterAndCheckAddButtons(0);
print $searchpicto;
print '</td>';
print "</tr>\n";

4
htdocs/societe/consumption.php
View File

@ -388,8 +388,8 @@ if ($sql_select)
print '<td class="liste_titre" align="center">';
print '</td>';
print '<td class="liste_titre" align="right">';
$searchpitco=$form->showFilterAndCheckAddButtons(0);
print $searchpitco;
$searchpicto=$form->showFilterAndCheckAddButtons(0);
print $searchpicto;
print '</td>';
print '</tr>';

4
htdocs/societe/list.php
View File

@ -866,8 +866,8 @@ if (! empty($arrayfields['s.status']['checked']))
}
// Action column
print '<td class="liste_titre" align="right">';
$searchpitco=$form->showFilterButtons();
print $searchpitco;
$searchpicto=$form->showFilterButtons();
print $searchpicto;
print '</td>';
print "</tr>\n";

4
htdocs/societe/price.php
View File

@ -510,8 +510,8 @@ if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
print '<td colspan="8">&nbsp;</td>';
// Print the search button
print '<td class="liste_titre" align="right">';
$searchpitco=$form->showFilterAndCheckAddButtons(0);
print $searchpitco;
$searchpicto=$form->showFilterAndCheckAddButtons(0);
print $searchpicto;
print '</td>';
print '</tr>';
}

4
htdocs/supplier_proposal/list.php
View File

@ -553,8 +553,8 @@ if ($result)
print '</td>';
// Check boxes
print '<td class="liste_titre" align="middle">';
$searchpitco=$form->showFilterButtons();
print $searchpitco;
$searchpicto=$form->showFilterButtons();
print $searchpicto;
print '</td>';
print "</tr>\n";

4
htdocs/user/hierarchy.php
View File

@ -153,8 +153,8 @@ print '<td class="liste_titre" align="right">';
print $form->selectarray('search_statut', array('-1'=>'','1'=>$langs->trans('Enabled')),$search_statut);
print '</td>';
print '<td class="liste_titre" align="right">';
$searchpitco=$form->showFilterAndCheckAddButtons(0);
print $searchpitco;
$searchpicto=$form->showFilterAndCheckAddButtons(0);
print $searchpicto;
print '</td>';
print '</tr>';

4
htdocs/user/index.php
View File

@ -419,8 +419,8 @@ if (! empty($arrayfields['u.statut']['checked']))
}
// Action column
print '<td class="liste_titre" align="right">';
$searchpitco=$form->showFilterAndCheckAddButtons(0);
print $searchpitco;
$searchpicto=$form->showFilterAndCheckAddButtons(0);
print $searchpicto;
print '</td>';
print "</tr>\n";

4
htdocs/variants/combinations.php
View File

@ -638,8 +638,8 @@ if (! empty($id) || ! empty($ref))
<td class="liste_titre"></td>
<?php
print '<td class="liste_titre" align="middle">';
$searchpitco=$form->showCheckAddButtons('checkforselect', 1);
print $searchpitco;
$searchpicto=$form->showCheckAddButtons('checkforselect', 1);
print $searchpicto;
print '</td>';
?>
</tr>