diff --git a/html/css/style-classic7.css b/html/css/style-classic7.css index 686614578..e14d5bedf 100644 --- a/html/css/style-classic7.css +++ b/html/css/style-classic7.css @@ -57,8 +57,8 @@ a.mtitle span.notice { } table.sortable, table.table_large, table.result ,table.resultfooter { width:99%; - border-spacing: 1px; - /*border-collapse:collapse; */ + border-spacing: 0px; + border-collapse:collapse; border:1px solid #5D90CD; border-radius: 10px; @@ -66,8 +66,11 @@ table.sortable, table.table_large, table.result ,table.resultfooter { -webkit-border-radius: 10px; padding:3px; color: #242DD0; + +} +table.sortable td, table.table_large td, table.result td,table.resultfooter td { + border: 1px solid lightblue; } - table.sortable th, table.table_large th,table.result th { font-weight:bold; font-family: Arial, Helvetica, "Liberation Sans", FreeSans, sans-serif; @@ -330,6 +333,9 @@ tr.odd { background-color: #DCE7F5; /*! opacity: 50%; */ } +tr.odd > td,tr.even > td { + border: 1px solid lightblue; +} .highlight { font-weight: bolder; font-size:14px; @@ -1064,6 +1070,7 @@ table.sortable td, table.table_large td, table.result td { padding-left:5px; padding-right:5px; + border: 1px solid lightblue; } table.info_op { @@ -1530,14 +1537,15 @@ div#preference_div { div#box_search_card { position:absolute; - right:15.625%; - top:145px; + right:3.625vh; + top:33vh; } @media only screen and (max-width:994px) { div#box_search_card { - top:29%; + top:60vh; + } } @media only screen and (max-width:804px) @@ -2954,7 +2962,7 @@ li.li-active { } .nav-level2 { - background-color: #0b2d99 + background-color: #0b2d99; } .nav-level2>li { border-right: 1px #9fbcd6 ridge; diff --git a/include/anc_od.inc.php b/include/anc_od.inc.php index 6daaeb4b6..fc7ca554e 100644 --- a/include/anc_od.inc.php +++ b/include/anc_od.inc.php @@ -45,26 +45,41 @@ if ( ! $m ) return; } +$dossier_id=Dossier::id(); -//---------------------------------------------------------------------- -// show the left menu -//---------------------------------------------------------------------- echo '
- - - - - -
- '._('Nouveau').' - -'._('Liste opérations').' -
-
'; +// +// +// +// +// +//
+// '._('Nouveau').' +// +//'._('Liste opérations').' +//
+// +//'; +//---------------------------------------------------------------------- +// show the menu +//---------------------------------------------------------------------- +echo ShowItem(array( + array( + "?".http_build_query(["ac"=>$http->request("ac"),"new"=>1,"gDossier"=>$dossier_id]), + _("Nouveau"), + _("Nouvelle opération") + ), + array ( + "?".http_build_query(["ac"=>$http->request("ac"),"see"=>1,"gDossier"=>$dossier_id]), + _("Liste"), + _("Liste opérations") + ) +), "H", "nav-item", "nav-link", "", "nav nav-pills nav-level3"); + //---------------------------------------------------------------------- // the pa_id is set diff --git a/include/class/acc_account_ledger.class.php b/include/class/acc_account_ledger.class.php index 1a484485f..bea644dbe 100644 --- a/include/class/acc_account_ledger.class.php +++ b/include/class/acc_account_ledger.class.php @@ -386,9 +386,9 @@ class Acc_Account_Ledger if ( $from_div == 1) - echo ""; + echo "
"; else - echo "
"; + echo "
"; echo ''; echo "". "". diff --git a/include/class/fiche.class.php b/include/class/fiche.class.php index aa905509a..e44c215f2 100644 --- a/include/class/fiche.class.php +++ b/include/class/fiche.class.php @@ -1588,11 +1588,11 @@ class Fiche $rep=""; if ( $from_div==1) { - echo "
"._('Date')."
"; + echo "
"; } else { - echo "
"; + echo "
"; } echo ''; echo "". diff --git a/include/class/lettering.class.php b/include/class/lettering.class.php index b51f7b2e6..cb1975e72 100644 --- a/include/class/lettering.class.php +++ b/include/class/lettering.class.php @@ -665,6 +665,7 @@ class Lettering_Card extends Lettering diff_letter1 as letter_diff, round(j_montant/currency_rate,4) as currency_amount, currency_rate, + currency_id, currency_rate_ref, (select cr_code_iso from currency where currency_id=currency.id) as cr_code_iso from jrnx join jrn on (j_grpt = jr_grpt_id) diff --git a/include/fiche.inc.php b/include/fiche.inc.php index e72e9b82d..99e76f67d 100644 --- a/include/fiche.inc.php +++ b/include/fiche.inc.php @@ -542,8 +542,9 @@ for ($e = 0; $e < count($afiche); $e++) echo th(_('Interne')); echo th(_('Comm')); echo th(_('Code Devise')); - echo th(_('Devise')); - echo th(_('Montant'), 'style="width:auto;text-align:center" colspan="2"'); + echo th(_('Devise'),'style="text-align:right"'); + echo th(_('Débit'), 'style="width:auto;text-align:right" '); + echo th(_('Crédit'), 'style="width:auto;text-align:right" '); echo th(_('Prog.'),'style="text-align:right"'); echo th(_('Let.')); echo ''; @@ -568,7 +569,9 @@ for ($e = 0; $e < count($afiche); $e++) echo td(HtmlInput::detail_op($row['jr_id'], $row['jr_internal'])); echo td(h($row['jr_comment'])); echo td($row['cr_code_iso']); - echo td(nbm(h($row['currency_amount']),2),'class="num"'); + $str_currency_amount=($row['currency_id']==0)?"":nbm($row['currency_amount'],2); + + echo td($str_currency_amount,'class="num"'); if ($row['j_debit'] == 't') { echo td(nbm($row['j_montant']), ' style="text-align:right"');