diff --git a/htdocs/compta/bank/account.php b/htdocs/compta/bank/account.php index 75e650d69b8..1aea3e27c1b 100644 --- a/htdocs/compta/bank/account.php +++ b/htdocs/compta/bank/account.php @@ -324,8 +324,54 @@ if ($id > 0 || ! empty($ref)) print ''; - print '
'; + dol_fiche_end(); + + + /* + * Boutons actions + */ + + if ($action != 'delete') + { + print '
'; + + if ($object->type != 2 && $object->rappro) // If not cash account and can be reconciliate + { + if ($user->rights->banque->consolidate) + { + print ''.$langs->trans("Conciliate").''; + } + else + { + print ''.$langs->trans("Conciliate").''; + } + } + + if ($action != 'addline') + { + if (empty($conf->global->BANK_DISABLE_DIRECT_INPUT)) + { + if ($user->rights->banque->modifier) + { + print 'id.'&page='.$page.($vline?'&vline='.$vline:'').'">'.$langs->trans("AddBankRecord").''; + } + else + { + print ''.$langs->trans("AddBankRecord").''; + } + } + else + { + print ''.$langs->trans("AddBankRecord").''; + } + } + + print '
'; + } + + print '
'; + /** * Search form */ @@ -364,15 +410,15 @@ if ($id > 0 || ! empty($ref)) } $navig.=''; + //var_dump($navig); - print ''; - - // Show title if ($action != 'addline' && $action != 'delete') { - print ''; + print '
'.$navig.'
'; } + + print '
'.$navig.'
'; // 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 "\n"; - dol_fiche_end(); - - - /* - * Boutons actions - */ - - if ($action != 'delete') - { - print '
'; - - if ($object->type != 2 && $object->rappro) // If not cash account and can be reconciliate - { - if ($user->rights->banque->consolidate) - { - print ''.$langs->trans("Conciliate").''; - } - else - { - print ''.$langs->trans("Conciliate").''; - } - } - - if ($action != 'addline') - { - if (empty($conf->global->BANK_DISABLE_DIRECT_INPUT)) - { - if ($user->rights->banque->modifier) - { - print 'id.'&page='.$page.($vline?'&vline='.$vline:'').'">'.$langs->trans("AddBankRecord").''; - } - else - { - print ''.$langs->trans("AddBankRecord").''; - } - } - else - { - print ''.$langs->trans("AddBankRecord").''; - } - } - - print '
'; - } - print '
'; } else diff --git a/htdocs/compta/bank/annuel.php b/htdocs/compta/bank/annuel.php index 182340a2baa..990b32524a5 100644 --- a/htdocs/compta/bank/annuel.php +++ b/htdocs/compta/bank/annuel.php @@ -186,12 +186,14 @@ print ''; print '
'; -print '
'; +dol_fiche_end(); + // Affiche tableau -print ''; +print '
'.$link.'
'; -print ''; + +print '
'.$link.'
'; print ''; for ($annee = $year_start ; $annee <= $year_end ; $annee++) @@ -245,16 +247,13 @@ for ($annee = $year_start ; $annee <= $year_end ; $annee++) } print "\n"; -// Ligne vierge -print ''; -$nbcol=0; -for ($annee = $year_start ; $annee <= $year_end ; $annee++) -{ - $nbcol+=2; -} -print "\n"; +print "
'.$langs->trans("Month").'
 
"; -// Solde actuel + +print '
'; + + +// Current balance $balance=0; $sql = "SELECT SUM(b.amount) as total"; @@ -274,6 +273,9 @@ if ($resql) else { dol_print_error($db); } + +print ''; + print '"; print ''; print "\n"; @@ -496,9 +498,9 @@ else unset($tblyear[1]); unset($tblyear[2]); - print '
'; + print '
'; print $show1; - print '
'; + print '
'; print $show2; print '
'; print '
'; diff --git a/htdocs/compta/bank/graph.php b/htdocs/compta/bank/graph.php index d0afdee61bb..6f885e12bde 100644 --- a/htdocs/compta/bank/graph.php +++ b/htdocs/compta/bank/graph.php @@ -813,6 +813,9 @@ print ''; print '
'.$langs->trans("CurrentBalance")."'.price($balance).'
'; +dol_fiche_end(); + + print ''; // Navigation links @@ -876,8 +879,6 @@ if ($mode == 'showalltime') print '
'; -print "\n\n"; - llxFooter(); diff --git a/htdocs/compta/bank/releve.php b/htdocs/compta/bank/releve.php index f82139d1f3a..eb56a95f96a 100644 --- a/htdocs/compta/bank/releve.php +++ b/htdocs/compta/bank/releve.php @@ -139,11 +139,10 @@ if (empty($num)) print ''; - print '
'; + dol_fiche_end(); - - print_barre_liste('', $page, $_SERVER["PHP_SELF"], "&account=".$acct->id, $sortfield, $sortorder,'',$numrows); + print_barre_liste('', $page, $_SERVER["PHP_SELF"], "&account=".$acct->id, $sortfield, $sortorder,'',$numrows); print ''; print ''; diff --git a/htdocs/compta/bank/treso.php b/htdocs/compta/bank/treso.php index 4643b367630..38f6b94952e 100644 --- a/htdocs/compta/bank/treso.php +++ b/htdocs/compta/bank/treso.php @@ -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 '
'; - print '
'; + dol_fiche_end(); + $solde = $acct->solde(0); /* * Affiche tableau des echeances a venir */ - print ''; + print '
'; // Ligne de titre tableau des ecritures print ''; diff --git a/htdocs/expedition/shipment.php b/htdocs/expedition/shipment.php index d29dc513e5c..1d8f8c7444d 100644 --- a/htdocs/expedition/shipment.php +++ b/htdocs/expedition/shipment.php @@ -546,7 +546,7 @@ if ($id > 0 || ! empty($ref)) } print "\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 ''; + print ''; print ''; print ''; print ''; print ''."\n"; - - print ''."\n"; } } } diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index 8854e8f3477..e7ae83cbe3e 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -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;
'; - $img=''; if ($value['stock'] < $value['stock_alert']) { $img=img_warning($langs->trans("StockTooLow")); } - print '
      -> '.$value['fullpath'].' ('.$value['nb'].')
      -> '.$value['fullpath'].' ('.$value['nb'].') '.$value['nb_total'].'  '.$value['stock'].' '.$img.'