diff --git a/html/ajax_ledger.php b/html/ajax_ledger.php index 0b4c54e2f..e82a4a8c9 100644 --- a/html/ajax_ledger.php +++ b/html/ajax_ledger.php @@ -28,7 +28,7 @@ - load a receipt document - for reconcialiation - update of analytic content - */ +*/ require_once('class_database.php'); require_once('class_user.php'); require_once('class_acc_operation.php'); @@ -164,14 +164,19 @@ case 'de': echo " "; echo ""; echo '
'; - $h=sprintf('%s', - $gDossier,$ledger,$obj->det->jr_grpt_id,h( $obj->det->jr_pj_name)); - echo $h; + $x=''; if ($access=='W') - $x=sprintf('enlever', + $x=sprintf('enlever', $gDossier,$div,$jr_id); echo $x; + $filename= $obj->det->jr_pj_name; + if ( strlen($obj->det->jr_pj_name) > 20 ) { + $filename=substr($obj->det->jr_pj_name,1,20); + } + $h=sprintf('%s', + $gDossier,$ledger,$obj->det->jr_grpt_id,h( $filename)); + echo $h; echo '
'; exit(); } @@ -194,12 +199,16 @@ case 'de': echo " "; echo ""; echo '
'; - $h=sprintf('%s', - $gDossier,$ledger,$obj->det->jr_grpt_id,h( $obj->det->jr_pj_name)); - echo $h; $x=sprintf('enlever', $gDossier,$div,$jr_id); echo $x; + $filename= $obj->det->jr_pj_name; + if ( strlen($obj->det->jr_pj_name) > 20 ) { + $filename=substr($obj->det->jr_pj_name,1,20); + } + $h=sprintf('%s', + $gDossier,$ledger,$obj->det->jr_grpt_id,h($filename)); + echo $h; echo '
'; } diff --git a/html/style-color.css b/html/style-color.css index 93760c9c2..5b83f9170 100644 --- a/html/style-color.css +++ b/html/style-color.css @@ -834,7 +834,7 @@ h2.gest_name { } div.op_detail_frame { - background-color:#e4e7ed; + background-color:#e4e7ed; height:100%; width:100%; @@ -852,7 +852,7 @@ position:absolute; left:10%; -border:1px solid darkblue; width:300; +border:1px solid darkblue; } div.op_detail_title { diff --git a/html/style-print.css b/html/style-print.css index 9d8e74df6..faa1f7fb6 100644 --- a/html/style-print.css +++ b/html/style-print.css @@ -230,4 +230,5 @@ a.detail:hover { display:none; } + /* */ diff --git a/include/template/ledger_detail_bottom.php b/include/template/ledger_detail_bottom.php index 13d9ba8fe..0c53385ae 100644 --- a/include/template/ledger_detail_bottom.php +++ b/include/template/ledger_detail_bottom.php @@ -45,7 +45,9 @@ if ( $access=='W') { +
label="Fermer"; diff --git a/include/template/ledger_detail_file.php b/include/template/ledger_detail_file.php index c9ca9644d..e7e9c6c10 100644 --- a/include/template/ledger_detail_file.php +++ b/include/template/ledger_detail_file.php @@ -6,4 +6,6 @@ */ $str='?'.dossier::get()."&div=$div&act=file&jr_id=$jr_id"; ?> - \ No newline at end of file +
+ +
\ No newline at end of file diff --git a/include/template/ledger_detail_fin.php b/include/template/ledger_detail_fin.php index 46fb11a91..46d286afb 100644 --- a/include/template/ledger_detail_fin.php +++ b/include/template/ledger_detail_fin.php @@ -1,5 +1,5 @@ -
+
diff --git a/include/template/ledger_detail_top.php b/include/template/ledger_detail_top.php index 1c4c86a24..e86f1d832 100644 --- a/include/template/ledger_detail_top.php +++ b/include/template/ledger_detail_top.php @@ -3,7 +3,7 @@ if ($div != "popup") { $callback=$_SERVER['PHP_SELF']; $str=$_SERVER['QUERY_STRING']."&act=$action&ajax=$callback"; - echo ' + echo ' !pop me up ! '; echo 'Fermer'; }