diff --git a/html/css/style-classic7.css b/html/css/style-classic7.css index 07515935a..aab596401 100644 --- a/html/css/style-classic7.css +++ b/html/css/style-classic7.css @@ -3640,8 +3640,9 @@ div.widget-full_size { div.row.odd.hover:hover,div.row.even.hover:hover { background-color: var(--hover) !important; } -h2.legend { +h2.h-section { background-color: #e4e9ee; color: navy; border: 1px steelblue solid; + font-style: normal; } diff --git a/include/balance.inc.php b/include/balance.inc.php index 0592fcc98..e8e17307c 100644 --- a/include/balance.inc.php +++ b/include/balance.inc.php @@ -317,7 +317,7 @@ if ( isset($_GET['view'] ) ) $periode=new Periode($cn); $a=$periode->get_date_limit($from_periode); $b=$periode->get_date_limit($to_periode); - echo '

'; + echo '

'; printf ( _("période du %s au %s"),$a['p_start'],$b['p_end']); echo '

'; echo ''; diff --git a/include/class/acc_ledger.class.php b/include/class/acc_ledger.class.php index ec804adce..51fc616f2 100644 --- a/include/class/acc_ledger.class.php +++ b/include/class/acc_ledger.class.php @@ -2917,7 +2917,7 @@ class Acc_Ledger extends jrn_def_sql { $r=''; $r.='
'; - $r.='

'._('Paiement').'

'; + $r.='

'._('Paiement').'

'; $mp=new Acc_Payment($this->db); $mp->set_parameter('ledger_source', $this->id); $r.=$mp->select($p_selected,$p_amount,$p_date,$p_comm); diff --git a/include/class/acc_ledger_sale.class.php b/include/class/acc_ledger_sale.class.php index 5fa2f583a..2f57664fe 100644 --- a/include/class/acc_ledger_sale.class.php +++ b/include/class/acc_ledger_sale.class.php @@ -914,7 +914,7 @@ class Acc_Ledger_Sale extends Acc_Ledger { $r.='
'; $r.='
'; - $r.='

' . _('Détail articles vendus') . '

'; + $r.='

' . _('Détail articles vendus') . '

'; $r.='

'; $r.=''; $r.=''; @@ -1141,7 +1141,7 @@ EOF; if ($g_parameter->MY_ANALYTIC != 'nu' && ! $p_summary) // use of AA $r.=''; $r.='
'; - $r.='

Totaux

'; + $r.='

Totaux

'; $other_tax_label=""; $other_tax_amount=""; if ( $this->has_other_tax() && isset($p_array['other_tax'])) { @@ -1219,7 +1219,7 @@ EOF; $fname = new Fiche($this->db); $fname->get_by_qcode(${'e_mp_qcode_' . $e_mp}); - $r.='

' . "Payé par " . ${'e_mp_qcode_' . $e_mp} . + $r.='

' . "Payé par " . ${'e_mp_qcode_' . $e_mp} . " le ".${"mp_date"}. " " . $fname->getName() . '

' . '

' . _('Déduction acompte ') . h($acompte) . '

' . _('Libellé :') . h($e_comm_paiement) ; diff --git a/include/company.inc.php b/include/company.inc.php index da840f17c..04adf430d 100644 --- a/include/company.inc.php +++ b/include/company.inc.php @@ -148,7 +148,7 @@ $all->style=' class="input_text"';
-

Société

+

Société

style=' class="input_text"';
-

Paramètre supplémentaire

+

Paramètre supplémentaire

create_js_script(); @@ -255,7 +255,7 @@ $all->style=' class="input_text"';
-

Fonctionnement

+

Fonctionnement

'; @@ -526,7 +526,7 @@ for ($e = 0; $e < count($afiche); $e++) continue; $detail_card = HtmlInput::card_detail($row->strAttribut(ATTR_DEF_QUICKCODE), $row->strAttribut(ATTR_DEF_NAME)); - echo '

' . $detail_card ; + echo '

' . $detail_card ; echo "poste " . ":".HtmlInput::history_account($row->strAttribut(ATTR_DEF_ACCOUNT),$row->strAttribut(ATTR_DEF_ACCOUNT),'display:inline').Icon_Action::infobulle(27).'

'; diff --git a/include/history_operation.inc.php b/include/history_operation.inc.php index 1ba4d6769..4a97184c5 100644 --- a/include/history_operation.inc.php +++ b/include/history_operation.inc.php @@ -91,13 +91,13 @@ if (!isset($p_array['date_start'])) list($date_start, $date_end) = $per->get_date_limit(); $p_array['date_start'] = $date_start; $p_array['date_end'] = $date_end; - $msg='

'.sprintf(_("Période %s au %s "),$date_start,$date_end).'

'; + $msg='

'.sprintf(_("Période %s au %s "),$date_start,$date_end).'

'; } else { $date_start=$http->get("date_start","string",""); $date_end=$http->get("date_end","string",""); - $msg='

'.sprintf(_("Période %s au %s "),$date_start,$date_end) .'

'; + $msg='

'.sprintf(_("Période %s au %s "),$date_start,$date_end) .'

'; } /* compute the sql stmt */ diff --git a/include/impress_bilan.inc.php b/include/impress_bilan.inc.php index 6b846c951..307b43510 100644 --- a/include/impress_bilan.inc.php +++ b/include/impress_bilan.inc.php @@ -93,7 +93,7 @@ if ( isset($_GET['verif'])) $date_from=$bilan->from; $date_to=$bilan->to; } - echo '

'._('Etape 2 :Impression')." ".$date_from.'-'.$date_to.'

'; + echo '

'._('Etape 2 :Impression')." ".$date_from.'-'.$date_to.'

'; $bilan->get_request_get(); $bilan->verify(); diff --git a/include/impress_gl_comptes.inc.php b/include/impress_gl_comptes.inc.php index d583e4d14..06c8b4435 100644 --- a/include/impress_gl_comptes.inc.php +++ b/include/impress_gl_comptes.inc.php @@ -148,7 +148,7 @@ if ( isset( $_REQUEST['bt_html'] ) ) echo ''; diff --git a/include/impress_poste.inc.php b/include/impress_poste.inc.php index d1a79ddf6..dd3ee2590 100644 --- a/include/impress_poste.inc.php +++ b/include/impress_poste.inc.php @@ -164,7 +164,7 @@ if ( isset( $_REQUEST['bt_html'] ) ) $result=$Poste->HtmlTable(null,$_GET['ople']); $table=ob_get_clean(); if ( $result == 0) { - echo '

'.$Poste->id." ".h($Poste->label).'

'; + echo '

'.$Poste->id." ".h($Poste->label).'

'; echo $table; } echo ''; @@ -182,7 +182,7 @@ if ( isset( $_REQUEST['bt_html'] ) ) $Poste->load(); echo '
-

'. $accounting_id['pcm_val'].' '.h($accounting_id['pcm_lib']).'

+

'. $accounting_id['pcm_val'].' '.h($accounting_id['pcm_lib']).'
'; - echo ''; + echo ''; /* avoid duplicates */ $old=array(); foreach ($Poste->row as $detail) @@ -210,7 +210,7 @@ if ( isset( $_REQUEST['bt_html'] ) ) if ( ! isset($_REQUEST['oper_detail']) ) { echo '
'; - echo '

' . + echo '

' . '(' . $fiche->id . ')' . $fiche->getName() . ' ' . ' [ ' . $fiche->get_quick_code() . ' ] ' . @@ -224,11 +224,11 @@ if ( isset( $_REQUEST['bt_html'] ) ) { // Detail // echo '
'; - echo '

' . + echo '

' . '(' . $fiche->id . ')' . $fiche->getName() . ' ' . ' [ ' . $fiche->get_quick_code() . ' ] ' . - '

'; + '

'; $fiche->HtmlTableHeader(); $fiche->HtmlTableDetail(); @@ -260,7 +260,7 @@ if ( isset( $_REQUEST['bt_html'] ) ) $result=$Poste->HtmlTable(null,$_GET['ople']); $table=ob_get_clean(); if ( $result == 0) { - echo '

'.$Poste->id." ".h($Poste->label).'

'; + echo '

'.$Poste->id." ".h($Poste->label).'

'; echo $table; } @@ -274,14 +274,14 @@ if ( isset( $_REQUEST['bt_html'] ) ) // Detail //---------------------------------------------------------------------- echo Acc_Account_Ledger::HtmlTableHeader(); - echo '

'. $_GET['poste_id'].' '.h($Poste->label).'

'. $_GET['poste_id'].' '.h($Poste->label).'

'; + echo '
'; foreach ($a_poste as $poste_id ) { $Poste=new Acc_Account_Ledger ($cn,$poste_id['pcm_val']); $Poste->load(); $Poste->get_row_date( $_GET['from_periode'], $_GET['to_periode'],$_GET['ople']); if ( empty($Poste->row)) continue; - echo ''; + echo ''; $detail=$Poste->row[0]; @@ -292,8 +292,8 @@ if ( isset( $_REQUEST['bt_html'] ) ) /* avoid duplicates */ if ( in_array($detail['jr_id'],$old) == TRUE ) continue; $old[]=$detail['jr_id']; - echo tr(td("Journal :".$detail['jrn_def_name'],''),'style="width:auto" colspan="6"'); - echo ''; + // echo tr(td("Journal :".$detail['jrn_def_name'],''),'style="width:auto" colspan="6"'); + echo ''; $op=new Acc_Operation($cn); $op->poste=$poste_id['pcm_val']; diff --git a/include/impress_rapport.inc.php b/include/impress_rapport.inc.php index 16e6139b2..bb0f57981 100644 --- a/include/impress_rapport.inc.php +++ b/include/impress_rapport.inc.php @@ -96,7 +96,7 @@ if ( isset( $_GET['bt_html'] ) ) { $t=($from_periode==$to_periode)?"":" -> ".getPeriodeName($cn,$to_periode,'p_end'); - echo '

'.$form_id + echo '

'.$form_id ." ".$form_label ." - ".getPeriodeName($cn,$from_periode,'p_start') ." ".$t @@ -104,7 +104,7 @@ if ( isset( $_GET['bt_html'] ) ) } else { - echo '

'.$form_id." ".$form_label. + echo '

'.$form_id." ".$form_label. ' Date :'. $from_date. " au ". diff --git a/include/noalyss-color.inc.php b/include/noalyss-color.inc.php index f5c08cf47..998b88780 100644 --- a/include/noalyss-color.inc.php +++ b/include/noalyss-color.inc.php @@ -36,7 +36,7 @@ $http = new HttpInput();
-

+

load(); @@ -55,7 +55,7 @@ $http = new HttpInput();
-

+

diff --git a/include/template/form_ledger_detail.php b/include/template/form_ledger_detail.php index ce06927ef..7fe94e7e3 100644 --- a/include/template/form_ledger_detail.php +++ b/include/template/form_ledger_detail.php @@ -101,7 +101,7 @@ Acc_Operation_Note::input($note) has_quantity()==0)?'d-none':''; ?> -

+

'. $poste_id['pcm_val'].' '.h($Poste->label).'

'. $poste_id['pcm_val'].' '.h($Poste->label).'

'. $detail['j_date'].' '.$detail['jr_internal'].' '.hb($detail['description']).' '.hi($detail['jr_pj_number']).'
'. $detail['jrn_def_name']."-".$detail['j_date'].' '.$detail['jr_internal'].' '.hb($detail['description']).' '.hi($detail['jr_pj_number']).'
diff --git a/include/template/operation_exercice-input_source.php b/include/template/operation_exercice-input_source.php index ed472a5c6..47bf3a288 100644 --- a/include/template/operation_exercice-input_source.php +++ b/include/template/operation_exercice-input_source.php @@ -42,7 +42,7 @@ global $g_parameter;
-

+

@@ -102,7 +102,7 @@ global $g_parameter;
-

Clôture

+

Clôture

Clôture de l'exercice pour les comptes 6 à 7
diff --git a/include/template/operation_exercice-list_draft.php b/include/template/operation_exercice-list_draft.php index 003c9bfce..f8acad9a1 100644 --- a/include/template/operation_exercice-list_draft.php +++ b/include/template/operation_exercice-list_draft.php @@ -37,7 +37,7 @@ $aUrl = ["ac" => $http->request("ac"), "gDossier" => Dossier::id()]; $checkbox=new ICheckBox("operation_list[]"); $checkbox->set_range("operation_range"); ?> -

+

-

Fiches

+

Fiches

Code
@@ -279,7 +279,7 @@ endif; if ( $new ==1 || $type=='VEN' ) : ?>
-

Fiches

+

Fiches

@@ -337,7 +337,7 @@ endif; if ( $new ==1 || $type=='ODS' ) : ?>
-

Fiches

+

Fiches

@@ -383,7 +383,7 @@ endif; if ( $new ==1 || $type=='FIN' ) : ?>
-

Fiches

+

Fiches

diff --git a/include/template/tax_summary_display.php b/include/template/tax_summary_display.php index 22fadc321..a3cbdf9b3 100644 --- a/include/template/tax_summary_display.php +++ b/include/template/tax_summary_display.php @@ -27,7 +27,7 @@ * */?>
-

+

get_summary_sale(); ?>
-

+

get_row_purchase(); $nb_array=count($array);