From 875071214e66b726055b2679b3928898ea582e0b Mon Sep 17 00:00:00 2001 From: Dany De Bontridder Date: Tue, 30 Jul 2019 21:52:49 +0200 Subject: [PATCH 01/29] javascript Add new function json_response --- include/lib/function_javascript.php | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/include/lib/function_javascript.php b/include/lib/function_javascript.php index 0db0317e2..12dbbde1c 100644 --- a/include/lib/function_javascript.php +++ b/include/lib/function_javascript.php @@ -2784,4 +2784,16 @@ function load_all_script() } +/** + * Send header and json object + * @param array $p_answer this array will be converted to json object + * @see json_encode + */ +function json_response($p_answer) +{ + header("Content-type: text/json; charset: utf8", true); + echo json_encode($p_answer, + JSON_UNESCAPED_UNICODE|JSON_UNESCAPED_SLASHES|JSON_NUMERIC_CHECK); +} + ?> From 71c26d81be0b50e8e93c14e7d18f3e2b4df72c83 Mon Sep 17 00:00:00 2001 From: Dany De Bontridder Date: Tue, 30 Jul 2019 22:27:55 +0200 Subject: [PATCH 02/29] #0001729: Preference : ne plus recharger la page --- html/ajax_misc.php | 12 +++-- html/do.php | 36 ------------- html/js/scripts.js | 28 +++++++++- html/user_login.php | 23 -------- include/ajax/ajax_preference.php | 93 ++++++++++++++++++++++++++------ include/lib/ac_common.php | 2 +- 6 files changed, 115 insertions(+), 79 deletions(-) diff --git a/html/ajax_misc.php b/html/ajax_misc.php index 39371f252..928713e65 100644 --- a/html/ajax_misc.php +++ b/html/ajax_misc.php @@ -51,7 +51,7 @@ $http=new HttpInput(); mb_internal_encoding("UTF-8"); -$var = array('gDossier', 'op'); +$var = array( 'op'); $cont = 0; /* check if mandatory parameters are given */ foreach ($var as $v) @@ -62,8 +62,14 @@ foreach ($var as $v) $cont = 1; } } -if ($cont != 0) - exit(); + +// If not connected to a folder +if ( ! isset($_REQUEST['gDossier'])) { + $gDossier=0; +} + +if ($cont != 0) exit(); + extract($_REQUEST, EXTR_SKIP ); if ( isset($div)) ajax_disconnected($div); global $g_user, $cn, $g_parameter; diff --git a/html/do.php b/html/do.php index 715dcf87f..fa90b492c 100644 --- a/html/do.php +++ b/html/do.php @@ -68,42 +68,6 @@ if ( ! $cn->exist_table('version')) { return; } -/* - * Set the user preference - */ -if ( isset ($_POST['set_preference'])) { - //// Save value - $style_user=$http->post("style_user","string","Classique"); - $lang=$http->post("lang","string","fr_FR.utf8"); - $p_size=$http->post("p_size","number",50); - $pass_1=$http->post("pass_1","string",""); - $pass_2=$http->post("pass_2","string",""); - $p_email=$http->post("p_email","string",""); - $minirap=$http->post("minirap","number",0); - $period=$http->post("period","number"); - $csv_fieldsep=$http->post("csv_fieldsep","number"); - $csv_decimal=$http->post("csv_decimal","number"); - $csv_encoding=$http->post("csv_encoding"); - - if (strlen(trim($pass_1)) != 0 && strlen(trim($pass_2)) != 0) - { - $g_user->save_password($pass_1,$pass_2); - - } - $g_user->set_periode($period); - $g_user->save_global_preference('THEME', $style_user); - $g_user->save_global_preference('LANG', $lang); - $g_user->save_global_preference('PAGESIZE', $p_size); - $g_user->save_global_preference('csv_fieldsep', $csv_fieldsep); - $g_user->save_global_preference('csv_decimal', $csv_decimal); - $g_user->save_global_preference('csv_encoding', $csv_encoding); - - $g_user->set_mini_report($minirap); - $_SESSION['g_theme']=$style_user; - $_SESSION['g_pagesize']=$p_size; - $_SESSION['g_lang']=$lang; - $g_user->save_email($p_email); -} $style_user=$http->post("style_user","string",$_SESSION['g_theme']); html_page_start($style_user); diff --git a/html/js/scripts.js b/html/js/scripts.js index ec64b844a..140305d9a 100644 --- a/html/js/scripts.js +++ b/html/js/scripts.js @@ -3542,4 +3542,30 @@ function toggle_lock(p_domid) } -} \ No newline at end of file +} + +/*** + * Update Preference, applied the new CSS + */ +function updatePreference() +{ + try { + waiting_box(); + var param=$('preference_frm').serialize()+"&op=preference&action=save"; + + new Ajax.Request("ajax_misc.php",{ + method:"post", + parameters:param, + onSuccess:function (req) { + var style=req.responseText.evalJSON(); + $('pagestyle').setAttribute('href',style.style); + removeDiv('preference_div'); + } + }); + } catch (e) + { + smoke.alert(content[48] + e.message); + } + remove_waiting_box(); + +} diff --git a/html/user_login.php b/html/user_login.php index d1f037656..cd40014b5 100644 --- a/html/user_login.php +++ b/html/user_login.php @@ -114,29 +114,6 @@ include_once NOALYSS_INCLUDE."/lib/user_menu.php"; $priv=($User->admin==1)?_("Administrateur"):_("Utilisateur"); load_all_script(); -if ( isset ($_POST['set_preference'])) { - //// Save value - $pass_1=$hi->post("pass_1","string", ""); - $pass_2=$hi->post("pass_2","string", ""); - $style_user=$hi->post("style_user","string", ""); - $lang=$hi->post("lang", "string",""); - $p_email=$hi->post("email","string", ""); - if (strlen(trim($pass_1)) != 0 && strlen(trim($pass_2)) != 0) - { - $User->save_password($pass_1,$pass_2); - - } - if (trim($style_user) != "") { - $User->save_global_preference('THEME',$style_user); - $_SESSION['g_theme']=$style_user; - } - if (trim($lang) != "") { - $User->save_global_preference('LANG', $lang); - $_SESSION['g_lang']=$lang; - } - $User->load(); - $User->save_email($p_email); -} echo '
'; /** * diff --git a/include/ajax/ajax_preference.php b/include/ajax/ajax_preference.php index 07f62bf5e..02f0028d3 100644 --- a/include/ajax/ajax_preference.php +++ b/include/ajax/ajax_preference.php @@ -28,26 +28,24 @@ require_once NOALYSS_INCLUDE.'/lib/iperiod.class.php'; require_once NOALYSS_INCLUDE.'/class/acc_report.class.php'; require_once NOALYSS_INCLUDE.'/class/periode.class.php'; require_once NOALYSS_INCLUDE.'/class/exercice.class.php'; -echo HtmlInput::title_box(_('Préférence'), 'preference_div'); -echo '
'; -echo '

'; -echo _("Si vous validez, la page sera rechargée et vous pourriez perdre ce que vous faisiez"); -echo '

'; -//---------------------------------------------------------------------- -// +require_once NOALYSS_INCLUDE.'/lib/http_input.class.php'; + + global $g_user; $g_user=new User($cn); $inside_dossier = false; +$http=new HttpInput(); +$action=$http->post("action","string","display_form"); -if (isset($_REQUEST['gDossier']) && $_REQUEST['gDossier']<>0) +if (isset($_REQUEST['gDossier']) && $http->request("gDossier","number",0) != 0 ) { - $g_user->load_global_pref(); - $msg = ""; - $cn =Dossier::connect(); - $g_user->cn = $cn; - $inside_dossier = true; - $local_pref=$g_user->get_preference(); + $g_user->load_global_pref(); + $msg = ""; + $cn =Dossier::connect(); + $g_user->cn = $cn; + $inside_dossier = true; + $local_pref=$g_user->get_preference(); } ////////////////////////////////////////////////////////////////////////// // Theme @@ -62,11 +60,24 @@ if (isset($_REQUEST['gDossier']) && $_REQUEST['gDossier']<>0) from theme order by the_name"); $style->selected =$_SESSION['g_theme']; + +//---------------------------------------------------------------------------------------------- +// Display the form +//---------------------------------------------------------------------------------------------- +if ( $action == 'display_form' ) +{ + echo HtmlInput::title_box(_('Préférence'), 'preference_div'); + echo '
'; + echo '

'; + echo _("Après validation, recharger si vous changez la langue"); + echo '

'; + //---------------------------------------------------------------------- + // ?>
-
+
@@ -272,3 +283,55 @@ if (isset($_REQUEST['gDossier']) && $_REQUEST['gDossier']<>0) echo ""; ?> +post("style_user","string","Classique"); + $lang=$http->post("lang","string","fr_FR.utf8"); + $p_size=$http->post("p_size","number",50); + $pass_1=$http->post("pass_1","string",""); + $pass_2=$http->post("pass_2","string",""); + $p_email=$http->post("p_email","string",""); + $csv_fieldsep=$http->post("csv_fieldsep","number"); + $csv_decimal=$http->post("csv_decimal","number"); + $csv_encoding=$http->post("csv_encoding"); + + if (strlen(trim($pass_1)) != 0 && strlen(trim($pass_2)) != 0) + { + $g_user->save_password($pass_1,$pass_2); + + } + if ( $inside_dossier) + { + $minirap=$http->post("minirap","number","0"); + $period=$http->post("period","number"); + $g_user->set_periode($period); + $g_user->set_mini_report($minirap); + } + $g_user->save_global_preference('THEME', $style_user); + $g_user->save_global_preference('LANG', $lang); + $g_user->save_global_preference('PAGESIZE', $p_size); + $g_user->save_global_preference('csv_fieldsep', $csv_fieldsep); + $g_user->save_global_preference('csv_decimal', $csv_decimal); + $g_user->save_global_preference('csv_encoding', $csv_encoding); + $g_user->save_email($p_email); + + $_SESSION['g_theme']=$style_user; + $_SESSION['g_pagesize']=$p_size; + $_SESSION['g_lang']=$lang; + + // find the right CSS theme + $style= $repo->get_value("select the_filestyle from theme + where the_name=$1" ,[$style_user]); + if ($style == "") + { + $style = "style-classic7.css"; + } + json_response(["style"=>$style]); + +} \ No newline at end of file diff --git a/include/lib/ac_common.php b/include/lib/ac_common.php index 86d40f44f..0b46cf6bb 100644 --- a/include/lib/ac_common.php +++ b/include/lib/ac_common.php @@ -337,7 +337,7 @@ function html_page_start($p_theme="", $p_script="", $p_script2="") $title - + " . $p_script2 . " "; From 817079f3348c334d3be5ac9f4f3ec0834cbef7f4 Mon Sep 17 00:00:00 2001 From: Dany De Bontridder Date: Tue, 30 Jul 2019 22:28:30 +0200 Subject: [PATCH 03/29] New message : failed --- include/lib/message_javascript.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/lib/message_javascript.php b/include/lib/message_javascript.php index bb2215d06..28f526322 100644 --- a/include/lib/message_javascript.php +++ b/include/lib/message_javascript.php @@ -76,4 +76,6 @@ content[44]=""; content[46]=""; content[47]=""; +content[48]=""; + \ No newline at end of file From 0d96019272f0889f6ea7f65bf3ec374c66c270bc Mon Sep 17 00:00:00 2001 From: Dany De Bontridder Date: Tue, 30 Jul 2019 22:28:39 +0200 Subject: [PATCH 04/29] Documentation --- include/class/user.class.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/class/user.class.php b/include/class/user.class.php index 5b066779a..3b9ba18fc 100644 --- a/include/class/user.class.php +++ b/include/class/user.class.php @@ -483,9 +483,9 @@ class User return $fr_id; } - /**\brief set the mini rapport to display on the welcome page + /** + * \brief set the mini rapport to display on the welcome page */ - function set_mini_report($p_id) { $count = $this->db->get_value("select count(*) from user_local_pref where user_id=$1 and parameter_type=$2", array($this->id, 'MINIREPORT')); From 550e74dee083115be4b5ac04e723218491497fc4 Mon Sep 17 00:00:00 2001 From: Dany De Bontridder Date: Tue, 30 Jul 2019 23:19:03 +0200 Subject: [PATCH 05/29] #1316: Notes tableau de bord - pas de limite ou choix. --- html/js/todo_list.js | 11 +++++++++-- include/ajax/ajax_todo_list.php | 10 +++++----- include/class/todo_list.class.php | 2 +- 3 files changed, 15 insertions(+), 8 deletions(-) diff --git a/html/js/todo_list.js b/html/js/todo_list.js index 09510c42f..7c1292fd0 100644 --- a/html/js/todo_list.js +++ b/html/js/todo_list.js @@ -69,6 +69,7 @@ function todo_list_show(p_id) remove_waiting_node(); content.evalScripts(); Effect.SlideDown(todo_div, {duration: 0.1, direction: 'top-left'}) + document.getElementById('todo_form_'+p_id)['p_desc'].scrollTop=0; } catch (e) { @@ -110,15 +111,21 @@ function todo_list_remove(p_ctl) return false; }); } +/** + * Save the content of a todo note + * @param {type} p_form the form containing date, test , ... + * + */ function todo_list_save(p_form) { try { var form=$('todo_form_'+p_form); var json=form.serialize(true); + document.getElementById('todo_form_'+p_form)['p_desc'].scrollTop=0; json['op']="todo_list"; new Ajax.Request('ajax_misc.php', { - method:'get', + method:'post', parameters:json, onSuccess:function (req) { // On success : reload the correct row and close @@ -131,7 +138,7 @@ function todo_list_save(p_form) if (tl_id.length == 0) { var rec = req.responseText; - alert_box('erreur :' + rec); + alert_box(content[48] + rec); } if ( getNodeText(tl_id[0]) == '0') { smoke.alert('Note est vide'); diff --git a/include/ajax/ajax_todo_list.php b/include/ajax/ajax_todo_list.php index 430014b9a..7e11a267e 100644 --- a/include/ajax/ajax_todo_list.php +++ b/include/ajax/ajax_todo_list.php @@ -97,7 +97,7 @@ if ($ac == 'save') $cn=Dossier::connect(); $todo=new Todo_List($cn); - $id=$http->get("id","string", 0); + $id=$http->post("id","string", 0); $todo->set_parameter("id",$id); if ($id <> 0 ) { $todo->load(); } else @@ -105,10 +105,10 @@ if ($ac == 'save') $todo->set_parameter("owner", $_SESSION['g_user']); } - $todo->set_parameter("date",$http->get("p_date_todo","string", "")); - $todo->set_parameter("title", $http->get("p_title","string", "")); - $todo->set_parameter("desc", $http->get("p_desc","string", "")); - $todo->set_is_public($http->get("p_public", "string","N")); + $todo->set_parameter("date",$http->post("p_date_todo","string", "")); + $todo->set_parameter("title", $http->post("p_title","string", "")); + $todo->set_parameter("desc", $http->post("p_desc","string", "")); + $todo->set_is_public($http->post("p_public", "string","N")); ob_start(); if ( $todo->get_parameter('owner') == $_SESSION['g_user'] ) $todo->save(); diff --git a/include/class/todo_list.class.php b/include/class/todo_list.class.php index 112f3a1fc..ea3b1dc07 100644 --- a/include/class/todo_list.class.php +++ b/include/class/todo_list.class.php @@ -88,7 +88,7 @@ class Todo_List } if ( strcmp ($p_idx, 'tl_desc') == 0 ) { - $p_value=mb_substr($p_value,0,400) ; + $p_value=mb_substr($p_value,0,1000) ; return true; } return true; From 7275c9b5bb4562fb403c001388a3735eca1a4b56 Mon Sep 17 00:00:00 2001 From: Dany De Bontridder Date: Wed, 31 Jul 2019 00:38:54 +0200 Subject: [PATCH 06/29] remove background color --- html/style-light.css | 1 - 1 file changed, 1 deletion(-) diff --git a/html/style-light.css b/html/style-light.css index a7b2e4025..0b237d6ac 100644 --- a/html/style-light.css +++ b/html/style-light.css @@ -30,7 +30,6 @@ BODY { color:#0000FF; font-size:0.9em; font-size:0.95rem; - background-color: rgb(237, 243, 255) } .notice { color:#FF0000; From b20c6e7c65cd8f9402b27cda3d4de35c9f92c32c Mon Sep 17 00:00:00 2001 From: Dany De Bontridder Date: Tue, 6 Aug 2019 00:15:28 +0200 Subject: [PATCH 07/29] Add demo for fontello --- html/image/fontello/css/animation.css | 85 ++++ html/image/fontello/css/fontello-codes.css | 96 ++++ html/image/fontello/css/fontello-embedded.css | 149 ++++++ .../image/fontello/css/fontello-ie7-codes.css | 96 ++++ html/image/fontello/css/fontello-ie7.css | 107 +++++ html/image/fontello/css/fontello.css | 152 ++++++ html/image/fontello/demo.html | 446 ++++++++++++++++++ 7 files changed, 1131 insertions(+) create mode 100644 html/image/fontello/css/animation.css create mode 100644 html/image/fontello/css/fontello-codes.css create mode 100644 html/image/fontello/css/fontello-embedded.css create mode 100644 html/image/fontello/css/fontello-ie7-codes.css create mode 100644 html/image/fontello/css/fontello-ie7.css create mode 100644 html/image/fontello/css/fontello.css create mode 100644 html/image/fontello/demo.html diff --git a/html/image/fontello/css/animation.css b/html/image/fontello/css/animation.css new file mode 100644 index 000000000..ac5a9562f --- /dev/null +++ b/html/image/fontello/css/animation.css @@ -0,0 +1,85 @@ +/* + Animation example, for spinners +*/ +.animate-spin { + -moz-animation: spin 2s infinite linear; + -o-animation: spin 2s infinite linear; + -webkit-animation: spin 2s infinite linear; + animation: spin 2s infinite linear; + display: inline-block; +} +@-moz-keyframes spin { + 0% { + -moz-transform: rotate(0deg); + -o-transform: rotate(0deg); + -webkit-transform: rotate(0deg); + transform: rotate(0deg); + } + + 100% { + -moz-transform: rotate(359deg); + -o-transform: rotate(359deg); + -webkit-transform: rotate(359deg); + transform: rotate(359deg); + } +} +@-webkit-keyframes spin { + 0% { + -moz-transform: rotate(0deg); + -o-transform: rotate(0deg); + -webkit-transform: rotate(0deg); + transform: rotate(0deg); + } + + 100% { + -moz-transform: rotate(359deg); + -o-transform: rotate(359deg); + -webkit-transform: rotate(359deg); + transform: rotate(359deg); + } +} +@-o-keyframes spin { + 0% { + -moz-transform: rotate(0deg); + -o-transform: rotate(0deg); + -webkit-transform: rotate(0deg); + transform: rotate(0deg); + } + + 100% { + -moz-transform: rotate(359deg); + -o-transform: rotate(359deg); + -webkit-transform: rotate(359deg); + transform: rotate(359deg); + } +} +@-ms-keyframes spin { + 0% { + -moz-transform: rotate(0deg); + -o-transform: rotate(0deg); + -webkit-transform: rotate(0deg); + transform: rotate(0deg); + } + + 100% { + -moz-transform: rotate(359deg); + -o-transform: rotate(359deg); + -webkit-transform: rotate(359deg); + transform: rotate(359deg); + } +} +@keyframes spin { + 0% { + -moz-transform: rotate(0deg); + -o-transform: rotate(0deg); + -webkit-transform: rotate(0deg); + transform: rotate(0deg); + } + + 100% { + -moz-transform: rotate(359deg); + -o-transform: rotate(359deg); + -webkit-transform: rotate(359deg); + transform: rotate(359deg); + } +} diff --git a/html/image/fontello/css/fontello-codes.css b/html/image/fontello/css/fontello-codes.css new file mode 100644 index 000000000..6a7d1c952 --- /dev/null +++ b/html/image/fontello/css/fontello-codes.css @@ -0,0 +1,96 @@ + +.icon-logout:before { content: '\e800'; } /* '' */ +.icon-cancel-circled:before { content: '\e801'; } /* '' */ +.icon-cancel-circled2:before { content: '\e802'; } /* '' */ +.icon-eye:before { content: '\e803'; } /* '' */ +.icon-upload:before { content: '\e804'; } /* '' */ +.icon-download:before { content: '\e805'; } /* '' */ +.icon-attention:before { content: '\e806'; } /* '' */ +.icon-search:before { content: '\e807'; } /* '' */ +.icon-mail:before { content: '\e808'; } /* '' */ +.icon-anchor:before { content: '\e809'; } /* '' */ +.icon-resize-full-alt:before { content: '\e80a'; } /* '' */ +.icon-tag:before { content: '\e80b'; } /* '' */ +.icon-cw:before { content: '\e80c'; } /* '' */ +.icon-edit:before { content: '\e80d'; } /* '' */ +.icon-attention-circled:before { content: '\e80e'; } /* '' */ +.icon-trash-empty:before { content: '\e80f'; } /* '' */ +.icon-doc:before { content: '\e810'; } /* '' */ +.icon-calendar:before { content: '\e811'; } /* '' */ +.icon-edit-1:before { content: '\e812'; } /* '' */ +.icon-resize-full:before { content: '\e813'; } /* '' */ +.icon-up-bold:before { content: '\e814'; } /* '' */ +.icon-down-fat:before { content: '\e815'; } /* '' */ +.icon-cancel-circled2-1:before { content: '\e816'; } /* '' */ +.icon-upload-1:before { content: '\e817'; } /* '' */ +.icon-exclamation:before { content: '\e818'; } /* '' */ +.icon-down-open-1:before { content: '\e819'; } /* '' */ +.icon-up-open-1:before { content: '\e81a'; } /* '' */ +.icon-left-open-1:before { content: '\e81b'; } /* '' */ +.icon-right-open-1:before { content: '\e81c'; } /* '' */ +.icon-arrows-cw:before { content: '\e81d'; } /* '' */ +.icon-down-dir:before { content: '\e81e'; } /* '' */ +.icon-up-dir:before { content: '\e81f'; } /* '' */ +.icon-cog:before { content: '\e820'; } /* '' */ +.icon-cog-alt:before { content: '\e821'; } /* '' */ +.icon-down-dir-1:before { content: '\e822'; } /* '' */ +.icon-up-dir-1:before { content: '\e823'; } /* '' */ +.icon-down-open-2:before { content: '\e824'; } /* '' */ +.icon-right-open-2:before { content: '\e825'; } /* '' */ +.icon-left-open-2:before { content: '\e826'; } /* '' */ +.icon-up-open-2:before { content: '\e827'; } /* '' */ +.icon-plus:before { content: '\e828'; } /* '' */ +.icon-compass:before { content: '\e829'; } /* '' */ +.icon-resize-full-alt-1:before { content: '\e82a'; } /* '' */ +.icon-tag-1:before { content: '\e82b'; } /* '' */ +.icon-edit-2:before { content: '\e82c'; } /* '' */ +.icon-compass-1:before { content: '\e82d'; } /* '' */ +.icon-cogs:before { content: '\e82e'; } /* '' */ +.icon-up:before { content: '\e82f'; } /* '' */ +.icon-thumbs-up:before { content: '\e830'; } /* '' */ +.icon-lock:before { content: '\e831'; } /* '' */ +.icon-lock-open:before { content: '\e832'; } /* '' */ +.icon-thumbs-down:before { content: '\e833'; } /* '' */ +.icon-bell:before { content: '\e834'; } /* '' */ +.icon-resize-small:before { content: '\e835'; } /* '' */ +.icon-resize-full-1:before { content: '\e836'; } /* '' */ +.icon-right-hand:before { content: '\e837'; } /* '' */ +.icon-left-hand:before { content: '\e838'; } /* '' */ +.icon-up-hand:before { content: '\e839'; } /* '' */ +.icon-down-hand:before { content: '\e83a'; } /* '' */ +.icon-eye-off:before { content: '\e83b'; } /* '' */ +.icon-arrows-cw-1:before { content: '\e83c'; } /* '' */ +.icon-down-open:before { content: '\f004'; } /* '' */ +.icon-up-open:before { content: '\f005'; } /* '' */ +.icon-right-open:before { content: '\f006'; } /* '' */ +.icon-left-open:before { content: '\f007'; } /* '' */ +.icon-move:before { content: '\f047'; } /* '' */ +.icon-info-circled-alt:before { content: '\f086'; } /* '' */ +.icon-link-ext:before { content: '\f08e'; } /* '' */ +.icon-comment-empty:before { content: '\f0e5'; } /* '' */ +.icon-doc-text:before { content: '\f0f6'; } /* '' */ +.icon-plus-squared:before { content: '\f0fe'; } /* '' */ +.icon-angle-circled-left:before { content: '\f137'; } /* '' */ +.icon-angle-circled-right:before { content: '\f138'; } /* '' */ +.icon-angle-circled-up:before { content: '\f139'; } /* '' */ +.icon-angle-circled-down:before { content: '\f13a'; } /* '' */ +.icon-lock-open-alt:before { content: '\f13e'; } /* '' */ +.icon-ellipsis-vert:before { content: '\f142'; } /* '' */ +.icon-sort-alt-up:before { content: '\f160'; } /* '' */ +.icon-sort-alt-down:before { content: '\f161'; } /* '' */ +.icon-bitbucket:before { content: '\f171'; } /* '' */ +.icon-linux:before { content: '\f17c'; } /* '' */ +.icon-dot-circled:before { content: '\f192'; } /* '' */ +.icon-plus-squared-alt:before { content: '\f196'; } /* '' */ +.icon-fax:before { content: '\f1ac'; } /* '' */ +.icon-sliders:before { content: '\f1de'; } /* '' */ +.icon-share:before { content: '\f1e0'; } /* '' */ +.icon-calc:before { content: '\f1ec'; } /* '' */ +.icon-bell-off-empty:before { content: '\f1f7'; } /* '' */ +.icon-toggle-off:before { content: '\f204'; } /* '' */ +.icon-toggle-on:before { content: '\f205'; } /* '' */ +.icon-safari:before { content: '\f267'; } /* '' */ +.icon-chrome:before { content: '\f268'; } /* '' */ +.icon-firefox:before { content: '\f269'; } /* '' */ +.icon-calendar-1:before { content: '\f4c5'; } /* '' */ +.icon-search-1:before { content: '\f50d'; } /* '' */ \ No newline at end of file diff --git a/html/image/fontello/css/fontello-embedded.css b/html/image/fontello/css/fontello-embedded.css new file mode 100644 index 000000000..2e1ba7bc0 --- /dev/null +++ b/html/image/fontello/css/fontello-embedded.css @@ -0,0 +1,149 @@ +@font-face { + font-family: 'fontello'; + src: url('../font/fontello.eot?30012397'); + src: url('../font/fontello.eot?30012397#iefix') format('embedded-opentype'), + url('../font/fontello.svg?30012397#fontello') format('svg'); + font-weight: normal; + font-style: normal; +} +@font-face { + font-family: 'fontello'; + src: url('data:application/octet-stream;base64,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') format('woff'), + url('data:application/octet-stream;base64,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LTEMcmlnaHQtb3Blbi0xCWFycm93cy1jdwhkb3duLWRpcgZ1cC1kaXIDY29nB2NvZy1hbHQKZG93bi1kaXItMQh1cC1kaXItMQtkb3duLW9wZW4tMgxyaWdodC1vcGVuLTILbGVmdC1vcGVuLTIJdXAtb3Blbi0yBHBsdXMHY29tcGFzcxFyZXNpemUtZnVsbC1hbHQtMQV0YWctMQZlZGl0LTIJY29tcGFzcy0xBGNvZ3MCdXAJdGh1bWJzLXVwBGxvY2sJbG9jay1vcGVuC3RodW1icy1kb3duBGJlbGwMcmVzaXplLXNtYWxsDXJlc2l6ZS1mdWxsLTEKcmlnaHQtaGFuZAlsZWZ0LWhhbmQHdXAtaGFuZAlkb3duLWhhbmQHZXllLW9mZgthcnJvd3MtY3ctMQlkb3duLW9wZW4HdXAtb3BlbgpyaWdodC1vcGVuCWxlZnQtb3BlbgRtb3ZlEGluZm8tY2lyY2xlZC1hbHQIbGluay1leHQNY29tbWVudC1lbXB0eQhkb2MtdGV4dAxwbHVzLXNxdWFyZWQSYW5nbGUtY2lyY2xlZC1sZWZ0E2FuZ2xlLWNpcmNsZWQtcmlnaHQQYW5nbGUtY2lyY2xlZC11cBJhbmdsZS1jaXJjbGVkLWRvd24NbG9jay1vcGVuLWFsdA1lbGxpcHNpcy12ZXJ0C3NvcnQtYWx0LXVwDXNvcnQtYWx0LWRvd24JYml0YnVja2V0BWxpbnV4C2RvdC1jaXJjbGVkEHBsdXMtc3F1YXJlZC1hbHQDZmF4B3NsaWRlcnMFc2hhcmUEY2FsYw5iZWxsLW9mZi1lbXB0eQp0b2dnbGUtb2ZmCXRvZ2dsZS1vbgZzYWZhcmkGY2hyb21lB2ZpcmVmb3gKY2FsZW5kYXItMQhzZWFyY2gtMQAAAAAAAAEAAf//AA8AAAAAAAAAAAAAAAAAAAAAABgAGAAYABgDVP9jA1T/Y7AALCCwAFVYRVkgIEu4AA5RS7AGU1pYsDQbsChZYGYgilVYsAIlYbkIAAgAY2MjYhshIbAAWbAAQyNEsgABAENgQi2wASywIGBmLbACLCBkILDAULAEJlqyKAEKQ0VjRVJbWCEjIRuKWCCwUFBYIbBAWRsgsDhQWCGwOFlZILEBCkNFY0VhZLAoUFghsQEKQ0VjRSCwMFBYIbAwWRsgsMBQWCBm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IVktsDossAAWILAIQyAuRyNHI2EgYLAgYGawAmIgsABQWLBAYFlmsAFjIyAgPIo4LbA7LCMgLkawAiVGUlggPFkusSsBFCstsDwsIyAuRrACJUZQWCA8WS6xKwEUKy2wPSwjIC5GsAIlRlJYIDxZIyAuRrACJUZQWCA8WS6xKwEUKy2wPiywNSsjIC5GsAIlRlJYIDxZLrErARQrLbA/LLA2K4ogIDywBCNCijgjIC5GsAIlRlJYIDxZLrErARQrsARDLrArKy2wQCywABawBCWwBCYgLkcjRyNhsAlDKyMgPCAuIzixKwEUKy2wQSyxCAQlQrAAFrAEJbAEJSAuRyNHI2EgsAQjQrAJQysgsGBQWCCwQFFYswIgAyAbswImAxpZQkIjIEewBEOwAmIgsABQWLBAYFlmsAFjYCCwASsgiophILACQ2BkI7ADQ2FkUFiwAkNhG7ADQ2BZsAMlsAJiILAAUFiwQGBZZrABY2GwAiVGYTgjIDwjOBshICBGI0ewASsjYTghWbErARQrLbBCLLA1Ky6xKwEUKy2wQyywNishIyAgPLAEI0IjOLErARQrsARDLrArKy2wRCywABUgR7AAI0KyAAEBFRQTLrAxKi2wRSywABUgR7AAI0KyAAEBFRQTLrAxKi2wRiyxAAEUE7AyKi2wRyywNCotsEgssAAWRSMgLiBGiiNhOLErARQrLbBJLLAII0KwSCstsEossgAAQSstsEsssgABQSstsEwssgEAQSstsE0ssgEBQSstsE4ssgAAQistsE8ssgABQistsFAssgEAQistsFEssgEBQistsFIssgAAPistsFMssgABPistsFQssgEAPistsFUssgEBPistsFYssgAAQCstsFcssgABQCstsFgssgEAQCstsFkssgEBQCstsFossgAAQystsFsssgABQystsFwssgEAQystsF0ssgEBQystsF4ssgAAPystsF8ssgABPystsGAssgEAPystsGEssgEBPystsGIssDcrLrErARQrLbBjLLA3K7A7Ky2wZCywNyuwPCstsGUssAAWsDcrsD0rLbBmLLA4Ky6xKwEUKy2wZyywOCuwOystsGgssDgrsDwrLbBpLLA4K7A9Ky2waiywOSsusSsBFCstsGsssDkrsDsrLbBsLLA5K7A8Ky2wbSywOSuwPSstsG4ssDorLrErARQrLbBvLLA6K7A7Ky2wcCywOiuwPCstsHEssDorsD0rLbByLLMJBAIDRVghGyMhWUIrsAhlsAMkUHiwARUwLQBLuADIUlixAQGOWbABuQgACABjcLEABUKyAAEAKrEABUKzCgIBCCqxAAVCsw4AAQgqsQAGQroCwAABAAkqsQAHQroAQAABAAkqsQMARLEkAYhRWLBAiFixA2REsSYBiFFYugiAAAEEQIhjVFixAwBEWVlZWbMMAgEMKrgB/4WwBI2xAgBEAAA=') format('truetype'); +} +/* Chrome hack: SVG is rendered more smooth in Windozze. 100% magic, uncomment if you need it. */ +/* Note, that will break hinting! In other OS-es font will be not as sharp as it could be */ +/* +@media screen and (-webkit-min-device-pixel-ratio:0) { + @font-face { + font-family: 'fontello'; + src: url('../font/fontello.svg?30012397#fontello') format('svg'); + } +} +*/ + + [class^="icon-"]:before, [class*=" icon-"]:before { + font-family: "fontello"; + font-style: normal; + font-weight: normal; + speak: none; + + display: inline-block; + text-decoration: inherit; + width: 1em; + margin-right: .2em; + text-align: center; + /* opacity: .8; */ + + /* For safety - reset parent styles, that can break glyph codes*/ + font-variant: normal; + text-transform: none; + + /* fix buttons height, for twitter bootstrap */ + line-height: 1em; + + /* Animation center compensation - margins should be symmetric */ + /* remove if not needed */ + margin-left: .2em; + + /* you can be more comfortable with increased icons size */ + /* font-size: 120%; */ + + /* Uncomment for 3D effect */ + /* text-shadow: 1px 1px 1px rgba(127, 127, 127, 0.3); */ +} +.icon-logout:before { content: '\e800'; } /* '' */ +.icon-cancel-circled:before { content: '\e801'; } /* '' */ +.icon-cancel-circled2:before { content: '\e802'; } /* '' */ +.icon-eye:before { content: '\e803'; } /* '' */ +.icon-upload:before { content: '\e804'; } /* '' */ +.icon-download:before { content: '\e805'; } /* '' */ +.icon-attention:before { content: '\e806'; } /* '' */ +.icon-search:before { content: '\e807'; } /* '' */ +.icon-mail:before { content: '\e808'; } /* '' */ +.icon-anchor:before { content: '\e809'; } /* '' */ +.icon-resize-full-alt:before { content: '\e80a'; } /* '' */ +.icon-tag:before { content: '\e80b'; } /* '' */ +.icon-cw:before { content: '\e80c'; } /* '' */ +.icon-edit:before { content: '\e80d'; } /* '' */ +.icon-attention-circled:before { content: '\e80e'; } /* '' */ +.icon-trash-empty:before { content: '\e80f'; } /* '' */ +.icon-doc:before { content: '\e810'; } /* '' */ +.icon-calendar:before { content: '\e811'; } /* '' */ +.icon-edit-1:before { content: '\e812'; } /* '' */ +.icon-resize-full:before { content: '\e813'; } /* '' */ +.icon-up-bold:before { content: '\e814'; } /* '' */ +.icon-down-fat:before { content: '\e815'; } /* '' */ +.icon-cancel-circled2-1:before { content: '\e816'; } /* '' */ +.icon-upload-1:before { content: '\e817'; } /* '' */ +.icon-exclamation:before { content: '\e818'; } /* '' */ +.icon-down-open-1:before { content: '\e819'; } /* '' */ +.icon-up-open-1:before { content: '\e81a'; } /* '' */ +.icon-left-open-1:before { content: '\e81b'; } /* '' */ +.icon-right-open-1:before { content: '\e81c'; } /* '' */ +.icon-arrows-cw:before { content: '\e81d'; } /* '' */ +.icon-down-dir:before { content: '\e81e'; } /* '' */ +.icon-up-dir:before { content: '\e81f'; } /* '' */ +.icon-cog:before { content: '\e820'; } /* '' */ +.icon-cog-alt:before { content: '\e821'; } /* '' */ +.icon-down-dir-1:before { content: '\e822'; } /* '' */ +.icon-up-dir-1:before { content: '\e823'; } /* '' */ +.icon-down-open-2:before { content: '\e824'; } /* '' */ +.icon-right-open-2:before { content: '\e825'; } /* '' */ +.icon-left-open-2:before { content: '\e826'; } /* '' */ +.icon-up-open-2:before { content: '\e827'; } /* '' */ +.icon-plus:before { content: '\e828'; } /* '' */ +.icon-compass:before { content: '\e829'; } /* '' */ +.icon-resize-full-alt-1:before { content: '\e82a'; } /* '' */ +.icon-tag-1:before { content: '\e82b'; } /* '' */ +.icon-edit-2:before { content: '\e82c'; } /* '' */ +.icon-compass-1:before { content: '\e82d'; } /* '' */ +.icon-cogs:before { content: '\e82e'; } /* '' */ +.icon-up:before { content: '\e82f'; } /* '' */ +.icon-thumbs-up:before { content: '\e830'; } /* '' */ +.icon-lock:before { content: '\e831'; } /* '' */ +.icon-lock-open:before { content: '\e832'; } /* '' */ +.icon-thumbs-down:before { content: '\e833'; } /* '' */ +.icon-bell:before { content: '\e834'; } /* '' */ +.icon-resize-small:before { content: '\e835'; } /* '' */ +.icon-resize-full-1:before { content: '\e836'; } /* '' */ +.icon-right-hand:before { content: '\e837'; } /* '' */ +.icon-left-hand:before { content: '\e838'; } /* '' */ +.icon-up-hand:before { content: '\e839'; } /* '' */ +.icon-down-hand:before { content: '\e83a'; } /* '' */ +.icon-eye-off:before { content: '\e83b'; } /* '' */ +.icon-arrows-cw-1:before { content: '\e83c'; } /* '' */ +.icon-down-open:before { content: '\f004'; } /* '' */ +.icon-up-open:before { content: '\f005'; } /* '' */ +.icon-right-open:before { content: '\f006'; } /* '' */ +.icon-left-open:before { content: '\f007'; } /* '' */ +.icon-move:before { content: '\f047'; } /* '' */ +.icon-info-circled-alt:before { content: '\f086'; } /* '' */ +.icon-link-ext:before { content: '\f08e'; } /* '' */ +.icon-comment-empty:before { content: '\f0e5'; } /* '' */ +.icon-doc-text:before { content: '\f0f6'; } /* '' */ +.icon-plus-squared:before { content: '\f0fe'; } /* '' */ +.icon-angle-circled-left:before { content: '\f137'; } /* '' */ +.icon-angle-circled-right:before { content: '\f138'; } /* '' */ +.icon-angle-circled-up:before { content: '\f139'; } /* '' */ +.icon-angle-circled-down:before { content: '\f13a'; } /* '' */ +.icon-lock-open-alt:before { content: '\f13e'; } /* '' */ +.icon-ellipsis-vert:before { content: '\f142'; } /* '' */ +.icon-sort-alt-up:before { content: '\f160'; } /* '' */ +.icon-sort-alt-down:before { content: '\f161'; } /* '' */ +.icon-bitbucket:before { content: '\f171'; } /* '' */ +.icon-linux:before { content: '\f17c'; } /* '' */ +.icon-dot-circled:before { content: '\f192'; } /* '' */ +.icon-plus-squared-alt:before { content: '\f196'; } /* '' */ +.icon-fax:before { content: '\f1ac'; } /* '' */ +.icon-sliders:before { content: '\f1de'; } /* '' */ +.icon-share:before { content: '\f1e0'; } /* '' */ +.icon-calc:before { content: '\f1ec'; } /* '' */ +.icon-bell-off-empty:before { content: '\f1f7'; } /* '' */ +.icon-toggle-off:before { content: '\f204'; } /* '' */ +.icon-toggle-on:before { content: '\f205'; } /* '' */ +.icon-safari:before { content: '\f267'; } /* '' */ +.icon-chrome:before { content: '\f268'; } /* '' */ +.icon-firefox:before { content: '\f269'; } /* '' */ +.icon-calendar-1:before { content: '\f4c5'; } /* '' */ +.icon-search-1:before { content: '\f50d'; } /* '' */ \ No newline at end of file diff --git a/html/image/fontello/css/fontello-ie7-codes.css b/html/image/fontello/css/fontello-ie7-codes.css new file mode 100644 index 000000000..fc69015d4 --- /dev/null +++ b/html/image/fontello/css/fontello-ie7-codes.css @@ -0,0 +1,96 @@ + +.icon-logout { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } +.icon-cancel-circled { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } +.icon-cancel-circled2 { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } +.icon-eye { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } +.icon-upload { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } +.icon-download { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } +.icon-attention { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } +.icon-search { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } +.icon-mail { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } +.icon-anchor { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } +.icon-resize-full-alt { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } +.icon-tag { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } +.icon-cw { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } +.icon-edit { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } +.icon-attention-circled { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } +.icon-trash-empty { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } +.icon-doc { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } +.icon-calendar { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } +.icon-edit-1 { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } +.icon-resize-full { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } +.icon-up-bold { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } +.icon-down-fat { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } +.icon-cancel-circled2-1 { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } +.icon-upload-1 { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } +.icon-exclamation { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } +.icon-down-open-1 { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } +.icon-up-open-1 { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } +.icon-left-open-1 { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } +.icon-right-open-1 { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } +.icon-arrows-cw { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } +.icon-down-dir { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } +.icon-up-dir { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } +.icon-cog { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } +.icon-cog-alt { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } +.icon-down-dir-1 { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } +.icon-up-dir-1 { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } +.icon-down-open-2 { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } +.icon-right-open-2 { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } +.icon-left-open-2 { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } +.icon-up-open-2 { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } +.icon-plus { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } +.icon-compass { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } +.icon-resize-full-alt-1 { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } +.icon-tag-1 { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } +.icon-edit-2 { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } +.icon-compass-1 { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } +.icon-cogs { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } +.icon-up { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } +.icon-thumbs-up { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } +.icon-lock { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } +.icon-lock-open { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } +.icon-thumbs-down { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } +.icon-bell { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } +.icon-resize-small { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } +.icon-resize-full-1 { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } +.icon-right-hand { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } +.icon-left-hand { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } +.icon-up-hand { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } +.icon-down-hand { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } +.icon-eye-off { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } +.icon-arrows-cw-1 { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } +.icon-down-open { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } +.icon-up-open { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } +.icon-right-open { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } +.icon-left-open { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } +.icon-move { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } +.icon-info-circled-alt { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } +.icon-link-ext { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } +.icon-comment-empty { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } +.icon-doc-text { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } +.icon-plus-squared { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } +.icon-angle-circled-left { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } +.icon-angle-circled-right { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } +.icon-angle-circled-up { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } +.icon-angle-circled-down { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } +.icon-lock-open-alt { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } +.icon-ellipsis-vert { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } +.icon-sort-alt-up { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } +.icon-sort-alt-down { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } +.icon-bitbucket { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } +.icon-linux { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } +.icon-dot-circled { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } +.icon-plus-squared-alt { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } +.icon-fax { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } +.icon-sliders { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } +.icon-share { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } +.icon-calc { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } +.icon-bell-off-empty { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } +.icon-toggle-off { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } +.icon-toggle-on { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } +.icon-safari { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } +.icon-chrome { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } +.icon-firefox { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } +.icon-calendar-1 { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } +.icon-search-1 { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } \ No newline at end of file diff --git a/html/image/fontello/css/fontello-ie7.css b/html/image/fontello/css/fontello-ie7.css new file mode 100644 index 000000000..b0288864d --- /dev/null +++ b/html/image/fontello/css/fontello-ie7.css @@ -0,0 +1,107 @@ +[class^="icon-"], [class*=" icon-"] { + font-family: 'fontello'; + font-style: normal; + font-weight: normal; + + /* fix buttons height */ + line-height: 1em; + + /* you can be more comfortable with increased icons size */ + /* font-size: 120%; */ +} + +.icon-logout { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } +.icon-cancel-circled { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } +.icon-cancel-circled2 { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } +.icon-eye { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } +.icon-upload { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } +.icon-download { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } +.icon-attention { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } +.icon-search { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } +.icon-mail { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } +.icon-anchor { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } +.icon-resize-full-alt { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } +.icon-tag { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } +.icon-cw { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } +.icon-edit { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } +.icon-attention-circled { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } +.icon-trash-empty { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } +.icon-doc { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } +.icon-calendar { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } +.icon-edit-1 { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } +.icon-resize-full { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } +.icon-up-bold { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } +.icon-down-fat { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } +.icon-cancel-circled2-1 { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } +.icon-upload-1 { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } +.icon-exclamation { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } +.icon-down-open-1 { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } +.icon-up-open-1 { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } +.icon-left-open-1 { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } +.icon-right-open-1 { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } +.icon-arrows-cw { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } +.icon-down-dir { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } +.icon-up-dir { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } +.icon-cog { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } +.icon-cog-alt { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } +.icon-down-dir-1 { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } +.icon-up-dir-1 { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } +.icon-down-open-2 { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } +.icon-right-open-2 { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } +.icon-left-open-2 { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } +.icon-up-open-2 { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } +.icon-plus { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } +.icon-compass { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } +.icon-resize-full-alt-1 { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } +.icon-tag-1 { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } +.icon-edit-2 { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } +.icon-compass-1 { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } +.icon-cogs { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } +.icon-up { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } +.icon-thumbs-up { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } +.icon-lock { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } +.icon-lock-open { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } +.icon-thumbs-down { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } +.icon-bell { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } +.icon-resize-small { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } +.icon-resize-full-1 { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } +.icon-right-hand { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } +.icon-left-hand { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } +.icon-up-hand { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } +.icon-down-hand { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } +.icon-eye-off { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } +.icon-arrows-cw-1 { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } +.icon-down-open { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } +.icon-up-open { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } +.icon-right-open { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } +.icon-left-open { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } +.icon-move { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } +.icon-info-circled-alt { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } +.icon-link-ext { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } +.icon-comment-empty { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } +.icon-doc-text { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } +.icon-plus-squared { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } +.icon-angle-circled-left { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } +.icon-angle-circled-right { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } +.icon-angle-circled-up { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } +.icon-angle-circled-down { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } +.icon-lock-open-alt { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } +.icon-ellipsis-vert { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } +.icon-sort-alt-up { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } +.icon-sort-alt-down { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } +.icon-bitbucket { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } +.icon-linux { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } +.icon-dot-circled { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } +.icon-plus-squared-alt { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } +.icon-fax { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } +.icon-sliders { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } +.icon-share { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } +.icon-calc { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } +.icon-bell-off-empty { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } +.icon-toggle-off { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } +.icon-toggle-on { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } +.icon-safari { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } +.icon-chrome { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } +.icon-firefox { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } +.icon-calendar-1 { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } +.icon-search-1 { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } \ No newline at end of file diff --git a/html/image/fontello/css/fontello.css b/html/image/fontello/css/fontello.css new file mode 100644 index 000000000..8c1edd55d --- /dev/null +++ b/html/image/fontello/css/fontello.css @@ -0,0 +1,152 @@ +@font-face { + font-family: 'fontello'; + src: url('../font/fontello.eot?62647818'); + src: url('../font/fontello.eot?62647818#iefix') format('embedded-opentype'), + url('../font/fontello.woff2?62647818') format('woff2'), + url('../font/fontello.woff?62647818') format('woff'), + url('../font/fontello.ttf?62647818') format('truetype'), + url('../font/fontello.svg?62647818#fontello') format('svg'); + font-weight: normal; + font-style: normal; +} +/* Chrome hack: SVG is rendered more smooth in Windozze. 100% magic, uncomment if you need it. */ +/* Note, that will break hinting! In other OS-es font will be not as sharp as it could be */ +/* +@media screen and (-webkit-min-device-pixel-ratio:0) { + @font-face { + font-family: 'fontello'; + src: url('../font/fontello.svg?62647818#fontello') format('svg'); + } +} +*/ + + [class^="icon-"]:before, [class*=" icon-"]:before { + font-family: "fontello"; + font-style: normal; + font-weight: normal; + speak: none; + + display: inline-block; + text-decoration: inherit; + width: 1em; + margin-right: .2em; + text-align: center; + /* opacity: .8; */ + + /* For safety - reset parent styles, that can break glyph codes*/ + font-variant: normal; + text-transform: none; + + /* fix buttons height, for twitter bootstrap */ + line-height: 1em; + + /* Animation center compensation - margins should be symmetric */ + /* remove if not needed */ + margin-left: .2em; + + /* you can be more comfortable with increased icons size */ + /* font-size: 120%; */ + + /* Font smoothing. That was taken from TWBS */ + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; + + /* Uncomment for 3D effect */ + /* text-shadow: 1px 1px 1px rgba(127, 127, 127, 0.3); */ +} + +.icon-logout:before { content: '\e800'; } /* '' */ +.icon-cancel-circled:before { content: '\e801'; } /* '' */ +.icon-cancel-circled2:before { content: '\e802'; } /* '' */ +.icon-eye:before { content: '\e803'; } /* '' */ +.icon-upload:before { content: '\e804'; } /* '' */ +.icon-download:before { content: '\e805'; } /* '' */ +.icon-attention:before { content: '\e806'; } /* '' */ +.icon-search:before { content: '\e807'; } /* '' */ +.icon-mail:before { content: '\e808'; } /* '' */ +.icon-anchor:before { content: '\e809'; } /* '' */ +.icon-resize-full-alt:before { content: '\e80a'; } /* '' */ +.icon-tag:before { content: '\e80b'; } /* '' */ +.icon-cw:before { content: '\e80c'; } /* '' */ +.icon-edit:before { content: '\e80d'; } /* '' */ +.icon-attention-circled:before { content: '\e80e'; } /* '' */ +.icon-trash-empty:before { content: '\e80f'; } /* '' */ +.icon-doc:before { content: '\e810'; } /* '' */ +.icon-calendar:before { content: '\e811'; } /* '' */ +.icon-edit-1:before { content: '\e812'; } /* '' */ +.icon-resize-full:before { content: '\e813'; } /* '' */ +.icon-up-bold:before { content: '\e814'; } /* '' */ +.icon-down-fat:before { content: '\e815'; } /* '' */ +.icon-cancel-circled2-1:before { content: '\e816'; } /* '' */ +.icon-upload-1:before { content: '\e817'; } /* '' */ +.icon-exclamation:before { content: '\e818'; } /* '' */ +.icon-down-open-1:before { content: '\e819'; } /* '' */ +.icon-up-open-1:before { content: '\e81a'; } /* '' */ +.icon-left-open-1:before { content: '\e81b'; } /* '' */ +.icon-right-open-1:before { content: '\e81c'; } /* '' */ +.icon-arrows-cw:before { content: '\e81d'; } /* '' */ +.icon-down-dir:before { content: '\e81e'; } /* '' */ +.icon-up-dir:before { content: '\e81f'; } /* '' */ +.icon-cog:before { content: '\e820'; } /* '' */ +.icon-cog-alt:before { content: '\e821'; } /* '' */ +.icon-down-dir-1:before { content: '\e822'; } /* '' */ +.icon-up-dir-1:before { content: '\e823'; } /* '' */ +.icon-down-open-2:before { content: '\e824'; } /* '' */ +.icon-right-open-2:before { content: '\e825'; } /* '' */ +.icon-left-open-2:before { content: '\e826'; } /* '' */ +.icon-up-open-2:before { content: '\e827'; } /* '' */ +.icon-plus:before { content: '\e828'; } /* '' */ +.icon-compass:before { content: '\e829'; } /* '' */ +.icon-resize-full-alt-1:before { content: '\e82a'; } /* '' */ +.icon-tag-1:before { content: '\e82b'; } /* '' */ +.icon-edit-2:before { content: '\e82c'; } /* '' */ +.icon-compass-1:before { content: '\e82d'; } /* '' */ +.icon-cogs:before { content: '\e82e'; } /* '' */ +.icon-up:before { content: '\e82f'; } /* '' */ +.icon-thumbs-up:before { content: '\e830'; } /* '' */ +.icon-lock:before { content: '\e831'; } /* '' */ +.icon-lock-open:before { content: '\e832'; } /* '' */ +.icon-thumbs-down:before { content: '\e833'; } /* '' */ +.icon-bell:before { content: '\e834'; } /* '' */ +.icon-resize-small:before { content: '\e835'; } /* '' */ +.icon-resize-full-1:before { content: '\e836'; } /* '' */ +.icon-right-hand:before { content: '\e837'; } /* '' */ +.icon-left-hand:before { content: '\e838'; } /* '' */ +.icon-up-hand:before { content: '\e839'; } /* '' */ +.icon-down-hand:before { content: '\e83a'; } /* '' */ +.icon-eye-off:before { content: '\e83b'; } /* '' */ +.icon-arrows-cw-1:before { content: '\e83c'; } /* '' */ +.icon-down-open:before { content: '\f004'; } /* '' */ +.icon-up-open:before { content: '\f005'; } /* '' */ +.icon-right-open:before { content: '\f006'; } /* '' */ +.icon-left-open:before { content: '\f007'; } /* '' */ +.icon-move:before { content: '\f047'; } /* '' */ +.icon-info-circled-alt:before { content: '\f086'; } /* '' */ +.icon-link-ext:before { content: '\f08e'; } /* '' */ +.icon-comment-empty:before { content: '\f0e5'; } /* '' */ +.icon-doc-text:before { content: '\f0f6'; } /* '' */ +.icon-plus-squared:before { content: '\f0fe'; } /* '' */ +.icon-angle-circled-left:before { content: '\f137'; } /* '' */ +.icon-angle-circled-right:before { content: '\f138'; } /* '' */ +.icon-angle-circled-up:before { content: '\f139'; } /* '' */ +.icon-angle-circled-down:before { content: '\f13a'; } /* '' */ +.icon-lock-open-alt:before { content: '\f13e'; } /* '' */ +.icon-ellipsis-vert:before { content: '\f142'; } /* '' */ +.icon-sort-alt-up:before { content: '\f160'; } /* '' */ +.icon-sort-alt-down:before { content: '\f161'; } /* '' */ +.icon-bitbucket:before { content: '\f171'; } /* '' */ +.icon-linux:before { content: '\f17c'; } /* '' */ +.icon-dot-circled:before { content: '\f192'; } /* '' */ +.icon-plus-squared-alt:before { content: '\f196'; } /* '' */ +.icon-fax:before { content: '\f1ac'; } /* '' */ +.icon-sliders:before { content: '\f1de'; } /* '' */ +.icon-share:before { content: '\f1e0'; } /* '' */ +.icon-calc:before { content: '\f1ec'; } /* '' */ +.icon-bell-off-empty:before { content: '\f1f7'; } /* '' */ +.icon-toggle-off:before { content: '\f204'; } /* '' */ +.icon-toggle-on:before { content: '\f205'; } /* '' */ +.icon-safari:before { content: '\f267'; } /* '' */ +.icon-chrome:before { content: '\f268'; } /* '' */ +.icon-firefox:before { content: '\f269'; } /* '' */ +.icon-calendar-1:before { content: '\f4c5'; } /* '' */ +.icon-search-1:before { content: '\f50d'; } /* '' */ \ No newline at end of file diff --git a/html/image/fontello/demo.html b/html/image/fontello/demo.html new file mode 100644 index 000000000..9eb49bbc7 --- /dev/null +++ b/html/image/fontello/demo.html @@ -0,0 +1,446 @@ + + + + + + + + +
+

fontello font demo

+ +
+
+
+
icon-logout0xe800
+
icon-cancel-circled0xe801
+
icon-cancel-circled20xe802
+
icon-eye0xe803
+
+
+
icon-upload0xe804
+
icon-download0xe805
+
icon-attention0xe806
+
icon-search0xe807
+
+
+
icon-mail0xe808
+
icon-anchor0xe809
+
icon-resize-full-alt0xe80a
+
icon-tag0xe80b
+
+
+
icon-cw0xe80c
+
icon-edit0xe80d
+
icon-attention-circled0xe80e
+
icon-trash-empty0xe80f
+
+
+
icon-doc0xe810
+
icon-calendar0xe811
+
icon-edit-10xe812
+
icon-resize-full0xe813
+
+
+
icon-up-bold0xe814
+
icon-down-fat0xe815
+
icon-cancel-circled2-10xe816
+
icon-upload-10xe817
+
+
+
icon-exclamation0xe818
+
icon-down-open-10xe819
+
icon-up-open-10xe81a
+
icon-left-open-10xe81b
+
+
+
icon-right-open-10xe81c
+
icon-arrows-cw0xe81d
+
icon-down-dir0xe81e
+
icon-up-dir0xe81f
+
+
+
icon-cog0xe820
+
icon-cog-alt0xe821
+
icon-down-dir-10xe822
+
icon-up-dir-10xe823
+
+
+
icon-down-open-20xe824
+
icon-right-open-20xe825
+
icon-left-open-20xe826
+
icon-up-open-20xe827
+
+
+
icon-plus0xe828
+
icon-compass0xe829
+
icon-resize-full-alt-10xe82a
+
icon-tag-10xe82b
+
+
+
icon-edit-20xe82c
+
icon-compass-10xe82d
+
icon-cogs0xe82e
+
icon-up0xe82f
+
+
+
icon-thumbs-up0xe830
+
icon-lock0xe831
+
icon-lock-open0xe832
+
icon-thumbs-down0xe833
+
+
+
icon-bell0xe834
+
icon-resize-small0xe835
+
icon-resize-full-10xe836
+
icon-right-hand0xe837
+
+
+
icon-left-hand0xe838
+
icon-up-hand0xe839
+
icon-down-hand0xe83a
+
icon-eye-off0xe83b
+
+
+
icon-arrows-cw-10xe83c
+
icon-down-open0xf004
+
icon-up-open0xf005
+
icon-right-open0xf006
+
+
+
icon-left-open0xf007
+
icon-move0xf047
+
icon-info-circled-alt0xf086
+
icon-link-ext0xf08e
+
+
+
icon-comment-empty0xf0e5
+
icon-doc-text0xf0f6
+
icon-plus-squared0xf0fe
+
icon-angle-circled-left0xf137
+
+
+
icon-angle-circled-right0xf138
+
icon-angle-circled-up0xf139
+
icon-angle-circled-down0xf13a
+
icon-lock-open-alt0xf13e
+
+
+
icon-ellipsis-vert0xf142
+
icon-sort-alt-up0xf160
+
icon-sort-alt-down0xf161
+
icon-bitbucket0xf171
+
+
+
icon-linux0xf17c
+
icon-dot-circled0xf192
+
icon-plus-squared-alt0xf196
+
icon-fax0xf1ac
+
+
+
icon-sliders0xf1de
+
icon-share0xf1e0
+
icon-calc0xf1ec
+
icon-bell-off-empty0xf1f7
+
+
+
icon-toggle-off0xf204
+
icon-toggle-on0xf205
+
icon-safari0xf267
+
icon-chrome0xf268
+
+
+
icon-firefox0xf269
+
icon-calendar-10xf4c5
+
icon-search-10xf50d
+
+
+
Generated by fontello.com
+ + From 9e2b09cd0abfe9292e7e59196de10f40a9ae4995 Mon Sep 17 00:00:00 2001 From: Dany De Bontridder Date: Tue, 6 Aug 2019 21:32:16 +0200 Subject: [PATCH 08/29] Code cleaning : remove obsolete, and direct access to --- include/lib/user_menu.php | 54 +++++---------------------------------- 1 file changed, 6 insertions(+), 48 deletions(-) diff --git a/include/lib/user_menu.php b/include/lib/user_menu.php index b3dc5fa2c..6444cb3c7 100644 --- a/include/lib/user_menu.php +++ b/include/lib/user_menu.php @@ -27,52 +27,6 @@ require_once NOALYSS_INCLUDE.'/lib/idate.class.php'; require_once NOALYSS_INCLUDE.'/lib/icard.class.php'; require_once NOALYSS_INCLUDE.'/lib/ispan.class.php'; - - - -/*! - * \brief Show the menu for the card management - * - * \param $p_dossier dossier 1 - * - * - * - * \return nothing - */ -function ShowMenuFiche($p_dossier) -{ - $cn=new Database($p_dossier); - $mod="&ac=".$_REQUEST['ac']; - $str_dossier=dossier::get().$mod; - echo '
'; - echo '
'; - - echo ' - - '; - $Res=$cn->exec_sql("select fd_id,fd_label from fiche_def order by fd_label"); - $Max=Database::num_row($Res); - for ( $i=0; $i < $Max;$i++) - { - $l_line=Database::fetch_array($Res,$i); - printf(' - - ', - $l_line['fd_id'], - $str_dossier, - $l_line['fd_label'], - $l_line['fd_id'], - $str_dossier - - ); - } - echo "
- '._('Création').''._('Recherche').'
- %s - Liste -
"; - echo '
'; -} /*! MenuAdmin */ /* \brief show the menu for user/database management /* @@ -82,11 +36,14 @@ function ShowMenuFiche($p_dossier) function MenuAdmin() { $def=-1; + $http=new HttpInput(); + if (isset($_REQUEST['UID'])) $def=0; if ( isset ($_REQUEST['action'])) { - switch ($_REQUEST['action']) + $action=$http->request('action'); + switch ($action) { case 'user_mgt': $def=0; @@ -163,7 +120,8 @@ function MenuAdmin() function menu_acc_plan($p_start=1) { - $base="?ac=".$_REQUEST['ac']; + $http=new HttpInput(); + $base="?ac=".$http->request('ac'); $str_dossier="&".dossier::get(); for ($i=0;$i<10;$i++) { $class[$i]="tabs";} $class[$p_start]="tabs_selected"; From 56007e9d3dd715793af4d151bf1d9599a8a313ae Mon Sep 17 00:00:00 2001 From: Dany De Bontridder Date: Tue, 6 Aug 2019 21:55:59 +0200 Subject: [PATCH 09/29] Code cleaning : rename table mod_payment to payment_method --- include/class/acc_payment.class.php | 24 ++++++++++++------------ include/payment_middle.inc.php | 2 +- sql/upgrade.sql | 15 +++++++++++++++ 3 files changed, 28 insertions(+), 13 deletions(-) diff --git a/include/class/acc_payment.class.php b/include/class/acc_payment.class.php index 4a655aa40..5f64c3377 100644 --- a/include/class/acc_payment.class.php +++ b/include/class/acc_payment.class.php @@ -20,7 +20,7 @@ // Copyright Author Dany De Bontridder danydb@aevalys.eu /*!\file - * \brief Handle the table mod_payment + * \brief Handle the table payment_method */ require_once NOALYSS_INCLUDE.'/lib/iselect.class.php'; require_once NOALYSS_INCLUDE.'/lib/icard.class.php'; @@ -31,7 +31,7 @@ require_once NOALYSS_INCLUDE.'/class/fiche_def.class.php'; require_once NOALYSS_INCLUDE.'/constant.php'; require_once NOALYSS_INCLUDE.'/lib/http_input.class.php'; -/*!\brief Handle the table mod_payment +/*!\brief Handle the table payment_method *\note the private data member are accessed via - mp_id ==> id ( Primary key ) - mp_lib ==> lib (label) @@ -106,7 +106,7 @@ class Acc_Payment public function insert() { if ( $this->verify() != 0 ) return; - $sql='INSERT INTO mod_payment( + $sql='INSERT INTO payment_method( mp_lib, mp_jrn_def_id, mp_fd_id, mp_qcode,jrn_def_id) VALUES ($1, $2, $3, upper($4),$5) returning mp_id'; $this->mp_id=$this->cn->exec_sql($sql,array( @@ -121,7 +121,7 @@ class Acc_Payment { if ( $this->verify() != 0 ) return; - $sql="update mod_payment set mp_lib=$1,mp_qcode=$2,mp_jrn_def_id=$3,mp_fd_id=$4,jrn_def_id=$5 ". + $sql="update payment_method set mp_lib=$1,mp_qcode=$2,mp_jrn_def_id=$3,mp_fd_id=$4,jrn_def_id=$5 ". " where mp_id = $6"; $res=$this->cn->exec_sql( $sql, @@ -134,22 +134,22 @@ class Acc_Payment ); if ( strlen (trim($this->mp_jrn_def_id))==0) $this->cn->exec_sql( - 'update mod_payment '. + 'update payment_method '. 'set mp_jrn_def_id = null where mp_id=$1', array($this->mp_id)); if ( strlen (trim($this->jrn_def_id))==0) $this->cn->exec_sql( - 'update mod_payment '. + 'update payment_method '. 'set mp_jrn_def_id = null where mp_id=$1', array($this->mp_id)); if ( strlen (trim($this->mp_qcode))==0) $this->cn->exec_sql( - 'update mod_payment '. + 'update payment_method '. 'set mp_qcode = null where mp_id=$1', array($this->mp_id)); if ( strlen (trim($this->mp_fd_id))==0) $this->cn->exec_sql( - 'update mod_payment '. + 'update payment_method '. 'set mp_fd_id = null where mp_id=$1', array($this->mp_id)); @@ -157,7 +157,7 @@ class Acc_Payment public function load() { - $sql='select mp_id,mp_lib,mp_fd_id,mp_jrn_def_id,mp_qcode,jrn_def_id from mod_payment '. + $sql='select mp_id,mp_lib,mp_fd_id,mp_jrn_def_id,mp_qcode,jrn_def_id from payment_method '. ' where mp_id = $1'; $res=$this->cn->exec_sql( $sql, @@ -177,7 +177,7 @@ class Acc_Payment */ public function delete() { - $sql="delete from mod_payment where mp_id=$1"; + $sql="delete from payment_method where mp_id=$1"; $this->cn->exec_sql($sql,array($this->mp_id)); } /*!\brief retrieve all the data for all ledgers @@ -187,7 +187,7 @@ class Acc_Payment public function get_all() { $sql='select mp_id,mp_lib '. - ' from mod_payment order by mp_lib'; + ' from payment_method order by mp_lib'; $array=$this->cn->get_array($sql); $ret=array(); if ( !empty($array) ) @@ -209,7 +209,7 @@ class Acc_Payment public function get_valide() { $sql='select mp_id '. - ' from mod_payment '. + ' from payment_method '. ' where jrn_def_id=$1 and mp_jrn_def_id is not null and '. ' (mp_fd_id is not null or mp_qcode is not null)'; $array=$this->cn->get_array($sql,array($this->jrn_def_id)); diff --git a/include/payment_middle.inc.php b/include/payment_middle.inc.php index 1fadaee8f..a8db6f0a9 100644 --- a/include/payment_middle.inc.php +++ b/include/payment_middle.inc.php @@ -134,7 +134,7 @@ $array=$cn->get_array(" j2.jrn_def_name as jrn_target, fd_label, coalesce(mp_qcode,'A choisir à l''encodage') as vw_name - from mod_payment as mp + from payment_method as mp left join jrn_def as j on (j.jrn_def_id=mp.jrn_def_id) left join jrn_def as j2 on (j2.jrn_def_id=mp.mp_jrn_def_id) left join fiche_def as fd on (mp.mp_fd_id=fd.fd_id) diff --git a/sql/upgrade.sql b/sql/upgrade.sql index 2abcfb5bf..3d2788c38 100644 --- a/sql/upgrade.sql +++ b/sql/upgrade.sql @@ -1 +1,16 @@ update attr_def set ad_extra = '[sql] fd_id in (select fd_id from fiche_def where frd_id in (4,8,9,14))' where ad_id=25; + +alter table mod_payment rename to payment_method; + +alter table payment_method add column type_payment_id varchar(6); + + +comment on column payment_method.type_payment_id is 'Type of payment method'; + +create table type_payment_ref (id varchar(6 ) primary key,tp_description varchar(80) not null); + +insert into type_payment_ref (id,tp_description) values ('CACRD','Carte de crédit'), + ('CHCK','Chèque'), + ('CASH','Liquide'), + ('ELECT','Electronique'), + ('VIRT','Virement'); From ae523e6c2abed322cb3f358f691e21baf57d0bff Mon Sep 17 00:00:00 2001 From: Dany De Bontridder Date: Tue, 6 Aug 2019 22:01:25 +0200 Subject: [PATCH 10/29] SQL : add constraint for payment_method --- sql/upgrade.sql | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/sql/upgrade.sql b/sql/upgrade.sql index 3d2788c38..ea4b1317b 100644 --- a/sql/upgrade.sql +++ b/sql/upgrade.sql @@ -14,3 +14,8 @@ insert into type_payment_ref (id,tp_description) values ('CACRD','Carte de créd ('CASH','Liquide'), ('ELECT','Electronique'), ('VIRT','Virement'); +update payment_method set type_payment_id = 'VIRT'; + +alter table payment_method add constraint type_payment_ref_fk foreign key (type_payment_id) references type_payment_ref(id); + +alter table payment_method alter type_payment_id set not null; \ No newline at end of file From 052b9904b8fe5ad5f08e90a8731268a74a45e1d4 Mon Sep 17 00:00:00 2001 From: Dany De Bontridder Date: Wed, 7 Aug 2019 11:54:11 +0200 Subject: [PATCH 11/29] Task #1730 : translate javascript message --- html/js/acc_ledger.js | 18 +- html/js/accounting_item.js | 4 +- html/js/admin.js | 4 +- html/js/ajax_fiche.js | 6 +- html/js/anc_script.js | 8 +- html/js/calc.js | 2 +- html/js/card.js | 6 +- html/js/compute_direct.js | 2 +- html/js/gestion.js | 22 +- html/js/managetable.js | 6 +- html/js/modele_document.js | 2 +- html/js/scripts.js | 65 +- html/js/todo_list.js | 10 +- html/lang/en_US/LC_MESSAGES/messages.po | 429 +++++++---- html/lang/messages.po | 902 +++++++++++++++++------- html/lang/nl_NL/LC_MESSAGES/messages.po | 346 +++++++-- include/class/pre_operation.class.php | 2 +- include/database.item.php | 2 +- include/lib/function_javascript.php | 1 + include/lib/message_javascript.php | 122 ++-- 20 files changed, 1364 insertions(+), 595 deletions(-) diff --git a/html/js/acc_ledger.js b/html/js/acc_ledger.js index 3bbe15048..8ffd60952 100644 --- a/html/js/acc_ledger.js +++ b/html/js/acc_ledger.js @@ -49,7 +49,7 @@ function update_predef(p_type, p_direct, p_ac) if (a.length == 0) { var rec = req.responseText; - alert_box('erreur :' + rec); + alert_box(content[48] + rec); } var code_html = getNodeText(html[0]); code_html = unescape_xml(code_html); @@ -113,7 +113,7 @@ function update_name() */ function error_get_predef(request, json) { - alert_box("Erreur mise à jour champs non possible"); + alert_box(content[49]); } /** @@ -224,7 +224,7 @@ function success_update_bank(req) if (a.length == 0) { var rec = req.responseText; - alert_box('erreur :' + rec); + alert_box('UPDBK-'+content[48]+ rec); } var name_ctl = a[0].firstChild.nodeValue; var code_html = getNodeText(html[0]); @@ -267,7 +267,7 @@ function success_get_last_date(req) if (a.length == 0) { var rec = req.responseText; - alert_box('erreur :' + rec); + alert_box('GETLASTDA:'+content[48] + rec); } var name_ctl = a[0].firstChild.nodeValue; var code_html = getNodeText(html[0]); @@ -298,7 +298,7 @@ function success_get_pj(request, json) */ function error_get_pj(request, json) { - alert_box("Ajax a echoue"); + alert_box("GETPJ:"+content[48]); } /** @@ -644,7 +644,7 @@ function go_next_concerned() { if (elmt.checked == true) { - return confirm("Si vous changez de page vous perdez les reconciliations, continuez ?"); + return confirm(content[52]); } } } @@ -1028,13 +1028,13 @@ function success_dsp_letter(req) } catch (e) { - alert_box("Impossible executer script de la reponse\n" + e.message); + alert_box("DSPLETTER:"+content[48] + e.message); } } function error_dsp_letter(req) { - alert_box('Erreur AJAX DSP_LETTER'); + alert_box("DSPLETTER:"+content[48]); } function search_letter(obj) @@ -1254,7 +1254,7 @@ function gestion_add_row() } function document_remove(p_dossier,p_div,p_jrid) { - smoke.confirm('Effacer ?', function (e) + smoke.confirm(content[50], function (e) { if (e) { new Ajax.Request('ajax_misc.php', diff --git a/html/js/accounting_item.js b/html/js/accounting_item.js index 41f3a34ff..0ad82916a 100644 --- a/html/js/accounting_item.js +++ b/html/js/accounting_item.js @@ -226,7 +226,7 @@ function result_poste_search(req) } catch(e) { - alert_box("Impossible executer script de la reponse\n"+e.message); + alert_box("RESPOSEAR"+content[48]+e.message); } } @@ -235,7 +235,7 @@ function result_poste_search(req) */ function errorPoste() { - alert_box('Ajax failed'); + alert_box(content[53]); } function pausecomp(millis) { diff --git a/html/js/admin.js b/html/js/admin.js index 64cc823a6..f7d8359cd 100644 --- a/html/js/admin.js +++ b/html/js/admin.js @@ -78,7 +78,7 @@ function folder_display(p_user) */ function folder_remove(p_user,p_dossier ) { - smoke.confirm ('Confirmer', + smoke.confirm (content[50] , function (e) { if (e ) { waiting_box(); @@ -119,7 +119,7 @@ function folder_add(p_user, p_dossier) var html = answer.getElementsByTagName('content'); if (a.length == 0) { var rec = req.responseText; - alert_box('erreur :' + rec); + alert_box('FOLDERADD-'+content[48] + rec); } var content = getNodeText(html[0]); diff --git a/html/js/ajax_fiche.js b/html/js/ajax_fiche.js index ac6033c8b..f46d8f270 100644 --- a/html/js/ajax_fiche.js +++ b/html/js/ajax_fiche.js @@ -53,7 +53,7 @@ function clean_Fid(p_ctl) } function errorFid(request,json) { - alert_box('erreur : ajax fiche'); + alert_box('ERRFID'+content[48]); } /*!\brief this function fills the data from fid.php, * \param p_ctl object : field of the input, @@ -184,7 +184,7 @@ function successFid(request,json) } function ajax_error_saldo(request,json) { - alert_box('erreur : ajax solde '); + alert_box('ERRSAL'+content[48]); } /*!\brief this function get the saldo * \param p_ctl the ctrl where we take the quick_code @@ -246,7 +246,7 @@ function ajax_get_success(request,json) */ function ajax_get_failure(request,json) { - alert_box("Ajax do not work for ajax_get"); + alert_box(content[53]); } diff --git a/html/js/anc_script.js b/html/js/anc_script.js index 101470d1e..147644f5f 100644 --- a/html/js/anc_script.js +++ b/html/js/anc_script.js @@ -41,13 +41,13 @@ function add_row(p_table, p_seq) if (mytable.rows.length > 15) { - alert_box("Maximum 15 lignes "); + alert_box(content[55]); return; } var amount = compute_total_table(p_table, p_seq); if (max < amount) { - alert_box('Montant incorrect : max = ' + max + " calculé=" + amount); + alert_box(content[48]+' '+content[56]+ ' '+max + content[57]+' '+ amount); return; } // For the detail view (modify_op) there is several form and then several time the @@ -180,7 +180,7 @@ function verify_ca(div) } if (amount_error != 0) { - alert_box('Désolé, les montants pour la comptabilité analytique sont incorrects'); + alert_box(content[54]); return false; } return true; @@ -328,7 +328,7 @@ function caod_checkTotal() */ function anc_remove_operation(p_dossier, p_oa_group) { - smoke.confirm("Etes-vous sur de vouloir effacer cette operation ?\n", + smoke.confirm(content[50]+"\n", function (a) { if ( a) { diff --git a/html/js/calc.js b/html/js/calc.js index 90e91142a..66b49d382 100644 --- a/html/js/calc.js +++ b/html/js/calc.js @@ -61,7 +61,7 @@ function cal() } catch(exception) { - alert_box("Mauvaise formule\n"+p_variable); + alert_box(content[48]+p_variable); return false; } p_history=p_variable+"="+result.toString()+'
'+p_history; diff --git a/html/js/card.js b/html/js/card.js index 0986a8c2c..71fb7eee2 100644 --- a/html/js/card.js +++ b/html/js/card.js @@ -335,7 +335,7 @@ function result_card_search(req) } catch(e) { - alert_box("Impossible executer script de la reponse\n"+e.message); + alert_box(content[53]+"\n"+e.message); } } @@ -392,7 +392,7 @@ function clean_Fid(p_ctl) } function errorFid(request,json) { - alert_box('erreur : ajax fiche'); + alert_box(content[53]); } function update_value(text,li) { @@ -533,7 +533,7 @@ function successFill_ipopcard(req,json) } catch(e) { - alert_box("Impossible executer script de la reponse\n"+e.message); + alert_box(content[53]+"\n"+e.message); } } /** diff --git a/html/js/compute_direct.js b/html/js/compute_direct.js index 8773ace98..c4959c2b8 100644 --- a/html/js/compute_direct.js +++ b/html/js/compute_direct.js @@ -99,7 +99,7 @@ function controleBalance() { if ( checkTotalDirect() == true ) { return true;} else { - smoke.alert('Balance incorrecte D/C'); + smoke.alert(content[58]); return false; } } \ No newline at end of file diff --git a/html/js/gestion.js b/html/js/gestion.js index de1e19b61..cca8cebff 100644 --- a/html/js/gestion.js +++ b/html/js/gestion.js @@ -82,13 +82,13 @@ function successRemoveOp(request,json) { try{ var answer=request.responseText.evalJSON(true); - if ( answer.ago_id == -1 ) { alert_box ('Effacement non autorisé');return;} + if ( answer.ago_id == -1 ) { alert_box (content[59]);return;} var action="acop"+answer.ago_id; $(action).innerHTML=""; var doc="op"+answer.ago_id; $(doc).style.color="red"; - $(doc).href="javascript:alert_box('Commentaire Effacé')"; + $(doc).href="javascript:alert_box(content[60])"; $(doc).style.textDecoration="line-through"; }catch(e){ alert_box(e.message); @@ -117,12 +117,12 @@ function remove_action(p_dossier,p_id,ag_id) onSuccess:function(request,json) { try{ var answer=request.responseText.evalJSON(true); - if ( answer.act_id == -1 ) { alert_box ('Effacement non autorisé');return;} + if ( answer.act_id == -1 ) { alert_box (content[59]);return;} var action="acact"+answer.act_id; $(action).innerHTML=""; var doc="act"+answer.act_id; $(doc).style.color="red"; - $(doc).href="javascript:alert_box('Action Effacée')"; + $(doc).href="javascript:alert_box(content[60])"; $(doc).style.textDecoration="line-through"; } catch (e){ alert_box(e.message);} } @@ -159,12 +159,12 @@ function remove_comment(p_dossier,p_id) function successRemoveComment(request,json) { var answer=request.responseText.evalJSON(true); - if ( answer.agc_id == -1 ) { alert_box ('Effacement non autorisé');return;} + if ( answer.agc_id == -1 ) { alert_box (content[59]);return;} var action="accom"+answer.agc_id; $(action).innerHTML=""; var doc="com"+answer.agc_id; $(doc).style.color="red"; - $(doc).href="javascript:alert_box('Commentaire Effacé')"; + $(doc).href="javascript:alert_box(content[60])"; $(doc).style.textDecoration="line-through"; } @@ -186,7 +186,7 @@ function successRemoveDoc(request,json) $(action).innerHTML=""; var doc="doc"+answer.d_id; $(doc).style.color="red"; - $(doc).href="javascript:alert_box('Document Effacé')"; + $(doc).href="javascript:alert_box(content[60])"; $(doc).style.textDecoration="line-through"; $('desc'+answer.d_id).innerHTML=""; @@ -202,7 +202,7 @@ function check_hour(p_ctl) var h=document.getElementById(p_ctl); var re = /^\d{1,2}:\d{2}$/; if ( trim(h.value) !='' && ! h.value.match(re)) - alert_box("Format de l'heure est HH:MM ") + alert_box("HH:MM ") } catch (erreur) { @@ -218,7 +218,7 @@ function check_hour(p_ctl) function removeStock(s_id,p_dossier) { - smoke.confirm("Confirmez-vous l'effacement de cette entrée dans le stock?", + smoke.confirm(content[50], function (a) { if (a) { @@ -244,7 +244,7 @@ function removeStock(s_id,p_dossier) */ function errorRemoveStock() { - alert_box('Impossible d\'effacer '); + alert_box(content[60]); } /** *@brief success when removing a document @@ -300,7 +300,7 @@ function action_show(p_dossier) function action_add(p_dossier) { try { if ( $('action_add_div')) { - alert_box('Désolé, événement en cours de création à sauver'); + alert_box(content[61]); return; } waiting_box(); diff --git a/html/js/managetable.js b/html/js/managetable.js index 9be363ace..862116614 100644 --- a/html/js/managetable.js +++ b/html/js/managetable.js @@ -168,7 +168,7 @@ var ManageTable = function (p_table_name) var ctl_row = xml.getElementsByTagName("ctl_row"); if (status.length == 0 || ctl.length == 0 || html.length == 0) { - throw "Invalid answer " + req.responseText; + throw content[53] + req.responseText; } var answer=[]; @@ -228,7 +228,7 @@ var ManageTable = function (p_table_name) } else { remove_waiting_box(); - smoke.alert("Changement impossible"); + smoke.alert(content[48]); $("dtr").update(answer['html']); } @@ -306,7 +306,7 @@ var ManageTable = function (p_table_name) $(obj.id).setStyle({position: "fixed", top: '15%', width: "auto", "margin-left": "20%"}); $(obj.id).update(x['html']); } catch (e) { - smoke.alert("ERREUR " + e.message); + smoke.alert(content[48] + e.message); } } diff --git a/html/js/modele_document.js b/html/js/modele_document.js index 31b9b2855..6bbf8d12f 100644 --- a/html/js/modele_document.js +++ b/html/js/modele_document.js @@ -84,6 +84,6 @@ function modify_document_success_box(req,json) } catch(e) { - alert_box("answer_box Impossible executer script de la reponse\n"+e.message); + alert_box(content[53]+"\n"+e.message); } } diff --git a/html/js/scripts.js b/html/js/scripts.js index 140305d9a..f10662b80 100644 --- a/html/js/scripts.js +++ b/html/js/scripts.js @@ -60,7 +60,7 @@ function infodiv(req, json) } catch (e) { - alert_box("answer_box Impossible executer script de la reponse\n" + e.message); + alert_box(content[53]+"\n" + e.message); } } @@ -70,7 +70,7 @@ function infodiv(req, json) */ function deleteRow(tb, obj) { - smoke.confirm('Confirmez effacement',function (e) + smoke.confirm(content[50],function (e) { if (e) { var td = obj.parentNode; @@ -291,13 +291,13 @@ function toggleHideShow(p_obj, p_button) if (stat === 'none') { show(p_obj); - str = str.replace(/Afficher/, 'Cacher'); + str = str.replace(/Afficher/, content[62]); g(p_button).value = str; } else { hide(p_obj); - str = str.replace(/Cacher/, 'Afficher'); + str = str.replace(/Cacher/, content[63]); g(p_button).value = str; } } @@ -394,21 +394,21 @@ function success_misc(req) } catch (e) { - alert_box("Impossible executer script de la reponse\n" + e.message); + alert_box(content[53]+"\n" + e.message); } } function loading() { - var str = '

Un instant ...

'; + var str = '

'+content[64]+'

'; str = str + 'chargement'; return str; } function ajax_misc_failure() { - alert_box('Ajax Misc failed'); + alert_box(content[53]); } /** *@brief remove a document_modele @@ -606,17 +606,7 @@ function success_set_tva_label(req) } } -/** - *@brief set loading for waiting - *@param name of ipopup - *@see showIPopup - *@deprecated - */ -function set_wait_obsolete(name) -{ - var content = name + "_content"; - $(content).innerHTML = 'Un instant...Chargement...'; -} + /** * Create a div without showing it * @param {type} obj @@ -744,7 +734,7 @@ function waiting_node() function waiting_box() { var obj = { - id: 'wait_box', html: '

Chargement

' + loading() + id: 'wait_box', html: '

'+content[65]+'

' + loading() }; var y = fixed_position(10, 250) obj.style = y + ";width:20%;margin-left:40%;"; @@ -806,7 +796,7 @@ function success_box(req, json) if (a.length === 0) { var rec = req.responseText; - alert_box('erreur :' + rec); + alert_box(content[48] + rec); } var name_ctl = a[0].firstChild.nodeValue; var code_html = getNodeText(html[0]); @@ -828,13 +818,13 @@ function success_box(req, json) } catch (e) { - alert_box("answer_box Impossible executer script de la reponse\n" + e.message); + alert_box(content[53]+"\n" + e.message); } } function error_box() { - alert_box('[error_box] ajax not implemented'); + alert_box(content[53]); } /** * show the ledger choice @@ -898,7 +888,7 @@ function show_ledger_choice(json_obj) code_html.evalScripts(); } catch (e) { - alert_box("answer_box Impossible executer script de la reponse\n" + e.message); + alert_box(content[53]+"\n" + e.message); } } @@ -1081,9 +1071,9 @@ function show_calc() shtml +="
"; shtml += ' ⨉'; shtml +="
"; - shtml += '

Calculatrice

'; - shtml += 'Calculatrice simplifiée: écrivez simplement les opérations que vous voulez puis la touche retour. exemple : 1+2+3*(1/5) '; - shtml += ' Taper une formule (ex 20*5.1) puis enter '; + shtml += '

'+content[66]+'

'; + shtml += '
'+content[68]+' '; + shtml += '
'+ content[67]+' '; var obj = {id: sid, html: shtml, drag: false, style: 'z-index:98' @@ -1147,7 +1137,7 @@ function success_display_periode(req) } catch (e) { - alert_box("success_display_periode Impossible executer script de la reponse\n" + e.message); + alert_box(content[53]+"\n" + e.message); } } @@ -1215,7 +1205,7 @@ function fill_box(req) console.error(e); console.error("log answer = "+req.responseText); } - alert_box("Impossible executer script de la reponse\n" + e.message); + alert_box(content[53]+"\n" + e.message); } @@ -1566,7 +1556,7 @@ function display_sub_menu(p_dossier,p_profile,p_dep,p_level) */ function remove_sub_menu(p_dossier,profile_menu_id) { - confirm_box(null,'Confirme ?', + confirm_box(null,content[47], function () { waiting_box(); new Ajax.Request('ajax_misc.php', @@ -2118,7 +2108,7 @@ function view_action(ag_id, dossier, modify) * @see HtmlInput::filter_table */ function filter_table(phrase, _id, colnr, start_row) { - $('info_div').innerHTML = "Un instant"; + $('info_div').innerHTML = content[65]; $('info_div').style.display = "block"; var words = $(phrase).value.toLowerCase(); var table = document.getElementById(_id); @@ -2159,7 +2149,7 @@ function filter_table(phrase, _id, colnr, start_row) { } if (tot_found == 0) { if ($('info_' + _id)) { - $('info_' + _id).innerHTML = " Aucun résultat "; + $('info_' + _id).innerHTML = content[69] } } else { if ($('info_' + _id)) { @@ -2167,6 +2157,7 @@ function filter_table(phrase, _id, colnr, start_row) { } } } + /** * @brief * Display the task late or for today in dashboard @@ -2293,7 +2284,7 @@ function show_bookmark(p_dossier) { } catch (e) { - alert_box("answer_box Impossible executer script de la reponse\n" + e.message); + alert_box(content[53]+"\n" + e.message); } } @@ -2327,7 +2318,7 @@ function save_bookmark() { } catch (e) { - alert_box("answer_box Impossible executer script de la reponse\n" + e.message); + alert_box(content[53]+"\n" + e.message); } } @@ -2359,7 +2350,7 @@ function remove_bookmark() { } catch (e) { - alert_box("answer_box Impossible executer script de la reponse\n" + e.message); + alert_box(content[53]+"\n" + e.message); } } @@ -2413,7 +2404,7 @@ function show_tag(p_dossier, p_ac, p_tag_id, p_post) } catch (e) { - alert_box("answer_box Impossible executer script de la reponse\n" + e.message); + alert_box(content[53]+"\n" + e.message); } } @@ -2533,7 +2524,7 @@ function action_tag_add(p_dossier, ag_id, t_id) */ function action_tag_remove(p_dossier, ag_id, t_id) { - confirm_box(null,'Enlevez ce tags ?',function () { + confirm_box(null,content[50],function () { try { waiting_box(); var queryString = "t_id=" + t_id + "&ag_id=" + ag_id + "&op=tag_remove&gDossier=" + p_dossier; @@ -3423,7 +3414,7 @@ function progress_bar_start(p_taskid,p_message) try { progressIdx++; // block the window - var message="Un instant svp"; + var message=content[65]; if ( p_message) { message=p_message; } diff --git a/html/js/todo_list.js b/html/js/todo_list.js index 7c1292fd0..f5fdaca5d 100644 --- a/html/js/todo_list.js +++ b/html/js/todo_list.js @@ -61,7 +61,7 @@ function todo_list_show(p_id) if (tl_id.length == 0) { var rec = req.responseText; - alert_box('erreur :' + rec); + alert_box(content[48] + rec); } var content = unescape_xml(getNodeText(tl_content[0])); todo_div.innerHTML=content; @@ -81,13 +81,13 @@ function todo_list_show(p_id) } catch (e) { - alert_box(" Envoi ajax non possible" + e.message); + alert_box(content[48] + e.message); } return false; } function todo_list_show_error(request_json) { - alert_box('failure'); + alert_box(content[48]); } function add_todo() { @@ -95,7 +95,7 @@ function add_todo() } function todo_list_remove(p_ctl) { - smoke.confirm('Effacer ?', + smoke.confirm(content[50], function (e) { if ( !e ) {return;} $("tr" + p_ctl).hide(); @@ -141,7 +141,7 @@ function todo_list_save(p_form) alert_box(content[48] + rec); } if ( getNodeText(tl_id[0]) == '0') { - smoke.alert('Note est vide'); + smoke.alert(content[49]); return; } var tr = $('tr'+p_form); diff --git a/html/lang/en_US/LC_MESSAGES/messages.po b/html/lang/en_US/LC_MESSAGES/messages.po index e6bff3b4a..c06fc68b1 100644 --- a/html/lang/en_US/LC_MESSAGES/messages.po +++ b/html/lang/en_US/LC_MESSAGES/messages.po @@ -4,13 +4,13 @@ # Dany De Bontridder # # dany, 2014. -# Dany De Bontridder , 2014, 2015, 2016, 2017, 2018. +# Dany De Bontridder , 2014, 2015, 2016, 2017, 2018, 2019. msgid "" msgstr "" "Project-Id-Version: NOALYSS 672\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-02-04 16:40+0100\n" -"PO-Revision-Date: 2018-11-20 22:30+0100\n" +"POT-Creation-Date: 2019-07-31 00:04+0200\n" +"PO-Revision-Date: 2019-08-07 11:50+0100\n" "Last-Translator: dany \n" "Language-Team: French \n" "Language: en_US\n" @@ -22,7 +22,7 @@ msgstr "" #: include/database.item.php:124 msgid " " -msgstr "C" +msgstr "" #: include/export/export_gl_pdf.php:75 msgid " Periode : " @@ -199,7 +199,7 @@ msgstr "Your version is %s" #: include/class/acc_ledger.class.php:1136 #, php-format msgid " Le poste %s appartient à fiche(s) dont : %s" -msgstr "" +msgstr "Accounting %s belong to the cards : %s" #: include/class_acc_payment.php:299 include/class_acc_payment.php:298 #: include/class/class_acc_payment.php:298 @@ -374,6 +374,7 @@ msgstr "and activity" #: include/class/anc_balance_double.class.php:356 #: include/class/anc_balance_double.class.php:357 +#: include/class/anc_balance_double.class.php:359 msgid " et le poste " msgstr "and the account" @@ -416,6 +417,7 @@ msgstr "The accounting item [" #: include/class/class_document_export.php:225 #: include/class/document_export.class.php:225 #: include/class/document_export.class.php:231 +#: include/class/document_export.class.php:232 msgid " ne peut pas convertir en PDF" msgstr "Conversion to PDF failed" @@ -800,7 +802,7 @@ msgstr "Ledger" #: html/do.php:210 html/do.php:211 html/do.php:239 html/do.php:252 #: html/do.php:254 html/do.php:251 html/do.php:288 html/do.php:300 -#: html/do.php:310 +#: html/do.php:310 html/do.php:279 msgid "Accès menu impossible" msgstr "Unauthorized access" @@ -938,6 +940,7 @@ msgstr "Folder not available" #: html/ajax_misc.php:179 html/ajax_misc.php:257 html/ajax_misc.php:262 #: html/ajax_misc.php:290 html/ajax_misc.php:382 html/ajax_misc.php:384 +#: html/ajax_misc.php:390 include/lib/message_javascript.php:90 msgid "Action non autorisée" msgstr "Unauthorized" @@ -1039,6 +1042,7 @@ msgstr "Noalyss Administrators" #: include/admin_repo.inc.php:63 include/database.item.php:130 #: html/user_login.php:160 include/admin_repo.inc.php:65 #: include/database.item.php:124 html/user_login.php:166 +#: html/user_login.php:143 msgid "Administration" msgstr "Administration" @@ -1057,6 +1061,7 @@ msgstr "Global Parameter" #: include/class/class_fiche.php:1601 include/class/class_fiche.php:1604 #: include/class/fiche.class.php:1758 include/class/fiche.class.php:1761 #: include/class/fiche.class.php:1763 include/class/fiche.class.php:1781 +#: include/class/fiche.class.php:1782 msgid "Adresse" msgstr "Address" @@ -1104,6 +1109,7 @@ msgstr "Display also the closed actions" #: include/ext/tva/class_ext_tvagen.php:114 #: include/ext/tva/ext_list_assujetti.class.php:54 #: include/ext/tva/ext_tvagen.class.php:114 +#: include/lib/message_javascript.php:94 msgid "Afficher" msgstr "Display" @@ -1540,7 +1546,6 @@ msgid "Ajoutez le menu actuel à vos favoris" msgstr "Bookmark the current menu" #: include/class/acc_ledger_fin.class.php:652 -#, fuzzy msgid "Ajoutez une pièce justificative" msgstr "Add a receipt" @@ -1626,14 +1631,13 @@ msgid "Analytique" msgstr "Analytic" #: include/class/acc_ledger_fin.class.php:636 -#, fuzzy msgid "Ancien solde" -msgstr "Balance not voided" +msgstr "Old balance" #: include/ajax_preference.php:166 include/ajax_preference.php:167 #: html/test_class.php:220 include/ajax_preference.php:174 #: include/ajax/ajax_preference.php:174 include/ajax/ajax_preference.php:253 -#: dev/test/test_class.php:216 +#: dev/test/test_class.php:216 include/ajax/ajax_preference.php:264 msgid "Anglais" msgstr "English" @@ -1770,6 +1774,10 @@ msgstr "Apply" msgid "Après le " msgstr "After" +#: include/ajax/ajax_preference.php:72 +msgid "Après validation, recharger si vous changez la langue" +msgstr "After clicking validate, you must reload if you change the language" + #: include/profile.inc.php:150 msgid "Argument" msgstr "Arguments" @@ -1918,7 +1926,7 @@ msgstr "Warning difference computed with VAT" #: include/ajax_preference.php:102 include/ajax_preference.php:103 #: include/ajax_preference.php:110 include/ajax/ajax_preference.php:110 -#: include/ajax/ajax_preference.php:115 +#: include/ajax/ajax_preference.php:115 include/ajax/ajax_preference.php:126 msgid "" "Attention cette période est fermée, vous ne pourrez rien modifier dans le " "module comptable" @@ -2014,7 +2022,7 @@ msgstr "Warning, do not change the meaning of this accounting" #: html/do.php:104 html/do.php:103 html/do.php:98 html/do.php:100 #: html/do.php:128 html/do.php:141 html/do.php:143 html/do.php:161 -#: html/do.php:185 html/do.php:197 html/do.php:207 +#: html/do.php:185 html/do.php:197 html/do.php:207 html/do.php:176 msgid "" "Attention: la version de base de donnée est supérieure à la version du " "programme, vous devriez mettre à jour" @@ -2222,7 +2230,7 @@ msgstr "No message saved" #: include/ajax_preference.php:152 include/ajax_preference.php:153 #: include/ajax_preference.php:160 include/ajax/ajax_preference.php:160 -#: include/ajax/ajax_preference.php:239 +#: include/ajax/ajax_preference.php:239 include/ajax/ajax_preference.php:250 msgid "Aucun mini rapport" msgstr "No mini-report" @@ -2265,7 +2273,7 @@ msgstr "No accounting found" #: html/do.php:219 html/do.php:224 html/do.php:252 html/do.php:265 #: html/do.php:268 html/do.php:270 html/do.php:307 html/do.php:319 -#: html/do.php:329 html/do.php:331 +#: html/do.php:329 html/do.php:331 html/do.php:300 msgid "Aucun profil utilisateur" msgstr "No user profile" @@ -2377,6 +2385,7 @@ msgstr "no data" #: include/anc_great_ledger.inc.php:47 include/anc_balance_double.inc.php:27 #: include/anc_balance_simple.inc.php:27 include/anc_great_ledger.inc.php:78 #: include/anc_history.inc.php:34 include/anc_history.inc.php:37 +#: include/anc_balance_double.inc.php:26 msgid "Aucune donnée trouvée" msgstr "No data found" @@ -2396,6 +2405,7 @@ msgstr "No card Abebooks web sites" #: include/fiche.inc.php:383 include/fiche.inc.php:386 #: include/fiche.inc.php:133 include/fiche.inc.php:387 #: include/fiche.inc.php:134 include/fiche.inc.php:388 +#: include/fiche.inc.php:395 msgid "Aucune fiche trouvée" msgstr "No record found" @@ -2774,6 +2784,10 @@ msgstr "wrong balance" msgid "Balance incorrecte " msgstr "wrong balance" +#: include/lib/message_javascript.php:89 +msgid "Balance incorrecte D/C" +msgstr "Unbalanced D/C" + #: include/fiche.inc.php:70 include/fiche.inc.php:72 include/fiche.inc.php:73 msgid "Balance non soldée" msgstr "Balance not voided" @@ -2867,7 +2881,7 @@ msgstr "Database %smod%d is accessed, disconnect first" #: html/do.php:97 html/user_login.php:66 html/do.php:96 html/do.php:91 #: html/do.php:93 html/user_login.php:67 html/do.php:121 html/do.php:134 #: html/do.php:136 html/do.php:154 html/do.php:178 html/user_login.php:69 -#: html/do.php:186 html/user_login.php:70 html/do.php:196 +#: html/do.php:186 html/user_login.php:70 html/do.php:196 html/do.php:165 msgid "Base de donnée invalide" msgstr "Invalid Database" @@ -2989,9 +3003,14 @@ msgstr "D / C " #: include/class/class_document_export.php:280 #: include/class/document_export.class.php:280 #: include/class/document_export.class.php:290 +#: include/class/document_export.class.php:291 msgid "CONVERT_GIF_PDF n'est pas installé" msgstr "CONVERT_GIF_PDF is not installed" +#: include/lib/message_javascript.php:93 +msgid "Cacher" +msgstr "Hide" + #: include/template/detail-action.php:337 #: include/template/detail-action.php:336 #: include/template/detail-action.php:351 @@ -3022,9 +3041,18 @@ msgstr "Automatic creation of the accounting" #: include/class_ibutton.php:82 include/class_ibutton.php:84 #: include/lib/class_ibutton.php:84 include/lib/ibutton.class.php:84 +#: include/lib/message_javascript.php:97 msgid "Calculatrice" msgstr "calculator" +#: include/lib/message_javascript.php:99 +msgid "" +"Calculatrice simplifiée: écrivez simplement les opérations que vous voulez " +"puis la touche retour. exemple : 1+2+3*(1/5)" +msgstr "" +"Simple calculator , simply write the operation you want , press \"enter\" ," +" example : 1+2+3*(1/5)" + #: include/profile.inc.php:356 include/profile.inc.php:358 #: include/profile.inc.php:381 include/profile.inc.php:363 msgid "Calculatrice visible" @@ -3233,6 +3261,7 @@ msgstr "This plan does not exist" #: html/ajax_misc.php:571 html/ajax_misc.php:613 html/ajax_misc.php:408 #: html/ajax_misc.php:434 html/ajax_misc.php:546 html/ajax_misc.php:548 +#: html/ajax_misc.php:554 msgid "Ce plugin n'existe pas " msgstr "No plugin" @@ -3302,7 +3331,7 @@ msgstr "This category has no email attribute" #: include/fiche.inc.php:290 include/fiche.inc.php:363 #: include/fiche.inc.php:366 include/fiche.inc.php:367 -#: include/fiche.inc.php:368 +#: include/fiche.inc.php:368 include/fiche.inc.php:375 msgid "Cette catégorie n'ayant pas de poste comptable n'a pas de balance" msgstr "This record has no valid accounting " @@ -3520,6 +3549,8 @@ msgstr "full path to postgresql" #: html/ajax_misc.php:456 include/class/pre_operation.class.php:289 #: include/class/acc_ledger.class.php:2185 #: include/class/anc_listing.class.php:76 include/class/fiche.class.php:2246 +#: html/user_login.php:158 html/ajax_misc.php:462 +#: include/class/fiche.class.php:2247 #, php-format msgid "Cherche" msgstr "Search" @@ -3565,7 +3596,7 @@ msgid "" "a-nouveaux (exercice N)" msgstr "Select the exercice ( N-1 ) to report for the Report As New" -#: html/ajax_misc.php:452 html/ajax_misc.php:454 +#: html/ajax_misc.php:452 html/ajax_misc.php:454 html/ajax_misc.php:460 msgid "Choisissez la TVA" msgstr "Select the VAT" @@ -3899,6 +3930,7 @@ msgid "Clients (C)" msgstr "Customers(c)" #: include/template/param_jrn.php:194 include/template/param_jrn.php:201 +#: include/template/param_jrn.php:203 msgid "Clients (D)" msgstr "Customers(c)" @@ -4290,7 +4322,7 @@ msgstr "Code not used" #: include/export/export_fiche_balance_csv.php:142 #: include/export/export_fiche_balance_csv.php:155 #: include/export/export_fiche_balance_csv.php:156 include/fiche.inc.php:519 -#: include/fiche.inc.php:521 +#: include/fiche.inc.php:521 include/fiche.inc.php:530 msgid "Comm" msgstr "How" @@ -4352,6 +4384,7 @@ msgstr "Start the uprade or the installation" #: include/class/acc_ledger_purchase.class.php:1835 #: include/class/print_ledger_misc.class.php:47 #: include/class/acc_ledger_fin.class.php:550 +#: include/class/acc_ledger_history_generic.class.php:684 msgid "Commentaire" msgstr "How" @@ -4488,7 +4521,7 @@ msgstr "Product with a debit result" #: include/template/param_jrn.php:41 include/template/ledger_detail_fin.php:34 #: include/template/operation_detail_fin.php:31 #: include/template/ledger_detail_fin.php:35 -#: include/compta_fin_saldo.inc.php:48 +#: include/compta_fin_saldo.inc.php:48 include/template/param_jrn.php:48 msgid "Compte en banque" msgstr "Bank account" @@ -4787,7 +4820,7 @@ msgstr "Confirm" #: include/ext/importbank/ajax.php:237 include/ext/importbank/ajax.php:238 #: include/operation_ods_confirm.inc.php:89 msgid "Confirmer" -msgstr "Confirmed" +msgstr "To confirm" #: include/template/anc_key_input.php:211 #: include/template/anc_key_input.php:212 @@ -4987,6 +5020,7 @@ msgstr "Creation template 2" #: include/ext/tools/include/anc_grandlivre_ext.class.php:127 #: include/export/export_poste_detail_pdf.php:104 #: include/ajax/ajax_display_letter.php:123 include/fiche.inc.php:580 +#: include/fiche.inc.php:589 msgid "Credit" msgstr "Credit" @@ -5153,6 +5187,9 @@ msgstr "Credit" #: include/class/fiche.class.php:1463 include/class/acc_ledger.class.php:614 #: include/class/fiche.class.php:1465 include/operation_ods_new.inc.php:85 #: include/class/fiche.class.php:1479 +#: include/class/anc_balance_double.class.php:100 +#: include/class/acc_ledger_history_generic.class.php:772 +#: include/class/fiche.class.php:1480 msgid "Crédit" msgstr "Credit" @@ -5538,6 +5575,10 @@ msgstr "In the ledger" #: include/class/anc_listing.class.php:79 #: include/class/anc_operation.class.php:297 include/class/fiche.class.php:1396 #: include/class/fiche.class.php:1471 include/lib/ac_common.php:1210 +#: include/fiche.inc.php:527 +#: include/class/acc_ledger_history_generic.class.php:680 +#: include/class/acc_ledger_history_generic.class.php:767 +#: include/class/fiche.class.php:1397 include/class/fiche.class.php:1472 msgid "Date" msgstr "Date" @@ -5883,6 +5924,7 @@ msgstr "Inavlid limit date" #: include/ext/tools/include/anc_grandlivre_ext.class.php:126 #: include/export/export_poste_detail_pdf.php:102 #: include/ajax/ajax_display_letter.php:122 include/fiche.inc.php:576 +#: include/fiche.inc.php:585 msgid "Debit" msgstr "Debit" @@ -5896,6 +5938,7 @@ msgstr "Debit / Credit" #: html/user_login.php:151 html/user_login.php:153 html/user_login.php:155 #: html/user_login.php:159 html/user_login.php:160 html/user_login.php:161 #: html/user_login.php:162 html/user_login.php:165 html/user_login.php:171 +#: html/user_login.php:148 msgid "Deconnexion" msgstr "Disconnect" @@ -5944,7 +5987,7 @@ msgid "Dernier numéro utilisé pour ce type de document" msgstr "Last receipt number for that type of document" #: include/template/param_jrn.php:102 include/template/param_jrn.php:99 -#: include/template/param_jrn.php:106 +#: include/template/param_jrn.php:106 include/template/param_jrn.php:108 msgid "Dernière pièce numérotée" msgstr "Last numbered receipt" @@ -5960,6 +6003,7 @@ msgstr "Last entries" #: html/ajax_misc.php:196 html/ajax_misc.php:274 html/ajax_misc.php:279 #: html/ajax_misc.php:307 html/ajax_misc.php:399 html/ajax_misc.php:401 +#: html/ajax_misc.php:407 msgid "Des actions dépendent de cette catégorie" msgstr "Event depends on this category" @@ -6135,6 +6179,8 @@ msgstr "Event depends on this category" #: include/class/acc_ledger_search.class.php:1105 #: include/class/anc_listing.class.php:83 include/class/fiche.class.php:1397 #: include/class/fiche.class.php:1476 include/lib/ac_common.php:1213 +#: include/template/param_jrn.php:85 include/class/fiche.class.php:1398 +#: include/class/fiche.class.php:1477 msgid "Description" msgstr "Description" @@ -6484,6 +6530,10 @@ msgstr "" msgid "Donnée invalide" msgstr "Invalid data" +#: include/lib/message_javascript.php:91 +msgid "Donnée manquante ou déjà supprimée" +msgstr "Missing data or already suppressed" + #: include/class_fiche_def.php:767 include/class_fiche_def.php:748 #: include/class_fiche_def.php:754 include/class_fiche_def.php:766 #: include/class_fiche_def.php:765 include/class/class_fiche_def.php:765 @@ -6592,12 +6642,12 @@ msgstr "Duplicate" #: scenario/package_repository.test.php:71 msgid "Download core" -msgstr "" +msgstr "Download core" #: include/export/export_balance_pdf.php:109 -#, fuzzy, php-format +#, php-format msgid "Du %s au %s" -msgstr "Date %s to %s" +msgstr "From %s to %s" #: include/ext/import_account/include/class_impacc_tva.php:64 #: include/ext/import_account/include/class_impacc_tva.php:76 @@ -6697,6 +6747,9 @@ msgstr "Amortization term" #: include/class/acc_ledger.class.php:884 include/class/fiche.class.php:1464 #: include/operation_ods_new.inc.php:84 include/class/acc_ledger.class.php:889 #: include/class/fiche.class.php:1478 +#: include/class/anc_balance_double.class.php:99 +#: include/class/acc_ledger_history_generic.class.php:771 +#: include/class/fiche.class.php:1479 msgid "Débit" msgstr "Debit" @@ -6713,6 +6766,7 @@ msgstr "Debit or credit" #: include/class/class_fiche.php:1235 include/class/class_fiche.php:1238 #: include/class/fiche.class.php:1382 include/class/fiche.class.php:1383 #: include/class/fiche.class.php:1385 include/class/fiche.class.php:1399 +#: include/class/fiche.class.php:1400 msgid "Débit/Crédit" msgstr "Debit or credit" @@ -6958,10 +7012,14 @@ msgid "Désolé vous ne pouvez pas utiliser ce plugin , vous êtes en mode STRIC msgstr "Sorry , you are in strict mode , you cannot use this plugin" #: include/class/fiche.class.php:838 include/class/fiche.class.php:840 -#: include/class/fiche.class.php:843 +#: include/class/fiche.class.php:843 include/class/fiche.class.php:844 msgid "Désolé, il y a trop de virgule dans le poste comptable " msgstr "Sorry too many coma in the accounting" +#: include/lib/message_javascript.php:85 +msgid "Désolé, les montants pour la comptabilité analytique sont incorrects" +msgstr "Sorry amount for analytic account are incorrect" + #: include/dossier.inc.php:345 include/dossier.inc.php:301 #: include/modele.inc.php:358 include/dossier.inc.php:324 #: include/dossier.inc.php:360 include/modele.inc.php:372 @@ -6972,6 +7030,10 @@ msgstr "Sorry too many coma in the accounting" msgid "Désolé, vous n'avez pas coché la case" msgstr "Sorry the box is not checked" +#: include/lib/message_javascript.php:92 +msgid "Désolé, événement en cours de création à sauver" +msgstr "Sorry another event must be saved first" + #: include/template/ledger_detail_ach.php:112 #: include/template/ledger_detail_fin.php:96 #: include/template/ledger_detail_misc.php:81 @@ -7243,9 +7305,14 @@ msgstr "Missed deadline" msgid "Echec" msgstr "Failed" +#: include/lib/message_javascript.php:79 +msgid "Echec " +msgstr "Fail" + #: include/class/class_document_export.php:247 #: include/class/document_export.class.php:247 #: include/class/document_export.class.php:254 +#: include/class/document_export.class.php:255 msgid "Echec Ajout detail " msgstr "Add details failed" @@ -7275,6 +7342,10 @@ msgstr "Transfer failure" msgid "Echec de la restauration " msgstr "Issue when restoring" +#: include/lib/message_javascript.php:80 +msgid "Echec donnée manquante ou incorrecte" +msgstr "Fail : missing or incorrect data" + #: include/ext/importbank/include/template/show_transfer.php:125 msgid "Echec import" msgstr "Import failed" @@ -7305,6 +7376,10 @@ msgstr "Failure update" msgid "Echec ouverture fichier " msgstr "Error opening file" +#: include/lib/message_javascript.php:84 +msgid "Echec réponse" +msgstr "Response Failed" + #: include/class_acc_ledger_sold.php:1012 #: include/class_acc_ledger_sold.php:1037 #: include/class_acc_ledger_sold.php:1038 @@ -7634,7 +7709,7 @@ msgstr "Items" #: include/database.item.php:179 include/ajax/ajax_preference.php:73 #: include/database.item.php:180 include/database.item.php:183 #: include/user.inc.php:84 include/database.item.php:191 -#: include/ajax/ajax_preference.php:74 +#: include/ajax/ajax_preference.php:74 include/ajax/ajax_preference.php:85 msgid "Email" msgstr "E-mail" @@ -7742,7 +7817,7 @@ msgstr "Customer payment today" #: include/ext/import_account/include/template/test_operation.php:26 #: include/ext/import_card/include/template/test_file.php:42 #: include/ext/import_doli/include/template/test_file.php:30 -#: include/ajax/ajax_preference.php:213 +#: include/ajax/ajax_preference.php:213 include/ajax/ajax_preference.php:224 msgid "Encodage" msgstr "Encoding" @@ -7861,6 +7936,7 @@ msgstr "Between activity" #: include/class/anc_balance_double.class.php:351 #: include/class/anc_balance_double.class.php:352 +#: include/class/anc_balance_double.class.php:354 msgid "Entre le poste " msgstr "Between the account" @@ -8032,6 +8108,7 @@ msgstr "Invalid exercice" #: html/do.php:196 html/do.php:224 html/do.php:237 html/do.php:239 #: html/do.php:236 html/do.php:273 html/do.php:285 html/do.php:295 +#: html/do.php:264 msgid "Erreur menu" msgstr "Error menu" @@ -8236,7 +8313,7 @@ msgstr "Exclude State" #: include/template/periode_add_exercice.php:25 #: include/ajax/ajax_preference.php:131 include/class/periode.class.php:519 #: include/class/periode_ledger_table.class.php:100 -#: include/template/stock_inv.php:126 +#: include/template/stock_inv.php:126 include/ajax/ajax_preference.php:142 msgid "Exercice" msgstr "Exercise" @@ -8260,6 +8337,7 @@ msgstr "exercice is not a number" #: html/ajax_misc.php:197 html/ajax_misc.php:216 html/ajax_misc.php:230 #: html/ajax_misc.php:236 html/ajax_misc.php:314 html/ajax_misc.php:319 #: html/ajax_misc.php:347 html/ajax_misc.php:459 html/ajax_misc.php:461 +#: html/ajax_misc.php:467 msgid "Explication" msgstr "Explanation" @@ -8323,6 +8401,9 @@ msgstr "Export balance" #: include/class/fiche.class.php:2191 include/fiche.inc.php:297 #: include/fiche.inc.php:333 include/class/fiche.class.php:1619 #: include/class/fiche.class.php:2214 include/anc_pa.inc.php:123 +#: include/fiche.inc.php:242 include/fiche.inc.php:302 +#: include/fiche.inc.php:340 include/class/fiche.class.php:1620 +#: include/class/fiche.class.php:2215 msgid "Export CSV" msgstr "Export CSV" @@ -8421,7 +8502,8 @@ msgstr "Export Ledger" #: include/class/fiche.class.php:1584 include/class/fiche.class.php:2211 #: html/popup.php:114 include/class/fiche.class.php:1586 #: include/class/fiche.class.php:2213 include/class/fiche.class.php:1604 -#: include/class/fiche.class.php:2236 +#: include/class/fiche.class.php:2236 include/class/fiche.class.php:1605 +#: include/class/fiche.class.php:2237 msgid "Export PDF" msgstr "Export PDF" @@ -8952,6 +9034,7 @@ msgid "Fiches ayant changé de poste comptable" msgstr "The card %s has changed his accouting" #: include/template/param_jrn.php:251 include/template/param_jrn.php:258 +#: include/template/param_jrn.php:260 msgid "Fiches utilisables (D/C)" msgstr "Usable Cards (D/C)" @@ -8991,9 +9074,8 @@ msgid "Fichier non sauvé" msgstr "Card not found" #: include/lib/ac_common.php:1129 -#, fuzzy msgid "Fichier non trouvé" -msgstr "Card not found" +msgstr "File not found" #: include/ext/import_account/include/template/input_file.php:19 #: include/ext/import_account/include/template/test_file.php:20 @@ -9097,6 +9179,7 @@ msgstr "Rapid filter:" #: include/fiche.inc.php:312 include/fiche.inc.php:317 #: include/fiche.inc.php:390 include/fiche.inc.php:393 #: include/fiche.inc.php:394 include/fiche.inc.php:395 +#: include/fiche.inc.php:402 msgid "Filtre rapide:" msgstr "Rapid filter:" @@ -9167,7 +9250,7 @@ msgstr "Fin /MO" msgid "Financier" msgstr "Financial" -#: include/ajax/ajax_preference.php:169 +#: include/ajax/ajax_preference.php:169 include/ajax/ajax_preference.php:180 msgid "Format Export CSV" msgstr "Export CSV" @@ -9276,6 +9359,7 @@ msgid "Fournisseur " msgstr "Supplier" #: include/template/param_jrn.php:139 include/template/param_jrn.php:146 +#: include/template/param_jrn.php:148 msgid "Fournisseurs (C)" msgstr "Supplier (C)" @@ -9294,7 +9378,7 @@ msgstr "Supplier to pay today" #: include/ajax_preference.php:165 include/ajax_preference.php:166 #: html/test_class.php:219 include/ajax_preference.php:173 #: include/ajax/ajax_preference.php:173 include/ajax/ajax_preference.php:252 -#: dev/test/test_class.php:215 +#: dev/test/test_class.php:215 include/ajax/ajax_preference.php:263 msgid "Français" msgstr "French" @@ -9731,11 +9815,11 @@ msgstr "Histo. Change" #: include/database.item.php:5 include/database.item.php:98 #: include/ext/import-winbook/index.php:66 include/fiche.inc.php:65 msgid "Historique" -msgstr "Historical" +msgstr "History" #: include/fiche.inc.php:65 include/fiche.inc.php:66 msgid "Historique Lettré" -msgstr "Historical lettered" +msgstr "Lettered history" #: include/fiche.inc.php:66 include/fiche.inc.php:67 msgid "Historique Lettré et montants différents" @@ -9746,7 +9830,7 @@ msgstr "Lettered history and different Amounts" #: include/database.item.php:66 include/database.item.php:65 #: include/database.item.php:68 include/database.item.php:62 msgid "Historique achat" -msgstr "Historical purchase" +msgstr "Purchase history" #: include/database.item.php:65 include/database.item.php:68 #: include/database.item.php:62 include/database.item.php:60 @@ -9874,14 +9958,14 @@ msgstr "Listing History" #: include/fiche.inc.php:67 include/fiche.inc.php:68 msgid "Historique non Lettré" -msgstr "Historical not lettered" +msgstr "Not lettered history" #: include/database.item.php:61 include/database.item.php:64 #: include/database.item.php:70 include/database.item.php:68 #: include/database.item.php:67 include/database.item.php:66 #: include/database.item.php:69 include/database.item.php:63 msgid "Historique opérations diverses" -msgstr "Historical" +msgstr "History" #: include/database.item.php:16 include/database.item.php:19 #: include/database.item.php:23 include/database.item.php:22 @@ -9893,7 +9977,7 @@ msgstr "Stock History" #: include/database.item.php:111 include/database.item.php:108 #: include/database.item.php:107 include/database.item.php:103 msgid "Historique vente" -msgstr "Historical sales" +msgstr "Sales history" #: include/user_menu.php:155 include/user_menu.php:156 #: include/user_menu.php:159 include/user_menu.php:160 @@ -9967,6 +10051,7 @@ msgstr "There are %s invalid parameters" #: html/ajax_misc.php:572 html/ajax_misc.php:614 html/ajax_misc.php:409 #: html/ajax_misc.php:435 html/ajax_misc.php:547 html/ajax_misc.php:549 +#: html/ajax_misc.php:555 msgid "Il y a une erreur, ce plugin n'existe pas" msgstr "This plugin doesn't exist" @@ -9975,6 +10060,7 @@ msgstr "This plugin doesn't exist" #: include/ajax_preference.php:137 include/ajax_preference.php:139 #: include/ajax/ajax_preference.php:137 include/ajax/ajax_preference.php:139 #: include/ajax/ajax_preference.php:154 include/ajax/ajax_preference.php:156 +#: include/ajax/ajax_preference.php:165 include/ajax/ajax_preference.php:167 msgid "Illimité" msgstr "Unlimited" @@ -10114,7 +10200,7 @@ msgstr "Imported" #: include/class_fiche.php:1022 include/class/class_fiche.php:1022 #: include/class/class_fiche.php:1024 include/class/class_fiche.php:1027 #: include/class/fiche.class.php:1117 include/class/fiche.class.php:1119 -#: include/class/fiche.class.php:1133 +#: include/class/fiche.class.php:1133 include/class/fiche.class.php:1134 msgid "Impossible cette fiche est utilisée dans un journal" msgstr "Can not remove this card, it is used" @@ -10526,7 +10612,9 @@ msgstr "Internal" #: include/class/anc_grandlivre.class.php:219 #: include/class/acc_ledger_purchase.class.php:1832 #: include/class/print_ledger_misc.class.php:45 include/fiche.inc.php:520 -#: include/class/fiche.class.php:1474 +#: include/class/fiche.class.php:1474 include/fiche.inc.php:529 +#: include/class/acc_ledger_history_generic.class.php:766 +#: include/class/fiche.class.php:1475 msgid "Interne" msgstr "Internal" @@ -10539,7 +10627,7 @@ msgstr "Invalid command" msgid "Invalide" msgstr "Invalide" -#: html/ajax_misc.php:288 html/ajax_misc.php:290 +#: html/ajax_misc.php:288 html/ajax_misc.php:290 html/ajax_misc.php:296 msgid "Invalide type" msgstr "Invalide type" @@ -10648,7 +10736,7 @@ msgstr "Thursday" msgid "Journal" msgstr "Ledger" -#: include/template/param_jrn.php:125 +#: include/template/param_jrn.php:125 include/template/param_jrn.php:127 msgid "Journal actif" msgstr "Enabled ledger" @@ -10999,7 +11087,7 @@ msgstr "0 for no change" #: include/ajax_preference.php:163 include/ajax_preference.php:164 #: include/ajax_preference.php:171 include/ajax/ajax_preference.php:171 -#: include/ajax/ajax_preference.php:250 +#: include/ajax/ajax_preference.php:250 include/ajax/ajax_preference.php:261 msgid "Langue" msgstr "Language" @@ -11044,7 +11132,7 @@ msgstr "The login can not be empty" #: include/ajax_preference.php:158 include/ajax_preference.php:159 #: include/ajax_preference.php:166 include/ajax/ajax_preference.php:166 -#: include/ajax/ajax_preference.php:245 +#: include/ajax/ajax_preference.php:245 include/ajax/ajax_preference.php:256 msgid "Le mini rapport est un rapport qui s'affiche sur votre page d'accueil" msgstr "The mini-report" @@ -11069,6 +11157,7 @@ msgstr "" "faster" #: include/lib/icard.class.php:222 include/lib/icard.class.php:223 +#: include/lib/icard.class.php:224 msgid "Le nom d une icard doit être donne" msgstr "The name can not be empty" @@ -11143,9 +11232,9 @@ msgid "Le poste" msgstr "The accounting item" #: include/class/acc_ledger.class.php:1124 -#, fuzzy, php-format +#, php-format msgid "Le poste %s n'est pas dans ce journal" -msgstr "Does not belong to this ledger" +msgstr "Account %s doesn't belong to this ledger" #: include/template/param_jrn.php:94 include/lib/message_javascript.php:70 msgid "" @@ -11354,6 +11443,7 @@ msgstr "Let." #: include/export/export_fiche_balance_csv.php:161 include/fiche.inc.php:522 #: include/export/export_fiche_detail_csv.php:80 #: include/export/export_poste_detail_csv.php:91 include/fiche.inc.php:524 +#: include/fiche.inc.php:533 msgid "Let." msgstr "Let." @@ -11411,11 +11501,11 @@ msgstr "Reminder" #: include/ext/syndicat_tools/index.php:31 msgid "Liaison entre journaux et section" -msgstr "" +msgstr "Link between ledger and section" #: include/ext/syndicat_tools/index.php:33 msgid "Liaison entre section et trésorier" -msgstr "" +msgstr "Link between section and treasurer" #: include/export/export_poste_detail_csv.php:71 #: include/export/export_poste_detail_csv.php:172 @@ -11581,6 +11671,7 @@ msgstr "label" #: include/class/acc_ledger.class.php:887 #: include/class/acc_ledger_fin.class.php:754 #: include/class/anc_operation.class.php:298 +#: include/class/acc_ledger_history_generic.class.php:770 #, php-format msgid "Libellé" msgstr "Label" @@ -11797,7 +11888,7 @@ msgstr "Quarterly intra Listing" #: include/export/export_security_pdf.php:61 msgid "Local Admin" -msgstr "" +msgstr "Local admin" #: include/template/todo_list_list_user.php:37 include/user.inc.php:122 #: include/user.inc.php:123 include/param_sec.inc.php:57 @@ -11921,6 +12012,14 @@ msgstr "Bad type of object" msgid "Max. email / jour (-1 = illimité)" msgstr "Max of email / day (-1 for unlimited)" +#: include/lib/message_javascript.php:87 +msgid "Maximum" +msgstr "Maximum" + +#: include/lib/message_javascript.php:86 +msgid "Maximum 15 lignes" +msgstr "Maximum 15 rows" + #: include/anc_pa.inc.php:60 include/anc_pa.inc.php:73 #: include/anc_pa.inc.php:74 include/anc_pa.inc.php:66 #: include/anc_pa.inc.php:80 @@ -12092,11 +12191,11 @@ msgstr "Update" #: include/ajax_preference.php:149 include/ajax_preference.php:150 #: include/ajax_preference.php:157 include/ajax/ajax_preference.php:157 -#: include/ajax/ajax_preference.php:236 +#: include/ajax/ajax_preference.php:236 include/ajax/ajax_preference.php:247 msgid "Mini-Rapport : " msgstr "Mini-Report" -#: include/template/param_jrn.php:68 +#: include/template/param_jrn.php:68 include/template/param_jrn.php:75 msgid "Minimum de lignes à afficher" msgstr "Minimum rows to display" @@ -12633,7 +12732,8 @@ msgstr "Starting month does not exist" #: include/class/acc_ledger_fin.class.php:551 #: include/class/acc_ledger_fin.class.php:754 #: include/class/anc_listing.class.php:86 include/class/fiche.class.php:1398 -#: include/lib/ac_common.php:1215 +#: include/lib/ac_common.php:1215 include/fiche.inc.php:531 +#: include/class/fiche.class.php:1399 msgid "Montant" msgstr "Amount" @@ -12995,7 +13095,7 @@ msgstr "Medium" msgid "MultiModule" msgstr "MultiModule" -#: include/ajax/ajax_preference.php:174 +#: include/ajax/ajax_preference.php:174 include/ajax/ajax_preference.php:185 msgid "N'utilisez pas le même séparateur pour les champs et les décimales" msgstr "Do not use the same separator for decimal and field" @@ -13271,7 +13371,7 @@ msgstr "No action" #: include/class/acc_ledger_search.class.php:1104 #: include/class/acc_ledger_fin.class.php:549 #: include/class/acc_ledger_fin.class.php:754 -#: include/class/fiche.class.php:1780 +#: include/class/fiche.class.php:1780 include/class/fiche.class.php:1781 msgid "Nom" msgstr "Name" @@ -13435,6 +13535,7 @@ msgstr "Dealer name" #: include/export/export_fiche_detail_csv.php:74 #: include/export/export_poste_detail_csv.php:81 #: include/export/export_poste_detail_csv.php:82 +#: include/template/param_jrn.php:14 msgid "Nom journal" msgstr "Name of the ledger" @@ -13630,7 +13731,7 @@ msgstr "not authorized" #: include/upgrade-core.php:23 include/upgrade.inc.php:27 #: include/upgrade-plugin.php:25 include/upgrade-template.php:25 #: include/ajax/ajax_remove_submenu.php:27 -#: include/ajax/ajax_user_security.php:39 +#: include/ajax/ajax_user_security.php:39 html/ajax_misc.php:86 msgid "Non autorisé" msgstr "not authorized" @@ -13668,7 +13769,7 @@ msgid "Non supporté" msgstr "not supported" #: include/ext/amortis/include/class_am_card.php:245 html/fid_card.php:169 -#: html/fid_card.php:170 html/fid_card.php:175 +#: html/fid_card.php:170 html/fid_card.php:175 html/fid_card.php:174 msgid "Non trouvé" msgstr "Not found" @@ -13759,9 +13860,8 @@ msgid "Nouveau plan" msgstr "New" #: include/class/acc_ledger_fin.class.php:641 -#, fuzzy msgid "Nouveau solde" -msgstr "New" +msgstr "New balance" #: include/database.item.php:2 include/database.item.php:5 #: include/database.item.php:7 include/database.item.php:10 @@ -13978,9 +14078,8 @@ msgid "Numéro TVA" msgstr "VAT number" #: include/class/acc_ledger_fin.class.php:535 -#, fuzzy msgid "Numéro d'extrait" -msgstr "Number of Bank receipt" +msgstr "Bank receipt number" #: include/ext/transform/include/class_transform_declarant.php:173 #: include/ext/transform/include/transform_declarant.class.php:173 @@ -14066,7 +14165,7 @@ msgstr "Internal number" msgid "Numéro opération" msgstr "Operation #" -#: include/template/param_jrn.php:33 +#: include/template/param_jrn.php:33 include/template/param_jrn.php:40 msgid "Numérotation de chaque opération" msgstr "Numbering Each of operation" @@ -14082,6 +14181,7 @@ msgstr "#" #: include/export/export_ledger_csv.php:216 #: include/class/acc_ledger_history_generic.class.php:764 #: include/export/export_ledger_csv.php:210 +#: include/class/acc_ledger_history_generic.class.php:765 msgid "N° Pièce" msgstr "Receipt #" @@ -14166,14 +14266,14 @@ msgid "N° pièce" msgstr "receipt #" #: include/template/param_jrn.php:110 include/template/param_jrn.php:108 -#: include/template/param_jrn.php:115 +#: include/template/param_jrn.php:115 include/template/param_jrn.php:117 msgid "N° pièce justificative" msgstr "Receipt number" #: include/ajax_preference.php:167 include/ajax_preference.php:168 #: html/test_class.php:221 include/ajax_preference.php:175 #: include/ajax/ajax_preference.php:175 include/ajax/ajax_preference.php:254 -#: dev/test/test_class.php:217 +#: dev/test/test_class.php:217 include/ajax/ajax_preference.php:265 msgid "Néerlandais" msgstr "Dutch" @@ -14237,7 +14337,7 @@ msgid "" "Obligatoire pour les journaux FIN : donner ici la fiche de la banque utilisée" msgstr "Mandatory for FIN ledger: give here the card of the bank" -#: include/template/param_jrn.php:61 +#: include/template/param_jrn.php:61 include/template/param_jrn.php:68 msgid "" "Obligatoire pour les journaux FIN : donner ici la fiche du compte en banque " "utilisée" @@ -14265,19 +14365,19 @@ msgstr "Not possible to write in the Noalyss folder, change the rights" #: scenario/acc_ledger_historyTest.php:53 msgid "Only VEN Detailled" -msgstr "" +msgstr "Only VEN Detailled" #: scenario/acc_ledger_historyTest.php:58 msgid "Only VEN Extended" -msgstr "" +msgstr "Only VEN Detailled" #: scenario/acc_ledger_historyTest.php:44 msgid "Only VEN from Acc_Ledger_History_Sale" -msgstr "" +msgstr "Only VEN Detailled" #: scenario/acc_ledger_historyTest.php:48 msgid "Only VEN one line" -msgstr "" +msgstr "Only VEN Detailled" #: include/template/form_ledger_fin.php:45 #: include/template/form_ledger_fin.php:44 @@ -14306,6 +14406,7 @@ msgstr "Unbalanced operation" #: include/ajax_preference.php:69 include/ajax_preference.php:70 #: include/ajax/ajax_preference.php:69 include/ajax/ajax_preference.php:70 +#: include/ajax/ajax_preference.php:81 msgid "Options Générales" msgstr "General setting" @@ -14316,7 +14417,7 @@ msgstr "Invalid options" #: include/ajax_preference.php:148 include/ajax_preference.php:149 #: include/ajax_preference.php:156 include/ajax/ajax_preference.php:156 -#: include/ajax/ajax_preference.php:235 +#: include/ajax/ajax_preference.php:235 include/ajax/ajax_preference.php:246 msgid "Options pour la page d'accueil" msgstr "Option for the welcome page" @@ -14432,9 +14533,9 @@ msgid "Opération non trouvée" msgstr "operation not found" #: include/operation_ods_new.inc.php:94 -#, fuzzy, php-format +#, php-format msgid "Opération rapprochée : %s" -msgstr "Linked operation" +msgstr "Linked operation : %s" #: include/ext/importbank/ajax.php:283 msgid "Opération récupérée" @@ -14649,6 +14750,7 @@ msgstr "Accounting period" #: include/class/class_document_export.php:284 #: include/class/document_export.class.php:284 #: include/class/document_export.class.php:294 +#: include/class/document_export.class.php:295 msgid "PDF2PS non installé" msgstr "PDF2PS is not installed" @@ -14677,6 +14779,7 @@ msgstr "Receipt #" #: include/class/class_document_export.php:283 #: include/class/document_export.class.php:283 #: include/class/document_export.class.php:293 +#: include/class/document_export.class.php:294 msgid "PS2PDF non installé" msgstr "PDF2PS is not installed" @@ -15004,6 +15107,10 @@ msgstr "Na category for contact" msgid "Pas de conversion en PDF disponible" msgstr "No PDF conversion available" +#: include/class/anc_balance_double.class.php:51 +msgid "Pas de croisement avec un seul plan" +msgstr "Cannot cross data with only one axis" + #: include/ext/import_account/include/class_impacc_operation.php:38 #: include/ext/importbank/include/import_bank.php:120 #: include/ext/importbank/include/import_bank.php:133 @@ -15401,7 +15508,6 @@ msgid "Plan Analytique" msgstr "Analytical" #: include/class/anc_print.class.php:163 -#, fuzzy msgid "Plan Analytique " msgstr "Analytic Plan" @@ -15435,7 +15541,7 @@ msgstr "Analytically" msgid "Plusieurs code TVA correspondent à ce taux" msgstr "Several tax code match that rate" -#: include/ajax/ajax_preference.php:187 +#: include/ajax/ajax_preference.php:187 include/ajax/ajax_preference.php:198 msgid "Point-virgule" msgstr "semi-colon" @@ -15546,9 +15652,16 @@ msgstr "Possible %d" #: include/class/acc_ledger.class.php:881 include/class/fiche.class.php:1459 #: include/class/acc_ledger.class.php:886 #: include/class/anc_listing.class.php:80 include/class/fiche.class.php:1473 +#: include/class/acc_ledger_history_generic.class.php:768 +#: include/class/fiche.class.php:1474 msgid "Poste" msgstr "Account. Item" +#: include/class/anc_balance_double.class.php:97 +#: include/class/anc_balance_double.class.php:98 +msgid "Poste Analytique" +msgstr "Analytic Accounting" + #: include/ext/amortis/raw.php:100 include/ext/amortis/raw.php:127 msgid "Poste Charge" msgstr "Post Charge" @@ -15649,6 +15762,7 @@ msgstr "Post load" #: include/class/fiche.class.php:1756 include/class/pdf_operation.class.php:246 #: include/ajax/ajax_boxcard_search.php:65 include/class/fiche.class.php:1759 #: include/class/fiche.class.php:1761 include/class/fiche.class.php:1779 +#: include/class/fiche.class.php:1780 msgid "Poste comptable" msgstr "Accounting" @@ -15732,6 +15846,8 @@ msgstr "Accounting or card" #: include/class/fiche.class.php:818 include/class/fiche.class.php:848 #: include/class/fiche.class.php:849 include/class/fiche.class.php:995 #: include/class/fiche.class.php:996 include/class/fiche.class.php:1036 +#: include/class/fiche.class.php:850 include/class/fiche.class.php:997 +#: include/class/fiche.class.php:1037 msgid "Poste comptable trop long" msgstr "Accounting too large" @@ -15815,7 +15931,7 @@ msgstr "Accounting in use : remove forbidden" msgid "Poste à créditer incorrect" msgstr "Post crediting incorrect" -#: include/template/param_jrn.php:15 +#: include/template/param_jrn.php:15 include/template/param_jrn.php:22 msgid "Postes utilisables journal (débit/crédit) " msgstr "Available accounting ledger (debit / credit)" @@ -15967,7 +16083,7 @@ msgstr "Percentage" #: include/ext/skel/index.php:45 msgid "Première route" -msgstr "" +msgstr "First road" #: include/class/class_follow_up.php:1926 #: include/class/class_follow_up.php:1928 @@ -16040,7 +16156,7 @@ msgstr "Issue during restoration" #: include/class/package_repository.class.php:132 #: include/class/package_repository.class.php:149 msgid "Problème réseau" -msgstr "" +msgstr "Network issue" #: include/template/document_mod_change.php:71 msgid "Prochain numéro" @@ -16103,6 +16219,7 @@ msgstr "Progr." #: include/export/export_poste_detail_csv.php:90 #: include/class/anc_grandlivre.class.php:221 #: include/class/anc_grandlivre.class.php:222 include/fiche.inc.php:523 +#: include/fiche.inc.php:532 msgid "Prog." msgstr "Progr." @@ -16126,10 +16243,12 @@ msgid "Préfixe" msgstr "Prefix" #: include/template/param_jrn.php:84 include/template/param_jrn.php:91 +#: include/template/param_jrn.php:93 msgid "Préfixe code interne" msgstr "Prefix for internal code" #: include/template/param_jrn.php:88 include/template/param_jrn.php:95 +#: include/template/param_jrn.php:97 msgid "Préfixe pièce justificative" msgstr "Prefix for receipt" @@ -16142,7 +16261,8 @@ msgstr "Prefix for receipt" #: html/user_login.php:158 html/user_login.php:159 html/user_login.php:160 #: include/database.item.php:87 html/user_login.php:163 #: include/database.item.php:81 include/ajax/ajax_preference.php:31 -#: html/user_login.php:169 include/database.item.php:79 +#: html/user_login.php:169 include/database.item.php:79 html/user_login.php:146 +#: include/ajax/ajax_preference.php:69 msgid "Préférence" msgstr "Setting" @@ -16243,6 +16363,7 @@ msgstr "Then perform the install procedure to upgrade the database" #: include/class/acc_ledger_purchase.class.php:1826 #: include/class/acc_ledger_sold.class.php:1400 #: include/class/acc_ledger_purchase.class.php:1829 +#: include/ajax/ajax_preference.php:150 msgid "Période" msgstr "Period" @@ -16416,7 +16537,7 @@ msgstr "Quantity" #: include/template/ledger_detail_misc.php:100 #: include/class/fiche.class.php:1758 include/class/fiche.class.php:1760 #: include/class/acc_ledger_fin.class.php:753 -#: include/class/fiche.class.php:1778 +#: include/class/fiche.class.php:1778 include/class/fiche.class.php:1779 msgid "Quick Code" msgstr "Quick Code" @@ -16447,6 +16568,7 @@ msgstr "QuickCode gold" #: include/class/acc_account_ledger.class.php:394 #: include/class/acc_ledger_history_generic.class.php:768 #: include/export/export_ledger_csv.php:211 +#: include/class/acc_ledger_history_generic.class.php:769 msgid "QuickCode" msgstr "QuickCode" @@ -16695,6 +16817,7 @@ msgstr "Search accounting" #: include/class/acc_ledger_search.class.php:551 #: include/class/acc_ledger_search.class.php:560 #: include/class/acc_ledger_fin.class.php:1087 +#: include/class/anc_balance_double.class.php:370 msgid "Rechercher" msgstr "Search" @@ -16864,7 +16987,7 @@ msgstr "Late" #: html/do.php:302 html/user_login.php:71 include/cfgledger.inc.php:138 #: include/modele.inc.php:403 include/modele.inc.php:443 #: include/ajax/ajax_display_letter.php:39 include/cfgledger.inc.php:141 -#: include/ext/tva/ajax.php:35 html/do.php:312 +#: include/ext/tva/ajax.php:35 html/do.php:312 html/do.php:281 msgid "Retour" msgstr "Return" @@ -16908,11 +17031,11 @@ msgstr "Nothing selected" #: include/ext/skel/index.php:45 msgid "Route 1" -msgstr "" +msgstr "road 1" #: include/ext/skel/index.php:46 msgid "Route 2" -msgstr "" +msgstr "road 2" #: include/ext/transform/include/template/listing_assujetti_declarant.php:30 #: include/ext/transform/include/template/listing_assujetti_representative.php:30 @@ -17039,6 +17162,7 @@ msgid "Résultat limité à %d , %d nombre de fiches trouvées" msgstr "List limited to %d, %d cards found" #: html/fid_card.php:164 html/fid_card.php:165 html/fid_card.php:170 +#: html/fid_card.php:169 #, php-format msgid "Résultat limité à 12" msgstr "Limited to 12" @@ -17335,6 +17459,7 @@ msgstr "Select the ledger where the operation must be recorded" #: include/class/class_anc_balance_double.php:358 #: include/class/anc_balance_double.class.php:362 #: include/class/anc_balance_double.class.php:364 +#: include/class/anc_balance_double.class.php:366 msgid "" "Selectionnez le plan qui vous intéresse avant de cliquer sur Recherche" msgstr "Select the Analytic plan you are interested before clicking on Search" @@ -17346,7 +17471,7 @@ msgstr "Select the Analytic plan before clicking on search" #: include/ajax_preference.php:164 include/ajax_preference.php:165 #: include/ajax_preference.php:172 include/ajax/ajax_preference.php:172 -#: include/ajax/ajax_preference.php:251 +#: include/ajax/ajax_preference.php:251 include/ajax/ajax_preference.php:262 msgid "Selectionnez votre langue" msgstr "Select your language" @@ -17368,10 +17493,12 @@ msgid "Services intracommunautaires avec report de perception" msgstr "Services intra-deferred perception" #: include/template/param_jrn.php:136 include/template/param_jrn.php:143 +#: include/template/param_jrn.php:145 msgid "Services, fournitures ou biens achetés (D)" msgstr "Services, or good purchased (D)" #: include/template/param_jrn.php:197 include/template/param_jrn.php:204 +#: include/template/param_jrn.php:206 msgid "Services, fournitures ou biens vendus (C)" msgstr "Services, or sold good(D)" @@ -17389,6 +17516,12 @@ msgid "" "Set mode to D etailled all_ledgers result = Detailled Accounting from " "Acc_Ledger_History_Generic" msgstr "" +"Set mode to D etailled all_ledgers result = Detailled Accounting from " +"Acc_Ledger_History_Generic" + +#: include/lib/message_javascript.php:83 +msgid "Si vous changez de page vous perdez les reconciliations, continuez ?" +msgstr "If you change , you'll lost your selection" #: include/template/category_of_card.php:35 #: include/template/category_of_card.php:39 @@ -17479,6 +17612,8 @@ msgstr "Company" #: include/class/fiche.class.php:1764 include/class/fiche.class.php:1766 #: include/export/export_balance_pdf.php:135 #: include/class/anc_listing.class.php:120 include/class/fiche.class.php:1784 +#: include/class/anc_balance_double.class.php:101 +#: include/class/fiche.class.php:1785 msgid "Solde" msgstr "Balance" @@ -17539,14 +17674,12 @@ msgid "Solde début" msgstr "Start balance" #: include/class/acc_ledger_fin.class.php:536 -#, fuzzy msgid "Solde début extrait" msgstr "Start balance" #: include/class/acc_ledger_fin.class.php:538 -#, fuzzy msgid "Solde fin extrait" -msgstr "new entry" +msgstr "End balance" #: include/database.item.php:98 include/database.item.php:101 #: include/database.item.php:106 include/database.item.php:103 @@ -17726,6 +17859,7 @@ msgstr "Deleted" #: html/ajax_misc.php:196 html/ajax_misc.php:215 html/ajax_misc.php:229 #: html/ajax_misc.php:235 html/ajax_misc.php:313 html/ajax_misc.php:318 #: html/ajax_misc.php:346 html/ajax_misc.php:458 html/ajax_misc.php:460 +#: html/ajax_misc.php:466 msgid "Symbole" msgstr "Symbol" @@ -17768,7 +17902,7 @@ msgstr "Select the rows you want to keep" msgid "Sélectionner tout" msgstr "Select all" -#: include/ajax/ajax_preference.php:197 +#: include/ajax/ajax_preference.php:197 include/ajax/ajax_preference.php:208 msgid "Séparateur Décimale" msgstr "Decimal separator" @@ -17776,7 +17910,7 @@ msgstr "Decimal separator" #: include/ext/importbank/include/template/show_transfer.php:177 #: include/ext/importbank/include/template/show_transfer.php:176 #: include/ext/importbank/include/template/show_field.php:48 -#: include/ajax/ajax_preference.php:181 +#: include/ajax/ajax_preference.php:181 include/ajax/ajax_preference.php:192 msgid "Séparateur de champs" msgstr "Field separator" @@ -17812,6 +17946,7 @@ msgstr "Decimal separator" #: include/class/class_document_export.php:281 #: include/class/document_export.class.php:281 #: include/class/document_export.class.php:291 +#: include/class/document_export.class.php:292 msgid "TKPDF n'est pas installé" msgstr "TKPDF is not installed" @@ -18098,7 +18233,7 @@ msgstr "Maximum 10 char." #: include/ajax_preference.php:120 include/ajax_preference.php:121 #: include/ajax_preference.php:128 include/ajax/ajax_preference.php:128 -#: include/ajax/ajax_preference.php:145 +#: include/ajax/ajax_preference.php:145 include/ajax/ajax_preference.php:156 msgid "Taille des pages" msgstr "Page size" @@ -18106,6 +18241,10 @@ msgstr "Page size" msgid "Tant que ce n'est pas vous fait vous ne pouvez pas utiliser NOALYSS" msgstr "You cannot use Noalyss if this file is present" +#: include/lib/message_javascript.php:98 +msgid "Taper une formule (ex 20*5.1) puis enter" +msgstr "Type a formula and press enter" + #: include/lib/message_javascript.php:40 msgid "" "Tapez le numéro de poste ou une partie du poste ou du libellé puis sur " @@ -18118,6 +18257,7 @@ msgstr "" #: html/ajax_misc.php:195 html/ajax_misc.php:214 html/ajax_misc.php:228 #: html/ajax_misc.php:234 html/ajax_misc.php:312 html/ajax_misc.php:317 #: html/ajax_misc.php:345 html/ajax_misc.php:457 html/ajax_misc.php:459 +#: html/ajax_misc.php:465 msgid "Taux" msgstr "Spleen" @@ -18149,7 +18289,7 @@ msgstr "Invalid VAT code" #: scenario/inplace_edit.test.php:32 scenario/inplace_edit.test.php:33 msgid "Test Inplace_Edit" -msgstr "" +msgstr "Test Inplace_Edit" #: include/card_attr.inc.php:77 include/card_attr.inc.php:78 msgid "Texte" @@ -18168,7 +18308,7 @@ msgstr "Text surrounded by" #: include/ajax_preference.php:81 include/ajax_preference.php:82 #: include/ajax_preference.php:89 include/ajax/ajax_preference.php:89 -#: include/ajax/ajax_preference.php:90 +#: include/ajax/ajax_preference.php:90 include/ajax/ajax_preference.php:101 msgid "Thème" msgstr "Theme" @@ -18205,6 +18345,8 @@ msgstr "Theme" #: include/class/fiche.class.php:1461 #: include/class/acc_ledger_search.class.php:650 #: include/class/fiche.class.php:1475 +#: include/class/acc_ledger_history_generic.class.php:683 +#: include/class/fiche.class.php:1476 msgid "Tiers" msgstr "Tiers" @@ -18229,11 +18371,11 @@ msgstr "Title" msgid "Titre 1" msgstr "Title 1" -#: scenario/html_tab.test.php:35 +#: scenario/html_tab.test.php:35 scenario/html_tab.test.php:39 msgid "Titre 2" msgstr "Title 2" -#: scenario/html_tab.test.php:49 +#: scenario/html_tab.test.php:49 scenario/html_tab.test.php:53 msgid "Titre 3" msgstr "Title 3" @@ -18317,6 +18459,8 @@ msgstr "Total VAT NP" #: include/class/anc_listing.class.php:115 #: include/class/anc_listing.class.php:117 #: include/class/anc_listing.class.php:118 +#: include/class/anc_balance_double.class.php:83 +#: include/class/anc_balance_double.class.php:278 msgid "Total" msgstr "Total" @@ -18464,7 +18608,7 @@ msgstr "Total fee" #: include/class/class_fiche.php:1604 include/class/class_fiche.php:1603 #: include/class/class_fiche.php:1606 include/class/fiche.class.php:1760 #: include/class/fiche.class.php:1763 include/class/fiche.class.php:1765 -#: include/class/fiche.class.php:1783 +#: include/class/fiche.class.php:1783 include/class/fiche.class.php:1784 msgid "Total crédit" msgstr "Total credit" @@ -18478,7 +18622,7 @@ msgstr "Accounting sum" #: include/class/class_fiche.php:1603 include/class/class_fiche.php:1602 #: include/class/class_fiche.php:1605 include/class/fiche.class.php:1759 #: include/class/fiche.class.php:1762 include/class/fiche.class.php:1764 -#: include/class/fiche.class.php:1782 +#: include/class/fiche.class.php:1782 include/class/fiche.class.php:1783 msgid "Total débit" msgstr "Total Debit" @@ -18494,6 +18638,7 @@ msgid "Total niveau" msgstr "Total level" #: include/class/acc_ledger_history_generic.class.php:684 +#: include/class/acc_ledger_history_generic.class.php:685 msgid "Total opération" msgstr "Total entries" @@ -18573,6 +18718,9 @@ msgstr "Total to distribute" #: include/class/acc_ledger_purchase.class.php:1588 #: include/class/acc_ledger.class.php:724 include/class/fiche.class.php:1544 #: include/fiche.inc.php:440 include/class/fiche.class.php:1563 +#: include/fiche.inc.php:447 +#: include/class/acc_ledger_history_generic.class.php:738 +#: include/class/fiche.class.php:1564 msgid "Totaux" msgstr "Total" @@ -18697,9 +18845,8 @@ msgid "Toutes les actions" msgstr "All Actions" #: include/class/acc_plan_mtable.class.php:196 -#, fuzzy msgid "Toutes les fiches" -msgstr "All sheets in PDF" +msgstr "All cards" #: include/ext/amortis/include/print_fiche.inc.php:63 msgid "Toutes les fiches en PDF" @@ -18717,6 +18864,10 @@ msgstr "All entries" msgid "Toutes opérations" msgstr "All operations" +#: include/lib/message_javascript.php:95 +msgid "Traitement en cours" +msgstr "Working in progress" + #: include/ext/import_account/include/class_impacc_operation.php:258 #: include/ext/import-winbook/index.php:65 msgid "Transfert" @@ -18809,7 +18960,7 @@ msgstr "VAT ND" #: include/class/acc_ledger_search.class.php:1093 #: include/class/fiche.class.php:1463 #: include/class/acc_ledger_search.class.php:1106 -#: include/class/fiche.class.php:1477 +#: include/class/fiche.class.php:1477 include/class/fiche.class.php:1478 msgid "Type" msgstr "Type" @@ -18852,6 +19003,7 @@ msgid "Type de fiche" msgstr "Type of card" #: include/template/param_jrn.php:78 include/template/param_jrn.php:85 +#: include/template/param_jrn.php:6 msgid "Type de journal" msgstr "Type of ledgers" @@ -18920,6 +19072,14 @@ msgstr "Phone" msgid "URL" msgstr "URL" +#: include/lib/message_javascript.php:96 +msgid "Un instant" +msgstr "A moment" + +#: include/lib/message_javascript.php:77 +msgid "Un instant svp" +msgstr "A moment please" + #: include/class_acc_ledger.php:3410 include/class_acc_ledger.php:3480 #: include/class_acc_ledger.php:3479 include/class_acc_ledger.php:3495 #: include/class_acc_ledger.php:3512 include/class_acc_ledger.php:3539 @@ -19015,7 +19175,7 @@ msgstr "Only not balanced accounting" msgid "Uniquement les opérations non lettrées" msgstr "Only unlettered actions" -#: include/template/param_jrn.php:21 +#: include/template/param_jrn.php:21 include/template/param_jrn.php:28 msgid "" "Uniquement pour les journaux d'Opérations Diverses, les valeurs sont " "séparées par des espaces, on peut aussi\n" @@ -19142,9 +19302,9 @@ msgid "Utilisation directe" msgstr "Direct use" #: include/class/acc_ledger.class.php:1150 -#, fuzzy, php-format +#, php-format msgid "Utilisation directe interdite du poste comptable %s" -msgstr "Automatic Creation of the accounting item" +msgstr "Forbidden use of the accounting %s" #: include/company.inc.php:117 include/company.inc.php:136 #: include/company.inc.php:140 @@ -19257,6 +19417,7 @@ msgstr "Validate ?" #: include/class/acc_ledger_search.class.php:1113 #: include/class/acc_ledger_search.class.php:1121 #: include/class/acc_ledger_search.class.php:1134 +#: include/ajax/ajax_preference.php:280 msgid "Valider" msgstr "Validate" @@ -19429,7 +19590,7 @@ msgstr "See documents monitoring" #: html/do.php:104 html/user_login.php:76 html/do.php:132 html/do.php:145 #: html/do.php:147 html/do.php:165 html/do.php:189 html/user_login.php:78 #: html/do.php:203 html/user_login.php:79 html/user_login.php:85 -#: html/do.php:213 +#: html/do.php:213 html/do.php:182 msgid "Votre base de données n'est pas à jour" msgstr "Your database is not updated" @@ -19567,9 +19728,14 @@ msgstr "Do you confirm" #: include/ajax/ajax_add_menu.php:192 include/ajax/ajax_add_menu.php:200 #: include/class/fiche_def.class.php:791 include/class/fiche_def.class.php:796 #: include/ajax/ajax_create_menu.php:13 include/template/stock_inv.php:33 +#: include/lib/message_javascript.php:78 msgid "Vous confirmez ?" msgstr "Do you confirm?" +#: include/lib/message_javascript.php:81 +msgid "Vous confirmez effacement ?" +msgstr "Do you confirm the removal ?" + #: include/forecast.inc.php:363 include/forecast.inc.php:343 #: include/forecast.inc.php:339 include/forecast.inc.php:333 #: include/forecast.inc.php:347 @@ -19589,6 +19755,10 @@ msgstr "Removing the Confirm?" msgid "Vous confirmez le clonage " msgstr "Confirm cloning" +#: include/lib/message_javascript.php:82 +msgid "Vous confirmez mise à jour ?" +msgstr "Do you confirm the update?" + #: include/ext/amortis/include/material_add.inc.php:39 msgid "" "Vous devez aller dans CFGCARD pour ajouter une catégorie , puis des fiches " @@ -19815,11 +19985,13 @@ msgid "Vous utilisez le mode strict la dernière operation est la date du " msgstr "You're using the strict mod and the last entry is one" #: include/class/acc_ledger.class.php:1079 -#, fuzzy, php-format +#, php-format msgid "" "Vous utilisez le mode strict la dernière operation est la date du %s\n" " vous ne pouvez pas encoder à une date antérieure" -msgstr "You're using the strict mod and the last entry is one" +msgstr "" +"You are using the strict mode, the last entry is on the %s , you cannot" +" record after that date" #: include/class_acc_ledger_fin.php:116 include/class_acc_ledger_fin.php:200 #: include/class_acc_ledger_purchase.php:111 @@ -20008,6 +20180,10 @@ msgstr "no data" msgid "budgets" msgstr "budgets" +#: include/lib/message_javascript.php:88 +msgid "calculé" +msgstr "Computed" + #: include/lib/inplace_edit.class.php:80 include/lib/inplace_edit.class.php:79 msgid "cancel" msgstr "Cancel" @@ -20023,7 +20199,7 @@ msgstr "This Code Has No accounting, please create it [" #: include/class/document.class.php:1293 #, php-format msgid "chaine à remplacer [%s] contient un caractère interdit" -msgstr "" +msgstr "String to remplace [%s] contains a forbidden character" #: include/ext/importbank/ajax.php:134 include/ext/importbank/ajax.php:135 msgid "choisir" @@ -20064,11 +20240,11 @@ msgstr "Select the type of ledger" #: html/do.php:105 html/user_login.php:77 html/do.php:133 html/do.php:146 #: html/do.php:148 html/do.php:166 html/do.php:190 html/user_login.php:79 #: html/do.php:204 html/user_login.php:80 html/user_login.php:86 -#: html/do.php:214 +#: html/do.php:214 html/do.php:183 msgid "cliquez ici pour appliquer le patch" msgstr "Click here to apply the patch" -#: html/do.php:193 html/do.php:203 +#: html/do.php:193 html/do.php:203 html/do.php:172 msgid "cliquez ici pour mettre à jour " msgstr "Click here to update " @@ -20080,7 +20256,7 @@ msgstr "Click here to update " #: include/class/pdf_operation.class.php:149 #: include/class/pdf_operation.class.php:194 #: include/class/pdf_operation.class.php:247 html/ajax_misc.php:456 -#: html/ajax_misc.php:458 +#: html/ajax_misc.php:458 html/ajax_misc.php:464 msgid "code" msgstr "code" @@ -20157,7 +20333,7 @@ msgstr "Debit" #: include/ext/tva/ajax.php:247 msgid "delete_param : echec" -msgstr "" +msgstr "delete_param : fail" #: include/template/ledger_detail_bottom.php:200 #: include/template/ledger_detail_bottom.php:217 @@ -20334,6 +20510,8 @@ msgid "" "export detail html all ledgers result = Detailled Accounting from " "Acc_Ledger_History_Generic" msgstr "" +"export detail html all ledgers result = Detailled Accounting from " +"Acc_Ledger_History_Generic" #: include/ajax_mod_periode.php:60 include/ajax_mod_periode.php:78 #: include/ajax/ajax_mod_periode.php:60 include/ajax/ajax_mod_periode.php:78 @@ -20440,6 +20618,7 @@ msgstr "inexistent" #: include/export/export_ledger_csv.php:220 #: include/class/acc_ledger_history_generic.class.php:681 #: include/export/export_ledger_csv.php:214 +#: include/class/acc_ledger_history_generic.class.php:682 msgid "internal" msgstr "Internal" @@ -20472,6 +20651,7 @@ msgstr "invalid parameter" #: include/class/acc_ledger_history_sale.class.php:232 #: include/class/acc_ledger_history_purchase.class.php:239 #: include/class/acc_ledger_history_sale.class.php:233 +#: include/class/acc_ledger_history_generic.class.php:759 msgid "journal" msgstr "Ledger" @@ -20514,7 +20694,7 @@ msgstr "the database %smod%s must be migrated in unicode" msgid "label" msgstr "Label" -#: include/ajax/ajax_preference.php:220 +#: include/ajax/ajax_preference.php:220 include/ajax/ajax_preference.php:231 msgid "latin1" msgstr "Latin" @@ -20765,6 +20945,7 @@ msgstr "receipt #" #: include/class/class_fiche.php:1231 include/class/class_fiche.php:1234 #: include/class/fiche.class.php:1378 include/class/fiche.class.php:1379 #: include/class/fiche.class.php:1381 include/class/fiche.class.php:1395 +#: include/class/fiche.class.php:1396 msgid "n° de pièce / Code interne" msgstr "Internal code" @@ -20799,6 +20980,8 @@ msgstr "No online" #: include/class/acc_ledger_history_generic.class.php:680 #: include/class/fiche.class.php:1456 include/class/fiche.class.php:1458 #: include/class/fiche.class.php:1472 +#: include/class/acc_ledger_history_generic.class.php:681 +#: include/class/fiche.class.php:1473 msgid "n° pièce" msgstr "receipt #" @@ -20836,6 +21019,7 @@ msgstr "open_basedir must be empty or set properly" #: include/export/export_ledger_csv.php:208 #: include/class/acc_ledger_history_purchase.class.php:250 #: include/class/acc_ledger_history_sale.class.php:244 +#: include/class/acc_ledger_history_generic.class.php:764 msgid "operation" msgstr "Operation" @@ -20849,7 +21033,7 @@ msgid "opération" msgstr "Entry" #: include/class/fiche.class.php:1047 include/class/fiche.class.php:1049 -#: include/class/fiche.class.php:1063 +#: include/class/fiche.class.php:1063 include/class/fiche.class.php:1064 msgid "opération annulée" msgstr "Entry canceled" @@ -20977,7 +21161,7 @@ msgstr "receipt" msgid "pièce" msgstr "Receipt" -#: include/ajax/ajax_preference.php:203 +#: include/ajax/ajax_preference.php:203 include/ajax/ajax_preference.php:214 msgid "point" msgstr "point" @@ -21162,7 +21346,7 @@ msgstr "Search" #: include/export/export_fiche_balance_csv.php:140 #: include/export/export_fiche_balance_csv.php:153 #: include/export/export_fiche_balance_csv.php:154 include/fiche.inc.php:517 -#: include/fiche.inc.php:519 +#: include/fiche.inc.php:519 include/fiche.inc.php:528 msgid "ref" msgstr "Ref" @@ -21231,11 +21415,11 @@ msgid "soit y restaurer un backup ou un modèle" msgstr "or restore un backup or a template" #: include/export/export_fiche_balance_csv.php:57 include/fiche.inc.php:587 +#: include/fiche.inc.php:596 msgid "solde" msgstr "Balance" -#: include/fiche.inc.php:592 -#, fuzzy +#: include/fiche.inc.php:592 include/fiche.inc.php:601 msgid "solde crediteur" msgstr "Total credit" @@ -21248,10 +21432,12 @@ msgstr "Total credit" #: include/class/fiche.class.php:1405 include/class/fiche.class.php:1534 #: include/class/fiche.class.php:1407 include/class/fiche.class.php:1536 #: include/class/fiche.class.php:1421 include/class/fiche.class.php:1552 +#: include/class/fiche.class.php:1422 include/class/fiche.class.php:1553 msgid "solde créditeur" msgstr "Total credit" #: include/class/acc_ledger_history_generic.class.php:668 +#: include/class/acc_ledger_history_generic.class.php:669 msgid "solde créditeur:" msgstr "Sum credit" @@ -21264,11 +21450,13 @@ msgstr "Sum credit" #: include/class/fiche.class.php:1405 include/class/fiche.class.php:1534 #: include/class/fiche.class.php:1407 include/class/fiche.class.php:1536 #: include/fiche.inc.php:590 include/class/fiche.class.php:1421 -#: include/class/fiche.class.php:1552 +#: include/class/fiche.class.php:1552 include/fiche.inc.php:599 +#: include/class/fiche.class.php:1422 include/class/fiche.class.php:1553 msgid "solde débiteur" msgstr "Total debit" #: include/class/acc_ledger_history_generic.class.php:667 +#: include/class/acc_ledger_history_generic.class.php:668 msgid "solde débiteur:" msgstr "Sum debit" @@ -21391,7 +21579,8 @@ msgstr "vat" #: html/ajax_misc.php:289 html/ajax_misc.php:294 html/ajax_misc.php:367 #: html/ajax_misc.php:372 html/ajax_misc.php:377 html/ajax_misc.php:400 #: html/ajax_misc.php:405 html/ajax_misc.php:512 html/ajax_misc.php:517 -#: html/ajax_misc.php:514 html/ajax_misc.php:519 +#: html/ajax_misc.php:514 html/ajax_misc.php:519 html/ajax_misc.php:520 +#: html/ajax_misc.php:525 msgid "tva inconnue" msgstr "VAT unknown" @@ -21437,7 +21626,7 @@ msgstr "unknown type of ledger" msgid "téléphone " msgstr "phone" -#: include/ajax/ajax_preference.php:219 +#: include/ajax/ajax_preference.php:219 include/ajax/ajax_preference.php:230 msgid "utf8" msgstr "utf8" @@ -21465,6 +21654,7 @@ msgid "verifie Imputation Analytique" msgstr "Verify Analytic" #: include/ajax/ajax_preference.php:188 include/ajax/ajax_preference.php:204 +#: include/ajax/ajax_preference.php:199 include/ajax/ajax_preference.php:215 msgid "virgule" msgstr "comma" @@ -21915,9 +22105,6 @@ msgstr "Step 4" #~ msgid "Voir les operations de ce journal" #~ msgstr "See entries of this ledger" -#~ msgid "Vous confirmez l\\' effacement ?" -#~ msgstr "Do you confirm the removal ?" - #~ msgid "Vous devez choisir un dossier " #~ msgstr "You must choose a folder" diff --git a/html/lang/messages.po b/html/lang/messages.po index 40f1164a0..8c9960ecd 100644 --- a/html/lang/messages.po +++ b/html/lang/messages.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-02-04 16:40+0100\n" +"POT-Creation-Date: 2019-07-31 00:04+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -30,8 +30,8 @@ msgstr "" #: include/ajax/ajax_card.php:145 include/class/class_fiche.php:655 #: include/ext/importbank/include/import_bank.class.php:490 #: include/ajax/ajax_card.php:148 include/class/fiche.class.php:661 -#: include/class/fiche.class.php:663 include/ajax/ajax_card.php:148 -#: include/class/fiche.class.php:662 +#: include/class/fiche.class.php:663 include/class/fiche.class.php:662 +#: include/ajax/ajax_card.php:148 include/class/fiche.class.php:663 msgid "Fiche non trouvée" msgstr "" @@ -50,9 +50,9 @@ msgstr "" #: include/ext/listing/index.php:60 include/ajax/ajax_card.php:163 #: include/database.item.php:11 include/ajax/ajax_card.php:166 #: include/database.item.php:5 include/database.item.php:98 -#: include/ext/import-winbook/index.php:66 include/ajax/ajax_card.php:166 -#: include/database.item.php:3 include/database.item.php:96 -#: include/fiche.inc.php:65 +#: include/ext/import-winbook/index.php:66 include/fiche.inc.php:65 +#: include/ajax/ajax_card.php:166 include/database.item.php:3 +#: include/database.item.php:96 include/fiche.inc.php:65 msgid "Historique" msgstr "" @@ -190,8 +190,11 @@ msgstr "" #: include/ajax/ajax_search_operation.php:72 #: include/class/acc_ledger_search.class.php:559 html/recherche.php:82 #: include/class/acc_ledger_search.class.php:547 -#: scenario/search_acc_operation.php:34 html/recherche.php:82 -#: scenario/search_acc_operation.php:34 include/template/action_show.php:33 +#: scenario/search_acc_operation.php:34 +#: include/ajax/ajax_search_operation.php:66 +#: include/ajax/ajax_search_operation.php:74 include/ajax/ajax_poste.php:63 +#: include/fiche.inc.php:86 include/class/acc_ledger_search.class.php:556 +#: html/recherche.php:82 include/template/action_show.php:33 #: include/template/stock_histo_search.php:30 #: include/template/stock_histo_search.php:68 #: include/template/action_button.php:39 include/anc_acc_balance.inc.php:15 @@ -222,8 +225,8 @@ msgstr "" #: html/ajax_card.php:393 include/forecast.inc.php:244 #: include/ajax/ajax_card.php:373 include/ajax/ajax_card.php:374 #: include/ajax/ajax_card.php:375 include/ajax/ajax_card.php:408 -#: include/ajax/ajax_card.php:411 include/ajax/ajax_card.php:411 -#: include/fiche.inc.php:93 +#: include/ajax/ajax_card.php:411 include/fiche.inc.php:93 +#: include/ajax/ajax_card.php:411 include/fiche.inc.php:93 msgid "Recherche de fiche" msgstr "" @@ -441,6 +444,7 @@ msgstr "" #: include/template/ledger_detail_bottom.php:39 #: include/class/acc_ledger_search.class.php:702 #: include/class/acc_ledger_search.class.php:696 +#: include/class/acc_ledger_search.class.php:709 #: include/template/ledger_detail_bottom.php:39 include/compta_ven.inc.php:188 #: include/ajax/ajax_ledger.php:322 include/ajax/ajax_ledger.php:351 #: include/database.item.php:87 include/class/document.class.php:172 @@ -488,7 +492,8 @@ msgstr "" #: include/class/pdf_operation.class.php:149 #: include/class/pdf_operation.class.php:194 #: include/class/pdf_operation.class.php:247 html/ajax_misc.php:456 -#: html/ajax_misc.php:458 include/class/pdf_operation.class.php:149 +#: html/ajax_misc.php:458 html/ajax_misc.php:464 +#: include/class/pdf_operation.class.php:149 #: include/class/pdf_operation.class.php:194 #: include/class/pdf_operation.class.php:247 msgid "code" @@ -497,18 +502,21 @@ msgstr "" #: html/ajax_misc.php:195 html/ajax_misc.php:214 html/ajax_misc.php:228 #: html/ajax_misc.php:234 html/ajax_misc.php:312 html/ajax_misc.php:317 #: html/ajax_misc.php:345 html/ajax_misc.php:457 html/ajax_misc.php:459 +#: html/ajax_misc.php:465 msgid "Taux" msgstr "" #: html/ajax_misc.php:196 html/ajax_misc.php:215 html/ajax_misc.php:229 #: html/ajax_misc.php:235 html/ajax_misc.php:313 html/ajax_misc.php:318 #: html/ajax_misc.php:346 html/ajax_misc.php:458 html/ajax_misc.php:460 +#: html/ajax_misc.php:466 msgid "Symbole" msgstr "" #: html/ajax_misc.php:197 html/ajax_misc.php:216 html/ajax_misc.php:230 #: html/ajax_misc.php:236 html/ajax_misc.php:314 html/ajax_misc.php:319 #: html/ajax_misc.php:347 html/ajax_misc.php:459 html/ajax_misc.php:461 +#: html/ajax_misc.php:467 msgid "Explication" msgstr "" @@ -517,7 +525,8 @@ msgstr "" #: html/ajax_misc.php:289 html/ajax_misc.php:294 html/ajax_misc.php:367 #: html/ajax_misc.php:372 html/ajax_misc.php:377 html/ajax_misc.php:400 #: html/ajax_misc.php:405 html/ajax_misc.php:512 html/ajax_misc.php:517 -#: html/ajax_misc.php:514 html/ajax_misc.php:519 +#: html/ajax_misc.php:514 html/ajax_misc.php:519 html/ajax_misc.php:520 +#: html/ajax_misc.php:525 msgid "tva inconnue" msgstr "" @@ -554,7 +563,7 @@ msgstr "" #: html/do.php:302 html/user_login.php:71 include/cfgledger.inc.php:138 #: include/modele.inc.php:403 include/modele.inc.php:443 #: include/ajax/ajax_display_letter.php:39 include/cfgledger.inc.php:141 -#: include/ext/tva/ajax.php:35 html/do.php:312 html/do.php:312 +#: include/ext/tva/ajax.php:35 html/do.php:312 html/do.php:281 #: html/user_login.php:71 include/cfgledger.inc.php:141 #: include/dossier.inc.php:383 include/dossier.inc.php:426 #: include/ajax/ajax_get_profile.php:50 include/ajax/ajax_display_letter.php:39 @@ -621,9 +630,9 @@ msgstr "" #: include/fiche.inc.php:574 #: include/ext/tools/include/anc_grandlivre_ext.class.php:126 #: include/export/export_poste_detail_pdf.php:102 -#: include/ajax/ajax_display_letter.php:122 -#: include/export/export_poste_detail_pdf.php:102 #: include/ajax/ajax_display_letter.php:122 include/fiche.inc.php:576 +#: include/export/export_poste_detail_pdf.php:102 +#: include/ajax/ajax_display_letter.php:122 include/fiche.inc.php:585 msgid "Debit" msgstr "" @@ -636,9 +645,9 @@ msgstr "" #: include/fiche.inc.php:578 #: include/ext/tools/include/anc_grandlivre_ext.class.php:127 #: include/export/export_poste_detail_pdf.php:104 -#: include/ajax/ajax_display_letter.php:123 -#: include/export/export_poste_detail_pdf.php:104 #: include/ajax/ajax_display_letter.php:123 include/fiche.inc.php:580 +#: include/export/export_poste_detail_pdf.php:104 +#: include/ajax/ajax_display_letter.php:123 include/fiche.inc.php:589 msgid "Credit" msgstr "" @@ -729,6 +738,8 @@ msgstr "" #: include/ext/modop/modop_confirm.php:70 #: include/ext/modop/modop_confirm.php:94 include/cfgledger.inc.php:157 #: include/class/acc_ledger.class.php:2019 +#: include/template/ledger_detail_bottom.php:318 +#: include/template/stock_inv.php:107 include/class/acc_ledger.class.php:2028 #: include/template/user_sec_profile.php:58 #: include/template/modele_document.php:119 #: include/template/ledger_detail_bottom.php:318 @@ -777,7 +788,7 @@ msgstr "" #: include/template/ledger_detail_bottom.php:88 #: include/template/ledger_detail_misc.php:99 include/ajax/ajax_poste.php:64 #: include/class/acc_plan_mtable.class.php:45 include/class/fiche.class.php:470 -#: include/template/fiche_list.php:41 +#: include/class/fiche.class.php:469 include/template/fiche_list.php:41 #: include/template/ledger_detail_misc.php:99 #: include/template/ledger_detail_bottom.php:88 #: include/template/operation_detail_misc.php:32 include/ajax/ajax_poste.php:65 @@ -795,14 +806,14 @@ msgstr "" #: html/do.php:97 html/user_login.php:66 html/do.php:96 html/do.php:91 #: html/do.php:93 html/user_login.php:67 html/do.php:121 html/do.php:134 #: html/do.php:136 html/do.php:154 html/do.php:178 html/user_login.php:69 -#: html/do.php:186 html/user_login.php:70 html/do.php:196 html/do.php:196 +#: html/do.php:186 html/user_login.php:70 html/do.php:196 html/do.php:165 #: html/user_login.php:70 msgid "Base de donnée invalide" msgstr "" #: html/do.php:104 html/do.php:103 html/do.php:98 html/do.php:100 #: html/do.php:128 html/do.php:141 html/do.php:143 html/do.php:161 -#: html/do.php:185 html/do.php:197 html/do.php:207 html/do.php:207 +#: html/do.php:185 html/do.php:197 html/do.php:207 html/do.php:176 msgid "" "Attention: la version de base de donnée est supérieure à la version du " "programme, vous devriez mettre à jour" @@ -812,7 +823,7 @@ msgstr "" #: html/do.php:104 html/user_login.php:76 html/do.php:132 html/do.php:145 #: html/do.php:147 html/do.php:165 html/do.php:189 html/user_login.php:78 #: html/do.php:203 html/user_login.php:79 html/user_login.php:85 -#: html/do.php:213 html/do.php:213 html/user_login.php:85 +#: html/do.php:213 html/do.php:182 html/user_login.php:85 msgid "Votre base de données n'est pas à jour" msgstr "" @@ -820,7 +831,7 @@ msgstr "" #: html/do.php:105 html/user_login.php:77 html/do.php:133 html/do.php:146 #: html/do.php:148 html/do.php:166 html/do.php:190 html/user_login.php:79 #: html/do.php:204 html/user_login.php:80 html/user_login.php:86 -#: html/do.php:214 html/do.php:214 html/user_login.php:86 +#: html/do.php:214 html/do.php:183 html/user_login.php:86 msgid "cliquez ici pour appliquer le patch" msgstr "" @@ -857,15 +868,15 @@ msgstr "" #: html/user_login.php:158 html/user_login.php:159 html/user_login.php:160 #: include/database.item.php:87 html/user_login.php:163 #: include/database.item.php:81 include/ajax/ajax_preference.php:31 -#: html/user_login.php:169 include/database.item.php:79 html/user_login.php:169 -#: include/ajax/ajax_preference.php:31 include/database.item.php:79 +#: html/user_login.php:169 include/database.item.php:79 html/user_login.php:146 +#: include/ajax/ajax_preference.php:69 include/database.item.php:79 msgid "Préférence" msgstr "" #: html/user_login.php:151 html/user_login.php:153 html/user_login.php:155 #: html/user_login.php:159 html/user_login.php:160 html/user_login.php:161 #: html/user_login.php:162 html/user_login.php:165 html/user_login.php:171 -#: html/user_login.php:171 +#: html/user_login.php:148 msgid "Deconnexion" msgstr "" @@ -915,7 +926,8 @@ msgstr "" #: include/class/acc_ledger_search.class.php:570 html/recherche.php:81 #: include/balance.inc.php:101 include/modele.inc.php:278 #: include/class/acc_ledger_search.class.php:565 html/recherche.php:83 -#: include/class/acc_ledger_search.class.php:553 html/recherche.php:83 +#: include/class/acc_ledger_search.class.php:553 +#: include/class/acc_ledger_search.class.php:562 html/recherche.php:83 #: include/cfgplugin.inc.php:110 include/ajax/ajax_search_filter.php:128 #: include/modele.inc.php:278 include/menu.inc.php:146 #: include/balance.inc.php:101 include/class/acc_ledger_search.class.php:562 @@ -932,8 +944,8 @@ msgstr "" #: include/lib/ac_common.php:431 include/action.common.inc.php:129 #: include/lib/ac_common.php:432 include/action.common.inc.php:131 #: include/action.common.inc.php:165 include/lib/ac_common.php:434 -#: include/action.common.inc.php:131 include/action.common.inc.php:165 -#: include/lib/ac_common.php:450 +#: include/lib/ac_common.php:450 include/action.common.inc.php:131 +#: include/action.common.inc.php:165 include/lib/ac_common.php:450 msgid "Cette action ne vous est pas autorisée Contactez votre responsable" msgstr "" @@ -943,7 +955,7 @@ msgstr "" #: include/lib/ac_common.php:434 include/lib/ac_common.php:435 #: include/lib/ac_common.php:436 include/lib/ac_common.php:437 #: include/lib/ac_common.php:438 include/lib/ac_common.php:440 -#: include/lib/ac_common.php:456 +#: include/lib/ac_common.php:456 include/lib/ac_common.php:456 msgid " Cette action ne vous est pas autorisée Contactez votre responsable" msgstr "" @@ -957,8 +969,8 @@ msgstr "" #: include/class/class_extension.php:122 include/lib/ac_common.php:880 #: include/lib/ac_common.php:881 include/class/extension.class.php:122 #: include/lib/ac_common.php:893 include/class/extension.class.php:138 -#: include/lib/ac_common.php:895 include/class/extension.class.php:138 -#: include/lib/ac_common.php:911 +#: include/lib/ac_common.php:895 include/lib/ac_common.php:911 +#: include/class/extension.class.php:138 include/lib/ac_common.php:911 msgid "Module inexistant" msgstr "" @@ -1161,7 +1173,8 @@ msgstr "" #: include/class/pre_op_ven.class.php:185 #: include/class/acc_ledger.class.php:2435 #: include/class/follow_up.class.php:297 include/category_card.inc.php:162 -#: include/class/acc_ledger.class.php:2436 include/category_card.inc.php:162 +#: include/class/acc_ledger.class.php:2436 include/fiche.inc.php:116 +#: include/class/acc_ledger.class.php:2445 include/category_card.inc.php:162 #: include/contact.inc.php:129 include/customer.inc.php:127 #: include/fiche.inc.php:116 include/class/acc_ledger.class.php:2445 #: include/class/pre_op_ach.class.php:174 @@ -1259,7 +1272,11 @@ msgstr "" #: include/class/user.class.php:988 include/upgrade-plugin.php:59 #: include/upgrade-template.php:51 #: include/class/acc_ledger_search.class.php:1091 -#: include/class/fiche.class.php:1762 include/param_sec.inc.php:58 +#: include/class/fiche.class.php:1762 include/export/export_anc_axis_csv.php:44 +#: include/class/acc_ledger_search.class.php:1104 +#: include/class/acc_ledger_fin.class.php:549 +#: include/class/acc_ledger_fin.class.php:754 +#: include/class/fiche.class.php:1780 include/param_sec.inc.php:58 #: include/user.inc.php:82 include/user.inc.php:126 #: include/template/fiche_list.php:38 #: include/template/document_mod_change.php:34 include/template/profile.php:33 @@ -1275,7 +1292,7 @@ msgstr "" #: include/class/acc_ledger_fin.class.php:754 #: include/class/template_card_category.class.php:42 #: include/class/anc_plan.class.php:137 include/class/anc_plan.class.php:153 -#: include/class/fiche.class.php:1780 include/class/user.class.php:988 +#: include/class/fiche.class.php:1781 include/class/user.class.php:988 #: include/class/balance_age.class.php:145 #: include/class/document_modele.class.php:67 include/upgrade-plugin.php:59 #: include/stock_cfg.inc.php:65 @@ -1308,19 +1325,19 @@ msgstr "" #: include/ajax_preference.php:69 include/ajax_preference.php:70 #: include/ajax/ajax_preference.php:69 include/ajax/ajax_preference.php:70 -#: include/ajax/ajax_preference.php:70 +#: include/ajax/ajax_preference.php:81 msgid "Options Générales" msgstr "" #: include/ajax_preference.php:81 include/ajax_preference.php:82 #: include/ajax_preference.php:89 include/ajax/ajax_preference.php:89 -#: include/ajax/ajax_preference.php:90 include/ajax/ajax_preference.php:90 +#: include/ajax/ajax_preference.php:90 include/ajax/ajax_preference.php:101 msgid "Thème" msgstr "" #: include/ajax_preference.php:102 include/ajax_preference.php:103 #: include/ajax_preference.php:110 include/ajax/ajax_preference.php:110 -#: include/ajax/ajax_preference.php:115 include/ajax/ajax_preference.php:115 +#: include/ajax/ajax_preference.php:115 include/ajax/ajax_preference.php:126 msgid "" "Attention cette période est fermée, vous ne pourrez rien modifier dans le " "module comptable" @@ -1355,7 +1372,7 @@ msgstr "" #: include/class/acc_ledger_purchase.class.php:1826 #: include/class/acc_ledger_sold.class.php:1400 #: include/class/acc_ledger_purchase.class.php:1829 -#: include/template/forecast_result.php:25 include/ajax/ajax_preference.php:139 +#: include/template/forecast_result.php:25 include/ajax/ajax_preference.php:150 #: include/database.item.php:84 include/class/acc_ledger_sold.class.php:1400 #: include/class/acc_ledger_purchase.class.php:1829 msgid "Période" @@ -1363,7 +1380,7 @@ msgstr "" #: include/ajax_preference.php:120 include/ajax_preference.php:121 #: include/ajax_preference.php:128 include/ajax/ajax_preference.php:128 -#: include/ajax/ajax_preference.php:145 include/ajax/ajax_preference.php:145 +#: include/ajax/ajax_preference.php:145 include/ajax/ajax_preference.php:156 msgid "Taille des pages" msgstr "" @@ -1372,43 +1389,43 @@ msgstr "" #: include/ajax_preference.php:137 include/ajax_preference.php:139 #: include/ajax/ajax_preference.php:137 include/ajax/ajax_preference.php:139 #: include/ajax/ajax_preference.php:154 include/ajax/ajax_preference.php:156 -#: include/ajax/ajax_preference.php:154 include/ajax/ajax_preference.php:156 +#: include/ajax/ajax_preference.php:165 include/ajax/ajax_preference.php:167 msgid "Illimité" msgstr "" #: include/ajax_preference.php:148 include/ajax_preference.php:149 #: include/ajax_preference.php:156 include/ajax/ajax_preference.php:156 -#: include/ajax/ajax_preference.php:235 include/ajax/ajax_preference.php:235 +#: include/ajax/ajax_preference.php:235 include/ajax/ajax_preference.php:246 msgid "Options pour la page d'accueil" msgstr "" #: include/ajax_preference.php:149 include/ajax_preference.php:150 #: include/ajax_preference.php:157 include/ajax/ajax_preference.php:157 -#: include/ajax/ajax_preference.php:236 include/ajax/ajax_preference.php:236 +#: include/ajax/ajax_preference.php:236 include/ajax/ajax_preference.php:247 msgid "Mini-Rapport : " msgstr "" #: include/ajax_preference.php:152 include/ajax_preference.php:153 #: include/ajax_preference.php:160 include/ajax/ajax_preference.php:160 -#: include/ajax/ajax_preference.php:239 include/ajax/ajax_preference.php:239 +#: include/ajax/ajax_preference.php:239 include/ajax/ajax_preference.php:250 msgid "Aucun mini rapport" msgstr "" #: include/ajax_preference.php:158 include/ajax_preference.php:159 #: include/ajax_preference.php:166 include/ajax/ajax_preference.php:166 -#: include/ajax/ajax_preference.php:245 include/ajax/ajax_preference.php:245 +#: include/ajax/ajax_preference.php:245 include/ajax/ajax_preference.php:256 msgid "Le mini rapport est un rapport qui s'affiche sur votre page d'accueil" msgstr "" #: include/ajax_preference.php:163 include/ajax_preference.php:164 #: include/ajax_preference.php:171 include/ajax/ajax_preference.php:171 -#: include/ajax/ajax_preference.php:250 include/ajax/ajax_preference.php:250 +#: include/ajax/ajax_preference.php:250 include/ajax/ajax_preference.php:261 msgid "Langue" msgstr "" #: include/ajax_preference.php:164 include/ajax_preference.php:165 #: include/ajax_preference.php:172 include/ajax/ajax_preference.php:172 -#: include/ajax/ajax_preference.php:251 include/ajax/ajax_preference.php:251 +#: include/ajax/ajax_preference.php:251 include/ajax/ajax_preference.php:262 msgid "Selectionnez votre langue" msgstr "" @@ -1416,7 +1433,7 @@ msgstr "" #: html/test_class.php:219 include/ajax_preference.php:173 #: include/ajax/ajax_preference.php:173 include/ajax/ajax_preference.php:252 #: dev/test/test_class.php:215 dev/test/test_class.php:215 -#: include/ajax/ajax_preference.php:252 +#: include/ajax/ajax_preference.php:263 msgid "Français" msgstr "" @@ -1424,7 +1441,7 @@ msgstr "" #: html/test_class.php:220 include/ajax_preference.php:174 #: include/ajax/ajax_preference.php:174 include/ajax/ajax_preference.php:253 #: dev/test/test_class.php:216 dev/test/test_class.php:216 -#: include/ajax/ajax_preference.php:253 +#: include/ajax/ajax_preference.php:264 msgid "Anglais" msgstr "" @@ -1432,7 +1449,7 @@ msgstr "" #: html/test_class.php:221 include/ajax_preference.php:175 #: include/ajax/ajax_preference.php:175 include/ajax/ajax_preference.php:254 #: dev/test/test_class.php:217 dev/test/test_class.php:217 -#: include/ajax/ajax_preference.php:254 +#: include/ajax/ajax_preference.php:265 msgid "Néerlandais" msgstr "" @@ -1476,12 +1493,13 @@ msgstr "" #: include/template/action_display_short.php:126 #: include/lib/html_input.class.php:409 include/ajax/ajax_preference.php:269 #: include/class/acc_ledger_search.class.php:1113 -#: include/class/acc_ledger_search.class.php:1121 include/cfgplugin.inc.php:171 +#: include/class/acc_ledger_search.class.php:1121 +#: include/class/acc_ledger_search.class.php:1134 include/cfgplugin.inc.php:171 #: include/template/action_display_short.php:126 #: include/template/action_other_action.php:60 #: include/stock_inv_histo.inc.php:69 include/ajax/ajax_add_menu.php:171 #: include/ajax/ajax_add_menu.php:217 include/ajax/ajax_get_menu_detail.php:77 -#: include/ajax/ajax_preference.php:269 include/balance_card_ageing.inc.php:60 +#: include/ajax/ajax_preference.php:280 include/balance_card_ageing.inc.php:60 #: include/balance_age.inc.php:54 #: include/class/acc_ledger_search.class.php:1134 #: include/lib/html_input.class.php:409 @@ -1573,6 +1591,7 @@ msgstr "" #: include/class/anc_key.class.php:352 #: include/lib/manage_table_sql.class.php:652 #: include/class/acc_ledger_search.class.php:248 +#: include/class/acc_ledger_search.class.php:250 #: include/template/dashboard.php:21 include/user_detail.inc.php:245 #: include/cat_document.inc.php:85 include/class/anc_key.class.php:352 #: include/class/acc_ledger_search.class.php:250 @@ -1615,7 +1634,7 @@ msgstr "" #: include/ext/amortis/include/template/material_detail.php:36 #: include/class/acc_plan_mtable.class.php:49 include/database.item.php:78 #: include/database.item.php:110 include/category_card.inc.php:75 -#: include/template/stock_histo_search.php:39 +#: include/template/stock_inv.php:67 include/template/stock_histo_search.php:39 #: include/template/detail-action.php:317 #: include/template/form_ledger_fin.php:41 #: include/template/security_list_action.php:55 @@ -1701,8 +1720,9 @@ msgstr "" #: include/database.item.php:70 include/category_card.inc.php:77 #: include/database.item.php:73 include/database.item.php:67 #: include/database.item.php:101 include/category_card.inc.php:79 -#: include/category_card.inc.php:79 include/database.item.php:65 -#: include/database.item.php:101 include/fiche.inc.php:70 +#: include/fiche.inc.php:70 include/category_card.inc.php:79 +#: include/database.item.php:65 include/database.item.php:101 +#: include/fiche.inc.php:70 msgid "Balance" msgstr "" @@ -1908,6 +1928,12 @@ msgstr "" #: include/class/acc_ledger.class.php:860 #: include/class/acc_ledger.class.php:882 #: include/class/anc_operation.class.php:297 +#: include/template/ledger_detail_bottom.php:359 +#: include/export/export_balance_pdf.php:126 +#: include/class/acc_ledger.class.php:865 +#: include/class/acc_ledger.class.php:887 +#: include/class/acc_ledger_fin.class.php:754 +#: include/class/anc_operation.class.php:298 #: include/template/balance_aged_result.php:50 #: include/template/operation_detail_fin.php:33 #: include/template/acc_ledger_history_financial_oneline.php:35 @@ -1929,7 +1955,7 @@ msgstr "" #: include/export/export_balance_pdf.php:126 #: include/export/export_gl_csv.php:96 include/balance.inc.php:307 #: include/class/print_ledger_detail_item.class.php:60 -#: include/class/acc_ledger_history_generic.class.php:769 +#: include/class/acc_ledger_history_generic.class.php:770 #: include/class/acc_ledger_sold.class.php:703 #: include/class/acc_ledger_sold.class.php:1401 #: include/class/acc_ledger.class.php:605 @@ -1993,6 +2019,7 @@ msgstr "" #: include/class/acc_ledger_fin.class.php:70 #: include/class/acc_ledger_purchase.class.php:80 #: include/class/acc_ledger_sold.class.php:80 +#: include/class/acc_ledger.class.php:1039 #: include/class/acc_ledger_sold.class.php:80 #: include/class/acc_ledger.class.php:1039 #: include/class/acc_ledger_fin.class.php:70 @@ -2028,7 +2055,8 @@ msgstr "" #: include/class/acc_ledger.class.php:1028 include/ext/modop/modop_save.php:247 #: html/recherche.php:58 include/ajax/ajax_todo_list.php:203 #: include/ajax/ajax_todo_list.php:266 include/class/acc_ledger.class.php:1029 -#: html/export.php:45 html/recherche.php:58 include/ajax/ajax_history.php:26 +#: include/class/acc_ledger.class.php:1034 html/export.php:45 +#: html/recherche.php:58 include/ajax/ajax_history.php:26 #: include/ajax/ajax_todo_list.php:203 include/ajax/ajax_todo_list.php:266 #: include/class/acc_ledger_sold.class.php:84 #: include/class/acc_ledger.class.php:1034 @@ -2058,6 +2086,7 @@ msgstr "" #: include/class/acc_ledger_sold.class.php:104 #: include/class/acc_ledger.class.php:1054 #: include/class/acc_ledger.class.php:1055 +#: include/class/acc_ledger.class.php:1060 #: include/class/acc_ledger_sold.class.php:104 #: include/class/acc_ledger.class.php:1060 #: include/class/acc_ledger_fin.class.php:110 @@ -2081,6 +2110,7 @@ msgstr "" #: include/class/acc_ledger_fin.class.php:200 #: include/class/acc_ledger_purchase.class.php:109 #: include/class/acc_ledger_sold.class.php:113 +#: include/class/acc_ledger.class.php:1068 #: include/class/acc_ledger_sold.class.php:113 #: include/class/acc_ledger.class.php:1068 #: include/class/acc_ledger_fin.class.php:116 @@ -2212,7 +2242,9 @@ msgstr "" #: include/class/acc_ledger_purchase.class.php:1069 #: include/class/acc_ledger_sold.class.php:1123 #: include/class/acc_ledger_purchase.class.php:1072 -#: include/class/acc_ledger.class.php:773 include/compta_ven.inc.php:253 +#: include/class/acc_ledger.class.php:773 include/compta_ods.inc.php:51 +#: include/compta_fin.inc.php:49 include/class/acc_ledger.class.php:774 +#: include/class/acc_ledger_fin.class.php:1052 include/compta_ven.inc.php:253 #: include/compta_ods.inc.php:51 include/compta_fin.inc.php:49 #: include/class/acc_ledger_sold.class.php:1123 #: include/class/acc_ledger.class.php:774 @@ -2231,6 +2263,7 @@ msgstr "" #: include/class/acc_ledger_fin.class.php:1041 #: include/class/acc_ledger_fin.class.php:1040 #: include/class/acc_ledger_fin.class.php:1057 +#: include/class/acc_ledger_fin.class.php:1057 msgid "Tous les journaux financiers" msgstr "" @@ -2263,8 +2296,10 @@ msgstr "" #: include/class/acc_ledger_search.class.php:563 #: include/class/anc_balance_double.class.php:368 #: include/class/acc_ledger_search.class.php:551 -#: include/ajax/ajax_admin.php:149 include/anc_great_ledger.inc.php:23 -#: include/class/anc_balance_double.class.php:368 +#: include/class/acc_ledger_search.class.php:560 +#: include/class/acc_ledger_fin.class.php:1087 include/ajax/ajax_admin.php:149 +#: include/anc_great_ledger.inc.php:23 +#: include/class/anc_balance_double.class.php:370 #: include/class/anc_balance_simple.class.php:193 #: include/class/acc_ledger_search.class.php:560 #: include/class/acc_ledger_fin.class.php:1087 @@ -2316,7 +2351,8 @@ msgstr "" #: include/class/follow_up.class.php:1698 #: include/class/follow_up.class.php:1700 #: include/class/acc_ledger.class.php:207 -#: include/class/anc_acc_list.class.php:334 include/ajax/ajax_gestion.php:69 +#: include/class/anc_acc_list.class.php:334 +#: include/class/acc_ledger.class.php:1044 include/ajax/ajax_gestion.php:69 #: include/class/acc_ledger_sold.class.php:92 #: include/class/acc_ledger.class.php:207 #: include/class/acc_ledger.class.php:1044 @@ -2376,6 +2412,8 @@ msgstr "" #: include/class/acc_ledger_search.class.php:930 #: include/class/acc_ledger_search.class.php:677 #: include/class/acc_ledger_search.class.php:943 +#: include/class/acc_ledger_search.class.php:677 +#: include/class/acc_ledger_search.class.php:943 msgid "Aucun enregistrement trouvé" msgstr "" @@ -2400,6 +2438,8 @@ msgstr "" #: include/class/acc_ledger_search.class.php:950 #: include/class/acc_ledger_search.class.php:708 #: include/class/acc_ledger_search.class.php:963 +#: include/class/acc_ledger_search.class.php:708 +#: include/class/acc_ledger_search.class.php:963 msgid "Concerne" msgstr "" @@ -2424,6 +2464,8 @@ msgstr "" #: include/class/acc_ledger_search.class.php:856 #: include/class/acc_ledger_search.class.php:693 #: include/class/acc_ledger_search.class.php:864 +#: include/class/acc_ledger_search.class.php:706 +#: include/class/acc_ledger_search.class.php:877 #: include/template/ledger_detail_ven.php:86 #: include/class/acc_ledger_search.class.php:706 #: include/class/acc_ledger_search.class.php:877 @@ -2638,6 +2680,15 @@ msgstr "" #: include/class/anc_operation.class.php:296 #: include/class/print_ledger_misc.class.php:43 #: include/class/fiche.class.php:1382 include/class/fiche.class.php:1457 +#: include/template/stock_inv.php:37 include/fiche.inc.php:518 +#: include/class/acc_ledger.class.php:814 +#: include/class/acc_ledger_search.class.php:638 +#: include/class/acc_ledger_search.class.php:957 +#: include/class/acc_ledger_fin.class.php:548 +#: include/class/acc_ledger_fin.class.php:753 +#: include/class/anc_listing.class.php:79 +#: include/class/anc_operation.class.php:297 include/class/fiche.class.php:1396 +#: include/class/fiche.class.php:1471 include/lib/ac_common.php:1210 #: include/audit_log.php:37 include/template/letter_prop.php:25 #: include/template/letter_prop.php:68 #: include/template/print_ledger_simple.php:7 @@ -2672,10 +2723,10 @@ msgstr "" #: include/export/export_fiche_detail_csv.php:70 #: include/export/export_gl_csv.php:96 include/stock_inv_histo.inc.php:75 #: include/ajax/ajax_display_letter.php:54 -#: include/balance_card_ageing.inc.php:58 include/fiche.inc.php:518 +#: include/balance_card_ageing.inc.php:58 include/fiche.inc.php:527 #: include/class/print_ledger_detail_item.class.php:57 -#: include/class/acc_ledger_history_generic.class.php:679 -#: include/class/acc_ledger_history_generic.class.php:766 +#: include/class/acc_ledger_history_generic.class.php:680 +#: include/class/acc_ledger_history_generic.class.php:767 #: include/class/acc_ledger_sold.class.php:687 #: include/class/acc_ledger_sold.class.php:1397 #: include/class/acc_ledger.class.php:601 @@ -2694,7 +2745,7 @@ msgstr "" #: include/class/acc_ledger_history_sale.class.php:242 #: include/class/anc_operation.class.php:297 #: include/class/acc_account_ledger.class.php:392 -#: include/class/fiche.class.php:1396 include/class/fiche.class.php:1471 +#: include/class/fiche.class.php:1397 include/class/fiche.class.php:1472 #: include/class/acc_ledger_purchase.class.php:1407 #: include/class/acc_ledger_purchase.class.php:1826 #: include/class/pdf_operation.class.php:67 @@ -2831,6 +2882,8 @@ msgstr "" #: include/class/acc_ledger_purchase.class.php:1834 #: include/class/acc_ledger.class.php:611 #: include/class/acc_ledger.class.php:881 include/class/fiche.class.php:1459 +#: include/class/acc_ledger.class.php:886 +#: include/class/anc_listing.class.php:80 include/class/fiche.class.php:1473 #: include/template/ledger_detail_ven.php:154 #: include/template/ledger_detail_ach.php:152 #: include/export/export_poste_detail_csv.php:79 @@ -2838,11 +2891,11 @@ msgstr "" #: include/export/export_fiche_detail_csv.php:69 #: include/ajax/ajax_display_letter.php:50 include/database.item.php:62 #: include/database.item.php:77 -#: include/class/acc_ledger_history_generic.class.php:767 +#: include/class/acc_ledger_history_generic.class.php:768 #: include/class/acc_ledger_sold.class.php:1405 #: include/class/acc_ledger.class.php:611 #: include/class/acc_ledger.class.php:886 -#: include/class/anc_listing.class.php:80 include/class/fiche.class.php:1473 +#: include/class/anc_listing.class.php:80 include/class/fiche.class.php:1474 #: include/class/pre_op_advanced.class.php:196 #: include/class/acc_ledger_purchase.class.php:1834 #: include/class/anc_grandlivre.class.php:214 @@ -2931,8 +2984,9 @@ msgstr "" #: include/class/anc_grandlivre.class.php:220 #: include/class/fiche.class.php:1462 include/class/acc_ledger.class.php:613 #: include/class/acc_ledger.class.php:884 include/class/fiche.class.php:1464 -#: include/impress_gl_comptes.inc.php:216 include/template/letter_prop.php:37 -#: include/template/letter_prop.php:80 +#: include/operation_ods_new.inc.php:84 include/class/acc_ledger.class.php:889 +#: include/class/fiche.class.php:1478 include/impress_gl_comptes.inc.php:216 +#: include/template/letter_prop.php:37 include/template/letter_prop.php:80 #: include/template/ledger_detail_misc.php:102 #: include/template/ledger_detail_bottom.php:91 #: include/template/anc_balance_group.php:49 @@ -2944,12 +2998,13 @@ msgstr "" #: include/export/export_fiche_detail_csv.php:77 #: include/export/export_gl_csv.php:96 include/verif_bilan.inc.php:74 #: include/operation_ods_new.inc.php:84 include/balance.inc.php:315 -#: include/class/acc_ledger_history_generic.class.php:770 +#: include/class/anc_balance_double.class.php:99 +#: include/class/acc_ledger_history_generic.class.php:771 #: include/class/acc_ledger.class.php:613 #: include/class/acc_ledger.class.php:889 #: include/class/anc_group_operation.class.php:137 #: include/class/acc_account_ledger.class.php:399 -#: include/class/fiche.class.php:1478 +#: include/class/fiche.class.php:1479 #: include/class/pre_op_advanced.class.php:199 #: include/class/anc_grandlivre.class.php:220 #: include/class/anticipation.class.php:420 include/anc_od.inc.php:148 @@ -3018,7 +3073,8 @@ msgstr "" #: include/class/acc_ledger_history_generic.class.php:771 #: include/class/anc_grandlivre.class.php:221 #: include/class/fiche.class.php:1463 include/class/acc_ledger.class.php:614 -#: include/class/fiche.class.php:1465 include/impress_gl_comptes.inc.php:215 +#: include/class/fiche.class.php:1465 include/operation_ods_new.inc.php:85 +#: include/class/fiche.class.php:1479 include/impress_gl_comptes.inc.php:215 #: include/template/letter_prop.php:40 include/template/letter_prop.php:83 #: include/template/ledger_detail_misc.php:103 #: include/template/ledger_detail_bottom.php:92 @@ -3029,10 +3085,11 @@ msgstr "" #: include/export/export_fiche_detail_csv.php:78 #: include/export/export_gl_csv.php:96 include/verif_bilan.inc.php:74 #: include/operation_ods_new.inc.php:85 include/balance.inc.php:316 -#: include/class/acc_ledger_history_generic.class.php:771 +#: include/class/anc_balance_double.class.php:100 +#: include/class/acc_ledger_history_generic.class.php:772 #: include/class/acc_ledger.class.php:614 #: include/class/acc_account_ledger.class.php:400 -#: include/class/fiche.class.php:1479 +#: include/class/fiche.class.php:1480 #: include/class/anc_grandlivre.class.php:221 #: include/class/anticipation.class.php:421 include/anc_od.inc.php:149 msgid "Crédit" @@ -3083,6 +3140,7 @@ msgstr "" #: include/class/fiche.class.php:1542 #: include/class/acc_ledger_purchase.class.php:1588 #: include/class/acc_ledger.class.php:724 include/class/fiche.class.php:1544 +#: include/fiche.inc.php:440 include/class/fiche.class.php:1563 #: include/template/print_ledger_simple.php:143 #: include/template/acc_ledger_history_sale_detail.php:154 #: include/template/acc_ledger_history_purchase_detail.php:167 @@ -3091,12 +3149,12 @@ msgstr "" #: include/template/acc_ledger_history_purchase_extended.php:159 #: include/template/acc_ledger_history_sale_extended.php:159 #: include/template/forecast_result.php:31 -#: include/export/export_fiche_balance_pdf.php:153 include/fiche.inc.php:440 -#: include/class/acc_ledger_history_generic.class.php:737 +#: include/export/export_fiche_balance_pdf.php:153 include/fiche.inc.php:447 +#: include/class/acc_ledger_history_generic.class.php:738 #: include/class/acc_ledger_sold.class.php:844 #: include/class/acc_ledger.class.php:724 #: include/class/acc_account_ledger.class.php:439 -#: include/class/fiche.class.php:1563 +#: include/class/fiche.class.php:1564 #: include/class/acc_ledger_purchase.class.php:1588 #: include/class/balance_age.class.php:234 msgid "Totaux" @@ -3145,6 +3203,7 @@ msgstr "" #: include/class/acc_ledger_sold.class.php:1103 #: include/class/acc_ledger_purchase.class.php:1046 #: include/class/acc_ledger.class.php:832 +#: include/class/acc_ledger.class.php:837 #: include/class/acc_ledger_sold.class.php:1103 #: include/class/acc_ledger.class.php:837 #: include/class/acc_ledger_fin.class.php:294 @@ -3182,6 +3241,7 @@ msgstr "" #: include/class/acc_ledger_sold.class.php:1107 #: include/class/acc_ledger_purchase.class.php:1052 #: include/class/acc_ledger.class.php:837 +#: include/class/acc_ledger.class.php:842 #: include/class/acc_ledger_sold.class.php:1107 #: include/class/acc_ledger.class.php:842 #: include/class/acc_ledger_purchase.class.php:1052 @@ -3277,6 +3337,9 @@ msgstr "" #: include/class/acc_ledger_history_sale.class.php:245 #: include/class/acc_ledger_search.class.php:633 #: include/class/acc_ledger_search.class.php:945 +#: include/class/acc_ledger.class.php:858 +#: include/class/acc_ledger_search.class.php:646 +#: include/class/acc_ledger_search.class.php:958 include/lib/ac_common.php:1212 #: include/template/balance_aged_result.php:47 #: include/template/print_ledger_simple.php:6 #: include/template/acc_ledger_history_financial_oneline.php:33 @@ -3403,8 +3466,14 @@ msgstr "" #: include/class/acc_ledger_search.class.php:639 #: include/class/acc_ledger_search.class.php:949 #: include/class/print_ledger_misc.class.php:48 -#: include/class/fiche.class.php:1384 -#: include/template/operation_detail_fin.php:34 +#: include/class/fiche.class.php:1384 include/export/export_anc_axis_csv.php:46 +#: include/fiche.inc.php:522 include/class/acc_ledger.class.php:888 +#: include/class/acc_ledger_search.class.php:652 +#: include/class/acc_ledger_search.class.php:962 +#: include/class/acc_ledger_fin.class.php:551 +#: include/class/acc_ledger_fin.class.php:754 +#: include/class/anc_listing.class.php:86 include/class/fiche.class.php:1398 +#: include/lib/ac_common.php:1215 include/template/operation_detail_fin.php:34 #: include/template/acc_ledger_history_financial_oneline.php:36 #: include/template/ledger_detail_misc.php:54 #: include/template/ledger_detail_ven.php:157 @@ -3415,7 +3484,7 @@ msgstr "" #: include/export/export_anc_axis_csv.php:46 #: include/export/export_poste_detail_csv.php:201 #: include/export/export_form_csv.php:72 -#: include/ajax/ajax_anc_detail_operation.php:56 include/fiche.inc.php:522 +#: include/ajax/ajax_anc_detail_operation.php:56 include/fiche.inc.php:531 #: include/class/acc_ledger_sold.class.php:730 #: include/class/acc_ledger.class.php:888 #: include/class/acc_ledger_search.class.php:652 @@ -3424,7 +3493,7 @@ msgstr "" #: include/class/acc_ledger_fin.class.php:551 #: include/class/acc_ledger_fin.class.php:754 #: include/class/print_ledger_misc.class.php:48 -#: include/class/anc_listing.class.php:86 include/class/fiche.class.php:1398 +#: include/class/anc_listing.class.php:86 include/class/fiche.class.php:1399 #: include/class/pre_op_advanced.class.php:198 #: include/class/acc_ledger_purchase.class.php:1452 #: include/class/pdf_operation.class.php:249 @@ -3473,6 +3542,8 @@ msgstr "" #: include/class/acc_ledger.class.php:1243 #: include/class/acc_ledger.class.php:1109 #: include/class/acc_ledger.class.php:1252 +#: include/class/acc_ledger.class.php:1109 +#: include/class/acc_ledger.class.php:1252 #, php-format msgid "La fiche %s n'a pas de poste comptable" msgstr "" @@ -3486,6 +3557,7 @@ msgstr "" #: include/class/acc_ledger.class.php:1106 #: include/class/acc_ledger.class.php:1107 #: include/class/acc_ledger.class.php:1114 +#: include/class/acc_ledger.class.php:1114 msgid "Poste Inexistant pour la fiche [" msgstr "" @@ -3520,6 +3592,7 @@ msgstr "" #: include/class/acc_ledger.class.php:1118 #: include/class/acc_ledger.class.php:1119 #: include/class/acc_ledger.class.php:1128 +#: include/class/acc_ledger.class.php:1128 msgid "Poste invalide [" msgstr "" @@ -3532,6 +3605,7 @@ msgstr "" #: include/class/acc_ledger.class.php:1121 #: include/class/acc_ledger.class.php:1122 #: include/class/acc_ledger.class.php:1131 +#: include/class/acc_ledger.class.php:1131 msgid "Poste Inexistant [" msgstr "" @@ -3544,6 +3618,7 @@ msgstr "" #: include/class/acc_ledger.class.php:1148 #: include/class/acc_ledger.class.php:1149 #: include/class/acc_ledger.class.php:1158 +#: include/class/acc_ledger.class.php:1158 msgid "Balance incorrecte " msgstr "" @@ -3581,6 +3656,7 @@ msgstr "" #: include/class/acc_ledger.class.php:2204 #: include/class/acc_ledger.class.php:2205 #: include/class/acc_ledger.class.php:2214 +#: include/class/acc_ledger.class.php:2214 msgid "Journal n'existe pas" msgstr "" @@ -4156,7 +4232,8 @@ msgstr "" #: include/class/acc_ledger_sold.class.php:680 #: include/ext/modop/modop_save.php:170 #: include/class/acc_ledger_purchase.class.php:1401 -#: include/compta_ods.inc.php:99 include/class/acc_ledger_sold.class.php:680 +#: include/compta_ods.inc.php:99 include/compta_ods.inc.php:99 +#: include/class/acc_ledger_sold.class.php:680 #: include/class/acc_ledger_purchase.class.php:1401 include/opening.inc.php:87 msgid "Attention numéro pièce existante, elle a du être adaptée" msgstr "" @@ -4192,6 +4269,7 @@ msgstr "" #: include/class/acc_ledger_sold.class.php:690 #: include/class/acc_ledger_purchase.class.php:1410 #: include/class/acc_ledger_search.class.php:629 +#: include/class/acc_ledger_search.class.php:642 #: include/template/ledger_detail_ven.php:40 #: include/template/form_ledger_detail.php:30 #: include/template/ledger_detail_ach.php:31 @@ -4239,6 +4317,7 @@ msgstr "" #: include/class/acc_ledger_sold.class.php:700 #: include/class/acc_ledger_purchase.class.php:1422 #: include/class/acc_ledger_search.class.php:941 +#: include/class/acc_ledger_search.class.php:954 #: include/template/form_ledger_detail.php:11 #: include/export/export_poste_detail_pdf.php:96 #: include/export/export_histo_csv.php:37 @@ -4919,7 +4998,7 @@ msgstr "" #: include/class/acc_ledger_purchase.class.php:1784 #: include/class/acc_ledger_sold.class.php:1037 #: include/class/acc_ledger_purchase.class.php:1787 -#: include/history_operation.inc.php:150 +#: include/history_operation.inc.php:150 include/history_operation.inc.php:156 #: include/class/acc_ledger_sold.class.php:1037 #: include/class/acc_ledger_purchase.class.php:1787 #: include/history_operation.inc.php:156 @@ -5298,10 +5377,16 @@ msgstr "" #: include/class/acc_ledger_search.class.php:947 #: include/class/acc_ledger_search.class.php:1092 #: include/class/fiche.class.php:1383 include/class/fiche.class.php:1462 +#: include/export/export_anc_axis_csv.php:45 +#: include/class/acc_ledger_search.class.php:654 +#: include/class/acc_ledger_search.class.php:960 +#: include/class/acc_ledger_search.class.php:1105 +#: include/class/anc_listing.class.php:83 include/class/fiche.class.php:1397 +#: include/class/fiche.class.php:1476 include/lib/ac_common.php:1213 #: include/cfgplugin.inc.php:115 include/template/letter_prop.php:34 #: include/template/letter_prop.php:77 include/template/category_of_card.php:28 #: include/template/print_ledger_simple.php:11 -#: include/template/param_jrn.php:78 include/template/pcmn_update.php:38 +#: include/template/param_jrn.php:85 include/template/pcmn_update.php:38 #: include/template/menu_detail.php:43 #: include/template/acc_ledger_history_sale_detail.php:38 #: include/template/action_display_short.php:114 @@ -5338,7 +5423,7 @@ msgstr "" #: include/class/anc_listing.class.php:83 #: include/class/acc_account_ledger.class.php:397 #: include/class/anc_plan.class.php:138 include/class/anc_plan.class.php:154 -#: include/class/fiche.class.php:1397 include/class/fiche.class.php:1476 +#: include/class/fiche.class.php:1398 include/class/fiche.class.php:1477 #: include/class/user.class.php:991 include/class/anc_table.class.php:442 #: include/class/anc_account_table.class.php:49 include/lib/ac_common.php:1213 #: include/upgrade-plugin.php:62 include/card_attr.inc.php:95 @@ -5362,8 +5447,8 @@ msgstr "" #: include/class/class_anc_account.php:290 include/database.item.php:15 #: include/class/anc_account_table.class.php:50 include/database.item.php:9 #: include/database.item.php:51 include/export/export_anc_axis_csv.php:47 -#: include/database.item.php:7 include/database.item.php:51 -#: include/class/anc_account_table.class.php:50 +#: include/export/export_anc_axis_csv.php:47 include/database.item.php:7 +#: include/database.item.php:51 include/class/anc_account_table.class.php:50 msgid "Groupe" msgstr "" @@ -5372,7 +5457,7 @@ msgstr "" #: include/class/class_anc_balance_double.php:358 #: include/class/anc_balance_double.class.php:362 #: include/class/anc_balance_double.class.php:364 -#: include/class/anc_balance_double.class.php:364 +#: include/class/anc_balance_double.class.php:366 msgid "" "Selectionnez le plan qui vous intéresse avant de cliquer sur Recherche" msgstr "" @@ -5397,6 +5482,7 @@ msgstr "" #: include/class/anc_listing.class.php:79 #: include/class/anc_grandlivre.class.php:215 #: include/class/anc_listing.class.php:81 +#: include/class/anc_listing.class.php:81 #: include/class/anc_grandlivre.class.php:215 msgid "Quick_code" msgstr "" @@ -5406,6 +5492,7 @@ msgstr "" #: include/class/class_anc_listing.php:82 #: include/class/anc_listing.class.php:82 #: include/class/anc_listing.class.php:84 +#: include/class/anc_listing.class.php:84 msgid "libelle" msgstr "" @@ -5417,6 +5504,7 @@ msgstr "" #: include/ext/tools/include/anc_grandlivre_ext.class.php:125 #: include/class/anc_listing.class.php:83 #: include/class/anc_listing.class.php:85 +#: include/class/anc_listing.class.php:85 msgid "Num.interne" msgstr "" @@ -5442,7 +5530,7 @@ msgstr "" #: include/template/detail-action.php:372 #: include/class/class_anc_group_operation.php:190 #: include/class/anc_group_operation.class.php:207 -#: include/class/anticipation.class.php:431 +#: include/class/anticipation.class.php:431 include/template/stock_inv.php:106 #: include/template/detail-action.php:374 include/template/stock_inv.php:106 #: include/class/anc_group_operation.class.php:207 #: include/class/anticipation.class.php:431 @@ -5456,6 +5544,7 @@ msgstr "" #: include/class/anc_listing.class.php:80 #: include/class/pdf_operation.class.php:374 #: include/class/anc_listing.class.php:82 +#: include/class/anc_listing.class.php:82 #: include/class/pdf_operation.class.php:374 msgid "Analytique" msgstr "" @@ -5473,6 +5562,7 @@ msgstr "" #: include/export/export_poste_detail_csv.php:202 #: include/class/anc_listing.class.php:85 #: include/class/pdf_operation.class.php:250 +#: include/class/anc_listing.class.php:87 #: include/export/export_fiche_balance_csv.php:160 #: include/export/export_poste_detail_csv.php:202 #: include/ajax/ajax_anc_detail_operation.php:57 @@ -5501,7 +5591,7 @@ msgstr "" #: include/class_anc_print.php:130 include/class_anc_print.php:177 #: include/class_anc_print.php:179 include/class/class_anc_print.php:179 #: include/class/class_anc_print.php:181 include/class/anc_print.class.php:175 -#: include/class/anc_print.class.php:181 +#: include/class/anc_print.class.php:181 include/class/anc_print.class.php:181 msgid "Entre l'activité " msgstr "" @@ -5515,7 +5605,7 @@ msgstr "" #: include/class_anc_print.php:137 include/class_anc_print.php:179 #: include/class_anc_print.php:181 include/class/class_anc_print.php:181 #: include/class/class_anc_print.php:183 include/class/anc_print.class.php:177 -#: include/class/anc_print.class.php:183 +#: include/class/anc_print.class.php:183 include/class/anc_print.class.php:183 msgid " et l'activité " msgstr "" @@ -5604,6 +5694,7 @@ msgstr "" #: include/class/calendar.class.php:136 #: include/class/acc_ledger_search.class.php:940 #: include/class/acc_ledger_search.class.php:948 +#: include/class/acc_ledger_search.class.php:961 #: include/class/calendar.class.php:136 #: include/class/acc_ledger_search.class.php:961 msgid "Notes" @@ -5703,6 +5794,7 @@ msgstr "" #: include/class/document_modele.class.php:68 include/class/fiche.class.php:432 #: include/class/fiche.class.php:562 include/lib/html_input.class.php:386 #: include/class/fiche.class.php:434 include/class/fiche.class.php:564 +#: include/class/fiche.class.php:433 include/class/fiche.class.php:563 #: include/template/fiche_list.php:45 include/template/forecast-detail.php:11 #: include/class/fiche.class.php:433 include/class/fiche.class.php:563 #: include/class/document_modele.class.php:68 @@ -5805,6 +5897,7 @@ msgstr "" #: include/class/periode.class.php:594 include/class/periode.class.php:599 #: include/class/anc_operation.class.php:316 #: include/template/ledger_detail_bottom.php:328 +#: include/template/ledger_detail_bottom.php:328 #: include/template/anc_key_input.php:212 include/preod.inc.php:112 #: include/anc_group.inc.php:88 include/dossier.inc.php:281 #: include/dossier.inc.php:290 include/compta_fin.inc.php:150 @@ -5913,6 +6006,7 @@ msgstr "" #: include/ext/rapport_avance/include/rapav_declaration.class.php:361 #: include/ext/rapport_avance/include/rapav_declaration.class.php:434 #: include/class/document.class.php:311 include/class/document.class.php:285 +#: include/class/document.class.php:285 msgid "Ne peut pas sauver " msgstr "" @@ -5944,7 +6038,8 @@ msgstr "" #: include/class/document_type.class.php:75 #: include/lib/manage_table_sql.class.php:752 #: include/class/anc_operation.class.php:324 -#: include/class/anc_operation.class.php:318 include/dossier.inc.php:283 +#: include/class/anc_operation.class.php:318 +#: include/class/anc_operation.class.php:319 include/dossier.inc.php:283 #: include/ajax/ajax_get_profile.php:90 include/ajax/ajax_view_action.php:47 #: include/class/document_type.class.php:75 #: include/class/anc_operation.class.php:319 @@ -6019,7 +6114,7 @@ msgstr "" #: include/class_fiche_def.php:776 include/class_fiche_def.php:788 #: include/class/class_fiche_def.php:787 include/operation_ods_new.inc.php:95 #: include/class/fiche_def.class.php:788 include/operation_ods_new.inc.php:98 -#: include/class/fiche_def.class.php:788 +#: include/operation_ods_new.inc.php:98 include/class/fiche_def.class.php:788 msgid "Sauvez" msgstr "" @@ -6044,10 +6139,11 @@ msgstr "" #: include/class/class_fiche_def.php:790 include/class/class_fiche_def.php:795 #: include/ajax/ajax_add_menu.php:192 include/ajax/ajax_add_menu.php:200 #: include/class/fiche_def.class.php:791 include/class/fiche_def.class.php:796 -#: include/ajax/ajax_create_menu.php:13 include/template/fiche_list.php:30 -#: include/template/stock_inv.php:33 include/ajax/ajax_create_menu.php:13 -#: include/ajax/ajax_add_menu.php:200 include/class/fiche_def.class.php:791 -#: include/class/fiche_def.class.php:796 +#: include/ajax/ajax_create_menu.php:13 include/template/stock_inv.php:33 +#: include/template/fiche_list.php:30 include/template/stock_inv.php:33 +#: include/ajax/ajax_create_menu.php:13 include/ajax/ajax_add_menu.php:200 +#: include/class/fiche_def.class.php:791 include/class/fiche_def.class.php:796 +#: include/lib/message_javascript.php:78 msgid "Vous confirmez ?" msgstr "" @@ -6072,19 +6168,19 @@ msgstr "" #: include/class_fiche.php:406 include/class/class_fiche.php:406 #: include/class/fiche.class.php:408 include/class/fiche.class.php:410 -#: include/class/fiche.class.php:409 +#: include/class/fiche.class.php:409 include/class/fiche.class.php:409 msgid "Cette categorie de card n'existe pas" msgstr "" #: include/class_fiche.php:451 include/class/class_fiche.php:451 #: include/class/fiche.class.php:453 include/class/fiche.class.php:455 -#: include/class/fiche.class.php:454 +#: include/class/fiche.class.php:454 include/class/fiche.class.php:454 msgid "Rappel: Poste créé automatiquement à partir de " msgstr "" #: include/class_fiche.php:459 include/class/class_fiche.php:459 #: include/class/fiche.class.php:461 include/class/fiche.class.php:463 -#: include/class/fiche.class.php:462 +#: include/class/fiche.class.php:462 include/class/fiche.class.php:462 msgid "Rappel: Poste par défaut sera " msgstr "" @@ -6099,11 +6195,12 @@ msgstr "" #: include/export/export_poste_detail_csv.php:80 #: include/class/acc_ledger_history_generic.class.php:680 #: include/class/fiche.class.php:1456 include/class/fiche.class.php:1458 +#: include/class/fiche.class.php:1472 #: include/template/impress_reconciliation.php:16 #: include/export/export_poste_detail_csv.php:80 #: include/export/export_fiche_detail_csv.php:71 -#: include/class/acc_ledger_history_generic.class.php:680 -#: include/class/fiche.class.php:1472 +#: include/class/acc_ledger_history_generic.class.php:681 +#: include/class/fiche.class.php:1473 msgid "n° pièce" msgstr "" @@ -6153,7 +6250,8 @@ msgstr "" #: include/template/ledger_detail_bottom.php:89 #: include/template/ledger_detail_misc.php:100 #: include/class/fiche.class.php:1758 include/class/fiche.class.php:1760 -#: include/template/fiche_list.php:34 +#: include/class/acc_ledger_fin.class.php:753 +#: include/class/fiche.class.php:1778 include/template/fiche_list.php:34 #: include/template/ledger_detail_misc.php:100 #: include/template/ledger_detail_bottom.php:89 #: include/template/ledger_detail_ven.php:126 @@ -6163,7 +6261,7 @@ msgstr "" #: include/template/ledger_detail_ach.php:118 #: include/ajax/ajax_boxcard_search.php:50 include/database.item.php:159 #: include/class/acc_ledger_fin.class.php:753 -#: include/class/fiche.class.php:1778 +#: include/class/fiche.class.php:1779 msgid "Quick Code" msgstr "" @@ -6177,10 +6275,10 @@ msgstr "" #: include/export/export_stock_resume_list.php:38 #: include/class/class_fiche.php:1601 include/class/class_fiche.php:1604 #: include/class/fiche.class.php:1758 include/class/fiche.class.php:1761 -#: include/class/fiche.class.php:1763 include/audit_log.php:38 -#: include/template/stock_summary_list.php:39 +#: include/class/fiche.class.php:1763 include/class/fiche.class.php:1781 +#: include/audit_log.php:38 include/template/stock_summary_list.php:39 #: include/export/export_stock_resume_list.php:38 -#: include/ajax/ajax_mod_stock_repo.php:47 include/class/fiche.class.php:1781 +#: include/ajax/ajax_mod_stock_repo.php:47 include/class/fiche.class.php:1782 #: include/stock_cfg.inc.php:66 msgid "Adresse" msgstr "" @@ -6191,7 +6289,7 @@ msgstr "" #: include/class/class_fiche.php:1603 include/class/class_fiche.php:1602 #: include/class/class_fiche.php:1605 include/class/fiche.class.php:1759 #: include/class/fiche.class.php:1762 include/class/fiche.class.php:1764 -#: include/class/fiche.class.php:1782 +#: include/class/fiche.class.php:1782 include/class/fiche.class.php:1783 msgid "Total débit" msgstr "" @@ -6201,7 +6299,7 @@ msgstr "" #: include/class/class_fiche.php:1604 include/class/class_fiche.php:1603 #: include/class/class_fiche.php:1606 include/class/fiche.class.php:1760 #: include/class/fiche.class.php:1763 include/class/fiche.class.php:1765 -#: include/class/fiche.class.php:1783 +#: include/class/fiche.class.php:1783 include/class/fiche.class.php:1784 msgid "Total crédit" msgstr "" @@ -6219,13 +6317,16 @@ msgstr "" #: include/class/anc_listing.class.php:118 include/class/fiche.class.php:1761 #: include/balance.inc.php:317 include/class/acc_bilan.class.php:176 #: include/class/fiche.class.php:1764 include/class/fiche.class.php:1766 +#: include/export/export_balance_pdf.php:135 +#: include/class/anc_listing.class.php:120 include/class/fiche.class.php:1784 #: include/template/anc_balance_group.php:51 #: include/template/anc_balance_group.php:72 #: include/export/export_gl_pdf.php:88 #: include/export/export_balance_pdf.php:135 #: include/export/export_gl_csv.php:96 include/balance.inc.php:317 +#: include/class/anc_balance_double.class.php:101 #: include/class/acc_bilan.class.php:176 -#: include/class/anc_listing.class.php:120 include/class/fiche.class.php:1784 +#: include/class/anc_listing.class.php:120 include/class/fiche.class.php:1785 msgid "Solde" msgstr "" @@ -6303,6 +6404,7 @@ msgstr "" #: include/class/acc_ledger_search.class.php:1069 #: include/class/acc_ledger_search.class.php:1077 #: include/class/acc_ledger_search.class.php:1090 +#: include/class/acc_ledger_search.class.php:1090 msgid "Filtre " msgstr "" @@ -6377,8 +6479,9 @@ msgstr "" #: include/lib/html_input.class.php:434 include/lib/html_input.class.php:449 #: include/ajax/ajax_card.php:312 include/class/extension.class.php:270 #: html/user_login.php:106 html/recherche.php:87 html/recherche.php:132 -#: html/user_login.php:106 html/recherche.php:87 html/recherche.php:132 -#: include/user.inc.php:88 include/template/ledger_detail_bottom.php:302 +#: include/template/ledger_detail_bottom.php:303 html/user_login.php:106 +#: html/recherche.php:87 html/recherche.php:132 include/user.inc.php:88 +#: include/template/ledger_detail_bottom.php:302 #: include/template/ledger_detail_bottom.php:303 #: include/template/ledger_detail_top.php:16 #: include/template/action_search.php:156 include/ajax/ajax_card.php:312 @@ -6411,6 +6514,7 @@ msgstr "" #: include/class_ibutton.php:82 include/class_ibutton.php:84 #: include/lib/class_ibutton.php:84 include/lib/ibutton.class.php:84 +#: include/lib/message_javascript.php:97 msgid "Calculatrice" msgstr "" @@ -6426,7 +6530,7 @@ msgstr "" #: include/class/anc_account_table.class.php:87 #: include/class/anc_key.class.php:153 include/lib/itva_popup.class.php:139 #: include/ajax/ajax_anc_plan.php:51 include/ajax/ajax_anc_plan.php:52 -#: include/class/anc_key.class.php:153 +#: include/ajax/ajax_anc_plan.php:52 include/class/anc_key.class.php:153 #: include/class/anc_account_table.class.php:87 #: include/lib/itva_popup.class.php:139 msgid "Le nom ne peut être vide" @@ -6864,9 +6968,10 @@ msgstr "" #: include/database.item.php:247 include/class/acc_ledger_search.class.php:1078 #: include/database.item.php:208 include/database.item.php:222 #: include/cfgledger.inc.php:171 include/class/acc_ledger_search.class.php:1086 -#: include/cfgledger.inc.php:171 include/database.item.php:2 -#: include/database.item.php:66 include/database.item.php:208 -#: include/database.item.php:222 include/class/acc_ledger_search.class.php:1099 +#: include/class/acc_ledger_search.class.php:1099 include/cfgledger.inc.php:171 +#: include/database.item.php:2 include/database.item.php:66 +#: include/database.item.php:208 include/database.item.php:222 +#: include/class/acc_ledger_search.class.php:1099 msgid "Achat" msgstr "" @@ -6986,9 +7091,9 @@ msgstr "" #: include/database.item.php:246 include/class/acc_ledger_search.class.php:1076 #: include/database.item.php:211 include/database.item.php:221 #: include/cfgledger.inc.php:173 include/class/acc_ledger_search.class.php:1084 -#: include/cfgledger.inc.php:173 include/database.item.php:9 -#: include/database.item.php:211 include/database.item.php:221 -#: include/class/acc_ledger_search.class.php:1097 +#: include/class/acc_ledger_search.class.php:1097 include/cfgledger.inc.php:173 +#: include/database.item.php:9 include/database.item.php:211 +#: include/database.item.php:221 include/class/acc_ledger_search.class.php:1097 msgid "Vente" msgstr "" @@ -8148,7 +8253,7 @@ msgstr "" #: include/admin_repo.inc.php:63 include/database.item.php:130 #: html/user_login.php:160 include/admin_repo.inc.php:65 #: include/database.item.php:124 html/user_login.php:166 -#: html/user_login.php:166 include/admin_repo.inc.php:65 +#: html/user_login.php:143 include/admin_repo.inc.php:65 #: include/database.item.php:122 msgid "Administration" msgstr "" @@ -8583,7 +8688,7 @@ msgstr "" #: include/database.item.php:180 include/database.item.php:183 #: include/user.inc.php:84 include/database.item.php:191 #: include/ajax/ajax_preference.php:74 include/user.inc.php:84 -#: include/ajax/ajax_preference.php:74 include/database.item.php:183 +#: include/ajax/ajax_preference.php:85 include/database.item.php:183 msgid "Email" msgstr "" @@ -8699,7 +8804,8 @@ msgstr "" #: include/database.item.php:228 include/database.item.php:245 #: include/class/acc_ledger_search.class.php:1074 include/database.item.php:209 #: include/database.item.php:220 include/cfgledger.inc.php:170 -#: include/class/acc_ledger_search.class.php:1082 include/cfgledger.inc.php:170 +#: include/class/acc_ledger_search.class.php:1082 +#: include/class/acc_ledger_search.class.php:1095 include/cfgledger.inc.php:170 #: include/database.item.php:209 include/database.item.php:220 #: include/class/acc_ledger_search.class.php:1095 include/lib/user_menu.php:178 msgid "Financier" @@ -8958,7 +9064,8 @@ msgstr "" #: include/export/export_fiche_balance_csv.php:140 #: include/export/export_fiche_balance_csv.php:153 #: include/export/export_fiche_balance_csv.php:154 include/fiche.inc.php:517 -#: include/export/export_fiche_balance_csv.php:154 include/fiche.inc.php:519 +#: include/fiche.inc.php:519 include/export/export_fiche_balance_csv.php:154 +#: include/fiche.inc.php:528 msgid "ref" msgstr "" @@ -9013,7 +9120,8 @@ msgstr "" #: include/class/acc_ledger_sold.class.php:1403 #: include/class/anc_grandlivre.class.php:219 #: include/class/acc_ledger_purchase.class.php:1832 -#: include/class/print_ledger_misc.class.php:45 +#: include/class/print_ledger_misc.class.php:45 include/fiche.inc.php:520 +#: include/class/fiche.class.php:1474 #: include/template/balance_aged_result.php:53 #: include/template/acc_ledger_history_purchase_oneline.php:44 #: include/template/acc_ledger_history_sale_oneline.php:41 @@ -9022,12 +9130,12 @@ msgstr "" #: include/template/letter_all.php:29 #: include/export/export_fiche_balance_csv.php:155 #: include/export/export_poste_detail_csv.php:85 -#: include/export/export_poste_detail_csv.php:197 include/fiche.inc.php:520 -#: include/class/acc_ledger_history_generic.class.php:765 +#: include/export/export_poste_detail_csv.php:197 include/fiche.inc.php:529 +#: include/class/acc_ledger_history_generic.class.php:766 #: include/class/acc_ledger_sold.class.php:1403 #: include/class/print_ledger_misc.class.php:45 #: include/class/acc_reconciliation.class.php:492 -#: include/class/fiche.class.php:1474 +#: include/class/fiche.class.php:1475 #: include/class/acc_ledger_purchase.class.php:1832 #: include/class/anc_grandlivre.class.php:219 #: include/class/balance_age.class.php:149 @@ -9040,7 +9148,8 @@ msgstr "" #: include/export/export_fiche_balance_csv.php:142 #: include/export/export_fiche_balance_csv.php:155 #: include/export/export_fiche_balance_csv.php:156 include/fiche.inc.php:519 -#: include/export/export_fiche_balance_csv.php:156 include/fiche.inc.php:521 +#: include/fiche.inc.php:521 include/export/export_fiche_balance_csv.php:156 +#: include/fiche.inc.php:530 msgid "Comm" msgstr "" @@ -9067,10 +9176,10 @@ msgstr "" #: include/export/export_fiche_detail_csv.php:79 #: include/export/export_poste_detail_csv.php:90 #: include/class/anc_grandlivre.class.php:221 -#: include/class/anc_grandlivre.class.php:222 +#: include/class/anc_grandlivre.class.php:222 include/fiche.inc.php:523 #: include/export/export_fiche_balance_csv.php:159 #: include/export/export_poste_detail_csv.php:90 -#: include/export/export_fiche_detail_csv.php:79 include/fiche.inc.php:523 +#: include/export/export_fiche_detail_csv.php:79 include/fiche.inc.php:532 #: include/class/anc_grandlivre.class.php:222 msgid "Prog." msgstr "" @@ -9083,10 +9192,10 @@ msgstr "" #: include/export/export_poste_detail_csv.php:78 #: include/export/export_fiche_balance_csv.php:161 include/fiche.inc.php:522 #: include/export/export_fiche_detail_csv.php:80 -#: include/export/export_poste_detail_csv.php:91 +#: include/export/export_poste_detail_csv.php:91 include/fiche.inc.php:524 #: include/export/export_fiche_balance_csv.php:161 #: include/export/export_poste_detail_csv.php:91 -#: include/export/export_fiche_detail_csv.php:80 include/fiche.inc.php:524 +#: include/export/export_fiche_detail_csv.php:80 include/fiche.inc.php:533 msgid "Let." msgstr "" @@ -9146,42 +9255,46 @@ msgstr "" #: include/fiche.inc.php:63 include/ext/rapport_avance/index.php:58 #: include/template/calendar.php:10 include/ext/rapport_avance/index.php:60 #: include/ext/listing/index.php:60 include/ext/listing/index.php:58 -#: include/template/calendar.php:10 include/fiche.inc.php:64 +#: include/fiche.inc.php:64 include/template/calendar.php:10 +#: include/fiche.inc.php:64 msgid "Liste" msgstr "" -#: include/fiche.inc.php:65 include/fiche.inc.php:66 +#: include/fiche.inc.php:65 include/fiche.inc.php:66 include/fiche.inc.php:66 msgid "Historique Lettré" msgstr "" -#: include/fiche.inc.php:66 include/fiche.inc.php:67 +#: include/fiche.inc.php:66 include/fiche.inc.php:67 include/fiche.inc.php:67 msgid "Historique Lettré et montants différents" msgstr "" -#: include/fiche.inc.php:67 include/fiche.inc.php:68 +#: include/fiche.inc.php:67 include/fiche.inc.php:68 include/fiche.inc.php:68 msgid "Historique non Lettré" msgstr "" #: include/fiche.inc.php:68 include/balance.inc.php:184 #: include/class/class_pdf_operation.php:107 #: include/class/pdf_operation.class.php:107 include/fiche.inc.php:69 -#: include/class/pdf_operation.class.php:107 +#: include/fiche.inc.php:69 include/class/pdf_operation.class.php:107 msgid "Résumé" msgstr "" #: include/fiche.inc.php:70 include/fiche.inc.php:72 include/fiche.inc.php:73 +#: include/fiche.inc.php:73 msgid "Balance non soldée" msgstr "" #: include/fiche.inc.php:175 include/fiche.inc.php:179 #: include/fiche.inc.php:181 include/fiche.inc.php:182 #: include/fiche.inc.php:183 include/fiche.inc.php:184 +#: include/fiche.inc.php:184 msgid "Fiche non effacées" msgstr "" #: include/fiche.inc.php:176 include/fiche.inc.php:180 #: include/fiche.inc.php:182 include/fiche.inc.php:183 #: include/fiche.inc.php:184 include/fiche.inc.php:185 +#: include/fiche.inc.php:185 msgid " Ces fiches n'ont pas été effacées " msgstr "" @@ -9190,12 +9303,14 @@ msgstr "" #: include/fiche.inc.php:383 include/fiche.inc.php:386 #: include/fiche.inc.php:133 include/fiche.inc.php:387 #: include/fiche.inc.php:134 include/fiche.inc.php:388 +#: include/fiche.inc.php:134 include/fiche.inc.php:395 msgid "Aucune fiche trouvée" msgstr "" #: include/fiche.inc.php:312 include/fiche.inc.php:317 #: include/fiche.inc.php:390 include/fiche.inc.php:393 #: include/fiche.inc.php:394 include/fiche.inc.php:395 +#: include/fiche.inc.php:402 msgid "Filtre rapide:" msgstr "" @@ -9371,6 +9486,8 @@ msgstr "" #: include/ext/coprop/include/appel_fond.inc.php:158 #: include/ext/coprop/include/coprop_appel_fond.class.php:252 #: include/operation_ods_new.inc.php:86 +#: include/class/acc_ledger_fin.class.php:645 +#: include/operation_ods_new.inc.php:86 #: include/class/acc_ledger_fin.class.php:645 include/anc_od.inc.php:150 msgid "Difference" msgstr "" @@ -9388,7 +9505,7 @@ msgstr "" #: include/ext/coprop/include/appel_fond.inc.php:83 #: include/ext/coprop/include/appel_fond.inc.php:153 #: include/ext/coprop/include/coprop_appel_fond.class.php:247 -#: include/operation_ods_new.inc.php:97 +#: include/operation_ods_new.inc.php:97 include/operation_ods_new.inc.php:97 msgid "Ajout d'une ligne" msgstr "" @@ -9404,9 +9521,10 @@ msgstr "" #: include/class/class_fiche.php:1602 include/class/class_pdf_operation.php:246 #: include/class/fiche.class.php:1756 include/class/pdf_operation.class.php:246 #: include/ajax/ajax_boxcard_search.php:65 include/class/fiche.class.php:1759 -#: include/class/fiche.class.php:1761 include/template/pcmn_update.php:28 -#: include/template/pcmn_update.php:36 include/template/account_result.php:13 -#: include/ajax/ajax_boxcard_search.php:65 include/class/fiche.class.php:1779 +#: include/class/fiche.class.php:1761 include/class/fiche.class.php:1779 +#: include/template/pcmn_update.php:28 include/template/pcmn_update.php:36 +#: include/template/account_result.php:13 +#: include/ajax/ajax_boxcard_search.php:65 include/class/fiche.class.php:1780 #: include/class/pdf_operation.class.php:246 msgid "Poste comptable" msgstr "" @@ -9878,7 +9996,9 @@ msgstr "" #: include/class/acc_plan_mtable.class.php:46 #: include/class/fiche.class.php:1461 #: include/class/acc_ledger_search.class.php:1093 -#: include/class/fiche.class.php:1463 include/user.inc.php:147 +#: include/class/fiche.class.php:1463 +#: include/class/acc_ledger_search.class.php:1106 +#: include/class/fiche.class.php:1477 include/user.inc.php:147 #: include/template/pcmn_update.php:42 include/template/menu_detail.php:51 #: include/template/impress_cat_card.php:10 #: include/template/detail-action.php:29 @@ -9887,7 +10007,7 @@ msgstr "" #: include/class/acc_ledger_search.class.php:1106 #: include/class/acc_plan_mtable.class.php:46 #: include/class/acc_account_ledger.class.php:398 -#: include/class/fiche.class.php:1477 include/card_attr.inc.php:96 +#: include/class/fiche.class.php:1478 include/card_attr.inc.php:96 msgid "Type" msgstr "" @@ -9978,11 +10098,12 @@ msgstr "" #: include/class/acc_ledger_sold.class.php:1406 #: include/class/acc_ledger_purchase.class.php:1835 #: include/class/print_ledger_misc.class.php:47 +#: include/class/acc_ledger_fin.class.php:550 #: include/template/detail-action.php:245 #: include/template/form_ledger_fin.php:42 #: include/export/export_stock_histo_csv.php:44 #: include/stock_inv_histo.inc.php:78 -#: include/class/acc_ledger_history_generic.class.php:683 +#: include/class/acc_ledger_history_generic.class.php:684 #: include/class/acc_ledger_sold.class.php:1406 #: include/class/acc_ledger_fin.class.php:550 #: include/class/print_ledger_misc.class.php:47 @@ -10376,7 +10497,9 @@ msgstr "" #: include/class/pdf_operation.class.php:199 #: include/export/export_gl_csv.php:219 #: include/class/anc_balance_double.class.php:276 -#: include/template/letter_prop.php:169 +#: include/class/anc_listing.class.php:115 +#: include/class/anc_listing.class.php:117 +#: include/class/anc_listing.class.php:118 include/template/letter_prop.php:169 #: include/template/stock_summary_table.php:41 #: include/template/ledger_detail_ven.php:140 #: include/template/ledger_detail_ven.php:250 @@ -10394,7 +10517,8 @@ msgstr "" #: include/template/ledger_detail_ach.php:252 #: include/template/ledger_detail_ach.php:254 #: include/export/export_gl_csv.php:157 include/export/export_gl_csv.php:219 -#: include/class/anc_balance_double.class.php:276 +#: include/class/anc_balance_double.class.php:83 +#: include/class/anc_balance_double.class.php:278 #: include/class/anc_balance_simple.class.php:170 #: include/class/anc_listing.class.php:115 #: include/class/anc_listing.class.php:117 @@ -10407,6 +10531,7 @@ msgstr "" #: include/template/form_ledger_fin.php:31 #: include/ext/modop/template_ledger_fin.php:10 #: include/ext/modop/template_ledger_fin.php:14 +#: include/class/acc_ledger_fin.class.php:527 #: include/template/form_ledger_fin.php:31 #: include/class/acc_ledger_fin.class.php:527 msgid "Extrait de compte" @@ -10431,6 +10556,7 @@ msgstr "" #: include/template/form_ledger_fin.php:45 #: include/template/form_ledger_fin.php:44 +#: include/class/acc_ledger_fin.class.php:552 #: include/template/form_ledger_fin.php:44 #: include/class/acc_ledger_fin.class.php:552 msgid "Op. Concernée(s)" @@ -10447,7 +10573,7 @@ msgstr "" #: include/template/impress_cat_card.php:18 #: include/template/stock_histo_search.php:47 include/class_anc_print.php:159 #: include/class/class_anc_print.php:159 include/class/class_anc_print.php:161 -#: include/class/anc_print.class.php:155 +#: include/class/anc_print.class.php:155 include/class/anc_print.class.php:153 #: include/template/stock_histo_search.php:47 #: include/template/impress_cat_card.php:18 #: include/class/anc_print.class.php:153 @@ -10510,7 +10636,7 @@ msgstr "" #: include/export/export_stock_histo_csv.php:45 #: include/template/acc_ledger_history_purchase_extended.php:126 #: include/template/acc_ledger_history_sale_extended.php:126 -#: include/template/ledger_detail_ven.php:129 +#: include/template/stock_inv.php:71 include/template/ledger_detail_ven.php:129 #: include/template/operation_detail_ven.php:38 #: include/template/acc_ledger_history_purchase_extended.php:126 #: include/template/operation_detail_ach.php:46 @@ -10627,6 +10753,7 @@ msgstr "" #: include/template/ledger_detail_bottom.php:303 #: include/template/ledger_detail_bottom.php:320 #: include/template/ledger_detail_bottom.php:321 +#: include/template/ledger_detail_bottom.php:321 msgid "verifie CA" msgstr "" @@ -10647,6 +10774,8 @@ msgstr "" #: include/template/ledger_detail_bottom.php:348 #: include/template/ledger_detail_bottom.php:336 #: include/template/ledger_detail_bottom.php:349 +#: include/template/ledger_detail_bottom.php:336 +#: include/template/ledger_detail_bottom.php:349 msgid "Extourner" msgstr "" @@ -10781,31 +10910,31 @@ msgstr "" #: include/export/export_fiche_detail_csv.php:74 #: include/export/export_poste_detail_csv.php:81 #: include/export/export_poste_detail_csv.php:82 -#: include/template/param_jrn.php:7 +#: include/template/param_jrn.php:14 #: include/export/export_poste_detail_csv.php:82 #: include/export/export_fiche_detail_csv.php:74 msgid "Nom journal" msgstr "" -#: include/template/param_jrn.php:15 include/template/param_jrn.php:15 +#: include/template/param_jrn.php:15 include/template/param_jrn.php:22 msgid "Postes utilisables journal (débit/crédit) " msgstr "" -#: include/template/param_jrn.php:21 include/template/param_jrn.php:21 +#: include/template/param_jrn.php:21 include/template/param_jrn.php:28 msgid "" "Uniquement pour les journaux d'Opérations Diverses, les valeurs sont " "séparées par des espaces, on peut aussi\n" "\tutiliser le * pour indiquer 'tous les postes qui en dépendent' exemple: 4*" msgstr "" -#: include/template/param_jrn.php:33 include/template/param_jrn.php:33 +#: include/template/param_jrn.php:33 include/template/param_jrn.php:40 msgid "Numérotation de chaque opération" msgstr "" #: include/template/param_jrn.php:41 include/template/ledger_detail_fin.php:34 #: include/template/operation_detail_fin.php:31 #: include/template/ledger_detail_fin.php:35 -#: include/compta_fin_saldo.inc.php:48 include/template/param_jrn.php:41 +#: include/compta_fin_saldo.inc.php:48 include/template/param_jrn.php:48 #: include/template/operation_detail_fin.php:31 #: include/template/ledger_detail_fin.php:35 #: include/compta_fin_saldo.inc.php:48 @@ -10818,17 +10947,17 @@ msgid "" msgstr "" #: include/template/param_jrn.php:78 include/template/param_jrn.php:85 -#: include/template/param_jrn.php:85 +#: include/template/param_jrn.php:6 msgid "Type de journal" msgstr "" #: include/template/param_jrn.php:84 include/template/param_jrn.php:91 -#: include/template/param_jrn.php:91 +#: include/template/param_jrn.php:93 msgid "Préfixe code interne" msgstr "" #: include/template/param_jrn.php:88 include/template/param_jrn.php:95 -#: include/template/param_jrn.php:95 +#: include/template/param_jrn.php:97 msgid "Préfixe pièce justificative" msgstr "" @@ -10844,12 +10973,12 @@ msgid "Uniquement des chiffres" msgstr "" #: include/template/param_jrn.php:102 include/template/param_jrn.php:99 -#: include/template/param_jrn.php:106 include/template/param_jrn.php:106 +#: include/template/param_jrn.php:106 include/template/param_jrn.php:108 msgid "Dernière pièce numérotée" msgstr "" #: include/template/param_jrn.php:110 include/template/param_jrn.php:108 -#: include/template/param_jrn.php:115 include/template/param_jrn.php:115 +#: include/template/param_jrn.php:115 include/template/param_jrn.php:117 msgid "N° pièce justificative" msgstr "" @@ -10867,6 +10996,7 @@ msgstr "" #: include/stock_inv_histo.inc.php:79 include/template/stock_inv.php:43 #: include/template/stock_inv.php:117 include/stock_inv_histo.inc.php:81 #: include/template/stock_inv.php:45 include/template/stock_inv.php:118 +#: include/template/stock_inv.php:45 include/template/stock_inv.php:118 #: include/template/profile_sec_repository.php:35 #: include/stock_inv_histo.inc.php:81 msgid "Dépot" @@ -11114,8 +11244,8 @@ msgstr "" #: include/class/acc_ledger.class.php:86 include/lib/http_input.class.php:120 #: include/class/acc_ledger.class.php:88 include/class/periode.class.php:235 #: include/lib/http_input.class.php:121 include/class/acc_ledger.class.php:89 -#: include/class/acc_ledger.class.php:89 include/class/periode.class.php:235 -#: include/lib/http_input.class.php:123 +#: include/lib/http_input.class.php:123 include/class/acc_ledger.class.php:89 +#: include/class/periode.class.php:235 include/lib/http_input.class.php:123 msgid "Paramètre invalide" msgstr "" @@ -11276,11 +11406,12 @@ msgstr "" #: include/template/periode_add_exercice.php:25 #: include/ajax/ajax_preference.php:131 include/class/periode.class.php:519 #: include/class/periode_ledger_table.class.php:100 +#: include/template/stock_inv.php:126 #: include/template/periode_add_exercice.php:25 #: include/template/stock_state_search.php:35 #: include/template/stock_inv.php:126 include/impress_rapport.inc.php:207 #: include/impress_jrn.inc.php:102 include/compta_fin_saldo.inc.php:43 -#: include/ajax/ajax_preference.php:131 +#: include/ajax/ajax_preference.php:142 #: include/class/periode_ledger_table.class.php:100 #: include/class/periode.class.php:519 include/bank.inc.php:72 #: include/impress_bilan.inc.php:49 @@ -11327,6 +11458,7 @@ msgstr "" #: include/ext/tva/class_ext_tvagen.php:114 #: include/ext/tva/ext_list_assujetti.class.php:54 #: include/ext/tva/ext_tvagen.class.php:114 +#: include/lib/message_javascript.php:94 msgid "Afficher" msgstr "" @@ -11661,6 +11793,7 @@ msgstr "" #: include/class/acc_compute.class.php:195 #: include/ext/amortis/include/am_card.class.php:279 #: include/class/acc_ledger.class.php:1105 +#: include/class/acc_ledger.class.php:1105 #: include/class/acc_compute.class.php:195 msgid "Montant invalide" msgstr "" @@ -11678,7 +11811,7 @@ msgid "Poste à créditer incorrect" msgstr "" #: include/ext/amortis/include/class_am_card.php:245 html/fid_card.php:169 -#: html/fid_card.php:170 html/fid_card.php:175 +#: html/fid_card.php:170 html/fid_card.php:175 html/fid_card.php:174 msgid "Non trouvé" msgstr "" @@ -11730,6 +11863,8 @@ msgstr "" #: include/class/acc_ledger_search.class.php:681 #: include/class/acc_ledger_search.class.php:699 #: include/class/acc_ledger_fin.class.php:753 +#: include/class/acc_ledger_search.class.php:699 +#: include/class/acc_ledger_fin.class.php:753 msgid "n° interne" msgstr "" @@ -11760,6 +11895,7 @@ msgstr "" #: include/lib/manage_table_sql.class.php:1075 #: include/lib/manage_table_sql.class.php:1095 #: include/lib/manage_table_sql.class.php:1092 +#: include/lib/manage_table_sql.class.php:1092 msgid "Effacé" msgstr "" @@ -11794,10 +11930,13 @@ msgstr "" #: include/class/acc_account_ledger.class.php:735 #: include/class/fiche.class.php:1599 include/class/fiche.class.php:2189 #: html/popup.php:113 include/class/fiche.class.php:1601 -#: include/class/fiche.class.php:2191 html/popup.php:113 -#: include/balance_card_ageing.inc.php:53 include/fiche.inc.php:297 -#: include/fiche.inc.php:333 include/class/acc_account_ledger.class.php:735 -#: include/class/fiche.class.php:1619 include/class/fiche.class.php:2214 +#: include/class/fiche.class.php:2191 include/fiche.inc.php:297 +#: include/fiche.inc.php:333 include/class/fiche.class.php:1619 +#: include/class/fiche.class.php:2214 include/anc_pa.inc.php:123 +#: html/popup.php:113 include/balance_card_ageing.inc.php:53 +#: include/fiche.inc.php:242 include/fiche.inc.php:302 +#: include/fiche.inc.php:340 include/class/acc_account_ledger.class.php:735 +#: include/class/fiche.class.php:1620 include/class/fiche.class.php:2215 #: include/anc_pa.inc.php:123 msgid "Export CSV" msgstr "" @@ -11905,7 +12044,7 @@ msgstr "" #: include/export/export_poste_detail_csv.php:83 #: include/export/export_poste_detail_csv.php:196 #: include/export/export_ledger_csv.php:211 -#: include/class/acc_ledger_history_generic.class.php:768 +#: include/class/acc_ledger_history_generic.class.php:769 #: include/class/acc_account_ledger.class.php:394 #: include/class/balance_age.class.php:144 msgid "QuickCode" @@ -12492,6 +12631,7 @@ msgstr "" #: include/class/anc_operation.class.php:625 #: include/class/anc_operation.class.php:619 #: include/class/anc_operation.class.php:620 +#: include/class/anc_operation.class.php:620 msgid "Reste" msgstr "" @@ -12538,6 +12678,7 @@ msgstr "" #: include/class/acc_ledger_search.class.php:933 #: include/class/acc_ledger_search.class.php:928 #: include/class/acc_ledger_search.class.php:936 +#: include/class/acc_ledger_search.class.php:949 #: include/template/fiche_list.php:49 #: include/class/acc_ledger_search.class.php:949 include/card_attr.inc.php:84 msgid "Selection" @@ -12656,7 +12797,7 @@ msgstr "" #: include/ext/import_account/include/template/test_operation.php:26 #: include/ext/import_card/include/template/test_file.php:42 #: include/ext/import_doli/include/template/test_file.php:30 -#: include/ajax/ajax_preference.php:213 include/ajax/ajax_preference.php:213 +#: include/ajax/ajax_preference.php:213 include/ajax/ajax_preference.php:224 msgid "Encodage" msgstr "" @@ -12858,6 +12999,7 @@ msgstr "" #: include/template/ledger_detail_bottom.php:354 #: include/ajax/ajax_ledger.php:544 #: include/template/ledger_detail_bottom.php:355 +#: include/template/ledger_detail_bottom.php:355 #: include/ajax/ajax_ledger.php:544 msgid "entrez une date" msgstr "" @@ -12904,6 +13046,7 @@ msgid "Vous n\\'êtes pas administrateur" msgstr "" #: html/fid_card.php:164 html/fid_card.php:165 html/fid_card.php:170 +#: html/fid_card.php:169 #, php-format msgid "Résultat limité à 12" msgstr "" @@ -12935,9 +13078,10 @@ msgstr "" #: html/popup.php:111 include/class/acc_account_ledger.class.php:757 #: include/class/fiche.class.php:1584 include/class/fiche.class.php:2211 #: html/popup.php:114 include/class/fiche.class.php:1586 -#: include/class/fiche.class.php:2213 html/popup.php:114 +#: include/class/fiche.class.php:2213 include/class/fiche.class.php:1604 +#: include/class/fiche.class.php:2236 html/popup.php:114 #: include/class/acc_account_ledger.class.php:757 -#: include/class/fiche.class.php:1604 include/class/fiche.class.php:2236 +#: include/class/fiche.class.php:1605 include/class/fiche.class.php:2237 msgid "Export PDF" msgstr "" @@ -12965,6 +13109,7 @@ msgstr "" #: include/lib/ac_common.php:629 include/lib/ac_common.php:630 #: include/lib/ac_common.php:641 include/lib/ac_common.php:642 #: include/lib/ac_common.php:644 include/lib/ac_common.php:660 +#: include/lib/ac_common.php:660 #, php-format msgid "" "Attention periode \n" @@ -12979,6 +13124,7 @@ msgstr "" #: include/lib/ac_common.php:812 include/lib/ac_common.php:823 #: include/lib/ac_common.php:824 include/lib/ac_common.php:836 #: include/lib/ac_common.php:838 include/lib/ac_common.php:854 +#: include/lib/ac_common.php:854 msgid "Données non disponibles" msgstr "" @@ -13003,7 +13149,7 @@ msgstr "" #: include/lib/ac_common.php:1160 include/lib/ac_common.php:1171 #: include/lib/ac_common.php:1172 include/lib/ac_common.php:1173 #: include/lib/ac_common.php:1185 include/lib/ac_common.php:1187 -#: include/lib/ac_common.php:1211 +#: include/lib/ac_common.php:1211 include/lib/ac_common.php:1211 msgid "Code Interne" msgstr "" @@ -13021,6 +13167,7 @@ msgstr "" #: include/lib/ac_common.php:1209 include/export/export_fiche_detail_csv.php:60 #: include/template/ledger_detail_bottom.php:286 include/lib/ac_common.php:1221 #: include/lib/ac_common.php:1223 include/template/ledger_detail_bottom.php:287 +#: include/lib/ac_common.php:1247 include/template/ledger_detail_bottom.php:287 #: include/export/export_fiche_detail_csv.php:60 include/lib/ac_common.php:1247 msgid "Aucune donnée" msgstr "" @@ -13168,7 +13315,9 @@ msgstr "" #: include/ajax/ajax_mod_predf_op.php:44 #: include/class/class_pre_operation.php:63 #: include/class/pre_operation.class.php:63 -#: include/ajax/ajax_mod_predf_op.php:43 include/ajax/ajax_mod_predf_op.php:43 +#: include/ajax/ajax_mod_predf_op.php:43 +#: include/class/pre_operation.class.php:64 +#: include/ajax/ajax_mod_predf_op.php:43 #: include/class/pre_operation.class.php:64 msgid "Description (max 50 car.)" msgstr "" @@ -13225,7 +13374,6 @@ msgstr "" #: include/ajax_preference.php:34 include/ajax_preference.php:33 #: include/ajax/ajax_preference.php:33 include/ajax/ajax_preference.php:34 -#: include/ajax/ajax_preference.php:34 msgid "" "Si vous validez, la page sera rechargée et vous pourriez perdre ce que vous " "faisiez" @@ -13248,6 +13396,8 @@ msgstr "" #: include/class/class_pre_operation.php:249 #: include/class/pre_operation.class.php:247 #: include/class/pre_operation.class.php:249 +#: include/class/pre_operation.class.php:248 +#: include/class/pre_operation.class.php:250 #: include/ajax/ajax_update_predef.php:55 #: include/class/pre_operation.class.php:248 #: include/class/pre_operation.class.php:250 @@ -13304,13 +13454,14 @@ msgstr "" #: include/anc_pa.inc.php:175 include/anc_pa.inc.php:195 #: include/anc_pa.inc.php:179 include/anc_pa.inc.php:199 #: include/anc_pa.inc.php:174 include/anc_pa.inc.php:194 +#: include/anc_pa.inc.php:174 include/anc_pa.inc.php:194 msgid "Ajout d'un plan comptable" msgstr "" #: include/anc_pa.inc.php:255 include/anc_pa.inc.php:274 #: include/anc_pa.inc.php:276 include/anc_pa.inc.php:280 #: include/anc_pa.inc.php:182 include/anc_pa.inc.php:186 -#: include/anc_pa.inc.php:181 +#: include/anc_pa.inc.php:181 include/anc_pa.inc.php:181 msgid "Aucun plan analytique n'est défini" msgstr "" @@ -13384,6 +13535,8 @@ msgstr "" #: include/search.inc.php:126 include/ajax/ajax_search_operation.php:123 #: include/ajax/ajax_search_operation.php:127 #: include/ajax/ajax_search_operation.php:132 +#: include/ajax/ajax_search_operation.php:129 +#: include/ajax/ajax_search_operation.php:134 #: include/template/action_search_result.php:32 #: include/template/action_search_result.php:88 #: include/ajax/ajax_search_operation.php:129 @@ -13503,6 +13656,7 @@ msgstr "" #: include/cfgfiche.inc.php:69 include/cfgfiche.inc.php:74 #: include/cfgfiche.inc.php:88 include/cfgfiche.inc.php:89 +#: include/cfgfiche.inc.php:89 msgid "" "Impossible d'enlever cette catégorie, certaines fiches sont encore " "utilisées\n" @@ -13633,42 +13787,42 @@ msgstr "" #: include/class_acc_bilan.php:175 include/class_acc_bilan.php:176 #: include/class/class_acc_bilan.php:176 include/class/class_acc_bilan.php:202 #: include/class/acc_bilan.class.php:202 include/class/acc_bilan.class.php:205 -#: include/class/acc_bilan.class.php:207 +#: include/class/acc_bilan.class.php:207 include/class/acc_bilan.class.php:207 msgid "Total actif" msgstr "" #: include/class_acc_bilan.php:192 include/class_acc_bilan.php:193 #: include/class/class_acc_bilan.php:193 include/class/class_acc_bilan.php:215 #: include/class/acc_bilan.class.php:215 include/class/acc_bilan.class.php:218 -#: include/class/acc_bilan.class.php:220 +#: include/class/acc_bilan.class.php:220 include/class/acc_bilan.class.php:220 msgid "Total passif" msgstr "" #: include/class_acc_bilan.php:211 include/class_acc_bilan.php:212 #: include/class/class_acc_bilan.php:212 include/class/class_acc_bilan.php:231 #: include/class/acc_bilan.class.php:231 include/class/acc_bilan.class.php:234 -#: include/class/acc_bilan.class.php:236 +#: include/class/acc_bilan.class.php:236 include/class/acc_bilan.class.php:236 msgid "Total charge " msgstr "" #: include/class_acc_bilan.php:226 include/class_acc_bilan.php:227 #: include/class/class_acc_bilan.php:227 include/class/class_acc_bilan.php:243 #: include/class/acc_bilan.class.php:243 include/class/acc_bilan.class.php:246 -#: include/class/acc_bilan.class.php:248 +#: include/class/acc_bilan.class.php:248 include/class/acc_bilan.class.php:248 msgid "Total produit" msgstr "" #: include/class_acc_bilan.php:230 include/class_acc_bilan.php:231 #: include/class/class_acc_bilan.php:231 include/class/class_acc_bilan.php:247 #: include/class/acc_bilan.class.php:247 include/class/acc_bilan.class.php:250 -#: include/class/acc_bilan.class.php:252 +#: include/class/acc_bilan.class.php:252 include/class/acc_bilan.class.php:252 msgid "Difference Produit - Charge" msgstr "" #: include/class_acc_bilan.php:256 include/class_acc_bilan.php:257 #: include/class/class_acc_bilan.php:257 include/class/class_acc_bilan.php:273 #: include/class/acc_bilan.class.php:273 include/class/acc_bilan.class.php:276 -#: include/class/acc_bilan.class.php:278 +#: include/class/acc_bilan.class.php:278 include/class/acc_bilan.class.php:278 msgid "Aucun enregistrement trouve" msgstr "" @@ -13686,6 +13840,8 @@ msgstr "" #: include/class/acc_bilan.class.php:706 include/class/acc_bilan.class.php:688 #: include/class/acc_bilan.class.php:711 include/class/acc_bilan.class.php:374 #: include/class/acc_bilan.class.php:690 include/class/acc_bilan.class.php:713 +#: include/class/acc_bilan.class.php:374 include/class/acc_bilan.class.php:690 +#: include/class/acc_bilan.class.php:713 msgid "erreur Ouverture fichier" msgstr "" @@ -13694,6 +13850,7 @@ msgstr "" #: include/class/class_acc_bilan.php:668 include/class/class_acc_bilan.php:685 #: include/class/acc_bilan.class.php:686 include/class/acc_bilan.class.php:689 #: include/class/acc_bilan.class.php:694 include/class/acc_bilan.class.php:696 +#: include/class/acc_bilan.class.php:696 msgid "erreur écriture fichier" msgstr "" @@ -13727,6 +13884,7 @@ msgstr "" #: include/export/export_histo_csv.php:36 #: include/class/acc_ledger_search.class.php:929 #: include/class/acc_ledger_search.class.php:937 +#: include/class/acc_ledger_search.class.php:950 #: include/template/letter_prop.php:31 include/template/letter_prop.php:74 #: include/export/export_histo_csv.php:36 #: include/class/acc_ledger_search.class.php:950 @@ -13741,6 +13899,7 @@ msgstr "" #: include/class/acc_ledger_search.class.php:938 #: include/class/acc_ledger_search.class.php:946 #: include/class/acc_ledger_search.class.php:959 +#: include/class/acc_ledger_search.class.php:959 msgid "tiers" msgstr "" @@ -13761,6 +13920,8 @@ msgstr "" #: include/class/acc_ledger_search.class.php:1045 #: include/class/acc_ledger_search.class.php:850 #: include/class/acc_ledger_search.class.php:1058 +#: include/class/acc_ledger_search.class.php:850 +#: include/class/acc_ledger_search.class.php:1058 msgid "Opération annulée" msgstr "" @@ -13787,6 +13948,8 @@ msgstr "" #: include/class/acc_ledger_history_purchase.class.php:249 #: include/class/acc_ledger_history_sale.class.php:243 #: include/class/acc_ledger_search.class.php:631 +#: include/class/acc_ledger.class.php:2421 +#: include/class/acc_ledger_search.class.php:644 #: include/template/print_ledger_simple.php:8 #: include/template/acc_ledger_history_sale_detail.php:35 #: include/template/acc_ledger_history_purchase_detail.php:34 @@ -13830,6 +13993,8 @@ msgstr "" #: include/class/acc_ledger_search.class.php:637 #: include/class/print_ledger_misc.class.php:46 #: include/class/fiche.class.php:1461 +#: include/class/acc_ledger_search.class.php:650 +#: include/class/fiche.class.php:1475 #: include/template/operation_detail_fin.php:32 #: include/template/acc_ledger_history_financial_oneline.php:34 #: include/template/ledger_detail_fin.php:45 @@ -13838,11 +14003,11 @@ msgstr "" #: include/export/export_ledger_csv.php:212 #: include/export/export_histo_csv.php:43 #: include/export/export_fiche_detail_csv.php:75 -#: include/class/acc_ledger_history_generic.class.php:682 +#: include/class/acc_ledger_history_generic.class.php:683 #: include/class/acc_ledger_search.class.php:650 #: include/class/print_ledger_misc.class.php:46 #: include/class/acc_account_ledger.class.php:396 -#: include/class/fiche.class.php:1475 +#: include/class/fiche.class.php:1476 msgid "Tiers" msgstr "" @@ -13854,6 +14019,7 @@ msgstr "" #: include/class/acc_ledger_search.class.php:860 #: include/class/acc_ledger_search.class.php:868 #: include/class/acc_ledger_search.class.php:881 +#: include/class/acc_ledger_search.class.php:881 msgid "Non payé" msgstr "" @@ -13877,6 +14043,7 @@ msgstr "" #: include/class/acc_ledger.class.php:1197 #: include/class/acc_ledger.class.php:1198 #: include/class/acc_ledger.class.php:1207 +#: include/class/acc_ledger.class.php:1207 msgid "" "Attention : il vaut mieux utiliser les fiches que les postes comptables " msgstr "" @@ -13892,6 +14059,7 @@ msgstr "" #: include/class/acc_ledger.class.php:1299 #: include/class/acc_ledger.class.php:1300 #: include/class/acc_ledger.class.php:1309 +#: include/class/acc_ledger.class.php:1309 msgid "Balance incorrecte" msgstr "" @@ -13905,6 +14073,7 @@ msgstr "" #: include/class/acc_ledger.class.php:1341 #: include/class/acc_ledger.class.php:1342 #: include/class/acc_ledger.class.php:1351 +#: include/class/acc_ledger.class.php:1351 msgid "OPERATION ANNULEE " msgstr "" @@ -13918,6 +14087,7 @@ msgstr "" #: include/class/acc_ledger.class.php:1664 #: include/class/acc_ledger.class.php:1665 #: include/class/acc_ledger.class.php:1674 +#: include/class/acc_ledger.class.php:1674 msgid "Celui qui paie n' a pas de poste comptable" msgstr "" @@ -13931,6 +14101,7 @@ msgstr "" #: include/class/acc_ledger.class.php:1682 #: include/class/acc_ledger.class.php:1683 #: include/class/acc_ledger.class.php:1692 +#: include/class/acc_ledger.class.php:1692 #, php-format msgid "Pour la fiche %s le poste comptable [%s] n'existe pas" msgstr "" @@ -13946,6 +14117,7 @@ msgstr "" #: include/class/acc_ledger.class.php:2108 #: include/class/acc_ledger.class.php:2109 #: include/class/acc_ledger.class.php:2118 +#: include/class/acc_ledger.class.php:2118 msgid "Journaux de vente" msgstr "" @@ -13985,6 +14157,7 @@ msgstr "" #: include/class/acc_ledger.class.php:2312 #: include/class/acc_ledger.class.php:2313 #: include/class/acc_ledger.class.php:2322 +#: include/class/acc_ledger.class.php:2322 msgid "Nombre de ligne incorrect" msgstr "" @@ -14000,6 +14173,7 @@ msgstr "" #: include/class/acc_ledger.class.php:2317 #: include/class/acc_ledger.class.php:2318 #: include/class/acc_ledger.class.php:2327 +#: include/class/acc_ledger.class.php:2327 msgid "Un journal avec ce nom existe déjà" msgstr "" @@ -14042,6 +14216,9 @@ msgstr "" #: include/class/acc_ledger.class.php:2333 #: include/class/acc_ledger.class.php:2397 #: include/class/acc_ledger.class.php:2575 +#: include/class/acc_ledger.class.php:2333 +#: include/class/acc_ledger.class.php:2397 +#: include/class/acc_ledger.class.php:2575 msgid "Aucun compte en banque n'est donné" msgstr "" @@ -14058,6 +14235,7 @@ msgstr "" #: include/class/acc_ledger.class.php:2482 #: include/class/acc_ledger.class.php:2483 #: include/class/acc_ledger.class.php:2492 +#: include/class/acc_ledger.class.php:2492 msgid "choix du type de journal" msgstr "" @@ -14074,6 +14252,7 @@ msgstr "" #: include/class/acc_ledger.class.php:2583 #: include/class/acc_ledger.class.php:2584 #: include/class/acc_ledger.class.php:2593 +#: include/class/acc_ledger.class.php:2593 msgid "Impossible d'effacer un journal qui contient des opérations" msgstr "" @@ -14090,6 +14269,7 @@ msgstr "" #: include/class/acc_ledger.class.php:2699 #: include/class/acc_ledger.class.php:2700 #: include/class/acc_ledger.class.php:2709 +#: include/class/acc_ledger.class.php:2709 msgid "Action non accessible" msgstr "" @@ -14548,6 +14728,7 @@ msgstr "" #: include/template/stock_inv.php:61 #: include/export/export_stock_histo_csv.php:41 #: include/export/export_stock_resume_list.php:38 +#: include/template/stock_inv.php:63 #: include/template/stock_summary_table.php:33 #: include/template/stock_histo_search.php:35 include/template/stock_inv.php:63 #: include/export/export_stock_histo_csv.php:41 @@ -14585,7 +14766,7 @@ msgid "Direction" msgstr "" #: include/template/stock_inv.php:50 include/template/stock_inv.php:51 -#: include/template/stock_inv.php:53 +#: include/template/stock_inv.php:53 include/template/stock_inv.php:53 msgid "Motif de changement" msgstr "" @@ -14716,6 +14897,7 @@ msgstr "" #: include/export/export_balance_pdf.php:124 #: include/export/export_poste_detail_csv.php:39 #: include/export/export_balance_pdf.php:128 +#: include/export/export_balance_pdf.php:125 #: include/export/export_poste_detail_csv.php:39 #: include/export/export_balance_pdf.php:125 msgid "poste" @@ -14749,8 +14931,9 @@ msgstr "" #: include/ext/importbank/include/import_bank.class.php:140 #: include/lib/ac_common.php:343 include/action.common.inc.php:144 #: include/action.common.inc.php:295 include/lib/ac_common.php:345 -#: include/action.common.inc.php:144 include/action.common.inc.php:295 -#: include/lib/ac_common.php:361 include/forecast.inc.php:359 +#: include/lib/ac_common.php:361 include/action.common.inc.php:144 +#: include/action.common.inc.php:295 include/lib/ac_common.php:361 +#: include/forecast.inc.php:359 msgid "Erreur" msgstr "" @@ -14758,7 +14941,8 @@ msgstr "" #: include/lib/class_html_input.php:320 include/lib/class_html_input.php:321 #: include/param_sec.inc.php:219 include/class/acc_ledger_search.class.php:1070 #: include/param_sec.inc.php:223 include/class/acc_ledger_search.class.php:1065 -#: include/class/acc_ledger_search.class.php:1073 include/param_sec.inc.php:223 +#: include/class/acc_ledger_search.class.php:1073 +#: include/class/acc_ledger_search.class.php:1086 include/param_sec.inc.php:223 #: include/class/acc_ledger_search.class.php:1086 msgid "Journaux" msgstr "" @@ -14839,9 +15023,9 @@ msgstr "" #: include/anc_great_ledger.inc.php:46 include/anc_history.inc.php:30 #: include/anc_great_ledger.inc.php:47 include/anc_balance_double.inc.php:27 #: include/anc_balance_simple.inc.php:27 include/anc_great_ledger.inc.php:78 -#: include/anc_history.inc.php:34 include/anc_great_ledger.inc.php:78 -#: include/anc_balance_simple.inc.php:27 include/anc_balance_double.inc.php:27 -#: include/anc_history.inc.php:37 +#: include/anc_history.inc.php:34 include/anc_history.inc.php:37 +#: include/anc_great_ledger.inc.php:78 include/anc_balance_simple.inc.php:27 +#: include/anc_balance_double.inc.php:26 include/anc_history.inc.php:37 msgid "Aucune donnée trouvée" msgstr "" @@ -14881,6 +15065,8 @@ msgstr "" #: include/class/acc_ledger.class.php:1487 #: include/class/acc_ledger.class.php:1479 #: include/class/acc_ledger.class.php:1496 +#: include/class/acc_ledger.class.php:1479 +#: include/class/acc_ledger.class.php:1496 msgid "get_default_card p_ledger_side is invalide [" msgstr "" @@ -15465,6 +15651,7 @@ msgstr "" #: include/class/anc_operation.class.php:632 #: include/class/anc_operation.class.php:626 #: include/class/anc_operation.class.php:627 +#: include/class/anc_operation.class.php:627 msgid "Nouvelle ligne" msgstr "" @@ -15476,6 +15663,7 @@ msgstr "" #: include/class/anc_operation.class.php:648 #: include/class/anc_operation.class.php:642 #: include/class/anc_operation.class.php:643 +#: include/class/anc_operation.class.php:643 msgid "Clef" msgstr "" @@ -15499,7 +15687,7 @@ msgstr "" #: include/class/class_document_export.php:225 #: include/class/document_export.class.php:225 #: include/class/document_export.class.php:231 -#: include/class/document_export.class.php:231 +#: include/class/document_export.class.php:232 msgid " ne peut pas convertir en PDF" msgstr "" @@ -15512,7 +15700,7 @@ msgstr "" #: include/class/class_document_export.php:280 #: include/class/document_export.class.php:280 #: include/class/document_export.class.php:290 -#: include/class/document_export.class.php:290 +#: include/class/document_export.class.php:291 msgid "CONVERT_GIF_PDF n'est pas installé" msgstr "" @@ -15525,7 +15713,7 @@ msgstr "" #: include/class/class_document_export.php:281 #: include/class/document_export.class.php:281 #: include/class/document_export.class.php:291 -#: include/class/document_export.class.php:291 +#: include/class/document_export.class.php:292 msgid "TKPDF n'est pas installé" msgstr "" @@ -15755,6 +15943,7 @@ msgstr "" #: include/ajax/ajax_search_operation.php:119 #: include/ajax/ajax_search_operation.php:122 #: include/ajax/ajax_search_operation.php:124 +#: include/ajax/ajax_search_operation.php:124 msgid "Liste limitée à " msgstr "" @@ -15762,6 +15951,7 @@ msgstr "" #: include/ajax/ajax_search_operation.php:119 #: include/ajax/ajax_search_operation.php:122 #: include/ajax/ajax_search_operation.php:124 +#: include/ajax/ajax_search_operation.php:124 msgid " enregistrements. Le nombre d'enregistrements trouvés est de " msgstr "" @@ -15785,7 +15975,7 @@ msgstr "" #: include/class_acc_bilan.php:249 include/class_acc_bilan.php:250 #: include/class/class_acc_bilan.php:250 include/class/class_acc_bilan.php:266 #: include/class/acc_bilan.class.php:266 include/class/acc_bilan.class.php:269 -#: include/class/acc_bilan.class.php:271 +#: include/class/acc_bilan.class.php:271 include/class/acc_bilan.class.php:271 msgid "le formulaire id n'est pas donnee" msgstr "" @@ -15793,6 +15983,7 @@ msgstr "" #: include/class/class_acc_bilan.php:637 include/class/class_acc_bilan.php:654 #: include/class/acc_bilan.class.php:655 include/class/acc_bilan.class.php:658 #: include/class/acc_bilan.class.php:663 include/class/acc_bilan.class.php:665 +#: include/class/acc_bilan.class.php:665 msgid "Ouverture fichier impossible" msgstr "" @@ -15804,6 +15995,8 @@ msgstr "" #: include/class/acc_ledger_search.class.php:575 #: include/class/anc_operation.class.php:294 include/fiche.inc.php:94 #: include/class/acc_ledger_search.class.php:588 +#: include/class/anc_operation.class.php:295 include/fiche.inc.php:94 +#: include/class/acc_ledger_search.class.php:588 #: include/class/anc_operation.class.php:295 msgid "Chercher" msgstr "" @@ -15930,7 +16123,7 @@ msgid "Mis à jour" msgstr "" #: include/cfgfiche.inc.php:68 include/cfgfiche.inc.php:82 -#: include/cfgfiche.inc.php:83 +#: include/cfgfiche.inc.php:83 include/cfgfiche.inc.php:83 msgid "Impossible d'enlever cette catégorie" msgstr "" @@ -15961,6 +16154,8 @@ msgstr "" #: include/class/acc_bilan.class.php:373 include/class/acc_bilan.class.php:394 #: include/class/acc_bilan.class.php:299 include/class/acc_bilan.class.php:311 #: include/class/acc_bilan.class.php:375 include/class/acc_bilan.class.php:396 +#: include/class/acc_bilan.class.php:299 include/class/acc_bilan.class.php:311 +#: include/class/acc_bilan.class.php:375 include/class/acc_bilan.class.php:396 msgid "Echec ouverture fichier " msgstr "" @@ -15982,6 +16177,7 @@ msgstr "" #: include/class/acc_ledger.class.php:2178 #: include/class/acc_ledger.class.php:2179 #: include/class/acc_ledger.class.php:2188 +#: include/class/acc_ledger.class.php:2188 msgid "Ajout journal" msgstr "" @@ -15997,6 +16193,7 @@ msgstr "" #: include/class/acc_ledger.class.php:2769 #: include/class/acc_ledger.class.php:2770 #: include/class/acc_ledger.class.php:2779 +#: include/class/acc_ledger.class.php:2779 msgid "Dans le dépôt" msgstr "" @@ -16187,6 +16384,8 @@ msgstr "" #: include/class/pre_operation.class.php:326 #: include/class/pre_operation.class.php:316 #: include/class/pre_operation.class.php:327 +#: include/class/pre_operation.class.php:316 +#: include/class/pre_operation.class.php:327 msgid ":" msgstr "" @@ -16238,7 +16437,7 @@ msgstr "" #: include/fiche.inc.php:290 include/fiche.inc.php:363 #: include/fiche.inc.php:366 include/fiche.inc.php:367 -#: include/fiche.inc.php:368 +#: include/fiche.inc.php:368 include/fiche.inc.php:375 msgid "Cette catégorie n'ayant pas de poste comptable n'a pas de balance" msgstr "" @@ -16411,6 +16610,7 @@ msgstr "" #: include/template/ledger_detail_bottom.php:274 #: include/template/ledger_detail_bottom.php:291 #: include/template/ledger_detail_bottom.php:292 +#: include/template/ledger_detail_bottom.php:292 msgid "Non utilisée" msgstr "" @@ -16432,6 +16632,7 @@ msgstr "" #: include/class/acc_ledger.class.php:2327 #: include/class/acc_ledger.class.php:2328 #: include/class/acc_ledger.class.php:2337 +#: include/class/acc_ledger.class.php:2337 msgid "Choix du type de journal est obligatoire" msgstr "" @@ -16594,6 +16795,8 @@ msgstr "" #: include/template/stock_inv.php:107 include/template/stock_inv.php:112 #: include/template/stock_inv.php:133 include/template/stock_inv.php:30 #: include/template/stock_inv.php:113 include/template/stock_inv.php:134 +#: include/template/stock_inv.php:30 include/template/stock_inv.php:113 +#: include/template/stock_inv.php:134 msgid "Reprise inventaire" msgstr "" @@ -16687,6 +16890,7 @@ msgstr "" #: include/class/acc_ledger.class.php:2788 #: include/class/acc_ledger.class.php:2789 #: include/class/acc_ledger.class.php:2798 +#: include/class/acc_ledger.class.php:2798 msgid "Nouvelle opération" msgstr "" @@ -17038,7 +17242,7 @@ msgstr "" #: include/lib/ac_common.php:959 include/lib/ac_common.php:970 #: include/lib/ac_common.php:971 include/lib/ac_common.php:972 #: include/lib/ac_common.php:984 include/lib/ac_common.php:986 -#: include/lib/ac_common.php:1002 +#: include/lib/ac_common.php:1002 include/lib/ac_common.php:1002 msgid "" "Utilisateur n'a pas de profil, votre administrateur doit en configurer un " "dans CFGSEC" @@ -17141,7 +17345,8 @@ msgstr "" #: include/category_card.inc.php:73 include/fiche.inc.php:70 #: include/category_card.inc.php:78 include/category_card.inc.php:80 -#: include/category_card.inc.php:80 include/fiche.inc.php:71 +#: include/fiche.inc.php:71 include/category_card.inc.php:80 +#: include/fiche.inc.php:71 msgid "Balance âgée" msgstr "" @@ -17226,8 +17431,8 @@ msgstr "" #: include/compta_ach.inc.php:184 include/compta_ods.inc.php:114 #: include/compta_ven.inc.php:200 include/compta_ods.inc.php:115 #: include/compta_ven.inc.php:203 include/compta_ods.inc.php:116 -#: include/compta_ven.inc.php:208 include/compta_ven.inc.php:208 -#: include/compta_ods.inc.php:118 +#: include/compta_ven.inc.php:208 include/compta_ods.inc.php:118 +#: include/compta_ven.inc.php:208 include/compta_ods.inc.php:118 msgid "Extourné au " msgstr "" @@ -17236,8 +17441,8 @@ msgstr "" #: include/compta_ods.inc.php:120 include/compta_ach.inc.php:192 #: include/compta_ven.inc.php:209 include/compta_ach.inc.php:197 #: include/compta_ods.inc.php:121 include/compta_ven.inc.php:214 -#: include/compta_ven.inc.php:214 include/compta_ods.inc.php:123 -#: include/compta_ach.inc.php:197 +#: include/compta_ods.inc.php:123 include/compta_ven.inc.php:214 +#: include/compta_ods.inc.php:123 include/compta_ach.inc.php:197 msgid "Opération non extournée" msgstr "" @@ -17246,8 +17451,8 @@ msgstr "" #: include/compta_ods.inc.php:129 include/compta_ach.inc.php:200 #: include/compta_ven.inc.php:217 include/compta_ach.inc.php:205 #: include/compta_ods.inc.php:130 include/compta_ven.inc.php:222 -#: include/compta_ven.inc.php:222 include/compta_ods.inc.php:132 -#: include/compta_ach.inc.php:205 +#: include/compta_ods.inc.php:132 include/compta_ven.inc.php:222 +#: include/compta_ods.inc.php:132 include/compta_ach.inc.php:205 msgid "Date invalide, opération non extournée" msgstr "" @@ -17258,7 +17463,7 @@ msgstr "" msgid "Ajout d'un dossier" msgstr "" -#: include/fiche.inc.php:71 include/fiche.inc.php:72 +#: include/fiche.inc.php:71 include/fiche.inc.php:72 include/fiche.inc.php:72 msgid "Balance âgée en-cours" msgstr "" @@ -17385,6 +17590,7 @@ msgstr "" #: include/template/ledger_detail_bottom.php:329 #: include/template/ledger_detail_bottom.php:350 #: include/template/ledger_detail_bottom.php:351 +#: include/template/ledger_detail_bottom.php:351 msgid "" "Extourner une opération vous permet de l'annuler par son écriture inverse" msgstr "" @@ -17618,6 +17824,7 @@ msgstr "" #: include/class/class_fiche.php:1231 include/class/class_fiche.php:1234 #: include/class/fiche.class.php:1378 include/class/fiche.class.php:1379 #: include/class/fiche.class.php:1381 include/class/fiche.class.php:1395 +#: include/class/fiche.class.php:1396 msgid "n° de pièce / Code interne" msgstr "" @@ -17626,6 +17833,7 @@ msgstr "" #: include/class/class_fiche.php:1235 include/class/class_fiche.php:1238 #: include/class/fiche.class.php:1382 include/class/fiche.class.php:1383 #: include/class/fiche.class.php:1385 include/class/fiche.class.php:1399 +#: include/class/fiche.class.php:1400 msgid "Débit/Crédit" msgstr "" @@ -17637,8 +17845,10 @@ msgstr "" #: include/class/acc_account_ledger.class.php:475 #: include/class/fiche.class.php:1405 include/class/fiche.class.php:1534 #: include/class/fiche.class.php:1407 include/class/fiche.class.php:1536 -#: include/fiche.inc.php:590 include/class/acc_account_ledger.class.php:475 -#: include/class/fiche.class.php:1421 include/class/fiche.class.php:1552 +#: include/fiche.inc.php:590 include/class/fiche.class.php:1421 +#: include/class/fiche.class.php:1552 include/fiche.inc.php:599 +#: include/class/acc_account_ledger.class.php:475 +#: include/class/fiche.class.php:1422 include/class/fiche.class.php:1553 msgid "solde débiteur" msgstr "" @@ -17650,8 +17860,9 @@ msgstr "" #: include/class/acc_account_ledger.class.php:475 #: include/class/fiche.class.php:1405 include/class/fiche.class.php:1534 #: include/class/fiche.class.php:1407 include/class/fiche.class.php:1536 -#: include/class/acc_account_ledger.class.php:475 #: include/class/fiche.class.php:1421 include/class/fiche.class.php:1552 +#: include/class/acc_account_ledger.class.php:475 +#: include/class/fiche.class.php:1422 include/class/fiche.class.php:1553 msgid "solde créditeur" msgstr "" @@ -17900,29 +18111,31 @@ msgstr "" #: html/ajax_misc.php:179 html/ajax_misc.php:257 html/ajax_misc.php:262 #: html/ajax_misc.php:290 html/ajax_misc.php:382 html/ajax_misc.php:384 +#: html/ajax_misc.php:390 include/lib/message_javascript.php:90 msgid "Action non autorisée" msgstr "" #: html/ajax_misc.php:196 html/ajax_misc.php:274 html/ajax_misc.php:279 #: html/ajax_misc.php:307 html/ajax_misc.php:399 html/ajax_misc.php:401 +#: html/ajax_misc.php:407 msgid "Des actions dépendent de cette catégorie" msgstr "" #: html/do.php:196 html/do.php:224 html/do.php:237 html/do.php:239 #: html/do.php:236 html/do.php:273 html/do.php:285 html/do.php:295 -#: html/do.php:295 +#: html/do.php:264 msgid "Erreur menu" msgstr "" #: html/do.php:210 html/do.php:211 html/do.php:239 html/do.php:252 #: html/do.php:254 html/do.php:251 html/do.php:288 html/do.php:300 -#: html/do.php:310 html/do.php:310 +#: html/do.php:310 html/do.php:279 msgid "Accès menu impossible" msgstr "" #: html/do.php:219 html/do.php:224 html/do.php:252 html/do.php:265 #: html/do.php:268 html/do.php:270 html/do.php:307 html/do.php:319 -#: html/do.php:329 html/do.php:331 +#: html/do.php:329 html/do.php:331 html/do.php:300 msgid "Aucun profil utilisateur" msgstr "" @@ -17931,7 +18144,7 @@ msgstr "" #: include/lib/ac_common.php:806 include/lib/ac_common.php:813 #: include/lib/ac_common.php:824 include/lib/ac_common.php:825 #: include/lib/ac_common.php:837 include/lib/ac_common.php:839 -#: include/lib/ac_common.php:855 +#: include/lib/ac_common.php:855 include/lib/ac_common.php:855 msgid "" "Veuillez vous reconnecter soit dans une autre fenêtre soit en cliquant sur " "le lien" @@ -17942,7 +18155,7 @@ msgstr "" #: include/lib/ac_common.php:810 include/lib/ac_common.php:817 #: include/lib/ac_common.php:828 include/lib/ac_common.php:829 #: include/lib/ac_common.php:841 include/lib/ac_common.php:843 -#: include/lib/ac_common.php:859 +#: include/lib/ac_common.php:859 include/lib/ac_common.php:859 msgid "Se reconnecter pour revenir ici" msgstr "" @@ -17951,7 +18164,7 @@ msgstr "" #: include/lib/ac_common.php:816 include/lib/ac_common.php:823 #: include/lib/ac_common.php:834 include/lib/ac_common.php:835 #: include/lib/ac_common.php:847 include/lib/ac_common.php:849 -#: include/lib/ac_common.php:865 +#: include/lib/ac_common.php:865 include/lib/ac_common.php:865 msgid "Cliquez ici pour vous reconnecter dans une autre page" msgstr "" @@ -18036,6 +18249,7 @@ msgstr "" #: include/class/acc_ledger.class.php:2109 #: include/class/acc_ledger.class.php:2110 #: include/class/acc_ledger.class.php:2119 +#: include/class/acc_ledger.class.php:2119 msgid "Journaux d'achat" msgstr "" @@ -18046,6 +18260,7 @@ msgstr "" #: include/class/acc_ledger.class.php:2110 #: include/class/acc_ledger.class.php:2111 #: include/class/acc_ledger.class.php:2120 +#: include/class/acc_ledger.class.php:2120 msgid "Journaux Financier" msgstr "" @@ -18056,6 +18271,7 @@ msgstr "" #: include/class/acc_ledger.class.php:2111 #: include/class/acc_ledger.class.php:2112 #: include/class/acc_ledger.class.php:2121 +#: include/class/acc_ledger.class.php:2121 msgid "Journaux d'Opérations diverses" msgstr "" @@ -18247,7 +18463,8 @@ msgstr "" #: include/cfgfiche.inc.php:143 include/profile.inc.php:355 #: include/cfgfiche.inc.php:158 include/profile.inc.php:336 -#: include/profile.inc.php:336 include/cfgfiche.inc.php:159 +#: include/cfgfiche.inc.php:159 include/profile.inc.php:336 +#: include/cfgfiche.inc.php:159 msgid "Doublon" msgstr "" @@ -18379,6 +18596,7 @@ msgstr "" #: include/class_pre_operation.php:56 include/class/class_pre_operation.php:56 #: include/class/pre_operation.class.php:56 #: include/class/pre_operation.class.php:57 +#: include/class/pre_operation.class.php:57 msgid "Donnez un nom pour sauver cette opération comme modèle" msgstr "" @@ -18433,21 +18651,22 @@ msgstr "" #: html/recherche.php:108 include/history_operation.inc.php:150 #: html/recherche.php:125 include/history_operation.inc.php:147 #: html/recherche.php:126 html/recherche.php:129 -#: include/history_operation.inc.php:167 html/recherche.php:129 -#: include/history_operation.inc.php:178 +#: include/history_operation.inc.php:167 include/history_operation.inc.php:178 +#: html/recherche.php:129 include/history_operation.inc.php:178 msgid "Export vers CSV" msgstr "" #: include/class_fiche.php:557 include/class/class_fiche.php:557 #: include/class/class_fiche.php:558 include/class/fiche.class.php:564 #: include/class/fiche.class.php:566 include/class/fiche.class.php:565 +#: include/class/fiche.class.php:565 msgid "id fiche" msgstr "" #: include/class_fiche.php:1022 include/class/class_fiche.php:1022 #: include/class/class_fiche.php:1024 include/class/class_fiche.php:1027 #: include/class/fiche.class.php:1117 include/class/fiche.class.php:1119 -#: include/class/fiche.class.php:1133 +#: include/class/fiche.class.php:1133 include/class/fiche.class.php:1134 msgid "Impossible cette fiche est utilisée dans un journal" msgstr "" @@ -18548,11 +18767,13 @@ msgstr "" #: html/ajax_misc.php:571 html/ajax_misc.php:613 html/ajax_misc.php:408 #: html/ajax_misc.php:434 html/ajax_misc.php:546 html/ajax_misc.php:548 +#: html/ajax_misc.php:554 msgid "Ce plugin n'existe pas " msgstr "" #: html/ajax_misc.php:572 html/ajax_misc.php:614 html/ajax_misc.php:409 #: html/ajax_misc.php:435 html/ajax_misc.php:547 html/ajax_misc.php:549 +#: html/ajax_misc.php:555 msgid "Il y a une erreur, ce plugin n'existe pas" msgstr "" @@ -18841,7 +19062,7 @@ msgstr "" #: html/install.php:456 html/install.php:462 html/install.php:454 #: html/install.php:460 html/install.php:424 html/install.php:399 #: html/install.php:405 html/install.php:408 scenario/180209.php:18 -#: html/install.php:408 scenario/180209.php:18 +#: html/install.php:408 msgid "Version base de données :" msgstr "" @@ -19654,7 +19875,7 @@ msgstr "" #: include/upgrade-core.php:23 include/upgrade.inc.php:27 #: include/upgrade-plugin.php:25 include/upgrade-template.php:25 #: include/ajax/ajax_remove_submenu.php:27 -#: include/ajax/ajax_user_security.php:39 html/ajax_misc.php:80 +#: include/ajax/ajax_user_security.php:39 html/ajax_misc.php:86 #: include/upgrade.inc.php:27 include/admin_repo.inc.php:24 #: include/admin_repo.inc.php:25 include/export/export_document.php:26 #: include/export/export_receipt.php:24 include/backup.inc.php:22 @@ -19922,7 +20143,10 @@ msgstr "" #: include/ajax/ajax_navigator.php:46 include/class/acc_ledger.class.php:2175 #: include/class/fiche.class.php:2221 html/user_login.php:181 #: include/class/acc_ledger.class.php:2176 include/class/fiche.class.php:2223 -#: html/user_login.php:181 html/ajax_misc.php:456 include/user.inc.php:138 +#: html/ajax_misc.php:456 include/class/pre_operation.class.php:289 +#: include/class/acc_ledger.class.php:2185 +#: include/class/anc_listing.class.php:76 include/class/fiche.class.php:2246 +#: html/user_login.php:158 html/ajax_misc.php:462 include/user.inc.php:138 #: include/template/todo_list_list_user.php:31 #: include/template/anc_key_display_list.php:28 #: include/template/tag_search_select.php:12 include/template/tag_select.php:16 @@ -19933,7 +20157,7 @@ msgstr "" #: include/compta_fin_rec.inc.php:226 include/report.inc.php:142 #: include/balance.inc.php:302 include/class/pre_operation.class.php:289 #: include/class/acc_ledger.class.php:2185 -#: include/class/anc_listing.class.php:76 include/class/fiche.class.php:2246 +#: include/class/anc_listing.class.php:76 include/class/fiche.class.php:2247 #: include/lib/manage_table_sql.class.php:631 #, php-format msgid "Cherche" @@ -19977,7 +20201,7 @@ msgstr "" #: include/ext/importbank/include/template/show_transfer.php:177 #: include/ext/importbank/include/template/show_transfer.php:176 #: include/ext/importbank/include/template/show_field.php:48 -#: include/ajax/ajax_preference.php:181 include/ajax/ajax_preference.php:181 +#: include/ajax/ajax_preference.php:181 include/ajax/ajax_preference.php:192 msgid "Séparateur de champs" msgstr "" @@ -20591,8 +20815,8 @@ msgstr "" msgid "credit" msgstr "" -#: include/export/export_fiche_balance_csv.php:57 #: include/export/export_fiche_balance_csv.php:57 include/fiche.inc.php:587 +#: include/export/export_fiche_balance_csv.php:57 include/fiche.inc.php:596 msgid "solde" msgstr "" @@ -20615,7 +20839,7 @@ msgstr "" #: include/export/export_histo_csv.php:40 #: include/export/export_histo_csv.php:41 #: include/class/print_ledger_misc.class.php:44 include/compta_ods.inc.php:96 -#: include/export/export_histo_csv.php:41 +#: include/compta_ods.inc.php:96 include/export/export_histo_csv.php:41 #: include/class/print_ledger_misc.class.php:44 msgid "Piece" msgstr "" @@ -20640,7 +20864,7 @@ msgstr "" #: include/class/acc_ledger_history_purchase.class.php:239 #: include/class/acc_ledger_history_sale.class.php:233 #: include/export/export_ledger_csv.php:46 -#: include/class/acc_ledger_history_generic.class.php:758 +#: include/class/acc_ledger_history_generic.class.php:759 #: include/class/acc_ledger_history_purchase.class.php:239 #: include/class/acc_reconciliation.class.php:487 #: include/class/acc_reconciliation.class.php:511 @@ -20664,7 +20888,7 @@ msgstr "" #: include/class/acc_ledger_history_purchase.class.php:250 #: include/class/acc_ledger_history_sale.class.php:244 #: include/export/export_ledger_csv.php:208 -#: include/class/acc_ledger_history_generic.class.php:763 +#: include/class/acc_ledger_history_generic.class.php:764 #: include/class/acc_ledger_history_purchase.class.php:250 #: include/class/acc_ledger_history_sale.class.php:244 msgid "operation" @@ -20679,7 +20903,7 @@ msgstr "" #: include/class/acc_ledger_history_generic.class.php:764 #: include/export/export_ledger_csv.php:210 #: include/export/export_ledger_csv.php:210 -#: include/class/acc_ledger_history_generic.class.php:764 +#: include/class/acc_ledger_history_generic.class.php:765 msgid "N° Pièce" msgstr "" @@ -20701,7 +20925,7 @@ msgstr "" #: include/class/acc_ledger_history_generic.class.php:681 #: include/export/export_ledger_csv.php:214 #: include/export/export_ledger_csv.php:214 -#: include/class/acc_ledger_history_generic.class.php:681 +#: include/class/acc_ledger_history_generic.class.php:682 #: include/class/acc_reconciliation.class.php:484 msgid "internal" msgstr "" @@ -21003,12 +21227,12 @@ msgid "Dépendant" msgstr "" #: include/template/param_jrn.php:136 include/template/param_jrn.php:143 -#: include/template/param_jrn.php:143 +#: include/template/param_jrn.php:145 msgid "Services, fournitures ou biens achetés (D)" msgstr "" #: include/template/param_jrn.php:139 include/template/param_jrn.php:146 -#: include/template/param_jrn.php:146 +#: include/template/param_jrn.php:148 msgid "Fournisseurs (C)" msgstr "" @@ -21021,7 +21245,7 @@ msgid "Services, fournitures ou biens vendus (D)" msgstr "" #: include/template/param_jrn.php:251 include/template/param_jrn.php:258 -#: include/template/param_jrn.php:258 +#: include/template/param_jrn.php:260 msgid "Fiches utilisables (D/C)" msgstr "" @@ -21157,6 +21381,8 @@ msgstr "" #: include/class/acc_ledger_fin.class.php:924 #: include/class/acc_ledger_fin.class.php:915 #: include/class/acc_ledger_fin.class.php:936 +#: include/class/acc_ledger_fin.class.php:915 +#: include/class/acc_ledger_fin.class.php:936 msgid "Attention , erreur Acc_Ledger_Fin::insert , coche paiement" msgstr "" @@ -21187,7 +21413,7 @@ msgstr "" #: include/class/class_document_export.php:283 #: include/class/document_export.class.php:283 #: include/class/document_export.class.php:293 -#: include/class/document_export.class.php:293 +#: include/class/document_export.class.php:294 msgid "PS2PDF non installé" msgstr "" @@ -21196,7 +21422,7 @@ msgstr "" #: include/class/class_document_export.php:284 #: include/class/document_export.class.php:284 #: include/class/document_export.class.php:294 -#: include/class/document_export.class.php:294 +#: include/class/document_export.class.php:295 msgid "PDF2PS non installé" msgstr "" @@ -21531,6 +21757,7 @@ msgstr "" #: include/balance.inc.php:439 include/export/export_balance_pdf.php:294 #: include/balance.inc.php:440 include/export/export_balance_pdf.php:309 #: include/balance.inc.php:458 include/export/export_balance_pdf.php:334 +#: include/export/export_balance_pdf.php:329 #: include/export/export_balance_pdf.php:329 include/balance.inc.php:458 msgid "Résumé Exercice précédent" msgstr "" @@ -21538,6 +21765,7 @@ msgstr "" #: include/balance.inc.php:446 include/export/export_balance_pdf.php:301 #: include/balance.inc.php:447 include/export/export_balance_pdf.php:316 #: include/balance.inc.php:465 include/export/export_balance_pdf.php:341 +#: include/export/export_balance_pdf.php:336 #: include/export/export_balance_pdf.php:336 include/balance.inc.php:465 msgid "Résumé Exercice courant" msgstr "" @@ -21560,6 +21788,7 @@ msgstr "" #: include/lib/ac_common.php:567 include/lib/ac_common.php:568 #: include/lib/ac_common.php:570 include/lib/ac_common.php:586 +#: include/lib/ac_common.php:586 msgid "paramètre invalide" msgstr "" @@ -21572,6 +21801,7 @@ msgstr "" #: include/lib/manage_table_sql.class.php:1005 #: include/lib/manage_table_sql.class.php:1025 #: include/lib/manage_table_sql.class.php:1022 +#: include/lib/manage_table_sql.class.php:1022 msgid "OK" msgstr "" @@ -21580,6 +21810,7 @@ msgstr "" #: include/lib/manage_table_sql.class.php:1008 #: include/lib/manage_table_sql.class.php:1028 #: include/lib/manage_table_sql.class.php:1025 +#: include/lib/manage_table_sql.class.php:1025 msgid "Cancel" msgstr "" @@ -21632,13 +21863,14 @@ msgstr "" #: include/class/acc_ledger.class.php:2825 #: include/class/acc_ledger.class.php:2826 #: include/class/acc_ledger.class.php:2835 +#: include/class/acc_ledger.class.php:2835 msgid "Opération identique" msgstr "" #: include/class/class_document_export.php:247 #: include/class/document_export.class.php:247 #: include/class/document_export.class.php:254 -#: include/class/document_export.class.php:254 +#: include/class/document_export.class.php:255 msgid "Echec Ajout detail " msgstr "" @@ -21781,7 +22013,7 @@ msgid "Commentaire vide" msgstr "" #: include/anc_pa.inc.php:130 include/anc_pa.inc.php:132 -#: include/anc_pa.inc.php:125 +#: include/anc_pa.inc.php:125 include/anc_pa.inc.php:125 msgid "Efface ce plan" msgstr "" @@ -21847,7 +22079,7 @@ msgid "Avec Détails opérations " msgstr "" #: include/opening.inc.php:84 include/compta_ods.inc.php:96 -#: include/opening.inc.php:84 +#: include/compta_ods.inc.php:96 include/opening.inc.php:84 msgid "Opération enregistrée" msgstr "" @@ -21888,6 +22120,7 @@ msgid "Ecriture d'ouverture %d" msgstr "" #: include/operation_ods_new.inc.php:43 include/operation_ods_new.inc.php:44 +#: include/operation_ods_new.inc.php:44 msgid "" "Vous ne pouvez pas écrire dans ce journal, contactez votre administrateur" msgstr "" @@ -21956,12 +22189,12 @@ msgid "delta" msgstr "" #: include/template/param_jrn.php:194 include/template/param_jrn.php:201 -#: include/template/param_jrn.php:201 +#: include/template/param_jrn.php:203 msgid "Clients (D)" msgstr "" #: include/template/param_jrn.php:197 include/template/param_jrn.php:204 -#: include/template/param_jrn.php:204 +#: include/template/param_jrn.php:206 msgid "Services, fournitures ou biens vendus (C)" msgstr "" @@ -21970,12 +22203,12 @@ msgid "Nouveau format" msgstr "" #: include/lib/http_input.class.php:78 include/lib/http_input.class.php:85 -#: include/lib/http_input.class.php:87 +#: include/lib/http_input.class.php:87 include/lib/http_input.class.php:87 msgid "Unknown type" msgstr "" #: include/lib/icard.class.php:222 include/lib/icard.class.php:223 -#: include/lib/icard.class.php:223 +#: include/lib/icard.class.php:224 msgid "Le nom d une icard doit être donne" msgstr "" @@ -21984,10 +22217,12 @@ msgid "Faites un choix" msgstr "" #: include/lib/inplace_edit.class.php:79 include/lib/inplace_edit.class.php:78 +#: include/lib/inplace_edit.class.php:78 msgid "ok" msgstr "" #: include/lib/inplace_edit.class.php:80 include/lib/inplace_edit.class.php:79 +#: include/lib/inplace_edit.class.php:79 msgid "cancel" msgstr "" @@ -22003,7 +22238,7 @@ msgstr "" #: include/ajax/ajax_anc_plan.php:56 include/class/anc_plan.class.php:126 #: include/ajax/ajax_anc_plan.php:59 include/ajax/ajax_anc_plan.php:60 -#: include/class/anc_plan.class.php:126 +#: include/ajax/ajax_anc_plan.php:60 include/class/anc_plan.class.php:126 msgid "Aucune description" msgstr "" @@ -22025,6 +22260,7 @@ msgstr "" #: include/export/export_balance_pdf.php:123 #: include/export/export_balance_pdf.php:127 #: include/export/export_balance_pdf.php:124 +#: include/export/export_balance_pdf.php:124 msgid "Balance comptable" msgstr "" @@ -22176,6 +22412,7 @@ msgstr "" #: include/class/acc_ledger.class.php:797 #: include/class/acc_ledger.class.php:798 #: include/class/acc_ledger.class.php:803 +#: include/class/acc_ledger.class.php:803 msgid "Modèle d'opération" msgstr "" @@ -22183,6 +22420,7 @@ msgstr "" #: include/class/acc_ledger.class.php:980 #: include/class/acc_ledger.class.php:981 #: include/class/acc_ledger.class.php:986 +#: include/class/acc_ledger.class.php:986 #, php-format msgid "Réconciliation/rapprochements : %s" msgstr "" @@ -22194,6 +22432,7 @@ msgstr "" #: include/class/acc_ledger_search.class.php:259 #: include/class/acc_ledger_search.class.php:246 #: include/class/acc_ledger_search.class.php:248 +#: include/class/acc_ledger_search.class.php:248 msgid "Nom du filtre" msgstr "" @@ -22201,6 +22440,7 @@ msgstr "" #: include/class/acc_ledger_search.class.php:1070 #: include/class/acc_ledger_search.class.php:1078 #: include/class/acc_ledger_search.class.php:1091 +#: include/class/acc_ledger_search.class.php:1091 msgid "Inverser sel" msgstr "" @@ -22208,6 +22448,7 @@ msgstr "" #: include/class/acc_ledger_search.class.php:1072 #: include/class/acc_ledger_search.class.php:1080 #: include/class/acc_ledger_search.class.php:1093 +#: include/class/acc_ledger_search.class.php:1093 msgid "Effacer sel" msgstr "" @@ -22215,6 +22456,7 @@ msgstr "" #: include/class/acc_ledger_search.class.php:1080 #: include/class/acc_ledger_search.class.php:1088 #: include/class/acc_ledger_search.class.php:1101 +#: include/class/acc_ledger_search.class.php:1101 msgid "Op.Diverses" msgstr "" @@ -22288,12 +22530,14 @@ msgstr "" #: include/class/acc_plan_mtable.class.php:127 #: include/class/acc_plan_mtable.class.php:139 #: include/class/acc_plan_mtable.class.php:163 +#: include/class/acc_plan_mtable.class.php:163 msgid "Poste comptable est unique" msgstr "" #: include/class/acc_plan_mtable.class.php:130 #: include/class/acc_plan_mtable.class.php:142 #: include/class/acc_plan_mtable.class.php:166 +#: include/class/acc_plan_mtable.class.php:166 msgid "Poste comptable ne peut être vide" msgstr "" @@ -22309,18 +22553,24 @@ msgstr "" #: include/class/fiche.class.php:818 include/class/fiche.class.php:848 #: include/class/fiche.class.php:849 include/class/fiche.class.php:995 #: include/class/fiche.class.php:996 include/class/fiche.class.php:1036 +#: include/class/acc_plan_mtable.class.php:170 +#: include/class/fiche.class.php:819 include/class/fiche.class.php:849 +#: include/class/fiche.class.php:850 include/class/fiche.class.php:996 +#: include/class/fiche.class.php:997 include/class/fiche.class.php:1037 msgid "Poste comptable trop long" msgstr "" #: include/class/acc_plan_mtable.class.php:137 #: include/class/acc_plan_mtable.class.php:149 #: include/class/acc_plan_mtable.class.php:173 +#: include/class/acc_plan_mtable.class.php:173 msgid "Poste comptable dépendant ne peut pas être vide" msgstr "" #: include/class/acc_plan_mtable.class.php:145 #: include/class/acc_plan_mtable.class.php:157 #: include/class/acc_plan_mtable.class.php:181 +#: include/class/acc_plan_mtable.class.php:181 msgid "Compte parent n'existe pas" msgstr "" @@ -22331,13 +22581,13 @@ msgstr "" #: include/class/anc_balance_double.class.php:351 #: include/class/anc_balance_double.class.php:352 -#: include/class/anc_balance_double.class.php:352 +#: include/class/anc_balance_double.class.php:354 msgid "Entre le poste " msgstr "" #: include/class/anc_balance_double.class.php:356 #: include/class/anc_balance_double.class.php:357 -#: include/class/anc_balance_double.class.php:357 +#: include/class/anc_balance_double.class.php:359 msgid " et le poste " msgstr "" @@ -22345,6 +22595,7 @@ msgstr "" #: include/class/anc_operation.class.php:272 #: include/class/anc_operation.class.php:273 #: include/class/anc_operation.class.php:274 +#: include/class/anc_operation.class.php:274 msgid "Pas d'enregistrement trouvé" msgstr "" @@ -22358,29 +22609,30 @@ msgid "Export en CSV" msgstr "" #: include/class/fiche.class.php:838 include/class/fiche.class.php:840 -#: include/class/fiche.class.php:843 +#: include/class/fiche.class.php:843 include/class/fiche.class.php:844 msgid "Désolé, il y a trop de virgule dans le poste comptable " msgstr "" #: include/class/fiche.class.php:1047 include/class/fiche.class.php:1049 -#: include/class/fiche.class.php:1063 +#: include/class/fiche.class.php:1063 include/class/fiche.class.php:1064 msgid "opération annulée" msgstr "" #: include/class/pre_operation.class.php:285 #: include/class/pre_operation.class.php:286 +#: include/class/pre_operation.class.php:286 msgid "Vous n'avez encore sauvé aucun modèle" msgstr "" -#: html/ajax_misc.php:288 html/ajax_misc.php:290 +#: html/ajax_misc.php:288 html/ajax_misc.php:290 html/ajax_misc.php:296 msgid "Invalide type" msgstr "" -#: html/ajax_misc.php:452 html/ajax_misc.php:454 +#: html/ajax_misc.php:452 html/ajax_misc.php:454 html/ajax_misc.php:460 msgid "Choisissez la TVA" msgstr "" -#: html/do.php:193 html/do.php:203 html/do.php:203 +#: html/do.php:193 html/do.php:203 html/do.php:172 msgid "cliquez ici pour mettre à jour " msgstr "" @@ -22443,6 +22695,7 @@ msgstr "" #: include/balance.inc.php:314 include/export/export_balance_pdf.php:135 #: include/class/acc_operation.class.php:727 +#: include/export/export_balance_pdf.php:132 #: include/export/export_balance_pdf.php:132 include/balance.inc.php:314 #: include/class/acc_operation.class.php:727 msgid "Ouverture" @@ -22644,7 +22897,7 @@ msgstr "" msgid "Date création" msgstr "" -#: include/template/param_jrn.php:125 include/template/param_jrn.php:125 +#: include/template/param_jrn.php:125 include/template/param_jrn.php:127 msgid "Journal actif" msgstr "" @@ -22779,7 +23032,7 @@ msgid "" msgstr "" #: include/lib/ac_common.php:811 include/lib/ac_common.php:813 -#: include/lib/ac_common.php:829 +#: include/lib/ac_common.php:829 include/lib/ac_common.php:829 msgid "Format Invalide" msgstr "" @@ -22840,36 +23093,36 @@ msgstr "" msgid "Invalid command" msgstr "" -#: include/ajax/ajax_preference.php:169 include/ajax/ajax_preference.php:169 +#: include/ajax/ajax_preference.php:169 include/ajax/ajax_preference.php:180 msgid "Format Export CSV" msgstr "" -#: include/ajax/ajax_preference.php:174 include/ajax/ajax_preference.php:174 +#: include/ajax/ajax_preference.php:174 include/ajax/ajax_preference.php:185 msgid "N'utilisez pas le même séparateur pour les champs et les décimales" msgstr "" -#: include/ajax/ajax_preference.php:187 include/ajax/ajax_preference.php:187 +#: include/ajax/ajax_preference.php:187 include/ajax/ajax_preference.php:198 msgid "Point-virgule" msgstr "" #: include/ajax/ajax_preference.php:188 include/ajax/ajax_preference.php:204 -#: include/ajax/ajax_preference.php:188 include/ajax/ajax_preference.php:204 +#: include/ajax/ajax_preference.php:199 include/ajax/ajax_preference.php:215 msgid "virgule" msgstr "" -#: include/ajax/ajax_preference.php:197 include/ajax/ajax_preference.php:197 +#: include/ajax/ajax_preference.php:197 include/ajax/ajax_preference.php:208 msgid "Séparateur Décimale" msgstr "" -#: include/ajax/ajax_preference.php:203 include/ajax/ajax_preference.php:203 +#: include/ajax/ajax_preference.php:203 include/ajax/ajax_preference.php:214 msgid "point" msgstr "" -#: include/ajax/ajax_preference.php:219 include/ajax/ajax_preference.php:219 +#: include/ajax/ajax_preference.php:219 include/ajax/ajax_preference.php:230 msgid "utf8" msgstr "" -#: include/ajax/ajax_preference.php:220 include/ajax/ajax_preference.php:220 +#: include/ajax/ajax_preference.php:220 include/ajax/ajax_preference.php:231 msgid "latin1" msgstr "" @@ -22904,11 +23157,13 @@ msgstr "" #: include/export/export_balance_pdf.php:136 #: include/export/export_balance_pdf.php:133 +#: include/export/export_balance_pdf.php:133 msgid "Total Débit" msgstr "" #: include/export/export_balance_pdf.php:137 #: include/export/export_balance_pdf.php:134 +#: include/export/export_balance_pdf.php:134 msgid "Total Crédit" msgstr "" @@ -22923,18 +23178,21 @@ msgstr "" #: include/class/acc_ledger.class.php:2273 #: include/class/acc_ledger.class.php:2274 #: include/class/acc_ledger.class.php:2283 +#: include/class/acc_ledger.class.php:2283 msgid "Activé" msgstr "" #: include/class/acc_ledger.class.php:2274 #: include/class/acc_ledger.class.php:2275 #: include/class/acc_ledger.class.php:2284 +#: include/class/acc_ledger.class.php:2284 msgid "Désactivé" msgstr "" #: include/class/acc_ledger.class.php:2870 #: include/class/acc_ledger.class.php:2871 #: include/class/acc_ledger.class.php:2880 +#: include/class/acc_ledger.class.php:2880 msgid "Journal incorrect" msgstr "" @@ -22951,17 +23209,17 @@ msgid "invalid parameter" msgstr "" #: include/class/acc_ledger_history_generic.class.php:667 -#: include/class/acc_ledger_history_generic.class.php:667 +#: include/class/acc_ledger_history_generic.class.php:668 msgid "solde débiteur:" msgstr "" #: include/class/acc_ledger_history_generic.class.php:668 -#: include/class/acc_ledger_history_generic.class.php:668 +#: include/class/acc_ledger_history_generic.class.php:669 msgid "solde créditeur:" msgstr "" #: include/class/acc_ledger_history_generic.class.php:684 -#: include/class/acc_ledger_history_generic.class.php:684 +#: include/class/acc_ledger_history_generic.class.php:685 msgid "Total opération" msgstr "" @@ -23344,7 +23602,7 @@ msgid " " msgstr "" #: include/history_operation.inc.php:103 include/history_operation.inc.php:97 -#: include/history_operation.inc.php:103 +#: include/history_operation.inc.php:97 include/history_operation.inc.php:103 #, php-format msgid "Période %s au %s " msgstr "" @@ -23356,13 +23614,13 @@ msgstr "" msgid "Désolé , impossible de se connecter au serveur %s" msgstr "" -#: include/template/param_jrn.php:61 include/template/param_jrn.php:61 +#: include/template/param_jrn.php:61 include/template/param_jrn.php:68 msgid "" "Obligatoire pour les journaux FIN : donner ici la fiche du compte en banque " "utilisée" msgstr "" -#: include/template/param_jrn.php:68 include/template/param_jrn.php:68 +#: include/template/param_jrn.php:68 include/template/param_jrn.php:75 msgid "Minimum de lignes à afficher" msgstr "" @@ -23434,6 +23692,7 @@ msgid "Only VEN Extended" msgstr "" #: scenario/inplace_edit.test.php:32 scenario/inplace_edit.test.php:33 +#: scenario/inplace_edit.test.php:33 msgid "Test Inplace_Edit" msgstr "" @@ -23441,11 +23700,11 @@ msgstr "" msgid "Titre 1" msgstr "" -#: scenario/html_tab.test.php:35 scenario/html_tab.test.php:35 +#: scenario/html_tab.test.php:35 scenario/html_tab.test.php:39 msgid "Titre 2" msgstr "" -#: scenario/html_tab.test.php:49 scenario/html_tab.test.php:49 +#: scenario/html_tab.test.php:49 scenario/html_tab.test.php:53 msgid "Titre 3" msgstr "" @@ -23461,20 +23720,22 @@ msgstr "" msgid "Impossible d'effacer : ce poste est utilisé" msgstr "" +#: include/export/export_balance_pdf.php:109 #: include/export/export_balance_pdf.php:109 #, php-format msgid "Du %s au %s" msgstr "" -#: include/operation_ods_new.inc.php:94 +#: include/operation_ods_new.inc.php:94 include/operation_ods_new.inc.php:94 #, php-format msgid "Opération rapprochée : %s" msgstr "" -#: include/fiche.inc.php:592 +#: include/fiche.inc.php:592 include/fiche.inc.php:601 msgid "solde crediteur" msgstr "" +#: include/class/acc_ledger.class.php:1079 #: include/class/acc_ledger.class.php:1079 #, php-format msgid "" @@ -23482,58 +23743,159 @@ msgid "" " vous ne pouvez pas encoder à une date antérieure" msgstr "" +#: include/class/acc_ledger.class.php:1124 #: include/class/acc_ledger.class.php:1124 #, php-format msgid "Le poste %s n'est pas dans ce journal" msgstr "" +#: include/class/acc_ledger.class.php:1136 #: include/class/acc_ledger.class.php:1136 #, php-format msgid " Le poste %s appartient à fiche(s) dont : %s" msgstr "" +#: include/class/acc_ledger.class.php:1150 #: include/class/acc_ledger.class.php:1150 #, php-format msgid "Utilisation directe interdite du poste comptable %s" msgstr "" -#: include/class/document.class.php:1293 +#: include/class/document.class.php:1293 include/class/document.class.php:1293 #, php-format msgid "chaine à remplacer [%s] contient un caractère interdit" msgstr "" +#: include/class/acc_ledger_fin.class.php:535 #: include/class/acc_ledger_fin.class.php:535 msgid "Numéro d'extrait" msgstr "" +#: include/class/acc_ledger_fin.class.php:536 #: include/class/acc_ledger_fin.class.php:536 msgid "Solde début extrait" msgstr "" +#: include/class/acc_ledger_fin.class.php:538 #: include/class/acc_ledger_fin.class.php:538 msgid "Solde fin extrait" msgstr "" +#: include/class/acc_ledger_fin.class.php:636 #: include/class/acc_ledger_fin.class.php:636 msgid "Ancien solde" msgstr "" +#: include/class/acc_ledger_fin.class.php:641 #: include/class/acc_ledger_fin.class.php:641 msgid "Nouveau solde" msgstr "" +#: include/class/acc_ledger_fin.class.php:652 #: include/class/acc_ledger_fin.class.php:652 msgid "Ajoutez une pièce justificative" msgstr "" +#: include/class/acc_plan_mtable.class.php:196 #: include/class/acc_plan_mtable.class.php:196 msgid "Toutes les fiches" msgstr "" -#: include/class/anc_print.class.php:163 +#: include/class/anc_print.class.php:163 include/class/anc_print.class.php:163 msgid "Plan Analytique " msgstr "" -#: include/lib/ac_common.php:1129 +#: include/lib/ac_common.php:1129 include/lib/ac_common.php:1129 msgid "Fichier non trouvé" msgstr "" + +#: include/ajax/ajax_preference.php:72 +msgid "Après validation, recharger si vous changez la langue" +msgstr "" + +#: include/class/anc_balance_double.class.php:51 +msgid "Pas de croisement avec un seul plan" +msgstr "" + +#: include/class/anc_balance_double.class.php:97 +#: include/class/anc_balance_double.class.php:98 +msgid "Poste Analytique" +msgstr "" + +#: include/lib/message_javascript.php:77 +msgid "Un instant svp" +msgstr "" + +#: include/lib/message_javascript.php:79 +msgid "Echec " +msgstr "" + +#: include/lib/message_javascript.php:80 +msgid "Echec donnée manquante ou incorrecte" +msgstr "" + +#: include/lib/message_javascript.php:81 +msgid "Vous confirmez effacement ?" +msgstr "" + +#: include/lib/message_javascript.php:82 +msgid "Vous confirmez mise à jour ?" +msgstr "" + +#: include/lib/message_javascript.php:83 +msgid "Si vous changez de page vous perdez les reconciliations, continuez ?" +msgstr "" + +#: include/lib/message_javascript.php:84 +msgid "Echec réponse" +msgstr "" + +#: include/lib/message_javascript.php:85 +msgid "Désolé, les montants pour la comptabilité analytique sont incorrects" +msgstr "" + +#: include/lib/message_javascript.php:86 +msgid "Maximum 15 lignes" +msgstr "" + +#: include/lib/message_javascript.php:87 +msgid "Maximum" +msgstr "" + +#: include/lib/message_javascript.php:88 +msgid "calculé" +msgstr "" + +#: include/lib/message_javascript.php:89 +msgid "Balance incorrecte D/C" +msgstr "" + +#: include/lib/message_javascript.php:91 +msgid "Donnée manquante ou déjà supprimée" +msgstr "" + +#: include/lib/message_javascript.php:92 +msgid "Désolé, événement en cours de création à sauver" +msgstr "" + +#: include/lib/message_javascript.php:93 +msgid "Cacher" +msgstr "" + +#: include/lib/message_javascript.php:95 +msgid "Traitement en cours" +msgstr "" + +#: include/lib/message_javascript.php:96 +msgid "Un instant" +msgstr "" + +#: include/lib/message_javascript.php:98 +msgid "Taper une formule (ex 20*5.1) puis enter" +msgstr "" + +#: include/lib/message_javascript.php:99 +msgid "" +"Calculatrice simplifiée: écrivez simplement les opérations que vous voulez " +"puis la touche retour. exemple : 1+2+3*(1/5)" +msgstr "" diff --git a/html/lang/nl_NL/LC_MESSAGES/messages.po b/html/lang/nl_NL/LC_MESSAGES/messages.po index 05c17a41e..a83a0b48b 100644 --- a/html/lang/nl_NL/LC_MESSAGES/messages.po +++ b/html/lang/nl_NL/LC_MESSAGES/messages.po @@ -3,22 +3,22 @@ # This file is distributed under the same license as the NOALYSS package. # # dany , 2014. -# Dany De Bontridder , 2015, 2018. +# Dany De Bontridder , 2015, 2018, 2019. msgid "" msgstr "" "Project-Id-Version: NOALYSS\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-02-04 16:40+0100\n" -"PO-Revision-Date: 2018-07-21 14:01+0200\n" -"Last-Translator: dany\n" -"Language-Team: American English \n" +"POT-Creation-Date: 2019-07-31 00:04+0200\n" +"PO-Revision-Date: 2019-07-31 13:23+0100\n" +"Last-Translator: dany \n" +"Language-Team: English \n" "Language: nl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "com>\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Lokalize 1.5\n" +"X-Generator: Lokalize 2.0\n" #: include/database.item.php:124 msgid " " @@ -373,6 +373,7 @@ msgstr "en de activiteit" #: include/class/anc_balance_double.class.php:356 #: include/class/anc_balance_double.class.php:357 +#: include/class/anc_balance_double.class.php:359 #, fuzzy msgid " et le poste " msgstr "Vanuit de post" @@ -416,6 +417,7 @@ msgstr "de begrotingspost [" #: include/class/class_document_export.php:225 #: include/class/document_export.class.php:225 #: include/class/document_export.class.php:231 +#: include/class/document_export.class.php:232 msgid " ne peut pas convertir en PDF" msgstr "Kan niet worden omgezet in PDF" @@ -799,7 +801,7 @@ msgstr "Kranten" #: html/do.php:210 html/do.php:211 html/do.php:239 html/do.php:252 #: html/do.php:254 html/do.php:251 html/do.php:288 html/do.php:300 -#: html/do.php:310 +#: html/do.php:310 html/do.php:279 msgid "Accès menu impossible" msgstr "" @@ -944,6 +946,7 @@ msgstr "Actie is ontoegankelijk" # Je suppose que Action = ce qu'il a fait et pas le terme de comptabilité = Aandelen #: html/ajax_misc.php:179 html/ajax_misc.php:257 html/ajax_misc.php:262 #: html/ajax_misc.php:290 html/ajax_misc.php:382 html/ajax_misc.php:384 +#: html/ajax_misc.php:390 include/lib/message_javascript.php:90 #, fuzzy msgid "Action non autorisée" msgstr "Bewerking Opgeslagen" @@ -1051,6 +1054,7 @@ msgstr "Beheerder" #: include/admin_repo.inc.php:63 include/database.item.php:130 #: html/user_login.php:160 include/admin_repo.inc.php:65 #: include/database.item.php:124 html/user_login.php:166 +#: html/user_login.php:143 msgid "Administration" msgstr "Administratie" @@ -1070,6 +1074,7 @@ msgstr "Globale Administratie" #: include/class/class_fiche.php:1601 include/class/class_fiche.php:1604 #: include/class/fiche.class.php:1758 include/class/fiche.class.php:1761 #: include/class/fiche.class.php:1763 include/class/fiche.class.php:1781 +#: include/class/fiche.class.php:1782 msgid "Adresse" msgstr "Adres" @@ -1118,6 +1123,7 @@ msgstr "Toon ook de gesloten acties" #: include/ext/tva/class_ext_tvagen.php:114 #: include/ext/tva/ext_list_assujetti.class.php:54 #: include/ext/tva/ext_tvagen.class.php:114 +#: include/lib/message_javascript.php:94 msgid "Afficher" msgstr "Weergeven" @@ -1677,7 +1683,7 @@ msgstr "Niet gesoldeerd balans" #: include/ajax_preference.php:166 include/ajax_preference.php:167 #: html/test_class.php:220 include/ajax_preference.php:174 #: include/ajax/ajax_preference.php:174 include/ajax/ajax_preference.php:253 -#: dev/test/test_class.php:216 +#: dev/test/test_class.php:216 include/ajax/ajax_preference.php:264 msgid "Anglais" msgstr "Engels" @@ -1820,6 +1826,10 @@ msgstr "Analytisch" msgid "Après le " msgstr "Na" +#: include/ajax/ajax_preference.php:72 +msgid "Après validation, recharger si vous changez la langue" +msgstr "" + #: include/profile.inc.php:150 #, fuzzy msgid "Argument" @@ -1983,7 +1993,7 @@ msgstr "Let op: Verschil tussen BTW en berekende gegevens" #: include/ajax_preference.php:102 include/ajax_preference.php:103 #: include/ajax_preference.php:110 include/ajax/ajax_preference.php:110 -#: include/ajax/ajax_preference.php:115 +#: include/ajax/ajax_preference.php:115 include/ajax/ajax_preference.php:126 msgid "" "Attention cette période est fermée, vous ne pourrez rien modifier dans le " "module comptable" @@ -2082,7 +2092,7 @@ msgstr "Opgelet, niet de betekenis van deze post veranderen" #: html/do.php:104 html/do.php:103 html/do.php:98 html/do.php:100 #: html/do.php:128 html/do.php:141 html/do.php:143 html/do.php:161 -#: html/do.php:185 html/do.php:197 html/do.php:207 +#: html/do.php:185 html/do.php:197 html/do.php:207 html/do.php:176 msgid "" "Attention: la version de base de donnée est supérieure à la version du " "programme, vous devriez mettre à jour" @@ -2302,7 +2312,7 @@ msgstr "Geen enkele post gevonden " #: include/ajax_preference.php:152 include/ajax_preference.php:153 #: include/ajax_preference.php:160 include/ajax/ajax_preference.php:160 -#: include/ajax/ajax_preference.php:239 +#: include/ajax/ajax_preference.php:239 include/ajax/ajax_preference.php:250 msgid "Aucun mini rapport" msgstr "Geen mini-verslag" @@ -2346,7 +2356,7 @@ msgstr "Geen enkele post gevonden " #: html/do.php:219 html/do.php:224 html/do.php:252 html/do.php:265 #: html/do.php:268 html/do.php:270 html/do.php:307 html/do.php:319 -#: html/do.php:329 html/do.php:331 +#: html/do.php:329 html/do.php:331 html/do.php:300 #, fuzzy msgid "Aucun profil utilisateur" msgstr "Gebruiker toevoegen" @@ -2468,6 +2478,7 @@ msgstr "Geen enkel gegeven" #: include/anc_great_ledger.inc.php:47 include/anc_balance_double.inc.php:27 #: include/anc_balance_simple.inc.php:27 include/anc_great_ledger.inc.php:78 #: include/anc_history.inc.php:34 include/anc_history.inc.php:37 +#: include/anc_balance_double.inc.php:26 msgid "Aucune donnée trouvée" msgstr "Geen enkele gegeven gevonden " @@ -2487,6 +2498,7 @@ msgstr "Geen bestand gevraag" #: include/fiche.inc.php:383 include/fiche.inc.php:386 #: include/fiche.inc.php:133 include/fiche.inc.php:387 #: include/fiche.inc.php:134 include/fiche.inc.php:388 +#: include/fiche.inc.php:395 msgid "Aucune fiche trouvée" msgstr "Geen bestand gevonden" @@ -2882,6 +2894,11 @@ msgstr "Foute balans" msgid "Balance incorrecte " msgstr "Foute balans" +#: include/lib/message_javascript.php:89 +#, fuzzy +msgid "Balance incorrecte D/C" +msgstr "Foute balans" + #: include/fiche.inc.php:70 include/fiche.inc.php:72 include/fiche.inc.php:73 msgid "Balance non soldée" msgstr "Niet gesoldeerd balans" @@ -2978,7 +2995,7 @@ msgstr "is in use of, logout eerst" #: html/do.php:97 html/user_login.php:66 html/do.php:96 html/do.php:91 #: html/do.php:93 html/user_login.php:67 html/do.php:121 html/do.php:134 #: html/do.php:136 html/do.php:154 html/do.php:178 html/user_login.php:69 -#: html/do.php:186 html/user_login.php:70 html/do.php:196 +#: html/do.php:186 html/user_login.php:70 html/do.php:196 html/do.php:165 msgid "Base de donnée invalide" msgstr "Ongeldige database" @@ -3106,9 +3123,15 @@ msgstr "D / C" #: include/class/class_document_export.php:280 #: include/class/document_export.class.php:280 #: include/class/document_export.class.php:290 +#: include/class/document_export.class.php:291 msgid "CONVERT_GIF_PDF n'est pas installé" msgstr "CONVERT_GIF_PDF is niet geïnstalleerd" +#: include/lib/message_javascript.php:93 +#, fuzzy +msgid "Cacher" +msgstr "Vinden" + #: include/template/detail-action.php:337 #: include/template/detail-action.php:336 #: include/template/detail-action.php:351 @@ -3140,9 +3163,16 @@ msgstr "Automatisch aanmaken van de boekhoudkundige post" #: include/class_ibutton.php:82 include/class_ibutton.php:84 #: include/lib/class_ibutton.php:84 include/lib/ibutton.class.php:84 +#: include/lib/message_javascript.php:97 msgid "Calculatrice" msgstr "Rekenmachine" +#: include/lib/message_javascript.php:99 +msgid "" +"Calculatrice simplifiée: écrivez simplement les opérations que vous voulez " +"puis la touche retour. exemple : 1+2+3*(1/5)" +msgstr "" + #: include/profile.inc.php:356 include/profile.inc.php:358 #: include/profile.inc.php:381 include/profile.inc.php:363 #, fuzzy @@ -3363,6 +3393,7 @@ msgstr "Dit plan bestaat niet" #: html/ajax_misc.php:571 html/ajax_misc.php:613 html/ajax_misc.php:408 #: html/ajax_misc.php:434 html/ajax_misc.php:546 html/ajax_misc.php:548 +#: html/ajax_misc.php:554 #, fuzzy msgid "Ce plugin n'existe pas " msgstr "Dit plan bestaat niet" @@ -3435,7 +3466,7 @@ msgstr "Deze categorie heeft geen toegewezen e-mail" #: include/fiche.inc.php:290 include/fiche.inc.php:363 #: include/fiche.inc.php:366 include/fiche.inc.php:367 -#: include/fiche.inc.php:368 +#: include/fiche.inc.php:368 include/fiche.inc.php:375 #, fuzzy msgid "Cette catégorie n'ayant pas de poste comptable n'a pas de balance" msgstr "Dit bestand heeft geen geldige boekhoudkundige post" @@ -3657,6 +3688,8 @@ msgstr "" #: html/ajax_misc.php:456 include/class/pre_operation.class.php:289 #: include/class/acc_ledger.class.php:2185 #: include/class/anc_listing.class.php:76 include/class/fiche.class.php:2246 +#: html/user_login.php:158 html/ajax_misc.php:462 +#: include/class/fiche.class.php:2247 #, fuzzy, php-format msgid "Cherche" msgstr "Vinden" @@ -3704,7 +3737,7 @@ msgid "" "a-nouveaux (exercice N)" msgstr "" -#: html/ajax_misc.php:452 html/ajax_misc.php:454 +#: html/ajax_misc.php:452 html/ajax_misc.php:454 html/ajax_misc.php:460 #, fuzzy msgid "Choisissez la TVA" msgstr "Kies de BTW" @@ -4066,6 +4099,7 @@ msgid "Clients (C)" msgstr "Klant" #: include/template/param_jrn.php:194 include/template/param_jrn.php:201 +#: include/template/param_jrn.php:203 #, fuzzy msgid "Clients (D)" msgstr "Klant" @@ -4469,7 +4503,7 @@ msgstr "niet use of" #: include/export/export_fiche_balance_csv.php:142 #: include/export/export_fiche_balance_csv.php:155 #: include/export/export_fiche_balance_csv.php:156 include/fiche.inc.php:519 -#: include/fiche.inc.php:521 +#: include/fiche.inc.php:521 include/fiche.inc.php:530 msgid "Comm" msgstr "Comm" @@ -4532,6 +4566,7 @@ msgstr "" #: include/class/acc_ledger_purchase.class.php:1835 #: include/class/print_ledger_misc.class.php:47 #: include/class/acc_ledger_fin.class.php:550 +#: include/class/acc_ledger_history_generic.class.php:684 msgid "Commentaire" msgstr "Commentaar" @@ -4672,7 +4707,7 @@ msgstr "Resultatenrekening : product met debetsaldo" #: include/template/param_jrn.php:41 include/template/ledger_detail_fin.php:34 #: include/template/operation_detail_fin.php:31 #: include/template/ledger_detail_fin.php:35 -#: include/compta_fin_saldo.inc.php:48 +#: include/compta_fin_saldo.inc.php:48 include/template/param_jrn.php:48 msgid "Compte en banque" msgstr "Bankrekening" @@ -5190,6 +5225,7 @@ msgstr "Dossier maken" #: include/ext/tools/include/anc_grandlivre_ext.class.php:127 #: include/export/export_poste_detail_pdf.php:104 #: include/ajax/ajax_display_letter.php:123 include/fiche.inc.php:580 +#: include/fiche.inc.php:589 msgid "Credit" msgstr "Credit" @@ -5362,6 +5398,9 @@ msgstr "Crébit" #: include/class/fiche.class.php:1463 include/class/acc_ledger.class.php:614 #: include/class/fiche.class.php:1465 include/operation_ods_new.inc.php:85 #: include/class/fiche.class.php:1479 +#: include/class/anc_balance_double.class.php:100 +#: include/class/acc_ledger_history_generic.class.php:772 +#: include/class/fiche.class.php:1480 msgid "Crédit" msgstr "Creditzijde" @@ -5758,6 +5797,10 @@ msgstr "In het dagboek" #: include/class/anc_listing.class.php:79 #: include/class/anc_operation.class.php:297 include/class/fiche.class.php:1396 #: include/class/fiche.class.php:1471 include/lib/ac_common.php:1210 +#: include/fiche.inc.php:527 +#: include/class/acc_ledger_history_generic.class.php:680 +#: include/class/acc_ledger_history_generic.class.php:767 +#: include/class/fiche.class.php:1397 include/class/fiche.class.php:1472 msgid "Date" msgstr "Datum" @@ -6115,6 +6158,7 @@ msgstr "Vervaldatum" #: include/ext/tools/include/anc_grandlivre_ext.class.php:126 #: include/export/export_poste_detail_pdf.php:102 #: include/ajax/ajax_display_letter.php:122 include/fiche.inc.php:576 +#: include/fiche.inc.php:585 msgid "Debit" msgstr "Debet" @@ -6128,6 +6172,7 @@ msgstr "Debet / Credit" #: html/user_login.php:151 html/user_login.php:153 html/user_login.php:155 #: html/user_login.php:159 html/user_login.php:160 html/user_login.php:161 #: html/user_login.php:162 html/user_login.php:165 html/user_login.php:171 +#: html/user_login.php:148 msgid "Deconnexion" msgstr "Afmelden" @@ -6177,7 +6222,7 @@ msgid "Dernier numéro utilisé pour ce type de document" msgstr "Het laatste nummer gebruikt voor dit type document" #: include/template/param_jrn.php:102 include/template/param_jrn.php:99 -#: include/template/param_jrn.php:106 +#: include/template/param_jrn.php:106 include/template/param_jrn.php:108 msgid "Dernière pièce numérotée" msgstr "Laatst genummerd stuk" @@ -6194,6 +6239,7 @@ msgstr "Laatste handelingen" #: html/ajax_misc.php:196 html/ajax_misc.php:274 html/ajax_misc.php:279 #: html/ajax_misc.php:307 html/ajax_misc.php:399 html/ajax_misc.php:401 +#: html/ajax_misc.php:407 #, fuzzy msgid "Des actions dépendent de cette catégorie" msgstr "Kan dit bestand op te slaan" @@ -6370,6 +6416,8 @@ msgstr "Kan dit bestand op te slaan" #: include/class/acc_ledger_search.class.php:1105 #: include/class/anc_listing.class.php:83 include/class/fiche.class.php:1397 #: include/class/fiche.class.php:1476 include/lib/ac_common.php:1213 +#: include/template/param_jrn.php:85 include/class/fiche.class.php:1398 +#: include/class/fiche.class.php:1477 msgid "Description" msgstr "Beschrijving" @@ -6728,6 +6776,10 @@ msgstr "" msgid "Donnée invalide" msgstr "Ongeldig jaar" +#: include/lib/message_javascript.php:91 +msgid "Donnée manquante ou déjà supprimée" +msgstr "" + #: include/class_fiche_def.php:767 include/class_fiche_def.php:748 #: include/class_fiche_def.php:754 include/class_fiche_def.php:766 #: include/class_fiche_def.php:765 include/class/class_fiche_def.php:765 @@ -6950,6 +7002,9 @@ msgstr "Afschrijvingstermijn" #: include/class/acc_ledger.class.php:884 include/class/fiche.class.php:1464 #: include/operation_ods_new.inc.php:84 include/class/acc_ledger.class.php:889 #: include/class/fiche.class.php:1478 +#: include/class/anc_balance_double.class.php:99 +#: include/class/acc_ledger_history_generic.class.php:771 +#: include/class/fiche.class.php:1479 msgid "Débit" msgstr "debiet" @@ -6967,6 +7022,7 @@ msgstr "Debet of Credit" #: include/class/class_fiche.php:1235 include/class/class_fiche.php:1238 #: include/class/fiche.class.php:1382 include/class/fiche.class.php:1383 #: include/class/fiche.class.php:1385 include/class/fiche.class.php:1399 +#: include/class/fiche.class.php:1400 #, fuzzy msgid "Débit/Crédit" msgstr "Debet of Credit" @@ -7224,10 +7280,15 @@ msgid "Désolé vous ne pouvez pas utiliser ce plugin , vous êtes en mode STRIC msgstr "" #: include/class/fiche.class.php:838 include/class/fiche.class.php:840 -#: include/class/fiche.class.php:843 +#: include/class/fiche.class.php:843 include/class/fiche.class.php:844 msgid "Désolé, il y a trop de virgule dans le poste comptable " msgstr "" +#: include/lib/message_javascript.php:85 +#, fuzzy +msgid "Désolé, les montants pour la comptabilité analytique sont incorrects" +msgstr "Cost Accounting Module" + #: include/dossier.inc.php:345 include/dossier.inc.php:301 #: include/modele.inc.php:358 include/dossier.inc.php:324 #: include/dossier.inc.php:360 include/modele.inc.php:372 @@ -7238,6 +7299,10 @@ msgstr "" msgid "Désolé, vous n'avez pas coché la case" msgstr "Sorry hebt u Het niet VAK aangekruisd" +#: include/lib/message_javascript.php:92 +msgid "Désolé, événement en cours de création à sauver" +msgstr "" + #: include/template/ledger_detail_ach.php:112 #: include/template/ledger_detail_fin.php:96 #: include/template/ledger_detail_misc.php:81 @@ -7516,9 +7581,15 @@ msgstr "termijn wordt overschreden" msgid "Echec" msgstr "Termijn" +#: include/lib/message_javascript.php:79 +#, fuzzy +msgid "Echec " +msgstr "Termijn" + #: include/class/class_document_export.php:247 #: include/class/document_export.class.php:247 #: include/class/document_export.class.php:254 +#: include/class/document_export.class.php:255 msgid "Echec Ajout detail " msgstr "" @@ -7549,6 +7620,10 @@ msgstr "" msgid "Echec de la restauration " msgstr "" +#: include/lib/message_javascript.php:80 +msgid "Echec donnée manquante ou incorrecte" +msgstr "" + #: include/ext/importbank/include/template/show_transfer.php:125 msgid "Echec import" msgstr "" @@ -7582,6 +7657,11 @@ msgstr "Bijwerken" msgid "Echec ouverture fichier " msgstr "fout bij het openen van het bestand" +#: include/lib/message_javascript.php:84 +#, fuzzy +msgid "Echec réponse" +msgstr "Aanmaken" + #: include/class_acc_ledger_sold.php:1012 #: include/class_acc_ledger_sold.php:1037 #: include/class_acc_ledger_sold.php:1038 @@ -7920,7 +8000,7 @@ msgstr "Elementen" #: include/database.item.php:179 include/ajax/ajax_preference.php:73 #: include/database.item.php:180 include/database.item.php:183 #: include/user.inc.php:84 include/database.item.php:191 -#: include/ajax/ajax_preference.php:74 +#: include/ajax/ajax_preference.php:74 include/ajax/ajax_preference.php:85 msgid "Email" msgstr "E-mail" @@ -8027,7 +8107,7 @@ msgstr "Invordering van klanten vandaag" #: include/ext/import_account/include/template/test_operation.php:26 #: include/ext/import_card/include/template/test_file.php:42 #: include/ext/import_doli/include/template/test_file.php:30 -#: include/ajax/ajax_preference.php:213 +#: include/ajax/ajax_preference.php:213 include/ajax/ajax_preference.php:224 msgid "Encodage" msgstr "Coderen" @@ -8152,6 +8232,7 @@ msgstr "Tussen de activiteit" #: include/class/anc_balance_double.class.php:351 #: include/class/anc_balance_double.class.php:352 +#: include/class/anc_balance_double.class.php:354 #, fuzzy msgid "Entre le poste " msgstr "Vanuit de post" @@ -8332,6 +8413,7 @@ msgstr "Ongeldig datum" #: html/do.php:196 html/do.php:224 html/do.php:237 html/do.php:239 #: html/do.php:236 html/do.php:273 html/do.php:285 html/do.php:295 +#: html/do.php:264 #, fuzzy msgid "Erreur menu" msgstr "Fout" @@ -8544,7 +8626,7 @@ msgstr "Uitsluiten State" #: include/template/periode_add_exercice.php:25 #: include/ajax/ajax_preference.php:131 include/class/periode.class.php:519 #: include/class/periode_ledger_table.class.php:100 -#: include/template/stock_inv.php:126 +#: include/template/stock_inv.php:126 include/ajax/ajax_preference.php:142 msgid "Exercice" msgstr "Oefening" @@ -8571,6 +8653,7 @@ msgstr "tarief is geen getal" #: html/ajax_misc.php:197 html/ajax_misc.php:216 html/ajax_misc.php:230 #: html/ajax_misc.php:236 html/ajax_misc.php:314 html/ajax_misc.php:319 #: html/ajax_misc.php:347 html/ajax_misc.php:459 html/ajax_misc.php:461 +#: html/ajax_misc.php:467 msgid "Explication" msgstr "Uitleg" @@ -8635,6 +8718,9 @@ msgstr "Balans export" #: include/class/fiche.class.php:2191 include/fiche.inc.php:297 #: include/fiche.inc.php:333 include/class/fiche.class.php:1619 #: include/class/fiche.class.php:2214 include/anc_pa.inc.php:123 +#: include/fiche.inc.php:242 include/fiche.inc.php:302 +#: include/fiche.inc.php:340 include/class/fiche.class.php:1620 +#: include/class/fiche.class.php:2215 msgid "Export CSV" msgstr "Export CSV" @@ -8733,7 +8819,8 @@ msgstr "Export Kranten" #: include/class/fiche.class.php:1584 include/class/fiche.class.php:2211 #: html/popup.php:114 include/class/fiche.class.php:1586 #: include/class/fiche.class.php:2213 include/class/fiche.class.php:1604 -#: include/class/fiche.class.php:2236 +#: include/class/fiche.class.php:2236 include/class/fiche.class.php:1605 +#: include/class/fiche.class.php:2237 msgid "Export PDF" msgstr "PDF exporteren" @@ -9294,6 +9381,7 @@ msgid "Fiches ayant changé de poste comptable" msgstr "De% s-plug heeft geen financieel administratieve post" #: include/template/param_jrn.php:251 include/template/param_jrn.php:258 +#: include/template/param_jrn.php:260 msgid "Fiches utilisables (D/C)" msgstr "" @@ -9447,6 +9535,7 @@ msgstr "Rapid filter:" #: include/fiche.inc.php:312 include/fiche.inc.php:317 #: include/fiche.inc.php:390 include/fiche.inc.php:393 #: include/fiche.inc.php:394 include/fiche.inc.php:395 +#: include/fiche.inc.php:402 msgid "Filtre rapide:" msgstr "Rapid filter:" @@ -9518,7 +9607,7 @@ msgstr "" msgid "Financier" msgstr "Financieel" -#: include/ajax/ajax_preference.php:169 +#: include/ajax/ajax_preference.php:169 include/ajax/ajax_preference.php:180 #, fuzzy msgid "Format Export CSV" msgstr "Export CSV" @@ -9634,6 +9723,7 @@ msgid "Fournisseur " msgstr "Leverancier" #: include/template/param_jrn.php:139 include/template/param_jrn.php:146 +#: include/template/param_jrn.php:148 #, fuzzy msgid "Fournisseurs (C)" msgstr "Leverancier" @@ -9653,7 +9743,7 @@ msgstr "Leverancier vandaag betalen" #: include/ajax_preference.php:165 include/ajax_preference.php:166 #: html/test_class.php:219 include/ajax_preference.php:173 #: include/ajax/ajax_preference.php:173 include/ajax/ajax_preference.php:252 -#: dev/test/test_class.php:215 +#: dev/test/test_class.php:215 include/ajax/ajax_preference.php:263 msgid "Français" msgstr "Frans" @@ -10336,6 +10426,7 @@ msgstr "" #: html/ajax_misc.php:572 html/ajax_misc.php:614 html/ajax_misc.php:409 #: html/ajax_misc.php:435 html/ajax_misc.php:547 html/ajax_misc.php:549 +#: html/ajax_misc.php:555 msgid "Il y a une erreur, ce plugin n'existe pas" msgstr "" @@ -10344,6 +10435,7 @@ msgstr "" #: include/ajax_preference.php:137 include/ajax_preference.php:139 #: include/ajax/ajax_preference.php:137 include/ajax/ajax_preference.php:139 #: include/ajax/ajax_preference.php:154 include/ajax/ajax_preference.php:156 +#: include/ajax/ajax_preference.php:165 include/ajax/ajax_preference.php:167 msgid "Illimité" msgstr "Onbeperkt" @@ -10494,7 +10586,7 @@ msgstr "Invoegen" #: include/class_fiche.php:1022 include/class/class_fiche.php:1022 #: include/class/class_fiche.php:1024 include/class/class_fiche.php:1027 #: include/class/fiche.class.php:1117 include/class/fiche.class.php:1119 -#: include/class/fiche.class.php:1133 +#: include/class/fiche.class.php:1133 include/class/fiche.class.php:1134 msgid "Impossible cette fiche est utilisée dans un journal" msgstr "" @@ -10903,7 +10995,9 @@ msgstr "Intern" #: include/class/anc_grandlivre.class.php:219 #: include/class/acc_ledger_purchase.class.php:1832 #: include/class/print_ledger_misc.class.php:45 include/fiche.inc.php:520 -#: include/class/fiche.class.php:1474 +#: include/class/fiche.class.php:1474 include/fiche.inc.php:529 +#: include/class/acc_ledger_history_generic.class.php:766 +#: include/class/fiche.class.php:1475 msgid "Interne" msgstr "Intern" @@ -10918,7 +11012,7 @@ msgstr "Bestelbon" msgid "Invalide" msgstr "Bevestigen" -#: html/ajax_misc.php:288 html/ajax_misc.php:290 +#: html/ajax_misc.php:288 html/ajax_misc.php:290 html/ajax_misc.php:296 #, fuzzy msgid "Invalide type" msgstr "Bevestigen" @@ -11033,7 +11127,7 @@ msgstr "Donderdag" msgid "Journal" msgstr "Journaal" -#: include/template/param_jrn.php:125 +#: include/template/param_jrn.php:125 include/template/param_jrn.php:127 #, fuzzy msgid "Journal actif" msgstr "Totale activa" @@ -11381,7 +11475,7 @@ msgstr "Laat 0 het nummer niet wijzigen" #: include/ajax_preference.php:163 include/ajax_preference.php:164 #: include/ajax_preference.php:171 include/ajax/ajax_preference.php:171 -#: include/ajax/ajax_preference.php:250 +#: include/ajax/ajax_preference.php:250 include/ajax/ajax_preference.php:261 msgid "Langue" msgstr "Taal" @@ -11427,7 +11521,7 @@ msgstr "De naam mag niet leeg zijn" #: include/ajax_preference.php:158 include/ajax_preference.php:159 #: include/ajax_preference.php:166 include/ajax/ajax_preference.php:166 -#: include/ajax/ajax_preference.php:245 +#: include/ajax/ajax_preference.php:245 include/ajax/ajax_preference.php:256 msgid "Le mini rapport est un rapport qui s'affiche sur votre page d'accueil" msgstr "De quick ratio is een verhouding die op uw homepage verschijnt" @@ -11451,6 +11545,7 @@ msgid "" msgstr "" #: include/lib/icard.class.php:222 include/lib/icard.class.php:223 +#: include/lib/icard.class.php:224 #, fuzzy msgid "Le nom d une icard doit être donne" msgstr "De naam mag niet leeg zijn" @@ -11739,6 +11834,7 @@ msgstr "Laten." #: include/export/export_fiche_balance_csv.php:161 include/fiche.inc.php:522 #: include/export/export_fiche_detail_csv.php:80 #: include/export/export_poste_detail_csv.php:91 include/fiche.inc.php:524 +#: include/fiche.inc.php:533 msgid "Let." msgstr "Laten." @@ -11967,6 +12063,7 @@ msgstr "smaad" #: include/class/acc_ledger.class.php:887 #: include/class/acc_ledger_fin.class.php:754 #: include/class/anc_operation.class.php:298 +#: include/class/acc_ledger_history_generic.class.php:770 #, php-format msgid "Libellé" msgstr "Opstellen" @@ -12323,6 +12420,15 @@ msgstr "Verkeerd type object" msgid "Max. email / jour (-1 = illimité)" msgstr "" +#: include/lib/message_javascript.php:87 +msgid "Maximum" +msgstr "" + +#: include/lib/message_javascript.php:86 +#, fuzzy +msgid "Maximum 15 lignes" +msgstr "Nieuwe lijn" + #: include/anc_pa.inc.php:60 include/anc_pa.inc.php:73 #: include/anc_pa.inc.php:74 include/anc_pa.inc.php:66 #: include/anc_pa.inc.php:80 @@ -12498,11 +12604,11 @@ msgstr "Up-to-date brengen" #: include/ajax_preference.php:149 include/ajax_preference.php:150 #: include/ajax_preference.php:157 include/ajax/ajax_preference.php:157 -#: include/ajax/ajax_preference.php:236 +#: include/ajax/ajax_preference.php:236 include/ajax/ajax_preference.php:247 msgid "Mini-Rapport : " msgstr "Mini-Report:" -#: include/template/param_jrn.php:68 +#: include/template/param_jrn.php:68 include/template/param_jrn.php:75 #, fuzzy msgid "Minimum de lignes à afficher" msgstr "Geen bestand" @@ -13068,7 +13174,8 @@ msgstr "Dit plan bestaat niet" #: include/class/acc_ledger_fin.class.php:551 #: include/class/acc_ledger_fin.class.php:754 #: include/class/anc_listing.class.php:86 include/class/fiche.class.php:1398 -#: include/lib/ac_common.php:1215 +#: include/lib/ac_common.php:1215 include/fiche.inc.php:531 +#: include/class/fiche.class.php:1399 msgid "Montant" msgstr "Bedrag" @@ -13444,7 +13551,7 @@ msgstr "" msgid "MultiModule" msgstr "Module" -#: include/ajax/ajax_preference.php:174 +#: include/ajax/ajax_preference.php:174 include/ajax/ajax_preference.php:185 msgid "N'utilisez pas le même séparateur pour les champs et les décimales" msgstr "" @@ -13725,7 +13832,7 @@ msgstr "Geen handeling" #: include/class/acc_ledger_search.class.php:1104 #: include/class/acc_ledger_fin.class.php:549 #: include/class/acc_ledger_fin.class.php:754 -#: include/class/fiche.class.php:1780 +#: include/class/fiche.class.php:1780 include/class/fiche.class.php:1781 msgid "Nom" msgstr "Naam" @@ -13898,6 +14005,7 @@ msgstr "Naam leverancier" #: include/export/export_fiche_detail_csv.php:74 #: include/export/export_poste_detail_csv.php:81 #: include/export/export_poste_detail_csv.php:82 +#: include/template/param_jrn.php:14 msgid "Nom journal" msgstr "Boek Naam" @@ -14105,7 +14213,7 @@ msgstr "niet use of" #: include/upgrade-core.php:23 include/upgrade.inc.php:27 #: include/upgrade-plugin.php:25 include/upgrade-template.php:25 #: include/ajax/ajax_remove_submenu.php:27 -#: include/ajax/ajax_user_security.php:39 +#: include/ajax/ajax_user_security.php:39 html/ajax_misc.php:86 #, fuzzy msgid "Non autorisé" msgstr "niet use of" @@ -14147,7 +14255,7 @@ msgid "Non supporté" msgstr "niet use of" #: include/ext/amortis/include/class_am_card.php:245 html/fid_card.php:169 -#: html/fid_card.php:170 html/fid_card.php:175 +#: html/fid_card.php:170 html/fid_card.php:175 html/fid_card.php:174 msgid "Non trouvé" msgstr "Niet gevonden" @@ -14555,7 +14663,7 @@ msgstr "Num.interne" msgid "Numéro opération" msgstr "Operatienummer" -#: include/template/param_jrn.php:33 +#: include/template/param_jrn.php:33 include/template/param_jrn.php:40 msgid "Numérotation de chaque opération" msgstr "Nummering van elke operatie" @@ -14571,6 +14679,7 @@ msgstr "Nr." #: include/export/export_ledger_csv.php:216 #: include/class/acc_ledger_history_generic.class.php:764 #: include/export/export_ledger_csv.php:210 +#: include/class/acc_ledger_history_generic.class.php:765 #, fuzzy msgid "N° Pièce" msgstr "Stuk nr." @@ -14659,14 +14768,14 @@ msgid "N° pièce" msgstr "Geen ruimte" #: include/template/param_jrn.php:110 include/template/param_jrn.php:108 -#: include/template/param_jrn.php:115 +#: include/template/param_jrn.php:115 include/template/param_jrn.php:117 msgid "N° pièce justificative" msgstr "Nummer" #: include/ajax_preference.php:167 include/ajax_preference.php:168 #: html/test_class.php:221 include/ajax_preference.php:175 #: include/ajax/ajax_preference.php:175 include/ajax/ajax_preference.php:254 -#: dev/test/test_class.php:217 +#: dev/test/test_class.php:217 include/ajax/ajax_preference.php:265 msgid "Néerlandais" msgstr "Nederlands" @@ -14731,7 +14840,7 @@ msgid "" "Obligatoire pour les journaux FIN : donner ici la fiche de la banque utilisée" msgstr "Verplicht voor FIN kranten geven hier de Data Bank gebruikt" -#: include/template/param_jrn.php:61 +#: include/template/param_jrn.php:61 include/template/param_jrn.php:68 #, fuzzy msgid "" "Obligatoire pour les journaux FIN : donner ici la fiche du compte en banque " @@ -14805,6 +14914,7 @@ msgstr "Niet evenwichtige Operatie" #: include/ajax_preference.php:69 include/ajax_preference.php:70 #: include/ajax/ajax_preference.php:69 include/ajax/ajax_preference.php:70 +#: include/ajax/ajax_preference.php:81 msgid "Options Générales" msgstr "Algemeen Opties" @@ -14815,7 +14925,7 @@ msgstr "Ongeldige opties" #: include/ajax_preference.php:148 include/ajax_preference.php:149 #: include/ajax_preference.php:156 include/ajax/ajax_preference.php:156 -#: include/ajax/ajax_preference.php:235 +#: include/ajax/ajax_preference.php:235 include/ajax/ajax_preference.php:246 msgid "Options pour la page d'accueil" msgstr "Opties voor de home page" @@ -15173,6 +15283,7 @@ msgstr "Boekhoudingsperiode" #: include/class/class_document_export.php:284 #: include/class/document_export.class.php:284 #: include/class/document_export.class.php:294 +#: include/class/document_export.class.php:295 #, fuzzy msgid "PDF2PS non installé" msgstr "TKPDF is niet geïnstalleerd" @@ -15203,6 +15314,7 @@ msgstr "Bewijs nummer" #: include/class/class_document_export.php:283 #: include/class/document_export.class.php:283 #: include/class/document_export.class.php:293 +#: include/class/document_export.class.php:294 #, fuzzy msgid "PS2PDF non installé" msgstr "TKPDF is niet geïnstalleerd" @@ -15548,6 +15660,10 @@ msgstr "Categorie naam van het record" msgid "Pas de conversion en PDF disponible" msgstr "Conversie naar PDF is niet mogelijk" +#: include/class/anc_balance_double.class.php:51 +msgid "Pas de croisement avec un seul plan" +msgstr "" + #: include/ext/import_account/include/class_impacc_operation.php:38 #: include/ext/importbank/include/import_bank.php:120 #: include/ext/importbank/include/import_bank.php:133 @@ -15981,7 +16097,7 @@ msgstr "Analytisch" msgid "Plusieurs code TVA correspondent à ce taux" msgstr "Verschillende fiscale code prijs evenaren" -#: include/ajax/ajax_preference.php:187 +#: include/ajax/ajax_preference.php:187 include/ajax/ajax_preference.php:198 msgid "Point-virgule" msgstr "" @@ -16098,9 +16214,17 @@ msgstr "Archief" #: include/class/acc_ledger.class.php:881 include/class/fiche.class.php:1459 #: include/class/acc_ledger.class.php:886 #: include/class/anc_listing.class.php:80 include/class/fiche.class.php:1473 +#: include/class/acc_ledger_history_generic.class.php:768 +#: include/class/fiche.class.php:1474 msgid "Poste" msgstr "Rekening" +#: include/class/anc_balance_double.class.php:97 +#: include/class/anc_balance_double.class.php:98 +#, fuzzy +msgid "Poste Analytique" +msgstr "Analytischer ekening" + #: include/ext/amortis/raw.php:100 include/ext/amortis/raw.php:127 msgid "Poste Charge" msgstr "Kostenpost " @@ -16204,6 +16328,7 @@ msgstr "Kostenpost" #: include/class/fiche.class.php:1756 include/class/pdf_operation.class.php:246 #: include/ajax/ajax_boxcard_search.php:65 include/class/fiche.class.php:1759 #: include/class/fiche.class.php:1761 include/class/fiche.class.php:1779 +#: include/class/fiche.class.php:1780 msgid "Poste comptable" msgstr "Accountant Vacature" @@ -16299,6 +16424,8 @@ msgstr "Boekhoudkundige post of fiche veranderen" #: include/class/fiche.class.php:818 include/class/fiche.class.php:848 #: include/class/fiche.class.php:849 include/class/fiche.class.php:995 #: include/class/fiche.class.php:996 include/class/fiche.class.php:1036 +#: include/class/fiche.class.php:850 include/class/fiche.class.php:997 +#: include/class/fiche.class.php:1037 #, fuzzy msgid "Poste comptable trop long" msgstr "Accountant Vacature" @@ -16388,7 +16515,7 @@ msgstr "" msgid "Poste à créditer incorrect" msgstr "De te crediteren post in fout" -#: include/template/param_jrn.php:15 +#: include/template/param_jrn.php:15 include/template/param_jrn.php:22 msgid "Postes utilisables journal (débit/crédit) " msgstr "Bericht bruikbare krant (debet / credit)" @@ -16688,6 +16815,7 @@ msgstr "Prog." #: include/export/export_poste_detail_csv.php:90 #: include/class/anc_grandlivre.class.php:221 #: include/class/anc_grandlivre.class.php:222 include/fiche.inc.php:523 +#: include/fiche.inc.php:532 msgid "Prog." msgstr "Prog." @@ -16712,10 +16840,12 @@ msgid "Préfixe" msgstr "Voorvoegsel" #: include/template/param_jrn.php:84 include/template/param_jrn.php:91 +#: include/template/param_jrn.php:93 msgid "Préfixe code interne" msgstr "Prefix interne code" #: include/template/param_jrn.php:88 include/template/param_jrn.php:95 +#: include/template/param_jrn.php:97 msgid "Préfixe pièce justificative" msgstr "Prefix voucher" @@ -16728,7 +16858,8 @@ msgstr "Prefix voucher" #: html/user_login.php:158 html/user_login.php:159 html/user_login.php:160 #: include/database.item.php:87 html/user_login.php:163 #: include/database.item.php:81 include/ajax/ajax_preference.php:31 -#: html/user_login.php:169 include/database.item.php:79 +#: html/user_login.php:169 include/database.item.php:79 html/user_login.php:146 +#: include/ajax/ajax_preference.php:69 msgid "Préférence" msgstr "Voorkeur" @@ -16827,6 +16958,7 @@ msgstr "" #: include/class/acc_ledger_purchase.class.php:1826 #: include/class/acc_ledger_sold.class.php:1400 #: include/class/acc_ledger_purchase.class.php:1829 +#: include/ajax/ajax_preference.php:150 msgid "Période" msgstr "Periode" @@ -17005,7 +17137,7 @@ msgstr "Hoeveelheid" #: include/template/ledger_detail_misc.php:100 #: include/class/fiche.class.php:1758 include/class/fiche.class.php:1760 #: include/class/acc_ledger_fin.class.php:753 -#: include/class/fiche.class.php:1778 +#: include/class/fiche.class.php:1778 include/class/fiche.class.php:1779 msgid "Quick Code" msgstr "Quick Code" @@ -17036,6 +17168,7 @@ msgstr "Quick Code of" #: include/class/acc_account_ledger.class.php:394 #: include/class/acc_ledger_history_generic.class.php:768 #: include/export/export_ledger_csv.php:211 +#: include/class/acc_ledger_history_generic.class.php:769 msgid "QuickCode" msgstr "QuickCode" @@ -17286,6 +17419,7 @@ msgstr "Bericht Vinden" #: include/class/acc_ledger_search.class.php:551 #: include/class/acc_ledger_search.class.php:560 #: include/class/acc_ledger_fin.class.php:1087 +#: include/class/anc_balance_double.class.php:370 msgid "Rechercher" msgstr "Vinden" @@ -17463,7 +17597,7 @@ msgstr "Is te laat" #: html/do.php:302 html/user_login.php:71 include/cfgledger.inc.php:138 #: include/modele.inc.php:403 include/modele.inc.php:443 #: include/ajax/ajax_display_letter.php:39 include/cfgledger.inc.php:141 -#: include/ext/tva/ajax.php:35 html/do.php:312 +#: include/ext/tva/ajax.php:35 html/do.php:312 html/do.php:281 msgid "Retour" msgstr "Terug" @@ -17639,6 +17773,7 @@ msgid "Résultat limité à %d , %d nombre de fiches trouvées" msgstr "Beperkt tot% d resultaat% d aantal records gevonden" #: html/fid_card.php:164 html/fid_card.php:165 html/fid_card.php:170 +#: html/fid_card.php:169 #, php-format msgid "Résultat limité à 12" msgstr "Beperkt tot 12 resultaten" @@ -17944,6 +18079,7 @@ msgstr "" #: include/class/class_anc_balance_double.php:358 #: include/class/anc_balance_double.class.php:362 #: include/class/anc_balance_double.class.php:364 +#: include/class/anc_balance_double.class.php:366 msgid "" "Selectionnez le plan qui vous intéresse avant de cliquer sur Recherche" msgstr "Selectionneer plannen DAT u interesseert je op VOOR Zoeken Klikken" @@ -17955,7 +18091,7 @@ msgstr "Selectionneer plannen DAT u interesseert je op VOOR Zoeken Klikken" #: include/ajax_preference.php:164 include/ajax_preference.php:165 #: include/ajax_preference.php:172 include/ajax/ajax_preference.php:172 -#: include/ajax/ajax_preference.php:251 +#: include/ajax/ajax_preference.php:251 include/ajax/ajax_preference.php:262 msgid "Selectionnez votre langue" msgstr "Selecteer uw taal" @@ -17979,10 +18115,12 @@ msgid "Services intracommunautaires avec report de perception" msgstr "Diensten-intra uitgestelde waarneming" #: include/template/param_jrn.php:136 include/template/param_jrn.php:143 +#: include/template/param_jrn.php:145 msgid "Services, fournitures ou biens achetés (D)" msgstr "" #: include/template/param_jrn.php:197 include/template/param_jrn.php:204 +#: include/template/param_jrn.php:206 msgid "Services, fournitures ou biens vendus (C)" msgstr "" @@ -18001,6 +18139,10 @@ msgid "" "Acc_Ledger_History_Generic" msgstr "" +#: include/lib/message_javascript.php:83 +msgid "Si vous changez de page vous perdez les reconciliations, continuez ?" +msgstr "" + #: include/template/category_of_card.php:35 #: include/template/category_of_card.php:39 msgid "" @@ -18091,6 +18233,8 @@ msgstr "Bedrijven" #: include/class/fiche.class.php:1764 include/class/fiche.class.php:1766 #: include/export/export_balance_pdf.php:135 #: include/class/anc_listing.class.php:120 include/class/fiche.class.php:1784 +#: include/class/anc_balance_double.class.php:101 +#: include/class/fiche.class.php:1785 msgid "Solde" msgstr "evenwicht" @@ -18346,6 +18490,7 @@ msgstr "" #: html/ajax_misc.php:196 html/ajax_misc.php:215 html/ajax_misc.php:229 #: html/ajax_misc.php:235 html/ajax_misc.php:313 html/ajax_misc.php:318 #: html/ajax_misc.php:346 html/ajax_misc.php:458 html/ajax_misc.php:460 +#: html/ajax_misc.php:466 msgid "Symbole" msgstr "Symbool" @@ -18392,7 +18537,7 @@ msgstr "De rijen selecteren die u wilt bewaren" msgid "Sélectionner tout" msgstr "Selecteer alle" -#: include/ajax/ajax_preference.php:197 +#: include/ajax/ajax_preference.php:197 include/ajax/ajax_preference.php:208 msgid "Séparateur Décimale" msgstr "" @@ -18400,7 +18545,7 @@ msgstr "" #: include/ext/importbank/include/template/show_transfer.php:177 #: include/ext/importbank/include/template/show_transfer.php:176 #: include/ext/importbank/include/template/show_field.php:48 -#: include/ajax/ajax_preference.php:181 +#: include/ajax/ajax_preference.php:181 include/ajax/ajax_preference.php:192 msgid "Séparateur de champs" msgstr "" @@ -18437,6 +18582,7 @@ msgstr "" #: include/class/class_document_export.php:281 #: include/class/document_export.class.php:281 #: include/class/document_export.class.php:291 +#: include/class/document_export.class.php:292 msgid "TKPDF n'est pas installé" msgstr "TKPDF is niet geïnstalleerd" @@ -18726,7 +18872,7 @@ msgstr "Lengte van de code is te lang, maximaal 10 karakters " #: include/ajax_preference.php:120 include/ajax_preference.php:121 #: include/ajax_preference.php:128 include/ajax/ajax_preference.php:128 -#: include/ajax/ajax_preference.php:145 +#: include/ajax/ajax_preference.php:145 include/ajax/ajax_preference.php:156 msgid "Taille des pages" msgstr "Paginaformaat" @@ -18734,6 +18880,10 @@ msgstr "Paginaformaat" msgid "Tant que ce n'est pas vous fait vous ne pouvez pas utiliser NOALYSS" msgstr "" +#: include/lib/message_javascript.php:98 +msgid "Taper une formule (ex 20*5.1) puis enter" +msgstr "" + #: include/lib/message_javascript.php:40 msgid "" "Tapez le numéro de poste ou une partie du poste ou du libellé puis sur " @@ -18744,6 +18894,7 @@ msgstr "" #: html/ajax_misc.php:195 html/ajax_misc.php:214 html/ajax_misc.php:228 #: html/ajax_misc.php:234 html/ajax_misc.php:312 html/ajax_misc.php:317 #: html/ajax_misc.php:345 html/ajax_misc.php:457 html/ajax_misc.php:459 +#: html/ajax_misc.php:465 msgid "Taux" msgstr "Tarief" @@ -18795,7 +18946,7 @@ msgstr "Tekst omgeven door" #: include/ajax_preference.php:81 include/ajax_preference.php:82 #: include/ajax_preference.php:89 include/ajax/ajax_preference.php:89 -#: include/ajax/ajax_preference.php:90 +#: include/ajax/ajax_preference.php:90 include/ajax/ajax_preference.php:101 msgid "Thème" msgstr "Thema" @@ -18832,6 +18983,8 @@ msgstr "Thema" #: include/class/fiche.class.php:1461 #: include/class/acc_ledger_search.class.php:650 #: include/class/fiche.class.php:1475 +#: include/class/acc_ledger_history_generic.class.php:683 +#: include/class/fiche.class.php:1476 msgid "Tiers" msgstr "Derde" @@ -18857,12 +19010,12 @@ msgstr "Titel" msgid "Titre 1" msgstr "Titel" -#: scenario/html_tab.test.php:35 +#: scenario/html_tab.test.php:35 scenario/html_tab.test.php:39 #, fuzzy msgid "Titre 2" msgstr "Titel" -#: scenario/html_tab.test.php:49 +#: scenario/html_tab.test.php:49 scenario/html_tab.test.php:53 #, fuzzy msgid "Titre 3" msgstr "Titel" @@ -18950,6 +19103,8 @@ msgstr "Totaal BTW" #: include/class/anc_listing.class.php:115 #: include/class/anc_listing.class.php:117 #: include/class/anc_listing.class.php:118 +#: include/class/anc_balance_double.class.php:83 +#: include/class/anc_balance_double.class.php:278 msgid "Total" msgstr "Totaal" @@ -19099,7 +19254,7 @@ msgstr "Totale last" #: include/class/class_fiche.php:1604 include/class/class_fiche.php:1603 #: include/class/class_fiche.php:1606 include/class/fiche.class.php:1760 #: include/class/fiche.class.php:1763 include/class/fiche.class.php:1765 -#: include/class/fiche.class.php:1783 +#: include/class/fiche.class.php:1783 include/class/fiche.class.php:1784 msgid "Total crédit" msgstr "Credit Totaal" @@ -19114,7 +19269,7 @@ msgstr "Rekeningoverzicht" #: include/class/class_fiche.php:1603 include/class/class_fiche.php:1602 #: include/class/class_fiche.php:1605 include/class/fiche.class.php:1759 #: include/class/fiche.class.php:1762 include/class/fiche.class.php:1764 -#: include/class/fiche.class.php:1782 +#: include/class/fiche.class.php:1782 include/class/fiche.class.php:1783 msgid "Total débit" msgstr "Debet Totaal" @@ -19131,6 +19286,7 @@ msgid "Total niveau" msgstr "Totale niveau" #: include/class/acc_ledger_history_generic.class.php:684 +#: include/class/acc_ledger_history_generic.class.php:685 #, fuzzy msgid "Total opération" msgstr "Retail operatie" @@ -19213,6 +19369,9 @@ msgstr "Total Credit" #: include/class/acc_ledger_purchase.class.php:1588 #: include/class/acc_ledger.class.php:724 include/class/fiche.class.php:1544 #: include/fiche.inc.php:440 include/class/fiche.class.php:1563 +#: include/fiche.inc.php:447 +#: include/class/acc_ledger_history_generic.class.php:738 +#: include/class/fiche.class.php:1564 msgid "Totaux" msgstr "Totalen" @@ -19362,6 +19521,11 @@ msgstr "Alle Operaties" msgid "Toutes opérations" msgstr "Alle activiteiten" +#: include/lib/message_javascript.php:95 +#, fuzzy +msgid "Traitement en cours" +msgstr "Later in te brengen" + #: include/ext/import_account/include/class_impacc_operation.php:258 #: include/ext/import-winbook/index.php:65 msgid "Transfert" @@ -19458,7 +19622,7 @@ msgstr "BTW NTV" #: include/class/acc_ledger_search.class.php:1093 #: include/class/fiche.class.php:1463 #: include/class/acc_ledger_search.class.php:1106 -#: include/class/fiche.class.php:1477 +#: include/class/fiche.class.php:1477 include/class/fiche.class.php:1478 msgid "Type" msgstr "Type" @@ -19504,6 +19668,7 @@ msgid "Type de fiche" msgstr "Soort blad" #: include/template/param_jrn.php:78 include/template/param_jrn.php:85 +#: include/template/param_jrn.php:6 msgid "Type de journal" msgstr "Soort boek van" @@ -19578,6 +19743,15 @@ msgstr "Telefoon" msgid "URL" msgstr "URL" +#: include/lib/message_javascript.php:96 +#, fuzzy +msgid "Un instant" +msgstr "onbestaand" + +#: include/lib/message_javascript.php:77 +msgid "Un instant svp" +msgstr "" + #: include/class_acc_ledger.php:3410 include/class_acc_ledger.php:3480 #: include/class_acc_ledger.php:3479 include/class_acc_ledger.php:3495 #: include/class_acc_ledger.php:3512 include/class_acc_ledger.php:3539 @@ -19680,7 +19854,7 @@ msgstr "Enkel open rekeningen" msgid "Uniquement les opérations non lettrées" msgstr "Alleen interne acties" -#: include/template/param_jrn.php:21 +#: include/template/param_jrn.php:21 include/template/param_jrn.php:28 msgid "" "Uniquement pour les journaux d'Opérations Diverses, les valeurs sont " "séparées par des espaces, on peut aussi\n" @@ -19944,6 +20118,7 @@ msgstr "Bevestigen" #: include/class/acc_ledger_search.class.php:1113 #: include/class/acc_ledger_search.class.php:1121 #: include/class/acc_ledger_search.class.php:1134 +#: include/ajax/ajax_preference.php:280 msgid "Valider" msgstr "Bevestigen" @@ -20116,7 +20291,7 @@ msgstr "Zie documenten controle" #: html/do.php:104 html/user_login.php:76 html/do.php:132 html/do.php:145 #: html/do.php:147 html/do.php:165 html/do.php:189 html/user_login.php:78 #: html/do.php:203 html/user_login.php:79 html/user_login.php:85 -#: html/do.php:213 +#: html/do.php:213 html/do.php:182 msgid "Votre base de données n'est pas à jour" msgstr "UW datagegevens is niet van de laatste versie" @@ -20255,9 +20430,15 @@ msgstr "U bevestigt" #: include/ajax/ajax_add_menu.php:192 include/ajax/ajax_add_menu.php:200 #: include/class/fiche_def.class.php:791 include/class/fiche_def.class.php:796 #: include/ajax/ajax_create_menu.php:13 include/template/stock_inv.php:33 +#: include/lib/message_javascript.php:78 msgid "Vous confirmez ?" msgstr "U bevestigt" +#: include/lib/message_javascript.php:81 +#, fuzzy +msgid "Vous confirmez effacement ?" +msgstr "U bevestigt het wissen" + #: include/forecast.inc.php:363 include/forecast.inc.php:343 #: include/forecast.inc.php:339 include/forecast.inc.php:333 #: include/forecast.inc.php:347 @@ -20277,6 +20458,11 @@ msgstr "U bevestigt het wissen" msgid "Vous confirmez le clonage " msgstr "U bevestigt het klonen" +#: include/lib/message_javascript.php:82 +#, fuzzy +msgid "Vous confirmez mise à jour ?" +msgstr "U bevestigt" + #: include/ext/amortis/include/material_add.inc.php:39 #, fuzzy msgid "" @@ -20704,6 +20890,11 @@ msgstr "Geen Gegevens" msgid "budgets" msgstr "budgetten" +#: include/lib/message_javascript.php:88 +#, fuzzy +msgid "calculé" +msgstr "Door berekening" + #: include/lib/inplace_edit.class.php:80 include/lib/inplace_edit.class.php:79 #, fuzzy msgid "cancel" @@ -20762,11 +20953,11 @@ msgstr "keuze van de soort dagboek" #: html/do.php:105 html/user_login.php:77 html/do.php:133 html/do.php:146 #: html/do.php:148 html/do.php:166 html/do.php:190 html/user_login.php:79 #: html/do.php:204 html/user_login.php:80 html/user_login.php:86 -#: html/do.php:214 +#: html/do.php:214 html/do.php:183 msgid "cliquez ici pour appliquer le patch" msgstr "Click here for the laatste versie kunt verkrijgen" -#: html/do.php:193 html/do.php:203 +#: html/do.php:193 html/do.php:203 html/do.php:172 #, fuzzy msgid "cliquez ici pour mettre à jour " msgstr "Klik hier om uw voorkeuren bij te werken" @@ -20779,7 +20970,7 @@ msgstr "Klik hier om uw voorkeuren bij te werken" #: include/class/pdf_operation.class.php:149 #: include/class/pdf_operation.class.php:194 #: include/class/pdf_operation.class.php:247 html/ajax_misc.php:456 -#: html/ajax_misc.php:458 +#: html/ajax_misc.php:458 html/ajax_misc.php:464 msgid "code" msgstr "code" @@ -21167,6 +21358,7 @@ msgstr "onbestaand" #: include/export/export_ledger_csv.php:220 #: include/class/acc_ledger_history_generic.class.php:681 #: include/export/export_ledger_csv.php:214 +#: include/class/acc_ledger_history_generic.class.php:682 #, fuzzy msgid "internal" msgstr "Intern" @@ -21201,6 +21393,7 @@ msgstr "ongeldig parameter " #: include/class/acc_ledger_history_sale.class.php:232 #: include/class/acc_ledger_history_purchase.class.php:239 #: include/class/acc_ledger_history_sale.class.php:233 +#: include/class/acc_ledger_history_generic.class.php:759 #, fuzzy msgid "journal" msgstr "Journaal" @@ -21248,7 +21441,7 @@ msgstr "moet in een unicode worden omgezet" msgid "label" msgstr "Etiket" -#: include/ajax/ajax_preference.php:220 +#: include/ajax/ajax_preference.php:220 include/ajax/ajax_preference.php:231 msgid "latin1" msgstr "latin1" @@ -21507,6 +21700,7 @@ msgstr "Geen ruimte" #: include/class/class_fiche.php:1231 include/class/class_fiche.php:1234 #: include/class/fiche.class.php:1378 include/class/fiche.class.php:1379 #: include/class/fiche.class.php:1381 include/class/fiche.class.php:1395 +#: include/class/fiche.class.php:1396 #, fuzzy msgid "n° de pièce / Code interne" msgstr "Interne code" @@ -21542,6 +21736,8 @@ msgstr "lijn nr" #: include/class/acc_ledger_history_generic.class.php:680 #: include/class/fiche.class.php:1456 include/class/fiche.class.php:1458 #: include/class/fiche.class.php:1472 +#: include/class/acc_ledger_history_generic.class.php:681 +#: include/class/fiche.class.php:1473 msgid "n° pièce" msgstr "Geen ruimte" @@ -21579,6 +21775,7 @@ msgstr "" #: include/export/export_ledger_csv.php:208 #: include/class/acc_ledger_history_purchase.class.php:250 #: include/class/acc_ledger_history_sale.class.php:244 +#: include/class/acc_ledger_history_generic.class.php:764 #, fuzzy msgid "operation" msgstr "Operatie" @@ -21594,7 +21791,7 @@ msgid "opération" msgstr "Operatie" #: include/class/fiche.class.php:1047 include/class/fiche.class.php:1049 -#: include/class/fiche.class.php:1063 +#: include/class/fiche.class.php:1063 include/class/fiche.class.php:1064 #, fuzzy msgid "opération annulée" msgstr "Operatie ongedaan gemaakt" @@ -21729,7 +21926,7 @@ msgstr "stuk" msgid "pièce" msgstr "Bewijs" -#: include/ajax/ajax_preference.php:203 +#: include/ajax/ajax_preference.php:203 include/ajax/ajax_preference.php:214 msgid "point" msgstr "" @@ -21919,7 +22116,7 @@ msgstr "Zoeken" #: include/export/export_fiche_balance_csv.php:140 #: include/export/export_fiche_balance_csv.php:153 #: include/export/export_fiche_balance_csv.php:154 include/fiche.inc.php:517 -#: include/fiche.inc.php:519 +#: include/fiche.inc.php:519 include/fiche.inc.php:528 msgid "ref" msgstr "ref" @@ -21992,11 +22189,12 @@ msgid "soit y restaurer un backup ou un modèle" msgstr "" #: include/export/export_fiche_balance_csv.php:57 include/fiche.inc.php:587 +#: include/fiche.inc.php:596 #, fuzzy msgid "solde" msgstr "evenwicht" -#: include/fiche.inc.php:592 +#: include/fiche.inc.php:592 include/fiche.inc.php:601 #, fuzzy msgid "solde crediteur" msgstr "Creditsaldo" @@ -22010,11 +22208,13 @@ msgstr "Creditsaldo" #: include/class/fiche.class.php:1405 include/class/fiche.class.php:1534 #: include/class/fiche.class.php:1407 include/class/fiche.class.php:1536 #: include/class/fiche.class.php:1421 include/class/fiche.class.php:1552 +#: include/class/fiche.class.php:1422 include/class/fiche.class.php:1553 #, fuzzy msgid "solde créditeur" msgstr "Creditsaldo" #: include/class/acc_ledger_history_generic.class.php:668 +#: include/class/acc_ledger_history_generic.class.php:669 #, fuzzy msgid "solde créditeur:" msgstr "Creditsaldo" @@ -22028,12 +22228,14 @@ msgstr "Creditsaldo" #: include/class/fiche.class.php:1405 include/class/fiche.class.php:1534 #: include/class/fiche.class.php:1407 include/class/fiche.class.php:1536 #: include/fiche.inc.php:590 include/class/fiche.class.php:1421 -#: include/class/fiche.class.php:1552 +#: include/class/fiche.class.php:1552 include/fiche.inc.php:599 +#: include/class/fiche.class.php:1422 include/class/fiche.class.php:1553 #, fuzzy msgid "solde débiteur" msgstr "Debetsaldo" #: include/class/acc_ledger_history_generic.class.php:667 +#: include/class/acc_ledger_history_generic.class.php:668 #, fuzzy msgid "solde débiteur:" msgstr "Debetsaldo" @@ -22161,7 +22363,8 @@ msgstr "btw" #: html/ajax_misc.php:289 html/ajax_misc.php:294 html/ajax_misc.php:367 #: html/ajax_misc.php:372 html/ajax_misc.php:377 html/ajax_misc.php:400 #: html/ajax_misc.php:405 html/ajax_misc.php:512 html/ajax_misc.php:517 -#: html/ajax_misc.php:514 html/ajax_misc.php:519 +#: html/ajax_misc.php:514 html/ajax_misc.php:519 html/ajax_misc.php:520 +#: html/ajax_misc.php:525 msgid "tva inconnue" msgstr "onbekend btw" @@ -22210,7 +22413,7 @@ msgstr "Soort boek van" msgid "téléphone " msgstr "telefoon" -#: include/ajax/ajax_preference.php:219 +#: include/ajax/ajax_preference.php:219 include/ajax/ajax_preference.php:230 msgid "utf8" msgstr "utf8" @@ -22238,6 +22441,7 @@ msgid "verifie Imputation Analytique" msgstr "Toerekening geverifieerd Analytische" #: include/ajax/ajax_preference.php:188 include/ajax/ajax_preference.php:204 +#: include/ajax/ajax_preference.php:199 include/ajax/ajax_preference.php:215 msgid "virgule" msgstr "comma" diff --git a/include/class/pre_operation.class.php b/include/class/pre_operation.class.php index bd6c5afba..224d4d1f5 100644 --- a/include/class/pre_operation.class.php +++ b/include/class/pre_operation.class.php @@ -146,7 +146,7 @@ class Pre_operation $this->detail=new Pre_op_advanced($this->db); break; default: - throw new Exception('Load PreOperatoin failed'.$this->od_jrn_type); + throw new Exception(sprintf(_('Echec PreOperatoin chargement %s'),$this->od_jrn_type)); } $this->detail->set_od_id($this->od_id); $this->detail->jrn_def_id=$this->jrn_def_id; diff --git a/include/database.item.php b/include/database.item.php index cbe31abc9..2ed2767f2 100644 --- a/include/database.item.php +++ b/include/database.item.php @@ -121,7 +121,7 @@ $menu[]=_('Liste Suivi'); $desc[]=_('Document de suivi sous forme de liste');$d $menu[]=_('Moyen de paiement'); $desc[]=_('Config. des méthodes de paiement');$desc_long[]=_('Configuration des moyens de paiements que vous voulez utiliser dans les journaux de type VEN ou ACH, les moyens de paiement permettent de générer l\'opération de trésorerie en même temps que l\'achat, la note de frais ou la vente'); $menu[]=_('Administration'); $desc[]=_('Suivi administration, banque');$desc_long[]=_('Suivi des administrations : courrrier, déclarations.'); $menu[]=_('Prévision'); $desc[]=_('Prévision');$desc_long[]=_('Prévision de vos achats, revenus, permet de suivre l\'évolution de votre société. Vos prévisions sont des formules sur les postes comptables et vous permettent aussi vos marges brutes.'); -$menu[]=_('Export opérations rapprochées'); $desc[]=_('Export opérations rapprochées en CSV');$desc_long[]=_(' '); +$menu[]=_('Export opérations rapprochées'); $desc[]=_('Export opérations rapprochées en CSV');$desc_long[]=_(''); $menu[]=_('Administrateur'); $desc[]=_('Suivi des gérants, administrateurs et salariés');$desc_long[]=_('Suivi de vos salariés, managers ainsi que des administrateurs, pour les documents et les opérations comptables'); $menu[]=_('Menu par défaut'); $desc[]=_('Configuration des menus par défaut');$desc_long[]=_('Configuration des menus par défaut, ces menus sont appelés par des actions dans d\'autres menus'); $menu[]=_('Agenda'); $desc[]=_('Agenda');$desc_long[]=_('Agenda, présentation du suivi sous forme d\'agenda '); diff --git a/include/lib/function_javascript.php b/include/lib/function_javascript.php index 12dbbde1c..10079acf5 100644 --- a/include/lib/function_javascript.php +++ b/include/lib/function_javascript.php @@ -2755,6 +2755,7 @@ function load_all_script() static $already_call=0; if ( $already_call==1)return; $already_call=1; + include_once NOALYSS_INCLUDE."/lib/message_javascript.php"; echo JS_INFOBULLE; echo js_include('smoke.js'); diff --git a/include/lib/message_javascript.php b/include/lib/message_javascript.php index 28f526322..239e42acc 100644 --- a/include/lib/message_javascript.php +++ b/include/lib/message_javascript.php @@ -28,54 +28,78 @@ ?> \ No newline at end of file From 71dc5294a508ad992e6267aab14429b10097476f Mon Sep 17 00:00:00 2001 From: Dany De Bontridder Date: Wed, 7 Aug 2019 11:54:27 +0200 Subject: [PATCH 12/29] Fix test --- scenario/ajax-save-operation.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scenario/ajax-save-operation.php b/scenario/ajax-save-operation.php index 6149ee7b8..80fdd7365 100644 --- a/scenario/ajax-save-operation.php +++ b/scenario/ajax-save-operation.php @@ -28,7 +28,8 @@ $_POST=array ( 'rapt' => '', 'div' => 'det2', 'act' => 'save', - 'op'=>'ledger' + 'op'=>'ledger', + 'jr_optype'=>'NOR' ); $_POST['gDossier']=$gDossierLogInput; $_GET['gDossier']=$gDossierLogInput; From 7c5dab27fcc38d2bb240825bc58d877ef21906ad Mon Sep 17 00:00:00 2001 From: Dany De Bontridder Date: Wed, 7 Aug 2019 14:55:16 +0200 Subject: [PATCH 13/29] Select_Box add a search --- html/js/scripts.js | 42 ++++++++++++++++++++++++++++++++ include/lib/html_input.class.php | 15 ++++++++++++ include/lib/select_box.class.php | 24 +++++++++++++++--- scenario/select-box-test.php | 20 ++++++++++++++- 4 files changed, 97 insertions(+), 4 deletions(-) diff --git a/html/js/scripts.js b/html/js/scripts.js index f10662b80..719286bb8 100644 --- a/html/js/scripts.js +++ b/html/js/scripts.js @@ -2157,7 +2157,49 @@ function filter_table(phrase, _id, colnr, start_row) { } } } +/** + * @brief filter quickly a list + * @param phrase : DOM id of the input text where we find the word to seach + * @param _id : id of the list + * @returns nothing + * @see HtmlInput::filter_list + */ +function filter_list(phrase, _id) { + $('info_div').innerHTML = content[65]; + $('info_div').style.display = "block"; + var words = $(phrase).value.toLowerCase(); + var l_list = document.getElementById(_id); + var ele; + var tot_found = 0; + + for (var r = 0; r < l_list.childNodes.length; r++) { + var found = 0; + if ( l_list.childNodes[r].childElementCount == 0 ) + { + ele = l_list.childNodes[r].innerHTML; + } else { + ele = l_list.childNodes[r].childNodes[0].innerHTML; + } + if ( ele.toLowerCase().indexOf(words) >= 0) { + tot_found++; + l_list.childNodes[r].style.display='block'; + } else { + l_list.childNodes[r].style.display='none'; + } + $('info_div').style.display = "none"; + $('info_div').innerHTML = ""; + } + if (tot_found == 0) { + if ($('info_' + _id)) { + $('info_' + _id).innerHTML = content[69] + } + } else { + if ($('info_' + _id)) { + $('info_' + _id).innerHTML = " "; + } + } +} /** * @brief * Display the task late or for today in dashboard diff --git a/include/lib/html_input.class.php b/include/lib/html_input.class.php index 815ea07ff..41c118352 100755 --- a/include/lib/html_input.class.php +++ b/include/lib/html_input.class.php @@ -975,6 +975,21 @@ class HtmlInput $r.=' '; return $r; } + /** + * Display a field for searching an element in a list + * @param string $p_list_id DOM ID of the list (ul or ol) + * @return string + */ + static function filter_list($p_list_id) + { + $r=""; + $r.=sprintf('', + $p_list_id,$p_list_id,$p_list_id); + + $r.=sprintf('',$p_list_id,$p_list_id); + $r.=''; + return $r; + } static function show_reconcile($p_div, $let, $span="") { diff --git a/include/lib/select_box.class.php b/include/lib/select_box.class.php index 9e07d6e74..c2eb361c3 100644 --- a/include/lib/select_box.class.php +++ b/include/lib/select_box.class.php @@ -34,6 +34,7 @@ class Select_Box var $id; var $item; private $cnt; + private $filter; //!< allow a dynamic not case sensitive search var $default_value; /** @@ -50,22 +51,27 @@ class Select_Box $this->cnt=0; $this->default_value=-1; $this->style_box=""; + $this->filter=""; } function input() { + $list_id=sprintf('%s_list',$this->id); + // Show when click $javascript=sprintf('$("%s_bt").onclick=function() { try { var newDiv=$("select_box%s"); var pos=$("%s_bt").cumulativeOffset(); newDiv.setStyle({display:"block",position:"fixed",top:pos.top+25+"px",left:pos.left+5+"px"}); + + if ( $("search_%s") ) { $("search_%s").focus();} } catch(e) { alert(e.message); } } - ', $this->id, $this->id, $this->id, $this->id); + ', $this->id, $this->id, $this->id, $list_id,$list_id); // Hide when out of the zone $javascript.=sprintf('$("select_box%s").onmouseleave=function() { @@ -85,9 +91,14 @@ class Select_Box printf('
', $this->id, $this->style_box); - + // Show the filter if there is one, + if ( $this->filter != "" ) { + echo $this->filter; + echo HtmlInput::filter_list($list_id); + } + // Print the list of possible options - printf('
    ',$this->id); + printf('
      ',$list_id); for ($i=0; $iitem); $i++) { if ($this->item[$i]['type']=="url") @@ -162,5 +173,12 @@ class Select_Box $this->item[$this->cnt]['type']='input'; $this->cnt++; } + function set_filter($p_filter) + { + $this->filter=$p_filter; + } + function get_filter() { + return $this->filter; + } } diff --git a/scenario/select-box-test.php b/scenario/select-box-test.php index 3c23ff6b2..d9dc0a916 100644 --- a/scenario/select-box-test.php +++ b/scenario/select-box-test.php @@ -46,7 +46,7 @@ div.select_box a:hover,div.select_box ul li:hover {

      add_url("List (link)","?id=5&".Dossier::get()); $a->add_javascript("Hello (Javascript)","alert('hello')"); @@ -56,6 +56,24 @@ div.select_box a:hover,div.select_box ul li:hover { echo $a->input(); + ?> + set_filter(_("recherche")); + $a->add_value("Value = 10 (set value)",10); + $a->add_value("Value = 1 (set value)",1); + $a->add_value("Value = 17 (set value)",15); + $a->add_value("Value = 18 (set value)",15); + $a->add_value("Value = 19 (set value)",15); + $a->add_value("Value = 20 (set value)",15); + $a->add_value("Value = 25 (set value)",15); + $a->add_value("Value = 30 (set value)",15); + $a->add_value("Value = 40 (set value)",15); + $a->add_value("Value = 50 (set value)",15); + $a->add_value("Value = 51 (set value)",15); + + echo $a->input(); + ?>

From 76ad5d7780ec83e255018e226b19ccbffba9f589 Mon Sep 17 00:00:00 2001 From: Dany De Bontridder Date: Wed, 7 Aug 2019 15:05:39 +0200 Subject: [PATCH 14/29] Improve message progress bar + translation --- html/js/scripts.js | 6 +- html/lang/en_US/LC_MESSAGES/messages.po | 287 +++++++---- html/lang/messages.po | 617 +++++++++++++++--------- html/lang/nl_NL/LC_MESSAGES/messages.po | 271 ++++++++--- include/lib/message_javascript.php | 1 + 5 files changed, 808 insertions(+), 374 deletions(-) diff --git a/html/js/scripts.js b/html/js/scripts.js index 719286bb8..7e19d0a6a 100644 --- a/html/js/scripts.js +++ b/html/js/scripts.js @@ -3456,14 +3456,16 @@ function progress_bar_start(p_taskid,p_message) try { progressIdx++; // block the window - var message=content[65]; + + var message='

'+content[70]+'

'; if ( p_message) { message=p_message; } + add_div({id:"blocking"+progressIdx,cssclass:"smoke-base smoke-visible "}); add_div({id:"message"+progressIdx,cssclass:"inner_box",style:"z-index:1000;position:fixed;top:30%;width:40%;left:30%"}); - $("message"+progressIdx).update(message); + $("message"+progressIdx).update('

'+content[65]+'

'+message); // Create a div add_div({id: "progressDiv" + progressIdx, cssclass: "progressbar", html: '0'}); // Check status every sec. diff --git a/html/lang/en_US/LC_MESSAGES/messages.po b/html/lang/en_US/LC_MESSAGES/messages.po index c06fc68b1..4e8aaabc6 100644 --- a/html/lang/en_US/LC_MESSAGES/messages.po +++ b/html/lang/en_US/LC_MESSAGES/messages.po @@ -3,14 +3,15 @@ # This file is distributed under the same license as the NOALYSS package. # Dany De Bontridder # +#: include/database.item.php:124 # dany, 2014. # Dany De Bontridder , 2014, 2015, 2016, 2017, 2018, 2019. msgid "" msgstr "" "Project-Id-Version: NOALYSS 672\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-07-31 00:04+0200\n" -"PO-Revision-Date: 2019-08-07 11:50+0100\n" +"POT-Creation-Date: 2019-08-07 15:00+0200\n" +"PO-Revision-Date: 2019-08-07 15:04+0100\n" "Last-Translator: dany \n" "Language-Team: French \n" "Language: en_US\n" @@ -22,7 +23,7 @@ msgstr "" #: include/database.item.php:124 msgid " " -msgstr "" +msgstr "." #: include/export/export_gl_pdf.php:75 msgid " Periode : " @@ -133,6 +134,7 @@ msgstr "D" #: include/ajax_mod_periode.php:55 include/ajax/ajax_mod_periode.php:55 #: include/ajax/ajax_periode.php:171 include/class/periode.class.php:702 +#: include/class/periode.class.php:704 msgid " Début période : " msgstr "Start periode" @@ -156,21 +158,25 @@ msgstr "Error in formula" #: include/ajax_mod_periode.php:57 include/ajax/ajax_mod_periode.php:57 #: include/ajax/ajax_periode.php:173 include/class/periode.class.php:704 +#: include/class/periode.class.php:706 msgid " Exercice : " msgstr "Exercise" #: include/ajax_mod_periode.php:56 include/ajax/ajax_mod_periode.php:56 #: include/ajax/ajax_periode.php:172 include/class/periode.class.php:703 +#: include/class/periode.class.php:705 msgid " Fin période : " msgstr "End Periode :" #: include/user_menu.php:147 include/user_menu.php:151 #: include/lib/user_menu.php:160 include/lib/user_menu.php:173 +#: include/lib/user_menu.php:131 msgid " Hors Bilan" msgstr "Out Balance Sheet" #: include/user_menu.php:148 include/user_menu.php:152 #: include/lib/user_menu.php:161 include/lib/user_menu.php:174 +#: include/lib/user_menu.php:132 msgid " Immobilisé" msgstr "Fixed Asset" @@ -485,7 +491,7 @@ msgstr "You have added% s% d months since% d /% d% d for the year" #: include/lib/class_sendmail.php:96 include/lib/class_sendmail.php:97 #: include/lib/class_sendmail.php:98 include/lib/sendmail.class.php:98 -#: include/lib/sendmail.class.php:102 +#: include/lib/sendmail.class.php:102 include/lib/sendmail_core.class.php:105 #, php-format msgid "%s est vide" msgstr "%s is empty" @@ -651,6 +657,26 @@ msgstr "" "
  • For ACH or VEN ledger type in \"list operation\" Journaux give total " "for each operation (amount ,VAT amount...)
    • " +#: include/lib/message_javascript.php:65 +msgid "" +"

    Remarque : choix possibles

    • Détail " +"opérations ne donne pas le même résultat si on regarde tous les journaux ou " +"un journal de type ACH ou VEN
    • Liste opérations ne donne pas " +"le même résultat si on regarde tous les journaux ou un journal de type ACH " +"ou VEN
    • Journaux VEN ou ACH en mode détail opérations donne " +"les détails des factures, y compris les montants, TVA et quantité par " +"article
    • Journaux VEN ou ACH en mode liste opérations donne " +"pour chaque opération, le total de la TVA, ND, ...
    " +msgstr "" +"

    Notice : possible choices

    • The detail of operations does not display the same " +"information , it depends of the ledger type
    • List of " +"operations does not display the same information , it depends of the ledger " +"type
    • For ACH or VEN ledger type in \"detail operation\" " +"give all the details including the VAT amount , VAT Code ...
      • " +"
    • For ACH or VEN ledger type in \"list operation\" Journaux give total " +"for each operation (amount ,VAT amount...)
    " + #: include/impress_bilan.inc.php:89 msgid "" " Attention : si le bilan n'est pas équilibré.
    " @@ -732,6 +758,7 @@ msgstr "Accept" #: include/database.item.php:78 include/lib/user_menu.php:123 #: include/lib/user_menu.php:131 include/lib/user_menu.php:124 #: include/lib/user_menu.php:143 include/database.item.php:75 +#: include/lib/user_menu.php:81 include/lib/user_menu.php:100 msgid "Accueil" msgstr "Home" @@ -853,6 +880,7 @@ msgstr "Active" #: include/user_menu.php:149 include/user_menu.php:153 #: include/lib/user_menu.php:162 include/lib/user_menu.php:175 +#: include/lib/user_menu.php:133 msgid "Actif a un an au plus" msgstr "Asset of one year max" @@ -941,6 +969,7 @@ msgstr "Folder not available" #: html/ajax_misc.php:179 html/ajax_misc.php:257 html/ajax_misc.php:262 #: html/ajax_misc.php:290 html/ajax_misc.php:382 html/ajax_misc.php:384 #: html/ajax_misc.php:390 include/lib/message_javascript.php:90 +#: include/lib/message_javascript.php:92 msgid "Action non autorisée" msgstr "Unauthorized" @@ -1109,7 +1138,7 @@ msgstr "Display also the closed actions" #: include/ext/tva/class_ext_tvagen.php:114 #: include/ext/tva/ext_list_assujetti.class.php:54 #: include/ext/tva/ext_tvagen.class.php:114 -#: include/lib/message_javascript.php:94 +#: include/lib/message_javascript.php:94 include/lib/message_javascript.php:96 msgid "Afficher" msgstr "Display" @@ -1241,7 +1270,7 @@ msgstr "Add item" #: include/lib/class_html_input.php:946 include/lib/class_html_input.php:957 #: include/lib/class_html_input.php:958 include/lib/class_html_input.php:984 #: include/lib/html_input.class.php:1037 include/lib/html_input.class.php:1095 -#: include/lib/html_input.class.php:1096 +#: include/lib/html_input.class.php:1096 include/lib/html_input.class.php:1111 msgid "Ajout autres" msgstr "Adding others" @@ -1445,6 +1474,7 @@ msgid "Ajout prévision" msgstr "Add forecast" #: include/periode.inc.php:113 include/class/periode.class.php:687 +#: include/class/periode.class.php:689 msgid "Ajout période" msgstr "Add periode" @@ -1712,7 +1742,7 @@ msgstr "Purchase accounting year" msgid "Année d'achat" msgstr "Year of purchase" -#: include/class/periode.class.php:430 +#: include/class/periode.class.php:430 include/class/periode.class.php:432 #, php-format msgid "Année doit être entre %s et %s " msgstr "Year must be between %s and%s" @@ -1732,7 +1762,7 @@ msgstr "Invalid year" msgid "Année invalide [" msgstr "Invalid year [" -#: include/class/periode.class.php:427 +#: include/class/periode.class.php:427 include/class/periode.class.php:429 msgid "Année n'est pas un nombre" msgstr "year is not a number" @@ -1740,7 +1770,7 @@ msgstr "year is not a number" msgid "Anomalie pour le compte " msgstr "Anomaly for the accounting" -#: include/class/periode.class.php:648 +#: include/class/periode.class.php:648 include/class/periode.class.php:650 msgid "Août" msgstr "August" @@ -2376,7 +2406,7 @@ msgstr "No description" #: include/lib/ac_common.php:1209 include/export/export_fiche_detail_csv.php:60 #: include/template/ledger_detail_bottom.php:286 include/lib/ac_common.php:1221 #: include/lib/ac_common.php:1223 include/template/ledger_detail_bottom.php:287 -#: include/lib/ac_common.php:1247 +#: include/lib/ac_common.php:1247 include/lib/message_javascript.php:102 msgid "Aucune donnée" msgstr "no data" @@ -2516,6 +2546,7 @@ msgstr "No tag available" #: include/user_menu.php:114 include/user_menu.php:121 #: include/lib/user_menu.php:121 include/lib/user_menu.php:130 #: include/lib/user_menu.php:122 include/lib/user_menu.php:141 +#: include/lib/user_menu.php:79 include/lib/user_menu.php:98 msgid "Audit" msgstr "Audit" @@ -2529,7 +2560,7 @@ msgstr "Author" msgid "Autoliquidation" msgstr "Autoreverse" -#: include/lib/message_javascript.php:74 +#: include/lib/message_javascript.php:74 include/lib/message_javascript.php:76 msgid "Autoliquidation : Utilisé en même temps au crédit et au débit" msgstr "Autoreverse : use in the same time on credit and debit" @@ -2664,7 +2695,7 @@ msgstr "With the card" msgid "Avertissement" msgstr "Warning" -#: include/class/periode.class.php:647 +#: include/class/periode.class.php:647 include/class/periode.class.php:649 msgid "Avril" msgstr "April" @@ -2734,6 +2765,7 @@ msgstr "Aged balance for customers and suppliers" #: include/export/export_balance_pdf.php:123 #: include/export/export_balance_pdf.php:127 #: include/export/export_balance_pdf.php:124 +#: include/export/export_balance_pdf.php:125 msgid "Balance comptable" msgstr "Balance" @@ -2784,7 +2816,7 @@ msgstr "wrong balance" msgid "Balance incorrecte " msgstr "wrong balance" -#: include/lib/message_javascript.php:89 +#: include/lib/message_javascript.php:89 include/lib/message_javascript.php:91 msgid "Balance incorrecte D/C" msgstr "Unbalanced D/C" @@ -2817,12 +2849,22 @@ msgstr "Balance group" msgid "Balance simple" msgstr "Simple balance" +#: include/class/pdfbalance_simple.class.php:35 +#, php-format +msgid "Balance simple %s" +msgstr "Simple balance %s" + #: include/database.item.php:4 include/database.item.php:7 #: include/database.item.php:9 include/database.item.php:12 #: include/database.item.php:6 msgid "Balance simple des imputations analytiques" msgstr "Simple analytic balance for record" +#: include/class/pdfbalance_simple.class.php:45 +#, php-format +msgid "Balance simple poste %s %s date %s %s" +msgstr "Simple balance accounting %s %s date %s %s" + #: include/category_card.inc.php:73 include/fiche.inc.php:70 #: include/category_card.inc.php:78 include/category_card.inc.php:80 #: include/fiche.inc.php:71 @@ -2889,7 +2931,7 @@ msgstr "Invalid Database" #: include/lib/class_database.php:421 include/lib/class_database.php:422 #: include/lib/class_database.php:429 include/lib/class_database.php:434 #: include/lib/database.class.php:433 include/lib/database.class.php:442 -#: include/lib/database.class.php:443 +#: include/lib/database.class.php:443 include/class/database.class.php:125 msgid "Base de donnée vide" msgstr "Empty Database" @@ -3007,7 +3049,7 @@ msgstr "D / C " msgid "CONVERT_GIF_PDF n'est pas installé" msgstr "CONVERT_GIF_PDF is not installed" -#: include/lib/message_javascript.php:93 +#: include/lib/message_javascript.php:93 include/lib/message_javascript.php:95 msgid "Cacher" msgstr "Hide" @@ -3041,17 +3083,17 @@ msgstr "Automatic creation of the accounting" #: include/class_ibutton.php:82 include/class_ibutton.php:84 #: include/lib/class_ibutton.php:84 include/lib/ibutton.class.php:84 -#: include/lib/message_javascript.php:97 +#: include/lib/message_javascript.php:97 include/lib/message_javascript.php:99 msgid "Calculatrice" msgstr "calculator" -#: include/lib/message_javascript.php:99 +#: include/lib/message_javascript.php:99 include/lib/message_javascript.php:101 msgid "" "Calculatrice simplifiée: écrivez simplement les opérations que vous voulez " "puis la touche retour. exemple : 1+2+3*(1/5)" msgstr "" -"Simple calculator , simply write the operation you want , press \"enter\" ," -" example : 1+2+3*(1/5)" +"Simple calculator , simply write the operation you want , press \"enter\" , " +"example : 1+2+3*(1/5)" #: include/profile.inc.php:356 include/profile.inc.php:358 #: include/profile.inc.php:381 include/profile.inc.php:363 @@ -3070,6 +3112,7 @@ msgstr "calculator is visible" #: include/template/calendar-list.php:34 include/lib/html_input.class.php:943 #: include/ajax/ajax_calendar_zoom.php:26 include/lib/html_input.class.php:991 #: include/ajax/ajax_calendar_zoom.php:32 include/lib/html_input.class.php:992 +#: include/lib/html_input.class.php:1007 msgid "Calendrier" msgstr "Calendar" @@ -3488,6 +3531,7 @@ msgstr "" #: include/user_menu.php:153 include/user_menu.php:157 #: include/lib/user_menu.php:166 include/lib/user_menu.php:179 +#: include/lib/user_menu.php:137 msgid "Charges" msgstr "Expenses" @@ -3963,11 +4007,11 @@ msgstr "Click here to reconnect in another tab" msgid "Cliquez pour éditer" msgstr "Click to edit" -#: include/lib/message_javascript.php:66 +#: include/lib/message_javascript.php:66 include/lib/message_javascript.php:68 msgid "Cliquez sur le chemin pour ouvrir le menu" msgstr "Click on the path to open the menu" -#: include/lib/message_javascript.php:65 +#: include/lib/message_javascript.php:65 include/lib/message_javascript.php:67 msgid "Cliquez sur le code AD pour ouvrir le menu dans un nouvel onglet" msgstr "Click on AD Code to open the page in a new tab" @@ -4557,6 +4601,7 @@ msgstr "Parent accounting doesn't exist" #: include/user_menu.php:151 include/user_menu.php:155 #: include/lib/user_menu.php:164 include/lib/user_menu.php:177 +#: include/lib/user_menu.php:135 msgid "Compte tiers" msgstr "Other account" @@ -5190,6 +5235,7 @@ msgstr "Credit" #: include/class/anc_balance_double.class.php:100 #: include/class/acc_ledger_history_generic.class.php:772 #: include/class/fiche.class.php:1480 +#: include/class/pdfbalance_simple.class.php:57 msgid "Crédit" msgstr "Credit" @@ -5330,6 +5376,7 @@ msgstr "D" #: include/class/anc_listing.class.php:85 #: include/class/pdf_operation.class.php:250 #: include/class/anc_listing.class.php:87 +#: include/class/pdfbalance_simple.class.php:59 msgid "D/C" msgstr "D / C" @@ -5369,6 +5416,10 @@ msgstr "In the warehouse" msgid "Dans le journal" msgstr "In the ledger" +#: include/lib/database_core.class.php:464 +msgid "Database:get_row retourne trop de lignes" +msgstr "Database::get_row returns too many rows" + #: include/class_acc_ledger.php:1424 include/class_acc_ledger.php:1610 #: include/class_acc_ledger_purchase.php:1350 #: include/class_acc_ledger_sold.php:647 include/class_anc_grandlivre.php:156 @@ -5609,6 +5660,7 @@ msgstr "Date DMY" #: include/ajax/ajax_display_letter.php:98 #: include/ajax/ajax_display_letter.php:103 include/class/periode.class.php:517 #: include/class/periode_ledger_table.class.php:98 +#: include/class/periode.class.php:519 msgid "Date Début" msgstr "Start date" @@ -5621,6 +5673,7 @@ msgstr "Start date" #: include/database.item.php:171 include/database.item.php:176 #: include/ajax/ajax_display_letter.php:116 include/class/periode.class.php:518 #: include/class/periode_ledger_table.class.php:99 +#: include/class/periode.class.php:520 msgid "Date Fin" msgstr "End Date" @@ -6530,7 +6583,7 @@ msgstr "" msgid "Donnée invalide" msgstr "Invalid data" -#: include/lib/message_javascript.php:91 +#: include/lib/message_javascript.php:91 include/lib/message_javascript.php:93 msgid "Donnée manquante ou déjà supprimée" msgstr "Missing data or already suppressed" @@ -6593,7 +6646,7 @@ msgid "Dossier non accessible" msgstr "Folder not available" #: include/user_menu.php:111 include/lib/user_menu.php:117 -#: include/lib/user_menu.php:118 +#: include/lib/user_menu.php:118 include/lib/user_menu.php:75 msgid "Dossiers" msgstr "Folders" @@ -6645,6 +6698,7 @@ msgid "Download core" msgstr "Download core" #: include/export/export_balance_pdf.php:109 +#: include/export/export_balance_pdf.php:110 #, php-format msgid "Du %s au %s" msgstr "From %s to %s" @@ -6750,6 +6804,7 @@ msgstr "Amortization term" #: include/class/anc_balance_double.class.php:99 #: include/class/acc_ledger_history_generic.class.php:771 #: include/class/fiche.class.php:1479 +#: include/class/pdfbalance_simple.class.php:56 msgid "Débit" msgstr "Debit" @@ -6774,7 +6829,7 @@ msgstr "Debit or credit" msgid "Débiteur" msgstr "Debit" -#: include/class/periode.class.php:649 +#: include/class/periode.class.php:649 include/class/periode.class.php:651 msgid "Décembre" msgstr "December" @@ -7016,7 +7071,7 @@ msgstr "Sorry , you are in strict mode , you cannot use this plugin" msgid "Désolé, il y a trop de virgule dans le poste comptable " msgstr "Sorry too many coma in the accounting" -#: include/lib/message_javascript.php:85 +#: include/lib/message_javascript.php:85 include/lib/message_javascript.php:87 msgid "Désolé, les montants pour la comptabilité analytique sont incorrects" msgstr "Sorry amount for analytic account are incorrect" @@ -7030,7 +7085,7 @@ msgstr "Sorry amount for analytic account are incorrect" msgid "Désolé, vous n'avez pas coché la case" msgstr "Sorry the box is not checked" -#: include/lib/message_javascript.php:92 +#: include/lib/message_javascript.php:92 include/lib/message_javascript.php:94 msgid "Désolé, événement en cours de création à sauver" msgstr "Sorry another event must be saved first" @@ -7305,7 +7360,7 @@ msgstr "Missed deadline" msgid "Echec" msgstr "Failed" -#: include/lib/message_javascript.php:79 +#: include/lib/message_javascript.php:79 include/lib/message_javascript.php:81 msgid "Echec " msgstr "Fail" @@ -7316,6 +7371,11 @@ msgstr "Fail" msgid "Echec Ajout detail " msgstr "Add details failed" +#: include/class/pre_operation.class.php:149 +#, php-format +msgid "Echec PreOperatoin chargement %s" +msgstr "Fail loading operation template" + #: include/dossier.inc.php:195 include/dossier.inc.php:196 #: include/dossier.inc.php:199 include/dossier.inc.php:204 msgid "Echec création " @@ -7342,7 +7402,7 @@ msgstr "Transfer failure" msgid "Echec de la restauration " msgstr "Issue when restoring" -#: include/lib/message_javascript.php:80 +#: include/lib/message_javascript.php:80 include/lib/message_javascript.php:82 msgid "Echec donnée manquante ou incorrecte" msgstr "Fail : missing or incorrect data" @@ -7376,7 +7436,7 @@ msgstr "Failure update" msgid "Echec ouverture fichier " msgstr "Error opening file" -#: include/lib/message_javascript.php:84 +#: include/lib/message_javascript.php:84 include/lib/message_javascript.php:86 msgid "Echec réponse" msgstr "Response Failed" @@ -7517,7 +7577,7 @@ msgstr "Clean all the plugins data" msgid "Effacement déclaration" msgstr "Erase statement" -#: include/class/periode.class.php:673 +#: include/class/periode.class.php:673 include/class/periode.class.php:675 msgid "Effacement impossible" msgstr "Impossible removal" @@ -7609,6 +7669,7 @@ msgstr "Removal forbidden" #: include/class/periode.class.php:594 include/class/periode.class.php:599 #: include/class/anc_operation.class.php:316 #: include/template/ledger_detail_bottom.php:328 +#: include/class/periode.class.php:596 include/class/periode.class.php:601 msgid "Effacer" msgstr "Remove" @@ -7729,7 +7790,7 @@ msgstr "Incorrect Email" #: include/lib/class_sendmail.php:152 include/lib/class_sendmail.php:153 #: include/lib/class_sendmail.php:155 include/lib/sendmail.class.php:157 -#: include/lib/sendmail.class.php:161 +#: include/lib/sendmail.class.php:161 include/class/sendmail.class.php:38 msgid "Email non envoyé" msgstr "Email not sent" @@ -7760,7 +7821,7 @@ msgstr "Late" msgid "En une opération" msgstr "In one operation" -#: include/lib/message_javascript.php:67 +#: include/lib/message_javascript.php:67 include/lib/message_javascript.php:69 msgid "" "En utilisant les dates d échéance ou de paiement, seuls les journaux de type " "ACH et VEN seront utilisés ,vous excluez d office les autres journaux" @@ -8076,6 +8137,10 @@ msgstr "Error : invalid parameter" msgid "Erreur : paramètre manquant " msgstr "Error : invalid parameter" +#: include/lib/database_core.class.php:73 +msgid "Erreur Connexion" +msgstr "Disconnect" + #: include/ext/import_account/include/class_impacc_csv.php:55 #: include/ext/import_account/include/impacc_csv.class.php:55 msgid "Erreur D/C" @@ -8102,6 +8167,10 @@ msgstr "Error log this type is not yet supported" msgid "Erreur date invalide" msgstr "Invalid Date" +#: include/lib/database_core.class.php:71 +msgid "Erreur de connexion !" +msgstr "Disconnect" + #: include/ajax/ajax_periode.php:195 msgid "Erreur exercice invalide" msgstr "Invalid exercice" @@ -8314,6 +8383,7 @@ msgstr "Exclude State" #: include/ajax/ajax_preference.php:131 include/class/periode.class.php:519 #: include/class/periode_ledger_table.class.php:100 #: include/template/stock_inv.php:126 include/ajax/ajax_preference.php:142 +#: include/class/periode.class.php:521 msgid "Exercice" msgstr "Exercise" @@ -8321,7 +8391,7 @@ msgstr "Exercise" msgid "Exercice comptable d'achat" msgstr "Purchase accounting year" -#: include/class/periode.class.php:424 +#: include/class/periode.class.php:424 include/class/periode.class.php:426 #, php-format msgid "Exercice doit être entre %s et %s " msgstr "Exercice is between %s and %s" @@ -8330,7 +8400,7 @@ msgstr "Exercice is between %s and %s" msgid "Exercice invalide" msgstr "Invalid exercice" -#: include/class/periode.class.php:421 +#: include/class/periode.class.php:421 include/class/periode.class.php:423 msgid "Exercice n'est pas un nombre" msgstr "exercice is not a number" @@ -8889,6 +8959,7 @@ msgstr "close" #: include/class/periode.class.php:585 #: include/class/periode_ledger_table.class.php:142 +#: include/class/periode.class.php:587 msgid "Fermée" msgstr "Closed" @@ -9246,7 +9317,7 @@ msgstr "Fin /MO" #: include/class/acc_ledger_search.class.php:1074 include/database.item.php:209 #: include/database.item.php:220 include/cfgledger.inc.php:170 #: include/class/acc_ledger_search.class.php:1082 -#: include/class/acc_ledger_search.class.php:1095 +#: include/class/acc_ledger_search.class.php:1095 include/lib/user_menu.php:136 msgid "Financier" msgstr "Financial" @@ -9382,7 +9453,7 @@ msgstr "Supplier to pay today" msgid "Français" msgstr "French" -#: include/class/periode.class.php:647 +#: include/class/periode.class.php:647 include/class/periode.class.php:649 msgid "Février" msgstr "February" @@ -9414,12 +9485,12 @@ msgid "Gestion des attributs de fiches " msgstr "Management attributes sheets" #: include/user_menu.php:111 include/lib/user_menu.php:117 -#: include/lib/user_menu.php:118 +#: include/lib/user_menu.php:118 include/lib/user_menu.php:75 msgid "Gestion des dossiers" msgstr "Folders managements" #: include/user_menu.php:112 include/lib/user_menu.php:118 -#: include/lib/user_menu.php:119 +#: include/lib/user_menu.php:119 include/lib/user_menu.php:76 msgid "Gestion des modèles" msgstr "Template management" @@ -9448,6 +9519,7 @@ msgstr "" #: include/user_menu.php:110 include/user_menu.php:120 #: include/lib/user_menu.php:116 include/lib/user_menu.php:129 #: include/lib/user_menu.php:117 include/lib/user_menu.php:140 +#: include/lib/user_menu.php:74 include/lib/user_menu.php:97 msgid "Gestion des utilisateurs" msgstr "Users managements" @@ -9983,6 +10055,7 @@ msgstr "Sales history" #: include/user_menu.php:159 include/user_menu.php:160 #: include/lib/user_menu.php:168 include/lib/user_menu.php:169 #: include/lib/user_menu.php:181 include/lib/user_menu.php:182 +#: include/lib/user_menu.php:139 include/lib/user_menu.php:140 msgid "Hors Comptabilité" msgstr "Out of accountancy system" @@ -10284,6 +10357,10 @@ msgid "" "connection" msgstr "Cannot connect to postgresql , please check the setting" +#: include/lib/database_core.class.php:60 +msgid "Impossible de se connecter à postgreSql" +msgstr "Impossible to connect to Postgresql" + #: include/database.item.php:68 include/database.item.php:114 #: include/ajax_get_profile.php:98 include/template/action_other_action.php:22 #: include/template/menu_detail.php:18 include/menu.inc.php:131 @@ -10497,7 +10574,8 @@ msgstr "" "document (invoice , fee note, ...)" #: include/lib/user_menu.php:122 include/lib/user_menu.php:123 -#: include/lib/user_menu.php:142 +#: include/lib/user_menu.php:142 include/lib/user_menu.php:80 +#: include/lib/user_menu.php:99 msgid "Information système" msgstr "System information" @@ -10513,11 +10591,11 @@ msgstr "General Information" #: html/install.php:271 html/install.php:277 html/install.php:228 #: html/install.php:235 include/upgrade-plugin.php:113 #: include/lib/user_menu.php:121 html/install.php:238 -#: include/upgrade-plugin.php:125 +#: include/upgrade-plugin.php:125 include/lib/user_menu.php:78 msgid "Installation" msgstr "Installation" -#: include/lib/user_menu.php:121 +#: include/lib/user_menu.php:121 include/lib/user_menu.php:78 msgid "Installation Mise à jour du système et des bases de données" msgstr "Update system and databases" @@ -10666,7 +10744,7 @@ msgstr "Invert sel" msgid "Item" msgstr "Item" -#: include/class/periode.class.php:647 +#: include/class/periode.class.php:647 include/class/periode.class.php:649 msgid "Janvier" msgstr "January" @@ -10852,11 +10930,11 @@ msgstr "Purchase ledger" msgid "Journaux de vente" msgstr "Ledger of sales" -#: include/class/periode.class.php:648 +#: include/class/periode.class.php:648 include/class/periode.class.php:650 msgid "Juillet" msgstr "July" -#: include/class/periode.class.php:648 +#: include/class/periode.class.php:648 include/class/periode.class.php:650 msgid "Juin" msgstr "June" @@ -11060,7 +11138,7 @@ msgstr "The card% s Has No accountancy" msgid "La numérotation est propre à chaque journal" msgstr "The numbering is only the for each ledger" -#: include/lib/message_javascript.php:69 +#: include/lib/message_javascript.php:69 include/lib/message_javascript.php:71 msgid "" "La numérotation est propre à chaque journal. Laissez à 0 pour ne pas changer " "le numéro" @@ -11078,6 +11156,7 @@ msgid "Label" msgstr "Label" #: include/template/param_jrn.php:118 include/lib/message_javascript.php:71 +#: include/lib/message_javascript.php:73 msgid "Laissez à 0 pour ne pas changer le numéro" msgstr "0 for no change" @@ -11237,6 +11316,7 @@ msgid "Le poste %s n'est pas dans ce journal" msgstr "Account %s doesn't belong to this ledger" #: include/template/param_jrn.php:94 include/lib/message_javascript.php:70 +#: include/lib/message_javascript.php:72 msgid "" "Le préfixe des pièces doit être différent pour chaque journal, on peut aussi " "utiliser l'année" @@ -11312,6 +11392,7 @@ msgid "Les clauses FROM sont ignorés avec les dates calendriers" msgstr "statement FROM are ignored if you use calendar" #: include/class_anc_print.php:120 include/lib/message_javascript.php:68 +#: include/lib/message_javascript.php:70 msgid "Les dates sont en format DD.MM.YYYY" msgstr "The date formats are DD.MM.YYYY" @@ -11672,6 +11753,7 @@ msgstr "label" #: include/class/acc_ledger_fin.class.php:754 #: include/class/anc_operation.class.php:298 #: include/class/acc_ledger_history_generic.class.php:770 +#: include/export/export_balance_pdf.php:127 #, php-format msgid "Libellé" msgstr "Label" @@ -11904,7 +11986,7 @@ msgstr "login" msgid "Lundi" msgstr "Monday" -#: include/class/periode.class.php:648 +#: include/class/periode.class.php:648 include/class/periode.class.php:650 msgid "Mai" msgstr "May" @@ -11976,7 +12058,7 @@ msgstr "Tuesday" msgid "Marquer pour suppression" msgstr "Mark for deleting" -#: include/class/periode.class.php:647 +#: include/class/periode.class.php:647 include/class/periode.class.php:649 msgid "Mars" msgstr "March" @@ -12012,11 +12094,11 @@ msgstr "Bad type of object" msgid "Max. email / jour (-1 = illimité)" msgstr "Max of email / day (-1 for unlimited)" -#: include/lib/message_javascript.php:87 +#: include/lib/message_javascript.php:87 include/lib/message_javascript.php:89 msgid "Maximum" msgstr "Maximum" -#: include/lib/message_javascript.php:86 +#: include/lib/message_javascript.php:86 include/lib/message_javascript.php:88 msgid "Maximum 15 lignes" msgstr "Maximum 15 rows" @@ -12164,7 +12246,7 @@ msgstr "Message reverse" msgid "Met à jour toutes les dossiers et modèles" msgstr "Update system and databases" -#: include/lib/message_javascript.php:72 +#: include/lib/message_javascript.php:72 include/lib/message_javascript.php:74 msgid "Mettez le pourcentage
    à zéro pour effacer la ligne" msgstr "Put the percentage to 0 to remove the row" @@ -12605,6 +12687,7 @@ msgstr "Template" #: include/modele.inc.php:250 include/lib/user_menu.php:118 #: include/modele.inc.php:274 include/lib/user_menu.php:119 #: include/modele.inc.php:257 include/modele.inc.php:258 +#: include/lib/user_menu.php:76 msgid "Modèles" msgstr "Template" @@ -12622,6 +12705,7 @@ msgid "Mois" msgstr "Month" #: include/class/periode.class.php:438 include/class/periode.class.php:440 +#: include/class/periode.class.php:442 msgid "Mois de début n'existe pas " msgstr "Starting month does not exist" @@ -13148,12 +13232,12 @@ msgid "" "Ne corrigez pas encore, cliquez continuer pour passer à l'étape suivante" msgstr "Continue without changing anything" -#: include/lib/message_javascript.php:76 +#: include/lib/message_javascript.php:76 include/lib/message_javascript.php:78 msgid "" "Ne donner pas ce poste comptable si ce code n'est pas utilisé à la vente" msgstr "Do not give this accounting is not used for sales" -#: include/lib/message_javascript.php:75 +#: include/lib/message_javascript.php:75 include/lib/message_javascript.php:77 msgid "Ne donner pas ce poste comptable si ce code n'est pas utilisé à l'achat" msgstr "Do not give this accounting is not used for purchase" @@ -13631,7 +13715,7 @@ msgstr "Number of recorded lines" msgid "Nombre de mois" msgstr "Number of month" -#: include/class/periode.class.php:436 +#: include/class/periode.class.php:436 include/class/periode.class.php:438 msgid "Nombre de mois doit être compris entre 1 & 60 " msgstr "Number of months must be between 1 and 60" @@ -13639,7 +13723,7 @@ msgstr "Number of months must be between 1 and 60" msgid "Nombre de mois invalide" msgstr "Number of month invalid" -#: include/class/periode.class.php:434 +#: include/class/periode.class.php:434 include/class/periode.class.php:436 msgid "Nombre de mois n'est pas un nombre" msgstr "Number of month is not a number" @@ -13896,6 +13980,7 @@ msgstr "New bank statement" #: include/lib/html_input.class.php:1043 #: include/template/action_display_short.php:81 #: include/lib/html_input.class.php:1103 include/lib/html_input.class.php:1104 +#: include/lib/html_input.class.php:1119 msgid "Nouvel événement" msgstr "New event" @@ -13964,7 +14049,7 @@ msgstr "New sale" msgid "Nouvelle version disponible %s , votre version %s" msgstr "Available version %s , your version %s" -#: include/class/periode.class.php:649 +#: include/class/periode.class.php:649 include/class/periode.class.php:651 msgid "Novembre" msgstr "November" @@ -14343,11 +14428,11 @@ msgid "" "utilisée" msgstr "Mandatory for FIN ledger: give here the card of the bank" -#: include/class/periode.class.php:649 +#: include/class/periode.class.php:649 include/class/periode.class.php:651 msgid "Octobre" msgstr "October" -#: include/class/periode.class.php:688 +#: include/class/periode.class.php:688 include/class/periode.class.php:690 msgid "On ne peut ajouter une période que sur un exercice qui existe déjà" msgstr "It is possible to add a period on an existing exercice" @@ -14719,12 +14804,14 @@ msgstr "Tools for co-ownership" #: include/class/periode.class.php:585 #: include/class/periode_ledger_table.class.php:142 #: include/class/periode_ledger_table.class.php:144 +#: include/class/periode.class.php:587 msgid "Ouvert" msgstr "Open" #: include/balance.inc.php:314 include/export/export_balance_pdf.php:135 #: include/class/acc_operation.class.php:727 #: include/export/export_balance_pdf.php:132 +#: include/export/export_balance_pdf.php:133 msgid "Ouverture" msgstr "Opening entry" @@ -15010,7 +15097,7 @@ msgstr "Invalid parameter" #: include/class/acc_ledger.class.php:86 include/lib/http_input.class.php:120 #: include/class/acc_ledger.class.php:88 include/class/periode.class.php:235 #: include/lib/http_input.class.php:121 include/class/acc_ledger.class.php:89 -#: include/lib/http_input.class.php:123 +#: include/lib/http_input.class.php:123 include/class/periode.class.php:237 msgid "Paramètre invalide" msgstr "Invalid parameter" @@ -15551,6 +15638,11 @@ msgstr "semi-colon" msgid "Port" msgstr "Port" +#: include/lib/database_core.class.php:65 +#, php-format +msgid "Port %s" +msgstr "Port %s" + #: include/template/template_config_form.php:59 #: include/template/template_config_form.php:67 msgid "Port de Postgresql" @@ -15691,6 +15783,7 @@ msgstr "Post Charge" #: include/template/ledger_detail_misc.php:99 include/ajax/ajax_poste.php:64 #: include/class/acc_plan_mtable.class.php:45 include/class/fiche.class.php:470 #: include/class/fiche.class.php:469 +#: include/class/pdfbalance_simple.class.php:55 msgid "Poste Comptable" msgstr "Accounting item" @@ -16174,6 +16267,7 @@ msgstr "Reverse Income" #: include/user_menu.php:154 include/user_menu.php:158 #: include/lib/user_menu.php:167 include/lib/user_menu.php:180 +#: include/lib/user_menu.php:138 msgid "Produits" msgstr "Products" @@ -16412,7 +16506,7 @@ msgstr "Accounting Period" msgid "Période N-1" msgstr "Period N-1" -#: include/class/periode.class.php:251 +#: include/class/periode.class.php:251 include/class/periode.class.php:253 msgid "Période chevauchant une autre" msgstr "Period overlaping another one" @@ -16917,12 +17011,12 @@ msgid "Restauration réussie du dossier " msgstr "Successfull restore" #: include/user_menu.php:113 include/lib/user_menu.php:119 -#: include/lib/user_menu.php:120 +#: include/lib/user_menu.php:120 include/lib/user_menu.php:77 msgid "Restaure" msgstr "Restore" #: include/user_menu.php:113 include/lib/user_menu.php:119 -#: include/lib/user_menu.php:120 +#: include/lib/user_menu.php:120 include/lib/user_menu.php:77 msgid "Restaure une base de données" msgstr "Restore a folder" @@ -17185,6 +17279,7 @@ msgstr "Summary" #: include/balance.inc.php:447 include/export/export_balance_pdf.php:316 #: include/balance.inc.php:465 include/export/export_balance_pdf.php:341 #: include/export/export_balance_pdf.php:336 +#: include/export/export_balance_pdf.php:337 msgid "Résumé Exercice courant" msgstr "Summary previous " @@ -17192,6 +17287,7 @@ msgstr "Summary previous " #: include/balance.inc.php:440 include/export/export_balance_pdf.php:309 #: include/balance.inc.php:458 include/export/export_balance_pdf.php:334 #: include/export/export_balance_pdf.php:329 +#: include/export/export_balance_pdf.php:330 msgid "Résumé Exercice précédent" msgstr "Summary current" @@ -17465,7 +17561,7 @@ msgid "" msgstr "Select the Analytic plan you are interested before clicking on Search" #: include/class_anc_print.php:140 include/class_anc_print.php:181 -#: include/lib/message_javascript.php:73 +#: include/lib/message_javascript.php:73 include/lib/message_javascript.php:75 msgid "Selectionnez le plan qui vous intéresse avant de cliquer sur Recherche" msgstr "Select the Analytic plan before clicking on search" @@ -17475,7 +17571,7 @@ msgstr "Select the Analytic plan before clicking on search" msgid "Selectionnez votre langue" msgstr "Select your language" -#: include/class/periode.class.php:648 +#: include/class/periode.class.php:648 include/class/periode.class.php:650 msgid "Septembre" msgstr "September" @@ -17519,7 +17615,7 @@ msgstr "" "Set mode to D etailled all_ledgers result = Detailled Accounting from " "Acc_Ledger_History_Generic" -#: include/lib/message_javascript.php:83 +#: include/lib/message_javascript.php:83 include/lib/message_javascript.php:85 msgid "Si vous changez de page vous perdez les reconciliations, continuez ?" msgstr "If you change , you'll lost your selection" @@ -17613,7 +17709,8 @@ msgstr "Company" #: include/export/export_balance_pdf.php:135 #: include/class/anc_listing.class.php:120 include/class/fiche.class.php:1784 #: include/class/anc_balance_double.class.php:101 -#: include/class/fiche.class.php:1785 +#: include/class/fiche.class.php:1785 include/export/export_balance_pdf.php:136 +#: include/class/pdfbalance_simple.class.php:58 msgid "Solde" msgstr "Balance" @@ -17693,7 +17790,8 @@ msgstr "Sales" #: include/database.item.php:104 include/lib/user_menu.php:124 #: include/lib/user_menu.php:125 include/lib/user_menu.php:144 #: include/database.item.php:107 include/database.item.php:101 -#: include/database.item.php:99 +#: include/database.item.php:99 include/lib/user_menu.php:82 +#: include/lib/user_menu.php:101 msgid "Sortie" msgstr "Logout" @@ -17704,7 +17802,7 @@ msgstr "Logout" msgid "Sortie ⎆" msgstr "Logout ⎆" -#: include/class/periode.class.php:521 +#: include/class/periode.class.php:521 include/class/periode.class.php:523 msgid "Status" msgstr "Status" @@ -17716,6 +17814,7 @@ msgstr "Stock" #: include/user_menu.php:150 include/user_menu.php:154 #: include/lib/user_menu.php:163 include/lib/user_menu.php:176 +#: include/lib/user_menu.php:134 msgid "Stock et commande" msgstr "Stock and Order" @@ -18241,7 +18340,7 @@ msgstr "Page size" msgid "Tant que ce n'est pas vous fait vous ne pouvez pas utiliser NOALYSS" msgstr "You cannot use Noalyss if this file is present" -#: include/lib/message_javascript.php:98 +#: include/lib/message_javascript.php:98 include/lib/message_javascript.php:100 msgid "Taper une formule (ex 20*5.1) puis enter" msgstr "Type a formula and press enter" @@ -18488,6 +18587,7 @@ msgstr "Only Credit" #: include/export/export_balance_pdf.php:137 #: include/export/export_balance_pdf.php:134 +#: include/export/export_balance_pdf.php:135 msgid "Total Crédit" msgstr "Sum credit" @@ -18497,6 +18597,7 @@ msgstr "Total Debit" #: include/export/export_balance_pdf.php:136 #: include/export/export_balance_pdf.php:133 +#: include/export/export_balance_pdf.php:134 msgid "Total Débit" msgstr "Sum Debit" @@ -18864,7 +18965,7 @@ msgstr "All entries" msgid "Toutes opérations" msgstr "All operations" -#: include/lib/message_javascript.php:95 +#: include/lib/message_javascript.php:95 include/lib/message_javascript.php:97 msgid "Traitement en cours" msgstr "Working in progress" @@ -19072,11 +19173,11 @@ msgstr "Phone" msgid "URL" msgstr "URL" -#: include/lib/message_javascript.php:96 +#: include/lib/message_javascript.php:96 include/lib/message_javascript.php:98 msgid "Un instant" msgstr "A moment" -#: include/lib/message_javascript.php:77 +#: include/lib/message_javascript.php:77 include/lib/message_javascript.php:79 msgid "Un instant svp" msgstr "A moment please" @@ -19211,6 +19312,11 @@ msgstr "Users" msgid "Utilisateur administrateur" msgstr "Administrator user" +#: include/lib/database_core.class.php:66 +#, php-format +msgid "Utilisateur : %s" +msgstr "User %s" + #: include/param_sec.inc.php:91 include/param_sec.inc.php:95 #: include/param_sec.inc.php:97 msgid "Utilisateur Normal" @@ -19277,12 +19383,14 @@ msgstr "User or password incorrect" #: include/user_menu.php:110 include/user_menu.php:120 #: include/lib/user_menu.php:116 include/lib/user_menu.php:129 #: include/lib/user_menu.php:117 include/lib/user_menu.php:140 +#: include/lib/user_menu.php:74 include/lib/user_menu.php:97 msgid "Utilisateurs" msgstr "Users" #: include/user_menu.php:114 include/user_menu.php:121 #: include/lib/user_menu.php:121 include/lib/user_menu.php:130 #: include/lib/user_menu.php:122 include/lib/user_menu.php:141 +#: include/lib/user_menu.php:79 include/lib/user_menu.php:98 msgid "Utilisateurs qui se sont connectés" msgstr "Connected users" @@ -19586,6 +19694,10 @@ msgstr "" msgid "Voir les documents du suivi" msgstr "See documents monitoring" +#: include/lib/database_core.class.php:62 +msgid "Vos paramètres sont incorrectes" +msgstr "Incorrect parameters" + #: html/do.php:108 html/user_login.php:75 html/do.php:107 html/do.php:102 #: html/do.php:104 html/user_login.php:76 html/do.php:132 html/do.php:145 #: html/do.php:147 html/do.php:165 html/do.php:189 html/user_login.php:78 @@ -19594,6 +19706,10 @@ msgstr "See documents monitoring" msgid "Votre base de données n'est pas à jour" msgstr "Your database is not updated" +#: include/lib/message_javascript.php:103 +msgid "Votre demande est en cours de traitement" +msgstr "Your request is being processed" + #: include/upgrade-core.php:42 include/upgrade-core.php:54 msgid "Votre version est à jour" msgstr "Your database is updated" @@ -19655,7 +19771,7 @@ msgstr "Do you want to delete this transaction" #: include/lib/class_html_input.php:934 include/lib/class_html_input.php:945 #: include/lib/class_html_input.php:946 include/lib/class_html_input.php:972 #: include/lib/html_input.class.php:1025 include/lib/html_input.class.php:1083 -#: include/lib/html_input.class.php:1084 +#: include/lib/html_input.class.php:1084 include/lib/html_input.class.php:1099 #, php-format msgid "Voulez-vous effacer cette relation " msgstr "Do you want to delete this relation" @@ -19728,11 +19844,11 @@ msgstr "Do you confirm" #: include/ajax/ajax_add_menu.php:192 include/ajax/ajax_add_menu.php:200 #: include/class/fiche_def.class.php:791 include/class/fiche_def.class.php:796 #: include/ajax/ajax_create_menu.php:13 include/template/stock_inv.php:33 -#: include/lib/message_javascript.php:78 +#: include/lib/message_javascript.php:78 include/lib/message_javascript.php:80 msgid "Vous confirmez ?" msgstr "Do you confirm?" -#: include/lib/message_javascript.php:81 +#: include/lib/message_javascript.php:81 include/lib/message_javascript.php:83 msgid "Vous confirmez effacement ?" msgstr "Do you confirm the removal ?" @@ -19755,7 +19871,7 @@ msgstr "Removing the Confirm?" msgid "Vous confirmez le clonage " msgstr "Confirm cloning" -#: include/lib/message_javascript.php:82 +#: include/lib/message_javascript.php:82 include/lib/message_javascript.php:84 msgid "Vous confirmez mise à jour ?" msgstr "Do you confirm the update?" @@ -19990,8 +20106,8 @@ msgid "" "Vous utilisez le mode strict la dernière operation est la date du %s\n" " vous ne pouvez pas encoder à une date antérieure" msgstr "" -"You are using the strict mode, the last entry is on the %s , you cannot" -" record after that date" +"You are using the strict mode, the last entry is on the %s , you cannot " +"record after that date" #: include/class_acc_ledger_fin.php:116 include/class_acc_ledger_fin.php:200 #: include/class_acc_ledger_purchase.php:111 @@ -20176,11 +20292,16 @@ msgstr "Incorrect call" msgid "aucune donnée" msgstr "no data" +#: include/lib/database_core.class.php:64 +#, php-format +msgid "base de donnée = %s" +msgstr "Database %s" + #: include/ext/coprop/index.php:46 msgid "budgets" msgstr "budgets" -#: include/lib/message_javascript.php:88 +#: include/lib/message_javascript.php:88 include/lib/message_javascript.php:90 msgid "calculé" msgstr "Computed" @@ -20217,6 +20338,7 @@ msgstr "Choose" #: include/class/acc_ledger_search.class.php:111 #: include/lib/html_input.class.php:1017 include/lib/html_input.class.php:1018 #: include/class/acc_ledger_search.class.php:112 +#: include/lib/html_input.class.php:1033 msgid "choix des journaux" msgstr "Ledgers" @@ -20516,6 +20638,7 @@ msgstr "" #: include/ajax_mod_periode.php:60 include/ajax_mod_periode.php:78 #: include/ajax/ajax_mod_periode.php:60 include/ajax/ajax_mod_periode.php:78 #: include/ajax/ajax_periode.php:176 include/class/periode.class.php:707 +#: include/class/periode.class.php:709 msgid "fermer" msgstr "close" @@ -20724,7 +20847,7 @@ msgstr "rate is invalid" msgid "le taux n'est pas un nombre" msgstr "rate is not a number" -#: include/lib/message_javascript.php:64 +#: include/lib/message_javascript.php:64 include/lib/message_javascript.php:66 msgid "" "le type vaut :
      \t
    • ME pour Menu
      • \t
    • PR pour les impressions \t
    • PL pour les plugins
      • \t
    • SP pour des valeurs spéciales
      • " @@ -20878,7 +21001,7 @@ msgstr "Does not belong to this ledger" msgid "n'existe pas" msgstr "does not exist" -#: include/class/periode.class.php:520 +#: include/class/periode.class.php:520 include/class/periode.class.php:522 msgid "nb opérations" msgstr "Number of entries" @@ -21170,6 +21293,7 @@ msgstr "point" #: include/export/export_poste_detail_csv.php:39 #: include/export/export_balance_pdf.php:128 #: include/export/export_balance_pdf.php:125 +#: include/export/export_balance_pdf.php:126 msgid "poste" msgstr "Accounting" @@ -21336,7 +21460,7 @@ msgstr "Reconciliation" #: include/manager.inc.php:104 include/supplier.inc.php:104 #: include/contact.inc.php:98 include/manager.inc.php:105 #: include/template/action_search.php:152 include/customer.inc.php:103 -#: include/template/action_search.php:148 +#: include/template/action_search.php:148 scenario/select-box-test.php:62 msgid "recherche" msgstr "Search" @@ -21378,6 +21502,7 @@ msgstr "new line" #: include/ajax_mod_periode.php:59 include/ajax/ajax_mod_periode.php:59 #: include/ajax/ajax_periode.php:175 include/class/periode.class.php:706 +#: include/class/periode.class.php:708 msgid "sauver" msgstr "Save" diff --git a/html/lang/messages.po b/html/lang/messages.po index 8c9960ecd..027811492 100644 --- a/html/lang/messages.po +++ b/html/lang/messages.po @@ -3,12 +3,13 @@ # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. # +#: include/database.item.php:124 #, fuzzy msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-07-31 00:04+0200\n" +"POT-Creation-Date: 2019-08-07 15:00+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -208,8 +209,7 @@ msgstr "" #: include/database.item.php:56 include/database.item.php:95 #: include/lettering.gestion.inc.php:53 include/fiche.inc.php:86 #: include/class/acc_ledger_search.class.php:556 -#: include/lettering.account.inc.php:105 include/lib/user_menu.php:52 -#: include/lettering.card.inc.php:102 +#: include/lettering.account.inc.php:105 include/lettering.card.inc.php:102 #, php-format msgid "Recherche" msgstr "" @@ -492,7 +492,7 @@ msgstr "" #: include/class/pdf_operation.class.php:149 #: include/class/pdf_operation.class.php:194 #: include/class/pdf_operation.class.php:247 html/ajax_misc.php:456 -#: html/ajax_misc.php:458 html/ajax_misc.php:464 +#: html/ajax_misc.php:458 html/ajax_misc.php:464 html/ajax_misc.php:464 #: include/class/pdf_operation.class.php:149 #: include/class/pdf_operation.class.php:194 #: include/class/pdf_operation.class.php:247 @@ -502,21 +502,21 @@ msgstr "" #: html/ajax_misc.php:195 html/ajax_misc.php:214 html/ajax_misc.php:228 #: html/ajax_misc.php:234 html/ajax_misc.php:312 html/ajax_misc.php:317 #: html/ajax_misc.php:345 html/ajax_misc.php:457 html/ajax_misc.php:459 -#: html/ajax_misc.php:465 +#: html/ajax_misc.php:465 html/ajax_misc.php:465 msgid "Taux" msgstr "" #: html/ajax_misc.php:196 html/ajax_misc.php:215 html/ajax_misc.php:229 #: html/ajax_misc.php:235 html/ajax_misc.php:313 html/ajax_misc.php:318 #: html/ajax_misc.php:346 html/ajax_misc.php:458 html/ajax_misc.php:460 -#: html/ajax_misc.php:466 +#: html/ajax_misc.php:466 html/ajax_misc.php:466 msgid "Symbole" msgstr "" #: html/ajax_misc.php:197 html/ajax_misc.php:216 html/ajax_misc.php:230 #: html/ajax_misc.php:236 html/ajax_misc.php:314 html/ajax_misc.php:319 #: html/ajax_misc.php:347 html/ajax_misc.php:459 html/ajax_misc.php:461 -#: html/ajax_misc.php:467 +#: html/ajax_misc.php:467 html/ajax_misc.php:467 msgid "Explication" msgstr "" @@ -526,7 +526,7 @@ msgstr "" #: html/ajax_misc.php:372 html/ajax_misc.php:377 html/ajax_misc.php:400 #: html/ajax_misc.php:405 html/ajax_misc.php:512 html/ajax_misc.php:517 #: html/ajax_misc.php:514 html/ajax_misc.php:519 html/ajax_misc.php:520 -#: html/ajax_misc.php:525 +#: html/ajax_misc.php:525 html/ajax_misc.php:520 html/ajax_misc.php:525 msgid "tva inconnue" msgstr "" @@ -563,7 +563,7 @@ msgstr "" #: html/do.php:302 html/user_login.php:71 include/cfgledger.inc.php:138 #: include/modele.inc.php:403 include/modele.inc.php:443 #: include/ajax/ajax_display_letter.php:39 include/cfgledger.inc.php:141 -#: include/ext/tva/ajax.php:35 html/do.php:312 html/do.php:281 +#: include/ext/tva/ajax.php:35 html/do.php:312 html/do.php:281 html/do.php:281 #: html/user_login.php:71 include/cfgledger.inc.php:141 #: include/dossier.inc.php:383 include/dossier.inc.php:426 #: include/ajax/ajax_get_profile.php:50 include/ajax/ajax_display_letter.php:39 @@ -631,7 +631,7 @@ msgstr "" #: include/ext/tools/include/anc_grandlivre_ext.class.php:126 #: include/export/export_poste_detail_pdf.php:102 #: include/ajax/ajax_display_letter.php:122 include/fiche.inc.php:576 -#: include/export/export_poste_detail_pdf.php:102 +#: include/fiche.inc.php:585 include/export/export_poste_detail_pdf.php:102 #: include/ajax/ajax_display_letter.php:122 include/fiche.inc.php:585 msgid "Debit" msgstr "" @@ -646,7 +646,7 @@ msgstr "" #: include/ext/tools/include/anc_grandlivre_ext.class.php:127 #: include/export/export_poste_detail_pdf.php:104 #: include/ajax/ajax_display_letter.php:123 include/fiche.inc.php:580 -#: include/export/export_poste_detail_pdf.php:104 +#: include/fiche.inc.php:589 include/export/export_poste_detail_pdf.php:104 #: include/ajax/ajax_display_letter.php:123 include/fiche.inc.php:589 msgid "Credit" msgstr "" @@ -794,7 +794,7 @@ msgstr "" #: include/template/operation_detail_misc.php:32 include/ajax/ajax_poste.php:65 #: include/database.item.php:170 include/balance.inc.php:306 #: include/class/acc_plan_mtable.class.php:45 include/class/fiche.class.php:469 -#: include/card_attr.inc.php:82 +#: include/class/pdfbalance_simple.class.php:55 include/card_attr.inc.php:82 msgid "Poste Comptable" msgstr "" @@ -807,13 +807,14 @@ msgstr "" #: html/do.php:93 html/user_login.php:67 html/do.php:121 html/do.php:134 #: html/do.php:136 html/do.php:154 html/do.php:178 html/user_login.php:69 #: html/do.php:186 html/user_login.php:70 html/do.php:196 html/do.php:165 -#: html/user_login.php:70 +#: html/do.php:165 html/user_login.php:70 msgid "Base de donnée invalide" msgstr "" #: html/do.php:104 html/do.php:103 html/do.php:98 html/do.php:100 #: html/do.php:128 html/do.php:141 html/do.php:143 html/do.php:161 #: html/do.php:185 html/do.php:197 html/do.php:207 html/do.php:176 +#: html/do.php:176 msgid "" "Attention: la version de base de donnée est supérieure à la version du " "programme, vous devriez mettre à jour" @@ -823,7 +824,7 @@ msgstr "" #: html/do.php:104 html/user_login.php:76 html/do.php:132 html/do.php:145 #: html/do.php:147 html/do.php:165 html/do.php:189 html/user_login.php:78 #: html/do.php:203 html/user_login.php:79 html/user_login.php:85 -#: html/do.php:213 html/do.php:182 html/user_login.php:85 +#: html/do.php:213 html/do.php:182 html/do.php:182 html/user_login.php:85 msgid "Votre base de données n'est pas à jour" msgstr "" @@ -831,7 +832,7 @@ msgstr "" #: html/do.php:105 html/user_login.php:77 html/do.php:133 html/do.php:146 #: html/do.php:148 html/do.php:166 html/do.php:190 html/user_login.php:79 #: html/do.php:204 html/user_login.php:80 html/user_login.php:86 -#: html/do.php:214 html/do.php:183 html/user_login.php:86 +#: html/do.php:214 html/do.php:183 html/do.php:183 html/user_login.php:86 msgid "cliquez ici pour appliquer le patch" msgstr "" @@ -869,6 +870,7 @@ msgstr "" #: include/database.item.php:87 html/user_login.php:163 #: include/database.item.php:81 include/ajax/ajax_preference.php:31 #: html/user_login.php:169 include/database.item.php:79 html/user_login.php:146 +#: include/ajax/ajax_preference.php:69 html/user_login.php:146 #: include/ajax/ajax_preference.php:69 include/database.item.php:79 msgid "Préférence" msgstr "" @@ -876,7 +878,7 @@ msgstr "" #: html/user_login.php:151 html/user_login.php:153 html/user_login.php:155 #: html/user_login.php:159 html/user_login.php:160 html/user_login.php:161 #: html/user_login.php:162 html/user_login.php:165 html/user_login.php:171 -#: html/user_login.php:148 +#: html/user_login.php:148 html/user_login.php:148 msgid "Deconnexion" msgstr "" @@ -1081,7 +1083,7 @@ msgstr "" #: include/manager.inc.php:104 include/supplier.inc.php:104 #: include/contact.inc.php:98 include/manager.inc.php:105 #: include/template/action_search.php:152 include/customer.inc.php:103 -#: include/template/action_search.php:148 +#: include/template/action_search.php:148 scenario/select-box-test.php:62 #: include/template/action_search.php:148 include/contact.inc.php:98 #: include/customer.inc.php:103 include/manager.inc.php:105 #: include/supplier.inc.php:104 include/bank.inc.php:99 include/adm.inc.php:100 @@ -1276,9 +1278,9 @@ msgstr "" #: include/class/acc_ledger_search.class.php:1104 #: include/class/acc_ledger_fin.class.php:549 #: include/class/acc_ledger_fin.class.php:754 -#: include/class/fiche.class.php:1780 include/param_sec.inc.php:58 -#: include/user.inc.php:82 include/user.inc.php:126 -#: include/template/fiche_list.php:38 +#: include/class/fiche.class.php:1780 include/class/fiche.class.php:1781 +#: include/param_sec.inc.php:58 include/user.inc.php:82 +#: include/user.inc.php:126 include/template/fiche_list.php:38 #: include/template/document_mod_change.php:34 include/template/profile.php:33 #: include/template/forecast_cat.php:15 #: include/export/export_anc_axis_csv.php:44 @@ -1325,19 +1327,21 @@ msgstr "" #: include/ajax_preference.php:69 include/ajax_preference.php:70 #: include/ajax/ajax_preference.php:69 include/ajax/ajax_preference.php:70 -#: include/ajax/ajax_preference.php:81 +#: include/ajax/ajax_preference.php:81 include/ajax/ajax_preference.php:81 msgid "Options Générales" msgstr "" #: include/ajax_preference.php:81 include/ajax_preference.php:82 #: include/ajax_preference.php:89 include/ajax/ajax_preference.php:89 #: include/ajax/ajax_preference.php:90 include/ajax/ajax_preference.php:101 +#: include/ajax/ajax_preference.php:101 msgid "Thème" msgstr "" #: include/ajax_preference.php:102 include/ajax_preference.php:103 #: include/ajax_preference.php:110 include/ajax/ajax_preference.php:110 #: include/ajax/ajax_preference.php:115 include/ajax/ajax_preference.php:126 +#: include/ajax/ajax_preference.php:126 msgid "" "Attention cette période est fermée, vous ne pourrez rien modifier dans le " "module comptable" @@ -1372,8 +1376,9 @@ msgstr "" #: include/class/acc_ledger_purchase.class.php:1826 #: include/class/acc_ledger_sold.class.php:1400 #: include/class/acc_ledger_purchase.class.php:1829 -#: include/template/forecast_result.php:25 include/ajax/ajax_preference.php:150 -#: include/database.item.php:84 include/class/acc_ledger_sold.class.php:1400 +#: include/ajax/ajax_preference.php:150 include/template/forecast_result.php:25 +#: include/ajax/ajax_preference.php:150 include/database.item.php:84 +#: include/class/acc_ledger_sold.class.php:1400 #: include/class/acc_ledger_purchase.class.php:1829 msgid "Période" msgstr "" @@ -1381,6 +1386,7 @@ msgstr "" #: include/ajax_preference.php:120 include/ajax_preference.php:121 #: include/ajax_preference.php:128 include/ajax/ajax_preference.php:128 #: include/ajax/ajax_preference.php:145 include/ajax/ajax_preference.php:156 +#: include/ajax/ajax_preference.php:156 msgid "Taille des pages" msgstr "" @@ -1390,66 +1396,73 @@ msgstr "" #: include/ajax/ajax_preference.php:137 include/ajax/ajax_preference.php:139 #: include/ajax/ajax_preference.php:154 include/ajax/ajax_preference.php:156 #: include/ajax/ajax_preference.php:165 include/ajax/ajax_preference.php:167 +#: include/ajax/ajax_preference.php:165 include/ajax/ajax_preference.php:167 msgid "Illimité" msgstr "" #: include/ajax_preference.php:148 include/ajax_preference.php:149 #: include/ajax_preference.php:156 include/ajax/ajax_preference.php:156 #: include/ajax/ajax_preference.php:235 include/ajax/ajax_preference.php:246 +#: include/ajax/ajax_preference.php:246 msgid "Options pour la page d'accueil" msgstr "" #: include/ajax_preference.php:149 include/ajax_preference.php:150 #: include/ajax_preference.php:157 include/ajax/ajax_preference.php:157 #: include/ajax/ajax_preference.php:236 include/ajax/ajax_preference.php:247 +#: include/ajax/ajax_preference.php:247 msgid "Mini-Rapport : " msgstr "" #: include/ajax_preference.php:152 include/ajax_preference.php:153 #: include/ajax_preference.php:160 include/ajax/ajax_preference.php:160 #: include/ajax/ajax_preference.php:239 include/ajax/ajax_preference.php:250 +#: include/ajax/ajax_preference.php:250 msgid "Aucun mini rapport" msgstr "" #: include/ajax_preference.php:158 include/ajax_preference.php:159 #: include/ajax_preference.php:166 include/ajax/ajax_preference.php:166 #: include/ajax/ajax_preference.php:245 include/ajax/ajax_preference.php:256 +#: include/ajax/ajax_preference.php:256 msgid "Le mini rapport est un rapport qui s'affiche sur votre page d'accueil" msgstr "" #: include/ajax_preference.php:163 include/ajax_preference.php:164 #: include/ajax_preference.php:171 include/ajax/ajax_preference.php:171 #: include/ajax/ajax_preference.php:250 include/ajax/ajax_preference.php:261 +#: include/ajax/ajax_preference.php:261 msgid "Langue" msgstr "" #: include/ajax_preference.php:164 include/ajax_preference.php:165 #: include/ajax_preference.php:172 include/ajax/ajax_preference.php:172 #: include/ajax/ajax_preference.php:251 include/ajax/ajax_preference.php:262 +#: include/ajax/ajax_preference.php:262 msgid "Selectionnez votre langue" msgstr "" #: include/ajax_preference.php:165 include/ajax_preference.php:166 #: html/test_class.php:219 include/ajax_preference.php:173 #: include/ajax/ajax_preference.php:173 include/ajax/ajax_preference.php:252 -#: dev/test/test_class.php:215 dev/test/test_class.php:215 -#: include/ajax/ajax_preference.php:263 +#: dev/test/test_class.php:215 include/ajax/ajax_preference.php:263 +#: dev/test/test_class.php:215 include/ajax/ajax_preference.php:263 msgid "Français" msgstr "" #: include/ajax_preference.php:166 include/ajax_preference.php:167 #: html/test_class.php:220 include/ajax_preference.php:174 #: include/ajax/ajax_preference.php:174 include/ajax/ajax_preference.php:253 -#: dev/test/test_class.php:216 dev/test/test_class.php:216 -#: include/ajax/ajax_preference.php:264 +#: dev/test/test_class.php:216 include/ajax/ajax_preference.php:264 +#: dev/test/test_class.php:216 include/ajax/ajax_preference.php:264 msgid "Anglais" msgstr "" #: include/ajax_preference.php:167 include/ajax_preference.php:168 #: html/test_class.php:221 include/ajax_preference.php:175 #: include/ajax/ajax_preference.php:175 include/ajax/ajax_preference.php:254 -#: dev/test/test_class.php:217 dev/test/test_class.php:217 -#: include/ajax/ajax_preference.php:265 +#: dev/test/test_class.php:217 include/ajax/ajax_preference.php:265 +#: dev/test/test_class.php:217 include/ajax/ajax_preference.php:265 msgid "Néerlandais" msgstr "" @@ -1494,7 +1507,8 @@ msgstr "" #: include/lib/html_input.class.php:409 include/ajax/ajax_preference.php:269 #: include/class/acc_ledger_search.class.php:1113 #: include/class/acc_ledger_search.class.php:1121 -#: include/class/acc_ledger_search.class.php:1134 include/cfgplugin.inc.php:171 +#: include/class/acc_ledger_search.class.php:1134 +#: include/ajax/ajax_preference.php:280 include/cfgplugin.inc.php:171 #: include/template/action_display_short.php:126 #: include/template/action_other_action.php:60 #: include/stock_inv_histo.inc.php:69 include/ajax/ajax_add_menu.php:171 @@ -1934,6 +1948,7 @@ msgstr "" #: include/class/acc_ledger.class.php:887 #: include/class/acc_ledger_fin.class.php:754 #: include/class/anc_operation.class.php:298 +#: include/class/acc_ledger_history_generic.class.php:770 #: include/template/balance_aged_result.php:50 #: include/template/operation_detail_fin.php:33 #: include/template/acc_ledger_history_financial_oneline.php:35 @@ -1952,7 +1967,7 @@ msgstr "" #: include/template/ledger_detail_ach.php:72 #: include/export/export_gl_pdf.php:88 #: include/export/export_poste_detail_pdf.php:98 -#: include/export/export_balance_pdf.php:126 +#: include/export/export_balance_pdf.php:127 #: include/export/export_gl_csv.php:96 include/balance.inc.php:307 #: include/class/print_ledger_detail_item.class.php:60 #: include/class/acc_ledger_history_generic.class.php:770 @@ -2297,8 +2312,9 @@ msgstr "" #: include/class/anc_balance_double.class.php:368 #: include/class/acc_ledger_search.class.php:551 #: include/class/acc_ledger_search.class.php:560 -#: include/class/acc_ledger_fin.class.php:1087 include/ajax/ajax_admin.php:149 -#: include/anc_great_ledger.inc.php:23 +#: include/class/acc_ledger_fin.class.php:1087 +#: include/class/anc_balance_double.class.php:370 +#: include/ajax/ajax_admin.php:149 include/anc_great_ledger.inc.php:23 #: include/class/anc_balance_double.class.php:370 #: include/class/anc_balance_simple.class.php:193 #: include/class/acc_ledger_search.class.php:560 @@ -2689,6 +2705,10 @@ msgstr "" #: include/class/anc_listing.class.php:79 #: include/class/anc_operation.class.php:297 include/class/fiche.class.php:1396 #: include/class/fiche.class.php:1471 include/lib/ac_common.php:1210 +#: include/fiche.inc.php:527 +#: include/class/acc_ledger_history_generic.class.php:680 +#: include/class/acc_ledger_history_generic.class.php:767 +#: include/class/fiche.class.php:1397 include/class/fiche.class.php:1472 #: include/audit_log.php:37 include/template/letter_prop.php:25 #: include/template/letter_prop.php:68 #: include/template/print_ledger_simple.php:7 @@ -2884,6 +2904,8 @@ msgstr "" #: include/class/acc_ledger.class.php:881 include/class/fiche.class.php:1459 #: include/class/acc_ledger.class.php:886 #: include/class/anc_listing.class.php:80 include/class/fiche.class.php:1473 +#: include/class/acc_ledger_history_generic.class.php:768 +#: include/class/fiche.class.php:1474 #: include/template/ledger_detail_ven.php:154 #: include/template/ledger_detail_ach.php:152 #: include/export/export_poste_detail_csv.php:79 @@ -2985,7 +3007,10 @@ msgstr "" #: include/class/fiche.class.php:1462 include/class/acc_ledger.class.php:613 #: include/class/acc_ledger.class.php:884 include/class/fiche.class.php:1464 #: include/operation_ods_new.inc.php:84 include/class/acc_ledger.class.php:889 -#: include/class/fiche.class.php:1478 include/impress_gl_comptes.inc.php:216 +#: include/class/fiche.class.php:1478 +#: include/class/anc_balance_double.class.php:99 +#: include/class/acc_ledger_history_generic.class.php:771 +#: include/class/fiche.class.php:1479 include/impress_gl_comptes.inc.php:216 #: include/template/letter_prop.php:37 include/template/letter_prop.php:80 #: include/template/ledger_detail_misc.php:102 #: include/template/ledger_detail_bottom.php:91 @@ -3007,6 +3032,7 @@ msgstr "" #: include/class/fiche.class.php:1479 #: include/class/pre_op_advanced.class.php:199 #: include/class/anc_grandlivre.class.php:220 +#: include/class/pdfbalance_simple.class.php:56 #: include/class/anticipation.class.php:420 include/anc_od.inc.php:148 msgid "Débit" msgstr "" @@ -3074,7 +3100,10 @@ msgstr "" #: include/class/anc_grandlivre.class.php:221 #: include/class/fiche.class.php:1463 include/class/acc_ledger.class.php:614 #: include/class/fiche.class.php:1465 include/operation_ods_new.inc.php:85 -#: include/class/fiche.class.php:1479 include/impress_gl_comptes.inc.php:215 +#: include/class/fiche.class.php:1479 +#: include/class/anc_balance_double.class.php:100 +#: include/class/acc_ledger_history_generic.class.php:772 +#: include/class/fiche.class.php:1480 include/impress_gl_comptes.inc.php:215 #: include/template/letter_prop.php:40 include/template/letter_prop.php:83 #: include/template/ledger_detail_misc.php:103 #: include/template/ledger_detail_bottom.php:92 @@ -3091,6 +3120,7 @@ msgstr "" #: include/class/acc_account_ledger.class.php:400 #: include/class/fiche.class.php:1480 #: include/class/anc_grandlivre.class.php:221 +#: include/class/pdfbalance_simple.class.php:57 #: include/class/anticipation.class.php:421 include/anc_od.inc.php:149 msgid "Crédit" msgstr "" @@ -3141,6 +3171,9 @@ msgstr "" #: include/class/acc_ledger_purchase.class.php:1588 #: include/class/acc_ledger.class.php:724 include/class/fiche.class.php:1544 #: include/fiche.inc.php:440 include/class/fiche.class.php:1563 +#: include/fiche.inc.php:447 +#: include/class/acc_ledger_history_generic.class.php:738 +#: include/class/fiche.class.php:1564 #: include/template/print_ledger_simple.php:143 #: include/template/acc_ledger_history_sale_detail.php:154 #: include/template/acc_ledger_history_purchase_detail.php:167 @@ -3473,7 +3506,9 @@ msgstr "" #: include/class/acc_ledger_fin.class.php:551 #: include/class/acc_ledger_fin.class.php:754 #: include/class/anc_listing.class.php:86 include/class/fiche.class.php:1398 -#: include/lib/ac_common.php:1215 include/template/operation_detail_fin.php:34 +#: include/lib/ac_common.php:1215 include/fiche.inc.php:531 +#: include/class/fiche.class.php:1399 +#: include/template/operation_detail_fin.php:34 #: include/template/acc_ledger_history_financial_oneline.php:36 #: include/template/ledger_detail_misc.php:54 #: include/template/ledger_detail_ven.php:157 @@ -3640,7 +3675,7 @@ msgstr "" #: include/class_acc_ledger.php:3349 include/class_acc_ledger.php:3348 #: include/ajax_create_menu.php:7 include/ajax/ajax_create_menu.php:7 #: include/lib/user_menu.php:51 include/ajax/ajax_create_menu.php:11 -#: include/ajax/ajax_create_menu.php:11 include/lib/user_menu.php:51 +#: include/ajax/ajax_create_menu.php:11 msgid "Création" msgstr "" @@ -5383,8 +5418,10 @@ msgstr "" #: include/class/acc_ledger_search.class.php:1105 #: include/class/anc_listing.class.php:83 include/class/fiche.class.php:1397 #: include/class/fiche.class.php:1476 include/lib/ac_common.php:1213 -#: include/cfgplugin.inc.php:115 include/template/letter_prop.php:34 -#: include/template/letter_prop.php:77 include/template/category_of_card.php:28 +#: include/template/param_jrn.php:85 include/class/fiche.class.php:1398 +#: include/class/fiche.class.php:1477 include/cfgplugin.inc.php:115 +#: include/template/letter_prop.php:34 include/template/letter_prop.php:77 +#: include/template/category_of_card.php:28 #: include/template/print_ledger_simple.php:11 #: include/template/param_jrn.php:85 include/template/pcmn_update.php:38 #: include/template/menu_detail.php:43 @@ -5458,6 +5495,7 @@ msgstr "" #: include/class/anc_balance_double.class.php:362 #: include/class/anc_balance_double.class.php:364 #: include/class/anc_balance_double.class.php:366 +#: include/class/anc_balance_double.class.php:366 msgid "" "Selectionnez le plan qui vous intéresse avant de cliquer sur Recherche" msgstr "" @@ -5568,6 +5606,7 @@ msgstr "" #: include/ajax/ajax_anc_detail_operation.php:57 #: include/class/anc_listing.class.php:87 #: include/class/pdf_operation.class.php:250 +#: include/class/pdfbalance_simple.class.php:59 msgid "D/C" msgstr "" @@ -5578,7 +5617,7 @@ msgid "Aucun plan défini" msgstr "" #: include/class_anc_print.php:120 include/lib/message_javascript.php:68 -#: include/lib/message_javascript.php:68 +#: include/lib/message_javascript.php:70 msgid "Les dates sont en format DD.MM.YYYY" msgstr "" @@ -5610,7 +5649,7 @@ msgid " et l'activité " msgstr "" #: include/class_anc_print.php:140 include/class_anc_print.php:181 -#: include/lib/message_javascript.php:73 include/lib/message_javascript.php:73 +#: include/lib/message_javascript.php:73 include/lib/message_javascript.php:75 msgid "Selectionnez le plan qui vous intéresse avant de cliquer sur Recherche" msgstr "" @@ -5905,7 +5944,7 @@ msgstr "" #: include/ajax/ajax_view_mod_stock.php:55 include/modele.inc.php:316 #: include/class/document_type.class.php:82 #: include/class/anc_operation.class.php:317 -#: include/class/periode.class.php:594 include/class/periode.class.php:599 +#: include/class/periode.class.php:596 include/class/periode.class.php:601 #: include/class/document_modele.class.php:71 #: include/lib/manage_table_sql.class.php:765 include/forecast.inc.php:347 #: include/card_attr.inc.php:110 @@ -6140,10 +6179,10 @@ msgstr "" #: include/ajax/ajax_add_menu.php:192 include/ajax/ajax_add_menu.php:200 #: include/class/fiche_def.class.php:791 include/class/fiche_def.class.php:796 #: include/ajax/ajax_create_menu.php:13 include/template/stock_inv.php:33 -#: include/template/fiche_list.php:30 include/template/stock_inv.php:33 -#: include/ajax/ajax_create_menu.php:13 include/ajax/ajax_add_menu.php:200 -#: include/class/fiche_def.class.php:791 include/class/fiche_def.class.php:796 -#: include/lib/message_javascript.php:78 +#: include/lib/message_javascript.php:78 include/template/fiche_list.php:30 +#: include/template/stock_inv.php:33 include/ajax/ajax_create_menu.php:13 +#: include/ajax/ajax_add_menu.php:200 include/class/fiche_def.class.php:791 +#: include/class/fiche_def.class.php:796 include/lib/message_javascript.php:80 msgid "Vous confirmez ?" msgstr "" @@ -6196,6 +6235,8 @@ msgstr "" #: include/class/acc_ledger_history_generic.class.php:680 #: include/class/fiche.class.php:1456 include/class/fiche.class.php:1458 #: include/class/fiche.class.php:1472 +#: include/class/acc_ledger_history_generic.class.php:681 +#: include/class/fiche.class.php:1473 #: include/template/impress_reconciliation.php:16 #: include/export/export_poste_detail_csv.php:80 #: include/export/export_fiche_detail_csv.php:71 @@ -6251,7 +6292,8 @@ msgstr "" #: include/template/ledger_detail_misc.php:100 #: include/class/fiche.class.php:1758 include/class/fiche.class.php:1760 #: include/class/acc_ledger_fin.class.php:753 -#: include/class/fiche.class.php:1778 include/template/fiche_list.php:34 +#: include/class/fiche.class.php:1778 include/class/fiche.class.php:1779 +#: include/template/fiche_list.php:34 #: include/template/ledger_detail_misc.php:100 #: include/template/ledger_detail_bottom.php:89 #: include/template/ledger_detail_ven.php:126 @@ -6276,7 +6318,8 @@ msgstr "" #: include/class/class_fiche.php:1601 include/class/class_fiche.php:1604 #: include/class/fiche.class.php:1758 include/class/fiche.class.php:1761 #: include/class/fiche.class.php:1763 include/class/fiche.class.php:1781 -#: include/audit_log.php:38 include/template/stock_summary_list.php:39 +#: include/class/fiche.class.php:1782 include/audit_log.php:38 +#: include/template/stock_summary_list.php:39 #: include/export/export_stock_resume_list.php:38 #: include/ajax/ajax_mod_stock_repo.php:47 include/class/fiche.class.php:1782 #: include/stock_cfg.inc.php:66 @@ -6290,6 +6333,7 @@ msgstr "" #: include/class/class_fiche.php:1605 include/class/fiche.class.php:1759 #: include/class/fiche.class.php:1762 include/class/fiche.class.php:1764 #: include/class/fiche.class.php:1782 include/class/fiche.class.php:1783 +#: include/class/fiche.class.php:1783 msgid "Total débit" msgstr "" @@ -6300,6 +6344,7 @@ msgstr "" #: include/class/class_fiche.php:1606 include/class/fiche.class.php:1760 #: include/class/fiche.class.php:1763 include/class/fiche.class.php:1765 #: include/class/fiche.class.php:1783 include/class/fiche.class.php:1784 +#: include/class/fiche.class.php:1784 msgid "Total crédit" msgstr "" @@ -6319,14 +6364,16 @@ msgstr "" #: include/class/fiche.class.php:1764 include/class/fiche.class.php:1766 #: include/export/export_balance_pdf.php:135 #: include/class/anc_listing.class.php:120 include/class/fiche.class.php:1784 -#: include/template/anc_balance_group.php:51 +#: include/class/anc_balance_double.class.php:101 +#: include/class/fiche.class.php:1785 include/template/anc_balance_group.php:51 #: include/template/anc_balance_group.php:72 #: include/export/export_gl_pdf.php:88 -#: include/export/export_balance_pdf.php:135 +#: include/export/export_balance_pdf.php:136 #: include/export/export_gl_csv.php:96 include/balance.inc.php:317 #: include/class/anc_balance_double.class.php:101 #: include/class/acc_bilan.class.php:176 #: include/class/anc_listing.class.php:120 include/class/fiche.class.php:1785 +#: include/class/pdfbalance_simple.class.php:58 msgid "Solde" msgstr "" @@ -6514,7 +6561,7 @@ msgstr "" #: include/class_ibutton.php:82 include/class_ibutton.php:84 #: include/lib/class_ibutton.php:84 include/lib/ibutton.class.php:84 -#: include/lib/message_javascript.php:97 +#: include/lib/message_javascript.php:97 include/lib/message_javascript.php:99 msgid "Calculatrice" msgstr "" @@ -7663,8 +7710,8 @@ msgstr "" #: include/database.item.php:78 include/lib/user_menu.php:123 #: include/lib/user_menu.php:131 include/lib/user_menu.php:124 #: include/lib/user_menu.php:143 include/database.item.php:75 -#: include/database.item.php:73 include/lib/user_menu.php:124 -#: include/lib/user_menu.php:143 +#: include/database.item.php:73 include/lib/user_menu.php:81 +#: include/lib/user_menu.php:100 msgid "Accueil" msgstr "" @@ -7714,7 +7761,7 @@ msgstr "" #: include/lib/user_menu.php:125 include/lib/user_menu.php:144 #: include/database.item.php:107 include/database.item.php:101 #: include/database.item.php:99 include/database.item.php:99 -#: include/lib/user_menu.php:125 include/lib/user_menu.php:144 +#: include/lib/user_menu.php:82 include/lib/user_menu.php:101 msgid "Sortie" msgstr "" @@ -8253,8 +8300,8 @@ msgstr "" #: include/admin_repo.inc.php:63 include/database.item.php:130 #: html/user_login.php:160 include/admin_repo.inc.php:65 #: include/database.item.php:124 html/user_login.php:166 -#: html/user_login.php:143 include/admin_repo.inc.php:65 -#: include/database.item.php:122 +#: html/user_login.php:143 html/user_login.php:143 +#: include/admin_repo.inc.php:65 include/database.item.php:122 msgid "Administration" msgstr "" @@ -8597,7 +8644,7 @@ msgstr "" #: include/class/periode_ledger_table.class.php:99 #: include/ajax/ajax_display_letter.php:116 include/database.item.php:171 #: include/class/periode_ledger_table.class.php:99 -#: include/class/periode.class.php:518 +#: include/class/periode.class.php:520 msgid "Date Fin" msgstr "" @@ -8687,8 +8734,9 @@ msgstr "" #: include/database.item.php:179 include/ajax/ajax_preference.php:73 #: include/database.item.php:180 include/database.item.php:183 #: include/user.inc.php:84 include/database.item.php:191 -#: include/ajax/ajax_preference.php:74 include/user.inc.php:84 -#: include/ajax/ajax_preference.php:85 include/database.item.php:183 +#: include/ajax/ajax_preference.php:74 include/ajax/ajax_preference.php:85 +#: include/user.inc.php:84 include/ajax/ajax_preference.php:85 +#: include/database.item.php:183 msgid "Email" msgstr "" @@ -8807,7 +8855,7 @@ msgstr "" #: include/class/acc_ledger_search.class.php:1082 #: include/class/acc_ledger_search.class.php:1095 include/cfgledger.inc.php:170 #: include/database.item.php:209 include/database.item.php:220 -#: include/class/acc_ledger_search.class.php:1095 include/lib/user_menu.php:178 +#: include/class/acc_ledger_search.class.php:1095 include/lib/user_menu.php:136 msgid "Financier" msgstr "" @@ -9064,8 +9112,8 @@ msgstr "" #: include/export/export_fiche_balance_csv.php:140 #: include/export/export_fiche_balance_csv.php:153 #: include/export/export_fiche_balance_csv.php:154 include/fiche.inc.php:517 -#: include/fiche.inc.php:519 include/export/export_fiche_balance_csv.php:154 -#: include/fiche.inc.php:528 +#: include/fiche.inc.php:519 include/fiche.inc.php:528 +#: include/export/export_fiche_balance_csv.php:154 include/fiche.inc.php:528 msgid "ref" msgstr "" @@ -9121,7 +9169,9 @@ msgstr "" #: include/class/anc_grandlivre.class.php:219 #: include/class/acc_ledger_purchase.class.php:1832 #: include/class/print_ledger_misc.class.php:45 include/fiche.inc.php:520 -#: include/class/fiche.class.php:1474 +#: include/class/fiche.class.php:1474 include/fiche.inc.php:529 +#: include/class/acc_ledger_history_generic.class.php:766 +#: include/class/fiche.class.php:1475 #: include/template/balance_aged_result.php:53 #: include/template/acc_ledger_history_purchase_oneline.php:44 #: include/template/acc_ledger_history_sale_oneline.php:41 @@ -9148,8 +9198,8 @@ msgstr "" #: include/export/export_fiche_balance_csv.php:142 #: include/export/export_fiche_balance_csv.php:155 #: include/export/export_fiche_balance_csv.php:156 include/fiche.inc.php:519 -#: include/fiche.inc.php:521 include/export/export_fiche_balance_csv.php:156 -#: include/fiche.inc.php:530 +#: include/fiche.inc.php:521 include/fiche.inc.php:530 +#: include/export/export_fiche_balance_csv.php:156 include/fiche.inc.php:530 msgid "Comm" msgstr "" @@ -9177,7 +9227,7 @@ msgstr "" #: include/export/export_poste_detail_csv.php:90 #: include/class/anc_grandlivre.class.php:221 #: include/class/anc_grandlivre.class.php:222 include/fiche.inc.php:523 -#: include/export/export_fiche_balance_csv.php:159 +#: include/fiche.inc.php:532 include/export/export_fiche_balance_csv.php:159 #: include/export/export_poste_detail_csv.php:90 #: include/export/export_fiche_detail_csv.php:79 include/fiche.inc.php:532 #: include/class/anc_grandlivre.class.php:222 @@ -9193,7 +9243,7 @@ msgstr "" #: include/export/export_fiche_balance_csv.php:161 include/fiche.inc.php:522 #: include/export/export_fiche_detail_csv.php:80 #: include/export/export_poste_detail_csv.php:91 include/fiche.inc.php:524 -#: include/export/export_fiche_balance_csv.php:161 +#: include/fiche.inc.php:533 include/export/export_fiche_balance_csv.php:161 #: include/export/export_poste_detail_csv.php:91 #: include/export/export_fiche_detail_csv.php:80 include/fiche.inc.php:533 msgid "Let." @@ -9303,14 +9353,15 @@ msgstr "" #: include/fiche.inc.php:383 include/fiche.inc.php:386 #: include/fiche.inc.php:133 include/fiche.inc.php:387 #: include/fiche.inc.php:134 include/fiche.inc.php:388 -#: include/fiche.inc.php:134 include/fiche.inc.php:395 +#: include/fiche.inc.php:395 include/fiche.inc.php:134 +#: include/fiche.inc.php:395 msgid "Aucune fiche trouvée" msgstr "" #: include/fiche.inc.php:312 include/fiche.inc.php:317 #: include/fiche.inc.php:390 include/fiche.inc.php:393 #: include/fiche.inc.php:394 include/fiche.inc.php:395 -#: include/fiche.inc.php:402 +#: include/fiche.inc.php:402 include/fiche.inc.php:402 msgid "Filtre rapide:" msgstr "" @@ -9522,8 +9573,8 @@ msgstr "" #: include/class/fiche.class.php:1756 include/class/pdf_operation.class.php:246 #: include/ajax/ajax_boxcard_search.php:65 include/class/fiche.class.php:1759 #: include/class/fiche.class.php:1761 include/class/fiche.class.php:1779 -#: include/template/pcmn_update.php:28 include/template/pcmn_update.php:36 -#: include/template/account_result.php:13 +#: include/class/fiche.class.php:1780 include/template/pcmn_update.php:28 +#: include/template/pcmn_update.php:36 include/template/account_result.php:13 #: include/ajax/ajax_boxcard_search.php:65 include/class/fiche.class.php:1780 #: include/class/pdf_operation.class.php:246 msgid "Poste comptable" @@ -9622,24 +9673,24 @@ msgstr "" #: include/user_menu.php:110 include/user_menu.php:120 #: include/lib/user_menu.php:116 include/lib/user_menu.php:129 #: include/lib/user_menu.php:117 include/lib/user_menu.php:140 -#: include/lib/user_menu.php:117 include/lib/user_menu.php:140 +#: include/lib/user_menu.php:74 include/lib/user_menu.php:97 msgid "Utilisateurs" msgstr "" #: include/user_menu.php:110 include/user_menu.php:120 #: include/lib/user_menu.php:116 include/lib/user_menu.php:129 #: include/lib/user_menu.php:117 include/lib/user_menu.php:140 -#: include/lib/user_menu.php:117 include/lib/user_menu.php:140 +#: include/lib/user_menu.php:74 include/lib/user_menu.php:97 msgid "Gestion des utilisateurs" msgstr "" #: include/user_menu.php:111 include/lib/user_menu.php:117 -#: include/lib/user_menu.php:118 include/lib/user_menu.php:118 +#: include/lib/user_menu.php:118 include/lib/user_menu.php:75 msgid "Dossiers" msgstr "" #: include/user_menu.php:111 include/lib/user_menu.php:117 -#: include/lib/user_menu.php:118 include/lib/user_menu.php:118 +#: include/lib/user_menu.php:118 include/lib/user_menu.php:75 msgid "Gestion des dossiers" msgstr "" @@ -9647,78 +9698,78 @@ msgstr "" #: include/modele.inc.php:250 include/lib/user_menu.php:118 #: include/modele.inc.php:274 include/lib/user_menu.php:119 #: include/modele.inc.php:257 include/modele.inc.php:258 -#: include/modele.inc.php:258 include/lib/user_menu.php:119 +#: include/modele.inc.php:258 include/lib/user_menu.php:76 msgid "Modèles" msgstr "" #: include/user_menu.php:112 include/lib/user_menu.php:118 -#: include/lib/user_menu.php:119 include/lib/user_menu.php:119 +#: include/lib/user_menu.php:119 include/lib/user_menu.php:76 msgid "Gestion des modèles" msgstr "" #: include/user_menu.php:113 include/lib/user_menu.php:119 -#: include/lib/user_menu.php:120 include/lib/user_menu.php:120 +#: include/lib/user_menu.php:120 include/lib/user_menu.php:77 msgid "Restaure" msgstr "" #: include/user_menu.php:113 include/lib/user_menu.php:119 -#: include/lib/user_menu.php:120 include/lib/user_menu.php:120 +#: include/lib/user_menu.php:120 include/lib/user_menu.php:77 msgid "Restaure une base de données" msgstr "" #: include/user_menu.php:114 include/user_menu.php:121 #: include/lib/user_menu.php:121 include/lib/user_menu.php:130 #: include/lib/user_menu.php:122 include/lib/user_menu.php:141 -#: include/lib/user_menu.php:122 include/lib/user_menu.php:141 +#: include/lib/user_menu.php:79 include/lib/user_menu.php:98 msgid "Audit" msgstr "" #: include/user_menu.php:114 include/user_menu.php:121 #: include/lib/user_menu.php:121 include/lib/user_menu.php:130 #: include/lib/user_menu.php:122 include/lib/user_menu.php:141 -#: include/lib/user_menu.php:122 include/lib/user_menu.php:141 +#: include/lib/user_menu.php:79 include/lib/user_menu.php:98 msgid "Utilisateurs qui se sont connectés" msgstr "" #: include/user_menu.php:147 include/user_menu.php:151 #: include/lib/user_menu.php:160 include/lib/user_menu.php:173 -#: include/lib/user_menu.php:173 +#: include/lib/user_menu.php:131 msgid " Hors Bilan" msgstr "" #: include/user_menu.php:148 include/user_menu.php:152 #: include/lib/user_menu.php:161 include/lib/user_menu.php:174 -#: include/lib/user_menu.php:174 +#: include/lib/user_menu.php:132 msgid " Immobilisé" msgstr "" #: include/user_menu.php:149 include/user_menu.php:153 #: include/lib/user_menu.php:162 include/lib/user_menu.php:175 -#: include/lib/user_menu.php:175 +#: include/lib/user_menu.php:133 msgid "Actif a un an au plus" msgstr "" #: include/user_menu.php:150 include/user_menu.php:154 #: include/lib/user_menu.php:163 include/lib/user_menu.php:176 -#: include/lib/user_menu.php:176 +#: include/lib/user_menu.php:134 msgid "Stock et commande" msgstr "" #: include/user_menu.php:151 include/user_menu.php:155 #: include/lib/user_menu.php:164 include/lib/user_menu.php:177 -#: include/lib/user_menu.php:177 +#: include/lib/user_menu.php:135 msgid "Compte tiers" msgstr "" #: include/user_menu.php:153 include/user_menu.php:157 #: include/lib/user_menu.php:166 include/lib/user_menu.php:179 -#: include/lib/user_menu.php:179 +#: include/lib/user_menu.php:137 msgid "Charges" msgstr "" #: include/user_menu.php:154 include/user_menu.php:158 #: include/lib/user_menu.php:167 include/lib/user_menu.php:180 -#: include/lib/user_menu.php:180 +#: include/lib/user_menu.php:138 msgid "Produits" msgstr "" @@ -9726,7 +9777,7 @@ msgstr "" #: include/user_menu.php:159 include/user_menu.php:160 #: include/lib/user_menu.php:168 include/lib/user_menu.php:169 #: include/lib/user_menu.php:181 include/lib/user_menu.php:182 -#: include/lib/user_menu.php:181 include/lib/user_menu.php:182 +#: include/lib/user_menu.php:139 include/lib/user_menu.php:140 msgid "Hors Comptabilité" msgstr "" @@ -9888,7 +9939,7 @@ msgstr "" #: include/ajax/ajax_calendar_zoom.php:32 include/lib/html_input.class.php:992 #: include/template/dashboard.php:6 include/template/calendar-list.php:34 #: include/impress_rapport.inc.php:234 include/ajax/ajax_calendar_zoom.php:32 -#: include/lib/html_input.class.php:992 +#: include/lib/html_input.class.php:1007 msgid "Calendrier" msgstr "" @@ -9998,9 +10049,9 @@ msgstr "" #: include/class/acc_ledger_search.class.php:1093 #: include/class/fiche.class.php:1463 #: include/class/acc_ledger_search.class.php:1106 -#: include/class/fiche.class.php:1477 include/user.inc.php:147 -#: include/template/pcmn_update.php:42 include/template/menu_detail.php:51 -#: include/template/impress_cat_card.php:10 +#: include/class/fiche.class.php:1477 include/class/fiche.class.php:1478 +#: include/user.inc.php:147 include/template/pcmn_update.php:42 +#: include/template/menu_detail.php:51 include/template/impress_cat_card.php:10 #: include/template/detail-action.php:29 #: include/template/action_search_result.php:56 include/user_detail.inc.php:168 #: include/export/export_gl_csv.php:96 include/menu.inc.php:111 @@ -10099,6 +10150,7 @@ msgstr "" #: include/class/acc_ledger_purchase.class.php:1835 #: include/class/print_ledger_misc.class.php:47 #: include/class/acc_ledger_fin.class.php:550 +#: include/class/acc_ledger_history_generic.class.php:684 #: include/template/detail-action.php:245 #: include/template/form_ledger_fin.php:42 #: include/export/export_stock_histo_csv.php:44 @@ -10499,7 +10551,10 @@ msgstr "" #: include/class/anc_balance_double.class.php:276 #: include/class/anc_listing.class.php:115 #: include/class/anc_listing.class.php:117 -#: include/class/anc_listing.class.php:118 include/template/letter_prop.php:169 +#: include/class/anc_listing.class.php:118 +#: include/class/anc_balance_double.class.php:83 +#: include/class/anc_balance_double.class.php:278 +#: include/template/letter_prop.php:169 #: include/template/stock_summary_table.php:41 #: include/template/ledger_detail_ven.php:140 #: include/template/ledger_detail_ven.php:250 @@ -10910,17 +10965,19 @@ msgstr "" #: include/export/export_fiche_detail_csv.php:74 #: include/export/export_poste_detail_csv.php:81 #: include/export/export_poste_detail_csv.php:82 -#: include/template/param_jrn.php:14 +#: include/template/param_jrn.php:14 include/template/param_jrn.php:14 #: include/export/export_poste_detail_csv.php:82 #: include/export/export_fiche_detail_csv.php:74 msgid "Nom journal" msgstr "" #: include/template/param_jrn.php:15 include/template/param_jrn.php:22 +#: include/template/param_jrn.php:22 msgid "Postes utilisables journal (débit/crédit) " msgstr "" #: include/template/param_jrn.php:21 include/template/param_jrn.php:28 +#: include/template/param_jrn.php:28 msgid "" "Uniquement pour les journaux d'Opérations Diverses, les valeurs sont " "séparées par des espaces, on peut aussi\n" @@ -10928,6 +10985,7 @@ msgid "" msgstr "" #: include/template/param_jrn.php:33 include/template/param_jrn.php:40 +#: include/template/param_jrn.php:40 msgid "Numérotation de chaque opération" msgstr "" @@ -10935,6 +10993,7 @@ msgstr "" #: include/template/operation_detail_fin.php:31 #: include/template/ledger_detail_fin.php:35 #: include/compta_fin_saldo.inc.php:48 include/template/param_jrn.php:48 +#: include/template/param_jrn.php:48 #: include/template/operation_detail_fin.php:31 #: include/template/ledger_detail_fin.php:35 #: include/compta_fin_saldo.inc.php:48 @@ -10947,22 +11006,22 @@ msgid "" msgstr "" #: include/template/param_jrn.php:78 include/template/param_jrn.php:85 -#: include/template/param_jrn.php:6 +#: include/template/param_jrn.php:6 include/template/param_jrn.php:6 msgid "Type de journal" msgstr "" #: include/template/param_jrn.php:84 include/template/param_jrn.php:91 -#: include/template/param_jrn.php:93 +#: include/template/param_jrn.php:93 include/template/param_jrn.php:93 msgid "Préfixe code interne" msgstr "" #: include/template/param_jrn.php:88 include/template/param_jrn.php:95 -#: include/template/param_jrn.php:97 +#: include/template/param_jrn.php:97 include/template/param_jrn.php:97 msgid "Préfixe pièce justificative" msgstr "" #: include/template/param_jrn.php:94 include/lib/message_javascript.php:70 -#: include/lib/message_javascript.php:70 +#: include/lib/message_javascript.php:72 msgid "" "Le préfixe des pièces doit être différent pour chaque journal, on peut aussi " "utiliser l'année" @@ -10974,11 +11033,13 @@ msgstr "" #: include/template/param_jrn.php:102 include/template/param_jrn.php:99 #: include/template/param_jrn.php:106 include/template/param_jrn.php:108 +#: include/template/param_jrn.php:108 msgid "Dernière pièce numérotée" msgstr "" #: include/template/param_jrn.php:110 include/template/param_jrn.php:108 #: include/template/param_jrn.php:115 include/template/param_jrn.php:117 +#: include/template/param_jrn.php:117 msgid "N° pièce justificative" msgstr "" @@ -10987,7 +11048,7 @@ msgid "La numérotation est propre à chaque journal" msgstr "" #: include/template/param_jrn.php:118 include/lib/message_javascript.php:71 -#: include/lib/message_javascript.php:71 +#: include/lib/message_javascript.php:73 msgid "Laissez à 0 pour ne pas changer le numéro" msgstr "" @@ -11245,7 +11306,7 @@ msgstr "" #: include/class/acc_ledger.class.php:88 include/class/periode.class.php:235 #: include/lib/http_input.class.php:121 include/class/acc_ledger.class.php:89 #: include/lib/http_input.class.php:123 include/class/acc_ledger.class.php:89 -#: include/class/periode.class.php:235 include/lib/http_input.class.php:123 +#: include/class/periode.class.php:237 include/lib/http_input.class.php:123 msgid "Paramètre invalide" msgstr "" @@ -11406,14 +11467,14 @@ msgstr "" #: include/template/periode_add_exercice.php:25 #: include/ajax/ajax_preference.php:131 include/class/periode.class.php:519 #: include/class/periode_ledger_table.class.php:100 -#: include/template/stock_inv.php:126 +#: include/template/stock_inv.php:126 include/ajax/ajax_preference.php:142 #: include/template/periode_add_exercice.php:25 #: include/template/stock_state_search.php:35 #: include/template/stock_inv.php:126 include/impress_rapport.inc.php:207 #: include/impress_jrn.inc.php:102 include/compta_fin_saldo.inc.php:43 #: include/ajax/ajax_preference.php:142 #: include/class/periode_ledger_table.class.php:100 -#: include/class/periode.class.php:519 include/bank.inc.php:72 +#: include/class/periode.class.php:521 include/bank.inc.php:72 #: include/impress_bilan.inc.php:49 msgid "Exercice" msgstr "" @@ -11458,7 +11519,7 @@ msgstr "" #: include/ext/tva/class_ext_tvagen.php:114 #: include/ext/tva/ext_list_assujetti.class.php:54 #: include/ext/tva/ext_tvagen.class.php:114 -#: include/lib/message_javascript.php:94 +#: include/lib/message_javascript.php:94 include/lib/message_javascript.php:96 msgid "Afficher" msgstr "" @@ -11812,6 +11873,7 @@ msgstr "" #: include/ext/amortis/include/class_am_card.php:245 html/fid_card.php:169 #: html/fid_card.php:170 html/fid_card.php:175 html/fid_card.php:174 +#: html/fid_card.php:174 msgid "Non trouvé" msgstr "" @@ -11933,9 +11995,12 @@ msgstr "" #: include/class/fiche.class.php:2191 include/fiche.inc.php:297 #: include/fiche.inc.php:333 include/class/fiche.class.php:1619 #: include/class/fiche.class.php:2214 include/anc_pa.inc.php:123 -#: html/popup.php:113 include/balance_card_ageing.inc.php:53 #: include/fiche.inc.php:242 include/fiche.inc.php:302 -#: include/fiche.inc.php:340 include/class/acc_account_ledger.class.php:735 +#: include/fiche.inc.php:340 include/class/fiche.class.php:1620 +#: include/class/fiche.class.php:2215 html/popup.php:113 +#: include/balance_card_ageing.inc.php:53 include/fiche.inc.php:242 +#: include/fiche.inc.php:302 include/fiche.inc.php:340 +#: include/class/acc_account_ledger.class.php:735 #: include/class/fiche.class.php:1620 include/class/fiche.class.php:2215 #: include/anc_pa.inc.php:123 msgid "Export CSV" @@ -12041,6 +12106,7 @@ msgstr "" #: include/class/acc_account_ledger.class.php:394 #: include/class/acc_ledger_history_generic.class.php:768 #: include/export/export_ledger_csv.php:211 +#: include/class/acc_ledger_history_generic.class.php:769 #: include/export/export_poste_detail_csv.php:83 #: include/export/export_poste_detail_csv.php:196 #: include/export/export_ledger_csv.php:211 @@ -12798,6 +12864,7 @@ msgstr "" #: include/ext/import_card/include/template/test_file.php:42 #: include/ext/import_doli/include/template/test_file.php:30 #: include/ajax/ajax_preference.php:213 include/ajax/ajax_preference.php:224 +#: include/ajax/ajax_preference.php:224 msgid "Encodage" msgstr "" @@ -13046,7 +13113,7 @@ msgid "Vous n\\'êtes pas administrateur" msgstr "" #: html/fid_card.php:164 html/fid_card.php:165 html/fid_card.php:170 -#: html/fid_card.php:169 +#: html/fid_card.php:169 html/fid_card.php:169 #, php-format msgid "Résultat limité à 12" msgstr "" @@ -13079,7 +13146,8 @@ msgstr "" #: include/class/fiche.class.php:1584 include/class/fiche.class.php:2211 #: html/popup.php:114 include/class/fiche.class.php:1586 #: include/class/fiche.class.php:2213 include/class/fiche.class.php:1604 -#: include/class/fiche.class.php:2236 html/popup.php:114 +#: include/class/fiche.class.php:2236 include/class/fiche.class.php:1605 +#: include/class/fiche.class.php:2237 html/popup.php:114 #: include/class/acc_account_ledger.class.php:757 #: include/class/fiche.class.php:1605 include/class/fiche.class.php:2237 msgid "Export PDF" @@ -13168,7 +13236,8 @@ msgstr "" #: include/template/ledger_detail_bottom.php:286 include/lib/ac_common.php:1221 #: include/lib/ac_common.php:1223 include/template/ledger_detail_bottom.php:287 #: include/lib/ac_common.php:1247 include/template/ledger_detail_bottom.php:287 -#: include/export/export_fiche_detail_csv.php:60 include/lib/ac_common.php:1247 +#: include/export/export_fiche_detail_csv.php:60 +#: include/lib/message_javascript.php:102 include/lib/ac_common.php:1247 msgid "Aucune donnée" msgstr "" @@ -13995,6 +14064,8 @@ msgstr "" #: include/class/fiche.class.php:1461 #: include/class/acc_ledger_search.class.php:650 #: include/class/fiche.class.php:1475 +#: include/class/acc_ledger_history_generic.class.php:683 +#: include/class/fiche.class.php:1476 #: include/template/operation_detail_fin.php:32 #: include/template/acc_ledger_history_financial_oneline.php:34 #: include/template/ledger_detail_fin.php:45 @@ -14899,7 +14970,7 @@ msgstr "" #: include/export/export_balance_pdf.php:128 #: include/export/export_balance_pdf.php:125 #: include/export/export_poste_detail_csv.php:39 -#: include/export/export_balance_pdf.php:125 +#: include/export/export_balance_pdf.php:126 msgid "poste" msgstr "" @@ -14968,7 +15039,7 @@ msgstr "" #: include/lib/html_input.class.php:1017 include/lib/html_input.class.php:1018 #: include/class/acc_ledger_search.class.php:112 #: include/class/acc_ledger_search.class.php:112 -#: include/lib/html_input.class.php:1018 +#: include/lib/html_input.class.php:1033 msgid "choix des journaux" msgstr "" @@ -15024,8 +15095,9 @@ msgstr "" #: include/anc_great_ledger.inc.php:47 include/anc_balance_double.inc.php:27 #: include/anc_balance_simple.inc.php:27 include/anc_great_ledger.inc.php:78 #: include/anc_history.inc.php:34 include/anc_history.inc.php:37 -#: include/anc_great_ledger.inc.php:78 include/anc_balance_simple.inc.php:27 -#: include/anc_balance_double.inc.php:26 include/anc_history.inc.php:37 +#: include/anc_balance_double.inc.php:26 include/anc_great_ledger.inc.php:78 +#: include/anc_balance_simple.inc.php:27 include/anc_balance_double.inc.php:26 +#: include/anc_history.inc.php:37 msgid "Aucune donnée trouvée" msgstr "" @@ -15688,6 +15760,7 @@ msgstr "" #: include/class/document_export.class.php:225 #: include/class/document_export.class.php:231 #: include/class/document_export.class.php:232 +#: include/class/document_export.class.php:232 msgid " ne peut pas convertir en PDF" msgstr "" @@ -15701,6 +15774,7 @@ msgstr "" #: include/class/document_export.class.php:280 #: include/class/document_export.class.php:290 #: include/class/document_export.class.php:291 +#: include/class/document_export.class.php:291 msgid "CONVERT_GIF_PDF n'est pas installé" msgstr "" @@ -15714,6 +15788,7 @@ msgstr "" #: include/class/document_export.class.php:281 #: include/class/document_export.class.php:291 #: include/class/document_export.class.php:292 +#: include/class/document_export.class.php:292 msgid "TKPDF n'est pas installé" msgstr "" @@ -15913,25 +15988,25 @@ msgstr "" #: include/ajax_mod_periode.php:55 include/ajax/ajax_mod_periode.php:55 #: include/ajax/ajax_periode.php:171 include/class/periode.class.php:702 -#: include/ajax/ajax_periode.php:171 include/class/periode.class.php:702 +#: include/ajax/ajax_periode.php:171 include/class/periode.class.php:704 msgid " Début période : " msgstr "" #: include/ajax_mod_periode.php:56 include/ajax/ajax_mod_periode.php:56 #: include/ajax/ajax_periode.php:172 include/class/periode.class.php:703 -#: include/ajax/ajax_periode.php:172 include/class/periode.class.php:703 +#: include/ajax/ajax_periode.php:172 include/class/periode.class.php:705 msgid " Fin période : " msgstr "" #: include/ajax_mod_periode.php:57 include/ajax/ajax_mod_periode.php:57 #: include/ajax/ajax_periode.php:173 include/class/periode.class.php:704 -#: include/ajax/ajax_periode.php:173 include/class/periode.class.php:704 +#: include/ajax/ajax_periode.php:173 include/class/periode.class.php:706 msgid " Exercice : " msgstr "" #: include/ajax_mod_periode.php:59 include/ajax/ajax_mod_periode.php:59 #: include/ajax/ajax_periode.php:175 include/class/periode.class.php:706 -#: include/ajax/ajax_periode.php:175 include/class/periode.class.php:706 +#: include/ajax/ajax_periode.php:175 include/class/periode.class.php:708 msgid "sauver" msgstr "" @@ -16351,7 +16426,7 @@ msgstr "" #: include/lib/class_html_input.php:934 include/lib/class_html_input.php:945 #: include/lib/class_html_input.php:946 include/lib/class_html_input.php:972 #: include/lib/html_input.class.php:1025 include/lib/html_input.class.php:1083 -#: include/lib/html_input.class.php:1084 include/lib/html_input.class.php:1084 +#: include/lib/html_input.class.php:1084 include/lib/html_input.class.php:1099 #, php-format msgid "Voulez-vous effacer cette relation " msgstr "" @@ -16362,7 +16437,7 @@ msgstr "" #: include/lib/class_html_input.php:946 include/lib/class_html_input.php:957 #: include/lib/class_html_input.php:958 include/lib/class_html_input.php:984 #: include/lib/html_input.class.php:1037 include/lib/html_input.class.php:1095 -#: include/lib/html_input.class.php:1096 include/lib/html_input.class.php:1096 +#: include/lib/html_input.class.php:1096 include/lib/html_input.class.php:1111 msgid "Ajout autres" msgstr "" @@ -16438,6 +16513,7 @@ msgstr "" #: include/fiche.inc.php:290 include/fiche.inc.php:363 #: include/fiche.inc.php:366 include/fiche.inc.php:367 #: include/fiche.inc.php:368 include/fiche.inc.php:375 +#: include/fiche.inc.php:375 msgid "Cette catégorie n'ayant pas de poste comptable n'a pas de balance" msgstr "" @@ -17778,7 +17854,7 @@ msgstr "" #: include/class/periode_ledger_table.class.php:98 #: include/ajax/ajax_display_letter.php:103 #: include/class/periode_ledger_table.class.php:98 -#: include/class/periode.class.php:517 +#: include/class/periode.class.php:519 msgid "Date Début" msgstr "" @@ -17824,7 +17900,7 @@ msgstr "" #: include/class/class_fiche.php:1231 include/class/class_fiche.php:1234 #: include/class/fiche.class.php:1378 include/class/fiche.class.php:1379 #: include/class/fiche.class.php:1381 include/class/fiche.class.php:1395 -#: include/class/fiche.class.php:1396 +#: include/class/fiche.class.php:1396 include/class/fiche.class.php:1396 msgid "n° de pièce / Code interne" msgstr "" @@ -17833,7 +17909,7 @@ msgstr "" #: include/class/class_fiche.php:1235 include/class/class_fiche.php:1238 #: include/class/fiche.class.php:1382 include/class/fiche.class.php:1383 #: include/class/fiche.class.php:1385 include/class/fiche.class.php:1399 -#: include/class/fiche.class.php:1400 +#: include/class/fiche.class.php:1400 include/class/fiche.class.php:1400 msgid "Débit/Crédit" msgstr "" @@ -17847,7 +17923,8 @@ msgstr "" #: include/class/fiche.class.php:1407 include/class/fiche.class.php:1536 #: include/fiche.inc.php:590 include/class/fiche.class.php:1421 #: include/class/fiche.class.php:1552 include/fiche.inc.php:599 -#: include/class/acc_account_ledger.class.php:475 +#: include/class/fiche.class.php:1422 include/class/fiche.class.php:1553 +#: include/fiche.inc.php:599 include/class/acc_account_ledger.class.php:475 #: include/class/fiche.class.php:1422 include/class/fiche.class.php:1553 msgid "solde débiteur" msgstr "" @@ -17861,6 +17938,7 @@ msgstr "" #: include/class/fiche.class.php:1405 include/class/fiche.class.php:1534 #: include/class/fiche.class.php:1407 include/class/fiche.class.php:1536 #: include/class/fiche.class.php:1421 include/class/fiche.class.php:1552 +#: include/class/fiche.class.php:1422 include/class/fiche.class.php:1553 #: include/class/acc_account_ledger.class.php:475 #: include/class/fiche.class.php:1422 include/class/fiche.class.php:1553 msgid "solde créditeur" @@ -18112,30 +18190,31 @@ msgstr "" #: html/ajax_misc.php:179 html/ajax_misc.php:257 html/ajax_misc.php:262 #: html/ajax_misc.php:290 html/ajax_misc.php:382 html/ajax_misc.php:384 #: html/ajax_misc.php:390 include/lib/message_javascript.php:90 +#: html/ajax_misc.php:390 include/lib/message_javascript.php:92 msgid "Action non autorisée" msgstr "" #: html/ajax_misc.php:196 html/ajax_misc.php:274 html/ajax_misc.php:279 #: html/ajax_misc.php:307 html/ajax_misc.php:399 html/ajax_misc.php:401 -#: html/ajax_misc.php:407 +#: html/ajax_misc.php:407 html/ajax_misc.php:407 msgid "Des actions dépendent de cette catégorie" msgstr "" #: html/do.php:196 html/do.php:224 html/do.php:237 html/do.php:239 #: html/do.php:236 html/do.php:273 html/do.php:285 html/do.php:295 -#: html/do.php:264 +#: html/do.php:264 html/do.php:264 msgid "Erreur menu" msgstr "" #: html/do.php:210 html/do.php:211 html/do.php:239 html/do.php:252 #: html/do.php:254 html/do.php:251 html/do.php:288 html/do.php:300 -#: html/do.php:310 html/do.php:279 +#: html/do.php:310 html/do.php:279 html/do.php:279 msgid "Accès menu impossible" msgstr "" #: html/do.php:219 html/do.php:224 html/do.php:252 html/do.php:265 #: html/do.php:268 html/do.php:270 html/do.php:307 html/do.php:319 -#: html/do.php:329 html/do.php:331 html/do.php:300 +#: html/do.php:329 html/do.php:331 html/do.php:300 html/do.php:300 msgid "Aucun profil utilisateur" msgstr "" @@ -18238,7 +18317,7 @@ msgstr "" #: include/ajax_mod_periode.php:60 include/ajax_mod_periode.php:78 #: include/ajax/ajax_mod_periode.php:60 include/ajax/ajax_mod_periode.php:78 #: include/ajax/ajax_periode.php:176 include/class/periode.class.php:707 -#: include/ajax/ajax_periode.php:176 include/class/periode.class.php:707 +#: include/ajax/ajax_periode.php:176 include/class/periode.class.php:709 msgid "fermer" msgstr "" @@ -18311,7 +18390,7 @@ msgstr "" #: include/template/action_display_short.php:81 #: include/lib/html_input.class.php:1103 include/lib/html_input.class.php:1104 #: include/template/action_display_short.php:81 -#: include/lib/html_input.class.php:1104 +#: include/lib/html_input.class.php:1119 msgid "Nouvel événement" msgstr "" @@ -18626,7 +18705,7 @@ msgstr "" #: include/lib/class_database.php:421 include/lib/class_database.php:422 #: include/lib/class_database.php:429 include/lib/class_database.php:434 #: include/lib/database.class.php:433 include/lib/database.class.php:442 -#: include/lib/database.class.php:443 include/lib/database.class.php:443 +#: include/lib/database.class.php:443 include/class/database.class.php:125 msgid "Base de donnée vide" msgstr "" @@ -18667,6 +18746,7 @@ msgstr "" #: include/class/class_fiche.php:1024 include/class/class_fiche.php:1027 #: include/class/fiche.class.php:1117 include/class/fiche.class.php:1119 #: include/class/fiche.class.php:1133 include/class/fiche.class.php:1134 +#: include/class/fiche.class.php:1134 msgid "Impossible cette fiche est utilisée dans un journal" msgstr "" @@ -18767,13 +18847,13 @@ msgstr "" #: html/ajax_misc.php:571 html/ajax_misc.php:613 html/ajax_misc.php:408 #: html/ajax_misc.php:434 html/ajax_misc.php:546 html/ajax_misc.php:548 -#: html/ajax_misc.php:554 +#: html/ajax_misc.php:554 html/ajax_misc.php:554 msgid "Ce plugin n'existe pas " msgstr "" #: html/ajax_misc.php:572 html/ajax_misc.php:614 html/ajax_misc.php:409 #: html/ajax_misc.php:435 html/ajax_misc.php:547 html/ajax_misc.php:549 -#: html/ajax_misc.php:555 +#: html/ajax_misc.php:555 html/ajax_misc.php:555 msgid "Il y a une erreur, ce plugin n'existe pas" msgstr "" @@ -19876,10 +19956,10 @@ msgstr "" #: include/upgrade-plugin.php:25 include/upgrade-template.php:25 #: include/ajax/ajax_remove_submenu.php:27 #: include/ajax/ajax_user_security.php:39 html/ajax_misc.php:86 -#: include/upgrade.inc.php:27 include/admin_repo.inc.php:24 -#: include/admin_repo.inc.php:25 include/export/export_document.php:26 -#: include/export/export_receipt.php:24 include/backup.inc.php:22 -#: include/ajax/ajax_user_security.php:39 +#: html/ajax_misc.php:86 include/upgrade.inc.php:27 +#: include/admin_repo.inc.php:24 include/admin_repo.inc.php:25 +#: include/export/export_document.php:26 include/export/export_receipt.php:24 +#: include/backup.inc.php:22 include/ajax/ajax_user_security.php:39 #: include/ajax/ajax_remove_submenu.php:27 include/upgrade-template.php:25 #: include/upgrade-core.php:23 include/impress_poste.inc.php:20 #: include/upgrade-plugin.php:25 @@ -19927,7 +20007,7 @@ msgstr "" #: html/install.php:235 include/upgrade-plugin.php:113 #: include/lib/user_menu.php:121 html/install.php:238 #: include/upgrade-plugin.php:125 html/install.php:238 -#: include/lib/user_menu.php:121 include/upgrade-plugin.php:125 +#: include/lib/user_menu.php:78 include/upgrade-plugin.php:125 msgid "Installation" msgstr "" @@ -20095,8 +20175,8 @@ msgid "Mise à jour du système et des bases de données" msgstr "" #: include/lib/user_menu.php:122 include/lib/user_menu.php:123 -#: include/lib/user_menu.php:142 include/lib/user_menu.php:123 -#: include/lib/user_menu.php:142 +#: include/lib/user_menu.php:142 include/lib/user_menu.php:80 +#: include/lib/user_menu.php:99 msgid "Information système" msgstr "" @@ -20146,7 +20226,9 @@ msgstr "" #: html/ajax_misc.php:456 include/class/pre_operation.class.php:289 #: include/class/acc_ledger.class.php:2185 #: include/class/anc_listing.class.php:76 include/class/fiche.class.php:2246 -#: html/user_login.php:158 html/ajax_misc.php:462 include/user.inc.php:138 +#: html/user_login.php:158 html/ajax_misc.php:462 +#: include/class/fiche.class.php:2247 html/user_login.php:158 +#: html/ajax_misc.php:462 include/user.inc.php:138 #: include/template/todo_list_list_user.php:31 #: include/template/anc_key_display_list.php:28 #: include/template/tag_search_select.php:12 include/template/tag_select.php:16 @@ -20202,6 +20284,7 @@ msgstr "" #: include/ext/importbank/include/template/show_transfer.php:176 #: include/ext/importbank/include/template/show_field.php:48 #: include/ajax/ajax_preference.php:181 include/ajax/ajax_preference.php:192 +#: include/ajax/ajax_preference.php:192 msgid "Séparateur de champs" msgstr "" @@ -20570,18 +20653,18 @@ msgid "" "TVA, ND, ...
    " msgstr "" -#: include/lib/message_javascript.php:64 include/lib/message_javascript.php:64 +#: include/lib/message_javascript.php:64 include/lib/message_javascript.php:66 msgid "" "le type vaut :
      \t
    • ME pour Menu
      • \t
    • PR pour les impressions \t
    • PL pour les plugins
      • \t
    • SP pour des valeurs spéciales
      • " "\t
    " msgstr "" -#: include/lib/message_javascript.php:65 include/lib/message_javascript.php:65 +#: include/lib/message_javascript.php:65 include/lib/message_javascript.php:67 msgid "Cliquez sur le code AD pour ouvrir le menu dans un nouvel onglet" msgstr "" -#: include/lib/message_javascript.php:66 include/lib/message_javascript.php:66 +#: include/lib/message_javascript.php:66 include/lib/message_javascript.php:68 msgid "Cliquez sur le chemin pour ouvrir le menu" msgstr "" @@ -20591,7 +20674,7 @@ msgid "" "type ACH et VEN seront utilisés ,vous excluez d\\'office les autres journaux" msgstr "" -#: include/lib/message_javascript.php:69 include/lib/message_javascript.php:69 +#: include/lib/message_javascript.php:69 include/lib/message_javascript.php:71 msgid "" "La numérotation est propre à chaque journal. Laissez à 0 pour ne pas changer " "le numéro" @@ -20615,7 +20698,7 @@ msgid "" "mettez 'Afficher la période comptable' à non" msgstr "" -#: include/lib/message_javascript.php:63 include/lib/message_javascript.php:63 +#: include/lib/message_javascript.php:63 msgid "" "

    Remarque : choix possibles

    • Détail opérations ne donne pas le même résultat si " @@ -20628,7 +20711,7 @@ msgid "" "ND, ...
    " msgstr "" -#: include/lib/message_javascript.php:67 include/lib/message_javascript.php:67 +#: include/lib/message_javascript.php:67 include/lib/message_javascript.php:69 msgid "" "En utilisant les dates d échéance ou de paiement, seuls les journaux de type " "ACH et VEN seront utilisés ,vous excluez d office les autres journaux" @@ -20816,7 +20899,8 @@ msgid "credit" msgstr "" #: include/export/export_fiche_balance_csv.php:57 include/fiche.inc.php:587 -#: include/export/export_fiche_balance_csv.php:57 include/fiche.inc.php:596 +#: include/fiche.inc.php:596 include/export/export_fiche_balance_csv.php:57 +#: include/fiche.inc.php:596 msgid "solde" msgstr "" @@ -20863,6 +20947,7 @@ msgstr "" #: include/class/acc_ledger_history_sale.class.php:232 #: include/class/acc_ledger_history_purchase.class.php:239 #: include/class/acc_ledger_history_sale.class.php:233 +#: include/class/acc_ledger_history_generic.class.php:759 #: include/export/export_ledger_csv.php:46 #: include/class/acc_ledger_history_generic.class.php:759 #: include/class/acc_ledger_history_purchase.class.php:239 @@ -20887,6 +20972,7 @@ msgstr "" #: include/export/export_ledger_csv.php:208 #: include/class/acc_ledger_history_purchase.class.php:250 #: include/class/acc_ledger_history_sale.class.php:244 +#: include/class/acc_ledger_history_generic.class.php:764 #: include/export/export_ledger_csv.php:208 #: include/class/acc_ledger_history_generic.class.php:764 #: include/class/acc_ledger_history_purchase.class.php:250 @@ -20902,6 +20988,7 @@ msgstr "" #: include/export/export_ledger_csv.php:216 #: include/class/acc_ledger_history_generic.class.php:764 #: include/export/export_ledger_csv.php:210 +#: include/class/acc_ledger_history_generic.class.php:765 #: include/export/export_ledger_csv.php:210 #: include/class/acc_ledger_history_generic.class.php:765 msgid "N° Pièce" @@ -20924,6 +21011,7 @@ msgstr "" #: include/export/export_ledger_csv.php:220 #: include/class/acc_ledger_history_generic.class.php:681 #: include/export/export_ledger_csv.php:214 +#: include/class/acc_ledger_history_generic.class.php:682 #: include/export/export_ledger_csv.php:214 #: include/class/acc_ledger_history_generic.class.php:682 #: include/class/acc_reconciliation.class.php:484 @@ -21227,12 +21315,12 @@ msgid "Dépendant" msgstr "" #: include/template/param_jrn.php:136 include/template/param_jrn.php:143 -#: include/template/param_jrn.php:145 +#: include/template/param_jrn.php:145 include/template/param_jrn.php:145 msgid "Services, fournitures ou biens achetés (D)" msgstr "" #: include/template/param_jrn.php:139 include/template/param_jrn.php:146 -#: include/template/param_jrn.php:148 +#: include/template/param_jrn.php:148 include/template/param_jrn.php:148 msgid "Fournisseurs (C)" msgstr "" @@ -21245,7 +21333,7 @@ msgid "Services, fournitures ou biens vendus (D)" msgstr "" #: include/template/param_jrn.php:251 include/template/param_jrn.php:258 -#: include/template/param_jrn.php:260 +#: include/template/param_jrn.php:260 include/template/param_jrn.php:260 msgid "Fiches utilisables (D/C)" msgstr "" @@ -21414,6 +21502,7 @@ msgstr "" #: include/class/document_export.class.php:283 #: include/class/document_export.class.php:293 #: include/class/document_export.class.php:294 +#: include/class/document_export.class.php:294 msgid "PS2PDF non installé" msgstr "" @@ -21423,6 +21512,7 @@ msgstr "" #: include/class/document_export.class.php:284 #: include/class/document_export.class.php:294 #: include/class/document_export.class.php:295 +#: include/class/document_export.class.php:295 msgid "PDF2PS non installé" msgstr "" @@ -21575,14 +21665,14 @@ msgstr "" #: include/lib/class_sendmail.php:96 include/lib/class_sendmail.php:97 #: include/lib/class_sendmail.php:98 include/lib/sendmail.class.php:98 -#: include/lib/sendmail.class.php:102 include/lib/sendmail.class.php:102 +#: include/lib/sendmail.class.php:102 include/lib/sendmail_core.class.php:105 #, php-format msgid "%s est vide" msgstr "" #: include/lib/class_sendmail.php:152 include/lib/class_sendmail.php:153 #: include/lib/class_sendmail.php:155 include/lib/sendmail.class.php:157 -#: include/lib/sendmail.class.php:161 include/lib/sendmail.class.php:161 +#: include/lib/sendmail.class.php:161 include/class/sendmail.class.php:38 msgid "Email non envoyé" msgstr "" @@ -21758,7 +21848,7 @@ msgstr "" #: include/balance.inc.php:440 include/export/export_balance_pdf.php:309 #: include/balance.inc.php:458 include/export/export_balance_pdf.php:334 #: include/export/export_balance_pdf.php:329 -#: include/export/export_balance_pdf.php:329 include/balance.inc.php:458 +#: include/export/export_balance_pdf.php:330 include/balance.inc.php:458 msgid "Résumé Exercice précédent" msgstr "" @@ -21766,7 +21856,7 @@ msgstr "" #: include/balance.inc.php:447 include/export/export_balance_pdf.php:316 #: include/balance.inc.php:465 include/export/export_balance_pdf.php:341 #: include/export/export_balance_pdf.php:336 -#: include/export/export_balance_pdf.php:336 include/balance.inc.php:465 +#: include/export/export_balance_pdf.php:337 include/balance.inc.php:465 msgid "Résumé Exercice courant" msgstr "" @@ -21871,6 +21961,7 @@ msgstr "" #: include/class/document_export.class.php:247 #: include/class/document_export.class.php:254 #: include/class/document_export.class.php:255 +#: include/class/document_export.class.php:255 msgid "Echec Ajout detail " msgstr "" @@ -22189,12 +22280,12 @@ msgid "delta" msgstr "" #: include/template/param_jrn.php:194 include/template/param_jrn.php:201 -#: include/template/param_jrn.php:203 +#: include/template/param_jrn.php:203 include/template/param_jrn.php:203 msgid "Clients (D)" msgstr "" #: include/template/param_jrn.php:197 include/template/param_jrn.php:204 -#: include/template/param_jrn.php:206 +#: include/template/param_jrn.php:206 include/template/param_jrn.php:206 msgid "Services, fournitures ou biens vendus (C)" msgstr "" @@ -22208,7 +22299,7 @@ msgid "Unknown type" msgstr "" #: include/lib/icard.class.php:222 include/lib/icard.class.php:223 -#: include/lib/icard.class.php:224 +#: include/lib/icard.class.php:224 include/lib/icard.class.php:224 msgid "Le nom d une icard doit être donne" msgstr "" @@ -22232,7 +22323,7 @@ msgstr "" msgid "Invalide value" msgstr "" -#: include/lib/message_javascript.php:72 include/lib/message_javascript.php:72 +#: include/lib/message_javascript.php:72 include/lib/message_javascript.php:74 msgid "Mettez le pourcentage
    à zéro pour effacer la ligne" msgstr "" @@ -22260,7 +22351,7 @@ msgstr "" #: include/export/export_balance_pdf.php:123 #: include/export/export_balance_pdf.php:127 #: include/export/export_balance_pdf.php:124 -#: include/export/export_balance_pdf.php:124 +#: include/export/export_balance_pdf.php:125 msgid "Balance comptable" msgstr "" @@ -22553,6 +22644,8 @@ msgstr "" #: include/class/fiche.class.php:818 include/class/fiche.class.php:848 #: include/class/fiche.class.php:849 include/class/fiche.class.php:995 #: include/class/fiche.class.php:996 include/class/fiche.class.php:1036 +#: include/class/fiche.class.php:850 include/class/fiche.class.php:997 +#: include/class/fiche.class.php:1037 #: include/class/acc_plan_mtable.class.php:170 #: include/class/fiche.class.php:819 include/class/fiche.class.php:849 #: include/class/fiche.class.php:850 include/class/fiche.class.php:996 @@ -22582,12 +22675,14 @@ msgstr "" #: include/class/anc_balance_double.class.php:351 #: include/class/anc_balance_double.class.php:352 #: include/class/anc_balance_double.class.php:354 +#: include/class/anc_balance_double.class.php:354 msgid "Entre le poste " msgstr "" #: include/class/anc_balance_double.class.php:356 #: include/class/anc_balance_double.class.php:357 #: include/class/anc_balance_double.class.php:359 +#: include/class/anc_balance_double.class.php:359 msgid " et le poste " msgstr "" @@ -22610,11 +22705,13 @@ msgstr "" #: include/class/fiche.class.php:838 include/class/fiche.class.php:840 #: include/class/fiche.class.php:843 include/class/fiche.class.php:844 +#: include/class/fiche.class.php:844 msgid "Désolé, il y a trop de virgule dans le poste comptable " msgstr "" #: include/class/fiche.class.php:1047 include/class/fiche.class.php:1049 #: include/class/fiche.class.php:1063 include/class/fiche.class.php:1064 +#: include/class/fiche.class.php:1064 msgid "opération annulée" msgstr "" @@ -22625,14 +22722,16 @@ msgid "Vous n'avez encore sauvé aucun modèle" msgstr "" #: html/ajax_misc.php:288 html/ajax_misc.php:290 html/ajax_misc.php:296 +#: html/ajax_misc.php:296 msgid "Invalide type" msgstr "" #: html/ajax_misc.php:452 html/ajax_misc.php:454 html/ajax_misc.php:460 +#: html/ajax_misc.php:460 msgid "Choisissez la TVA" msgstr "" -#: html/do.php:193 html/do.php:203 html/do.php:172 +#: html/do.php:193 html/do.php:203 html/do.php:172 html/do.php:172 msgid "cliquez ici pour mettre à jour " msgstr "" @@ -22696,7 +22795,7 @@ msgstr "" #: include/balance.inc.php:314 include/export/export_balance_pdf.php:135 #: include/class/acc_operation.class.php:727 #: include/export/export_balance_pdf.php:132 -#: include/export/export_balance_pdf.php:132 include/balance.inc.php:314 +#: include/export/export_balance_pdf.php:133 include/balance.inc.php:314 #: include/class/acc_operation.class.php:727 msgid "Ouverture" msgstr "" @@ -22790,7 +22889,7 @@ msgid "Ajout exercice" msgstr "" #: include/periode.inc.php:113 include/class/periode.class.php:687 -#: include/periode.inc.php:113 include/class/periode.class.php:687 +#: include/periode.inc.php:113 include/class/periode.class.php:689 msgid "Ajout période" msgstr "" @@ -22898,6 +22997,7 @@ msgid "Date création" msgstr "" #: include/template/param_jrn.php:125 include/template/param_jrn.php:127 +#: include/template/param_jrn.php:127 msgid "Journal actif" msgstr "" @@ -23044,15 +23144,15 @@ msgstr "" msgid "Cliquez pour éditer" msgstr "" -#: include/lib/message_javascript.php:74 include/lib/message_javascript.php:74 +#: include/lib/message_javascript.php:74 include/lib/message_javascript.php:76 msgid "Autoliquidation : Utilisé en même temps au crédit et au débit" msgstr "" -#: include/lib/message_javascript.php:75 include/lib/message_javascript.php:75 +#: include/lib/message_javascript.php:75 include/lib/message_javascript.php:77 msgid "Ne donner pas ce poste comptable si ce code n'est pas utilisé à l'achat" msgstr "" -#: include/lib/message_javascript.php:76 include/lib/message_javascript.php:76 +#: include/lib/message_javascript.php:76 include/lib/message_javascript.php:78 msgid "" "Ne donner pas ce poste comptable si ce code n'est pas utilisé à la vente" msgstr "" @@ -23062,7 +23162,7 @@ msgstr "" msgid "Encodage invalide" msgstr "" -#: include/lib/user_menu.php:121 include/lib/user_menu.php:121 +#: include/lib/user_menu.php:121 include/lib/user_menu.php:78 msgid "Installation Mise à jour du système et des bases de données" msgstr "" @@ -23094,35 +23194,43 @@ msgid "Invalid command" msgstr "" #: include/ajax/ajax_preference.php:169 include/ajax/ajax_preference.php:180 +#: include/ajax/ajax_preference.php:180 msgid "Format Export CSV" msgstr "" #: include/ajax/ajax_preference.php:174 include/ajax/ajax_preference.php:185 +#: include/ajax/ajax_preference.php:185 msgid "N'utilisez pas le même séparateur pour les champs et les décimales" msgstr "" #: include/ajax/ajax_preference.php:187 include/ajax/ajax_preference.php:198 +#: include/ajax/ajax_preference.php:198 msgid "Point-virgule" msgstr "" #: include/ajax/ajax_preference.php:188 include/ajax/ajax_preference.php:204 #: include/ajax/ajax_preference.php:199 include/ajax/ajax_preference.php:215 +#: include/ajax/ajax_preference.php:199 include/ajax/ajax_preference.php:215 msgid "virgule" msgstr "" #: include/ajax/ajax_preference.php:197 include/ajax/ajax_preference.php:208 +#: include/ajax/ajax_preference.php:208 msgid "Séparateur Décimale" msgstr "" #: include/ajax/ajax_preference.php:203 include/ajax/ajax_preference.php:214 +#: include/ajax/ajax_preference.php:214 msgid "point" msgstr "" #: include/ajax/ajax_preference.php:219 include/ajax/ajax_preference.php:230 +#: include/ajax/ajax_preference.php:230 msgid "utf8" msgstr "" #: include/ajax/ajax_preference.php:220 include/ajax/ajax_preference.php:231 +#: include/ajax/ajax_preference.php:231 msgid "latin1" msgstr "" @@ -23157,13 +23265,13 @@ msgstr "" #: include/export/export_balance_pdf.php:136 #: include/export/export_balance_pdf.php:133 -#: include/export/export_balance_pdf.php:133 +#: include/export/export_balance_pdf.php:134 msgid "Total Débit" msgstr "" #: include/export/export_balance_pdf.php:137 #: include/export/export_balance_pdf.php:134 -#: include/export/export_balance_pdf.php:134 +#: include/export/export_balance_pdf.php:135 msgid "Total Crédit" msgstr "" @@ -23210,16 +23318,19 @@ msgstr "" #: include/class/acc_ledger_history_generic.class.php:667 #: include/class/acc_ledger_history_generic.class.php:668 +#: include/class/acc_ledger_history_generic.class.php:668 msgid "solde débiteur:" msgstr "" #: include/class/acc_ledger_history_generic.class.php:668 #: include/class/acc_ledger_history_generic.class.php:669 +#: include/class/acc_ledger_history_generic.class.php:669 msgid "solde créditeur:" msgstr "" #: include/class/acc_ledger_history_generic.class.php:684 #: include/class/acc_ledger_history_generic.class.php:685 +#: include/class/acc_ledger_history_generic.class.php:685 msgid "Total opération" msgstr "" @@ -23316,53 +23427,53 @@ msgstr "" msgid "Installé le %s" msgstr "" -#: include/class/periode.class.php:251 include/class/periode.class.php:251 +#: include/class/periode.class.php:251 include/class/periode.class.php:253 msgid "Période chevauchant une autre" msgstr "" -#: include/class/periode.class.php:421 include/class/periode.class.php:421 +#: include/class/periode.class.php:421 include/class/periode.class.php:423 msgid "Exercice n'est pas un nombre" msgstr "" -#: include/class/periode.class.php:424 include/class/periode.class.php:424 +#: include/class/periode.class.php:424 include/class/periode.class.php:426 #, php-format msgid "Exercice doit être entre %s et %s " msgstr "" -#: include/class/periode.class.php:427 include/class/periode.class.php:427 +#: include/class/periode.class.php:427 include/class/periode.class.php:429 msgid "Année n'est pas un nombre" msgstr "" -#: include/class/periode.class.php:430 include/class/periode.class.php:430 +#: include/class/periode.class.php:430 include/class/periode.class.php:432 #, php-format msgid "Année doit être entre %s et %s " msgstr "" -#: include/class/periode.class.php:434 include/class/periode.class.php:434 +#: include/class/periode.class.php:434 include/class/periode.class.php:436 msgid "Nombre de mois n'est pas un nombre" msgstr "" -#: include/class/periode.class.php:436 include/class/periode.class.php:436 +#: include/class/periode.class.php:436 include/class/periode.class.php:438 msgid "Nombre de mois doit être compris entre 1 & 60 " msgstr "" #: include/class/periode.class.php:438 include/class/periode.class.php:440 -#: include/class/periode.class.php:438 include/class/periode.class.php:440 +#: include/class/periode.class.php:440 include/class/periode.class.php:442 msgid "Mois de début n'existe pas " msgstr "" -#: include/class/periode.class.php:520 include/class/periode.class.php:520 +#: include/class/periode.class.php:520 include/class/periode.class.php:522 msgid "nb opérations" msgstr "" -#: include/class/periode.class.php:521 include/class/periode.class.php:521 +#: include/class/periode.class.php:521 include/class/periode.class.php:523 msgid "Status" msgstr "" #: include/class/periode.class.php:585 #: include/class/periode_ledger_table.class.php:142 #: include/class/periode_ledger_table.class.php:142 -#: include/class/periode.class.php:585 +#: include/class/periode.class.php:587 msgid "Fermée" msgstr "" @@ -23371,63 +23482,63 @@ msgstr "" #: include/class/periode_ledger_table.class.php:144 #: include/class/periode_ledger_table.class.php:142 #: include/class/periode_ledger_table.class.php:144 -#: include/class/periode.class.php:585 +#: include/class/periode.class.php:587 msgid "Ouvert" msgstr "" -#: include/class/periode.class.php:647 include/class/periode.class.php:647 +#: include/class/periode.class.php:647 include/class/periode.class.php:649 msgid "Janvier" msgstr "" -#: include/class/periode.class.php:647 include/class/periode.class.php:647 +#: include/class/periode.class.php:647 include/class/periode.class.php:649 msgid "Février" msgstr "" -#: include/class/periode.class.php:647 include/class/periode.class.php:647 +#: include/class/periode.class.php:647 include/class/periode.class.php:649 msgid "Mars" msgstr "" -#: include/class/periode.class.php:647 include/class/periode.class.php:647 +#: include/class/periode.class.php:647 include/class/periode.class.php:649 msgid "Avril" msgstr "" -#: include/class/periode.class.php:648 include/class/periode.class.php:648 +#: include/class/periode.class.php:648 include/class/periode.class.php:650 msgid "Mai" msgstr "" -#: include/class/periode.class.php:648 include/class/periode.class.php:648 +#: include/class/periode.class.php:648 include/class/periode.class.php:650 msgid "Juin" msgstr "" -#: include/class/periode.class.php:648 include/class/periode.class.php:648 +#: include/class/periode.class.php:648 include/class/periode.class.php:650 msgid "Juillet" msgstr "" -#: include/class/periode.class.php:648 include/class/periode.class.php:648 +#: include/class/periode.class.php:648 include/class/periode.class.php:650 msgid "Août" msgstr "" -#: include/class/periode.class.php:648 include/class/periode.class.php:648 +#: include/class/periode.class.php:648 include/class/periode.class.php:650 msgid "Septembre" msgstr "" -#: include/class/periode.class.php:649 include/class/periode.class.php:649 +#: include/class/periode.class.php:649 include/class/periode.class.php:651 msgid "Octobre" msgstr "" -#: include/class/periode.class.php:649 include/class/periode.class.php:649 +#: include/class/periode.class.php:649 include/class/periode.class.php:651 msgid "Novembre" msgstr "" -#: include/class/periode.class.php:649 include/class/periode.class.php:649 +#: include/class/periode.class.php:649 include/class/periode.class.php:651 msgid "Décembre" msgstr "" -#: include/class/periode.class.php:673 include/class/periode.class.php:673 +#: include/class/periode.class.php:673 include/class/periode.class.php:675 msgid "Effacement impossible" msgstr "" -#: include/class/periode.class.php:688 include/class/periode.class.php:688 +#: include/class/periode.class.php:688 include/class/periode.class.php:690 msgid "On ne peut ajouter une période que sur un exercice qui existe déjà" msgstr "" @@ -23597,7 +23708,7 @@ msgstr "" msgid "Tant que ce n'est pas vous fait vous ne pouvez pas utiliser NOALYSS" msgstr "" -#: include/database.item.php:124 include/database.item.php:124 +#: include/database.item.php:124 msgid " " msgstr "" @@ -23615,12 +23726,14 @@ msgid "Désolé , impossible de se connecter au serveur %s" msgstr "" #: include/template/param_jrn.php:61 include/template/param_jrn.php:68 +#: include/template/param_jrn.php:68 msgid "" "Obligatoire pour les journaux FIN : donner ici la fiche du compte en banque " "utilisée" msgstr "" #: include/template/param_jrn.php:68 include/template/param_jrn.php:75 +#: include/template/param_jrn.php:75 msgid "Minimum de lignes à afficher" msgstr "" @@ -23701,10 +23814,12 @@ msgid "Titre 1" msgstr "" #: scenario/html_tab.test.php:35 scenario/html_tab.test.php:39 +#: scenario/html_tab.test.php:39 msgid "Titre 2" msgstr "" #: scenario/html_tab.test.php:49 scenario/html_tab.test.php:53 +#: scenario/html_tab.test.php:53 msgid "Titre 3" msgstr "" @@ -23721,7 +23836,7 @@ msgid "Impossible d'effacer : ce poste est utilisé" msgstr "" #: include/export/export_balance_pdf.php:109 -#: include/export/export_balance_pdf.php:109 +#: include/export/export_balance_pdf.php:110 #, php-format msgid "Du %s au %s" msgstr "" @@ -23732,6 +23847,7 @@ msgid "Opération rapprochée : %s" msgstr "" #: include/fiche.inc.php:592 include/fiche.inc.php:601 +#: include/fiche.inc.php:601 msgid "solde crediteur" msgstr "" @@ -23809,93 +23925,162 @@ msgstr "" msgid "Fichier non trouvé" msgstr "" -#: include/ajax/ajax_preference.php:72 +#: include/ajax/ajax_preference.php:72 include/ajax/ajax_preference.php:72 msgid "Après validation, recharger si vous changez la langue" msgstr "" +#: include/class/anc_balance_double.class.php:51 #: include/class/anc_balance_double.class.php:51 msgid "Pas de croisement avec un seul plan" msgstr "" +#: include/class/anc_balance_double.class.php:97 +#: include/class/anc_balance_double.class.php:98 #: include/class/anc_balance_double.class.php:97 #: include/class/anc_balance_double.class.php:98 msgid "Poste Analytique" msgstr "" -#: include/lib/message_javascript.php:77 +#: include/lib/message_javascript.php:77 include/lib/message_javascript.php:79 msgid "Un instant svp" msgstr "" -#: include/lib/message_javascript.php:79 +#: include/lib/message_javascript.php:79 include/lib/message_javascript.php:81 msgid "Echec " msgstr "" -#: include/lib/message_javascript.php:80 +#: include/lib/message_javascript.php:80 include/lib/message_javascript.php:82 msgid "Echec donnée manquante ou incorrecte" msgstr "" -#: include/lib/message_javascript.php:81 +#: include/lib/message_javascript.php:81 include/lib/message_javascript.php:83 msgid "Vous confirmez effacement ?" msgstr "" -#: include/lib/message_javascript.php:82 +#: include/lib/message_javascript.php:82 include/lib/message_javascript.php:84 msgid "Vous confirmez mise à jour ?" msgstr "" -#: include/lib/message_javascript.php:83 +#: include/lib/message_javascript.php:83 include/lib/message_javascript.php:85 msgid "Si vous changez de page vous perdez les reconciliations, continuez ?" msgstr "" -#: include/lib/message_javascript.php:84 +#: include/lib/message_javascript.php:84 include/lib/message_javascript.php:86 msgid "Echec réponse" msgstr "" -#: include/lib/message_javascript.php:85 +#: include/lib/message_javascript.php:85 include/lib/message_javascript.php:87 msgid "Désolé, les montants pour la comptabilité analytique sont incorrects" msgstr "" -#: include/lib/message_javascript.php:86 +#: include/lib/message_javascript.php:86 include/lib/message_javascript.php:88 msgid "Maximum 15 lignes" msgstr "" -#: include/lib/message_javascript.php:87 +#: include/lib/message_javascript.php:87 include/lib/message_javascript.php:89 msgid "Maximum" msgstr "" -#: include/lib/message_javascript.php:88 +#: include/lib/message_javascript.php:88 include/lib/message_javascript.php:90 msgid "calculé" msgstr "" -#: include/lib/message_javascript.php:89 +#: include/lib/message_javascript.php:89 include/lib/message_javascript.php:91 msgid "Balance incorrecte D/C" msgstr "" -#: include/lib/message_javascript.php:91 +#: include/lib/message_javascript.php:91 include/lib/message_javascript.php:93 msgid "Donnée manquante ou déjà supprimée" msgstr "" -#: include/lib/message_javascript.php:92 +#: include/lib/message_javascript.php:92 include/lib/message_javascript.php:94 msgid "Désolé, événement en cours de création à sauver" msgstr "" -#: include/lib/message_javascript.php:93 +#: include/lib/message_javascript.php:93 include/lib/message_javascript.php:95 msgid "Cacher" msgstr "" -#: include/lib/message_javascript.php:95 +#: include/lib/message_javascript.php:95 include/lib/message_javascript.php:97 msgid "Traitement en cours" msgstr "" -#: include/lib/message_javascript.php:96 +#: include/lib/message_javascript.php:96 include/lib/message_javascript.php:98 msgid "Un instant" msgstr "" -#: include/lib/message_javascript.php:98 +#: include/lib/message_javascript.php:98 include/lib/message_javascript.php:100 msgid "Taper une formule (ex 20*5.1) puis enter" msgstr "" -#: include/lib/message_javascript.php:99 +#: include/lib/message_javascript.php:99 include/lib/message_javascript.php:101 msgid "" "Calculatrice simplifiée: écrivez simplement les opérations que vous voulez " "puis la touche retour. exemple : 1+2+3*(1/5)" msgstr "" + +#: include/class/pre_operation.class.php:149 +#, php-format +msgid "Echec PreOperatoin chargement %s" +msgstr "" + +#: include/class/pdfbalance_simple.class.php:35 +#, php-format +msgid "Balance simple %s" +msgstr "" + +#: include/class/pdfbalance_simple.class.php:45 +#, php-format +msgid "Balance simple poste %s %s date %s %s" +msgstr "" + +#: include/lib/message_javascript.php:65 +msgid "" +"

    Remarque : choix possibles

    • Détail " +"opérations ne donne pas le même résultat si on regarde tous les journaux ou " +"un journal de type ACH ou VEN
    • Liste opérations ne donne pas " +"le même résultat si on regarde tous les journaux ou un journal de type ACH " +"ou VEN
    • Journaux VEN ou ACH en mode détail opérations donne " +"les détails des factures, y compris les montants, TVA et quantité par " +"article
    • Journaux VEN ou ACH en mode liste opérations donne " +"pour chaque opération, le total de la TVA, ND, ...
    " +msgstr "" + +#: include/lib/message_javascript.php:103 +msgid "Votre demande est en cours de traitement" +msgstr "" + +#: include/lib/database_core.class.php:60 +msgid "Impossible de se connecter à postgreSql" +msgstr "" + +#: include/lib/database_core.class.php:62 +msgid "Vos paramètres sont incorrectes" +msgstr "" + +#: include/lib/database_core.class.php:64 +#, php-format +msgid "base de donnée = %s" +msgstr "" + +#: include/lib/database_core.class.php:65 +#, php-format +msgid "Port %s" +msgstr "" + +#: include/lib/database_core.class.php:66 +#, php-format +msgid "Utilisateur : %s" +msgstr "" + +#: include/lib/database_core.class.php:71 +msgid "Erreur de connexion !" +msgstr "" + +#: include/lib/database_core.class.php:73 +msgid "Erreur Connexion" +msgstr "" + +#: include/lib/database_core.class.php:464 +msgid "Database:get_row retourne trop de lignes" +msgstr "" diff --git a/html/lang/nl_NL/LC_MESSAGES/messages.po b/html/lang/nl_NL/LC_MESSAGES/messages.po index a83a0b48b..72550f00c 100644 --- a/html/lang/nl_NL/LC_MESSAGES/messages.po +++ b/html/lang/nl_NL/LC_MESSAGES/messages.po @@ -4,11 +4,12 @@ # # dany , 2014. # Dany De Bontridder , 2015, 2018, 2019. +#: include/database.item.php:124 msgid "" msgstr "" "Project-Id-Version: NOALYSS\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-07-31 00:04+0200\n" +"POT-Creation-Date: 2019-08-07 15:00+0200\n" "PO-Revision-Date: 2019-07-31 13:23+0100\n" "Last-Translator: dany \n" "Language-Team: English \n" @@ -136,6 +137,7 @@ msgstr "D" #: include/ajax_mod_periode.php:55 include/ajax/ajax_mod_periode.php:55 #: include/ajax/ajax_periode.php:171 include/class/periode.class.php:702 +#: include/class/periode.class.php:704 msgid " Début période : " msgstr "Begin" @@ -159,21 +161,25 @@ msgstr "Fout in de formula" #: include/ajax_mod_periode.php:57 include/ajax/ajax_mod_periode.php:57 #: include/ajax/ajax_periode.php:173 include/class/periode.class.php:704 +#: include/class/periode.class.php:706 msgid " Exercice : " msgstr "Jaar" #: include/ajax_mod_periode.php:56 include/ajax/ajax_mod_periode.php:56 #: include/ajax/ajax_periode.php:172 include/class/periode.class.php:703 +#: include/class/periode.class.php:705 msgid " Fin période : " msgstr "End " #: include/user_menu.php:147 include/user_menu.php:151 #: include/lib/user_menu.php:160 include/lib/user_menu.php:173 +#: include/lib/user_menu.php:131 msgid " Hors Bilan" msgstr "Buiten de balansstelling" #: include/user_menu.php:148 include/user_menu.php:152 #: include/lib/user_menu.php:161 include/lib/user_menu.php:174 +#: include/lib/user_menu.php:132 msgid " Immobilisé" msgstr "Vastleggen" @@ -488,7 +494,7 @@ msgstr "Je hebt% s% d maanden sinds% d /% d% d bij de oefening toegevoegd" #: include/lib/class_sendmail.php:96 include/lib/class_sendmail.php:97 #: include/lib/class_sendmail.php:98 include/lib/sendmail.class.php:98 -#: include/lib/sendmail.class.php:102 +#: include/lib/sendmail.class.php:102 include/lib/sendmail_core.class.php:105 #, fuzzy, php-format msgid "%s est vide" msgstr "is leeg" @@ -640,6 +646,18 @@ msgid "" "ND, ... " msgstr "" +#: include/lib/message_javascript.php:65 +msgid "" +"

    Remarque : choix possibles

    • Détail " +"opérations ne donne pas le même résultat si on regarde tous les journaux ou " +"un journal de type ACH ou VEN
    • Liste opérations ne donne pas " +"le même résultat si on regarde tous les journaux ou un journal de type ACH " +"ou VEN
    • Journaux VEN ou ACH en mode détail opérations donne " +"les détails des factures, y compris les montants, TVA et quantité par " +"article
    • Journaux VEN ou ACH en mode liste opérations donne " +"pour chaque opération, le total de la TVA, ND, ...
    " +msgstr "" + # les comptes dit inversés => niet gevonden in het NL dus de rekeningen genomen die tegengesteld zijn aan degene die er in de zin staan #: include/impress_bilan.inc.php:89 msgid "" @@ -725,6 +743,7 @@ msgstr "Aanvaarden" #: include/database.item.php:78 include/lib/user_menu.php:123 #: include/lib/user_menu.php:131 include/lib/user_menu.php:124 #: include/lib/user_menu.php:143 include/database.item.php:75 +#: include/lib/user_menu.php:81 include/lib/user_menu.php:100 msgid "Accueil" msgstr "Home" @@ -856,6 +875,7 @@ msgstr "Actie" #: include/user_menu.php:149 include/user_menu.php:153 #: include/lib/user_menu.php:162 include/lib/user_menu.php:175 +#: include/lib/user_menu.php:133 msgid "Actif a un an au plus" msgstr "Activa van een jaar tot meer" @@ -947,6 +967,7 @@ msgstr "Actie is ontoegankelijk" #: html/ajax_misc.php:179 html/ajax_misc.php:257 html/ajax_misc.php:262 #: html/ajax_misc.php:290 html/ajax_misc.php:382 html/ajax_misc.php:384 #: html/ajax_misc.php:390 include/lib/message_javascript.php:90 +#: include/lib/message_javascript.php:92 #, fuzzy msgid "Action non autorisée" msgstr "Bewerking Opgeslagen" @@ -1123,7 +1144,7 @@ msgstr "Toon ook de gesloten acties" #: include/ext/tva/class_ext_tvagen.php:114 #: include/ext/tva/ext_list_assujetti.class.php:54 #: include/ext/tva/ext_tvagen.class.php:114 -#: include/lib/message_javascript.php:94 +#: include/lib/message_javascript.php:94 include/lib/message_javascript.php:96 msgid "Afficher" msgstr "Weergeven" @@ -1256,7 +1277,7 @@ msgstr "Artikel toevoegen" #: include/lib/class_html_input.php:946 include/lib/class_html_input.php:957 #: include/lib/class_html_input.php:958 include/lib/class_html_input.php:984 #: include/lib/html_input.class.php:1037 include/lib/html_input.class.php:1095 -#: include/lib/html_input.class.php:1096 +#: include/lib/html_input.class.php:1096 include/lib/html_input.class.php:1111 #, fuzzy msgid "Ajout autres" msgstr "Factuur toevoegen" @@ -1479,6 +1500,7 @@ msgid "Ajout prévision" msgstr "Raming toevoegen" #: include/periode.inc.php:113 include/class/periode.class.php:687 +#: include/class/periode.class.php:689 #, fuzzy msgid "Ajout période" msgstr "Artikel toevoegen" @@ -1759,7 +1781,7 @@ msgstr "Boekhoudkundig aankoopjaar" msgid "Année d'achat" msgstr "Jaar van de aankoop" -#: include/class/periode.class.php:430 +#: include/class/periode.class.php:430 include/class/periode.class.php:432 #, fuzzy, php-format msgid "Année doit être entre %s et %s " msgstr "Tussen de data %s en %s" @@ -1779,7 +1801,7 @@ msgstr "Ongeldig jaar" msgid "Année invalide [" msgstr "Ongeldig jaar [" -#: include/class/periode.class.php:427 +#: include/class/periode.class.php:427 include/class/periode.class.php:429 #, fuzzy msgid "Année n'est pas un nombre" msgstr "tarief is geen getal" @@ -1789,7 +1811,7 @@ msgstr "tarief is geen getal" msgid "Anomalie pour le compte " msgstr "Belettering voor de boekhoudkundige positie" -#: include/class/periode.class.php:648 +#: include/class/periode.class.php:648 include/class/periode.class.php:650 msgid "Août" msgstr "" @@ -2469,7 +2491,7 @@ msgstr "Beschrijving" #: include/lib/ac_common.php:1209 include/export/export_fiche_detail_csv.php:60 #: include/template/ledger_detail_bottom.php:286 include/lib/ac_common.php:1221 #: include/lib/ac_common.php:1223 include/template/ledger_detail_bottom.php:287 -#: include/lib/ac_common.php:1247 +#: include/lib/ac_common.php:1247 include/lib/message_javascript.php:102 msgid "Aucune donnée" msgstr "Geen enkel gegeven" @@ -2612,6 +2634,7 @@ msgstr "Geen label beschikbaar" #: include/user_menu.php:114 include/user_menu.php:121 #: include/lib/user_menu.php:121 include/lib/user_menu.php:130 #: include/lib/user_menu.php:122 include/lib/user_menu.php:141 +#: include/lib/user_menu.php:79 include/lib/user_menu.php:98 msgid "Audit" msgstr "Audit" @@ -2625,7 +2648,7 @@ msgstr "" msgid "Autoliquidation" msgstr "" -#: include/lib/message_javascript.php:74 +#: include/lib/message_javascript.php:74 include/lib/message_javascript.php:76 msgid "Autoliquidation : Utilisé en même temps au crédit et au débit" msgstr "" @@ -2767,7 +2790,7 @@ msgstr "Met het bestand" msgid "Avertissement" msgstr "Aflossing" -#: include/class/periode.class.php:647 +#: include/class/periode.class.php:647 include/class/periode.class.php:649 msgid "Avril" msgstr "" @@ -2842,6 +2865,7 @@ msgstr "Balans van de leverancier" #: include/export/export_balance_pdf.php:123 #: include/export/export_balance_pdf.php:127 #: include/export/export_balance_pdf.php:124 +#: include/export/export_balance_pdf.php:125 #, fuzzy msgid "Balance comptable" msgstr "Export Accounting Balance" @@ -2894,7 +2918,7 @@ msgstr "Foute balans" msgid "Balance incorrecte " msgstr "Foute balans" -#: include/lib/message_javascript.php:89 +#: include/lib/message_javascript.php:89 include/lib/message_javascript.php:91 #, fuzzy msgid "Balance incorrecte D/C" msgstr "Foute balans" @@ -2928,12 +2952,22 @@ msgstr "Balans per groep" msgid "Balance simple" msgstr "Eenvoudige balans" +#: include/class/pdfbalance_simple.class.php:35 +#, fuzzy, php-format +msgid "Balance simple %s" +msgstr "Eenvoudige balans" + #: include/database.item.php:4 include/database.item.php:7 #: include/database.item.php:9 include/database.item.php:12 #: include/database.item.php:6 msgid "Balance simple des imputations analytiques" msgstr "Eenvoudige balans van de analytische verrekeningen" +#: include/class/pdfbalance_simple.class.php:45 +#, fuzzy, php-format +msgid "Balance simple poste %s %s date %s %s" +msgstr "Eenvoudige balans van de analytische verrekeningen" + #: include/category_card.inc.php:73 include/fiche.inc.php:70 #: include/category_card.inc.php:78 include/category_card.inc.php:80 #: include/fiche.inc.php:71 @@ -3003,7 +3037,7 @@ msgstr "Ongeldige database" #: include/lib/class_database.php:421 include/lib/class_database.php:422 #: include/lib/class_database.php:429 include/lib/class_database.php:434 #: include/lib/database.class.php:433 include/lib/database.class.php:442 -#: include/lib/database.class.php:443 +#: include/lib/database.class.php:443 include/class/database.class.php:125 #, fuzzy msgid "Base de donnée vide" msgstr "Ongeldige database" @@ -3127,7 +3161,7 @@ msgstr "D / C" msgid "CONVERT_GIF_PDF n'est pas installé" msgstr "CONVERT_GIF_PDF is niet geïnstalleerd" -#: include/lib/message_javascript.php:93 +#: include/lib/message_javascript.php:93 include/lib/message_javascript.php:95 #, fuzzy msgid "Cacher" msgstr "Vinden" @@ -3163,11 +3197,11 @@ msgstr "Automatisch aanmaken van de boekhoudkundige post" #: include/class_ibutton.php:82 include/class_ibutton.php:84 #: include/lib/class_ibutton.php:84 include/lib/ibutton.class.php:84 -#: include/lib/message_javascript.php:97 +#: include/lib/message_javascript.php:97 include/lib/message_javascript.php:99 msgid "Calculatrice" msgstr "Rekenmachine" -#: include/lib/message_javascript.php:99 +#: include/lib/message_javascript.php:99 include/lib/message_javascript.php:101 msgid "" "Calculatrice simplifiée: écrivez simplement les opérations que vous voulez " "puis la touche retour. exemple : 1+2+3*(1/5)" @@ -3191,6 +3225,7 @@ msgstr "Rekenmachine" #: include/template/calendar-list.php:34 include/lib/html_input.class.php:943 #: include/ajax/ajax_calendar_zoom.php:26 include/lib/html_input.class.php:991 #: include/ajax/ajax_calendar_zoom.php:32 include/lib/html_input.class.php:992 +#: include/lib/html_input.class.php:1007 msgid "Calendrier" msgstr "Kalender" @@ -3627,6 +3662,7 @@ msgstr "" #: include/user_menu.php:153 include/user_menu.php:157 #: include/lib/user_menu.php:166 include/lib/user_menu.php:179 +#: include/lib/user_menu.php:137 msgid "Charges" msgstr "Kosten" @@ -4135,11 +4171,11 @@ msgstr "" msgid "Cliquez pour éditer" msgstr "Creditsaldo" -#: include/lib/message_javascript.php:66 +#: include/lib/message_javascript.php:66 include/lib/message_javascript.php:68 msgid "Cliquez sur le chemin pour ouvrir le menu" msgstr "" -#: include/lib/message_javascript.php:65 +#: include/lib/message_javascript.php:65 include/lib/message_javascript.php:67 msgid "Cliquez sur le code AD pour ouvrir le menu dans un nouvel onglet" msgstr "" @@ -4748,6 +4784,7 @@ msgstr "Dit plan bestaat niet" #: include/user_menu.php:151 include/user_menu.php:155 #: include/lib/user_menu.php:164 include/lib/user_menu.php:177 +#: include/lib/user_menu.php:135 msgid "Compte tiers" msgstr "Derde rekening" @@ -5401,6 +5438,7 @@ msgstr "Crébit" #: include/class/anc_balance_double.class.php:100 #: include/class/acc_ledger_history_generic.class.php:772 #: include/class/fiche.class.php:1480 +#: include/class/pdfbalance_simple.class.php:57 msgid "Crédit" msgstr "Creditzijde" @@ -5547,6 +5585,7 @@ msgstr "D / C" #: include/class/anc_listing.class.php:85 #: include/class/pdf_operation.class.php:250 #: include/class/anc_listing.class.php:87 +#: include/class/pdfbalance_simple.class.php:59 msgid "D/C" msgstr "D / C" @@ -5591,6 +5630,10 @@ msgstr "Deposito" msgid "Dans le journal" msgstr "In het dagboek" +#: include/lib/database_core.class.php:464 +msgid "Database:get_row retourne trop de lignes" +msgstr "" + #: include/class_acc_ledger.php:1424 include/class_acc_ledger.php:1610 #: include/class_acc_ledger_purchase.php:1350 #: include/class_acc_ledger_sold.php:647 include/class_anc_grandlivre.php:156 @@ -5831,6 +5874,7 @@ msgstr "Datum DMY" #: include/ajax/ajax_display_letter.php:98 #: include/ajax/ajax_display_letter.php:103 include/class/periode.class.php:517 #: include/class/periode_ledger_table.class.php:98 +#: include/class/periode.class.php:519 #, fuzzy msgid "Date Début" msgstr "Begindatum" @@ -5844,6 +5888,7 @@ msgstr "Begindatum" #: include/database.item.php:171 include/database.item.php:176 #: include/ajax/ajax_display_letter.php:116 include/class/periode.class.php:518 #: include/class/periode_ledger_table.class.php:99 +#: include/class/periode.class.php:520 msgid "Date Fin" msgstr "Einddatum" @@ -6776,7 +6821,7 @@ msgstr "" msgid "Donnée invalide" msgstr "Ongeldig jaar" -#: include/lib/message_javascript.php:91 +#: include/lib/message_javascript.php:91 include/lib/message_javascript.php:93 msgid "Donnée manquante ou déjà supprimée" msgstr "" @@ -6844,7 +6889,7 @@ msgid "Dossier non accessible" msgstr "Folder niet Bereikbaar" #: include/user_menu.php:111 include/lib/user_menu.php:117 -#: include/lib/user_menu.php:118 +#: include/lib/user_menu.php:118 include/lib/user_menu.php:75 msgid "Dossiers" msgstr "Archief" @@ -6899,6 +6944,7 @@ msgid "Download core" msgstr "" #: include/export/export_balance_pdf.php:109 +#: include/export/export_balance_pdf.php:110 #, fuzzy, php-format msgid "Du %s au %s" msgstr "tot" @@ -7005,6 +7051,7 @@ msgstr "Afschrijvingstermijn" #: include/class/anc_balance_double.class.php:99 #: include/class/acc_ledger_history_generic.class.php:771 #: include/class/fiche.class.php:1479 +#: include/class/pdfbalance_simple.class.php:56 msgid "Débit" msgstr "debiet" @@ -7031,7 +7078,7 @@ msgstr "Debet of Credit" msgid "Débiteur" msgstr "schuldenaar" -#: include/class/periode.class.php:649 +#: include/class/periode.class.php:649 include/class/periode.class.php:651 msgid "Décembre" msgstr "" @@ -7284,7 +7331,7 @@ msgstr "" msgid "Désolé, il y a trop de virgule dans le poste comptable " msgstr "" -#: include/lib/message_javascript.php:85 +#: include/lib/message_javascript.php:85 include/lib/message_javascript.php:87 #, fuzzy msgid "Désolé, les montants pour la comptabilité analytique sont incorrects" msgstr "Cost Accounting Module" @@ -7299,7 +7346,7 @@ msgstr "Cost Accounting Module" msgid "Désolé, vous n'avez pas coché la case" msgstr "Sorry hebt u Het niet VAK aangekruisd" -#: include/lib/message_javascript.php:92 +#: include/lib/message_javascript.php:92 include/lib/message_javascript.php:94 msgid "Désolé, événement en cours de création à sauver" msgstr "" @@ -7581,7 +7628,7 @@ msgstr "termijn wordt overschreden" msgid "Echec" msgstr "Termijn" -#: include/lib/message_javascript.php:79 +#: include/lib/message_javascript.php:79 include/lib/message_javascript.php:81 #, fuzzy msgid "Echec " msgstr "Termijn" @@ -7593,6 +7640,11 @@ msgstr "Termijn" msgid "Echec Ajout detail " msgstr "" +#: include/class/pre_operation.class.php:149 +#, php-format +msgid "Echec PreOperatoin chargement %s" +msgstr "" + #: include/dossier.inc.php:195 include/dossier.inc.php:196 #: include/dossier.inc.php:199 include/dossier.inc.php:204 #, fuzzy @@ -7620,7 +7672,7 @@ msgstr "" msgid "Echec de la restauration " msgstr "" -#: include/lib/message_javascript.php:80 +#: include/lib/message_javascript.php:80 include/lib/message_javascript.php:82 msgid "Echec donnée manquante ou incorrecte" msgstr "" @@ -7657,7 +7709,7 @@ msgstr "Bijwerken" msgid "Echec ouverture fichier " msgstr "fout bij het openen van het bestand" -#: include/lib/message_javascript.php:84 +#: include/lib/message_javascript.php:84 include/lib/message_javascript.php:86 #, fuzzy msgid "Echec réponse" msgstr "Aanmaken" @@ -7802,7 +7854,7 @@ msgstr "" msgid "Effacement déclaration" msgstr "Deze verklaring verwijderen" -#: include/class/periode.class.php:673 +#: include/class/periode.class.php:673 include/class/periode.class.php:675 #, fuzzy msgid "Effacement impossible" msgstr "Export is onmogelijk" @@ -7897,6 +7949,7 @@ msgstr "Erasure" #: include/class/periode.class.php:594 include/class/periode.class.php:599 #: include/class/anc_operation.class.php:316 #: include/template/ledger_detail_bottom.php:328 +#: include/class/periode.class.php:596 include/class/periode.class.php:601 msgid "Effacer" msgstr "Wissen" @@ -8020,7 +8073,7 @@ msgstr "Foute e-mail" #: include/lib/class_sendmail.php:152 include/lib/class_sendmail.php:153 #: include/lib/class_sendmail.php:155 include/lib/sendmail.class.php:157 -#: include/lib/sendmail.class.php:161 +#: include/lib/sendmail.class.php:161 include/class/sendmail.class.php:38 #, fuzzy msgid "Email non envoyé" msgstr "E-mail verzonden door" @@ -8054,7 +8107,7 @@ msgstr "Is te laat" msgid "En une opération" msgstr "Alle activiteiten" -#: include/lib/message_javascript.php:67 +#: include/lib/message_javascript.php:67 include/lib/message_javascript.php:69 msgid "" "En utilisant les dates d échéance ou de paiement, seuls les journaux de type " "ACH et VEN seront utilisés ,vous excluez d office les autres journaux" @@ -8378,6 +8431,11 @@ msgstr "Parameter is ongeldig" msgid "Erreur : paramètre manquant " msgstr "Parameter is ongeldig" +#: include/lib/database_core.class.php:73 +#, fuzzy +msgid "Erreur Connexion" +msgstr "Afmelden" + #: include/ext/import_account/include/class_impacc_csv.php:55 #: include/ext/import_account/include/impacc_csv.class.php:55 #, fuzzy @@ -8406,6 +8464,11 @@ msgstr "Foutenlogboek dit type wordt nog niet ondersteund" msgid "Erreur date invalide" msgstr "Ongeldig datum" +#: include/lib/database_core.class.php:71 +#, fuzzy +msgid "Erreur de connexion !" +msgstr "Afmelden" + #: include/ajax/ajax_periode.php:195 #, fuzzy msgid "Erreur exercice invalide" @@ -8627,6 +8690,7 @@ msgstr "Uitsluiten State" #: include/ajax/ajax_preference.php:131 include/class/periode.class.php:519 #: include/class/periode_ledger_table.class.php:100 #: include/template/stock_inv.php:126 include/ajax/ajax_preference.php:142 +#: include/class/periode.class.php:521 msgid "Exercice" msgstr "Oefening" @@ -8635,7 +8699,7 @@ msgstr "Oefening" msgid "Exercice comptable d'achat" msgstr "Boekhoudkundig aankoopjaar" -#: include/class/periode.class.php:424 +#: include/class/periode.class.php:424 include/class/periode.class.php:426 #, php-format msgid "Exercice doit être entre %s et %s " msgstr "" @@ -8645,7 +8709,7 @@ msgstr "" msgid "Exercice invalide" msgstr "Ongeldig datum" -#: include/class/periode.class.php:421 +#: include/class/periode.class.php:421 include/class/periode.class.php:423 #, fuzzy msgid "Exercice n'est pas un nombre" msgstr "tarief is geen getal" @@ -9226,6 +9290,7 @@ msgstr "Dicht" #: include/class/periode.class.php:585 #: include/class/periode_ledger_table.class.php:142 +#: include/class/periode.class.php:587 #, fuzzy msgid "Fermée" msgstr "Dicht" @@ -9603,7 +9668,7 @@ msgstr "" #: include/class/acc_ledger_search.class.php:1074 include/database.item.php:209 #: include/database.item.php:220 include/cfgledger.inc.php:170 #: include/class/acc_ledger_search.class.php:1082 -#: include/class/acc_ledger_search.class.php:1095 +#: include/class/acc_ledger_search.class.php:1095 include/lib/user_menu.php:136 msgid "Financier" msgstr "Financieel" @@ -9747,7 +9812,7 @@ msgstr "Leverancier vandaag betalen" msgid "Français" msgstr "Frans" -#: include/class/periode.class.php:647 +#: include/class/periode.class.php:647 include/class/periode.class.php:649 msgid "Février" msgstr "" @@ -9779,12 +9844,12 @@ msgid "Gestion des attributs de fiches " msgstr "Beheer attributen vellen" #: include/user_menu.php:111 include/lib/user_menu.php:117 -#: include/lib/user_menu.php:118 +#: include/lib/user_menu.php:118 include/lib/user_menu.php:75 msgid "Gestion des dossiers" msgstr "Records Management" #: include/user_menu.php:112 include/lib/user_menu.php:118 -#: include/lib/user_menu.php:119 +#: include/lib/user_menu.php:119 include/lib/user_menu.php:76 msgid "Gestion des modèles" msgstr "Managementmodellen" @@ -9811,6 +9876,7 @@ msgstr "" #: include/user_menu.php:110 include/user_menu.php:120 #: include/lib/user_menu.php:116 include/lib/user_menu.php:129 #: include/lib/user_menu.php:117 include/lib/user_menu.php:140 +#: include/lib/user_menu.php:74 include/lib/user_menu.php:97 msgid "Gestion des utilisateurs" msgstr "Users Beheer" @@ -10356,6 +10422,7 @@ msgstr "Historische omzet" #: include/user_menu.php:159 include/user_menu.php:160 #: include/lib/user_menu.php:168 include/lib/user_menu.php:169 #: include/lib/user_menu.php:181 include/lib/user_menu.php:182 +#: include/lib/user_menu.php:139 include/lib/user_menu.php:140 msgid "Hors Comptabilité" msgstr "Exclusief Accounting" @@ -10670,6 +10737,11 @@ msgid "" "connection" msgstr "" +#: include/lib/database_core.class.php:60 +#, fuzzy +msgid "Impossible de se connecter à postgreSql" +msgstr "Kan dit bestand op te slaan" + #: include/database.item.php:68 include/database.item.php:114 #: include/ajax_get_profile.php:98 include/template/action_other_action.php:22 #: include/template/menu_detail.php:18 include/menu.inc.php:131 @@ -10876,7 +10948,8 @@ msgid "" msgstr "" #: include/lib/user_menu.php:122 include/lib/user_menu.php:123 -#: include/lib/user_menu.php:142 +#: include/lib/user_menu.php:142 include/lib/user_menu.php:80 +#: include/lib/user_menu.php:99 #, fuzzy msgid "Information système" msgstr "Opgeslagen Informatie" @@ -10893,12 +10966,12 @@ msgstr "Algemene informatie" #: html/install.php:271 html/install.php:277 html/install.php:228 #: html/install.php:235 include/upgrade-plugin.php:113 #: include/lib/user_menu.php:121 html/install.php:238 -#: include/upgrade-plugin.php:125 +#: include/upgrade-plugin.php:125 include/lib/user_menu.php:78 #, fuzzy msgid "Installation" msgstr "Herstelt" -#: include/lib/user_menu.php:121 +#: include/lib/user_menu.php:121 include/lib/user_menu.php:78 #, fuzzy msgid "Installation Mise à jour du système et des bases de données" msgstr "Update" @@ -11057,7 +11130,7 @@ msgstr "Omgekeerde selectie" msgid "Item" msgstr "Item code" -#: include/class/periode.class.php:647 +#: include/class/periode.class.php:647 include/class/periode.class.php:649 msgid "Janvier" msgstr "" @@ -11253,12 +11326,12 @@ msgstr "Inkoopdagboeken" msgid "Journaux de vente" msgstr "Geschiedenis verkopen " -#: include/class/periode.class.php:648 +#: include/class/periode.class.php:648 include/class/periode.class.php:650 #, fuzzy msgid "Juillet" msgstr "City" -#: include/class/periode.class.php:648 +#: include/class/periode.class.php:648 include/class/periode.class.php:650 msgid "Juin" msgstr "" @@ -11448,7 +11521,7 @@ msgstr "De% s-plug heeft geen financieel administratieve post" msgid "La numérotation est propre à chaque journal" msgstr "Dagboek van nummering hängt" -#: include/lib/message_javascript.php:69 +#: include/lib/message_javascript.php:69 include/lib/message_javascript.php:71 #, fuzzy msgid "" "La numérotation est propre à chaque journal. Laissez à 0 pour ne pas changer " @@ -11465,6 +11538,7 @@ msgid "Label" msgstr "Etiket" #: include/template/param_jrn.php:118 include/lib/message_javascript.php:71 +#: include/lib/message_javascript.php:73 msgid "Laissez à 0 pour ne pas changer le numéro" msgstr "Laat 0 het nummer niet wijzigen" @@ -11629,6 +11703,7 @@ msgid "Le poste %s n'est pas dans ce journal" msgstr "wordt niet in this journaal" #: include/template/param_jrn.php:94 include/lib/message_javascript.php:70 +#: include/lib/message_javascript.php:72 msgid "" "Le préfixe des pièces doit être différent pour chaque journal, on peut aussi " "utiliser l'année" @@ -11711,6 +11786,7 @@ msgid "Les clauses FROM sont ignorés avec les dates calendriers" msgstr "" #: include/class_anc_print.php:120 include/lib/message_javascript.php:68 +#: include/lib/message_javascript.php:70 msgid "Les dates sont en format DD.MM.YYYY" msgstr "referentiepunt in formaat TT.MM.JJJJ" @@ -12064,6 +12140,7 @@ msgstr "smaad" #: include/class/acc_ledger_fin.class.php:754 #: include/class/anc_operation.class.php:298 #: include/class/acc_ledger_history_generic.class.php:770 +#: include/export/export_balance_pdf.php:127 #, php-format msgid "Libellé" msgstr "Opstellen" @@ -12303,7 +12380,7 @@ msgstr "" msgid "Lundi" msgstr "Maandag" -#: include/class/periode.class.php:648 +#: include/class/periode.class.php:648 include/class/periode.class.php:650 #, fuzzy msgid "Mai" msgstr "Dinsdag" @@ -12382,7 +12459,7 @@ msgstr "Dinsdag" msgid "Marquer pour suppression" msgstr "Print menu" -#: include/class/periode.class.php:647 +#: include/class/periode.class.php:647 include/class/periode.class.php:649 msgid "Mars" msgstr "" @@ -12420,11 +12497,11 @@ msgstr "Verkeerd type object" msgid "Max. email / jour (-1 = illimité)" msgstr "" -#: include/lib/message_javascript.php:87 +#: include/lib/message_javascript.php:87 include/lib/message_javascript.php:89 msgid "Maximum" msgstr "" -#: include/lib/message_javascript.php:86 +#: include/lib/message_javascript.php:86 include/lib/message_javascript.php:88 #, fuzzy msgid "Maximum 15 lignes" msgstr "Nieuwe lijn" @@ -12577,7 +12654,7 @@ msgstr "Bericht" msgid "Met à jour toutes les dossiers et modèles" msgstr "Update" -#: include/lib/message_javascript.php:72 +#: include/lib/message_javascript.php:72 include/lib/message_javascript.php:74 msgid "Mettez le pourcentage
    à zéro pour effacer la ligne" msgstr "" @@ -13045,6 +13122,7 @@ msgstr "Modellen" #: include/modele.inc.php:250 include/lib/user_menu.php:118 #: include/modele.inc.php:274 include/lib/user_menu.php:119 #: include/modele.inc.php:257 include/modele.inc.php:258 +#: include/lib/user_menu.php:76 msgid "Modèles" msgstr "Modellen" @@ -13063,6 +13141,7 @@ msgid "Mois" msgstr "Maand" #: include/class/periode.class.php:438 include/class/periode.class.php:440 +#: include/class/periode.class.php:442 #, fuzzy msgid "Mois de début n'existe pas " msgstr "Dit plan bestaat niet" @@ -13608,12 +13687,12 @@ msgid "" "Ne corrigez pas encore, cliquez continuer pour passer à l'étape suivante" msgstr "Uitvoeren in CSV of naar de volgende stap gaan " -#: include/lib/message_javascript.php:76 +#: include/lib/message_javascript.php:76 include/lib/message_javascript.php:78 msgid "" "Ne donner pas ce poste comptable si ce code n'est pas utilisé à la vente" msgstr "" -#: include/lib/message_javascript.php:75 +#: include/lib/message_javascript.php:75 include/lib/message_javascript.php:77 msgid "Ne donner pas ce poste comptable si ce code n'est pas utilisé à l'achat" msgstr "" @@ -14107,7 +14186,7 @@ msgstr "Aantal geregistreerde lijnen" msgid "Nombre de mois" msgstr "Aantal geregistreerde lijnen" -#: include/class/periode.class.php:436 +#: include/class/periode.class.php:436 include/class/periode.class.php:438 msgid "Nombre de mois doit être compris entre 1 & 60 " msgstr "" @@ -14116,7 +14195,7 @@ msgstr "" msgid "Nombre de mois invalide" msgstr "Aantal ongeldige annuïteiten" -#: include/class/periode.class.php:434 +#: include/class/periode.class.php:434 include/class/periode.class.php:436 #, fuzzy msgid "Nombre de mois n'est pas un nombre" msgstr "tarief is geen getal" @@ -14386,6 +14465,7 @@ msgstr "Nieuwe bankafschrift" #: include/lib/html_input.class.php:1043 #: include/template/action_display_short.php:81 #: include/lib/html_input.class.php:1103 include/lib/html_input.class.php:1104 +#: include/lib/html_input.class.php:1119 #, fuzzy msgid "Nouvel événement" msgstr "Voeg dit element toe" @@ -14456,7 +14536,7 @@ msgstr "Nieuwe omzet of inkomsten" msgid "Nouvelle version disponible %s , votre version %s" msgstr "" -#: include/class/periode.class.php:649 +#: include/class/periode.class.php:649 include/class/periode.class.php:651 #, fuzzy msgid "Novembre" msgstr "Aantal" @@ -14847,11 +14927,11 @@ msgid "" "utilisée" msgstr "Verplicht voor FIN kranten geven hier de Data Bank gebruikt" -#: include/class/periode.class.php:649 +#: include/class/periode.class.php:649 include/class/periode.class.php:651 msgid "Octobre" msgstr "" -#: include/class/periode.class.php:688 +#: include/class/periode.class.php:688 include/class/periode.class.php:690 msgid "On ne peut ajouter une période que sur un exercice qui existe déjà" msgstr "" @@ -15247,6 +15327,7 @@ msgstr "de begrotingspost" #: include/class/periode.class.php:585 #: include/class/periode_ledger_table.class.php:142 #: include/class/periode_ledger_table.class.php:144 +#: include/class/periode.class.php:587 #, fuzzy msgid "Ouvert" msgstr "OPSLAAN" @@ -15254,6 +15335,7 @@ msgstr "OPSLAAN" #: include/balance.inc.php:314 include/export/export_balance_pdf.php:135 #: include/class/acc_operation.class.php:727 #: include/export/export_balance_pdf.php:132 +#: include/export/export_balance_pdf.php:133 #, fuzzy msgid "Ouverture" msgstr "Opening Schrift" @@ -15558,7 +15640,7 @@ msgstr "Parameter is ongeldig" #: include/class/acc_ledger.class.php:86 include/lib/http_input.class.php:120 #: include/class/acc_ledger.class.php:88 include/class/periode.class.php:235 #: include/lib/http_input.class.php:121 include/class/acc_ledger.class.php:89 -#: include/lib/http_input.class.php:123 +#: include/lib/http_input.class.php:123 include/class/periode.class.php:237 msgid "Paramètre invalide" msgstr "Parameter is ongeldig" @@ -16107,6 +16189,11 @@ msgstr "" msgid "Port" msgstr "" +#: include/lib/database_core.class.php:65 +#, php-format +msgid "Port %s" +msgstr "" + # Plage heeft verschillende vertalingen: periode, marge/verschil, programmablok #: include/template/template_config_form.php:59 #: include/template/template_config_form.php:67 @@ -16254,6 +16341,7 @@ msgstr "Kostenpost " #: include/template/ledger_detail_misc.php:99 include/ajax/ajax_poste.php:64 #: include/class/acc_plan_mtable.class.php:45 include/class/fiche.class.php:470 #: include/class/fiche.class.php:469 +#: include/class/pdfbalance_simple.class.php:55 msgid "Poste Comptable" msgstr "rekening" @@ -16768,6 +16856,7 @@ msgstr "Producten" #: include/user_menu.php:154 include/user_menu.php:158 #: include/lib/user_menu.php:167 include/lib/user_menu.php:180 +#: include/lib/user_menu.php:138 msgid "Produits" msgstr "Producten" @@ -17009,7 +17098,7 @@ msgstr "Boekhoudingsperiode" msgid "Période N-1" msgstr "Periode" -#: include/class/periode.class.php:251 +#: include/class/periode.class.php:251 include/class/periode.class.php:253 msgid "Période chevauchant une autre" msgstr "" @@ -17525,12 +17614,12 @@ msgid "Restauration réussie du dossier " msgstr "Records Management" #: include/user_menu.php:113 include/lib/user_menu.php:119 -#: include/lib/user_menu.php:120 +#: include/lib/user_menu.php:120 include/lib/user_menu.php:77 msgid "Restaure" msgstr "Herstelt" #: include/user_menu.php:113 include/lib/user_menu.php:119 -#: include/lib/user_menu.php:120 +#: include/lib/user_menu.php:120 include/lib/user_menu.php:77 msgid "Restaure une base de données" msgstr "Restore Database" @@ -17796,6 +17885,7 @@ msgstr "Overzicht" #: include/balance.inc.php:447 include/export/export_balance_pdf.php:316 #: include/balance.inc.php:465 include/export/export_balance_pdf.php:341 #: include/export/export_balance_pdf.php:336 +#: include/export/export_balance_pdf.php:337 msgid "Résumé Exercice courant" msgstr "" @@ -17803,6 +17893,7 @@ msgstr "" #: include/balance.inc.php:440 include/export/export_balance_pdf.php:309 #: include/balance.inc.php:458 include/export/export_balance_pdf.php:334 #: include/export/export_balance_pdf.php:329 +#: include/export/export_balance_pdf.php:330 msgid "Résumé Exercice précédent" msgstr "" @@ -18085,7 +18176,7 @@ msgid "" msgstr "Selectionneer plannen DAT u interesseert je op VOOR Zoeken Klikken" #: include/class_anc_print.php:140 include/class_anc_print.php:181 -#: include/lib/message_javascript.php:73 +#: include/lib/message_javascript.php:73 include/lib/message_javascript.php:75 msgid "Selectionnez le plan qui vous intéresse avant de cliquer sur Recherche" msgstr "Selectionneer plannen DAT u interesseert je op VOOR Zoeken Klikken" @@ -18095,7 +18186,7 @@ msgstr "Selectionneer plannen DAT u interesseert je op VOOR Zoeken Klikken" msgid "Selectionnez votre langue" msgstr "Selecteer uw taal" -#: include/class/periode.class.php:648 +#: include/class/periode.class.php:648 include/class/periode.class.php:650 msgid "Septembre" msgstr "" @@ -18139,7 +18230,7 @@ msgid "" "Acc_Ledger_History_Generic" msgstr "" -#: include/lib/message_javascript.php:83 +#: include/lib/message_javascript.php:83 include/lib/message_javascript.php:85 msgid "Si vous changez de page vous perdez les reconciliations, continuez ?" msgstr "" @@ -18234,7 +18325,8 @@ msgstr "Bedrijven" #: include/export/export_balance_pdf.php:135 #: include/class/anc_listing.class.php:120 include/class/fiche.class.php:1784 #: include/class/anc_balance_double.class.php:101 -#: include/class/fiche.class.php:1785 +#: include/class/fiche.class.php:1785 include/export/export_balance_pdf.php:136 +#: include/class/pdfbalance_simple.class.php:58 msgid "Solde" msgstr "evenwicht" @@ -18317,7 +18409,8 @@ msgstr "Sales" #: include/database.item.php:104 include/lib/user_menu.php:124 #: include/lib/user_menu.php:125 include/lib/user_menu.php:144 #: include/database.item.php:107 include/database.item.php:101 -#: include/database.item.php:99 +#: include/database.item.php:99 include/lib/user_menu.php:82 +#: include/lib/user_menu.php:101 msgid "Sortie" msgstr "Uitgang" @@ -18329,7 +18422,7 @@ msgstr "Uitgang" msgid "Sortie ⎆" msgstr "Uitgang" -#: include/class/periode.class.php:521 +#: include/class/periode.class.php:521 include/class/periode.class.php:523 msgid "Status" msgstr "" @@ -18341,6 +18434,7 @@ msgstr "Voorraad" #: include/user_menu.php:150 include/user_menu.php:154 #: include/lib/user_menu.php:163 include/lib/user_menu.php:176 +#: include/lib/user_menu.php:134 msgid "Stock et commande" msgstr "Voorraad in Bestelling" @@ -18880,7 +18974,7 @@ msgstr "Paginaformaat" msgid "Tant que ce n'est pas vous fait vous ne pouvez pas utiliser NOALYSS" msgstr "" -#: include/lib/message_javascript.php:98 +#: include/lib/message_javascript.php:98 include/lib/message_javascript.php:100 msgid "Taper une formule (ex 20*5.1) puis enter" msgstr "" @@ -19132,6 +19226,7 @@ msgstr "Total Credit" #: include/export/export_balance_pdf.php:137 #: include/export/export_balance_pdf.php:134 +#: include/export/export_balance_pdf.php:135 #, fuzzy msgid "Total Crédit" msgstr "Credit Totaal" @@ -19142,6 +19237,7 @@ msgstr "Totaal Debet" #: include/export/export_balance_pdf.php:136 #: include/export/export_balance_pdf.php:133 +#: include/export/export_balance_pdf.php:134 #, fuzzy msgid "Total Débit" msgstr "Debet Totaal" @@ -19521,7 +19617,7 @@ msgstr "Alle Operaties" msgid "Toutes opérations" msgstr "Alle activiteiten" -#: include/lib/message_javascript.php:95 +#: include/lib/message_javascript.php:95 include/lib/message_javascript.php:97 #, fuzzy msgid "Traitement en cours" msgstr "Later in te brengen" @@ -19743,12 +19839,12 @@ msgstr "Telefoon" msgid "URL" msgstr "URL" -#: include/lib/message_javascript.php:96 +#: include/lib/message_javascript.php:96 include/lib/message_javascript.php:98 #, fuzzy msgid "Un instant" msgstr "onbestaand" -#: include/lib/message_javascript.php:77 +#: include/lib/message_javascript.php:77 include/lib/message_javascript.php:79 msgid "Un instant svp" msgstr "" @@ -19893,6 +19989,11 @@ msgstr "Gebruiker" msgid "Utilisateur administrateur" msgstr "Gebruiker" +#: include/lib/database_core.class.php:66 +#, fuzzy, php-format +msgid "Utilisateur : %s" +msgstr "Users" + #: include/param_sec.inc.php:91 include/param_sec.inc.php:95 #: include/param_sec.inc.php:97 #, fuzzy @@ -19969,12 +20070,14 @@ msgstr "Verkeerd login van wachword" #: include/user_menu.php:110 include/user_menu.php:120 #: include/lib/user_menu.php:116 include/lib/user_menu.php:129 #: include/lib/user_menu.php:117 include/lib/user_menu.php:140 +#: include/lib/user_menu.php:74 include/lib/user_menu.php:97 msgid "Utilisateurs" msgstr "Users" #: include/user_menu.php:114 include/user_menu.php:121 #: include/lib/user_menu.php:121 include/lib/user_menu.php:130 #: include/lib/user_menu.php:122 include/lib/user_menu.php:141 +#: include/lib/user_menu.php:79 include/lib/user_menu.php:98 msgid "Utilisateurs qui se sont connectés" msgstr "Gebruikers die zijn aangesloten" @@ -20287,6 +20390,11 @@ msgstr "" msgid "Voir les documents du suivi" msgstr "Zie documenten controle" +#: include/lib/database_core.class.php:62 +#, fuzzy +msgid "Vos paramètres sont incorrectes" +msgstr "Foute e-mail" + #: html/do.php:108 html/user_login.php:75 html/do.php:107 html/do.php:102 #: html/do.php:104 html/user_login.php:76 html/do.php:132 html/do.php:145 #: html/do.php:147 html/do.php:165 html/do.php:189 html/user_login.php:78 @@ -20295,6 +20403,10 @@ msgstr "Zie documenten controle" msgid "Votre base de données n'est pas à jour" msgstr "UW datagegevens is niet van de laatste versie" +#: include/lib/message_javascript.php:103 +msgid "Votre demande est en cours de traitement" +msgstr "" + #: include/upgrade-core.php:42 include/upgrade-core.php:54 #, fuzzy msgid "Votre version est à jour" @@ -20357,7 +20469,7 @@ msgstr "Wilt u deze transactie verwijderen" #: include/lib/class_html_input.php:934 include/lib/class_html_input.php:945 #: include/lib/class_html_input.php:946 include/lib/class_html_input.php:972 #: include/lib/html_input.class.php:1025 include/lib/html_input.class.php:1083 -#: include/lib/html_input.class.php:1084 +#: include/lib/html_input.class.php:1084 include/lib/html_input.class.php:1099 #, fuzzy, php-format msgid "Voulez-vous effacer cette relation " msgstr "Wilt u deze actie wilt verwijderen" @@ -20430,11 +20542,11 @@ msgstr "U bevestigt" #: include/ajax/ajax_add_menu.php:192 include/ajax/ajax_add_menu.php:200 #: include/class/fiche_def.class.php:791 include/class/fiche_def.class.php:796 #: include/ajax/ajax_create_menu.php:13 include/template/stock_inv.php:33 -#: include/lib/message_javascript.php:78 +#: include/lib/message_javascript.php:78 include/lib/message_javascript.php:80 msgid "Vous confirmez ?" msgstr "U bevestigt" -#: include/lib/message_javascript.php:81 +#: include/lib/message_javascript.php:81 include/lib/message_javascript.php:83 #, fuzzy msgid "Vous confirmez effacement ?" msgstr "U bevestigt het wissen" @@ -20458,7 +20570,7 @@ msgstr "U bevestigt het wissen" msgid "Vous confirmez le clonage " msgstr "U bevestigt het klonen" -#: include/lib/message_javascript.php:82 +#: include/lib/message_javascript.php:82 include/lib/message_javascript.php:84 #, fuzzy msgid "Vous confirmez mise à jour ?" msgstr "U bevestigt" @@ -20886,11 +20998,16 @@ msgstr "Foute e-mail" msgid "aucune donnée" msgstr "Geen Gegevens" +#: include/lib/database_core.class.php:64 +#, fuzzy, php-format +msgid "base de donnée = %s" +msgstr "Database" + #: include/ext/coprop/index.php:46 msgid "budgets" msgstr "budgetten" -#: include/lib/message_javascript.php:88 +#: include/lib/message_javascript.php:88 include/lib/message_javascript.php:90 #, fuzzy msgid "calculé" msgstr "Door berekening" @@ -20930,6 +21047,7 @@ msgstr "kiezen" #: include/class/acc_ledger_search.class.php:111 #: include/lib/html_input.class.php:1017 include/lib/html_input.class.php:1018 #: include/class/acc_ledger_search.class.php:112 +#: include/lib/html_input.class.php:1033 msgid "choix des journaux" msgstr "keuze van de dagboeken" @@ -21244,6 +21362,7 @@ msgstr "" #: include/ajax_mod_periode.php:60 include/ajax_mod_periode.php:78 #: include/ajax/ajax_mod_periode.php:60 include/ajax/ajax_mod_periode.php:78 #: include/ajax/ajax_periode.php:176 include/class/periode.class.php:707 +#: include/class/periode.class.php:709 #, fuzzy msgid "fermer" msgstr "Dicht" @@ -21472,7 +21591,7 @@ msgstr "het tarief is ongeldig" msgid "le taux n'est pas un nombre" msgstr "tarief is geen getal" -#: include/lib/message_javascript.php:64 +#: include/lib/message_javascript.php:64 include/lib/message_javascript.php:66 msgid "" "le type vaut :
      \t
    • ME pour Menu
      • \t
    • PR pour les impressions \t
    • PL pour les plugins
      • \t
    • SP pour des valeurs spéciales
      • " @@ -21627,7 +21746,7 @@ msgstr "wordt niet in this journaal" msgid "n'existe pas" msgstr "doorsturingslijst is leeg niet" -#: include/class/periode.class.php:520 +#: include/class/periode.class.php:520 include/class/periode.class.php:522 #, fuzzy msgid "nb opérations" msgstr "Operatie" @@ -21935,6 +22054,7 @@ msgstr "" #: include/export/export_poste_detail_csv.php:39 #: include/export/export_balance_pdf.php:128 #: include/export/export_balance_pdf.php:125 +#: include/export/export_balance_pdf.php:126 msgid "poste" msgstr "post" @@ -22106,7 +22226,7 @@ msgstr "Verzoening" #: include/manager.inc.php:104 include/supplier.inc.php:104 #: include/contact.inc.php:98 include/manager.inc.php:105 #: include/template/action_search.php:152 include/customer.inc.php:103 -#: include/template/action_search.php:148 +#: include/template/action_search.php:148 scenario/select-box-test.php:62 msgid "recherche" msgstr "Zoeken" @@ -22151,6 +22271,7 @@ msgstr "nieuwe regel" #: include/ajax_mod_periode.php:59 include/ajax/ajax_mod_periode.php:59 #: include/ajax/ajax_periode.php:175 include/class/periode.class.php:706 +#: include/class/periode.class.php:708 #, fuzzy msgid "sauver" msgstr "OPSLAAN" diff --git a/include/lib/message_javascript.php b/include/lib/message_javascript.php index 239e42acc..5b17c7e6f 100644 --- a/include/lib/message_javascript.php +++ b/include/lib/message_javascript.php @@ -100,6 +100,7 @@ content[66]=""; content[67]=""; content[68]=""; content[69]=""; +content[70]=""; \ No newline at end of file From 282c53ef9064d85d8a6ca7f471e4d4411cdc3256 Mon Sep 17 00:00:00 2001 From: Dany De Bontridder Date: Wed, 7 Aug 2019 15:23:48 +0200 Subject: [PATCH 15/29] Cosmetic & bug fix for SELECT_BOX --- include/lib/html_input.class.php | 3 ++- include/lib/select_box.class.php | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/include/lib/html_input.class.php b/include/lib/html_input.class.php index 41c118352..421861ca6 100755 --- a/include/lib/html_input.class.php +++ b/include/lib/html_input.class.php @@ -983,10 +983,11 @@ class HtmlInput static function filter_list($p_list_id) { $r=""; + $r.=''; $r.=sprintf('', $p_list_id,$p_list_id,$p_list_id); - $r.=sprintf('',$p_list_id,$p_list_id); + $r.=sprintf('',$p_list_id,$p_list_id,$p_list_id); $r.=''; return $r; } diff --git a/include/lib/select_box.class.php b/include/lib/select_box.class.php index c2eb361c3..82c5547c4 100644 --- a/include/lib/select_box.class.php +++ b/include/lib/select_box.class.php @@ -93,8 +93,8 @@ class Select_Box // Show the filter if there is one, if ( $this->filter != "" ) { - echo $this->filter; - echo HtmlInput::filter_list($list_id); + + echo HtmlInput::filter_list($list_id); } // Print the list of possible options From b21b3bd922a0aa49c27e7ed13f562a38536e374e Mon Sep 17 00:00:00 2001 From: Dany De Bontridder Date: Thu, 8 Aug 2019 01:26:26 +0200 Subject: [PATCH 16/29] New : manage_table_sql has new function (input_custom and display_row_custom) for handling special data --- include/lib/manage_table_sql.class.php | 54 +++++++++++++++++++++++--- 1 file changed, 49 insertions(+), 5 deletions(-) diff --git a/include/lib/manage_table_sql.class.php b/include/lib/manage_table_sql.class.php index 51aef220c..3488a20ea 100644 --- a/include/lib/manage_table_sql.class.php +++ b/include/lib/manage_table_sql.class.php @@ -262,8 +262,11 @@ function check() * select must supply an array of possible values [val=> , label=>] with * the variable $this->key_name->a_value * @param $p_key col name - * @param $p_type is SELECT NUMERIC TEXT or DATE + * @param $p_type is SELECT NUMERIC TEXT , DATE or custom * @param $p_array if type is SELECT an array is expected + * @note if $p_type is custom then a function named input_custom($p_key,$p_value) must be implemented + * in the class + * @see Manage_Table_SQL:input_custom */ function set_col_type($p_key, $p_value, $p_array=NULL) { @@ -271,7 +274,7 @@ function check() throw new Exception("invalid key $p_key"); if (!in_array($p_value, - array("text", "numeric", "date", "select", "timestamp"))) + array("text", "numeric", "date", "select", "timestamp","custom"))) throw new Exception("invalid type $p_value"); $this->a_type[$p_key]=$p_value; @@ -770,7 +773,11 @@ function check() /** * @brief display a data row in the table, with the order defined * in a_order and depending of the visibility of the column + * @param array $p_row contains a row from the database + * @see set_col_type + * @see input_custom * @see display_table + * @see display_row_custom */ function display_row($p_row) { @@ -830,7 +837,11 @@ function check() } - }else { + } elseif ($this->get_col_type($v)=="custom") { + // For custom col + echo td($this->display_row_custom($v,$p_row[$v])); + } + else { echo td($p_row[$v]); } } @@ -844,7 +855,18 @@ function check() echo ''; } - + /** + * For the type custom , we can call a function to display properly the value + * @param $p_key string key name + * @param $p_value string value + * @see input_custom + * @see set_type + * @note must return a string which will be in surrounded by td in the function display_row + * @return string + */ + function display_row_custom($p_key,$p_value) { + return $p_value; + } /** * @brief display into a dialog box the datarow in order * to be appended or modified. Can be override if you need @@ -905,6 +927,9 @@ function check() $min_size=10; $text->size=$min_size; echo $text->input(); + } elseif ($this->a_type[$key]=="custom") + { + $this->input_custom($key,$value); } echo ""; } @@ -919,7 +944,26 @@ function check() } echo ""; } - + /** + * @brief this function let you create your own input , for example for a ITEXT , a IRADIO , ... + * it must be override , there is not default + * @code + * function input_custom($p_key,$p_value) { + * switch ($p_key) { + * case 'name': + * $w=new ICard($p_key,$p_value); + * $w->input(); + * break; + * } + * } + * @endcode + * @parameter string $p_key name of the column + * @parameter string $p_value current value + * @return nothing + */ + function input_custom($p_key,$p_value) { + throw new Exception(__FILE__.":".__LINE__."-"._("non implémenté")); + } /** * @brief Save the record from Request into the DB and returns an XML * to update the Html Element From 282c26a9f0f3612cbb659c6426b7bfa16b66a10d Mon Sep 17 00:00:00 2001 From: Dany De Bontridder Date: Thu, 8 Aug 2019 09:06:44 +0200 Subject: [PATCH 17/29] Task #0001731: Moyen de paiement --- html/ajax_misc.php | 4 +- html/lang/en_US/LC_MESSAGES/messages.po | 90 ++++- html/lang/messages.po | 337 +++++++++++++----- html/lang/nl_NL/LC_MESSAGES/messages.po | 96 ++++- include/ajax/ajax_payment_method.php | 71 ++++ include/class/acc_payment.class.php | 75 +--- include/class/payment_method_mtable.class.php | 144 ++++++++ include/constant.php | 2 +- include/database/payment_method_sql.class.php | 71 ++++ include/lib/message_javascript.php | 3 +- include/payment_middle.inc.php | 134 +------ include/sql/patch/upgrade134.sql | 8 + sql/upgrade.sql | 21 -- 13 files changed, 718 insertions(+), 338 deletions(-) create mode 100644 include/ajax/ajax_payment_method.php create mode 100644 include/class/payment_method_mtable.class.php create mode 100644 include/database/payment_method_sql.class.php create mode 100644 include/sql/patch/upgrade134.sql diff --git a/html/ajax_misc.php b/html/ajax_misc.php index d34d7ee82..912917679 100644 --- a/html/ajax_misc.php +++ b/html/ajax_misc.php @@ -252,7 +252,9 @@ $path = array( // TVA param "tva_parameter"=>"ajax_tva_parameter", // Display all cards using an accounting - "display_all_card"=>"ajax_display_all_card" + "display_all_card"=>"ajax_display_all_card", + // payment_method + "payment_method"=>"ajax_payment_method" ) ; if (array_key_exists($op, $path)) { diff --git a/html/lang/en_US/LC_MESSAGES/messages.po b/html/lang/en_US/LC_MESSAGES/messages.po index 4e8aaabc6..1b5b2be75 100644 --- a/html/lang/en_US/LC_MESSAGES/messages.po +++ b/html/lang/en_US/LC_MESSAGES/messages.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: NOALYSS 672\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-07 15:00+0200\n" -"PO-Revision-Date: 2019-08-07 15:04+0100\n" +"POT-Creation-Date: 2019-08-08 01:27+0200\n" +"PO-Revision-Date: 2019-08-08 01:28+0100\n" "Last-Translator: dany \n" "Language-Team: French \n" "Language: en_US\n" @@ -969,7 +969,7 @@ msgstr "Folder not available" #: html/ajax_misc.php:179 html/ajax_misc.php:257 html/ajax_misc.php:262 #: html/ajax_misc.php:290 html/ajax_misc.php:382 html/ajax_misc.php:384 #: html/ajax_misc.php:390 include/lib/message_javascript.php:90 -#: include/lib/message_javascript.php:92 +#: include/lib/message_javascript.php:92 html/ajax_misc.php:392 msgid "Action non autorisée" msgstr "Unauthorized" @@ -1202,6 +1202,8 @@ msgstr "Help " #: include/lib/manage_table_sql.class.php:652 #: include/class/acc_ledger_search.class.php:248 #: include/class/acc_ledger_search.class.php:250 +#: include/lib/manage_table_sql.class.php:616 +#: include/lib/manage_table_sql.class.php:655 msgid "Ajout" msgstr "Add" @@ -1271,6 +1273,7 @@ msgstr "Add item" #: include/lib/class_html_input.php:958 include/lib/class_html_input.php:984 #: include/lib/html_input.class.php:1037 include/lib/html_input.class.php:1095 #: include/lib/html_input.class.php:1096 include/lib/html_input.class.php:1111 +#: include/lib/html_input.class.php:1112 msgid "Ajout autres" msgstr "Adding others" @@ -3112,7 +3115,7 @@ msgstr "calculator is visible" #: include/template/calendar-list.php:34 include/lib/html_input.class.php:943 #: include/ajax/ajax_calendar_zoom.php:26 include/lib/html_input.class.php:991 #: include/ajax/ajax_calendar_zoom.php:32 include/lib/html_input.class.php:992 -#: include/lib/html_input.class.php:1007 +#: include/lib/html_input.class.php:1007 include/lib/html_input.class.php:1008 msgid "Calendrier" msgstr "Calendar" @@ -3125,6 +3128,7 @@ msgstr "from" #: include/lib/manage_table_sql.class.php:1008 #: include/lib/manage_table_sql.class.php:1028 #: include/lib/manage_table_sql.class.php:1025 +#: include/lib/manage_table_sql.class.php:1069 msgid "Cancel" msgstr "Cancel" @@ -3304,7 +3308,7 @@ msgstr "This plan does not exist" #: html/ajax_misc.php:571 html/ajax_misc.php:613 html/ajax_misc.php:408 #: html/ajax_misc.php:434 html/ajax_misc.php:546 html/ajax_misc.php:548 -#: html/ajax_misc.php:554 +#: html/ajax_misc.php:554 html/ajax_misc.php:556 msgid "Ce plugin n'existe pas " msgstr "No plugin" @@ -3594,7 +3598,8 @@ msgstr "full path to postgresql" #: include/class/acc_ledger.class.php:2185 #: include/class/anc_listing.class.php:76 include/class/fiche.class.php:2246 #: html/user_login.php:158 html/ajax_misc.php:462 -#: include/class/fiche.class.php:2247 +#: include/class/fiche.class.php:2247 html/ajax_misc.php:464 +#: include/lib/manage_table_sql.class.php:634 #, php-format msgid "Cherche" msgstr "Search" @@ -3641,6 +3646,7 @@ msgid "" msgstr "Select the exercice ( N-1 ) to report for the Report As New" #: html/ajax_misc.php:452 html/ajax_misc.php:454 html/ajax_misc.php:460 +#: html/ajax_misc.php:462 msgid "Choisissez la TVA" msgstr "Select the VAT" @@ -3690,6 +3696,11 @@ msgstr "Select another year" msgid "Choisissez un dossier" msgstr "Select your folder" +#: include/class/payment_method_mtable.class.php:77 +#: include/class/payment_method_mtable.class.php:87 +msgid "Choisissez un journal" +msgstr "Select a ledger" + #: include/class_pre_operation.php:281 #: include/class/class_pre_operation.php:281 #: include/class/class_pre_operation.php:284 @@ -3700,6 +3711,10 @@ msgstr "Select a template" msgid "Choisissez un poste" msgstr "Select an accouting" +#: include/class/payment_method_mtable.class.php:115 +msgid "Choisissez un type de fiche" +msgstr "Select a type of card" + #: html/ajax_card.php:295 html/ajax_card.php:297 html/ajax_card.php:298 #: include/ajax/ajax_card.php:278 include/ajax/ajax_card.php:279 #: include/ajax/ajax_card.php:285 include/ajax/ajax_card.php:287 @@ -6056,7 +6071,7 @@ msgstr "Last entries" #: html/ajax_misc.php:196 html/ajax_misc.php:274 html/ajax_misc.php:279 #: html/ajax_misc.php:307 html/ajax_misc.php:399 html/ajax_misc.php:401 -#: html/ajax_misc.php:407 +#: html/ajax_misc.php:407 html/ajax_misc.php:409 msgid "Des actions dépendent de cette catégorie" msgstr "Event depends on this category" @@ -7670,6 +7685,7 @@ msgstr "Removal forbidden" #: include/class/anc_operation.class.php:316 #: include/template/ledger_detail_bottom.php:328 #: include/class/periode.class.php:596 include/class/periode.class.php:601 +#: include/lib/manage_table_sql.class.php:768 msgid "Effacer" msgstr "Remove" @@ -7753,6 +7769,7 @@ msgstr "Remove an operation" #: include/lib/manage_table_sql.class.php:1075 #: include/lib/manage_table_sql.class.php:1095 #: include/lib/manage_table_sql.class.php:1092 +#: include/lib/manage_table_sql.class.php:1136 msgid "Effacé" msgstr "Erased" @@ -7959,6 +7976,10 @@ msgstr "Record" msgid "Enregistrement" msgstr "Record" +#: include/class/payment_method_mtable.class.php:39 +msgid "Enregistrement dans" +msgstr "Recorded in" + #: include/action.common.inc.php:160 include/action.common.inc.php:258 #: include/compta_ach.inc.php:222 include/compta_ven.inc.php:238 #: include/action.common.inc.php:177 include/action.common.inc.php:309 @@ -8175,6 +8196,11 @@ msgstr "Disconnect" msgid "Erreur exercice invalide" msgstr "Invalid exercice" +#: include/class/payment_method_mtable.class.php:140 +#, php-format +msgid "Erreur key %s value %s" +msgstr "Error key %s value %s" + #: html/do.php:196 html/do.php:224 html/do.php:237 html/do.php:239 #: html/do.php:236 html/do.php:273 html/do.php:285 html/do.php:295 #: html/do.php:264 @@ -8407,7 +8433,7 @@ msgstr "exercice is not a number" #: html/ajax_misc.php:197 html/ajax_misc.php:216 html/ajax_misc.php:230 #: html/ajax_misc.php:236 html/ajax_misc.php:314 html/ajax_misc.php:319 #: html/ajax_misc.php:347 html/ajax_misc.php:459 html/ajax_misc.php:461 -#: html/ajax_misc.php:467 +#: html/ajax_misc.php:467 html/ajax_misc.php:469 msgid "Explication" msgstr "Explanation" @@ -8998,6 +9024,7 @@ msgstr "Closed" #: include/class/acc_plan_mtable.class.php:49 include/database.item.php:78 #: include/database.item.php:110 include/category_card.inc.php:75 #: include/template/stock_inv.php:67 +#: include/class/payment_method_mtable.class.php:41 msgid "Fiche" msgstr "Card" @@ -9039,6 +9066,10 @@ msgstr "VAT record" msgid "Fiche contenant" msgstr "Card" +#: include/class/payment_method_mtable.class.php:98 +msgid "Fiche inexistante" +msgstr "Inexistent card" + #: include/ext/import_account/include/class_impacc_csv.php:53 #: include/ext/import_account/include/impacc_csv.class.php:53 msgid "Fiche non disponible pour journal" @@ -10124,7 +10155,7 @@ msgstr "There are %s invalid parameters" #: html/ajax_misc.php:572 html/ajax_misc.php:614 html/ajax_misc.php:409 #: html/ajax_misc.php:435 html/ajax_misc.php:547 html/ajax_misc.php:549 -#: html/ajax_misc.php:555 +#: html/ajax_misc.php:555 html/ajax_misc.php:557 msgid "Il y a une erreur, ce plugin n'existe pas" msgstr "This plugin doesn't exist" @@ -10706,6 +10737,7 @@ msgid "Invalide" msgstr "Invalide" #: html/ajax_misc.php:288 html/ajax_misc.php:290 html/ajax_misc.php:296 +#: html/ajax_misc.php:298 msgid "Invalide type" msgstr "Invalide type" @@ -11754,6 +11786,7 @@ msgstr "label" #: include/class/anc_operation.class.php:298 #: include/class/acc_ledger_history_generic.class.php:770 #: include/export/export_balance_pdf.php:127 +#: include/class/payment_method_mtable.class.php:38 #, php-format msgid "Libellé" msgstr "Label" @@ -11828,6 +11861,12 @@ msgstr "Skipped rows" msgid "Limite dossiers" msgstr "Folders limit" +#: include/lib/message_javascript.php:104 +msgid "" +"Limite le type fiche si vous choisissez la fiche à la saisie, uniquement " +"avec journaux OD" +msgstr "" + #: include/fiche.inc.php:63 include/ext/rapport_avance/index.php:58 #: include/template/calendar.php:10 include/ext/rapport_avance/index.php:60 #: include/ext/listing/index.php:60 include/ext/listing/index.php:58 @@ -12530,6 +12569,7 @@ msgstr "Missing description" #: include/class/anc_operation.class.php:324 #: include/class/anc_operation.class.php:318 #: include/class/anc_operation.class.php:319 +#: include/lib/manage_table_sql.class.php:755 msgid "Modifier" msgstr "Modify" @@ -13980,7 +14020,7 @@ msgstr "New bank statement" #: include/lib/html_input.class.php:1043 #: include/template/action_display_short.php:81 #: include/lib/html_input.class.php:1103 include/lib/html_input.class.php:1104 -#: include/lib/html_input.class.php:1119 +#: include/lib/html_input.class.php:1119 include/lib/html_input.class.php:1120 msgid "Nouvel événement" msgstr "New event" @@ -14373,6 +14413,7 @@ msgstr "MW analytic" #: include/lib/manage_table_sql.class.php:1005 #: include/lib/manage_table_sql.class.php:1025 #: include/lib/manage_table_sql.class.php:1022 +#: include/lib/manage_table_sql.class.php:1066 msgid "OK" msgstr "OK" @@ -16147,6 +16188,10 @@ msgid "" "Pour le passer en unicode, faites-en un backup puis restaurez le fichier reçu" msgstr "To convert it in unicode, do first year in backup restore it" +#: include/lib/message_javascript.php:105 +msgid "Pour les journaux FIN, ce sera la fiche du journal" +msgstr "For the FIN Ledger, it will be the card of the ledger" + #: include/template/impress_cat_card.php:21 msgid "Pour toutes les catégories" msgstr "For all categories" @@ -17958,7 +18003,7 @@ msgstr "Deleted" #: html/ajax_misc.php:196 html/ajax_misc.php:215 html/ajax_misc.php:229 #: html/ajax_misc.php:235 html/ajax_misc.php:313 html/ajax_misc.php:318 #: html/ajax_misc.php:346 html/ajax_misc.php:458 html/ajax_misc.php:460 -#: html/ajax_misc.php:466 +#: html/ajax_misc.php:466 html/ajax_misc.php:468 msgid "Symbole" msgstr "Symbol" @@ -18356,7 +18401,7 @@ msgstr "" #: html/ajax_misc.php:195 html/ajax_misc.php:214 html/ajax_misc.php:228 #: html/ajax_misc.php:234 html/ajax_misc.php:312 html/ajax_misc.php:317 #: html/ajax_misc.php:345 html/ajax_misc.php:457 html/ajax_misc.php:459 -#: html/ajax_misc.php:465 +#: html/ajax_misc.php:465 html/ajax_misc.php:467 msgid "Taux" msgstr "Spleen" @@ -19100,6 +19145,7 @@ msgstr "Type of document" #: include/template/new_mod_payment.php:28 include/payment_middle.inc.php:121 #: include/payment_middle.inc.php:122 +#: include/class/payment_method_mtable.class.php:40 msgid "Type de fiche" msgstr "Type of card" @@ -19196,6 +19242,11 @@ msgstr "A moment please" msgid "Un journal avec ce nom existe déjà" msgstr "This name is already used" +#: include/class/payment_method_mtable.class.php:68 +#: include/class/payment_method_mtable.class.php:92 +msgid "Un libellé est obligatoire" +msgstr "mandatory label" + #: include/profile.inc.php:322 msgid "Un menu ne peut pas dépendre de lui-même" msgstr "A menu can not depend of itself" @@ -19394,6 +19445,10 @@ msgstr "Users" msgid "Utilisateurs qui se sont connectés" msgstr "Connected users" +#: include/class/payment_method_mtable.class.php:42 +msgid "Utilisation dans" +msgstr "Used in " + #: include/company.inc.php:114 include/company.inc.php:133 #: include/company.inc.php:137 msgid "Utilisation de la compta. analytique" @@ -19772,6 +19827,7 @@ msgstr "Do you want to delete this transaction" #: include/lib/class_html_input.php:946 include/lib/class_html_input.php:972 #: include/lib/html_input.class.php:1025 include/lib/html_input.class.php:1083 #: include/lib/html_input.class.php:1084 include/lib/html_input.class.php:1099 +#: include/lib/html_input.class.php:1100 #, php-format msgid "Voulez-vous effacer cette relation " msgstr "Do you want to delete this relation" @@ -20338,7 +20394,7 @@ msgstr "Choose" #: include/class/acc_ledger_search.class.php:111 #: include/lib/html_input.class.php:1017 include/lib/html_input.class.php:1018 #: include/class/acc_ledger_search.class.php:112 -#: include/lib/html_input.class.php:1033 +#: include/lib/html_input.class.php:1033 include/lib/html_input.class.php:1034 msgid "choix des journaux" msgstr "Ledgers" @@ -20378,7 +20434,7 @@ msgstr "Click here to update " #: include/class/pdf_operation.class.php:149 #: include/class/pdf_operation.class.php:194 #: include/class/pdf_operation.class.php:247 html/ajax_misc.php:456 -#: html/ajax_misc.php:458 html/ajax_misc.php:464 +#: html/ajax_misc.php:458 html/ajax_misc.php:464 html/ajax_misc.php:466 msgid "code" msgstr "code" @@ -21014,6 +21070,10 @@ msgstr "Name of the ledger" msgid "non actif" msgstr "Not asset" +#: include/lib/manage_table_sql.class.php:965 +msgid "non implémenté" +msgstr "Not implemented" + #: include/balance_age.inc.php:40 include/balance_age.inc.php:44 #: include/balance_age.inc.php:43 msgid "non lettrées" @@ -21705,7 +21765,7 @@ msgstr "vat" #: html/ajax_misc.php:372 html/ajax_misc.php:377 html/ajax_misc.php:400 #: html/ajax_misc.php:405 html/ajax_misc.php:512 html/ajax_misc.php:517 #: html/ajax_misc.php:514 html/ajax_misc.php:519 html/ajax_misc.php:520 -#: html/ajax_misc.php:525 +#: html/ajax_misc.php:525 html/ajax_misc.php:522 html/ajax_misc.php:527 msgid "tva inconnue" msgstr "VAT unknown" diff --git a/html/lang/messages.po b/html/lang/messages.po index 027811492..74f2de6ba 100644 --- a/html/lang/messages.po +++ b/html/lang/messages.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-07 15:00+0200\n" +"POT-Creation-Date: 2019-08-08 01:27+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -337,12 +337,11 @@ msgstr "" #: include/ajax/ajax_card.php:517 include/ajax/ajax_mod_predf_op.php:54 #: include/cfgledger.inc.php:137 include/template/pcmn_update.php:53 #: include/template/dashboard.php:350 -#: include/template/todo_list_display.php:105 include/payment_middle.inc.php:53 -#: include/cfgledger.inc.php:137 include/compta_fin.inc.php:149 -#: include/ajax/ajax_mod_predf_op.php:54 include/ajax/ajax_card.php:203 -#: include/ajax/ajax_card.php:517 include/report.inc.php:88 -#: include/report.inc.php:103 include/company.inc.php:149 -#: include/class/fiche_def.class.php:812 +#: include/template/todo_list_display.php:105 include/cfgledger.inc.php:137 +#: include/compta_fin.inc.php:149 include/ajax/ajax_mod_predf_op.php:54 +#: include/ajax/ajax_card.php:203 include/ajax/ajax_card.php:517 +#: include/report.inc.php:88 include/report.inc.php:103 +#: include/company.inc.php:149 include/class/fiche_def.class.php:812 msgid "Sauve" msgstr "" @@ -492,7 +491,7 @@ msgstr "" #: include/class/pdf_operation.class.php:149 #: include/class/pdf_operation.class.php:194 #: include/class/pdf_operation.class.php:247 html/ajax_misc.php:456 -#: html/ajax_misc.php:458 html/ajax_misc.php:464 html/ajax_misc.php:464 +#: html/ajax_misc.php:458 html/ajax_misc.php:464 html/ajax_misc.php:466 #: include/class/pdf_operation.class.php:149 #: include/class/pdf_operation.class.php:194 #: include/class/pdf_operation.class.php:247 @@ -502,21 +501,21 @@ msgstr "" #: html/ajax_misc.php:195 html/ajax_misc.php:214 html/ajax_misc.php:228 #: html/ajax_misc.php:234 html/ajax_misc.php:312 html/ajax_misc.php:317 #: html/ajax_misc.php:345 html/ajax_misc.php:457 html/ajax_misc.php:459 -#: html/ajax_misc.php:465 html/ajax_misc.php:465 +#: html/ajax_misc.php:465 html/ajax_misc.php:467 msgid "Taux" msgstr "" #: html/ajax_misc.php:196 html/ajax_misc.php:215 html/ajax_misc.php:229 #: html/ajax_misc.php:235 html/ajax_misc.php:313 html/ajax_misc.php:318 #: html/ajax_misc.php:346 html/ajax_misc.php:458 html/ajax_misc.php:460 -#: html/ajax_misc.php:466 html/ajax_misc.php:466 +#: html/ajax_misc.php:466 html/ajax_misc.php:468 msgid "Symbole" msgstr "" #: html/ajax_misc.php:197 html/ajax_misc.php:216 html/ajax_misc.php:230 #: html/ajax_misc.php:236 html/ajax_misc.php:314 html/ajax_misc.php:319 #: html/ajax_misc.php:347 html/ajax_misc.php:459 html/ajax_misc.php:461 -#: html/ajax_misc.php:467 html/ajax_misc.php:467 +#: html/ajax_misc.php:467 html/ajax_misc.php:469 msgid "Explication" msgstr "" @@ -526,7 +525,7 @@ msgstr "" #: html/ajax_misc.php:372 html/ajax_misc.php:377 html/ajax_misc.php:400 #: html/ajax_misc.php:405 html/ajax_misc.php:512 html/ajax_misc.php:517 #: html/ajax_misc.php:514 html/ajax_misc.php:519 html/ajax_misc.php:520 -#: html/ajax_misc.php:525 html/ajax_misc.php:520 html/ajax_misc.php:525 +#: html/ajax_misc.php:525 html/ajax_misc.php:522 html/ajax_misc.php:527 msgid "tva inconnue" msgstr "" @@ -788,7 +787,9 @@ msgstr "" #: include/template/ledger_detail_bottom.php:88 #: include/template/ledger_detail_misc.php:99 include/ajax/ajax_poste.php:64 #: include/class/acc_plan_mtable.class.php:45 include/class/fiche.class.php:470 -#: include/class/fiche.class.php:469 include/template/fiche_list.php:41 +#: include/class/fiche.class.php:469 +#: include/class/pdfbalance_simple.class.php:55 +#: include/template/fiche_list.php:41 #: include/template/ledger_detail_misc.php:99 #: include/template/ledger_detail_bottom.php:88 #: include/template/operation_detail_misc.php:32 include/ajax/ajax_poste.php:65 @@ -1084,9 +1085,10 @@ msgstr "" #: include/contact.inc.php:98 include/manager.inc.php:105 #: include/template/action_search.php:152 include/customer.inc.php:103 #: include/template/action_search.php:148 scenario/select-box-test.php:62 -#: include/template/action_search.php:148 include/contact.inc.php:98 -#: include/customer.inc.php:103 include/manager.inc.php:105 -#: include/supplier.inc.php:104 include/bank.inc.php:99 include/adm.inc.php:100 +#: scenario/select-box-test.php:62 include/template/action_search.php:148 +#: include/contact.inc.php:98 include/customer.inc.php:103 +#: include/manager.inc.php:105 include/supplier.inc.php:104 +#: include/bank.inc.php:99 include/adm.inc.php:100 msgid "recherche" msgstr "" @@ -1609,8 +1611,8 @@ msgstr "" #: include/template/dashboard.php:21 include/user_detail.inc.php:245 #: include/cat_document.inc.php:85 include/class/anc_key.class.php:352 #: include/class/acc_ledger_search.class.php:250 -#: include/lib/manage_table_sql.class.php:613 -#: include/lib/manage_table_sql.class.php:652 +#: include/lib/manage_table_sql.class.php:616 +#: include/lib/manage_table_sql.class.php:655 msgid "Ajout" msgstr "" @@ -1657,6 +1659,7 @@ msgstr "" #: include/category_card.inc.php:75 #: include/ajax/ajax_anc_detail_operation.php:54 include/database.item.php:78 #: include/database.item.php:110 +#: include/class/payment_method_mtable.class.php:41 #: include/class/anc_group_operation.class.php:121 #: include/class/acc_plan_mtable.class.php:49 include/card_attr.inc.php:83 msgid "Fiche" @@ -1949,6 +1952,7 @@ msgstr "" #: include/class/acc_ledger_fin.class.php:754 #: include/class/anc_operation.class.php:298 #: include/class/acc_ledger_history_generic.class.php:770 +#: include/export/export_balance_pdf.php:127 #: include/template/balance_aged_result.php:50 #: include/template/operation_detail_fin.php:33 #: include/template/acc_ledger_history_financial_oneline.php:35 @@ -1969,6 +1973,7 @@ msgstr "" #: include/export/export_poste_detail_pdf.php:98 #: include/export/export_balance_pdf.php:127 #: include/export/export_gl_csv.php:96 include/balance.inc.php:307 +#: include/class/payment_method_mtable.class.php:38 #: include/class/print_ledger_detail_item.class.php:60 #: include/class/acc_ledger_history_generic.class.php:770 #: include/class/acc_ledger_sold.class.php:703 @@ -3010,8 +3015,10 @@ msgstr "" #: include/class/fiche.class.php:1478 #: include/class/anc_balance_double.class.php:99 #: include/class/acc_ledger_history_generic.class.php:771 -#: include/class/fiche.class.php:1479 include/impress_gl_comptes.inc.php:216 -#: include/template/letter_prop.php:37 include/template/letter_prop.php:80 +#: include/class/fiche.class.php:1479 +#: include/class/pdfbalance_simple.class.php:56 +#: include/impress_gl_comptes.inc.php:216 include/template/letter_prop.php:37 +#: include/template/letter_prop.php:80 #: include/template/ledger_detail_misc.php:102 #: include/template/ledger_detail_bottom.php:91 #: include/template/anc_balance_group.php:49 @@ -3103,8 +3110,10 @@ msgstr "" #: include/class/fiche.class.php:1479 #: include/class/anc_balance_double.class.php:100 #: include/class/acc_ledger_history_generic.class.php:772 -#: include/class/fiche.class.php:1480 include/impress_gl_comptes.inc.php:215 -#: include/template/letter_prop.php:40 include/template/letter_prop.php:83 +#: include/class/fiche.class.php:1480 +#: include/class/pdfbalance_simple.class.php:57 +#: include/impress_gl_comptes.inc.php:215 include/template/letter_prop.php:40 +#: include/template/letter_prop.php:83 #: include/template/ledger_detail_misc.php:103 #: include/template/ledger_detail_bottom.php:92 #: include/template/operation_detail_misc.php:36 @@ -5601,6 +5610,7 @@ msgstr "" #: include/class/anc_listing.class.php:85 #: include/class/pdf_operation.class.php:250 #: include/class/anc_listing.class.php:87 +#: include/class/pdfbalance_simple.class.php:59 #: include/export/export_fiche_balance_csv.php:160 #: include/export/export_poste_detail_csv.php:202 #: include/ajax/ajax_anc_detail_operation.php:57 @@ -5617,7 +5627,7 @@ msgid "Aucun plan défini" msgstr "" #: include/class_anc_print.php:120 include/lib/message_javascript.php:68 -#: include/lib/message_javascript.php:70 +#: include/lib/message_javascript.php:70 include/lib/message_javascript.php:70 msgid "Les dates sont en format DD.MM.YYYY" msgstr "" @@ -5650,6 +5660,7 @@ msgstr "" #: include/class_anc_print.php:140 include/class_anc_print.php:181 #: include/lib/message_javascript.php:73 include/lib/message_javascript.php:75 +#: include/lib/message_javascript.php:75 msgid "Selectionnez le plan qui vous intéresse avant de cliquer sur Recherche" msgstr "" @@ -5936,6 +5947,7 @@ msgstr "" #: include/class/periode.class.php:594 include/class/periode.class.php:599 #: include/class/anc_operation.class.php:316 #: include/template/ledger_detail_bottom.php:328 +#: include/class/periode.class.php:596 include/class/periode.class.php:601 #: include/template/ledger_detail_bottom.php:328 #: include/template/anc_key_input.php:212 include/preod.inc.php:112 #: include/anc_group.inc.php:88 include/dossier.inc.php:281 @@ -5946,7 +5958,7 @@ msgstr "" #: include/class/anc_operation.class.php:317 #: include/class/periode.class.php:596 include/class/periode.class.php:601 #: include/class/document_modele.class.php:71 -#: include/lib/manage_table_sql.class.php:765 include/forecast.inc.php:347 +#: include/lib/manage_table_sql.class.php:768 include/forecast.inc.php:347 #: include/card_attr.inc.php:110 msgid "Effacer" msgstr "" @@ -6083,7 +6095,7 @@ msgstr "" #: include/class/document_type.class.php:75 #: include/class/anc_operation.class.php:319 #: include/class/document_modele.class.php:92 -#: include/lib/manage_table_sql.class.php:752 include/stock_cfg.inc.php:110 +#: include/lib/manage_table_sql.class.php:755 include/stock_cfg.inc.php:110 msgid "Modifier" msgstr "" @@ -6095,8 +6107,7 @@ msgstr "" #: include/ajax/ajax_plugin_detail.php:32 #: include/class/class_document_type.php:83 include/ajax/ajax_add_menu.php:137 #: include/ajax/ajax_add_menu.php:145 include/class/document_type.class.php:83 -#: include/payment_middle.inc.php:46 include/ajax/ajax_add_menu.php:145 -#: include/ajax/ajax_get_menu_detail.php:53 +#: include/ajax/ajax_add_menu.php:145 include/ajax/ajax_get_menu_detail.php:53 #: include/ajax/ajax_plugin_detail.php:32 #: include/class/document_type.class.php:83 msgid "Vous confirmez" @@ -6179,10 +6190,11 @@ msgstr "" #: include/ajax/ajax_add_menu.php:192 include/ajax/ajax_add_menu.php:200 #: include/class/fiche_def.class.php:791 include/class/fiche_def.class.php:796 #: include/ajax/ajax_create_menu.php:13 include/template/stock_inv.php:33 -#: include/lib/message_javascript.php:78 include/template/fiche_list.php:30 -#: include/template/stock_inv.php:33 include/ajax/ajax_create_menu.php:13 -#: include/ajax/ajax_add_menu.php:200 include/class/fiche_def.class.php:791 -#: include/class/fiche_def.class.php:796 include/lib/message_javascript.php:80 +#: include/lib/message_javascript.php:78 include/lib/message_javascript.php:80 +#: include/template/fiche_list.php:30 include/template/stock_inv.php:33 +#: include/ajax/ajax_create_menu.php:13 include/ajax/ajax_add_menu.php:200 +#: include/class/fiche_def.class.php:791 include/class/fiche_def.class.php:796 +#: include/lib/message_javascript.php:80 msgid "Vous confirmez ?" msgstr "" @@ -6365,7 +6377,9 @@ msgstr "" #: include/export/export_balance_pdf.php:135 #: include/class/anc_listing.class.php:120 include/class/fiche.class.php:1784 #: include/class/anc_balance_double.class.php:101 -#: include/class/fiche.class.php:1785 include/template/anc_balance_group.php:51 +#: include/class/fiche.class.php:1785 include/export/export_balance_pdf.php:136 +#: include/class/pdfbalance_simple.class.php:58 +#: include/template/anc_balance_group.php:51 #: include/template/anc_balance_group.php:72 #: include/export/export_gl_pdf.php:88 #: include/export/export_balance_pdf.php:136 @@ -6562,6 +6576,7 @@ msgstr "" #: include/class_ibutton.php:82 include/class_ibutton.php:84 #: include/lib/class_ibutton.php:84 include/lib/ibutton.class.php:84 #: include/lib/message_javascript.php:97 include/lib/message_javascript.php:99 +#: include/lib/message_javascript.php:99 msgid "Calculatrice" msgstr "" @@ -7710,6 +7725,7 @@ msgstr "" #: include/database.item.php:78 include/lib/user_menu.php:123 #: include/lib/user_menu.php:131 include/lib/user_menu.php:124 #: include/lib/user_menu.php:143 include/database.item.php:75 +#: include/lib/user_menu.php:81 include/lib/user_menu.php:100 #: include/database.item.php:73 include/lib/user_menu.php:81 #: include/lib/user_menu.php:100 msgid "Accueil" @@ -7760,7 +7776,8 @@ msgstr "" #: include/database.item.php:104 include/lib/user_menu.php:124 #: include/lib/user_menu.php:125 include/lib/user_menu.php:144 #: include/database.item.php:107 include/database.item.php:101 -#: include/database.item.php:99 include/database.item.php:99 +#: include/database.item.php:99 include/lib/user_menu.php:82 +#: include/lib/user_menu.php:101 include/database.item.php:99 #: include/lib/user_menu.php:82 include/lib/user_menu.php:101 msgid "Sortie" msgstr "" @@ -8642,7 +8659,8 @@ msgstr "" #: include/database.item.php:171 include/database.item.php:176 #: include/ajax/ajax_display_letter.php:116 include/class/periode.class.php:518 #: include/class/periode_ledger_table.class.php:99 -#: include/ajax/ajax_display_letter.php:116 include/database.item.php:171 +#: include/class/periode.class.php:520 include/ajax/ajax_display_letter.php:116 +#: include/database.item.php:171 #: include/class/periode_ledger_table.class.php:99 #: include/class/periode.class.php:520 msgid "Date Fin" @@ -8853,9 +8871,10 @@ msgstr "" #: include/class/acc_ledger_search.class.php:1074 include/database.item.php:209 #: include/database.item.php:220 include/cfgledger.inc.php:170 #: include/class/acc_ledger_search.class.php:1082 -#: include/class/acc_ledger_search.class.php:1095 include/cfgledger.inc.php:170 -#: include/database.item.php:209 include/database.item.php:220 #: include/class/acc_ledger_search.class.php:1095 include/lib/user_menu.php:136 +#: include/cfgledger.inc.php:170 include/database.item.php:209 +#: include/database.item.php:220 include/class/acc_ledger_search.class.php:1095 +#: include/lib/user_menu.php:136 msgid "Financier" msgstr "" @@ -9603,15 +9622,13 @@ msgstr "" #: include/ajax/ajax_admin.php:276 include/cfgledger.inc.php:136 #: include/ajax/ajax_admin.php:254 include/ajax/ajax_admin.php:280 #: include/ajax/ajax_card.php:171 include/cfgledger.inc.php:139 -#: include/payment_middle.inc.php:54 include/cfgledger.inc.php:139 -#: include/ajax/ajax_card.php:171 include/ajax/ajax_admin.php:254 -#: include/ajax/ajax_admin.php:280 +#: include/cfgledger.inc.php:139 include/ajax/ajax_card.php:171 +#: include/ajax/ajax_admin.php:254 include/ajax/ajax_admin.php:280 msgid "Efface" msgstr "" #: include/payment_middle.inc.php:56 include/payment_middle.inc.php:104 #: include/payment_middle.inc.php:55 include/payment_middle.inc.php:105 -#: include/payment_middle.inc.php:106 include/payment_middle.inc.php:55 #: include/payment_middle.inc.php:106 msgid "Retour sans sauver" msgstr "" @@ -9620,7 +9637,7 @@ msgstr "" #: include/anc_pa.inc.php:99 include/anc_pa.inc.php:192 #: include/anc_pa.inc.php:194 include/payment_middle.inc.php:104 #: include/anc_pa.inc.php:57 include/payment_middle.inc.php:105 -#: include/payment_middle.inc.php:105 include/anc_pa.inc.php:57 +#: include/anc_pa.inc.php:57 msgid "Enregistre" msgstr "" @@ -9674,6 +9691,7 @@ msgstr "" #: include/lib/user_menu.php:116 include/lib/user_menu.php:129 #: include/lib/user_menu.php:117 include/lib/user_menu.php:140 #: include/lib/user_menu.php:74 include/lib/user_menu.php:97 +#: include/lib/user_menu.php:74 include/lib/user_menu.php:97 msgid "Utilisateurs" msgstr "" @@ -9681,16 +9699,19 @@ msgstr "" #: include/lib/user_menu.php:116 include/lib/user_menu.php:129 #: include/lib/user_menu.php:117 include/lib/user_menu.php:140 #: include/lib/user_menu.php:74 include/lib/user_menu.php:97 +#: include/lib/user_menu.php:74 include/lib/user_menu.php:97 msgid "Gestion des utilisateurs" msgstr "" #: include/user_menu.php:111 include/lib/user_menu.php:117 #: include/lib/user_menu.php:118 include/lib/user_menu.php:75 +#: include/lib/user_menu.php:75 msgid "Dossiers" msgstr "" #: include/user_menu.php:111 include/lib/user_menu.php:117 #: include/lib/user_menu.php:118 include/lib/user_menu.php:75 +#: include/lib/user_menu.php:75 msgid "Gestion des dossiers" msgstr "" @@ -9698,22 +9719,26 @@ msgstr "" #: include/modele.inc.php:250 include/lib/user_menu.php:118 #: include/modele.inc.php:274 include/lib/user_menu.php:119 #: include/modele.inc.php:257 include/modele.inc.php:258 -#: include/modele.inc.php:258 include/lib/user_menu.php:76 +#: include/lib/user_menu.php:76 include/modele.inc.php:258 +#: include/lib/user_menu.php:76 msgid "Modèles" msgstr "" #: include/user_menu.php:112 include/lib/user_menu.php:118 #: include/lib/user_menu.php:119 include/lib/user_menu.php:76 +#: include/lib/user_menu.php:76 msgid "Gestion des modèles" msgstr "" #: include/user_menu.php:113 include/lib/user_menu.php:119 #: include/lib/user_menu.php:120 include/lib/user_menu.php:77 +#: include/lib/user_menu.php:77 msgid "Restaure" msgstr "" #: include/user_menu.php:113 include/lib/user_menu.php:119 #: include/lib/user_menu.php:120 include/lib/user_menu.php:77 +#: include/lib/user_menu.php:77 msgid "Restaure une base de données" msgstr "" @@ -9721,6 +9746,7 @@ msgstr "" #: include/lib/user_menu.php:121 include/lib/user_menu.php:130 #: include/lib/user_menu.php:122 include/lib/user_menu.php:141 #: include/lib/user_menu.php:79 include/lib/user_menu.php:98 +#: include/lib/user_menu.php:79 include/lib/user_menu.php:98 msgid "Audit" msgstr "" @@ -9728,48 +9754,49 @@ msgstr "" #: include/lib/user_menu.php:121 include/lib/user_menu.php:130 #: include/lib/user_menu.php:122 include/lib/user_menu.php:141 #: include/lib/user_menu.php:79 include/lib/user_menu.php:98 +#: include/lib/user_menu.php:79 include/lib/user_menu.php:98 msgid "Utilisateurs qui se sont connectés" msgstr "" #: include/user_menu.php:147 include/user_menu.php:151 #: include/lib/user_menu.php:160 include/lib/user_menu.php:173 -#: include/lib/user_menu.php:131 +#: include/lib/user_menu.php:131 include/lib/user_menu.php:131 msgid " Hors Bilan" msgstr "" #: include/user_menu.php:148 include/user_menu.php:152 #: include/lib/user_menu.php:161 include/lib/user_menu.php:174 -#: include/lib/user_menu.php:132 +#: include/lib/user_menu.php:132 include/lib/user_menu.php:132 msgid " Immobilisé" msgstr "" #: include/user_menu.php:149 include/user_menu.php:153 #: include/lib/user_menu.php:162 include/lib/user_menu.php:175 -#: include/lib/user_menu.php:133 +#: include/lib/user_menu.php:133 include/lib/user_menu.php:133 msgid "Actif a un an au plus" msgstr "" #: include/user_menu.php:150 include/user_menu.php:154 #: include/lib/user_menu.php:163 include/lib/user_menu.php:176 -#: include/lib/user_menu.php:134 +#: include/lib/user_menu.php:134 include/lib/user_menu.php:134 msgid "Stock et commande" msgstr "" #: include/user_menu.php:151 include/user_menu.php:155 #: include/lib/user_menu.php:164 include/lib/user_menu.php:177 -#: include/lib/user_menu.php:135 +#: include/lib/user_menu.php:135 include/lib/user_menu.php:135 msgid "Compte tiers" msgstr "" #: include/user_menu.php:153 include/user_menu.php:157 #: include/lib/user_menu.php:166 include/lib/user_menu.php:179 -#: include/lib/user_menu.php:137 +#: include/lib/user_menu.php:137 include/lib/user_menu.php:137 msgid "Charges" msgstr "" #: include/user_menu.php:154 include/user_menu.php:158 #: include/lib/user_menu.php:167 include/lib/user_menu.php:180 -#: include/lib/user_menu.php:138 +#: include/lib/user_menu.php:138 include/lib/user_menu.php:138 msgid "Produits" msgstr "" @@ -9778,6 +9805,7 @@ msgstr "" #: include/lib/user_menu.php:168 include/lib/user_menu.php:169 #: include/lib/user_menu.php:181 include/lib/user_menu.php:182 #: include/lib/user_menu.php:139 include/lib/user_menu.php:140 +#: include/lib/user_menu.php:139 include/lib/user_menu.php:140 msgid "Hors Comptabilité" msgstr "" @@ -9937,9 +9965,9 @@ msgstr "" #: include/template/calendar-list.php:34 include/lib/html_input.class.php:943 #: include/ajax/ajax_calendar_zoom.php:26 include/lib/html_input.class.php:991 #: include/ajax/ajax_calendar_zoom.php:32 include/lib/html_input.class.php:992 -#: include/template/dashboard.php:6 include/template/calendar-list.php:34 -#: include/impress_rapport.inc.php:234 include/ajax/ajax_calendar_zoom.php:32 -#: include/lib/html_input.class.php:1007 +#: include/lib/html_input.class.php:1007 include/template/dashboard.php:6 +#: include/template/calendar-list.php:34 include/impress_rapport.inc.php:234 +#: include/ajax/ajax_calendar_zoom.php:32 include/lib/html_input.class.php:1008 msgid "Calendrier" msgstr "" @@ -10934,13 +10962,12 @@ msgstr "" #: include/template/new_mod_payment.php:10 include/payment_middle.inc.php:120 #: include/payment_middle.inc.php:121 include/template/new_mod_payment.php:10 -#: include/payment_middle.inc.php:121 msgid "Pour le journal" msgstr "" #: include/template/new_mod_payment.php:28 include/payment_middle.inc.php:121 #: include/payment_middle.inc.php:122 include/template/new_mod_payment.php:28 -#: include/payment_middle.inc.php:122 +#: include/class/payment_method_mtable.class.php:40 msgid "Type de fiche" msgstr "" @@ -10951,7 +10978,6 @@ msgstr "" #: include/template/new_mod_payment.php:47 include/payment_middle.inc.php:123 #: include/payment_middle.inc.php:124 include/template/new_mod_payment.php:47 -#: include/payment_middle.inc.php:124 msgid "Avec la fiche" msgstr "" @@ -11021,7 +11047,7 @@ msgid "Préfixe pièce justificative" msgstr "" #: include/template/param_jrn.php:94 include/lib/message_javascript.php:70 -#: include/lib/message_javascript.php:72 +#: include/lib/message_javascript.php:72 include/lib/message_javascript.php:72 msgid "" "Le préfixe des pièces doit être différent pour chaque journal, on peut aussi " "utiliser l'année" @@ -11048,7 +11074,7 @@ msgid "La numérotation est propre à chaque journal" msgstr "" #: include/template/param_jrn.php:118 include/lib/message_javascript.php:71 -#: include/lib/message_javascript.php:73 +#: include/lib/message_javascript.php:73 include/lib/message_javascript.php:73 msgid "Laissez à 0 pour ne pas changer le numéro" msgstr "" @@ -11305,8 +11331,9 @@ msgstr "" #: include/class/acc_ledger.class.php:86 include/lib/http_input.class.php:120 #: include/class/acc_ledger.class.php:88 include/class/periode.class.php:235 #: include/lib/http_input.class.php:121 include/class/acc_ledger.class.php:89 -#: include/lib/http_input.class.php:123 include/class/acc_ledger.class.php:89 -#: include/class/periode.class.php:237 include/lib/http_input.class.php:123 +#: include/lib/http_input.class.php:123 include/class/periode.class.php:237 +#: include/class/acc_ledger.class.php:89 include/class/periode.class.php:237 +#: include/lib/http_input.class.php:123 msgid "Paramètre invalide" msgstr "" @@ -11468,6 +11495,7 @@ msgstr "" #: include/ajax/ajax_preference.php:131 include/class/periode.class.php:519 #: include/class/periode_ledger_table.class.php:100 #: include/template/stock_inv.php:126 include/ajax/ajax_preference.php:142 +#: include/class/periode.class.php:521 #: include/template/periode_add_exercice.php:25 #: include/template/stock_state_search.php:35 #: include/template/stock_inv.php:126 include/impress_rapport.inc.php:207 @@ -11520,6 +11548,7 @@ msgstr "" #: include/ext/tva/ext_list_assujetti.class.php:54 #: include/ext/tva/ext_tvagen.class.php:114 #: include/lib/message_javascript.php:94 include/lib/message_javascript.php:96 +#: include/lib/message_javascript.php:96 msgid "Afficher" msgstr "" @@ -11957,7 +11986,7 @@ msgstr "" #: include/lib/manage_table_sql.class.php:1075 #: include/lib/manage_table_sql.class.php:1095 #: include/lib/manage_table_sql.class.php:1092 -#: include/lib/manage_table_sql.class.php:1092 +#: include/lib/manage_table_sql.class.php:1136 msgid "Effacé" msgstr "" @@ -13235,7 +13264,8 @@ msgstr "" #: include/lib/ac_common.php:1209 include/export/export_fiche_detail_csv.php:60 #: include/template/ledger_detail_bottom.php:286 include/lib/ac_common.php:1221 #: include/lib/ac_common.php:1223 include/template/ledger_detail_bottom.php:287 -#: include/lib/ac_common.php:1247 include/template/ledger_detail_bottom.php:287 +#: include/lib/ac_common.php:1247 include/lib/message_javascript.php:102 +#: include/template/ledger_detail_bottom.php:287 #: include/export/export_fiche_detail_csv.php:60 #: include/lib/message_javascript.php:102 include/lib/ac_common.php:1247 msgid "Aucune donnée" @@ -14969,6 +14999,7 @@ msgstr "" #: include/export/export_poste_detail_csv.php:39 #: include/export/export_balance_pdf.php:128 #: include/export/export_balance_pdf.php:125 +#: include/export/export_balance_pdf.php:126 #: include/export/export_poste_detail_csv.php:39 #: include/export/export_balance_pdf.php:126 msgid "poste" @@ -15038,8 +15069,9 @@ msgstr "" #: include/class/acc_ledger_search.class.php:111 #: include/lib/html_input.class.php:1017 include/lib/html_input.class.php:1018 #: include/class/acc_ledger_search.class.php:112 -#: include/class/acc_ledger_search.class.php:112 #: include/lib/html_input.class.php:1033 +#: include/class/acc_ledger_search.class.php:112 +#: include/lib/html_input.class.php:1034 msgid "choix des journaux" msgstr "" @@ -15988,25 +16020,29 @@ msgstr "" #: include/ajax_mod_periode.php:55 include/ajax/ajax_mod_periode.php:55 #: include/ajax/ajax_periode.php:171 include/class/periode.class.php:702 -#: include/ajax/ajax_periode.php:171 include/class/periode.class.php:704 +#: include/class/periode.class.php:704 include/ajax/ajax_periode.php:171 +#: include/class/periode.class.php:704 msgid " Début période : " msgstr "" #: include/ajax_mod_periode.php:56 include/ajax/ajax_mod_periode.php:56 #: include/ajax/ajax_periode.php:172 include/class/periode.class.php:703 -#: include/ajax/ajax_periode.php:172 include/class/periode.class.php:705 +#: include/class/periode.class.php:705 include/ajax/ajax_periode.php:172 +#: include/class/periode.class.php:705 msgid " Fin période : " msgstr "" #: include/ajax_mod_periode.php:57 include/ajax/ajax_mod_periode.php:57 #: include/ajax/ajax_periode.php:173 include/class/periode.class.php:704 -#: include/ajax/ajax_periode.php:173 include/class/periode.class.php:706 +#: include/class/periode.class.php:706 include/ajax/ajax_periode.php:173 +#: include/class/periode.class.php:706 msgid " Exercice : " msgstr "" #: include/ajax_mod_periode.php:59 include/ajax/ajax_mod_periode.php:59 #: include/ajax/ajax_periode.php:175 include/class/periode.class.php:706 -#: include/ajax/ajax_periode.php:175 include/class/periode.class.php:708 +#: include/class/periode.class.php:708 include/ajax/ajax_periode.php:175 +#: include/class/periode.class.php:708 msgid "sauver" msgstr "" @@ -16427,6 +16463,7 @@ msgstr "" #: include/lib/class_html_input.php:946 include/lib/class_html_input.php:972 #: include/lib/html_input.class.php:1025 include/lib/html_input.class.php:1083 #: include/lib/html_input.class.php:1084 include/lib/html_input.class.php:1099 +#: include/lib/html_input.class.php:1100 #, php-format msgid "Voulez-vous effacer cette relation " msgstr "" @@ -16438,6 +16475,7 @@ msgstr "" #: include/lib/class_html_input.php:958 include/lib/class_html_input.php:984 #: include/lib/html_input.class.php:1037 include/lib/html_input.class.php:1095 #: include/lib/html_input.class.php:1096 include/lib/html_input.class.php:1111 +#: include/lib/html_input.class.php:1112 msgid "Ajout autres" msgstr "" @@ -17852,7 +17890,7 @@ msgstr "" #: include/ajax/ajax_display_letter.php:98 #: include/ajax/ajax_display_letter.php:103 include/class/periode.class.php:517 #: include/class/periode_ledger_table.class.php:98 -#: include/ajax/ajax_display_letter.php:103 +#: include/class/periode.class.php:519 include/ajax/ajax_display_letter.php:103 #: include/class/periode_ledger_table.class.php:98 #: include/class/periode.class.php:519 msgid "Date Début" @@ -18190,13 +18228,14 @@ msgstr "" #: html/ajax_misc.php:179 html/ajax_misc.php:257 html/ajax_misc.php:262 #: html/ajax_misc.php:290 html/ajax_misc.php:382 html/ajax_misc.php:384 #: html/ajax_misc.php:390 include/lib/message_javascript.php:90 -#: html/ajax_misc.php:390 include/lib/message_javascript.php:92 +#: include/lib/message_javascript.php:92 html/ajax_misc.php:392 +#: include/lib/message_javascript.php:92 msgid "Action non autorisée" msgstr "" #: html/ajax_misc.php:196 html/ajax_misc.php:274 html/ajax_misc.php:279 #: html/ajax_misc.php:307 html/ajax_misc.php:399 html/ajax_misc.php:401 -#: html/ajax_misc.php:407 html/ajax_misc.php:407 +#: html/ajax_misc.php:407 html/ajax_misc.php:409 msgid "Des actions dépendent de cette catégorie" msgstr "" @@ -18317,7 +18356,8 @@ msgstr "" #: include/ajax_mod_periode.php:60 include/ajax_mod_periode.php:78 #: include/ajax/ajax_mod_periode.php:60 include/ajax/ajax_mod_periode.php:78 #: include/ajax/ajax_periode.php:176 include/class/periode.class.php:707 -#: include/ajax/ajax_periode.php:176 include/class/periode.class.php:709 +#: include/class/periode.class.php:709 include/ajax/ajax_periode.php:176 +#: include/class/periode.class.php:709 msgid "fermer" msgstr "" @@ -18389,8 +18429,9 @@ msgstr "" #: include/lib/html_input.class.php:1043 #: include/template/action_display_short.php:81 #: include/lib/html_input.class.php:1103 include/lib/html_input.class.php:1104 -#: include/template/action_display_short.php:81 #: include/lib/html_input.class.php:1119 +#: include/template/action_display_short.php:81 +#: include/lib/html_input.class.php:1120 msgid "Nouvel événement" msgstr "" @@ -18425,12 +18466,11 @@ msgstr "" #: include/payment_middle.inc.php:119 #: include/ext/importbank/bank_constant.php:56 -#: include/payment_middle.inc.php:120 include/payment_middle.inc.php:120 +#: include/payment_middle.inc.php:120 msgid "Libelle" msgstr "" #: include/payment_middle.inc.php:122 include/payment_middle.inc.php:123 -#: include/payment_middle.inc.php:123 msgid "Enregistré dans le journal" msgstr "" @@ -18706,6 +18746,7 @@ msgstr "" #: include/lib/class_database.php:429 include/lib/class_database.php:434 #: include/lib/database.class.php:433 include/lib/database.class.php:442 #: include/lib/database.class.php:443 include/class/database.class.php:125 +#: include/class/database.class.php:125 msgid "Base de donnée vide" msgstr "" @@ -18847,13 +18888,13 @@ msgstr "" #: html/ajax_misc.php:571 html/ajax_misc.php:613 html/ajax_misc.php:408 #: html/ajax_misc.php:434 html/ajax_misc.php:546 html/ajax_misc.php:548 -#: html/ajax_misc.php:554 html/ajax_misc.php:554 +#: html/ajax_misc.php:554 html/ajax_misc.php:556 msgid "Ce plugin n'existe pas " msgstr "" #: html/ajax_misc.php:572 html/ajax_misc.php:614 html/ajax_misc.php:409 #: html/ajax_misc.php:435 html/ajax_misc.php:547 html/ajax_misc.php:549 -#: html/ajax_misc.php:555 html/ajax_misc.php:555 +#: html/ajax_misc.php:555 html/ajax_misc.php:557 msgid "Il y a une erreur, ce plugin n'existe pas" msgstr "" @@ -20006,8 +20047,9 @@ msgstr "" #: html/install.php:271 html/install.php:277 html/install.php:228 #: html/install.php:235 include/upgrade-plugin.php:113 #: include/lib/user_menu.php:121 html/install.php:238 -#: include/upgrade-plugin.php:125 html/install.php:238 -#: include/lib/user_menu.php:78 include/upgrade-plugin.php:125 +#: include/upgrade-plugin.php:125 include/lib/user_menu.php:78 +#: html/install.php:238 include/lib/user_menu.php:78 +#: include/upgrade-plugin.php:125 msgid "Installation" msgstr "" @@ -20176,6 +20218,7 @@ msgstr "" #: include/lib/user_menu.php:122 include/lib/user_menu.php:123 #: include/lib/user_menu.php:142 include/lib/user_menu.php:80 +#: include/lib/user_menu.php:99 include/lib/user_menu.php:80 #: include/lib/user_menu.php:99 msgid "Information système" msgstr "" @@ -20228,7 +20271,7 @@ msgstr "" #: include/class/anc_listing.class.php:76 include/class/fiche.class.php:2246 #: html/user_login.php:158 html/ajax_misc.php:462 #: include/class/fiche.class.php:2247 html/user_login.php:158 -#: html/ajax_misc.php:462 include/user.inc.php:138 +#: html/ajax_misc.php:464 include/user.inc.php:138 #: include/template/todo_list_list_user.php:31 #: include/template/anc_key_display_list.php:28 #: include/template/tag_search_select.php:12 include/template/tag_select.php:16 @@ -20240,7 +20283,7 @@ msgstr "" #: include/balance.inc.php:302 include/class/pre_operation.class.php:289 #: include/class/acc_ledger.class.php:2185 #: include/class/anc_listing.class.php:76 include/class/fiche.class.php:2247 -#: include/lib/manage_table_sql.class.php:631 +#: include/lib/manage_table_sql.class.php:634 #, php-format msgid "Cherche" msgstr "" @@ -20654,6 +20697,7 @@ msgid "" msgstr "" #: include/lib/message_javascript.php:64 include/lib/message_javascript.php:66 +#: include/lib/message_javascript.php:66 msgid "" "le type vaut :
        \t
      • ME pour Menu
        • \t
      • PR pour les impressions \t
      • PL pour les plugins
        • \t
      • SP pour des valeurs spéciales
        • " @@ -20661,10 +20705,12 @@ msgid "" msgstr "" #: include/lib/message_javascript.php:65 include/lib/message_javascript.php:67 +#: include/lib/message_javascript.php:67 msgid "Cliquez sur le code AD pour ouvrir le menu dans un nouvel onglet" msgstr "" #: include/lib/message_javascript.php:66 include/lib/message_javascript.php:68 +#: include/lib/message_javascript.php:68 msgid "Cliquez sur le chemin pour ouvrir le menu" msgstr "" @@ -20675,6 +20721,7 @@ msgid "" msgstr "" #: include/lib/message_javascript.php:69 include/lib/message_javascript.php:71 +#: include/lib/message_javascript.php:71 msgid "" "La numérotation est propre à chaque journal. Laissez à 0 pour ne pas changer " "le numéro" @@ -20712,6 +20759,7 @@ msgid "" msgstr "" #: include/lib/message_javascript.php:67 include/lib/message_javascript.php:69 +#: include/lib/message_javascript.php:69 msgid "" "En utilisant les dates d échéance ou de paiement, seuls les journaux de type " "ACH et VEN seront utilisés ,vous excluez d office les autres journaux" @@ -21666,6 +21714,7 @@ msgstr "" #: include/lib/class_sendmail.php:96 include/lib/class_sendmail.php:97 #: include/lib/class_sendmail.php:98 include/lib/sendmail.class.php:98 #: include/lib/sendmail.class.php:102 include/lib/sendmail_core.class.php:105 +#: include/lib/sendmail_core.class.php:105 #, php-format msgid "%s est vide" msgstr "" @@ -21673,6 +21722,7 @@ msgstr "" #: include/lib/class_sendmail.php:152 include/lib/class_sendmail.php:153 #: include/lib/class_sendmail.php:155 include/lib/sendmail.class.php:157 #: include/lib/sendmail.class.php:161 include/class/sendmail.class.php:38 +#: include/class/sendmail.class.php:38 msgid "Email non envoyé" msgstr "" @@ -21848,6 +21898,7 @@ msgstr "" #: include/balance.inc.php:440 include/export/export_balance_pdf.php:309 #: include/balance.inc.php:458 include/export/export_balance_pdf.php:334 #: include/export/export_balance_pdf.php:329 +#: include/export/export_balance_pdf.php:330 #: include/export/export_balance_pdf.php:330 include/balance.inc.php:458 msgid "Résumé Exercice précédent" msgstr "" @@ -21856,6 +21907,7 @@ msgstr "" #: include/balance.inc.php:447 include/export/export_balance_pdf.php:316 #: include/balance.inc.php:465 include/export/export_balance_pdf.php:341 #: include/export/export_balance_pdf.php:336 +#: include/export/export_balance_pdf.php:337 #: include/export/export_balance_pdf.php:337 include/balance.inc.php:465 msgid "Résumé Exercice courant" msgstr "" @@ -21891,7 +21943,7 @@ msgstr "" #: include/lib/manage_table_sql.class.php:1005 #: include/lib/manage_table_sql.class.php:1025 #: include/lib/manage_table_sql.class.php:1022 -#: include/lib/manage_table_sql.class.php:1022 +#: include/lib/manage_table_sql.class.php:1066 msgid "OK" msgstr "" @@ -21900,7 +21952,7 @@ msgstr "" #: include/lib/manage_table_sql.class.php:1008 #: include/lib/manage_table_sql.class.php:1028 #: include/lib/manage_table_sql.class.php:1025 -#: include/lib/manage_table_sql.class.php:1025 +#: include/lib/manage_table_sql.class.php:1069 msgid "Cancel" msgstr "" @@ -22324,6 +22376,7 @@ msgid "Invalide value" msgstr "" #: include/lib/message_javascript.php:72 include/lib/message_javascript.php:74 +#: include/lib/message_javascript.php:74 msgid "Mettez le pourcentage
        à zéro pour effacer la ligne" msgstr "" @@ -22352,6 +22405,7 @@ msgstr "" #: include/export/export_balance_pdf.php:127 #: include/export/export_balance_pdf.php:124 #: include/export/export_balance_pdf.php:125 +#: include/export/export_balance_pdf.php:125 msgid "Balance comptable" msgstr "" @@ -22722,12 +22776,12 @@ msgid "Vous n'avez encore sauvé aucun modèle" msgstr "" #: html/ajax_misc.php:288 html/ajax_misc.php:290 html/ajax_misc.php:296 -#: html/ajax_misc.php:296 +#: html/ajax_misc.php:298 msgid "Invalide type" msgstr "" #: html/ajax_misc.php:452 html/ajax_misc.php:454 html/ajax_misc.php:460 -#: html/ajax_misc.php:460 +#: html/ajax_misc.php:462 msgid "Choisissez la TVA" msgstr "" @@ -22795,6 +22849,7 @@ msgstr "" #: include/balance.inc.php:314 include/export/export_balance_pdf.php:135 #: include/class/acc_operation.class.php:727 #: include/export/export_balance_pdf.php:132 +#: include/export/export_balance_pdf.php:133 #: include/export/export_balance_pdf.php:133 include/balance.inc.php:314 #: include/class/acc_operation.class.php:727 msgid "Ouverture" @@ -22889,7 +22944,8 @@ msgid "Ajout exercice" msgstr "" #: include/periode.inc.php:113 include/class/periode.class.php:687 -#: include/periode.inc.php:113 include/class/periode.class.php:689 +#: include/class/periode.class.php:689 include/periode.inc.php:113 +#: include/class/periode.class.php:689 msgid "Ajout période" msgstr "" @@ -23145,14 +23201,17 @@ msgid "Cliquez pour éditer" msgstr "" #: include/lib/message_javascript.php:74 include/lib/message_javascript.php:76 +#: include/lib/message_javascript.php:76 msgid "Autoliquidation : Utilisé en même temps au crédit et au débit" msgstr "" #: include/lib/message_javascript.php:75 include/lib/message_javascript.php:77 +#: include/lib/message_javascript.php:77 msgid "Ne donner pas ce poste comptable si ce code n'est pas utilisé à l'achat" msgstr "" #: include/lib/message_javascript.php:76 include/lib/message_javascript.php:78 +#: include/lib/message_javascript.php:78 msgid "" "Ne donner pas ce poste comptable si ce code n'est pas utilisé à la vente" msgstr "" @@ -23163,6 +23222,7 @@ msgid "Encodage invalide" msgstr "" #: include/lib/user_menu.php:121 include/lib/user_menu.php:78 +#: include/lib/user_menu.php:78 msgid "Installation Mise à jour du système et des bases de données" msgstr "" @@ -23266,12 +23326,14 @@ msgstr "" #: include/export/export_balance_pdf.php:136 #: include/export/export_balance_pdf.php:133 #: include/export/export_balance_pdf.php:134 +#: include/export/export_balance_pdf.php:134 msgid "Total Débit" msgstr "" #: include/export/export_balance_pdf.php:137 #: include/export/export_balance_pdf.php:134 #: include/export/export_balance_pdf.php:135 +#: include/export/export_balance_pdf.php:135 msgid "Total Crédit" msgstr "" @@ -23428,50 +23490,61 @@ msgid "Installé le %s" msgstr "" #: include/class/periode.class.php:251 include/class/periode.class.php:253 +#: include/class/periode.class.php:253 msgid "Période chevauchant une autre" msgstr "" #: include/class/periode.class.php:421 include/class/periode.class.php:423 +#: include/class/periode.class.php:423 msgid "Exercice n'est pas un nombre" msgstr "" #: include/class/periode.class.php:424 include/class/periode.class.php:426 +#: include/class/periode.class.php:426 #, php-format msgid "Exercice doit être entre %s et %s " msgstr "" #: include/class/periode.class.php:427 include/class/periode.class.php:429 +#: include/class/periode.class.php:429 msgid "Année n'est pas un nombre" msgstr "" #: include/class/periode.class.php:430 include/class/periode.class.php:432 +#: include/class/periode.class.php:432 #, php-format msgid "Année doit être entre %s et %s " msgstr "" #: include/class/periode.class.php:434 include/class/periode.class.php:436 +#: include/class/periode.class.php:436 msgid "Nombre de mois n'est pas un nombre" msgstr "" #: include/class/periode.class.php:436 include/class/periode.class.php:438 +#: include/class/periode.class.php:438 msgid "Nombre de mois doit être compris entre 1 & 60 " msgstr "" #: include/class/periode.class.php:438 include/class/periode.class.php:440 -#: include/class/periode.class.php:440 include/class/periode.class.php:442 +#: include/class/periode.class.php:442 include/class/periode.class.php:440 +#: include/class/periode.class.php:442 msgid "Mois de début n'existe pas " msgstr "" #: include/class/periode.class.php:520 include/class/periode.class.php:522 +#: include/class/periode.class.php:522 msgid "nb opérations" msgstr "" #: include/class/periode.class.php:521 include/class/periode.class.php:523 +#: include/class/periode.class.php:523 msgid "Status" msgstr "" #: include/class/periode.class.php:585 #: include/class/periode_ledger_table.class.php:142 +#: include/class/periode.class.php:587 #: include/class/periode_ledger_table.class.php:142 #: include/class/periode.class.php:587 msgid "Fermée" @@ -23480,6 +23553,7 @@ msgstr "" #: include/class/periode.class.php:585 #: include/class/periode_ledger_table.class.php:142 #: include/class/periode_ledger_table.class.php:144 +#: include/class/periode.class.php:587 #: include/class/periode_ledger_table.class.php:142 #: include/class/periode_ledger_table.class.php:144 #: include/class/periode.class.php:587 @@ -23487,58 +23561,72 @@ msgid "Ouvert" msgstr "" #: include/class/periode.class.php:647 include/class/periode.class.php:649 +#: include/class/periode.class.php:649 msgid "Janvier" msgstr "" #: include/class/periode.class.php:647 include/class/periode.class.php:649 +#: include/class/periode.class.php:649 msgid "Février" msgstr "" #: include/class/periode.class.php:647 include/class/periode.class.php:649 +#: include/class/periode.class.php:649 msgid "Mars" msgstr "" #: include/class/periode.class.php:647 include/class/periode.class.php:649 +#: include/class/periode.class.php:649 msgid "Avril" msgstr "" #: include/class/periode.class.php:648 include/class/periode.class.php:650 +#: include/class/periode.class.php:650 msgid "Mai" msgstr "" #: include/class/periode.class.php:648 include/class/periode.class.php:650 +#: include/class/periode.class.php:650 msgid "Juin" msgstr "" #: include/class/periode.class.php:648 include/class/periode.class.php:650 +#: include/class/periode.class.php:650 msgid "Juillet" msgstr "" #: include/class/periode.class.php:648 include/class/periode.class.php:650 +#: include/class/periode.class.php:650 msgid "Août" msgstr "" #: include/class/periode.class.php:648 include/class/periode.class.php:650 +#: include/class/periode.class.php:650 msgid "Septembre" msgstr "" #: include/class/periode.class.php:649 include/class/periode.class.php:651 +#: include/class/periode.class.php:651 msgid "Octobre" msgstr "" #: include/class/periode.class.php:649 include/class/periode.class.php:651 +#: include/class/periode.class.php:651 msgid "Novembre" msgstr "" #: include/class/periode.class.php:649 include/class/periode.class.php:651 +#: include/class/periode.class.php:651 msgid "Décembre" msgstr "" #: include/class/periode.class.php:673 include/class/periode.class.php:675 +#: include/class/periode.class.php:675 msgid "Effacement impossible" msgstr "" #: include/class/periode.class.php:688 include/class/periode.class.php:690 +#: include/class/periode.class.php:690 msgid "On ne peut ajouter une période que sur un exercice qui existe déjà" msgstr "" @@ -23837,6 +23925,7 @@ msgstr "" #: include/export/export_balance_pdf.php:109 #: include/export/export_balance_pdf.php:110 +#: include/export/export_balance_pdf.php:110 #, php-format msgid "Du %s au %s" msgstr "" @@ -23942,99 +24031,121 @@ msgid "Poste Analytique" msgstr "" #: include/lib/message_javascript.php:77 include/lib/message_javascript.php:79 +#: include/lib/message_javascript.php:79 msgid "Un instant svp" msgstr "" #: include/lib/message_javascript.php:79 include/lib/message_javascript.php:81 +#: include/lib/message_javascript.php:81 msgid "Echec " msgstr "" #: include/lib/message_javascript.php:80 include/lib/message_javascript.php:82 +#: include/lib/message_javascript.php:82 msgid "Echec donnée manquante ou incorrecte" msgstr "" #: include/lib/message_javascript.php:81 include/lib/message_javascript.php:83 +#: include/lib/message_javascript.php:83 msgid "Vous confirmez effacement ?" msgstr "" #: include/lib/message_javascript.php:82 include/lib/message_javascript.php:84 +#: include/lib/message_javascript.php:84 msgid "Vous confirmez mise à jour ?" msgstr "" #: include/lib/message_javascript.php:83 include/lib/message_javascript.php:85 +#: include/lib/message_javascript.php:85 msgid "Si vous changez de page vous perdez les reconciliations, continuez ?" msgstr "" #: include/lib/message_javascript.php:84 include/lib/message_javascript.php:86 +#: include/lib/message_javascript.php:86 msgid "Echec réponse" msgstr "" #: include/lib/message_javascript.php:85 include/lib/message_javascript.php:87 +#: include/lib/message_javascript.php:87 msgid "Désolé, les montants pour la comptabilité analytique sont incorrects" msgstr "" #: include/lib/message_javascript.php:86 include/lib/message_javascript.php:88 +#: include/lib/message_javascript.php:88 msgid "Maximum 15 lignes" msgstr "" #: include/lib/message_javascript.php:87 include/lib/message_javascript.php:89 +#: include/lib/message_javascript.php:89 msgid "Maximum" msgstr "" #: include/lib/message_javascript.php:88 include/lib/message_javascript.php:90 +#: include/lib/message_javascript.php:90 msgid "calculé" msgstr "" #: include/lib/message_javascript.php:89 include/lib/message_javascript.php:91 +#: include/lib/message_javascript.php:91 msgid "Balance incorrecte D/C" msgstr "" #: include/lib/message_javascript.php:91 include/lib/message_javascript.php:93 +#: include/lib/message_javascript.php:93 msgid "Donnée manquante ou déjà supprimée" msgstr "" #: include/lib/message_javascript.php:92 include/lib/message_javascript.php:94 +#: include/lib/message_javascript.php:94 msgid "Désolé, événement en cours de création à sauver" msgstr "" #: include/lib/message_javascript.php:93 include/lib/message_javascript.php:95 +#: include/lib/message_javascript.php:95 msgid "Cacher" msgstr "" #: include/lib/message_javascript.php:95 include/lib/message_javascript.php:97 +#: include/lib/message_javascript.php:97 msgid "Traitement en cours" msgstr "" #: include/lib/message_javascript.php:96 include/lib/message_javascript.php:98 +#: include/lib/message_javascript.php:98 msgid "Un instant" msgstr "" #: include/lib/message_javascript.php:98 include/lib/message_javascript.php:100 +#: include/lib/message_javascript.php:100 msgid "Taper une formule (ex 20*5.1) puis enter" msgstr "" #: include/lib/message_javascript.php:99 include/lib/message_javascript.php:101 +#: include/lib/message_javascript.php:101 msgid "" "Calculatrice simplifiée: écrivez simplement les opérations que vous voulez " "puis la touche retour. exemple : 1+2+3*(1/5)" msgstr "" +#: include/class/pre_operation.class.php:149 #: include/class/pre_operation.class.php:149 #, php-format msgid "Echec PreOperatoin chargement %s" msgstr "" +#: include/class/pdfbalance_simple.class.php:35 #: include/class/pdfbalance_simple.class.php:35 #, php-format msgid "Balance simple %s" msgstr "" +#: include/class/pdfbalance_simple.class.php:45 #: include/class/pdfbalance_simple.class.php:45 #, php-format msgid "Balance simple poste %s %s date %s %s" msgstr "" -#: include/lib/message_javascript.php:65 +#: include/lib/message_javascript.php:65 include/lib/message_javascript.php:65 msgid "" "

        Remarque : choix possibles

        • Détail " "opérations ne donne pas le même résultat si on regarde tous les journaux ou " @@ -24046,41 +24157,95 @@ msgid "" "pour chaque opération, le total de la TVA, ND, ...
        " msgstr "" +#: include/lib/message_javascript.php:103 #: include/lib/message_javascript.php:103 msgid "Votre demande est en cours de traitement" msgstr "" +#: include/lib/database_core.class.php:60 #: include/lib/database_core.class.php:60 msgid "Impossible de se connecter à postgreSql" msgstr "" +#: include/lib/database_core.class.php:62 #: include/lib/database_core.class.php:62 msgid "Vos paramètres sont incorrectes" msgstr "" +#: include/lib/database_core.class.php:64 #: include/lib/database_core.class.php:64 #, php-format msgid "base de donnée = %s" msgstr "" +#: include/lib/database_core.class.php:65 #: include/lib/database_core.class.php:65 #, php-format msgid "Port %s" msgstr "" +#: include/lib/database_core.class.php:66 #: include/lib/database_core.class.php:66 #, php-format msgid "Utilisateur : %s" msgstr "" +#: include/lib/database_core.class.php:71 #: include/lib/database_core.class.php:71 msgid "Erreur de connexion !" msgstr "" +#: include/lib/database_core.class.php:73 #: include/lib/database_core.class.php:73 msgid "Erreur Connexion" msgstr "" +#: include/lib/database_core.class.php:464 #: include/lib/database_core.class.php:464 msgid "Database:get_row retourne trop de lignes" msgstr "" + +#: include/class/payment_method_mtable.class.php:39 +msgid "Enregistrement dans" +msgstr "" + +#: include/class/payment_method_mtable.class.php:42 +msgid "Utilisation dans" +msgstr "" + +#: include/class/payment_method_mtable.class.php:68 +#: include/class/payment_method_mtable.class.php:92 +msgid "Un libellé est obligatoire" +msgstr "" + +#: include/class/payment_method_mtable.class.php:77 +#: include/class/payment_method_mtable.class.php:87 +msgid "Choisissez un journal" +msgstr "" + +#: include/class/payment_method_mtable.class.php:98 +msgid "Fiche inexistante" +msgstr "" + +#: include/class/payment_method_mtable.class.php:115 +msgid "Choisissez un type de fiche" +msgstr "" + +#: include/class/payment_method_mtable.class.php:140 +#, php-format +msgid "Erreur key %s value %s" +msgstr "" + +#: include/lib/message_javascript.php:104 +msgid "" +"Limite le type fiche si vous choisissez la fiche à la saisie, uniquement " +"avec journaux OD" +msgstr "" + +#: include/lib/message_javascript.php:105 +msgid "Pour les journaux FIN, ce sera la fiche du journal" +msgstr "" + +#: include/lib/manage_table_sql.class.php:965 +msgid "non implémenté" +msgstr "" diff --git a/html/lang/nl_NL/LC_MESSAGES/messages.po b/html/lang/nl_NL/LC_MESSAGES/messages.po index 72550f00c..b6b340622 100644 --- a/html/lang/nl_NL/LC_MESSAGES/messages.po +++ b/html/lang/nl_NL/LC_MESSAGES/messages.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: NOALYSS\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-07 15:00+0200\n" +"POT-Creation-Date: 2019-08-08 01:27+0200\n" "PO-Revision-Date: 2019-07-31 13:23+0100\n" "Last-Translator: dany \n" "Language-Team: English \n" @@ -967,7 +967,7 @@ msgstr "Actie is ontoegankelijk" #: html/ajax_misc.php:179 html/ajax_misc.php:257 html/ajax_misc.php:262 #: html/ajax_misc.php:290 html/ajax_misc.php:382 html/ajax_misc.php:384 #: html/ajax_misc.php:390 include/lib/message_javascript.php:90 -#: include/lib/message_javascript.php:92 +#: include/lib/message_javascript.php:92 html/ajax_misc.php:392 #, fuzzy msgid "Action non autorisée" msgstr "Bewerking Opgeslagen" @@ -1206,6 +1206,8 @@ msgstr "Hulp voor de wiki" #: include/lib/manage_table_sql.class.php:652 #: include/class/acc_ledger_search.class.php:248 #: include/class/acc_ledger_search.class.php:250 +#: include/lib/manage_table_sql.class.php:616 +#: include/lib/manage_table_sql.class.php:655 msgid "Ajout" msgstr "Toevoeging" @@ -1278,6 +1280,7 @@ msgstr "Artikel toevoegen" #: include/lib/class_html_input.php:958 include/lib/class_html_input.php:984 #: include/lib/html_input.class.php:1037 include/lib/html_input.class.php:1095 #: include/lib/html_input.class.php:1096 include/lib/html_input.class.php:1111 +#: include/lib/html_input.class.php:1112 #, fuzzy msgid "Ajout autres" msgstr "Factuur toevoegen" @@ -3225,7 +3228,7 @@ msgstr "Rekenmachine" #: include/template/calendar-list.php:34 include/lib/html_input.class.php:943 #: include/ajax/ajax_calendar_zoom.php:26 include/lib/html_input.class.php:991 #: include/ajax/ajax_calendar_zoom.php:32 include/lib/html_input.class.php:992 -#: include/lib/html_input.class.php:1007 +#: include/lib/html_input.class.php:1007 include/lib/html_input.class.php:1008 msgid "Calendrier" msgstr "Kalender" @@ -3239,6 +3242,7 @@ msgstr "Kalender" #: include/lib/manage_table_sql.class.php:1008 #: include/lib/manage_table_sql.class.php:1028 #: include/lib/manage_table_sql.class.php:1025 +#: include/lib/manage_table_sql.class.php:1069 #, fuzzy msgid "Cancel" msgstr "Evenwicht" @@ -3428,7 +3432,7 @@ msgstr "Dit plan bestaat niet" #: html/ajax_misc.php:571 html/ajax_misc.php:613 html/ajax_misc.php:408 #: html/ajax_misc.php:434 html/ajax_misc.php:546 html/ajax_misc.php:548 -#: html/ajax_misc.php:554 +#: html/ajax_misc.php:554 html/ajax_misc.php:556 #, fuzzy msgid "Ce plugin n'existe pas " msgstr "Dit plan bestaat niet" @@ -3725,7 +3729,8 @@ msgstr "" #: include/class/acc_ledger.class.php:2185 #: include/class/anc_listing.class.php:76 include/class/fiche.class.php:2246 #: html/user_login.php:158 html/ajax_misc.php:462 -#: include/class/fiche.class.php:2247 +#: include/class/fiche.class.php:2247 html/ajax_misc.php:464 +#: include/lib/manage_table_sql.class.php:634 #, fuzzy, php-format msgid "Cherche" msgstr "Vinden" @@ -3774,6 +3779,7 @@ msgid "" msgstr "" #: html/ajax_misc.php:452 html/ajax_misc.php:454 html/ajax_misc.php:460 +#: html/ajax_misc.php:462 #, fuzzy msgid "Choisissez la TVA" msgstr "Kies de BTW" @@ -3832,6 +3838,12 @@ msgstr "Kies een andere oefening" msgid "Choisissez un dossier" msgstr "Kies een dossier" +#: include/class/payment_method_mtable.class.php:77 +#: include/class/payment_method_mtable.class.php:87 +#, fuzzy +msgid "Choisissez un journal" +msgstr "Kies uw dossier" + #: include/class_pre_operation.php:281 #: include/class/class_pre_operation.php:281 #: include/class/class_pre_operation.php:284 @@ -3844,6 +3856,11 @@ msgstr "Kies een dossier" msgid "Choisissez un poste" msgstr "Kies een dossier" +#: include/class/payment_method_mtable.class.php:115 +#, fuzzy +msgid "Choisissez un type de fiche" +msgstr "Kies een andere oefening" + #: html/ajax_card.php:295 html/ajax_card.php:297 html/ajax_card.php:298 #: include/ajax/ajax_card.php:278 include/ajax/ajax_card.php:279 #: include/ajax/ajax_card.php:285 include/ajax/ajax_card.php:287 @@ -6284,7 +6301,7 @@ msgstr "Laatste handelingen" #: html/ajax_misc.php:196 html/ajax_misc.php:274 html/ajax_misc.php:279 #: html/ajax_misc.php:307 html/ajax_misc.php:399 html/ajax_misc.php:401 -#: html/ajax_misc.php:407 +#: html/ajax_misc.php:407 html/ajax_misc.php:409 #, fuzzy msgid "Des actions dépendent de cette catégorie" msgstr "Kan dit bestand op te slaan" @@ -7950,6 +7967,7 @@ msgstr "Erasure" #: include/class/anc_operation.class.php:316 #: include/template/ledger_detail_bottom.php:328 #: include/class/periode.class.php:596 include/class/periode.class.php:601 +#: include/lib/manage_table_sql.class.php:768 msgid "Effacer" msgstr "Wissen" @@ -8036,6 +8054,7 @@ msgstr "Alle activiteiten" #: include/lib/manage_table_sql.class.php:1075 #: include/lib/manage_table_sql.class.php:1095 #: include/lib/manage_table_sql.class.php:1092 +#: include/lib/manage_table_sql.class.php:1136 msgid "Effacé" msgstr "Verwijderen" @@ -8245,6 +8264,11 @@ msgstr "OPSLAAN" msgid "Enregistrement" msgstr "Opgeslagen" +#: include/class/payment_method_mtable.class.php:39 +#, fuzzy +msgid "Enregistrement dans" +msgstr "Opgeslagen" + #: include/action.common.inc.php:160 include/action.common.inc.php:258 #: include/compta_ach.inc.php:222 include/compta_ven.inc.php:238 #: include/action.common.inc.php:177 include/action.common.inc.php:309 @@ -8474,6 +8498,11 @@ msgstr "Afmelden" msgid "Erreur exercice invalide" msgstr "Ongeldig datum" +#: include/class/payment_method_mtable.class.php:140 +#, fuzzy, php-format +msgid "Erreur key %s value %s" +msgstr "Ongeldig datum" + #: html/do.php:196 html/do.php:224 html/do.php:237 html/do.php:239 #: html/do.php:236 html/do.php:273 html/do.php:285 html/do.php:295 #: html/do.php:264 @@ -8717,7 +8746,7 @@ msgstr "tarief is geen getal" #: html/ajax_misc.php:197 html/ajax_misc.php:216 html/ajax_misc.php:230 #: html/ajax_misc.php:236 html/ajax_misc.php:314 html/ajax_misc.php:319 #: html/ajax_misc.php:347 html/ajax_misc.php:459 html/ajax_misc.php:461 -#: html/ajax_misc.php:467 +#: html/ajax_misc.php:467 html/ajax_misc.php:469 msgid "Explication" msgstr "Uitleg" @@ -9330,6 +9359,7 @@ msgstr "Dicht" #: include/class/acc_plan_mtable.class.php:49 include/database.item.php:78 #: include/database.item.php:110 include/category_card.inc.php:75 #: include/template/stock_inv.php:67 +#: include/class/payment_method_mtable.class.php:41 msgid "Fiche" msgstr "Blad" @@ -9375,6 +9405,11 @@ msgstr "BTW fiche" msgid "Fiche contenant" msgstr "Blad Bevat" +#: include/class/payment_method_mtable.class.php:98 +#, fuzzy +msgid "Fiche inexistante" +msgstr "Map niet bestaat" + #: include/ext/import_account/include/class_impacc_csv.php:53 #: include/ext/import_account/include/impacc_csv.class.php:53 #, fuzzy @@ -10493,7 +10528,7 @@ msgstr "" #: html/ajax_misc.php:572 html/ajax_misc.php:614 html/ajax_misc.php:409 #: html/ajax_misc.php:435 html/ajax_misc.php:547 html/ajax_misc.php:549 -#: html/ajax_misc.php:555 +#: html/ajax_misc.php:555 html/ajax_misc.php:557 msgid "Il y a une erreur, ce plugin n'existe pas" msgstr "" @@ -11086,6 +11121,7 @@ msgid "Invalide" msgstr "Bevestigen" #: html/ajax_misc.php:288 html/ajax_misc.php:290 html/ajax_misc.php:296 +#: html/ajax_misc.php:298 #, fuzzy msgid "Invalide type" msgstr "Bevestigen" @@ -12141,6 +12177,7 @@ msgstr "smaad" #: include/class/anc_operation.class.php:298 #: include/class/acc_ledger_history_generic.class.php:770 #: include/export/export_balance_pdf.php:127 +#: include/class/payment_method_mtable.class.php:38 #, php-format msgid "Libellé" msgstr "Opstellen" @@ -12219,6 +12256,12 @@ msgstr "Regel niet geïmporteerd" msgid "Limite dossiers" msgstr "Records Management" +#: include/lib/message_javascript.php:104 +msgid "" +"Limite le type fiche si vous choisissez la fiche à la saisie, uniquement " +"avec journaux OD" +msgstr "" + #: include/fiche.inc.php:63 include/ext/rapport_avance/index.php:58 #: include/template/calendar.php:10 include/ext/rapport_avance/index.php:60 #: include/ext/listing/index.php:60 include/ext/listing/index.php:58 @@ -12954,6 +12997,7 @@ msgstr "Verandering" #: include/class/anc_operation.class.php:324 #: include/class/anc_operation.class.php:318 #: include/class/anc_operation.class.php:319 +#: include/lib/manage_table_sql.class.php:755 msgid "Modifier" msgstr "Veranderen" @@ -14465,7 +14509,7 @@ msgstr "Nieuwe bankafschrift" #: include/lib/html_input.class.php:1043 #: include/template/action_display_short.php:81 #: include/lib/html_input.class.php:1103 include/lib/html_input.class.php:1104 -#: include/lib/html_input.class.php:1119 +#: include/lib/html_input.class.php:1119 include/lib/html_input.class.php:1120 #, fuzzy msgid "Nouvel événement" msgstr "Voeg dit element toe" @@ -14870,6 +14914,7 @@ msgstr "Analytische OD" #: include/lib/manage_table_sql.class.php:1005 #: include/lib/manage_table_sql.class.php:1025 #: include/lib/manage_table_sql.class.php:1022 +#: include/lib/manage_table_sql.class.php:1066 msgid "OK" msgstr "" @@ -16732,6 +16777,11 @@ msgstr "" "Om over te schakelen naar unicode, maak een back-up en vervolgens het " "ontvangen bestand herstellen" +#: include/lib/message_javascript.php:105 +#, fuzzy +msgid "Pour les journaux FIN, ce sera la fiche du journal" +msgstr "Verplicht voor FIN kranten geven hier de Data Bank gebruikt" + #: include/template/impress_cat_card.php:21 msgid "Pour toutes les catégories" msgstr "Voor alle categorieën" @@ -18584,7 +18634,7 @@ msgstr "" #: html/ajax_misc.php:196 html/ajax_misc.php:215 html/ajax_misc.php:229 #: html/ajax_misc.php:235 html/ajax_misc.php:313 html/ajax_misc.php:318 #: html/ajax_misc.php:346 html/ajax_misc.php:458 html/ajax_misc.php:460 -#: html/ajax_misc.php:466 +#: html/ajax_misc.php:466 html/ajax_misc.php:468 msgid "Symbole" msgstr "Symbool" @@ -18988,7 +19038,7 @@ msgstr "" #: html/ajax_misc.php:195 html/ajax_misc.php:214 html/ajax_misc.php:228 #: html/ajax_misc.php:234 html/ajax_misc.php:312 html/ajax_misc.php:317 #: html/ajax_misc.php:345 html/ajax_misc.php:457 html/ajax_misc.php:459 -#: html/ajax_misc.php:465 +#: html/ajax_misc.php:465 html/ajax_misc.php:467 msgid "Taux" msgstr "Tarief" @@ -19760,6 +19810,7 @@ msgstr "Soort document" #: include/template/new_mod_payment.php:28 include/payment_middle.inc.php:121 #: include/payment_middle.inc.php:122 +#: include/class/payment_method_mtable.class.php:40 msgid "Type de fiche" msgstr "Soort blad" @@ -19863,6 +19914,12 @@ msgstr "" msgid "Un journal avec ce nom existe déjà" msgstr "Een journaal met deze naam bestaat al" +#: include/class/payment_method_mtable.class.php:68 +#: include/class/payment_method_mtable.class.php:92 +#, fuzzy +msgid "Un libellé est obligatoire" +msgstr "Het onderwerp is verplicht" + #: include/profile.inc.php:322 msgid "Un menu ne peut pas dépendre de lui-même" msgstr "" @@ -20081,6 +20138,11 @@ msgstr "Users" msgid "Utilisateurs qui se sont connectés" msgstr "Gebruikers die zijn aangesloten" +#: include/class/payment_method_mtable.class.php:42 +#, fuzzy +msgid "Utilisation dans" +msgstr "Gebruik van de voorraden" + #: include/company.inc.php:114 include/company.inc.php:133 #: include/company.inc.php:137 msgid "Utilisation de la compta. analytique" @@ -20470,6 +20532,7 @@ msgstr "Wilt u deze transactie verwijderen" #: include/lib/class_html_input.php:946 include/lib/class_html_input.php:972 #: include/lib/html_input.class.php:1025 include/lib/html_input.class.php:1083 #: include/lib/html_input.class.php:1084 include/lib/html_input.class.php:1099 +#: include/lib/html_input.class.php:1100 #, fuzzy, php-format msgid "Voulez-vous effacer cette relation " msgstr "Wilt u deze actie wilt verwijderen" @@ -21047,7 +21110,7 @@ msgstr "kiezen" #: include/class/acc_ledger_search.class.php:111 #: include/lib/html_input.class.php:1017 include/lib/html_input.class.php:1018 #: include/class/acc_ledger_search.class.php:112 -#: include/lib/html_input.class.php:1033 +#: include/lib/html_input.class.php:1033 include/lib/html_input.class.php:1034 msgid "choix des journaux" msgstr "keuze van de dagboeken" @@ -21088,7 +21151,7 @@ msgstr "Klik hier om uw voorkeuren bij te werken" #: include/class/pdf_operation.class.php:149 #: include/class/pdf_operation.class.php:194 #: include/class/pdf_operation.class.php:247 html/ajax_misc.php:456 -#: html/ajax_misc.php:458 html/ajax_misc.php:464 +#: html/ajax_misc.php:458 html/ajax_misc.php:464 html/ajax_misc.php:466 msgid "code" msgstr "code" @@ -21762,6 +21825,11 @@ msgstr "Boek Naam" msgid "non actif" msgstr "Totale activa" +#: include/lib/manage_table_sql.class.php:965 +#, fuzzy +msgid "non implémenté" +msgstr "Geletterde operaties" + #: include/balance_age.inc.php:40 include/balance_age.inc.php:44 #: include/balance_age.inc.php:43 #, fuzzy @@ -22485,7 +22553,7 @@ msgstr "btw" #: html/ajax_misc.php:372 html/ajax_misc.php:377 html/ajax_misc.php:400 #: html/ajax_misc.php:405 html/ajax_misc.php:512 html/ajax_misc.php:517 #: html/ajax_misc.php:514 html/ajax_misc.php:519 html/ajax_misc.php:520 -#: html/ajax_misc.php:525 +#: html/ajax_misc.php:525 html/ajax_misc.php:522 html/ajax_misc.php:527 msgid "tva inconnue" msgstr "onbekend btw" diff --git a/include/ajax/ajax_payment_method.php b/include/ajax/ajax_payment_method.php new file mode 100644 index 000000000..a0415599d --- /dev/null +++ b/include/ajax/ajax_payment_method.php @@ -0,0 +1,71 @@ + + +if (!defined('ALLOWED')) + die('Appel direct ne sont pas permis'); + +/** + * @file + * @brief Manage the payement method, existing variable (from ajax_misc.php) + * - $http + * - $gDossier + * - $cn + * + * @see Payment_Method_SQL + * @see Payment_Method_MTable + * + */ +require_once NOALYSS_INCLUDE."/database/payment_method_sql.class.php"; +require_once NOALYSS_INCLUDE."/class/payment_method_mtable.class.php"; + +$id=$http->request("p_id", "number", -1); +$action=$http->request("action"); +$ctl=$http->request("ctl"); + +$payment_method_sql=new Payment_method_SQL($cn, $id); +$payment_method_mtable=new Payment_Method_MTable($payment_method_sql); + +$payment_method_mtable->add_json_param("op", "payment_method"); +$payment_method_mtable->set_callback("ajax_misc.php"); +$payment_method_mtable->set_object_name($ctl); + +// Display a form for modifying or adding an element +if ($action=="input") +{ + $payment_method_mtable->send_header(); + echo $payment_method_mtable->ajax_input()->saveXML(); + return; +} +// Save it +elseif ($action=="save") +{ + $xml=$payment_method_mtable->ajax_save(); + $payment_method_mtable->send_header(); + echo $xml->saveXML(); + return; +} +// delete the row +elseif ($action=="delete") +{ + $payment_method_mtable->send_header(); + echo $payment_method_mtable->ajax_delete()->saveXML(); + return; +} \ No newline at end of file diff --git a/include/class/acc_payment.class.php b/include/class/acc_payment.class.php index 5f64c3377..6ebafc476 100644 --- a/include/class/acc_payment.class.php +++ b/include/class/acc_payment.class.php @@ -90,71 +90,7 @@ class Acc_Payment { return var_export(self::$variable,true); } - public function verify() - { - // Verify that the elt we want to add is correct - } - public function save() - { - /* please adapt */ - if ( $this->get_parameter("id") == 0 ) - $this->insert(); - else - $this->update(); - } - - public function insert() - { - if ( $this->verify() != 0 ) return; - $sql='INSERT INTO payment_method( - mp_lib, mp_jrn_def_id, mp_fd_id, mp_qcode,jrn_def_id) - VALUES ($1, $2, $3, upper($4),$5) returning mp_id'; - $this->mp_id=$this->cn->exec_sql($sql,array( - $this->mp_lib, - $this->mp_jrn_def_id, - $this->mp_fd_id, - $this->mp_qcode, - $this->jrn_def_id)); - } - - public function update() - { - if ( $this->verify() != 0 ) return; - - $sql="update payment_method set mp_lib=$1,mp_qcode=$2,mp_jrn_def_id=$3,mp_fd_id=$4,jrn_def_id=$5 ". - " where mp_id = $6"; - $res=$this->cn->exec_sql( - $sql, - array($this->mp_lib, - $this->mp_qcode, - $this->mp_jrn_def_id, - $this->mp_fd_id, - $this->jrn_def_id, - $this->mp_id) - ); - if ( strlen (trim($this->mp_jrn_def_id))==0) - $this->cn->exec_sql( - 'update payment_method '. - 'set mp_jrn_def_id = null where mp_id=$1', - array($this->mp_id)); - if ( strlen (trim($this->jrn_def_id))==0) - $this->cn->exec_sql( - 'update payment_method '. - 'set mp_jrn_def_id = null where mp_id=$1', - array($this->mp_id)); - if ( strlen (trim($this->mp_qcode))==0) - $this->cn->exec_sql( - 'update payment_method '. - 'set mp_qcode = null where mp_id=$1', - array($this->mp_id)); - if ( strlen (trim($this->mp_fd_id))==0) - $this->cn->exec_sql( - 'update payment_method '. - 'set mp_fd_id = null where mp_id=$1', - array($this->mp_id)); - - } - + public function load() { $sql='select mp_id,mp_lib,mp_fd_id,mp_jrn_def_id,mp_qcode,jrn_def_id from payment_method '. @@ -172,14 +108,7 @@ class Acc_Payment } } - /** - *@brief remove a middle of payment - */ - public function delete() - { - $sql="delete from payment_method where mp_id=$1"; - $this->cn->exec_sql($sql,array($this->mp_id)); - } + /*!\brief retrieve all the data for all ledgers *\param non *\return an array of row diff --git a/include/class/payment_method_mtable.class.php b/include/class/payment_method_mtable.class.php new file mode 100644 index 000000000..f67b60218 --- /dev/null +++ b/include/class/payment_method_mtable.class.php @@ -0,0 +1,144 @@ + + +/** + * @file + * @brief + * @see Payment_Method_SQL + * @see ajax_payment_method.php + */ +require_once NOALYSS_INCLUDE."/lib/manage_table_sql.class.php"; + +class Payment_Method_MTable extends Manage_Table_SQL +{ + + function __construct(\Data_SQL $p_table) + { + parent::__construct($p_table); + + // Column header + $this->set_col_label("mp_lib", _("Libellé")); + $this->set_col_label("mp_jrn_def_id", _("Enregistrement dans")); + $this->set_col_label("mp_fd_id", _("Type de fiche")); + $this->set_col_label("mp_qcode", _("Fiche")); + $this->set_col_label("jrn_def_id", _("Utilisation dans")); + // Hide id + $this->set_property_visible("mp_id", FALSE); + $this->icon_mod="right"; + + // Set value for col + $this->set_col_type("mp_qcode","custom"); + $this->set_col_type("mp_jrn_def_id", "select", + $p_table->cn->make_array("select jrn_def_id,jrn_def_name from jrn_def where jrn_def_type in ('FIN','ODS') and jrn_enable=1 order by 2",1)); + $this->set_col_type("mp_fd_id", "select", + $p_table->cn->make_array("select fd_id,fd_label from fiche_def order by 2",1)); + $this->set_col_type("jrn_def_id", "select", + $p_table->cn->make_array("select jrn_def_id,jrn_def_name from jrn_def where jrn_def_type in ('ACH','VEN') and jrn_enable=1 order by 2",1)); + $this->set_col_tips("mp_fd_id", 71); + $this->set_col_tips("mp_qcode", 72); + $this->set_order(["mp_lib","jrn_def_id","mp_jrn_def_id","mp_fd_id","mp_qcode"]); + + } + + function check() + { + $table=$this->get_table(); + $cn=$table->cn; + $has_error=0; + + if ( trim($table->mp_lib) == "") { + $this->set_error("mp_lib", _("Un libellé est obligatoire")); + $has_error++; + } + $count_ledger_target=0; + if ( trim($table->mp_jrn_def_id) !="") { + $count_ledger_target=$cn->get_value("select count(*) from jrn_def where jrn_def_id=$1",[$table->mp_jrn_def_id]); + + } + if ($count_ledger_target == 0 ) { + $this->set_error("mp_jrn_def_id", _("Choisissez un journal")); + $has_error++; + } + + $count_ledger_used=0; + if ( trim($table->jrn_def_id) != "") { + $count_ledger_used=$cn->get_value("select count(*) from jrn_def where jrn_def_id=$1",[$table->jrn_def_id]); + } + + if ($count_ledger_used == 0) { + $this->set_error("jrn_def_id", _("Choisissez un journal")); + $has_error++; + } + // if the ledger is financial, the qcode MUST be the default one + if ( trim($table->mp_lib) == "") { + $this->set_error("mp_lib", _("Un libellé est obligatoire")); + $has_error++; + } + if (trim ($table->mp_qcode) != "" && $a_row['jrn_def_type'] != 'FIN') { + $fiche=new Fiche($cn); + if ( $fiche->get_by_qcode($table->mp_qcode,FALSE) == 1) { + $this->set_error("mp_qcode",_("Fiche inexistante")); + $has_error++; + } + } + // get the type of the ledger + $a_row= $cn->get_row("select jrn_def_type,jrn_def_bank from jrn_def where jrn_def_id = $1",[$table->mp_jrn_def_id]); + + // if ledger FIN then set the mp_qcode to the right card and set mp_fd_id to the same than mp_qcode + if ( $a_row['jrn_def_type'] == 'FIN') { + $fiche=new Fiche($cn,$a_row['jrn_def_bank']); + $table->mp_qcode=$fiche->get_quick_code(); + $table->mp_fd_id=$cn->get_value("select fd_id from fiche where f_id=$1",[$a_row['jrn_def_bank']]); + } + + + if ( $a_row['jrn_def_type'] != 'FIN' && $table->mp_fd_id == -1) + { + $this->set_error("mp_fd_id",_("Choisissez un type de fiche")); + $has_error++; + } + if ( $has_error > 0) return FALSE; + return TRUE; + } + /** + * For the quickcode + * @param type $p_key + * @param type $p_value + */ + function input_custom($p_key,$p_value) + { + $cn=$this->get_table()->cn; + switch ($p_key) + { + case "mp_qcode": + $w=new ICard("mp_qcode",$p_value); + $w->set_attribute("typecard", "all"); + $w->autocomplete=0; + + echo $w->input(); + echo $w->search(); + break; + default: + printf (_("Erreur key %s value %s"),$p_key,$p_value); + break; + } + } +} diff --git a/include/constant.php b/include/constant.php index 748d26496..cc27a552d 100644 --- a/include/constant.php +++ b/include/constant.php @@ -108,7 +108,7 @@ if ( !defined ("NOALYSS_PACKAGE_REPOSITORY")) { if ( ! defined ("SYSINFO_DISPLAY")) { define ("SYSINFO_DISPLAY",TRUE); } -define ("DBVERSION",134); +define ("DBVERSION",135); define ("MONO_DATABASE",25); define ("DBVERSIONREPO",18); define ('NOTFOUND','--not found--'); diff --git a/include/database/payment_method_sql.class.php b/include/database/payment_method_sql.class.php new file mode 100644 index 000000000..2154e9509 --- /dev/null +++ b/include/database/payment_method_sql.class.php @@ -0,0 +1,71 @@ +table="public.payment_method"; + $this->primary_key="mp_id"; + /* + * List of columns + */ + $this->name=array( + "mp_id"=>"mp_id" + , "mp_lib"=>"mp_lib" + , "mp_jrn_def_id"=>"mp_jrn_def_id" + , "mp_fd_id"=>"mp_fd_id" + , "mp_qcode"=>"mp_qcode" + , "jrn_def_id"=>"jrn_def_id" + ); + /* + * Type of columns + */ + $this->type=array( + "mp_id"=>"numeric" + , "mp_lib"=>"text" + , "mp_jrn_def_id"=>"numeric" + , "mp_fd_id"=>"numeric" + , "mp_qcode"=>"text" + , "jrn_def_id"=>"numeric" + ); + + + $this->default=array( + "mp_id"=>"auto" + ); + + $this->date_format="DD.MM.YYYY"; + parent::__construct($p_cn, $p_id); + } + +} diff --git a/include/lib/message_javascript.php b/include/lib/message_javascript.php index 5b17c7e6f..78de05b4c 100644 --- a/include/lib/message_javascript.php +++ b/include/lib/message_javascript.php @@ -101,6 +101,7 @@ content[67]=""; content[69]=""; content[70]=""; - +content[71]=""; +content[72]=""; \ No newline at end of file diff --git a/include/payment_middle.inc.php b/include/payment_middle.inc.php index a8db6f0a9..f86f57eb4 100644 --- a/include/payment_middle.inc.php +++ b/include/payment_middle.inc.php @@ -19,133 +19,15 @@ // Copyright Author Dany De Bontridder danydb@aevalys.eu if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis'); -require_once NOALYSS_INCLUDE.'/class/acc_payment.class.php'; -require_once NOALYSS_INCLUDE.'/lib/sort_table.class.php'; -//--------------------------------------------------------------------------- -// Common variable -$td=''; -$etd=''; -$tr=''; -$etr=''; -$th=''; -$eth=''; -global $http; -/*!\file - * \brief payment mode - */ -$sb=$http->request('sb', "string",""); -echo '
        '; -//---------------------------------------------------------------------- -// change -if ( $sb=='change') -{ - if ( !isset($_GET['id'])) exit; - $row=new Acc_Payment($cn,$_GET['id']); - $row->load(); - echo '
        '; - echo dossier::hidden(); - echo HtmlInput::hidden('sa','mp'); - echo HtmlInput::hidden('sb','save'); - echo HtmlInput::hidden('id',$row->get_parameter("id")); - echo HtmlInput::hidden('delete_ck',0); - echo $row->form(); - echo HtmlInput::submit('save',_('Sauve'), ' onclick="$(\'delete_ck\').value=0"'); - echo HtmlInput::submit('delete',_('Efface'),' onclick="$(\'delete_ck\').value=1"'); - echo HtmlInput::button_anchor(_('Retour sans sauver'), - '?p_action=divers&sa=mp&'.dossier::get()."&ac=".$_REQUEST['ac'], - "","","smallbutton"); - echo '
        '; - return; -} -//---------------------------------------------------------------------- -// Save the change -// -if ( $sb=='save') -{ - $http=new HttpInput(); - $delete=$http->post("delete_ck","string", 0); - if ( $delete == 0 ) - { - $row=new Acc_Payment($cn,$_POST ['id']); - $row->from_array($_POST); - $row->update(); - } else { -//--------------------------------------------------------------------------- -// Delete a card -//--------------------------------------------------------------------------- - $row=new Acc_Payment($cn,$_POST['id']); - $row->from_array($_POST); - $row->delete(); - - } -} -//--------------------------------------------------------------------------- -// Insert a new mod of payment -//--------------------------------------------------------------------------- -if ( isset($_POST['insert'])) -{ - $row=new Acc_Payment($cn); - $row->from_array($_POST); - $row->insert(); - $sb="list"; -} +require_once NOALYSS_INCLUDE."/database/payment_method_sql.class.php"; +require_once NOALYSS_INCLUDE."/class/payment_method_mtable.class.php"; -//--------------------------------------------------------------------------- -// Show form to enter a new one -//--------------------------------------------------------------------------- -if ($sb=='ins') -{ - $mp=new Acc_Payment($cn); - $r=$mp->blank(); - echo '
        '; - echo dossier::hidden(); - echo HtmlInput::hidden('ac',$_REQUEST['ac']),HtmlInput::hidden('insert',0); - echo $r; - echo HtmlInput::submit('insertsub',_('Enregistre')); - echo HtmlInput::button_anchor(_('Retour sans sauver'), - '?p_action=divers&sa=mp&'.dossier::get()."&ac=".$_REQUEST['ac'], - "","","smallbutton"); - echo '
        '; +$payment_method_sql=new Payment_method_SQL($cn); +$payment_method_mtable=new Payment_Method_MTable($payment_method_sql); - return; -} -//-------------------------------------------------------------------------------- -//LIST -//-------------------------------------------------------------------------------- -/* Get the data from database */ -$header=new Sort_Table(); -$base_url=$_SERVER['PHP_SELF']."?".Dossier::get()."&ac=".$_REQUEST['ac']; +$payment_method_mtable->add_json_param("op", "payment_method"); +$payment_method_mtable->set_callback("ajax_misc.php"); +$payment_method_mtable->create_js_script(); -$header->add(_("Libelle"),$base_url,"order by mp_lib asc","order by mp_lib desc",'la','ld'); -$header->add(_("Pour le journal"),$base_url,"order by jrn_def_name asc","order by jrn_def_name desc",'ja','jd'); -$header->add(_("Type de fiche"),$base_url,"order by fd_label asc","order by fd_label desc",'tc','td'); -$header->add(_("Enregistré dans le journal"),$base_url,"order by jrn_target asc","order by jrn_target desc",'jta','jtd'); -$header->add(_("Avec la fiche"),$base_url,"order by vw_name asc","order by vw_name desc",'na','nd'); - -$order=(isset($_REQUEST['ord']))?$_REQUEST['ord']:'la'; - -$sql=$header->get_sql_order($order); - -$array=$cn->get_array(" - select - mp_id,mp_lib,mp_jrn_def_id,mp_fd_id,mp_qcode,j.jrn_def_id, - j.jrn_def_name as jrn_def_name, - j2.jrn_def_name as jrn_target, - fd_label, - coalesce(mp_qcode,'A choisir à l''encodage') as vw_name - from payment_method as mp - left join jrn_def as j on (j.jrn_def_id=mp.jrn_def_id) - left join jrn_def as j2 on (j2.jrn_def_id=mp.mp_jrn_def_id) - left join fiche_def as fd on (mp.mp_fd_id=fd.fd_id) - $sql - "); -/* if there are data show them in a table */ -if ( ! empty ($array)) -{ - - require_once NOALYSS_TEMPLATE.'/list_mod_payment.php'; -} -echo HtmlInput::button_anchor("Ajout", $base_url."&sb=ins","","","smallbutton"); -echo '
        '; -?> +echo $payment_method_mtable->display_table(); diff --git a/include/sql/patch/upgrade134.sql b/include/sql/patch/upgrade134.sql new file mode 100644 index 000000000..17d4f18a8 --- /dev/null +++ b/include/sql/patch/upgrade134.sql @@ -0,0 +1,8 @@ +begin; + +update attr_def set ad_extra = '[sql] fd_id in (select fd_id from fiche_def where frd_id in (4,8,9,14))' where ad_id=25; + +alter table mod_payment rename to payment_method; + +insert into version (val,v_description) values (135,'rename table mod_payment'); +commit ; \ No newline at end of file diff --git a/sql/upgrade.sql b/sql/upgrade.sql index ea4b1317b..e69de29bb 100644 --- a/sql/upgrade.sql +++ b/sql/upgrade.sql @@ -1,21 +0,0 @@ -update attr_def set ad_extra = '[sql] fd_id in (select fd_id from fiche_def where frd_id in (4,8,9,14))' where ad_id=25; - -alter table mod_payment rename to payment_method; - -alter table payment_method add column type_payment_id varchar(6); - - -comment on column payment_method.type_payment_id is 'Type of payment method'; - -create table type_payment_ref (id varchar(6 ) primary key,tp_description varchar(80) not null); - -insert into type_payment_ref (id,tp_description) values ('CACRD','Carte de crédit'), - ('CHCK','Chèque'), - ('CASH','Liquide'), - ('ELECT','Electronique'), - ('VIRT','Virement'); -update payment_method set type_payment_id = 'VIRT'; - -alter table payment_method add constraint type_payment_ref_fk foreign key (type_payment_id) references type_payment_ref(id); - -alter table payment_method alter type_payment_id set not null; \ No newline at end of file From 348f46908ddc1c972008bdd75931861614433c7c Mon Sep 17 00:00:00 2001 From: Dany De Bontridder Date: Thu, 8 Aug 2019 09:08:42 +0200 Subject: [PATCH 18/29] fixup! Improve message progress bar + translation --- scenario/test_manage_table_sql.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scenario/test_manage_table_sql.php b/scenario/test_manage_table_sql.php index bfc4ae8ed..9a2c4a6fe 100644 --- a/scenario/test_manage_table_sql.php +++ b/scenario/test_manage_table_sql.php @@ -79,7 +79,6 @@ echo "

        "."Icon MODIFY place"."

        "; echo "

        "." Mod left"."

        "; $manage_table->set_icon_mod("left"); $manage_table->display_table("where pcm_val::text >= '400' order by pcm_val::text limit 10"); -return; echo "

        "." Mod right"."

        "; $manage_table->set_icon_mod("right"); @@ -99,4 +98,5 @@ $manage_table->set_icon_del("right"); $manage_table->display_table("where pcm_val::text >= '400' order by pcm_val::text limit 10"); + ?> From 12b607e9fad4ae6ab57ff06f3768a6436736dcce Mon Sep 17 00:00:00 2001 From: Dany De Bontridder Date: Fri, 9 Aug 2019 13:25:07 +0200 Subject: [PATCH 19/29] Security : replace direct use of $_GET --- include/class/print_ledger_simple.class.php | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/include/class/print_ledger_simple.class.php b/include/class/print_ledger_simple.class.php index ef21133cf..e2f81cd8d 100644 --- a/include/class/print_ledger_simple.class.php +++ b/include/class/print_ledger_simple.class.php @@ -24,12 +24,14 @@ * of any ledgers */ require_once NOALYSS_INCLUDE.'/class/pdf.class.php'; +require_once NOALYSS_INCLUDE.'/lib/http_input.class.php'; class Print_Ledger_Simple extends PDF { public function __construct ($p_cn, Acc_Ledger $p_jrn) { + $http=new HttpInput(); if($p_cn == null) die("No database connection. Abort."); parent::__construct($p_cn,'L', 'mm', 'A4'); @@ -48,7 +50,8 @@ class Print_Ledger_Simple extends PDF * get rappel to initialize amount rap_xx *the easiest way is to compute sum from quant_ */ - $this->previous=$this->ledger->previous_amount($_GET['from_periode']); + $from_periode=$http->get('from_periode',"number"); + $this->previous=$this->ledger->previous_amount($from_periode); /* initialize the amount to report */ foreach($this->previous['tva'] as $line_tva) @@ -203,8 +206,10 @@ class Print_Ledger_Simple extends PDF function export() { bcscale(2); - $a_jrn=$this->ledger->get_operation($_GET['from_periode'], - $_GET['to_periode']); + $http=new HttpInput(); + + $a_jrn=$this->ledger->get_operation($http->get('from_periode',"number"), + $http->get('to_periode',"number")); if ( $a_jrn == null ) return; for ( $i=0;$i Date: Thu, 15 Aug 2019 11:46:57 +0200 Subject: [PATCH 20/29] Purpose is to contain all the prepared query called from different locations --- include/class/prepared_query.class.php | 83 ++++++++++++++++++++++++++ 1 file changed, 83 insertions(+) create mode 100644 include/class/prepared_query.class.php diff --git a/include/class/prepared_query.class.php b/include/class/prepared_query.class.php new file mode 100644 index 000000000..64b26afc6 --- /dev/null +++ b/include/class/prepared_query.class.php @@ -0,0 +1,83 @@ + + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ + + +/*** + * @file + * @brief contains prepared query used in different classes of the application + * + * + */ +class Prepared_Query { + private $db; //!< Database connection + + function __construct(Database $cn) + { + $this->db=$cn; + } + + public function get_db() + { + return $this->db; + } + + public function set_db($db) + { + $this->db=$db; + return $this; + } + + /** + * Prepare the query for fetching the linked operation. ONE paramete is needed : jrn.jr_id , returns all columns + * from the table PUBLIC.JRN, column qcode_bank (default card for fin ledger) of the operation concerning + * to the payment + * + * @see export_ledger_pdf.php + * @see Acc_Ledger_History + * + */ + public function prepare_reconcile_date() + { + $prepare=$this->db->is_prepare("reconcile_date"); + if ($prepare==FALSE) + { + $this->db->prepare('reconcile_date', + 'select * + , (select ad_value from fiche_detail where ad_id=23 and f_id=jrn_def.jrn_def_bank ) as qcode_bank + from + jrn + join jrn_def on (jrn.jr_def_id=jrn_def.jrn_def_id) + where + jr_id in + (select + jra_concerned + from + jrn_rapt + where jr_id = $1 + union all + select + jr_id + from jrn_rapt + where jra_concerned=$1)'); + } + } + + +} From 715486b99a9baabb3836cab0dcf57268cdfd643a Mon Sep 17 00:00:00 2001 From: Dany De Bontridder Date: Thu, 15 Aug 2019 11:47:14 +0200 Subject: [PATCH 21/29] Translation --- html/lang/en_US/LC_MESSAGES/messages.po | 169 ++++++++++-- html/lang/messages.po | 324 +++++++++++++++++------- html/lang/nl_NL/LC_MESSAGES/messages.po | 150 ++++++++++- 3 files changed, 535 insertions(+), 108 deletions(-) diff --git a/html/lang/en_US/LC_MESSAGES/messages.po b/html/lang/en_US/LC_MESSAGES/messages.po index 1b5b2be75..629d1fb0d 100644 --- a/html/lang/en_US/LC_MESSAGES/messages.po +++ b/html/lang/en_US/LC_MESSAGES/messages.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: NOALYSS 672\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-08 01:27+0200\n" -"PO-Revision-Date: 2019-08-08 01:28+0100\n" +"POT-Creation-Date: 2019-08-15 11:12+0200\n" +"PO-Revision-Date: 2019-08-15 11:26+0100\n" "Last-Translator: dany \n" "Language-Team: French \n" "Language: en_US\n" @@ -60,6 +60,7 @@ msgstr "Except if you give another accounting item when you create the card" #: include/class/class_acc_payment.php:290 #: include/class/acc_payment.class.php:298 #: include/class/acc_payment.class.php:301 +#: include/class/acc_payment.class.php:230 msgid " Acompte à déduire" msgstr "Amount already paid" @@ -211,8 +212,9 @@ msgstr "Accounting %s belong to the cards : %s" #: include/class/class_acc_payment.php:298 #: include/class/acc_payment.class.php:306 #: include/class/acc_payment.class.php:310 +#: include/class/acc_payment.class.php:239 msgid " Libellé du paiement" -msgstr "Wording of payment" +msgstr "Payment label" #: include/ajax_account_update.php:149 include/ajax/ajax_account_update.php:149 #: include/ajax/ajax_account_update.php:151 @@ -432,6 +434,7 @@ msgstr "Conversion to PDF failed" #: include/class/class_acc_payment.php:328 #: include/class/acc_payment.class.php:337 #: include/class/acc_payment.class.php:341 +#: include/class/acc_payment.class.php:270 msgid " paiement par " msgstr "Paid by" @@ -825,7 +828,7 @@ msgstr "You are not allowed to access this , contact your administrator" #: include/export/export_security_pdf.php:119 msgid "Accès journaux" -msgstr "Ledger" +msgstr "Access Ledger" #: html/do.php:210 html/do.php:211 html/do.php:239 html/do.php:252 #: html/do.php:254 html/do.php:251 html/do.php:288 html/do.php:300 @@ -3487,7 +3490,7 @@ msgstr "Change format" #: include/company.inc.php:123 include/company.inc.php:142 #: include/company.inc.php:146 msgid "Changer le libellé des détails" -msgstr "Change the wording details" +msgstr "Change the label details" #: include/ext/tools/index.php:41 msgid "Changer poste comptable ou fiche" @@ -3967,6 +3970,7 @@ msgstr "Invalid key" #: include/class/acc_ledger_sold.class.php:707 #: include/class/acc_ledger_sold.class.php:1074 #: include/class/acc_ledger_sold.class.php:1330 +#: include/class/print_ledger_simple.class.php:103 msgid "Client" msgstr "Customer" @@ -4248,6 +4252,8 @@ msgstr "Stock" #: include/class/acc_ledger_purchase.class.php:1843 #: include/class/acc_ledger_sold.class.php:1417 #: include/class/acc_ledger_purchase.class.php:1846 +#: include/template/acc_ledger_history_purchase_extended.php:130 +#: include/template/acc_ledger_history_sale_extended.php:131 msgid "Code TVA" msgstr "VAT Code" @@ -4774,7 +4780,7 @@ msgstr "Repository configuration" #: include/database.item.php:96 include/database.item.php:93 #: include/database.item.php:92 include/database.item.php:90 msgid "Configuration des journaux" -msgstr "ledger parameter" +msgstr "Ledger setting" #: include/database.item.php:10 include/database.item.php:13 #: include/database.item.php:15 include/database.item.php:18 @@ -5409,6 +5415,8 @@ msgstr "DIFF" #: include/export/export_ledger_csv.php:260 #: include/class/acc_ledger_history_purchase.class.php:256 #: include/class/acc_ledger_history_purchase.class.php:257 +#: include/class/acc_ledger_history_purchase.class.php:258 +#: include/class/acc_ledger_history_purchase.class.php:262 msgid "DNA" msgstr "Unallowed fee" @@ -5645,6 +5653,11 @@ msgstr "Database::get_row returns too many rows" #: include/class/acc_ledger_history_generic.class.php:680 #: include/class/acc_ledger_history_generic.class.php:767 #: include/class/fiche.class.php:1397 include/class/fiche.class.php:1472 +#: include/export/export_ledger_csv.php:211 +#: include/class/print_ledger_simple.class.php:100 +#: include/class/acc_ledger_history_purchase.class.php:249 +#: include/export/export_ledger_csv.php:219 +#: include/class/acc_ledger_history_purchase.class.php:253 msgid "Date" msgstr "Date" @@ -5654,6 +5667,7 @@ msgstr "Date" #: include/class/acc_payment.class.php:294 #: include/class/acc_payment.class.php:297 +#: include/class/acc_payment.class.php:226 #, php-format msgid "Date %s" msgstr "Date %s" @@ -5936,6 +5950,9 @@ msgstr "Date of operation" #: include/class/acc_ledger_purchase.class.php:1824 #: include/class/acc_ledger_sold.class.php:1398 #: include/class/acc_ledger_purchase.class.php:1827 +#: include/export/export_ledger_csv.php:141 +#: include/class/acc_ledger_history_purchase.class.php:277 +#: include/class/acc_ledger_history_sale.class.php:263 msgid "Date paiement" msgstr "Payment date" @@ -6041,7 +6058,7 @@ msgstr "Store" #: include/ext/bilan_interne/class_acc_bilaninterne.php:274 #: include/ext/bilan_interne/acc_bilaninterne.class.php:274 #: include/class/acc_bilan.class.php:70 include/class/anc_print.class.php:142 -#: include/balance.inc.php:77 +#: include/balance.inc.php:77 include/impress_jrn.inc.php:132 msgid "Depuis" msgstr "From" @@ -6249,6 +6266,7 @@ msgstr "Event depends on this category" #: include/class/fiche.class.php:1476 include/lib/ac_common.php:1213 #: include/template/param_jrn.php:85 include/class/fiche.class.php:1398 #: include/class/fiche.class.php:1477 +#: include/class/print_ledger_simple.class.php:108 msgid "Description" msgstr "Description" @@ -9439,6 +9457,9 @@ msgstr "Formula" #: include/class/acc_ledger_purchase.class.php:1430 #: include/class/acc_ledger_history_purchase.class.php:252 #: include/class/acc_ledger_history_sale.class.php:246 +#: include/class/print_ledger_simple.class.php:105 +#: include/class/acc_ledger_history_purchase.class.php:253 +#: include/class/acc_ledger_history_purchase.class.php:257 msgid "Fournisseur" msgstr "Supplier" @@ -9576,11 +9597,11 @@ msgstr "Global period for all ledgers" #: include/class/acc_ledger.class.php:372 #: include/class/acc_ledger.class.php:373 msgid "Grand Livre" -msgstr "Ledger" +msgstr "General Ledger" #: include/verif_bilan.inc.php:78 include/verif_bilan.inc.php:105 msgid "Grand livre" -msgstr "Ledger" +msgstr "General Ledger" #: include/database.item.php:70 include/database.item.php:73 #: include/database.item.php:79 include/database.item.php:77 @@ -9592,14 +9613,14 @@ msgstr "Great analytical book" #: include/database.item.php:75 include/database.item.php:78 #: include/database.item.php:72 include/database.item.php:70 msgid "Grand livre pour la comptabilité analytique" -msgstr "Central ledger for Analytic accountancy" +msgstr "General Ledger for Analytic accountancy" #: include/database.item.php:70 include/database.item.php:73 #: include/database.item.php:79 include/database.item.php:77 #: include/database.item.php:76 include/database.item.php:75 #: include/database.item.php:78 include/database.item.php:72 msgid "Grand'Livre" -msgstr "Great ledger" +msgstr "General Ledger" #: include/ext/tva/form_parameter.php:68 include/ext/tva/form_parameter.php:71 msgid "Grille 00 : opérations soumises à un régime particulier" @@ -9842,6 +9863,11 @@ msgstr "Generate an invoice or upload a document" #: include/class/acc_ledger_history_sale.class.php:248 #: include/class/acc_ledger_history_purchase.class.php:255 #: include/class/acc_ledger_history_sale.class.php:249 +#: include/template/acc_ledger_history_purchase_extended.php:128 +#: include/template/acc_ledger_history_sale_extended.php:129 +#: include/class/print_ledger_simple.class.php:110 +#: include/class/acc_ledger_history_purchase.class.php:256 +#: include/class/acc_ledger_history_purchase.class.php:260 msgid "HTVA" msgstr "wo VAT" @@ -10411,7 +10437,7 @@ msgstr "Print" #: include/database.item.php:51 include/database.item.php:50 #: include/database.item.php:53 include/database.item.php:46 msgid "Impression Grand-Livre" -msgstr "Print Great Ledger" +msgstr "Print General Ledger" #: include/database.item.php:112 include/database.item.php:115 #: include/database.item.php:121 include/database.item.php:118 @@ -10506,7 +10532,7 @@ msgstr "Detail of a print job accounting" msgid "Impression du grand livre" msgstr "Print great ledger" -#: include/ext/bilan_interne/index.php:110 +#: include/ext/bilan_interne/index.php:110 include/lib/html_input.class.php:559 msgid "Imprimer" msgstr "Print" @@ -10773,6 +10799,8 @@ msgstr "Invert sel" #: include/template/acc_ledger_history_purchase_extended.php:124 #: include/template/acc_ledger_history_sale_extended.php:124 +#: include/template/acc_ledger_history_purchase_extended.php:125 +#: include/template/acc_ledger_history_sale_extended.php:126 msgid "Item" msgstr "Item" @@ -10978,6 +11006,7 @@ msgstr "Until accountancy" #: include/template/stock_histo_search.php:47 include/class_anc_print.php:159 #: include/class/class_anc_print.php:159 include/class/class_anc_print.php:161 #: include/class/anc_print.class.php:155 include/class/anc_print.class.php:153 +#: include/impress_jrn.inc.php:143 msgid "Jusque" msgstr "Until" @@ -11825,6 +11854,10 @@ msgstr "Label of the menu" msgid "Libellé vide" msgstr "Label empty" +#: include/template/acc_ledger_history_purchase_oneline.php:66 +msgid "Lien" +msgstr "Link" + #: include/database.item.php:6 include/database.item.php:9 #: include/database.item.php:11 include/database.item.php:14 #: include/database.item.php:8 @@ -11863,9 +11896,16 @@ msgstr "Folders limit" #: include/lib/message_javascript.php:104 msgid "" -"Limite le type fiche si vous choisissez la fiche à la saisie, uniquement " +"Limite le type de fiche si vous choisissez la fiche à la saisie, uniquement " "avec journaux OD" msgstr "" +"Filter the card type if you choose the card , works only with Misc Ledger" + +#: include/lib/message_javascript.php:104 +msgid "" +"Limite le type fiche si vous choisissez la fiche à la saisie, uniquement " +"avec journaux OD" +msgstr "Filter the card type if you choose the card , only with Misc Ledger" #: include/fiche.inc.php:63 include/ext/rapport_avance/index.php:58 #: include/template/calendar.php:10 include/ext/rapport_avance/index.php:60 @@ -12285,6 +12325,10 @@ msgstr "Message reverse" msgid "Met à jour toutes les dossiers et modèles" msgstr "Update system and databases" +#: include/export/export_ledger_csv.php:143 +msgid "Methode paiement" +msgstr "means of payment" + #: include/lib/message_javascript.php:72 include/lib/message_javascript.php:74 msgid "Mettez le pourcentage
        à zéro pour effacer la ligne" msgstr "Put the percentage to 0 to remove the row" @@ -13101,6 +13145,12 @@ msgstr "min Amount" msgid "Montant opération" msgstr "Operation amount" +#: include/export/export_ledger_csv.php:142 +#: include/class/acc_ledger_history_purchase.class.php:279 +#: include/class/acc_ledger_history_sale.class.php:265 +msgid "Montant paiement" +msgstr "Payment Amount" + #: include/template/stock_histo_search.php:55 msgid "Montant supérieur ou égal à" msgstr "Amount bigger or equal to" @@ -13219,6 +13269,11 @@ msgstr "Medium" msgid "MultiModule" msgstr "MultiModule" +#: include/class/acc_ledger_history_purchase.class.php:278 +#: include/class/acc_ledger_history_sale.class.php:264 +msgid "Méthode paiement" +msgstr "Means of payment" + #: include/ajax/ajax_preference.php:174 include/ajax/ajax_preference.php:185 msgid "N'utilisez pas le même séparateur pour les champs et les décimales" msgstr "Do not use the same separator for decimal and field" @@ -13927,6 +13982,8 @@ msgstr "Normal" #: include/class/acc_ledger_history_sale.class.php:246 #: include/class/acc_ledger_history_purchase.class.php:253 #: include/class/acc_ledger_history_sale.class.php:247 +#: include/class/acc_ledger_history_purchase.class.php:254 +#: include/class/acc_ledger_history_purchase.class.php:258 msgid "Note" msgstr "Note" @@ -14307,6 +14364,8 @@ msgstr "#" #: include/class/acc_ledger_history_generic.class.php:764 #: include/export/export_ledger_csv.php:210 #: include/class/acc_ledger_history_generic.class.php:765 +#: include/export/export_ledger_csv.php:212 +#: include/export/export_ledger_csv.php:220 msgid "N° Pièce" msgstr "Receipt #" @@ -14658,6 +14717,10 @@ msgstr "Not Reversed accounting" msgid "Opération non trouvée" msgstr "operation not found" +#: include/export/export_ledger_csv.php:144 +msgid "Opération paiement" +msgstr "Payment Writing " + #: include/operation_ods_new.inc.php:94 #, php-format msgid "Opération rapprochée : %s" @@ -14963,6 +15026,8 @@ msgstr "Pu" #: include/class/acc_ledger_search.class.php:631 #: include/class/acc_ledger.class.php:2421 #: include/class/acc_ledger_search.class.php:644 +#: include/class/acc_ledger_history_purchase.class.php:250 +#: include/class/acc_ledger_history_purchase.class.php:254 msgid "Paiement" msgstr "Payment" @@ -14975,6 +15040,7 @@ msgstr "Customer Payment" #: include/class/class_acc_payment.php:304 #: include/class/acc_payment.class.php:312 #: include/class/acc_payment.class.php:316 +#: include/class/acc_payment.class.php:245 msgid "Paiement encodé plus tard" msgstr "Payment encoded later" @@ -14987,6 +15053,11 @@ msgstr "Payment Recorded in" msgid "Paiement fournisseur" msgstr "Supplier Payment" +#: include/class/print_ledger_detail_item.class.php:145 +#, php-format +msgid "Paiement montant %s date %s methoded %s " +msgstr "Payment amount %s date %s means %s" + #: include/database.item.php:226 msgid "Paiement par paypal" msgstr "Paid by" @@ -15368,6 +15439,7 @@ msgstr "Paid" #: include/class/acc_ledger_purchase.class.php:1680 #: include/class/acc_ledger_purchase.class.php:1698 #: include/class/acc_ledger_purchase.class.php:1701 +#: include/class/print_ledger_simple.class.php:274 msgid "Payé par" msgstr "Paid by" @@ -15583,6 +15655,9 @@ msgstr "Receipt" #: include/class/acc_ledger.class.php:858 #: include/class/acc_ledger_search.class.php:646 #: include/class/acc_ledger_search.class.php:958 include/lib/ac_common.php:1212 +#: include/class/print_ledger_simple.class.php:99 +#: include/class/acc_ledger_history_purchase.class.php:252 +#: include/class/acc_ledger_history_purchase.class.php:256 msgid "Pièce" msgstr "Receipt" @@ -16241,15 +16316,21 @@ msgstr "Main" msgid "Priorité" msgstr "Priority" +#: include/class/print_ledger_simple.class.php:113 +msgid "Priv/DNA" +msgstr "Private/DNA" + #: include/template/impress_reconciliation_detail.php:10 msgid "Prix HTVA" msgstr "wo VAT" #: include/template/acc_ledger_history_sale_extended.php:125 +#: include/template/acc_ledger_history_sale_extended.php:127 msgid "Prix Uni" msgstr "Price / unit" #: include/template/acc_ledger_history_purchase_extended.php:125 +#: include/template/acc_ledger_history_purchase_extended.php:126 msgid "Prix Unit" msgstr "Price / unit" @@ -16639,6 +16720,8 @@ msgstr "Code" #: include/template/acc_ledger_history_purchase_extended.php:126 #: include/template/acc_ledger_history_sale_extended.php:126 #: include/template/stock_inv.php:71 +#: include/template/acc_ledger_history_purchase_extended.php:127 +#: include/template/acc_ledger_history_sale_extended.php:128 msgid "Quantité" msgstr "Quantity" @@ -16708,6 +16791,8 @@ msgstr "QuickCode gold" #: include/class/acc_ledger_history_generic.class.php:768 #: include/export/export_ledger_csv.php:211 #: include/class/acc_ledger_history_generic.class.php:769 +#: include/export/export_ledger_csv.php:213 +#: include/export/export_ledger_csv.php:221 msgid "QuickCode" msgstr "QuickCode" @@ -17863,6 +17948,10 @@ msgstr "Stock" msgid "Stock et commande" msgstr "Stock and Order" +#: include/impress_jrn.inc.php:156 +msgid "Style d'impression" +msgstr "Printing type" + #: include/ext/importbank/ajax.php:82 include/ext/importbank/ajax.php:83 msgid "Suggestion" msgstr "Suggest" @@ -18125,6 +18214,8 @@ msgstr "Totals" #: include/template/acc_ledger_history_sale_oneline.php:53 #: include/class/acc_ledger_history_sale.class.php:249 #: include/class/acc_ledger_history_sale.class.php:250 +#: include/template/acc_ledger_history_purchase_extended.php:129 +#: include/template/acc_ledger_history_sale_extended.php:130 msgid "TVA" msgstr "VAT" @@ -18143,6 +18234,7 @@ msgstr "Tax Deductible" #: include/template/ledger_detail_ach.php:134 #: include/template/ledger_detail_ach.php:135 +#: include/class/print_ledger_simple.class.php:114 msgid "TVA ND" msgstr "VAT ND" @@ -18153,6 +18245,9 @@ msgstr "VAT ND" #: include/export/export_ledger_csv.php:262 #: include/class/acc_ledger_history_purchase.class.php:258 #: include/class/acc_ledger_history_purchase.class.php:259 +#: include/class/print_ledger_simple.class.php:116 +#: include/class/acc_ledger_history_purchase.class.php:260 +#: include/class/acc_ledger_history_purchase.class.php:264 msgid "TVA NP" msgstr "VAT ND" @@ -18308,6 +18403,8 @@ msgstr "TVA Ded" #: include/template/acc_ledger_history_sale_extended.php:55 #: include/template/acc_ledger_history_sale_extended.php:130 #: include/template/acc_ledger_history_sale_oneline.php:56 +#: include/template/acc_ledger_history_purchase_extended.php:131 +#: include/template/acc_ledger_history_sale_extended.php:132 msgid "TVAC" msgstr "with VAT" @@ -18315,6 +18412,8 @@ msgstr "with VAT" #: include/class/acc_ledger_history_sale.class.php:261 #: include/class/acc_ledger_history_purchase.class.php:270 #: include/class/acc_ledger_history_sale.class.php:262 +#: include/class/acc_ledger_history_purchase.class.php:271 +#: include/class/acc_ledger_history_purchase.class.php:276 msgid "TVAC/TTC" msgstr "with VAT" @@ -18490,7 +18589,8 @@ msgstr "Theme" #: include/class/acc_ledger_search.class.php:650 #: include/class/fiche.class.php:1475 #: include/class/acc_ledger_history_generic.class.php:683 -#: include/class/fiche.class.php:1476 +#: include/class/fiche.class.php:1476 include/export/export_ledger_csv.php:214 +#: include/export/export_ledger_csv.php:222 msgid "Tiers" msgstr "Tiers" @@ -18867,6 +18967,12 @@ msgstr "Total to distribute" #: include/fiche.inc.php:447 #: include/class/acc_ledger_history_generic.class.php:738 #: include/class/fiche.class.php:1564 +#: include/template/acc_ledger_history_sale_detail.php:155 +#: include/template/acc_ledger_history_purchase_detail.php:168 +#: include/template/acc_ledger_history_purchase_oneline.php:141 +#: include/template/acc_ledger_history_sale_oneline.php:121 +#: include/template/acc_ledger_history_purchase_extended.php:160 +#: include/template/acc_ledger_history_sale_extended.php:161 msgid "Totaux" msgstr "Total" @@ -20454,6 +20560,8 @@ msgstr "zip code" #: include/export/export_ledger_csv.php:198 #: include/export/export_ledger_csv.php:219 #: include/export/export_ledger_csv.php:213 +#: include/export/export_ledger_csv.php:215 +#: include/export/export_ledger_csv.php:223 msgid "commentaire" msgstr "Comment" @@ -20798,6 +20906,8 @@ msgstr "inexistent" #: include/class/acc_ledger_history_generic.class.php:681 #: include/export/export_ledger_csv.php:214 #: include/class/acc_ledger_history_generic.class.php:682 +#: include/export/export_ledger_csv.php:216 +#: include/export/export_ledger_csv.php:224 msgid "internal" msgstr "Internal" @@ -20810,11 +20920,17 @@ msgstr "Internal" #: include/class/acc_ledger_history_sale.class.php:247 #: include/class/acc_ledger_history_purchase.class.php:254 #: include/class/acc_ledger_history_sale.class.php:248 +#: include/class/acc_ledger_history_purchase.class.php:255 +#: include/class/acc_ledger_history_purchase.class.php:259 msgid "interne" msgstr "Internal" #: include/class/acc_ledger_history.class.php:108 #: include/class/acc_ledger_history.class.php:121 +#: include/class/acc_ledger_history.class.php:109 +#: include/class/acc_ledger_history.class.php:122 +#: include/class/acc_ledger_history.class.php:110 +#: include/class/acc_ledger_history.class.php:123 msgid "invalid parameter" msgstr "invalid parameter" @@ -20831,6 +20947,8 @@ msgstr "invalid parameter" #: include/class/acc_ledger_history_purchase.class.php:239 #: include/class/acc_ledger_history_sale.class.php:233 #: include/class/acc_ledger_history_generic.class.php:759 +#: include/class/acc_ledger_history_purchase.class.php:240 +#: include/class/acc_ledger_history_purchase.class.php:244 msgid "journal" msgstr "Ledger" @@ -20843,7 +20961,7 @@ msgstr "Unknown ledger" #: include/database.item.php:96 include/database.item.php:93 #: include/database.item.php:92 include/database.item.php:90 msgid "journaux" -msgstr "ledger" +msgstr "ledgers" #: include/template/calendar-list.php:49 include/template/calendar-list.php:51 #: include/template/calendar-list.php:52 @@ -20986,6 +21104,8 @@ msgstr "max_execution_time should be more than 60 " #: include/ajax/ajax_display_letter.php:55 #: include/export/export_ledger_csv.php:221 #: include/export/export_ledger_csv.php:215 +#: include/export/export_ledger_csv.php:217 +#: include/export/export_ledger_csv.php:225 msgid "montant" msgstr "Amount" @@ -21151,6 +21271,11 @@ msgstr "internal code" msgid "n° ligne" msgstr "No online" +#: include/class/acc_ledger_history_purchase.class.php:280 +#: include/class/acc_ledger_history_sale.class.php:266 +msgid "n° opération" +msgstr "No operation" + #: include/class_fiche.php:1282 include/template/impress_reconciliation.php:16 #: include/class_fiche.php:1288 include/class_fiche.php:1305 #: include/class/class_fiche.php:1305 include/class/class_fiche.php:1308 @@ -21203,6 +21328,10 @@ msgstr "open_basedir must be empty or set properly" #: include/class/acc_ledger_history_purchase.class.php:250 #: include/class/acc_ledger_history_sale.class.php:244 #: include/class/acc_ledger_history_generic.class.php:764 +#: include/export/export_ledger_csv.php:210 +#: include/class/acc_ledger_history_purchase.class.php:251 +#: include/export/export_ledger_csv.php:218 +#: include/class/acc_ledger_history_purchase.class.php:255 msgid "operation" msgstr "Operation" @@ -21239,6 +21368,7 @@ msgstr "Depending entry" #: include/class/acc_ledger_history_sale.class.php:262 #: include/class/acc_ledger_history_purchase.class.php:271 #: include/class/acc_ledger_history_sale.class.php:263 +#: include/class/acc_ledger_history_purchase.class.php:272 msgid "opérations liées" msgstr "Linked operations" @@ -21282,6 +21412,8 @@ msgid "ou générer une facture" msgstr "or generate an invoice" #: include/class/acc_ledger_history.class.php:46 +#: include/class/acc_ledger_history.class.php:47 +#: include/class/acc_ledger_history.class.php:48 msgid "pa_ledger doit être un tableau" msgstr "pa_ledger must be an array" @@ -21370,6 +21502,8 @@ msgstr "Accounting / Activity" #: include/export/export_ledger_csv.php:259 #: include/class/acc_ledger_history_purchase.class.php:255 #: include/class/acc_ledger_history_purchase.class.php:256 +#: include/class/acc_ledger_history_purchase.class.php:257 +#: include/class/acc_ledger_history_purchase.class.php:261 msgid "privé" msgstr "Private" @@ -21531,6 +21665,7 @@ msgstr "Search" #: include/export/export_fiche_balance_csv.php:153 #: include/export/export_fiche_balance_csv.php:154 include/fiche.inc.php:517 #: include/fiche.inc.php:519 include/fiche.inc.php:528 +#: include/class/print_ledger_simple.class.php:101 msgid "ref" msgstr "Ref" @@ -21774,6 +21909,8 @@ msgstr "VAT unknown" #: include/export/export_ledger_csv.php:261 #: include/class/acc_ledger_history_purchase.class.php:257 #: include/class/acc_ledger_history_purchase.class.php:258 +#: include/class/acc_ledger_history_purchase.class.php:259 +#: include/class/acc_ledger_history_purchase.class.php:263 msgid "tva non ded." msgstr "TVA not deductible" diff --git a/html/lang/messages.po b/html/lang/messages.po index 74f2de6ba..4a1178ce0 100644 --- a/html/lang/messages.po +++ b/html/lang/messages.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-08 01:27+0200\n" +"POT-Creation-Date: 2019-08-15 11:12+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -492,7 +492,7 @@ msgstr "" #: include/class/pdf_operation.class.php:194 #: include/class/pdf_operation.class.php:247 html/ajax_misc.php:456 #: html/ajax_misc.php:458 html/ajax_misc.php:464 html/ajax_misc.php:466 -#: include/class/pdf_operation.class.php:149 +#: html/ajax_misc.php:466 include/class/pdf_operation.class.php:149 #: include/class/pdf_operation.class.php:194 #: include/class/pdf_operation.class.php:247 msgid "code" @@ -501,21 +501,21 @@ msgstr "" #: html/ajax_misc.php:195 html/ajax_misc.php:214 html/ajax_misc.php:228 #: html/ajax_misc.php:234 html/ajax_misc.php:312 html/ajax_misc.php:317 #: html/ajax_misc.php:345 html/ajax_misc.php:457 html/ajax_misc.php:459 -#: html/ajax_misc.php:465 html/ajax_misc.php:467 +#: html/ajax_misc.php:465 html/ajax_misc.php:467 html/ajax_misc.php:467 msgid "Taux" msgstr "" #: html/ajax_misc.php:196 html/ajax_misc.php:215 html/ajax_misc.php:229 #: html/ajax_misc.php:235 html/ajax_misc.php:313 html/ajax_misc.php:318 #: html/ajax_misc.php:346 html/ajax_misc.php:458 html/ajax_misc.php:460 -#: html/ajax_misc.php:466 html/ajax_misc.php:468 +#: html/ajax_misc.php:466 html/ajax_misc.php:468 html/ajax_misc.php:468 msgid "Symbole" msgstr "" #: html/ajax_misc.php:197 html/ajax_misc.php:216 html/ajax_misc.php:230 #: html/ajax_misc.php:236 html/ajax_misc.php:314 html/ajax_misc.php:319 #: html/ajax_misc.php:347 html/ajax_misc.php:459 html/ajax_misc.php:461 -#: html/ajax_misc.php:467 html/ajax_misc.php:469 +#: html/ajax_misc.php:467 html/ajax_misc.php:469 html/ajax_misc.php:469 msgid "Explication" msgstr "" @@ -526,6 +526,7 @@ msgstr "" #: html/ajax_misc.php:405 html/ajax_misc.php:512 html/ajax_misc.php:517 #: html/ajax_misc.php:514 html/ajax_misc.php:519 html/ajax_misc.php:520 #: html/ajax_misc.php:525 html/ajax_misc.php:522 html/ajax_misc.php:527 +#: html/ajax_misc.php:522 html/ajax_misc.php:527 msgid "tva inconnue" msgstr "" @@ -1608,8 +1609,10 @@ msgstr "" #: include/lib/manage_table_sql.class.php:652 #: include/class/acc_ledger_search.class.php:248 #: include/class/acc_ledger_search.class.php:250 -#: include/template/dashboard.php:21 include/user_detail.inc.php:245 -#: include/cat_document.inc.php:85 include/class/anc_key.class.php:352 +#: include/lib/manage_table_sql.class.php:616 +#: include/lib/manage_table_sql.class.php:655 include/template/dashboard.php:21 +#: include/user_detail.inc.php:245 include/cat_document.inc.php:85 +#: include/class/anc_key.class.php:352 #: include/class/acc_ledger_search.class.php:250 #: include/lib/manage_table_sql.class.php:616 #: include/lib/manage_table_sql.class.php:655 @@ -1650,7 +1653,9 @@ msgstr "" #: include/ext/amortis/include/template/material_detail.php:36 #: include/class/acc_plan_mtable.class.php:49 include/database.item.php:78 #: include/database.item.php:110 include/category_card.inc.php:75 -#: include/template/stock_inv.php:67 include/template/stock_histo_search.php:39 +#: include/template/stock_inv.php:67 +#: include/class/payment_method_mtable.class.php:41 +#: include/template/stock_histo_search.php:39 #: include/template/detail-action.php:317 #: include/template/form_ledger_fin.php:41 #: include/template/security_list_action.php:55 @@ -1953,6 +1958,7 @@ msgstr "" #: include/class/anc_operation.class.php:298 #: include/class/acc_ledger_history_generic.class.php:770 #: include/export/export_balance_pdf.php:127 +#: include/class/payment_method_mtable.class.php:38 #: include/template/balance_aged_result.php:50 #: include/template/operation_detail_fin.php:33 #: include/template/acc_ledger_history_financial_oneline.php:35 @@ -2009,10 +2015,11 @@ msgstr "" #: include/ext/bilan_interne/class_acc_bilaninterne.php:274 #: include/ext/bilan_interne/acc_bilaninterne.class.php:274 #: include/class/acc_bilan.class.php:70 include/class/anc_print.class.php:142 -#: include/balance.inc.php:77 include/impress_gl_comptes.inc.php:62 -#: include/template/impress_cat_card.php:14 include/balance.inc.php:77 -#: include/class/acc_bilan.class.php:70 include/class/anc_print.class.php:142 -#: include/impress_poste.inc.php:86 +#: include/balance.inc.php:77 include/impress_jrn.inc.php:132 +#: include/impress_gl_comptes.inc.php:62 +#: include/template/impress_cat_card.php:14 include/impress_jrn.inc.php:132 +#: include/balance.inc.php:77 include/class/acc_bilan.class.php:70 +#: include/class/anc_print.class.php:142 include/impress_poste.inc.php:86 msgid "Depuis" msgstr "" @@ -2714,6 +2721,9 @@ msgstr "" #: include/class/acc_ledger_history_generic.class.php:680 #: include/class/acc_ledger_history_generic.class.php:767 #: include/class/fiche.class.php:1397 include/class/fiche.class.php:1472 +#: include/export/export_ledger_csv.php:211 +#: include/class/print_ledger_simple.class.php:100 +#: include/class/acc_ledger_history_purchase.class.php:249 #: include/audit_log.php:37 include/template/letter_prop.php:25 #: include/template/letter_prop.php:68 #: include/template/print_ledger_simple.php:7 @@ -2743,12 +2753,13 @@ msgstr "" #: include/export/export_poste_detail_csv.php:78 #: include/export/export_poste_detail_csv.php:198 #: include/export/export_poste_detail_pdf.php:92 -#: include/export/export_ledger_csv.php:209 +#: include/export/export_ledger_csv.php:219 #: include/export/export_histo_csv.php:38 #: include/export/export_fiche_detail_csv.php:70 #: include/export/export_gl_csv.php:96 include/stock_inv_histo.inc.php:75 #: include/ajax/ajax_display_letter.php:54 #: include/balance_card_ageing.inc.php:58 include/fiche.inc.php:527 +#: include/class/print_ledger_simple.class.php:100 #: include/class/print_ledger_detail_item.class.php:57 #: include/class/acc_ledger_history_generic.class.php:680 #: include/class/acc_ledger_history_generic.class.php:767 @@ -2756,7 +2767,7 @@ msgstr "" #: include/class/acc_ledger_sold.class.php:1397 #: include/class/acc_ledger.class.php:601 #: include/class/acc_ledger.class.php:814 -#: include/class/acc_ledger_history_purchase.class.php:248 +#: include/class/acc_ledger_history_purchase.class.php:253 #: include/class/acc_ledger_search.class.php:638 #: include/class/acc_ledger_search.class.php:957 #: include/class/anc_group_operation.class.php:111 @@ -3183,13 +3194,19 @@ msgstr "" #: include/fiche.inc.php:447 #: include/class/acc_ledger_history_generic.class.php:738 #: include/class/fiche.class.php:1564 +#: include/template/acc_ledger_history_sale_detail.php:155 +#: include/template/acc_ledger_history_purchase_detail.php:168 +#: include/template/acc_ledger_history_purchase_oneline.php:141 +#: include/template/acc_ledger_history_sale_oneline.php:121 +#: include/template/acc_ledger_history_purchase_extended.php:160 +#: include/template/acc_ledger_history_sale_extended.php:161 #: include/template/print_ledger_simple.php:143 -#: include/template/acc_ledger_history_sale_detail.php:154 -#: include/template/acc_ledger_history_purchase_detail.php:167 -#: include/template/acc_ledger_history_purchase_oneline.php:137 -#: include/template/acc_ledger_history_sale_oneline.php:120 -#: include/template/acc_ledger_history_purchase_extended.php:159 -#: include/template/acc_ledger_history_sale_extended.php:159 +#: include/template/acc_ledger_history_sale_detail.php:155 +#: include/template/acc_ledger_history_purchase_detail.php:168 +#: include/template/acc_ledger_history_purchase_oneline.php:141 +#: include/template/acc_ledger_history_sale_oneline.php:121 +#: include/template/acc_ledger_history_purchase_extended.php:160 +#: include/template/acc_ledger_history_sale_extended.php:161 #: include/template/forecast_result.php:31 #: include/export/export_fiche_balance_pdf.php:153 include/fiche.inc.php:447 #: include/class/acc_ledger_history_generic.class.php:738 @@ -3382,6 +3399,8 @@ msgstr "" #: include/class/acc_ledger.class.php:858 #: include/class/acc_ledger_search.class.php:646 #: include/class/acc_ledger_search.class.php:958 include/lib/ac_common.php:1212 +#: include/class/print_ledger_simple.class.php:99 +#: include/class/acc_ledger_history_purchase.class.php:252 #: include/template/balance_aged_result.php:47 #: include/template/print_ledger_simple.php:6 #: include/template/acc_ledger_history_financial_oneline.php:33 @@ -3396,9 +3415,10 @@ msgstr "" #: include/template/acc_ledger_history_sale_extended.php:37 #: include/template/ledger_detail_ach.php:63 #: include/export/export_gl_pdf.php:88 include/export/export_gl_csv.php:96 +#: include/class/print_ledger_simple.class.php:99 #: include/class/acc_ledger_sold.class.php:1402 #: include/class/acc_ledger.class.php:858 -#: include/class/acc_ledger_history_purchase.class.php:251 +#: include/class/acc_ledger_history_purchase.class.php:256 #: include/class/acc_ledger_search.class.php:646 #: include/class/acc_ledger_search.class.php:958 #: include/class/acc_ledger_history_sale.class.php:245 @@ -3722,6 +3742,7 @@ msgstr "" #: include/class/acc_ledger_purchase.class.php:1680 #: include/class/acc_ledger_purchase.class.php:1698 #: include/class/acc_ledger_purchase.class.php:1701 +#: include/class/print_ledger_simple.class.php:274 #: include/class/acc_ledger_purchase.class.php:1701 msgid "Payé par" msgstr "" @@ -4116,11 +4137,14 @@ msgstr "" #: include/class/acc_ledger_purchase.class.php:1430 #: include/class/acc_ledger_history_purchase.class.php:252 #: include/class/acc_ledger_history_sale.class.php:246 +#: include/class/print_ledger_simple.class.php:105 +#: include/class/acc_ledger_history_purchase.class.php:253 #: include/template/print_ledger_simple.php:10 #: include/template/acc_ledger_history_purchase_detail.php:36 #: include/template/ledger_detail_ach.php:51 include/database.item.php:11 #: include/balance_age.inc.php:36 -#: include/class/acc_ledger_history_purchase.class.php:252 +#: include/class/print_ledger_simple.class.php:105 +#: include/class/acc_ledger_history_purchase.class.php:257 #: include/class/pre_op_ach.class.php:397 #: include/class/acc_ledger_history_sale.class.php:246 #: include/class/acc_ledger_purchase.class.php:1303 @@ -5137,6 +5161,7 @@ msgstr "" #: include/class/acc_ledger_sold.class.php:707 #: include/class/acc_ledger_sold.class.php:1074 #: include/class/acc_ledger_sold.class.php:1330 +#: include/class/print_ledger_simple.class.php:103 #: include/template/print_ledger_simple.php:10 #: include/template/acc_ledger_history_sale_detail.php:37 #: include/template/ledger_detail_ven.php:59 @@ -5145,6 +5170,7 @@ msgstr "" #: include/template/acc_ledger_history_purchase_extended.php:43 #: include/template/acc_ledger_history_sale_extended.php:43 #: include/database.item.php:15 include/balance_age.inc.php:35 +#: include/class/print_ledger_simple.class.php:103 #: include/class/acc_ledger_sold.class.php:707 #: include/class/acc_ledger_sold.class.php:1074 #: include/class/acc_ledger_sold.class.php:1330 @@ -5226,7 +5252,8 @@ msgstr "" #: include/class/class_acc_payment.php:290 #: include/class/acc_payment.class.php:298 #: include/class/acc_payment.class.php:301 -#: include/class/acc_payment.class.php:301 +#: include/class/acc_payment.class.php:230 +#: include/class/acc_payment.class.php:230 msgid " Acompte à déduire" msgstr "" @@ -5234,7 +5261,8 @@ msgstr "" #: include/class/class_acc_payment.php:298 #: include/class/acc_payment.class.php:306 #: include/class/acc_payment.class.php:310 -#: include/class/acc_payment.class.php:310 +#: include/class/acc_payment.class.php:239 +#: include/class/acc_payment.class.php:239 msgid " Libellé du paiement" msgstr "" @@ -5242,7 +5270,8 @@ msgstr "" #: include/class/class_acc_payment.php:304 #: include/class/acc_payment.class.php:312 #: include/class/acc_payment.class.php:316 -#: include/class/acc_payment.class.php:316 +#: include/class/acc_payment.class.php:245 +#: include/class/acc_payment.class.php:245 msgid "Paiement encodé plus tard" msgstr "" @@ -5251,7 +5280,8 @@ msgstr "" #: include/class/class_acc_payment.php:328 #: include/class/acc_payment.class.php:337 #: include/class/acc_payment.class.php:341 -#: include/class/acc_payment.class.php:341 +#: include/class/acc_payment.class.php:270 +#: include/class/acc_payment.class.php:270 msgid " paiement par " msgstr "" @@ -5428,9 +5458,10 @@ msgstr "" #: include/class/anc_listing.class.php:83 include/class/fiche.class.php:1397 #: include/class/fiche.class.php:1476 include/lib/ac_common.php:1213 #: include/template/param_jrn.php:85 include/class/fiche.class.php:1398 -#: include/class/fiche.class.php:1477 include/cfgplugin.inc.php:115 -#: include/template/letter_prop.php:34 include/template/letter_prop.php:77 -#: include/template/category_of_card.php:28 +#: include/class/fiche.class.php:1477 +#: include/class/print_ledger_simple.class.php:108 +#: include/cfgplugin.inc.php:115 include/template/letter_prop.php:34 +#: include/template/letter_prop.php:77 include/template/category_of_card.php:28 #: include/template/print_ledger_simple.php:11 #: include/template/param_jrn.php:85 include/template/pcmn_update.php:38 #: include/template/menu_detail.php:43 @@ -5462,6 +5493,7 @@ msgstr "" #: include/ajax/ajax_plugin_detail.php:43 include/upgrade-template.php:51 #: include/modele.inc.php:248 include/modele.inc.php:362 #: include/menu.inc.php:110 include/database.item.php:152 +#: include/class/print_ledger_simple.class.php:108 #: include/class/tva_rate_mtable.class.php:50 #: include/class/acc_ledger_search.class.php:654 #: include/class/acc_ledger_search.class.php:960 @@ -5948,6 +5980,7 @@ msgstr "" #: include/class/anc_operation.class.php:316 #: include/template/ledger_detail_bottom.php:328 #: include/class/periode.class.php:596 include/class/periode.class.php:601 +#: include/lib/manage_table_sql.class.php:768 #: include/template/ledger_detail_bottom.php:328 #: include/template/anc_key_input.php:212 include/preod.inc.php:112 #: include/anc_group.inc.php:88 include/dossier.inc.php:281 @@ -6090,7 +6123,8 @@ msgstr "" #: include/lib/manage_table_sql.class.php:752 #: include/class/anc_operation.class.php:324 #: include/class/anc_operation.class.php:318 -#: include/class/anc_operation.class.php:319 include/dossier.inc.php:283 +#: include/class/anc_operation.class.php:319 +#: include/lib/manage_table_sql.class.php:755 include/dossier.inc.php:283 #: include/ajax/ajax_get_profile.php:90 include/ajax/ajax_view_action.php:47 #: include/class/document_type.class.php:75 #: include/class/anc_operation.class.php:319 @@ -7118,16 +7152,18 @@ msgstr "" #: include/template/acc_ledger_history_sale_oneline.php:53 #: include/class/acc_ledger_history_sale.class.php:249 #: include/class/acc_ledger_history_sale.class.php:250 +#: include/template/acc_ledger_history_purchase_extended.php:129 +#: include/template/acc_ledger_history_sale_extended.php:130 #: include/template/impress_reconciliation_detail.php:19 #: include/template/ledger_detail_ven.php:137 #: include/template/acc_ledger_history_purchase_oneline.php:59 #: include/template/operation_detail_ven.php:46 #: include/template/acc_ledger_history_sale_oneline.php:53 #: include/template/acc_ledger_history_purchase_extended.php:52 -#: include/template/acc_ledger_history_purchase_extended.php:128 +#: include/template/acc_ledger_history_purchase_extended.php:129 #: include/template/operation_detail_ach.php:54 #: include/template/acc_ledger_history_sale_extended.php:52 -#: include/template/acc_ledger_history_sale_extended.php:128 +#: include/template/acc_ledger_history_sale_extended.php:130 #: include/template/ledger_detail_ach.php:135 include/database.item.php:8 #: include/class/acc_ledger_history_sale.class.php:250 #: include/class/pdf_operation.class.php:152 @@ -9132,7 +9168,9 @@ msgstr "" #: include/export/export_fiche_balance_csv.php:153 #: include/export/export_fiche_balance_csv.php:154 include/fiche.inc.php:517 #: include/fiche.inc.php:519 include/fiche.inc.php:528 +#: include/class/print_ledger_simple.class.php:101 #: include/export/export_fiche_balance_csv.php:154 include/fiche.inc.php:528 +#: include/class/print_ledger_simple.class.php:101 msgid "ref" msgstr "" @@ -9965,9 +10003,10 @@ msgstr "" #: include/template/calendar-list.php:34 include/lib/html_input.class.php:943 #: include/ajax/ajax_calendar_zoom.php:26 include/lib/html_input.class.php:991 #: include/ajax/ajax_calendar_zoom.php:32 include/lib/html_input.class.php:992 -#: include/lib/html_input.class.php:1007 include/template/dashboard.php:6 -#: include/template/calendar-list.php:34 include/impress_rapport.inc.php:234 -#: include/ajax/ajax_calendar_zoom.php:32 include/lib/html_input.class.php:1008 +#: include/lib/html_input.class.php:1007 include/lib/html_input.class.php:1008 +#: include/template/dashboard.php:6 include/template/calendar-list.php:34 +#: include/impress_rapport.inc.php:234 include/ajax/ajax_calendar_zoom.php:32 +#: include/lib/html_input.class.php:1008 msgid "Calendrier" msgstr "" @@ -10252,9 +10291,11 @@ msgstr "" #: include/class/acc_ledger_purchase.class.php:1843 #: include/class/acc_ledger_sold.class.php:1417 #: include/class/acc_ledger_purchase.class.php:1846 +#: include/template/acc_ledger_history_purchase_extended.php:130 +#: include/template/acc_ledger_history_sale_extended.php:131 #: include/template/detail-action.php:321 -#: include/template/acc_ledger_history_purchase_extended.php:129 -#: include/template/acc_ledger_history_sale_extended.php:129 +#: include/template/acc_ledger_history_purchase_extended.php:130 +#: include/template/acc_ledger_history_sale_extended.php:131 #: include/class/acc_ledger_sold.class.php:1417 #: include/class/acc_ledger_purchase.class.php:1846 msgid "Code TVA" @@ -10657,8 +10698,8 @@ msgstr "" #: include/template/stock_histo_search.php:47 include/class_anc_print.php:159 #: include/class/class_anc_print.php:159 include/class/class_anc_print.php:161 #: include/class/anc_print.class.php:155 include/class/anc_print.class.php:153 -#: include/template/stock_histo_search.php:47 -#: include/template/impress_cat_card.php:18 +#: include/impress_jrn.inc.php:143 include/template/stock_histo_search.php:47 +#: include/template/impress_cat_card.php:18 include/impress_jrn.inc.php:143 #: include/class/anc_print.class.php:153 msgid "Jusque" msgstr "" @@ -10719,11 +10760,14 @@ msgstr "" #: include/export/export_stock_histo_csv.php:45 #: include/template/acc_ledger_history_purchase_extended.php:126 #: include/template/acc_ledger_history_sale_extended.php:126 -#: include/template/stock_inv.php:71 include/template/ledger_detail_ven.php:129 +#: include/template/stock_inv.php:71 +#: include/template/acc_ledger_history_purchase_extended.php:127 +#: include/template/acc_ledger_history_sale_extended.php:128 +#: include/template/ledger_detail_ven.php:129 #: include/template/operation_detail_ven.php:38 -#: include/template/acc_ledger_history_purchase_extended.php:126 +#: include/template/acc_ledger_history_purchase_extended.php:127 #: include/template/operation_detail_ach.php:46 -#: include/template/acc_ledger_history_sale_extended.php:126 +#: include/template/acc_ledger_history_sale_extended.php:128 #: include/template/stock_inv.php:71 include/template/ledger_detail_ach.php:128 #: include/export/export_stock_histo_csv.php:45 msgid "Quantité" @@ -10760,24 +10804,31 @@ msgstr "" #: include/class/acc_ledger_history_sale.class.php:248 #: include/class/acc_ledger_history_purchase.class.php:255 #: include/class/acc_ledger_history_sale.class.php:249 +#: include/template/acc_ledger_history_purchase_extended.php:128 +#: include/template/acc_ledger_history_sale_extended.php:129 +#: include/class/print_ledger_simple.class.php:110 +#: include/class/acc_ledger_history_purchase.class.php:256 #: include/template/ledger_detail_ven.php:136 #: include/template/acc_ledger_history_purchase_oneline.php:53 #: include/template/operation_detail_ven.php:44 #: include/template/acc_ledger_history_sale_oneline.php:50 #: include/template/acc_ledger_history_purchase_extended.php:49 -#: include/template/acc_ledger_history_purchase_extended.php:127 +#: include/template/acc_ledger_history_purchase_extended.php:128 #: include/template/operation_detail_ach.php:52 #: include/template/acc_ledger_history_sale_extended.php:49 -#: include/template/acc_ledger_history_sale_extended.php:127 +#: include/template/acc_ledger_history_sale_extended.php:129 #: include/template/ledger_detail_ach.php:133 -#: include/class/acc_ledger_history_purchase.class.php:255 +#: include/class/print_ledger_simple.class.php:110 +#: include/class/acc_ledger_history_purchase.class.php:260 #: include/class/acc_ledger_history_sale.class.php:249 msgid "HTVA" msgstr "" #: include/template/ledger_detail_ach.php:134 #: include/template/ledger_detail_ach.php:135 +#: include/class/print_ledger_simple.class.php:114 #: include/template/ledger_detail_ach.php:134 +#: include/class/print_ledger_simple.class.php:114 msgid "TVA ND" msgstr "" @@ -10805,16 +10856,18 @@ msgstr "" #: include/template/acc_ledger_history_sale_extended.php:55 #: include/template/acc_ledger_history_sale_extended.php:130 #: include/template/acc_ledger_history_sale_oneline.php:56 +#: include/template/acc_ledger_history_purchase_extended.php:131 +#: include/template/acc_ledger_history_sale_extended.php:132 #: include/template/impress_reconciliation_detail.php:28 #: include/template/ledger_detail_ven.php:138 #: include/template/acc_ledger_history_purchase_oneline.php:63 #: include/template/operation_detail_ven.php:47 #: include/template/acc_ledger_history_sale_oneline.php:56 #: include/template/acc_ledger_history_purchase_extended.php:55 -#: include/template/acc_ledger_history_purchase_extended.php:130 +#: include/template/acc_ledger_history_purchase_extended.php:131 #: include/template/operation_detail_ach.php:55 #: include/template/acc_ledger_history_sale_extended.php:55 -#: include/template/acc_ledger_history_sale_extended.php:130 +#: include/template/acc_ledger_history_sale_extended.php:132 #: include/template/ledger_detail_ach.php:136 #: include/class/print_ledger_detail_item.class.php:65 msgid "TVAC" @@ -10966,7 +11019,9 @@ msgid "Pour le journal" msgstr "" #: include/template/new_mod_payment.php:28 include/payment_middle.inc.php:121 -#: include/payment_middle.inc.php:122 include/template/new_mod_payment.php:28 +#: include/payment_middle.inc.php:122 +#: include/class/payment_method_mtable.class.php:40 +#: include/template/new_mod_payment.php:28 #: include/class/payment_method_mtable.class.php:40 msgid "Type de fiche" msgstr "" @@ -11987,6 +12042,7 @@ msgstr "" #: include/lib/manage_table_sql.class.php:1095 #: include/lib/manage_table_sql.class.php:1092 #: include/lib/manage_table_sql.class.php:1136 +#: include/lib/manage_table_sql.class.php:1136 msgid "Effacé" msgstr "" @@ -12136,9 +12192,10 @@ msgstr "" #: include/class/acc_ledger_history_generic.class.php:768 #: include/export/export_ledger_csv.php:211 #: include/class/acc_ledger_history_generic.class.php:769 +#: include/export/export_ledger_csv.php:213 #: include/export/export_poste_detail_csv.php:83 #: include/export/export_poste_detail_csv.php:196 -#: include/export/export_ledger_csv.php:211 +#: include/export/export_ledger_csv.php:221 #: include/class/acc_ledger_history_generic.class.php:769 #: include/class/acc_account_ledger.class.php:394 #: include/class/balance_age.class.php:144 @@ -13119,9 +13176,10 @@ msgstr "" #: include/ajax/ajax_display_letter.php:55 #: include/export/export_ledger_csv.php:221 #: include/export/export_ledger_csv.php:215 +#: include/export/export_ledger_csv.php:217 #: include/template/ledger_detail_fin.php:60 #: include/template/ledger_detail_bottom.php:216 -#: include/export/export_ledger_csv.php:215 +#: include/export/export_ledger_csv.php:225 #: include/ajax/ajax_display_letter.php:55 #: include/class/acc_reconciliation.class.php:489 #: include/class/acc_reconciliation.class.php:497 @@ -14049,12 +14107,13 @@ msgstr "" #: include/class/acc_ledger_search.class.php:631 #: include/class/acc_ledger.class.php:2421 #: include/class/acc_ledger_search.class.php:644 +#: include/class/acc_ledger_history_purchase.class.php:250 #: include/template/print_ledger_simple.php:8 #: include/template/acc_ledger_history_sale_detail.php:35 #: include/template/acc_ledger_history_purchase_detail.php:34 #: include/export/export_histo_csv.php:40 #: include/class/acc_ledger.class.php:2421 -#: include/class/acc_ledger_history_purchase.class.php:249 +#: include/class/acc_ledger_history_purchase.class.php:254 #: include/class/acc_ledger_search.class.php:644 #: include/class/acc_ledger_history_sale.class.php:243 #: include/class/pdf_operation.class.php:73 @@ -14095,13 +14154,13 @@ msgstr "" #: include/class/acc_ledger_search.class.php:650 #: include/class/fiche.class.php:1475 #: include/class/acc_ledger_history_generic.class.php:683 -#: include/class/fiche.class.php:1476 +#: include/class/fiche.class.php:1476 include/export/export_ledger_csv.php:214 #: include/template/operation_detail_fin.php:32 #: include/template/acc_ledger_history_financial_oneline.php:34 #: include/template/ledger_detail_fin.php:45 #: include/export/export_poste_detail_csv.php:86 #: include/export/export_poste_detail_csv.php:199 -#: include/export/export_ledger_csv.php:212 +#: include/export/export_ledger_csv.php:222 #: include/export/export_histo_csv.php:43 #: include/export/export_fiche_detail_csv.php:75 #: include/class/acc_ledger_history_generic.class.php:683 @@ -14646,7 +14705,10 @@ msgstr "" #: include/template/acc_ledger_history_purchase_extended.php:34 #: include/template/acc_ledger_history_sale_extended.php:34 #: include/template/ledger_detail_ach.php:37 +#: include/export/export_ledger_csv.php:141 #: include/class/acc_ledger_sold.class.php:1398 +#: include/class/acc_ledger_history_purchase.class.php:277 +#: include/class/acc_ledger_history_sale.class.php:263 #: include/class/acc_ledger_purchase.class.php:1827 msgid "Date paiement" msgstr "" @@ -14696,10 +14758,11 @@ msgstr "" #: include/class/acc_ledger_history_sale.class.php:246 #: include/class/acc_ledger_history_purchase.class.php:253 #: include/class/acc_ledger_history_sale.class.php:247 +#: include/class/acc_ledger_history_purchase.class.php:254 #: include/template/dashboard.php:344 #: include/template/security_list_action.php:72 #: include/export/export_histo_csv.php:45 -#: include/class/acc_ledger_history_purchase.class.php:253 +#: include/class/acc_ledger_history_purchase.class.php:258 #: include/class/acc_ledger_history_sale.class.php:247 msgid "Note" msgstr "" @@ -15069,7 +15132,7 @@ msgstr "" #: include/class/acc_ledger_search.class.php:111 #: include/lib/html_input.class.php:1017 include/lib/html_input.class.php:1018 #: include/class/acc_ledger_search.class.php:112 -#: include/lib/html_input.class.php:1033 +#: include/lib/html_input.class.php:1033 include/lib/html_input.class.php:1034 #: include/class/acc_ledger_search.class.php:112 #: include/lib/html_input.class.php:1034 msgid "choix des journaux" @@ -16463,7 +16526,7 @@ msgstr "" #: include/lib/class_html_input.php:946 include/lib/class_html_input.php:972 #: include/lib/html_input.class.php:1025 include/lib/html_input.class.php:1083 #: include/lib/html_input.class.php:1084 include/lib/html_input.class.php:1099 -#: include/lib/html_input.class.php:1100 +#: include/lib/html_input.class.php:1100 include/lib/html_input.class.php:1100 #, php-format msgid "Voulez-vous effacer cette relation " msgstr "" @@ -16475,7 +16538,7 @@ msgstr "" #: include/lib/class_html_input.php:958 include/lib/class_html_input.php:984 #: include/lib/html_input.class.php:1037 include/lib/html_input.class.php:1095 #: include/lib/html_input.class.php:1096 include/lib/html_input.class.php:1111 -#: include/lib/html_input.class.php:1112 +#: include/lib/html_input.class.php:1112 include/lib/html_input.class.php:1112 msgid "Ajout autres" msgstr "" @@ -16898,9 +16961,12 @@ msgstr "" #: include/export/export_ledger_csv.php:262 #: include/class/acc_ledger_history_purchase.class.php:258 #: include/class/acc_ledger_history_purchase.class.php:259 +#: include/class/print_ledger_simple.class.php:116 +#: include/class/acc_ledger_history_purchase.class.php:260 #: include/template/operation_detail_ven.php:45 #: include/template/operation_detail_ach.php:53 -#: include/class/acc_ledger_history_purchase.class.php:259 +#: include/class/print_ledger_simple.class.php:116 +#: include/class/acc_ledger_history_purchase.class.php:264 msgid "TVA NP" msgstr "" @@ -18229,13 +18295,13 @@ msgstr "" #: html/ajax_misc.php:290 html/ajax_misc.php:382 html/ajax_misc.php:384 #: html/ajax_misc.php:390 include/lib/message_javascript.php:90 #: include/lib/message_javascript.php:92 html/ajax_misc.php:392 -#: include/lib/message_javascript.php:92 +#: html/ajax_misc.php:392 include/lib/message_javascript.php:92 msgid "Action non autorisée" msgstr "" #: html/ajax_misc.php:196 html/ajax_misc.php:274 html/ajax_misc.php:279 #: html/ajax_misc.php:307 html/ajax_misc.php:399 html/ajax_misc.php:401 -#: html/ajax_misc.php:407 html/ajax_misc.php:409 +#: html/ajax_misc.php:407 html/ajax_misc.php:409 html/ajax_misc.php:409 msgid "Des actions dépendent de cette catégorie" msgstr "" @@ -18429,7 +18495,7 @@ msgstr "" #: include/lib/html_input.class.php:1043 #: include/template/action_display_short.php:81 #: include/lib/html_input.class.php:1103 include/lib/html_input.class.php:1104 -#: include/lib/html_input.class.php:1119 +#: include/lib/html_input.class.php:1119 include/lib/html_input.class.php:1120 #: include/template/action_display_short.php:81 #: include/lib/html_input.class.php:1120 msgid "Nouvel événement" @@ -18888,13 +18954,13 @@ msgstr "" #: html/ajax_misc.php:571 html/ajax_misc.php:613 html/ajax_misc.php:408 #: html/ajax_misc.php:434 html/ajax_misc.php:546 html/ajax_misc.php:548 -#: html/ajax_misc.php:554 html/ajax_misc.php:556 +#: html/ajax_misc.php:554 html/ajax_misc.php:556 html/ajax_misc.php:556 msgid "Ce plugin n'existe pas " msgstr "" #: html/ajax_misc.php:572 html/ajax_misc.php:614 html/ajax_misc.php:409 #: html/ajax_misc.php:435 html/ajax_misc.php:547 html/ajax_misc.php:549 -#: html/ajax_misc.php:555 html/ajax_misc.php:557 +#: html/ajax_misc.php:555 html/ajax_misc.php:557 html/ajax_misc.php:557 msgid "Il y a une erreur, ce plugin n'existe pas" msgstr "" @@ -20270,7 +20336,8 @@ msgstr "" #: include/class/acc_ledger.class.php:2185 #: include/class/anc_listing.class.php:76 include/class/fiche.class.php:2246 #: html/user_login.php:158 html/ajax_misc.php:462 -#: include/class/fiche.class.php:2247 html/user_login.php:158 +#: include/class/fiche.class.php:2247 html/ajax_misc.php:464 +#: include/lib/manage_table_sql.class.php:634 html/user_login.php:158 #: html/ajax_misc.php:464 include/user.inc.php:138 #: include/template/todo_list_list_user.php:31 #: include/template/anc_key_display_list.php:28 @@ -20996,9 +21063,10 @@ msgstr "" #: include/class/acc_ledger_history_purchase.class.php:239 #: include/class/acc_ledger_history_sale.class.php:233 #: include/class/acc_ledger_history_generic.class.php:759 +#: include/class/acc_ledger_history_purchase.class.php:240 #: include/export/export_ledger_csv.php:46 #: include/class/acc_ledger_history_generic.class.php:759 -#: include/class/acc_ledger_history_purchase.class.php:239 +#: include/class/acc_ledger_history_purchase.class.php:244 #: include/class/acc_reconciliation.class.php:487 #: include/class/acc_reconciliation.class.php:511 #: include/class/acc_ledger_history_sale.class.php:233 @@ -21021,9 +21089,11 @@ msgstr "" #: include/class/acc_ledger_history_purchase.class.php:250 #: include/class/acc_ledger_history_sale.class.php:244 #: include/class/acc_ledger_history_generic.class.php:764 -#: include/export/export_ledger_csv.php:208 +#: include/export/export_ledger_csv.php:210 +#: include/class/acc_ledger_history_purchase.class.php:251 +#: include/export/export_ledger_csv.php:218 #: include/class/acc_ledger_history_generic.class.php:764 -#: include/class/acc_ledger_history_purchase.class.php:250 +#: include/class/acc_ledger_history_purchase.class.php:255 #: include/class/acc_ledger_history_sale.class.php:244 msgid "operation" msgstr "" @@ -21037,7 +21107,8 @@ msgstr "" #: include/class/acc_ledger_history_generic.class.php:764 #: include/export/export_ledger_csv.php:210 #: include/class/acc_ledger_history_generic.class.php:765 -#: include/export/export_ledger_csv.php:210 +#: include/export/export_ledger_csv.php:212 +#: include/export/export_ledger_csv.php:220 #: include/class/acc_ledger_history_generic.class.php:765 msgid "N° Pièce" msgstr "" @@ -21047,7 +21118,8 @@ msgstr "" #: include/export/export_ledger_csv.php:198 #: include/export/export_ledger_csv.php:219 #: include/export/export_ledger_csv.php:213 -#: include/export/export_ledger_csv.php:213 +#: include/export/export_ledger_csv.php:215 +#: include/export/export_ledger_csv.php:223 msgid "commentaire" msgstr "" @@ -21060,7 +21132,8 @@ msgstr "" #: include/class/acc_ledger_history_generic.class.php:681 #: include/export/export_ledger_csv.php:214 #: include/class/acc_ledger_history_generic.class.php:682 -#: include/export/export_ledger_csv.php:214 +#: include/export/export_ledger_csv.php:216 +#: include/export/export_ledger_csv.php:224 #: include/class/acc_ledger_history_generic.class.php:682 #: include/class/acc_reconciliation.class.php:484 msgid "internal" @@ -21081,7 +21154,8 @@ msgstr "" #: include/class/acc_ledger_history_sale.class.php:247 #: include/class/acc_ledger_history_purchase.class.php:254 #: include/class/acc_ledger_history_sale.class.php:248 -#: include/class/acc_ledger_history_purchase.class.php:254 +#: include/class/acc_ledger_history_purchase.class.php:255 +#: include/class/acc_ledger_history_purchase.class.php:259 #: include/class/acc_reconciliation.class.php:508 #: include/class/acc_ledger_history_sale.class.php:248 msgid "interne" @@ -21092,7 +21166,8 @@ msgstr "" #: include/export/export_ledger_csv.php:259 #: include/class/acc_ledger_history_purchase.class.php:255 #: include/class/acc_ledger_history_purchase.class.php:256 -#: include/class/acc_ledger_history_purchase.class.php:256 +#: include/class/acc_ledger_history_purchase.class.php:257 +#: include/class/acc_ledger_history_purchase.class.php:261 msgid "privé" msgstr "" @@ -21101,7 +21176,8 @@ msgstr "" #: include/export/export_ledger_csv.php:260 #: include/class/acc_ledger_history_purchase.class.php:256 #: include/class/acc_ledger_history_purchase.class.php:257 -#: include/class/acc_ledger_history_purchase.class.php:257 +#: include/class/acc_ledger_history_purchase.class.php:258 +#: include/class/acc_ledger_history_purchase.class.php:262 msgid "DNA" msgstr "" @@ -21110,7 +21186,8 @@ msgstr "" #: include/export/export_ledger_csv.php:261 #: include/class/acc_ledger_history_purchase.class.php:257 #: include/class/acc_ledger_history_purchase.class.php:258 -#: include/class/acc_ledger_history_purchase.class.php:258 +#: include/class/acc_ledger_history_purchase.class.php:259 +#: include/class/acc_ledger_history_purchase.class.php:263 msgid "tva non ded." msgstr "" @@ -21121,8 +21198,7 @@ msgstr "" #: include/class/acc_ledger_history_sale.class.php:262 #: include/class/acc_ledger_history_purchase.class.php:271 #: include/class/acc_ledger_history_sale.class.php:263 -#: include/class/acc_ledger_history_purchase.class.php:271 -#: include/class/acc_ledger_history_sale.class.php:263 +#: include/class/acc_ledger_history_purchase.class.php:272 msgid "opérations liées" msgstr "" @@ -21944,6 +22020,7 @@ msgstr "" #: include/lib/manage_table_sql.class.php:1025 #: include/lib/manage_table_sql.class.php:1022 #: include/lib/manage_table_sql.class.php:1066 +#: include/lib/manage_table_sql.class.php:1066 msgid "OK" msgstr "" @@ -21953,6 +22030,7 @@ msgstr "" #: include/lib/manage_table_sql.class.php:1028 #: include/lib/manage_table_sql.class.php:1025 #: include/lib/manage_table_sql.class.php:1069 +#: include/lib/manage_table_sql.class.php:1069 msgid "Cancel" msgstr "" @@ -22092,7 +22170,8 @@ msgstr "" msgid "Etablir bilan interne" msgstr "" -#: include/ext/bilan_interne/index.php:110 +#: include/ext/bilan_interne/index.php:110 include/lib/html_input.class.php:559 +#: include/lib/html_input.class.php:559 msgid "Imprimer" msgstr "" @@ -22607,7 +22686,8 @@ msgstr "" #: include/class/acc_payment.class.php:294 #: include/class/acc_payment.class.php:297 -#: include/class/acc_payment.class.php:297 +#: include/class/acc_payment.class.php:226 +#: include/class/acc_payment.class.php:226 #, php-format msgid "Date %s" msgstr "" @@ -22776,12 +22856,12 @@ msgid "Vous n'avez encore sauvé aucun modèle" msgstr "" #: html/ajax_misc.php:288 html/ajax_misc.php:290 html/ajax_misc.php:296 -#: html/ajax_misc.php:298 +#: html/ajax_misc.php:298 html/ajax_misc.php:298 msgid "Invalide type" msgstr "" #: html/ajax_misc.php:452 html/ajax_misc.php:454 html/ajax_misc.php:460 -#: html/ajax_misc.php:462 +#: html/ajax_misc.php:462 html/ajax_misc.php:462 msgid "Choisissez la TVA" msgstr "" @@ -23033,18 +23113,22 @@ msgstr "" #: include/template/acc_ledger_history_purchase_extended.php:124 #: include/template/acc_ledger_history_sale_extended.php:124 -#: include/template/acc_ledger_history_purchase_extended.php:124 -#: include/template/acc_ledger_history_sale_extended.php:124 +#: include/template/acc_ledger_history_purchase_extended.php:125 +#: include/template/acc_ledger_history_sale_extended.php:126 +#: include/template/acc_ledger_history_purchase_extended.php:125 +#: include/template/acc_ledger_history_sale_extended.php:126 msgid "Item" msgstr "" #: include/template/acc_ledger_history_purchase_extended.php:125 -#: include/template/acc_ledger_history_purchase_extended.php:125 +#: include/template/acc_ledger_history_purchase_extended.php:126 +#: include/template/acc_ledger_history_purchase_extended.php:126 msgid "Prix Unit" msgstr "" #: include/template/acc_ledger_history_sale_extended.php:125 -#: include/template/acc_ledger_history_sale_extended.php:125 +#: include/template/acc_ledger_history_sale_extended.php:127 +#: include/template/acc_ledger_history_sale_extended.php:127 msgid "Prix Uni" msgstr "" @@ -23367,14 +23451,17 @@ msgid "Journal incorrect" msgstr "" #: include/class/acc_ledger_history.class.php:46 -#: include/class/acc_ledger_history.class.php:46 +#: include/class/acc_ledger_history.class.php:47 +#: include/class/acc_ledger_history.class.php:48 msgid "pa_ledger doit être un tableau" msgstr "" #: include/class/acc_ledger_history.class.php:108 #: include/class/acc_ledger_history.class.php:121 -#: include/class/acc_ledger_history.class.php:108 -#: include/class/acc_ledger_history.class.php:121 +#: include/class/acc_ledger_history.class.php:109 +#: include/class/acc_ledger_history.class.php:122 +#: include/class/acc_ledger_history.class.php:110 +#: include/class/acc_ledger_history.class.php:123 msgid "invalid parameter" msgstr "" @@ -23400,7 +23487,8 @@ msgstr "" #: include/class/acc_ledger_history_sale.class.php:261 #: include/class/acc_ledger_history_purchase.class.php:270 #: include/class/acc_ledger_history_sale.class.php:262 -#: include/class/acc_ledger_history_purchase.class.php:270 +#: include/class/acc_ledger_history_purchase.class.php:271 +#: include/class/acc_ledger_history_purchase.class.php:276 #: include/class/acc_ledger_history_sale.class.php:262 msgid "TVAC/TTC" msgstr "" @@ -24205,32 +24293,41 @@ msgstr "" msgid "Database:get_row retourne trop de lignes" msgstr "" +#: include/class/payment_method_mtable.class.php:39 #: include/class/payment_method_mtable.class.php:39 msgid "Enregistrement dans" msgstr "" +#: include/class/payment_method_mtable.class.php:42 #: include/class/payment_method_mtable.class.php:42 msgid "Utilisation dans" msgstr "" +#: include/class/payment_method_mtable.class.php:68 +#: include/class/payment_method_mtable.class.php:92 #: include/class/payment_method_mtable.class.php:68 #: include/class/payment_method_mtable.class.php:92 msgid "Un libellé est obligatoire" msgstr "" +#: include/class/payment_method_mtable.class.php:77 +#: include/class/payment_method_mtable.class.php:87 #: include/class/payment_method_mtable.class.php:77 #: include/class/payment_method_mtable.class.php:87 msgid "Choisissez un journal" msgstr "" +#: include/class/payment_method_mtable.class.php:98 #: include/class/payment_method_mtable.class.php:98 msgid "Fiche inexistante" msgstr "" +#: include/class/payment_method_mtable.class.php:115 #: include/class/payment_method_mtable.class.php:115 msgid "Choisissez un type de fiche" msgstr "" +#: include/class/payment_method_mtable.class.php:140 #: include/class/payment_method_mtable.class.php:140 #, php-format msgid "Erreur key %s value %s" @@ -24242,10 +24339,61 @@ msgid "" "avec journaux OD" msgstr "" +#: include/lib/message_javascript.php:105 #: include/lib/message_javascript.php:105 msgid "Pour les journaux FIN, ce sera la fiche du journal" msgstr "" +#: include/lib/manage_table_sql.class.php:965 #: include/lib/manage_table_sql.class.php:965 msgid "non implémenté" msgstr "" + +#: include/template/acc_ledger_history_purchase_oneline.php:66 +#: include/template/acc_ledger_history_purchase_oneline.php:66 +msgid "Lien" +msgstr "" + +#: include/impress_jrn.inc.php:156 include/impress_jrn.inc.php:156 +msgid "Style d'impression" +msgstr "" + +#: include/class/print_ledger_simple.class.php:113 +#: include/class/print_ledger_simple.class.php:113 +msgid "Priv/DNA" +msgstr "" + +#: include/export/export_ledger_csv.php:142 +#: include/class/acc_ledger_history_purchase.class.php:279 +#: include/class/acc_ledger_history_sale.class.php:265 +msgid "Montant paiement" +msgstr "" + +#: include/export/export_ledger_csv.php:143 +msgid "Methode paiement" +msgstr "" + +#: include/export/export_ledger_csv.php:144 +msgid "Opération paiement" +msgstr "" + +#: include/class/print_ledger_detail_item.class.php:145 +#, php-format +msgid "Paiement montant %s date %s methoded %s " +msgstr "" + +#: include/class/acc_ledger_history_purchase.class.php:278 +#: include/class/acc_ledger_history_sale.class.php:264 +msgid "Méthode paiement" +msgstr "" + +#: include/class/acc_ledger_history_purchase.class.php:280 +#: include/class/acc_ledger_history_sale.class.php:266 +msgid "n° opération" +msgstr "" + +#: include/lib/message_javascript.php:104 +msgid "" +"Limite le type de fiche si vous choisissez la fiche à la saisie, uniquement " +"avec journaux OD" +msgstr "" diff --git a/html/lang/nl_NL/LC_MESSAGES/messages.po b/html/lang/nl_NL/LC_MESSAGES/messages.po index b6b340622..2facf4735 100644 --- a/html/lang/nl_NL/LC_MESSAGES/messages.po +++ b/html/lang/nl_NL/LC_MESSAGES/messages.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: NOALYSS\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-08 01:27+0200\n" +"POT-Creation-Date: 2019-08-15 11:12+0200\n" "PO-Revision-Date: 2019-07-31 13:23+0100\n" "Last-Translator: dany \n" "Language-Team: English \n" @@ -61,6 +61,7 @@ msgstr "" #: include/class/class_acc_payment.php:290 #: include/class/acc_payment.class.php:298 #: include/class/acc_payment.class.php:301 +#: include/class/acc_payment.class.php:230 msgid " Acompte à déduire" msgstr "Af te trekken voorschot" @@ -214,6 +215,7 @@ msgstr "" #: include/class/class_acc_payment.php:298 #: include/class/acc_payment.class.php:306 #: include/class/acc_payment.class.php:310 +#: include/class/acc_payment.class.php:239 msgid " Libellé du paiement" msgstr "Omschrijving van de betaling" @@ -432,6 +434,7 @@ msgstr "Kan niet worden omgezet in PDF" #: include/class/class_acc_payment.php:328 #: include/class/acc_payment.class.php:337 #: include/class/acc_payment.class.php:341 +#: include/class/acc_payment.class.php:270 msgid " paiement par " msgstr "betaling in" @@ -4127,6 +4130,7 @@ msgstr "Ongeldige sleutel" #: include/class/acc_ledger_sold.class.php:707 #: include/class/acc_ledger_sold.class.php:1074 #: include/class/acc_ledger_sold.class.php:1330 +#: include/class/print_ledger_simple.class.php:103 msgid "Client" msgstr "Klant" @@ -4420,6 +4424,8 @@ msgstr "Stock code" #: include/class/acc_ledger_purchase.class.php:1843 #: include/class/acc_ledger_sold.class.php:1417 #: include/class/acc_ledger_purchase.class.php:1846 +#: include/template/acc_ledger_history_purchase_extended.php:130 +#: include/template/acc_ledger_history_sale_extended.php:131 msgid "Code TVA" msgstr "BTW-code" @@ -5623,6 +5629,8 @@ msgstr "Diff" #: include/export/export_ledger_csv.php:260 #: include/class/acc_ledger_history_purchase.class.php:256 #: include/class/acc_ledger_history_purchase.class.php:257 +#: include/class/acc_ledger_history_purchase.class.php:258 +#: include/class/acc_ledger_history_purchase.class.php:262 msgid "DNA" msgstr "" @@ -5861,6 +5869,11 @@ msgstr "" #: include/class/acc_ledger_history_generic.class.php:680 #: include/class/acc_ledger_history_generic.class.php:767 #: include/class/fiche.class.php:1397 include/class/fiche.class.php:1472 +#: include/export/export_ledger_csv.php:211 +#: include/class/print_ledger_simple.class.php:100 +#: include/class/acc_ledger_history_purchase.class.php:249 +#: include/export/export_ledger_csv.php:219 +#: include/class/acc_ledger_history_purchase.class.php:253 msgid "Date" msgstr "Datum" @@ -5870,6 +5883,7 @@ msgstr "Datum" #: include/class/acc_payment.class.php:294 #: include/class/acc_payment.class.php:297 +#: include/class/acc_payment.class.php:226 #, fuzzy, php-format msgid "Date %s" msgstr "Datum" @@ -6162,6 +6176,9 @@ msgstr "Datum van de verrichting" #: include/class/acc_ledger_purchase.class.php:1824 #: include/class/acc_ledger_sold.class.php:1398 #: include/class/acc_ledger_purchase.class.php:1827 +#: include/export/export_ledger_csv.php:141 +#: include/class/acc_ledger_history_purchase.class.php:277 +#: include/class/acc_ledger_history_sale.class.php:263 msgid "Date paiement" msgstr "Datum van de betaling" @@ -6270,7 +6287,7 @@ msgstr "" #: include/ext/bilan_interne/class_acc_bilaninterne.php:274 #: include/ext/bilan_interne/acc_bilaninterne.class.php:274 #: include/class/acc_bilan.class.php:70 include/class/anc_print.class.php:142 -#: include/balance.inc.php:77 +#: include/balance.inc.php:77 include/impress_jrn.inc.php:132 msgid "Depuis" msgstr "Vanaf" @@ -6480,6 +6497,7 @@ msgstr "Kan dit bestand op te slaan" #: include/class/fiche.class.php:1476 include/lib/ac_common.php:1213 #: include/template/param_jrn.php:85 include/class/fiche.class.php:1398 #: include/class/fiche.class.php:1477 +#: include/class/print_ledger_simple.class.php:108 msgid "Description" msgstr "Beschrijving" @@ -9801,6 +9819,9 @@ msgstr "Formules" #: include/class/acc_ledger_purchase.class.php:1430 #: include/class/acc_ledger_history_purchase.class.php:252 #: include/class/acc_ledger_history_sale.class.php:246 +#: include/class/print_ledger_simple.class.php:105 +#: include/class/acc_ledger_history_purchase.class.php:253 +#: include/class/acc_ledger_history_purchase.class.php:257 msgid "Fournisseur" msgstr "Leverancier" @@ -10225,6 +10246,11 @@ msgstr "" #: include/class/acc_ledger_history_sale.class.php:248 #: include/class/acc_ledger_history_purchase.class.php:255 #: include/class/acc_ledger_history_sale.class.php:249 +#: include/template/acc_ledger_history_purchase_extended.php:128 +#: include/template/acc_ledger_history_sale_extended.php:129 +#: include/class/print_ledger_simple.class.php:110 +#: include/class/acc_ledger_history_purchase.class.php:256 +#: include/class/acc_ledger_history_purchase.class.php:260 msgid "HTVA" msgstr "Zonder BTW" @@ -10886,7 +10912,7 @@ msgstr "Detail van een afdruktaak boekhoudkundige" msgid "Impression du grand livre" msgstr "Het grootboek afdrukken" -#: include/ext/bilan_interne/index.php:110 +#: include/ext/bilan_interne/index.php:110 include/lib/html_input.class.php:559 msgid "Imprimer" msgstr "" @@ -11162,6 +11188,8 @@ msgstr "Omgekeerde selectie" #: include/template/acc_ledger_history_purchase_extended.php:124 #: include/template/acc_ledger_history_sale_extended.php:124 +#: include/template/acc_ledger_history_purchase_extended.php:125 +#: include/template/acc_ledger_history_sale_extended.php:126 #, fuzzy msgid "Item" msgstr "Item code" @@ -11379,6 +11407,7 @@ msgstr "Om de positie" #: include/template/stock_histo_search.php:47 include/class_anc_print.php:159 #: include/class/class_anc_print.php:159 include/class/class_anc_print.php:161 #: include/class/anc_print.class.php:155 include/class/anc_print.class.php:153 +#: include/impress_jrn.inc.php:143 msgid "Jusque" msgstr "Peuter" @@ -12217,6 +12246,10 @@ msgstr "Omschrijving van het menu" msgid "Libellé vide" msgstr "Volgt:" +#: include/template/acc_ledger_history_purchase_oneline.php:66 +msgid "Lien" +msgstr "" + #: include/database.item.php:6 include/database.item.php:9 #: include/database.item.php:11 include/database.item.php:14 #: include/database.item.php:8 @@ -12256,6 +12289,12 @@ msgstr "Regel niet geïmporteerd" msgid "Limite dossiers" msgstr "Records Management" +#: include/lib/message_javascript.php:104 +msgid "" +"Limite le type de fiche si vous choisissez la fiche à la saisie, uniquement " +"avec journaux OD" +msgstr "" + #: include/lib/message_javascript.php:104 msgid "" "Limite le type fiche si vous choisissez la fiche à la saisie, uniquement " @@ -12697,6 +12736,11 @@ msgstr "Bericht" msgid "Met à jour toutes les dossiers et modèles" msgstr "Update" +#: include/export/export_ledger_csv.php:143 +#, fuzzy +msgid "Methode paiement" +msgstr "Betaling" + #: include/lib/message_javascript.php:72 include/lib/message_javascript.php:74 msgid "Mettez le pourcentage
        à zéro pour effacer la ligne" msgstr "" @@ -13546,6 +13590,13 @@ msgstr "Bedragen min." msgid "Montant opération" msgstr "Datum van de verrichting" +#: include/export/export_ledger_csv.php:142 +#: include/class/acc_ledger_history_purchase.class.php:279 +#: include/class/acc_ledger_history_sale.class.php:265 +#, fuzzy +msgid "Montant paiement" +msgstr "Datum van de betaling" + #: include/template/stock_histo_search.php:55 msgid "Montant supérieur ou égal à" msgstr "Bedrag groter dan of gelijk aan" @@ -13674,6 +13725,12 @@ msgstr "" msgid "MultiModule" msgstr "Module" +#: include/class/acc_ledger_history_purchase.class.php:278 +#: include/class/acc_ledger_history_sale.class.php:264 +#, fuzzy +msgid "Méthode paiement" +msgstr "Betaling" + #: include/ajax/ajax_preference.php:174 include/ajax/ajax_preference.php:185 msgid "N'utilisez pas le même séparateur pour les champs et les décimales" msgstr "" @@ -14413,6 +14470,8 @@ msgstr "" #: include/class/acc_ledger_history_sale.class.php:246 #: include/class/acc_ledger_history_purchase.class.php:253 #: include/class/acc_ledger_history_sale.class.php:247 +#: include/class/acc_ledger_history_purchase.class.php:254 +#: include/class/acc_ledger_history_purchase.class.php:258 msgid "Note" msgstr "Nota" @@ -14804,6 +14863,8 @@ msgstr "Nr." #: include/class/acc_ledger_history_generic.class.php:764 #: include/export/export_ledger_csv.php:210 #: include/class/acc_ledger_history_generic.class.php:765 +#: include/export/export_ledger_csv.php:212 +#: include/export/export_ledger_csv.php:220 #, fuzzy msgid "N° Pièce" msgstr "Stuk nr." @@ -15172,6 +15233,11 @@ msgstr "Werking omgekeerd" msgid "Opération non trouvée" msgstr "Handeling is niet gevonden" +#: include/export/export_ledger_csv.php:144 +#, fuzzy +msgid "Opération paiement" +msgstr "Operatie van verkopen" + #: include/operation_ods_new.inc.php:94 #, fuzzy, php-format msgid "Opération rapprochée : %s" @@ -15499,6 +15565,8 @@ msgstr "Eenheidsprijs" #: include/class/acc_ledger_search.class.php:631 #: include/class/acc_ledger.class.php:2421 #: include/class/acc_ledger_search.class.php:644 +#: include/class/acc_ledger_history_purchase.class.php:250 +#: include/class/acc_ledger_history_purchase.class.php:254 msgid "Paiement" msgstr "Betaling" @@ -15511,6 +15579,7 @@ msgstr "Betaling klant" #: include/class/class_acc_payment.php:304 #: include/class/acc_payment.class.php:312 #: include/class/acc_payment.class.php:316 +#: include/class/acc_payment.class.php:245 msgid "Paiement encodé plus tard" msgstr "Later in te brengen" @@ -15523,6 +15592,11 @@ msgstr "Betaling geregistreerd in" msgid "Paiement fournisseur" msgstr "Betaling van de leverancier" +#: include/class/print_ledger_detail_item.class.php:145 +#, php-format +msgid "Paiement montant %s date %s methoded %s " +msgstr "" + #: include/database.item.php:226 #, fuzzy msgid "Paiement par paypal" @@ -15922,6 +15996,7 @@ msgstr "Betaald" #: include/class/acc_ledger_purchase.class.php:1680 #: include/class/acc_ledger_purchase.class.php:1698 #: include/class/acc_ledger_purchase.class.php:1701 +#: include/class/print_ledger_simple.class.php:274 msgid "Payé par" msgstr "Betaald deur" @@ -16133,6 +16208,9 @@ msgstr "stuk" #: include/class/acc_ledger.class.php:858 #: include/class/acc_ledger_search.class.php:646 #: include/class/acc_ledger_search.class.php:958 include/lib/ac_common.php:1212 +#: include/class/print_ledger_simple.class.php:99 +#: include/class/acc_ledger_history_purchase.class.php:252 +#: include/class/acc_ledger_history_purchase.class.php:256 msgid "Pièce" msgstr "Bewijs" @@ -16831,16 +16909,22 @@ msgstr "" msgid "Priorité" msgstr "Prioriteit" +#: include/class/print_ledger_simple.class.php:113 +msgid "Priv/DNA" +msgstr "" + #: include/template/impress_reconciliation_detail.php:10 msgid "Prix HTVA" msgstr "Priijs exclusief BTW" #: include/template/acc_ledger_history_sale_extended.php:125 +#: include/template/acc_ledger_history_sale_extended.php:127 #, fuzzy msgid "Prix Uni" msgstr "Prijs / A" #: include/template/acc_ledger_history_purchase_extended.php:125 +#: include/template/acc_ledger_history_purchase_extended.php:126 #, fuzzy msgid "Prix Unit" msgstr "Prijs / A" @@ -17239,6 +17323,8 @@ msgstr "Code" #: include/template/acc_ledger_history_purchase_extended.php:126 #: include/template/acc_ledger_history_sale_extended.php:126 #: include/template/stock_inv.php:71 +#: include/template/acc_ledger_history_purchase_extended.php:127 +#: include/template/acc_ledger_history_sale_extended.php:128 msgid "Quantité" msgstr "Hoeveelheid" @@ -17308,6 +17394,8 @@ msgstr "Quick Code of" #: include/class/acc_ledger_history_generic.class.php:768 #: include/export/export_ledger_csv.php:211 #: include/class/acc_ledger_history_generic.class.php:769 +#: include/export/export_ledger_csv.php:213 +#: include/export/export_ledger_csv.php:221 msgid "QuickCode" msgstr "QuickCode" @@ -18488,6 +18576,11 @@ msgstr "Voorraad" msgid "Stock et commande" msgstr "Voorraad in Bestelling" +#: include/impress_jrn.inc.php:156 +#, fuzzy +msgid "Style d'impression" +msgstr "Print menu" + #: include/ext/importbank/ajax.php:82 include/ext/importbank/ajax.php:83 #, fuzzy msgid "Suggestion" @@ -18761,6 +18854,8 @@ msgstr "" #: include/template/acc_ledger_history_sale_oneline.php:53 #: include/class/acc_ledger_history_sale.class.php:249 #: include/class/acc_ledger_history_sale.class.php:250 +#: include/template/acc_ledger_history_purchase_extended.php:129 +#: include/template/acc_ledger_history_sale_extended.php:130 msgid "TVA" msgstr "BTW" @@ -18779,6 +18874,7 @@ msgstr "Fiscaal aftrekbaar" #: include/template/ledger_detail_ach.php:134 #: include/template/ledger_detail_ach.php:135 +#: include/class/print_ledger_simple.class.php:114 msgid "TVA ND" msgstr "BTW ND" @@ -18789,6 +18885,9 @@ msgstr "BTW ND" #: include/export/export_ledger_csv.php:262 #: include/class/acc_ledger_history_purchase.class.php:258 #: include/class/acc_ledger_history_purchase.class.php:259 +#: include/class/print_ledger_simple.class.php:116 +#: include/class/acc_ledger_history_purchase.class.php:260 +#: include/class/acc_ledger_history_purchase.class.php:264 #, fuzzy msgid "TVA NP" msgstr "BTW ND" @@ -18947,6 +19046,8 @@ msgstr "BTW ingevorderd" #: include/template/acc_ledger_history_sale_extended.php:55 #: include/template/acc_ledger_history_sale_extended.php:130 #: include/template/acc_ledger_history_sale_oneline.php:56 +#: include/template/acc_ledger_history_purchase_extended.php:131 +#: include/template/acc_ledger_history_sale_extended.php:132 msgid "TVAC" msgstr "BTW Met" @@ -18954,6 +19055,8 @@ msgstr "BTW Met" #: include/class/acc_ledger_history_sale.class.php:261 #: include/class/acc_ledger_history_purchase.class.php:270 #: include/class/acc_ledger_history_sale.class.php:262 +#: include/class/acc_ledger_history_purchase.class.php:271 +#: include/class/acc_ledger_history_purchase.class.php:276 #, fuzzy msgid "TVAC/TTC" msgstr "BTW Met" @@ -19128,7 +19231,8 @@ msgstr "Thema" #: include/class/acc_ledger_search.class.php:650 #: include/class/fiche.class.php:1475 #: include/class/acc_ledger_history_generic.class.php:683 -#: include/class/fiche.class.php:1476 +#: include/class/fiche.class.php:1476 include/export/export_ledger_csv.php:214 +#: include/export/export_ledger_csv.php:222 msgid "Tiers" msgstr "Derde" @@ -19518,6 +19622,12 @@ msgstr "Total Credit" #: include/fiche.inc.php:447 #: include/class/acc_ledger_history_generic.class.php:738 #: include/class/fiche.class.php:1564 +#: include/template/acc_ledger_history_sale_detail.php:155 +#: include/template/acc_ledger_history_purchase_detail.php:168 +#: include/template/acc_ledger_history_purchase_oneline.php:141 +#: include/template/acc_ledger_history_sale_oneline.php:121 +#: include/template/acc_ledger_history_purchase_extended.php:160 +#: include/template/acc_ledger_history_sale_extended.php:161 msgid "Totaux" msgstr "Totalen" @@ -21171,6 +21281,8 @@ msgstr "BTW-code" #: include/export/export_ledger_csv.php:198 #: include/export/export_ledger_csv.php:219 #: include/export/export_ledger_csv.php:213 +#: include/export/export_ledger_csv.php:215 +#: include/export/export_ledger_csv.php:223 #, fuzzy msgid "commentaire" msgstr "Commentaar" @@ -21541,6 +21653,8 @@ msgstr "onbestaand" #: include/class/acc_ledger_history_generic.class.php:681 #: include/export/export_ledger_csv.php:214 #: include/class/acc_ledger_history_generic.class.php:682 +#: include/export/export_ledger_csv.php:216 +#: include/export/export_ledger_csv.php:224 #, fuzzy msgid "internal" msgstr "Intern" @@ -21554,12 +21668,18 @@ msgstr "Intern" #: include/class/acc_ledger_history_sale.class.php:247 #: include/class/acc_ledger_history_purchase.class.php:254 #: include/class/acc_ledger_history_sale.class.php:248 +#: include/class/acc_ledger_history_purchase.class.php:255 +#: include/class/acc_ledger_history_purchase.class.php:259 #, fuzzy msgid "interne" msgstr "Intern" #: include/class/acc_ledger_history.class.php:108 #: include/class/acc_ledger_history.class.php:121 +#: include/class/acc_ledger_history.class.php:109 +#: include/class/acc_ledger_history.class.php:122 +#: include/class/acc_ledger_history.class.php:110 +#: include/class/acc_ledger_history.class.php:123 msgid "invalid parameter" msgstr "ongeldig parameter " @@ -21576,6 +21696,8 @@ msgstr "ongeldig parameter " #: include/class/acc_ledger_history_purchase.class.php:239 #: include/class/acc_ledger_history_sale.class.php:233 #: include/class/acc_ledger_history_generic.class.php:759 +#: include/class/acc_ledger_history_purchase.class.php:240 +#: include/class/acc_ledger_history_purchase.class.php:244 #, fuzzy msgid "journal" msgstr "Journaal" @@ -21738,6 +21860,8 @@ msgstr "" #: include/ajax/ajax_display_letter.php:55 #: include/export/export_ledger_csv.php:221 #: include/export/export_ledger_csv.php:215 +#: include/export/export_ledger_csv.php:217 +#: include/export/export_ledger_csv.php:225 msgid "montant" msgstr "bedrag" @@ -21911,6 +22035,12 @@ msgstr "Intern nr." msgid "n° ligne" msgstr "lijn nr" +#: include/class/acc_ledger_history_purchase.class.php:280 +#: include/class/acc_ledger_history_sale.class.php:266 +#, fuzzy +msgid "n° opération" +msgstr "Operatienr." + #: include/class_fiche.php:1282 include/template/impress_reconciliation.php:16 #: include/class_fiche.php:1288 include/class_fiche.php:1305 #: include/class/class_fiche.php:1305 include/class/class_fiche.php:1308 @@ -21963,6 +22093,10 @@ msgstr "" #: include/class/acc_ledger_history_purchase.class.php:250 #: include/class/acc_ledger_history_sale.class.php:244 #: include/class/acc_ledger_history_generic.class.php:764 +#: include/export/export_ledger_csv.php:210 +#: include/class/acc_ledger_history_purchase.class.php:251 +#: include/export/export_ledger_csv.php:218 +#: include/class/acc_ledger_history_purchase.class.php:255 #, fuzzy msgid "operation" msgstr "Operatie" @@ -22004,6 +22138,7 @@ msgstr "Gelinkte operaties" #: include/class/acc_ledger_history_sale.class.php:262 #: include/class/acc_ledger_history_purchase.class.php:271 #: include/class/acc_ledger_history_sale.class.php:263 +#: include/class/acc_ledger_history_purchase.class.php:272 #, fuzzy msgid "opérations liées" msgstr "Gelinkte operaties" @@ -22049,6 +22184,8 @@ msgid "ou générer une facture" msgstr "Creeren een faktuur" #: include/class/acc_ledger_history.class.php:46 +#: include/class/acc_ledger_history.class.php:47 +#: include/class/acc_ledger_history.class.php:48 msgid "pa_ledger doit être un tableau" msgstr "" @@ -22141,6 +22278,8 @@ msgstr "Accountant Vacature" #: include/export/export_ledger_csv.php:259 #: include/class/acc_ledger_history_purchase.class.php:255 #: include/class/acc_ledger_history_purchase.class.php:256 +#: include/class/acc_ledger_history_purchase.class.php:257 +#: include/class/acc_ledger_history_purchase.class.php:261 msgid "privé" msgstr "" @@ -22305,6 +22444,7 @@ msgstr "Zoeken" #: include/export/export_fiche_balance_csv.php:153 #: include/export/export_fiche_balance_csv.php:154 include/fiche.inc.php:517 #: include/fiche.inc.php:519 include/fiche.inc.php:528 +#: include/class/print_ledger_simple.class.php:101 msgid "ref" msgstr "ref" @@ -22562,6 +22702,8 @@ msgstr "onbekend btw" #: include/export/export_ledger_csv.php:261 #: include/class/acc_ledger_history_purchase.class.php:257 #: include/class/acc_ledger_history_purchase.class.php:258 +#: include/class/acc_ledger_history_purchase.class.php:259 +#: include/class/acc_ledger_history_purchase.class.php:263 #, fuzzy msgid "tva non ded." msgstr "onbekend btw" From c60d5d49dad1955a42597e6df978f9eac4ae4dd0 Mon Sep 17 00:00:00 2001 From: Dany De Bontridder Date: Thu, 15 Aug 2019 11:49:49 +0200 Subject: [PATCH 22/29] translation --- include/lib/html_input.class.php | 2 +- include/lib/message_javascript.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/lib/html_input.class.php b/include/lib/html_input.class.php index 421861ca6..47bf25614 100755 --- a/include/lib/html_input.class.php +++ b/include/lib/html_input.class.php @@ -556,7 +556,7 @@ class HtmlInput static function print_window() { $r=''; - $r.=HtmlInput::button('print', 'Imprimer', 'onclick="window.print();"'); + $r.=HtmlInput::button('print', _('Imprimer'), 'onclick="window.print();"'); return $r; } diff --git a/include/lib/message_javascript.php b/include/lib/message_javascript.php index 78de05b4c..03c3f3fb0 100644 --- a/include/lib/message_javascript.php +++ b/include/lib/message_javascript.php @@ -101,7 +101,7 @@ content[67]=""; content[69]=""; content[70]=""; -content[71]=""; +content[71]=""; content[72]=""; \ No newline at end of file From e669d05efcaa7cb07489fba00c5f90f7d1b819b6 Mon Sep 17 00:00:00 2001 From: Dany De Bontridder Date: Thu, 15 Aug 2019 11:50:04 +0200 Subject: [PATCH 23/29] Task #0001733: Impression moyen paiement --- include/class/acc_ledger_history.class.php | 27 ++++------- .../acc_ledger_history_financial.class.php | 1 + .../acc_ledger_history_purchase.class.php | 40 +++++++++++----- .../class/acc_ledger_history_sale.class.php | 30 +++++++----- include/class/acc_payment.class.php | 2 +- include/class/print_ledger.class.php | 1 - .../class/print_ledger_detail_item.class.php | 47 ++++++++++++------ include/class/print_ledger_simple.class.php | 48 ++++++++++++++----- .../print_ledger_simple_without_vat.class.php | 27 +++++++++-- include/export/export_ledger_csv.php | 46 +++++++++++------- include/impress_jrn.inc.php | 6 +-- .../acc_ledger_history_purchase_detail.php | 3 +- .../acc_ledger_history_purchase_extended.php | 3 +- .../acc_ledger_history_purchase_oneline.php | 6 ++- .../acc_ledger_history_sale_detail.php | 3 +- .../acc_ledger_history_sale_extended.php | 4 +- .../acc_ledger_history_sale_oneline.php | 3 +- 17 files changed, 194 insertions(+), 103 deletions(-) diff --git a/include/class/acc_ledger_history.class.php b/include/class/acc_ledger_history.class.php index 45b0a0c71..cf63b712c 100644 --- a/include/class/acc_ledger_history.class.php +++ b/include/class/acc_ledger_history.class.php @@ -28,8 +28,10 @@ require_once NOALYSS_INCLUDE."/class/acc_ledger_history_generic.class.php"; require_once NOALYSS_INCLUDE."/class/acc_ledger_history_sale.class.php"; require_once NOALYSS_INCLUDE."/class/acc_ledger_history_purchase.class.php"; require_once NOALYSS_INCLUDE."/class/acc_ledger_history_financial.class.php"; +require_once NOALYSS_INCLUDE."/class/prepared_query.class.php"; /** * @brief Display history of operation + * @see acc_ledger_historyTest.php */ abstract class Acc_Ledger_History { @@ -240,32 +242,19 @@ abstract class Acc_Ledger_History return $tiers; } + /** * Prepare the query for fetching the linked operation * @staticvar int $prepare */ protected function prepare_reconcile_date() { - $prepare=$this->db->is_prepare("reconcile_date"); - if ($prepare==FALSE) - { - $this->db->prepare('reconcile_date', - 'select * - from - jrn - where - jr_id in - (select - jra_concerned - from - jrn_rapt - where jr_id = $1 - union all - select - jr_id - from jrn_rapt - where jra_concerned=$1)'); + static $not_done=TRUE; + if ($not_done ) { + $prepare_query = new Prepared_Query($this->db); + $prepare_query->prepare_reconcile_date(); } + $not_done=FALSE; } /** * display accounting of operations m_mode=A diff --git a/include/class/acc_ledger_history_financial.class.php b/include/class/acc_ledger_history_financial.class.php index e8a0624f9..fdcb95e4d 100644 --- a/include/class/acc_ledger_history_financial.class.php +++ b/include/class/acc_ledger_history_financial.class.php @@ -82,6 +82,7 @@ class Acc_Ledger_History_Financial extends Acc_Ledger_History public function export_oneline_html() { $this->get_row(); + $this->prepare_reconcile_date(); require_once NOALYSS_TEMPLATE.'/acc_ledger_history_financial_oneline.php'; diff --git a/include/class/acc_ledger_history_purchase.class.php b/include/class/acc_ledger_history_purchase.class.php index 8024ab7c2..51f75b866 100644 --- a/include/class/acc_ledger_history_purchase.class.php +++ b/include/class/acc_ledger_history_purchase.class.php @@ -27,6 +27,7 @@ require_once NOALYSS_INCLUDE."/class/acc_ledger_history.class.php"; /** * @brief Display the operations for Purchase + * @see acc_ledger_historyTest.php */ class Acc_Ledger_History_Purchase extends Acc_Ledger_History { @@ -236,6 +237,10 @@ class Acc_Ledger_History_Purchase extends Acc_Ledger_History } function export_csv() { + // Prepare the query for reconcile date + $prepared_query=new Prepared_Query($this->db); + $prepared_query->prepare_reconcile_date(); + $export=new Noalyss_Csv(_('journal')); $export->send_header(); @@ -258,6 +263,7 @@ class Acc_Ledger_History_Purchase extends Acc_Ledger_History $title[]=_("tva non ded."); $title[]=_("TVA NP"); + if ( $own->MY_TVA_USE=='Y') { @@ -268,7 +274,11 @@ class Acc_Ledger_History_Purchase extends Acc_Ledger_History } } $title[]=_("TVAC/TTC"); - $title[]=_("opérations liées"); + $title[]=_("Date paiement"); + $title[]=_("Méthode paiement"); + $title[]=_("Montant paiement"); + $title[]=_("n° opération"); + $export->write_header($title); foreach ($this->data as $line) @@ -289,22 +299,24 @@ class Acc_Ledger_History_Purchase extends Acc_Ledger_History $export->add($line['tva_sided'],"number"); $a_tva_amount=array(); - //- set all TVA to 0 - foreach ($a_Tva as $l) { - $t_id=$l["tva_id"]; - $a_tva_amount[$t_id]=0; - } - foreach ($line['detail_vat'] as $lineTVA) - { - $idx_tva=$lineTVA['qp_vat_code']; - $a_tva_amount[$idx_tva]=$lineTVA['vat_amount']; - } - if ($own->MY_TVA_USE == 'Y' ) + if ($own->MY_TVA_USE=='Y') { + //- set all TVA to 0 + foreach ($a_Tva as $l) + { + $t_id=$l["tva_id"]; + $a_tva_amount[$t_id]=0; + } + foreach ($line['detail_vat'] as $lineTVA) + { + $idx_tva=$lineTVA['qp_vat_code']; + $a_tva_amount[$idx_tva]=$lineTVA['vat_amount']; + } + foreach ($a_Tva as $line_tva) { $a=$line_tva['tva_id']; - $export->add($a_tva_amount[$a],"number"); + $export->add($a_tva_amount[$a], "number"); } } $export->add($line['tvac'],"number"); @@ -317,6 +329,8 @@ class Acc_Ledger_History_Purchase extends Acc_Ledger_History for ($e=0;$e<$max;$e++) { $row=Database::fetch_array($ret_reconcile, $e); $export->add($row['jr_date']); + $export->add($row['qcode_bank']); + $export->add($row['jr_montant'],"number"); $export->add($row['jr_internal']); } } diff --git a/include/class/acc_ledger_history_sale.class.php b/include/class/acc_ledger_history_sale.class.php index 693bad729..fbc6ca729 100644 --- a/include/class/acc_ledger_history_sale.class.php +++ b/include/class/acc_ledger_history_sale.class.php @@ -260,7 +260,11 @@ class Acc_Ledger_History_Sale extends Acc_Ledger_History } } $title[]=_("TVAC/TTC"); - $title[]=_("opérations liées"); + $title[]=_("Date paiement"); + $title[]=_("Méthode paiement"); + $title[]=_("Montant paiement"); + $title[]=_("n° opération"); + $export->write_header($title); foreach ($this->data as $line) @@ -279,18 +283,19 @@ class Acc_Ledger_History_Sale extends Acc_Ledger_History $export->add($line['tva_sided'],"number"); $a_tva_amount=array(); - //- set all TVA to 0 - foreach ($a_Tva as $l) { - $t_id=$l["tva_id"]; - $a_tva_amount[$t_id]=0; - } - foreach ($line['detail_vat'] as $lineTVA) - { - $idx_tva=$lineTVA['qs_vat_code']; - $a_tva_amount[$idx_tva]=$lineTVA['vat_amount']; - } + if ($own->MY_TVA_USE == 'Y' ) { + //- set all TVA to 0 + foreach ($a_Tva as $l) { + $t_id=$l["tva_id"]; + $a_tva_amount[$t_id]=0; + } + foreach ($line['detail_vat'] as $lineTVA) + { + $idx_tva=$lineTVA['qs_vat_code']; + $a_tva_amount[$idx_tva]=$lineTVA['vat_amount']; + } foreach ($a_Tva as $line_tva) { $a=$line_tva['tva_id']; @@ -307,7 +312,10 @@ class Acc_Ledger_History_Sale extends Acc_Ledger_History for ($e=0;$e<$max;$e++) { $row=Database::fetch_array($ret_reconcile, $e); $export->add($row['jr_date']); + $export->add($row['qcode_bank']); + $export->add($row['jr_montant'],"number"); $export->add($row['jr_internal']); + } } $export->write(); diff --git a/include/class/acc_payment.class.php b/include/class/acc_payment.class.php index 6ebafc476..9b156b40c 100644 --- a/include/class/acc_payment.class.php +++ b/include/class/acc_payment.class.php @@ -267,7 +267,7 @@ class Acc_Payment } $s=new ISpan(); $s->name=$a->name.'_label'; - $f=_(" paiement par ").$a->input().$s->input(); + $f=_(" paiement par ").$a->input().$s->input().$a->search(); } else diff --git a/include/class/print_ledger.class.php b/include/class/print_ledger.class.php index 572a04d83..dfa59103b 100644 --- a/include/class/print_ledger.class.php +++ b/include/class/print_ledger.class.php @@ -149,7 +149,6 @@ class Print_Ledger { { $pdf=new Print_Ledger_Detail($cn, $p_ledger); return $pdf; - ; } if ($jrn_type=='ODS'||$p_ledger->id==0) { diff --git a/include/class/print_ledger_detail_item.class.php b/include/class/print_ledger_detail_item.class.php index 68387c01d..a92ea36ad 100644 --- a/include/class/print_ledger_detail_item.class.php +++ b/include/class/print_ledger_detail_item.class.php @@ -90,21 +90,25 @@ class Print_Ledger_Detail_Item extends PDFLand { bcscale(2); $jrn_type=$this->ledger->get_type(); + $http=new HttpInput(); switch ($jrn_type) { case 'VEN': $ledger=new Acc_Ledger_Sold($this->cn, $this->ledger->jrn_def_id); - $ret_detail=$ledger->get_detail_sale($_GET['from_periode'],$_GET['to_periode']); + $ret_detail=$ledger->get_detail_sale($http->get('from_periode','number'),$http->get('to_periode','number')); break; case 'ACH': $ledger=new Acc_Ledger_Purchase($this->cn, $this->ledger->jrn_def_id); - $ret_detail=$ledger->get_detail_purchase($_GET['from_periode'],$_GET['to_periode']); + $ret_detail=$ledger->get_detail_purchase($http->get('from_periode','number'),$http->get('to_periode','number')); break; default: die (__FILE__.":".__LINE__.'Journal invalide'); break; } if ( $ret_detail == null ) return; + $prepared_query=new Prepared_Query($this->ledger->db); + $prepared_query->prepare_reconcile_date(); + $nb=Database::num_row($ret_detail); $this->SetFont('DejaVu', '', 6); $internal=""; @@ -130,20 +134,35 @@ class Print_Ledger_Detail_Item extends PDFLand $this->write_cell(20, $high, nbm($sum), 1, 0, 'R', true); $internal=$row['jr_internal']; $this->line_new(6); - // on the first line, the code for each column is displaid + // Payment info + // Prepare the query for reconcile date + $ret_reconcile=$this->ledger->db->execute('reconcile_date', array($row['jr_id'])); + $max=Database::num_row($ret_reconcile); + for ($e=0; $e<$max; $e++) + { + $ret_row=Database::fetch_array($ret_reconcile, $e); + $msg=( $ret_row['qcode_bank']!="")?"[".$ret_row['qcode_bank']."]":$ret_row['jr_internal']; + $this->write_cell(200, $high, + sprintf(_("Paiement montant %s date %s methoded %s "), $ret_row['jr_montant'], + $ret_row['jr_date'], $msg + )); + $this->line_new(6); + } + // on the first line, the code for each column is displaid if ( $this->show_col == true ) { - // + + // Header detail - $this->LongLine(30,$high,'QuickCode'); - $this->write_cell(30,$high,'Poste'); - $this->LongLine(70,$high,'Libellé'); - $this->write_cell(20,$high,'Prix/Unit',0,0,'R'); - $this->write_cell(20,$high,'Quant.',0,0,'R'); - $this->write_cell(20,$high,'HTVA',0,0,'R'); - $this->write_cell(20,$high,'TVA NP',0,0,'R'); - $this->write_cell(20,$high,'Code TVA'); - $this->write_cell(20,$high,'TVA',0,0,'R'); - $this->write_cell(20,$high,'TVAC',0,0,'R'); + $this->LongLine(30,$high,_('QuickCode')); + $this->write_cell(30,$high,_('Poste')); + $this->LongLine(70,$high,_('Libellé')); + $this->write_cell(20,$high,_('Prix/Unit'),0,0,'R'); + $this->write_cell(20,$high,_('Quant.'),0,0,'R'); + $this->write_cell(20,$high,_('HTVA'),0,0,'R'); + $this->write_cell(20,$high,_('TVA NP'),0,0,'R'); + $this->write_cell(20,$high,_('Code TVA')); + $this->write_cell(20,$high,_('TVA'),0,0,'R'); + $this->write_cell(20,$high,_('TVAC'),0,0,'R'); $this->line_new(6); $this->show_col=false; } diff --git a/include/class/print_ledger_simple.class.php b/include/class/print_ledger_simple.class.php index e2f81cd8d..1b94509c2 100644 --- a/include/class/print_ledger_simple.class.php +++ b/include/class/print_ledger_simple.class.php @@ -96,24 +96,24 @@ class Print_Ledger_Simple extends PDF $tmp1=$line_tva['tva_id']; $this->rap_tva[$tmp1]=(isset($this->rap_tva[$tmp1]))?$this->rap_tva[$tmp1]:0; } - $this->Cell(15,6,'Pièce'); - $this->Cell(10,6,'Date'); - $this->Cell(13,6,'ref'); + $this->Cell(15,6,_('Pièce')); + $this->Cell(10,6,_('Date')); + $this->Cell(13,6,_('ref')); if ( $this->jrn_type=='ACH') - $this->Cell(40,6,'Client'); + $this->Cell(40,6,_('Client')); else - $this->Cell(40,6,'Fournisseur'); + $this->Cell(40,6,_('Fournisseur')); $flag_tva=(count($this->a_Tva) > 4)?true:false; - if ( !$flag_tva ) $this->Cell(65,6,'Description'); + if ( !$flag_tva ) $this->Cell(65,6,_('Description')); - $this->Cell(15,6,'HTVA',0,0,'R'); + $this->Cell(15,6,_('HTVA'),0,0,'R'); if ( $this->jrn_type=='ACH') { - $this->Cell(15,6,'Priv/DNA',0,0,'R'); - $this->Cell(15,6,'TVA ND',0,0,'R'); + $this->Cell(15,6,_('Priv/DNA'),0,0,'R'); + $this->Cell(15,6,_('TVA ND'),0,0,'R'); } - $this->Cell(15,6,'TVA NP',0,0,'R'); // Unpaid TVA --> autoliquidation, NPR + $this->Cell(15,6,_('TVA NP'),0,0,'R'); // Unpaid TVA --> autoliquidation, NPR foreach($this->a_Tva as $line_tva) { $this->Cell(15,6,$line_tva['tva_label'],0,0,'R'); @@ -210,8 +210,13 @@ class Print_Ledger_Simple extends PDF $a_jrn=$this->ledger->get_operation($http->get('from_periode',"number"), $http->get('to_periode',"number")); - + if ( $a_jrn == null ) return; + + // Prepare the query for reconcile date + $prepared_query=new Prepared_Query($this->ledger->db); + $prepared_query->prepare_reconcile_date(); + for ( $i=0;$irap_tva[$l]=bcadd($this->rap_tva[$l],$aAmountVat[$f]['sum_vat']); } - $row=$a_jrn[$i]; + $ret_reconcile=$this->ledger->db->execute('reconcile_date',array($row['id'])); $this->LongLine(15,5,($row['pj']),0); $this->write_cell(10,5,$row['date_fmt'],0,0); $this->write_cell(13,5,$row['internal'],0,0); @@ -265,7 +270,24 @@ class Print_Ledger_Simple extends PDF $l_tvac=bcadd($other['price'], bcsub($other['vat'],$other['tva_np'])); $l_tvac=bcadd($l_tvac,$other['tva_nd']); $this->write_cell(15,5,nbm($l_tvac),0,0,'R'); - $this->line_new(5); + $this->line_new(2); + $this->write_cell(15,5, _("Payé par")); + // Add the payment information on another row + $max=Database::num_row($ret_reconcile); + $str_payment=""; + if ($max > 0) { + $sep=""; + for ($e=0;$e<$max;$e++) { + $row=Database::fetch_array($ret_reconcile, $e); + $msg=( $row['qcode_bank'] != "")?"[".$row['qcode_bank']."]":$row['jr_internal']; + $str_payment=$row['jr_date'].$msg.$sep; + $sep=' , '; + } + $this->write_cell (120,5,$str_payment); + } + + + $this->line_new(3); // Total page $this->tp_htva=bcadd($this->tp_htva,$other['price']); $this->tp_tvac=bcadd($this->tp_tvac,$other['price']); diff --git a/include/class/print_ledger_simple_without_vat.class.php b/include/class/print_ledger_simple_without_vat.class.php index 56653592f..688638dc2 100644 --- a/include/class/print_ledger_simple_without_vat.class.php +++ b/include/class/print_ledger_simple_without_vat.class.php @@ -141,11 +141,15 @@ class Print_Ledger_Simple_Without_Vat extends PDF */ function export() { - - $a_jrn=$this->ledger->get_operation($_GET['from_periode'], - $_GET['to_periode']); + $http=new HttpInput; + $a_jrn=$this->ledger->get_operation($http->get('from_periode','number'),$http->get('to_periode','number')); if ( $a_jrn == null ) return; + + // Prepare the query for reconcile date + $prepared_query=new Prepared_Query($this->cn); + $prepared_query->prepare_reconcile_date(); + for ( $i=0;$ijrn_type !='VEN') { - $this->write_cell(15,6,sprintf("%.2f",$other['priv']),0,0,'R'); + $this->write_cell(15,5,sprintf("%.2f",$other['priv']),0,0,'R'); } - $this->write_cell(15,6,sprintf("%.2f",$other['price']),0,0,'R'); + $this->write_cell(15,5,sprintf("%.2f",$other['price']),0,0,'R'); + $ret_reconcile=$this->cn->execute('reconcile_date',array($row['id'])); + $max=Database::num_row($ret_reconcile); + $str_payment=""; + if ($max > 0) { + $sep=""; + for ($e=0;$e<$max;$e++) { + $row=Database::fetch_array($ret_reconcile, $e); + $msg=( $row['qcode_bank'] != "")?"[".$row['qcode_bank']."]":$row['jr_internal']; + $str_payment=$row['jr_date'].$msg.$sep; + $sep=' , '; + } + $this->write_cell (50,5,$str_payment); + } $this->line_new(5); } } diff --git a/include/export/export_ledger_csv.php b/include/export/export_ledger_csv.php index b1eabe927..82a467ae4 100644 --- a/include/export/export_ledger_csv.php +++ b/include/export/export_ledger_csv.php @@ -135,6 +135,18 @@ if ( $get_option=="E") } if ($ret_detail==null) return; + $a_heading[]=""; + $a_heading[]=""; + $a_heading[]=""; + $a_heading[]=_("Date paiement"); + $a_heading[]=_("Montant paiement"); + $a_heading[]=_("Methode paiement"); + $a_heading[]=_("Opération paiement"); + + // Prepare the query for reconcile date + $prepared_query=new Prepared_Query($cn); + $prepared_query->prepare_reconcile_date(); + $nb=Database::num_row($ret_detail); $title=array(); foreach ($a_heading as $key=> $value) @@ -156,6 +168,16 @@ if ( $get_option=="E") $type="number"; $export->add($row[$j], $type); } + //info payment + $ret_reconcile=$cn->execute('reconcile_date',array($row['jr_id'])); + $max=Database::num_row($ret_reconcile); + for ($e=0;$e<$max;$e++) { + $row=Database::fetch_array($ret_reconcile, $e); + $export->add($row['jr_date']); + $export->add($row['jr_montant'],"number"); + $export->add($row['qcode_bank']); + $export->add($row['jr_internal']); + } $export->write(); } } @@ -188,22 +210,10 @@ if ($get_option=="L" && ($jrn_type=='ODS'||$jrn_type=='FIN'||$jrn_type=='GL') ) }else { $Row=$Jrn->get_rowSimple($get_from_periode, $get_to_periode); } - $cn->prepare('reconcile_date_csv', - 'select * - from - jrn - where - jr_id in - (select - jra_concerned - from - jrn_rapt - where jr_id = $1 - union all - select - jr_id - from jrn_rapt - where jra_concerned=$1)'); + // Prepare the query for reconcile date + $prepared_query=new Prepared_Query($cn); + $prepared_query->prepare_reconcile_date(); + $title=array(); $title[]=_("operation"); $title[]=_("Date"); @@ -245,7 +255,7 @@ if ($get_option=="L" && ($jrn_type=='ODS'||$jrn_type=='FIN'||$jrn_type=='GL') ) $export->add($line['montant'], "number"); } //------ Add reconcilied operation --------------- - $ret_reconcile=$cn->execute('reconcile_date_csv', + $ret_reconcile=$cn->execute('reconcile_date', array($line['jr_id'])); $max=Database::num_row($ret_reconcile); if ($max>0) @@ -253,9 +263,11 @@ if ($get_option=="L" && ($jrn_type=='ODS'||$jrn_type=='FIN'||$jrn_type=='GL') ) for ($e=0; $e<$max; $e++) { $row=Database::fetch_array($ret_reconcile, $e); + $export->add($row['qcode_bank']); $export->add($row['jr_date']); $export->add($row['jr_internal']); $export->add($row['jr_pj_number']); + $export->add($row['jr_montant'],"number"); } } $export->write(); diff --git a/include/impress_jrn.inc.php b/include/impress_jrn.inc.php index 5fb703bd1..0b81f45a6 100644 --- a/include/impress_jrn.inc.php +++ b/include/impress_jrn.inc.php @@ -129,7 +129,7 @@ $filter_year = " where p_exercice='" . sql_string($exercice) . "'"; $periode_start = $cn->make_array("select p_id,to_char(p_start,'DD-MM-YYYY') from parm_periode $filter_year order by p_start,p_end"); $w->selected = $from_periode ; -print td('Depuis') . $w->input('from_periode', $periode_start); +print td(_('Depuis')) . $w->input('from_periode', $periode_start); print ''; print ''; @@ -140,7 +140,7 @@ $w->selected = $to_periode ; if ($w->selected== '' ){ $w->selected=$per_max->p_id; } -print td('Jusque ') . $w->input('to_periode', $periode_end); +print td(_('Jusque')). $w->input('to_periode', $periode_end); print ""; $a = array( array('value' => 'L', 'label' => _('Liste opérations')), @@ -153,7 +153,7 @@ print ''; print ''; $simple=$http->get("p_simple","string","L"); $w->selected = $simple; -echo 'Style d\'impression '.Icon_Action::infobulle(32).'' . $w->input('p_simple', $a); +echo ''._("Style d'impression")." ".Icon_Action::infobulle(32).'' . $w->input('p_simple', $a); print ""; echo ''; diff --git a/include/template/acc_ledger_history_purchase_detail.php b/include/template/acc_ledger_history_purchase_detail.php index 02d4fae07..d69372270 100644 --- a/include/template/acc_ledger_history_purchase_detail.php +++ b/include/template/acc_ledger_history_purchase_detail.php @@ -151,7 +151,8 @@ foreach ($this->data as $line) { $sep=""; for ($e=0;$e<$max;$e++) { $row=Database::fetch_array($ret_reconcile, $e); - echo $sep.HtmlInput::detail_op($row['jr_id'],$row['jr_date'].' '. $row['jr_internal']); + $msg=( $row['qcode_bank'] != "")?"[".$row['qcode_bank']."]":$row['jr_internal']; + echo $sep.HtmlInput::detail_op($row['jr_id'],$row['jr_date'].' '. $msg); $sep=' ,'; } } diff --git a/include/template/acc_ledger_history_purchase_extended.php b/include/template/acc_ledger_history_purchase_extended.php index c6b241275..5506b212f 100644 --- a/include/template/acc_ledger_history_purchase_extended.php +++ b/include/template/acc_ledger_history_purchase_extended.php @@ -104,7 +104,8 @@ for ($i=0;$i<$nb_data;$i++): $sep=""; for ($e=0;$e<$max;$e++) { $row=Database::fetch_array($ret_reconcile, $e); - echo $sep.HtmlInput::detail_op($row['jr_id'],$row['jr_date'].' '. $row['jr_internal']); + $msg=( $row['qcode_bank'] != "")?"[".$row['qcode_bank']."]":$row['jr_internal']; + echo $sep.HtmlInput::detail_op($row['jr_id'],$row['jr_date'].' '. $msg); $sep=' ,'; } } ?> diff --git a/include/template/acc_ledger_history_purchase_oneline.php b/include/template/acc_ledger_history_purchase_oneline.php index 97d011fc5..8244b8485 100644 --- a/include/template/acc_ledger_history_purchase_oneline.php +++ b/include/template/acc_ledger_history_purchase_oneline.php @@ -62,6 +62,9 @@ if (!defined('ALLOWED')) + + + data); @@ -122,7 +125,8 @@ for ($i=0;$i<$nb_data;$i++): $sep=""; for ($e=0;$e<$max;$e++) { $row=Database::fetch_array($ret_reconcile, $e); - echo $sep.HtmlInput::detail_op($row['jr_id'],$row['jr_date'].' '. $row['jr_internal']); + $msg=( $row['qcode_bank'] != "")?"[".$row['qcode_bank']."]":$row['jr_internal']; + echo $sep.HtmlInput::detail_op($row['jr_id'],$row['jr_date'].' '. $msg); $sep=' ,'; } } ?> diff --git a/include/template/acc_ledger_history_sale_detail.php b/include/template/acc_ledger_history_sale_detail.php index 320632115..d15f30918 100644 --- a/include/template/acc_ledger_history_sale_detail.php +++ b/include/template/acc_ledger_history_sale_detail.php @@ -138,7 +138,8 @@ foreach ($this->data as $line) { $sep=""; for ($e=0;$e<$max;$e++) { $row=Database::fetch_array($ret_reconcile, $e); - echo $sep.HtmlInput::detail_op($row['jr_id'],$row['jr_date'].' '. $row['jr_internal']); + $msg=( $row['qcode_bank'] != "")?"[".$row['qcode_bank']."]":$row['jr_internal']; + echo $sep.HtmlInput::detail_op($row['jr_id'],$row['jr_date'].' '. $msg); $sep=' ,'; } } diff --git a/include/template/acc_ledger_history_sale_extended.php b/include/template/acc_ledger_history_sale_extended.php index 9a0631fe7..3450847de 100644 --- a/include/template/acc_ledger_history_sale_extended.php +++ b/include/template/acc_ledger_history_sale_extended.php @@ -104,7 +104,9 @@ for ($i=0;$i<$nb_data;$i++): $sep=""; for ($e=0;$e<$max;$e++) { $row=Database::fetch_array($ret_reconcile, $e); - echo $sep.HtmlInput::detail_op($row['jr_id'],$row['jr_date'].' '. $row['jr_internal']); + $msg=( $row['qcode_bank'] != "")?"[".$row['qcode_bank']."]":$row['jr_internal']; + echo $sep.HtmlInput::detail_op($row['jr_id'],$row['jr_date'].' '. $msg); + $sep=' ,'; } } ?> diff --git a/include/template/acc_ledger_history_sale_oneline.php b/include/template/acc_ledger_history_sale_oneline.php index a24b9ee11..39923ee56 100644 --- a/include/template/acc_ledger_history_sale_oneline.php +++ b/include/template/acc_ledger_history_sale_oneline.php @@ -105,7 +105,8 @@ for ($i=0;$i<$nb_data;$i++): $sep=""; for ($e=0;$e<$max;$e++) { $row=Database::fetch_array($ret_reconcile, $e); - echo $sep.HtmlInput::detail_op($row['jr_id'],$row['jr_date'].' '. $row['jr_internal']); + $msg=( $row['qcode_bank'] != "")?"[".$row['qcode_bank']."]":$row['jr_internal']; + echo $sep.HtmlInput::detail_op($row['jr_id'],$row['jr_date'].' '. $msg); $sep=' ,'; } } ?> From c2d6876ac62b2db0f07ae4e5ed1fee3ab85c1659 Mon Sep 17 00:00:00 2001 From: Dany De Bontridder Date: Thu, 8 Aug 2019 16:40:14 +0200 Subject: [PATCH 24/29] DatabaseCore fix silent when not debug --- include/lib/database_core.class.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/include/lib/database_core.class.php b/include/lib/database_core.class.php index ff42ea6bd..dca335852 100644 --- a/include/lib/database_core.class.php +++ b/include/lib/database_core.class.php @@ -165,12 +165,12 @@ class DatabaseCore } else { $a = is_array($p_array); if (!is_array($p_array)) { - throw new Exception("Erreur : exec_sql attend un array"); + throw new Exception(_("Erreur : exec_sql attend un array")); } if (!DEBUG) - $this->ret = pg_query_params($this->db, $p_string, $p_array); + $this->ret =@pg_query_params($this->db, $p_string, $p_array); else - $this->ret = @pg_query_params($this->db, $p_string, $p_array); + $this->ret = pg_query_params($this->db, $p_string, $p_array); } if (!$this->ret) { $str_error = pg_last_error($this->db) . pg_result_error($this->ret); From f18c02671a105533370c54d26fee30d2943793a2 Mon Sep 17 00:00:00 2001 From: Dany De Bontridder Date: Sat, 10 Aug 2019 15:17:03 +0200 Subject: [PATCH 25/29] Task#1734 New : Add PRINTTVA to have a summary of VAT by ledger --- sql/upgrade.sql | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/sql/upgrade.sql b/sql/upgrade.sql index e69de29bb..20feb0af1 100644 --- a/sql/upgrade.sql +++ b/sql/upgrade.sql @@ -0,0 +1,18 @@ +insert into menu_ref (me_code,me_menu,me_file,me_description,me_type,me_description_etendue) +values('PRINTTVA','Résumé TVA','tax_summary.inc.php','totaux par TVA et par journal','ME','Calcul des totaux par TVA et par journal'); + +insert into profile_menu (me_code,me_code_dep,p_id,p_order,p_type_display,pm_default,pm_id_dep) +select me_code,'PRINT',1,250,'E',0,6 from menu_ref where me_code='PRINTTVA' +union +select me_code,'PRINT',1,250,'E',0,35 from menu_ref where me_code='PRINTTVA' +union +select me_code,'PRINT',2,250,'E',0,719 from menu_ref where me_code='PRINTTVA' +union +select me_code,'PRINT',2,250,'E',0,716 from menu_ref where me_code='PRINTTVA' +; +insert into menu_ref (me_code,me_menu,me_file,me_type) +values ('CSV:printtva','Export Résumé TVA','export_printtva_csv.php','PR'), + ('PDF:printtva','Export Résumé TVA','export_printtva_pdf.php','PR') +; + +insert into profile_menu(me_code,p_id,p_type_display) values ('CSV:printtva',1,'P'),('PDF:printtva',1,'P'),('CSV:printtva',2,'P'),('PDF:printtva',2,'P'); From 2efba0ac383443d06dcf5e152c7c37a45a797422 Mon Sep 17 00:00:00 2001 From: Dany De Bontridder Date: Thu, 15 Aug 2019 12:07:31 +0200 Subject: [PATCH 26/29] Task #1734 Upgrade patch for PRINTTVA --- include/constant.php | 2 +- include/sql/patch/upgrade135.sql | 23 +++++++++++++++++++++++ sql/upgrade.sql | 18 ------------------ 3 files changed, 24 insertions(+), 19 deletions(-) create mode 100644 include/sql/patch/upgrade135.sql diff --git a/include/constant.php b/include/constant.php index cc27a552d..81911ffb5 100644 --- a/include/constant.php +++ b/include/constant.php @@ -108,7 +108,7 @@ if ( !defined ("NOALYSS_PACKAGE_REPOSITORY")) { if ( ! defined ("SYSINFO_DISPLAY")) { define ("SYSINFO_DISPLAY",TRUE); } -define ("DBVERSION",135); +define ("DBVERSION",136); define ("MONO_DATABASE",25); define ("DBVERSIONREPO",18); define ('NOTFOUND','--not found--'); diff --git a/include/sql/patch/upgrade135.sql b/include/sql/patch/upgrade135.sql new file mode 100644 index 000000000..e45fa03c6 --- /dev/null +++ b/include/sql/patch/upgrade135.sql @@ -0,0 +1,23 @@ +begin; + +insert into menu_ref (me_code,me_menu,me_file,me_description,me_type,me_description_etendue) +values('PRINTTVA','Résumé TVA','tax_summary.inc.php','totaux par TVA et par journal','ME','Calcul des totaux par TVA et par journal'); + +insert into profile_menu (me_code,me_code_dep,p_id,p_order,p_type_display,pm_default,pm_id_dep) +select me_code,'PRINT',1,250,'E',0,6 from menu_ref where me_code='PRINTTVA' +union +select me_code,'PRINT',1,250,'E',0,35 from menu_ref where me_code='PRINTTVA' +union +select me_code,'PRINT',2,250,'E',0,719 from menu_ref where me_code='PRINTTVA' +union +select me_code,'PRINT',2,250,'E',0,716 from menu_ref where me_code='PRINTTVA' +; +insert into menu_ref (me_code,me_menu,me_file,me_type) +values ('CSV:printtva','Export Résumé TVA','export_printtva_csv.php','PR'), + ('PDF:printtva','Export Résumé TVA','export_printtva_pdf.php','PR') +; + +insert into profile_menu(me_code,p_id,p_type_display) values ('CSV:printtva',1,'P'),('PDF:printtva',1,'P'),('CSV:printtva',2,'P'),('PDF:printtva',2,'P'); + +insert into version (val,v_description) values (136,'new feature PRINTTVA'); +commit ; \ No newline at end of file diff --git a/sql/upgrade.sql b/sql/upgrade.sql index 20feb0af1..e69de29bb 100644 --- a/sql/upgrade.sql +++ b/sql/upgrade.sql @@ -1,18 +0,0 @@ -insert into menu_ref (me_code,me_menu,me_file,me_description,me_type,me_description_etendue) -values('PRINTTVA','Résumé TVA','tax_summary.inc.php','totaux par TVA et par journal','ME','Calcul des totaux par TVA et par journal'); - -insert into profile_menu (me_code,me_code_dep,p_id,p_order,p_type_display,pm_default,pm_id_dep) -select me_code,'PRINT',1,250,'E',0,6 from menu_ref where me_code='PRINTTVA' -union -select me_code,'PRINT',1,250,'E',0,35 from menu_ref where me_code='PRINTTVA' -union -select me_code,'PRINT',2,250,'E',0,719 from menu_ref where me_code='PRINTTVA' -union -select me_code,'PRINT',2,250,'E',0,716 from menu_ref where me_code='PRINTTVA' -; -insert into menu_ref (me_code,me_menu,me_file,me_type) -values ('CSV:printtva','Export Résumé TVA','export_printtva_csv.php','PR'), - ('PDF:printtva','Export Résumé TVA','export_printtva_pdf.php','PR') -; - -insert into profile_menu(me_code,p_id,p_type_display) values ('CSV:printtva',1,'P'),('PDF:printtva',1,'P'),('CSV:printtva',2,'P'),('PDF:printtva',2,'P'); From 52f995482b77ac87c2b8df93988cb26e74477ec8 Mon Sep 17 00:00:00 2001 From: Dany De Bontridder Date: Sun, 11 Aug 2019 21:18:47 +0200 Subject: [PATCH 27/29] Cosmetic : Icon_Trash in Todo_List --- include/class/todo_list.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/class/todo_list.class.php b/include/class/todo_list.class.php index ea3b1dc07..a1b7ba497 100644 --- a/include/class/todo_list.class.php +++ b/include/class/todo_list.class.php @@ -337,7 +337,7 @@ class Todo_List { // This a note the user owns $r.= ''. - HtmlInput::button('del','X','onClick="todo_list_remove('.$this->tl_id.')"','smallbutton'). + Icon_Action::trash(uniqid(),sprintf("todo_list_remove('%s')",$this->tl_id)). ''; } else From 3e201471c7f5eb0acf0901e2b422aecedee1ad29 Mon Sep 17 00:00:00 2001 From: Dany De Bontridder Date: Sun, 11 Aug 2019 21:21:53 +0200 Subject: [PATCH 28/29] Cosmetic : Icon_Trash in Todo_List --- include/class/todo_list.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/class/todo_list.class.php b/include/class/todo_list.class.php index a1b7ba497..e759a3adb 100644 --- a/include/class/todo_list.class.php +++ b/include/class/todo_list.class.php @@ -344,7 +344,7 @@ class Todo_List { // this is a note shared by someone else $r.= ''. - HtmlInput::button('del','X','onClick="todo_list_remove_share('.$this->tl_id.',\''.$this->use_login.'\','.Dossier::id().')"','smallbutton'). + Icon_Action::trash(uniqid(),sprintf("todo_list_remove_share('%s','%s','%s')",$this->tl_id,$this->use_login,Dossier::id())). ''; } From 24439d46850bec35b4db418fdef806f231cf0c55 Mon Sep 17 00:00:00 2001 From: Dany De Bontridder Date: Thu, 15 Aug 2019 16:57:33 +0200 Subject: [PATCH 29/29] Bug : cannot get a message when trying to save a new category of card --- html/js/card.js | 3 +-- include/ajax/ajax_card.php | 42 +++++++++++++++++++++++-------- include/class/fiche_def.class.php | 2 +- 3 files changed, 34 insertions(+), 13 deletions(-) diff --git a/html/js/card.js b/html/js/card.js index 4ab40df53..95b731ea6 100644 --- a/html/js/card.js +++ b/html/js/card.js @@ -838,9 +838,8 @@ function save_card_category(obj) alert_box('Erreur pas d\' attribut ipopup '+obj.id); return; }; - try { +try { // Data must be taken here - data=$('newcat').serialize(false); var dossier=$('gDossier').value; var queryString='ctl='+obj.ipopup+'&'; diff --git a/include/ajax/ajax_card.php b/include/ajax/ajax_card.php index 1e7df81d4..cf825c16a 100644 --- a/include/ajax/ajax_card.php +++ b/include/ajax/ajax_card.php @@ -86,7 +86,7 @@ set_language(); *echo a warning if disconnected */ ajax_disconnected($_REQUEST['ctl']); - +$http=new HttpInput(); $cn=Dossier::connect(); global $g_user; $g_user=new User($cn); @@ -532,22 +532,40 @@ case 'scc': * *----------------------------------------------------------------------*/ $html=''; + $invalid=0; if ( $g_user->check_action(FICCAT) == 1 ) { - $script=create_script("removeDiv('$ctl')"); - $html.=$script; - if ( strlen(trim($_GET['nom_mod'])) != 0 ) + + $html=""; + $nom_mod=$http->get("nom_mod"); + $class_base=$http->get("class_base"); + $fd_description=$http->get("nom_mod"); + if ( strlen(trim($nom_mod)) != 0 ) { $array=array("FICHE_REF"=>$cat, - "nom_mod"=>$_GET['nom_mod'], - "class_base"=>$_GET['class_base'], - "fd_description"=>$_GET['fd_description']); + "nom_mod"=>$nom_mod, + "class_base"=>$class_base, + "fd_description"=>$fd_description); + if ( isset ($_POST['create'])) $array['create']=1; + $catcard=new Fiche_Def($cn); - if ( $catcard->Add($array) == -1) + + ob_start(); + $result=$catcard->Add($array); + + $html.=ob_get_contents(); + ob_end_clean(); + + if ( $result == 1) + { $script="alert_box('"._('Catégorie existe déjà')."')"; - else - $script="alert_box('"._('Catégorie sauvée')."')"; + $invalid=1; + } + else{ + $script="alert_box('"._('Catégorie sauvée')."');removeDiv('$ctl')"; + } + $html.=create_script($script); } else @@ -561,6 +579,10 @@ case 'scc': else { $html=alert(_('Action interdite'),true); + $invalid=1; + } + if ($invalid == 1) { + $ctl="info_div"; } break; case 'upc': diff --git a/include/class/fiche_def.class.php b/include/class/fiche_def.class.php index f913ed523..a06ee60f6 100644 --- a/include/class/fiche_def.class.php +++ b/include/class/fiche_def.class.php @@ -233,7 +233,7 @@ $order $count=$this->cn->get_value($sql,array(trim($p_nom_mod))); if ($count != 0 ) { - echo alert (_('Catégorie existante')); + alert (_('Catégorie existante')); return 1; } // Set the value of fiche_def.fd_create_account