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

Look enhancement

Browse Source
This commit is contained in:
Laurent Destailleur 2015-05-15 12:53:14 +02:00
parent c33cbefad2
commit 976211b70f
7 changed files with 78 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

101
htdocs/compta/bank/account.php
View File

@ -324,8 +324,54 @@ if ($id > 0 || ! empty($ref))
print '</table>';
print '<br>';
dol_fiche_end();
/*
* Boutons actions
*/
if ($action != 'delete')
{
print '<div class="tabsAction">';
if ($object->type != 2 && $object->rappro) // If not cash account and can be reconciliate
{
if ($user->rights->banque->consolidate)
{
print '<a class="butAction" href="'.DOL_URL_ROOT.'/compta/bank/rappro.php?account='.$object->id.($vline?'&amp;vline='.$vline:'').'">'.$langs->trans("Conciliate").'</a>';
}
else
{
print '<a class="butActionRefused" title="'.$langs->trans("NotEnoughPermissions").'" href="#">'.$langs->trans("Conciliate").'</a>';
}
}
if ($action != 'addline')
{
if (empty($conf->global->BANK_DISABLE_DIRECT_INPUT))
{
if ($user->rights->banque->modifier)
{
print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=addline&amp;id='.$object->id.'&amp;page='.$page.($vline?'&amp;vline='.$vline:'').'">'.$langs->trans("AddBankRecord").'</a>';
}
else
{
print '<a class="butActionRefused" title="'.$langs->trans("NotEnoughPermissions").'" href="#">'.$langs->trans("AddBankRecord").'</a>';
}
}
else
{
print '<a class="butActionRefused" title="'.$langs->trans("FeatureDisabled").'" href="#">'.$langs->trans("AddBankRecord").'</a>';
}
}
print '</div>';
}
print '<br>';
/**
* Search form
*/
@ -364,15 +410,15 @@ if ($id > 0 || ! empty($ref))
}
$navig.='</div>';
//var_dump($navig);
print '<table class="notopnoleftnoright" width="100%">';
// Show title
if ($action != 'addline' && $action != 'delete')
{
print '<tr><td colspan="10" align="right">'.$navig.'</td></tr>';
print '<div class="floatright">'.$navig.'</div>';
}
print '<table class="noborder" width="100%">';
// Form to add a transaction with no invoice
if ($user->rights->banque->modifier && $action == 'addline')
@ -859,51 +905,6 @@ if ($id > 0 || ! empty($ref))
print "</form>\n";
dol_fiche_end();
/*
* Boutons actions
*/
if ($action != 'delete')
{
print '<div class="tabsAction">';
if ($object->type != 2 && $object->rappro) // If not cash account and can be reconciliate
{
if ($user->rights->banque->consolidate)
{
print '<a class="butAction" href="'.DOL_URL_ROOT.'/compta/bank/rappro.php?account='.$object->id.($vline?'&amp;vline='.$vline:'').'">'.$langs->trans("Conciliate").'</a>';
}
else
{
print '<a class="butActionRefused" title="'.$langs->trans("NotEnoughPermissions").'" href="#">'.$langs->trans("Conciliate").'</a>';
}
}
if ($action != 'addline')
{
if (empty($conf->global->BANK_DISABLE_DIRECT_INPUT))
{
if ($user->rights->banque->modifier)
{
print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=addline&amp;id='.$object->id.'&amp;page='.$page.($vline?'&amp;vline='.$vline:'').'">'.$langs->trans("AddBankRecord").'</a>';
}
else
{
print '<a class="butActionRefused" title="'.$langs->trans("NotEnoughPermissions").'" href="#">'.$langs->trans("AddBankRecord").'</a>';
}
}
else
{
print '<a class="butActionRefused" title="'.$langs->trans("FeatureDisabled").'" href="#">'.$langs->trans("AddBankRecord").'</a>';
}
}
print '</div>';
}
print '<br>';
}
else

30
htdocs/compta/bank/annuel.php
View File

@ -186,12 +186,14 @@ print '</td></tr>';
print '</table>';
print '<br>';
dol_fiche_end();
// Affiche tableau
print '<table class="notopnoleftnoright" width="100%">';
print '<div class="floatright">'.$link.'</div>';
print '<tr><td colspan="'.(1+($year_end-$year_start+1)*2).'" align="right">'.$link.'</td></tr>';
print '<table class="noborder" width="100%">';
print '<tr class="liste_titre"><td class="liste_titre">'.$langs->trans("Month").'</td>';
for ($annee = $year_start ; $annee <= $year_end ; $annee++)
@ -245,16 +247,13 @@ for ($annee = $year_start ; $annee <= $year_end ; $annee++)
}
print "</tr>\n";
// Ligne vierge
print '<tr><td>&nbsp;</td>';
$nbcol=0;
for ($annee = $year_start ; $annee <= $year_end ; $annee++)
{
$nbcol+=2;
}
print "</tr>\n";
print "</table>";
// Solde actuel
print '<br>';
// Current balance
$balance=0;
$sql = "SELECT SUM(b.amount) as total";
@ -274,6 +273,9 @@ if ($resql)
else {
dol_print_error($db);
}
print '<table class="noborder" width="100%">';
print '<tr class="liste_total"><td><b>'.$langs->trans("CurrentBalance")."</b></td>";
print '<td colspan="'.($nbcol).'" align="right">'.price($balance).'</td>';
print "</tr>\n";
@ -496,9 +498,9 @@ else
unset($tblyear[1]);
unset($tblyear[2]);
print '<div class="fichecenter"><div class="fichehalfleft"><div class="center">';
print '<div class="fichecenter"><div class="fichehalfleft"><div align="center">';
print $show1;
print '</div></div><div class="fichehalfright"><div class="ficheaddleft"><div class="center">';
print '</div></div><div class="fichehalfright"><div class="ficheaddleft"><div align="center">';
print $show2;
print '</div></div></div></div>';
print '<div style="clear:both"></div>';

5
htdocs/compta/bank/graph.php
View File

@ -813,6 +813,9 @@ print '</td></tr>';
print '</table>';
dol_fiche_end();
print '<table class="notopnoleftnoright" width="100%">';
// Navigation links
@ -876,8 +879,6 @@ if ($mode == 'showalltime')
print '</table>';
print "\n</div>\n";
llxFooter();

5
htdocs/compta/bank/releve.php
View File

@ -139,11 +139,10 @@ if (empty($num))
print '</table>';
print '<br>';
dol_fiche_end();
print_barre_liste('', $page, $_SERVER["PHP_SELF"], "&amp;account=".$acct->id, $sortfield, $sortorder,'',$numrows);
print_barre_liste('', $page, $_SERVER["PHP_SELF"], "&account=".$acct->id, $sortfield, $sortorder,'',$numrows);
print '<table class="noborder" width="100%">';
print '<tr class="liste_titre">';

9
htdocs/compta/bank/treso.php
View File

@ -85,10 +85,6 @@ if ($_REQUEST["account"] || $_REQUEST["ref"])
}
/*
*
*
*/
// Onglets
$head=bank_prepare_head($acct);
dol_fiche_head($head,'cash',$langs->trans("FinancialAccount"),0,'account');
@ -109,14 +105,15 @@ if ($_REQUEST["account"] || $_REQUEST["ref"])
print '</table>';
print '<br>';
dol_fiche_end();
$solde = $acct->solde(0);
/*
* Affiche tableau des echeances a venir
*/
print '<table class="notopnoleftnoright" width="100% border="1">';
print '<table class="noborder centpercent">';
// Ligne de titre tableau des ecritures
print '<tr class="liste_titre">';

8
htdocs/expedition/shipment.php
View File

@ -546,7 +546,7 @@ if ($id > 0 || ! empty($ref))
}
print "</tr>\n";
// Show subproducts details
// Show subproducts lines
if ($objp->fk_product > 0 && ! empty($conf->global->PRODUIT_SOUSPRODUITS))
{
// Set tree of subproducts in product->sousprods
@ -560,20 +560,16 @@ if ($id > 0 || ! empty($ref))
{
foreach($prods_arbo as $key => $value)
{
print '<tr><td colspan="4">';
$img='';
if ($value['stock'] < $value['stock_alert'])
{
$img=img_warning($langs->trans("StockTooLow"));
}
print '<tr><td>&nbsp; &nbsp; &nbsp; -> <a href="'.DOL_URL_ROOT."/product/card.php?id=".$value['id'].'">'.$value['fullpath'].'</a> ('.$value['nb'].')</td>';
print '<tr '.$bc[$var].'><td>&nbsp; &nbsp; &nbsp; -> <a href="'.DOL_URL_ROOT."/product/card.php?id=".$value['id'].'">'.$value['fullpath'].'</a> ('.$value['nb'].')</td>';
print '<td align="center"> '.$value['nb_total'].'</td>';
print '<td>&nbsp</td>';
print '<td>&nbsp</td>';
print '<td align="center">'.$value['stock'].' '.$img.'</td></tr>'."\n";
print '</td></tr>'."\n";
}
}
}

2
htdocs/theme/eldy/style.css.php
View File

@ -1781,7 +1781,7 @@ table.nobordernopadding tr {
}
table.nobordernopadding tr td {
border: 0px;
padding: 0 3px 0 0 !important;
padding: 0 3px 0 0;
}
table.border tr td table.nobordernopadding tr td {
padding-top: 0px;