From 9fe4f7ae434893f0a54c2640fdd06152086b22f3 Mon Sep 17 00:00:00 2001 From: Dany De Bontridder Date: Mon, 19 Aug 2019 12:04:43 +0200 Subject: [PATCH 01/16] SQL : correct SQL script to take care of users who delete the profile no 2 --- include/sql/patch/upgrade135.sql | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/include/sql/patch/upgrade135.sql b/include/sql/patch/upgrade135.sql index e45fa03c6..5b57918fe 100644 --- a/include/sql/patch/upgrade135.sql +++ b/include/sql/patch/upgrade135.sql @@ -8,16 +8,16 @@ 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' +select me_code,'PRINT',2,250,'E',0,719 from menu_ref where me_code='PRINTTVA' and exists (select 1 from profile where p_id=2) union -select me_code,'PRINT',2,250,'E',0,716 from menu_ref where me_code='PRINTTVA' +select me_code,'PRINT',2,250,'E',0,716 from menu_ref where me_code='PRINTTVA' and exists (select 1 from profile where p_id=2) ; 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 profile_menu(me_code,p_id,p_type_display) select 'CSV:printtva',p_id,'P' from profile where p_id in (1,2) union all select 'PDF:printtva',p_id,'P' from profile where p_id in (1,2); insert into version (val,v_description) values (136,'new feature PRINTTVA'); commit ; \ No newline at end of file From 878c0ff5bc357f5741fee55dac59fe68ed994ea6 Mon Sep 17 00:00:00 2001 From: Dany De Bontridder Date: Mon, 19 Aug 2019 13:34:28 +0200 Subject: [PATCH 02/16] =?UTF-8?q?Task=20#1735:=20D=C3=A9tail=20op=C3=A9rat?= =?UTF-8?q?ion=20utilisation=20icone=20poubelle?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- include/ajax/ajax_ledger.php | 3 ++- include/lib/html_input.class.php | 4 ++-- include/template/ledger_detail_bottom.php | 11 ++++------- 3 files changed, 8 insertions(+), 10 deletions(-) diff --git a/include/ajax/ajax_ledger.php b/include/ajax/ajax_ledger.php index b475004be..8b90b6e98 100644 --- a/include/ajax/ajax_ledger.php +++ b/include/ajax/ajax_ledger.php @@ -27,6 +27,7 @@ - load a receipt document - for reconcialiation - update of analytic content +* */ if ( ! defined('ALLOWED')) die(_('Non authorisé')); @@ -283,7 +284,7 @@ case 'file': { // Not possible to remove the file thanks a modal dialog box, // because of the frameset - $x=sprintf(''.SMALLX.'', + $x=sprintf(''."x".'', $gDossier,$div,$jr_id); } diff --git a/include/lib/html_input.class.php b/include/lib/html_input.class.php index 47bf25614..15156277d 100755 --- a/include/lib/html_input.class.php +++ b/include/lib/html_input.class.php @@ -1097,9 +1097,9 @@ class HtmlInput */ static function button_action_remove_operation($p_operation) { - $rmOperation=sprintf("javascript:confirm_box(null,'"._('Voulez-vous effacer cette relation ')."',function () {remove_operation('%s','%s');});", + $rmOperation=sprintf("confirm_box(null,'"._('Voulez-vous effacer cette relation ')."',function () {remove_operation('%s','%s');});", dossier::id(), $p_operation); - $js=''.SMALLX.''; + $js=Icon_Action::trash("acop".$p_operation, $rmOperation); return $js; } diff --git a/include/template/ledger_detail_bottom.php b/include/template/ledger_detail_bottom.php index 85c93f19e..4fc312941 100644 --- a/include/template/ledger_detail_bottom.php +++ b/include/template/ledger_detail_bottom.php @@ -189,11 +189,8 @@ if ($aRap != null ) { // If write access , allow to drop Reconciles operations if ( $access=='W') { - $rmReconciliation=new IButton('rmr'); - $rmReconciliation->label=SMALLX; - $rmReconciliation->class="tinybutton"; - $rmReconciliation->javascript="return confirm_box(null,'"._("vous confirmez?")."',"; - $rmReconciliation->javascript.=sprintf('function () { dropLink(\'%s\',\'%s\',\'%s\',\'%s\');deleteRowRec(\'%s\',$(\'row%d\'));})', + $js="return confirm_box(null,'"._("vous confirmez?")."',"; + $js.=sprintf('function () { dropLink(\'%s\',\'%s\',\'%s\',\'%s\');deleteRowRec(\'%s\',$(\'row%d\'));})', $gDossier, $div, $jr_id, @@ -201,8 +198,8 @@ if ($aRap != null ) { $tableid, $e ); - - $remove=$rmReconciliation->input(); + $remove=Icon_Action::trash(uniqid(), $js); +// $remove=$rmReconciliation->input(); } else $remove=''; From baa52a131060a8ecf4247eccca0becb143477562 Mon Sep 17 00:00:00 2001 From: Dany De Bontridder Date: Mon, 19 Aug 2019 19:45:52 +0200 Subject: [PATCH 03/16] Cosmetic : add button close in history card & accounting --- include/ajax/ajax_history.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/ajax/ajax_history.php b/include/ajax/ajax_history.php index b0eef4eb1..ffdb85ae4 100644 --- a/include/ajax/ajax_history.php +++ b/include/ajax/ajax_history.php @@ -122,6 +122,7 @@ if ( isset($_GET['f_id'])) } else { echo $fiche->filter_history("tb".$div); echo $table; + echo HtmlInput::button_close($div); echo $fiche->button_csv($array['from_periode'],$array['to_periode']); echo $fiche->button_pdf($array['from_periode'],$array['to_periode']); } @@ -209,6 +210,7 @@ if ( isset($_REQUEST['pcm_val'])) } else { echo $poste->filter_history('tb'.$div); echo $table; + echo HtmlInput::button_close($div); echo $poste->button_csv($array['from_periode'],$array['to_periode']); echo $poste->button_pdf($array['from_periode'],$array['to_periode']); } From b2a25872379ad47a99c17c7ab571c78a244735ef Mon Sep 17 00:00:00 2001 From: Dany De Bontridder Date: Mon, 19 Aug 2019 19:49:43 +0200 Subject: [PATCH 04/16] Cosmetic : add button close in detail card --- include/ajax/ajax_card.php | 1 + 1 file changed, 1 insertion(+) diff --git a/include/ajax/ajax_card.php b/include/ajax/ajax_card.php index cf825c16a..cfc471618 100644 --- a/include/ajax/ajax_card.php +++ b/include/ajax/ajax_card.php @@ -159,6 +159,7 @@ case 'dc': } $html.=$card; $html.='

'; + $html.=HtmlInput::button_close($ctl); if ( $can_modify==1) { $html.=HtmlInput::submit('save',_('Sauver')); From f32ef6ea3959674bee1d1c3e986ec4254481a962 Mon Sep 17 00:00:00 2001 From: Dany De Bontridder Date: Tue, 20 Aug 2019 10:28:23 +0200 Subject: [PATCH 05/16] Code : remove direct use of $_GET --- html/ajax_misc.php | 84 ++++++++++++++++++++++++---------------------- 1 file changed, 44 insertions(+), 40 deletions(-) diff --git a/html/ajax_misc.php b/html/ajax_misc.php index 912917679..c209d9d32 100644 --- a/html/ajax_misc.php +++ b/html/ajax_misc.php @@ -317,30 +317,32 @@ switch ($op) return; break; - case "remove_anc": - if ($g_user->check_module('ANCODS') == 0) - exit(); - $cn->exec_sql("delete from operation_analytique where oa_group=$1", array($_GET['oa'])); - break; - case "rm_stock": - if ($g_user->check_module('STOCK') == 0) - exit(); - require_once NOALYSS_INCLUDE.'/constant.security.php'; - $cn->exec_sql('delete from stock_goods where sg_id=$1', array($s_id)); - $html = escape_xml($s_id); - header('Content-type: text/xml; charset=UTF-8'); - printf('{"d_id":"%s"}', $s_id); - exit(); - break; - //-------------------------------------------------- - // get the last date of a ledger - case 'lastdate': - require_once NOALYSS_INCLUDE.'/class/acc_ledger_fin.class.php'; - $ledger = new Acc_Ledger_Fin($cn, $_GET['p_jrn']); - $html = $ledger->get_last_date(); - $html = escape_xml($html); - header('Content-type: text/xml; charset=UTF-8'); - echo <<check_module('ANCODS') == 0) + exit(); + $oa_group=$http->get("oa","number"); + $cn->exec_sql("delete from operation_analytique where oa_group=$1", array($oa_group)); + break; + case "rm_stock": + if ($g_user->check_module('STOCK') == 0) + exit(); + require_once NOALYSS_INCLUDE.'/constant.security.php'; + $cn->exec_sql('delete from stock_goods where sg_id=$1', array($s_id)); + $html = escape_xml($s_id); + header('Content-type: text/xml; charset=UTF-8'); + printf('{"d_id":"%s"}', $s_id); + exit(); + break; + //-------------------------------------------------- + // get the last date of a ledger + case 'lastdate': + require_once NOALYSS_INCLUDE.'/class/acc_ledger_fin.class.php'; + $p_jrn=$http->get('p_jrn','number'); + $ledger = new Acc_Ledger_Fin($cn, $p_jrn); + $html = $ledger->get_last_date(); + $html = escape_xml($html); + header('Content-type: text/xml; charset=UTF-8'); + echo << e_date @@ -348,12 +350,13 @@ switch ($op) EOF; - break; - case 'bkname': - require_once NOALYSS_INCLUDE.'/class/acc_ledger_fin.class.php'; - $ledger = new Acc_Ledger_Fin($cn, $_GET['p_jrn']); - $html = $ledger->get_bank_name(); - $html = escape_xml($html); + break; + case 'bkname': + require_once NOALYSS_INCLUDE.'/class/acc_ledger_fin.class.php'; + $p_jrn=$http->get('p_jrn','number'); + $ledger = new Acc_Ledger_Fin($cn, $p_jrn); + $html = $ledger->get_bank_name(); + $html = escape_xml($html); header('Content-type: text/xml; charset=UTF-8'); echo << @@ -364,16 +367,17 @@ EOF; EOF; break; // display new calendar - case 'cal': - require_once NOALYSS_INCLUDE.'/class/calendar.class.php'; - /* others report */ - $cal = new Calendar(); - $cal->set_periode($per); - $notitle=$http->get("notitle", "string",0); - $html = ""; - $html = $cal->display($http->get('t'),$notitle); - $html = escape_xml($html); - header('Content-type: text/xml; charset=UTF-8'); + case 'cal': + require_once NOALYSS_INCLUDE.'/class/calendar.class.php'; + /* others report */ + $cal = new Calendar(); + $per=$http->get("per","number"); + $cal->set_periode($per); + $notitle=$http->get("notitle", "string",0); + $html = ""; + $html = $cal->display($http->get('t'),$notitle); + $html = escape_xml($html); + header('Content-type: text/xml; charset=UTF-8'); echo << From 7a41f9b3017087ffa37270a2b716ac597ade3195 Mon Sep 17 00:00:00 2001 From: Dany De Bontridder Date: Fri, 23 Aug 2019 12:10:04 +0200 Subject: [PATCH 06/16] Documentation --- html/js/scripts.js | 1 + 1 file changed, 1 insertion(+) diff --git a/html/js/scripts.js b/html/js/scripts.js index 7e19d0a6a..d7207bffb 100644 --- a/html/js/scripts.js +++ b/html/js/scripts.js @@ -581,6 +581,7 @@ function set_tva_label(obj) } /** *@brief display the popup with vat and explanations + *@param string req answer from ajax */ function success_set_tva_label(req) { From 5aab6a0502ca5bd2e4cc7822ca4550f2a0701947 Mon Sep 17 00:00:00 2001 From: Dany De Bontridder Date: Sat, 24 Aug 2019 12:05:49 +0200 Subject: [PATCH 07/16] Bug : Database::fetch_all returns an array or FALSE, because of pg_fetch_all, the version PHP7 cannot use anymore a boolean with count(). --- include/class/acc_ledger.class.php | 5 ++-- .../acc_ledger_history_generic.class.php | 3 +++ include/class/acc_operation.class.php | 2 +- include/class/anc_balance_simple.class.php | 24 +++++++++---------- include/class/customer.class.php | 5 ++-- include/class/fiche.class.php | 2 +- include/class/follow_up.class.php | 2 +- include/class/gestion_sold.class.php | 4 ++-- include/class/pre_op_fin.class.php | 6 ++--- include/class/pre_operation.class.php | 4 ++-- include/lib/database_core.class.php | 2 +- include/modele.inc.php | 3 ++- .../acc_ledger_history_purchase_extended.php | 2 +- include/verif_bilan.inc.php | 10 ++++---- 14 files changed, 41 insertions(+), 33 deletions(-) diff --git a/include/class/acc_ledger.class.php b/include/class/acc_ledger.class.php index 6d38964ea..7487b7ba6 100644 --- a/include/class/acc_ledger.class.php +++ b/include/class/acc_ledger.class.php @@ -443,7 +443,7 @@ class Acc_Ledger extends jrn_def_sql $sql="select jrn_deb_max_line as value from jrn_def where jrn_def_id=$1"; $r=$this->db->exec_sql($sql, array($this->id)); $Res=Database::fetch_all($r); - if (sizeof($Res)==0) + if ($Res == FALSE || sizeof($Res)==0) return 1; return $Res[0]['value']; } @@ -469,6 +469,7 @@ class Acc_Ledger extends jrn_def_sql $array=Database::fetch_all($ret); $deb=0.0; $cred=0.0; + if ( $array==FALSE) $array=[]; foreach ($array as $line) { @@ -533,7 +534,7 @@ class Acc_Ledger extends jrn_def_sql $r=$this->db->exec_sql($sql, array($this->id)); $res=Database::fetch_all($r); - if (empty($res)) + if ($res==FALSE || empty($res)) return null; return $res[0]; diff --git a/include/class/acc_ledger_history_generic.class.php b/include/class/acc_ledger_history_generic.class.php index 3606193fa..8770f8219 100644 --- a/include/class/acc_ledger_history_generic.class.php +++ b/include/class/acc_ledger_history_generic.class.php @@ -225,6 +225,9 @@ class Acc_Ledger_History_Generic extends Acc_Ledger_History $c=0; // Parse data from jrnx and fill diff. field + if ( $data_jrnx == FALSE ){ + $data_jrnx=[]; + } foreach ($data_jrnx as $code) { $idx_tva=0; diff --git a/include/class/acc_operation.class.php b/include/class/acc_operation.class.php index 793fb7327..167325c6b 100644 --- a/include/class/acc_operation.class.php +++ b/include/class/acc_operation.class.php @@ -330,7 +330,7 @@ class Acc_Operation } /*!\brief retrieve data from jrnx *\note the data are filtered by the access of the current user - * \return an array + * \return an array or FALSE if nothing found */ function get_jrnx_detail() { diff --git a/include/class/anc_balance_simple.class.php b/include/class/anc_balance_simple.class.php index 6a9764eea..8419c674c 100644 --- a/include/class/anc_balance_simple.class.php +++ b/include/class/anc_balance_simple.class.php @@ -69,18 +69,18 @@ class Anc_Balance_Simple extends Anc_Print $a=array(); $count=0; $array=Database::fetch_all($res); - foreach ($array as $row) - { - $a[$count]['po_id']=$row['po_id']; - $a[$count]['sum_deb']=$row['sum_deb']; - $a[$count]['sum_cred']=$row['sum_cred']; - $a[$count]['po_name']=$row['po_name']; - $a[$count]['ga_description']=$row['ga_description']; - $a[$count]['solde']=abs($row['sum_deb']-$row['sum_cred']); - $a[$count]['debit']=($row['sum_deb']>$row['sum_cred'])?"debit":"credit"; - $count++; - } - $this->has_data=$count; + foreach ($array as $row) + { + $a[$count]['po_id']=$row['po_id']; + $a[$count]['sum_deb']=$row['sum_deb']; + $a[$count]['sum_cred']=$row['sum_cred']; + $a[$count]['po_name']=$row['po_name']; + $a[$count]['ga_description']=$row['ga_description']; + $a[$count]['solde']=abs($row['sum_deb']-$row['sum_cred']); + $a[$count]['debit']=($row['sum_deb']>$row['sum_cred'])?"debit":"credit"; + $count++; + } + $this->has_data=$count; return $a; diff --git a/include/class/customer.class.php b/include/class/customer.class.php index b6e8efcd0..59fba23ba 100644 --- a/include/class/customer.class.php +++ b/include/class/customer.class.php @@ -144,9 +144,10 @@ class Customer extends Fiche // select the operation //---- - $Res2=$this->cn->exec_sql("select j_poste,j_montant,j_debit from jrnx where j_grpt=".$row1['j_grpt']); + $Res2=$this->cn->exec_sql("select j_poste,j_montant,j_debit from jrnx where j_grpt=$1",[$row1['j_grpt']]); $a_row=Database::fetch_all($Res2); - + if ($a_row==FALSE) $a_row=[]; + // Store the amount in the array //--- foreach ($a_row as $e) diff --git a/include/class/fiche.class.php b/include/class/fiche.class.php index e5b3fa05f..67db0c9d8 100644 --- a/include/class/fiche.class.php +++ b/include/class/fiche.class.php @@ -1163,7 +1163,7 @@ class Fiche $sql="select ad_value from fiche_detail where ad_id=23 and f_id=$1"; $Res=$this->cn->exec_sql($sql,array($this->id)); $r=Database::fetch_all($Res); - if ( sizeof($r) == 0 ) + if ( $r == FALSE || sizeof($r) == 0 ) return null; return $r[0]['ad_value']; } diff --git a/include/class/follow_up.class.php b/include/class/follow_up.class.php index 39d9a004f..3f9327142 100644 --- a/include/class/follow_up.class.php +++ b/include/class/follow_up.class.php @@ -772,7 +772,7 @@ class Follow_Up if ($a_row==false || sizeof($a_row)==0 ) { $r='

'; - $r.='
Aucun enregistrement trouvé'; + $r.='
'._("Aucun enregistrement trouvé"); $r.="
"; return $r; } diff --git a/include/class/gestion_sold.class.php b/include/class/gestion_sold.class.php index c13492b08..4aca544b4 100644 --- a/include/class/gestion_sold.class.php +++ b/include/class/gestion_sold.class.php @@ -68,7 +68,7 @@ class gestion_sold extends gestion_table // $res contains all the line $res=Database::fetch_all($ret); - if ( sizeof($res)==0) return null; + if ( $res == FALSE || sizeof($res)==0) return null; $count=0; foreach ($res as $row) @@ -108,7 +108,7 @@ class gestion_sold extends gestion_table // $res contains all the line $res=Database::fetch_all($ret); - if ( empty($res) ) return null; + if ( $res==FALSE || empty($res) ) return null; foreach ($res[0] as $idx=>$value) $this->$idx=$value; } diff --git a/include/class/pre_op_fin.class.php b/include/class/pre_op_fin.class.php index 3523d427d..f293eb253 100644 --- a/include/class/pre_op_fin.class.php +++ b/include/class/pre_op_fin.class.php @@ -118,14 +118,14 @@ class Pre_op_fin extends Pre_operation_detail return $array; } /*!\brief load the data from the database and return an array - * \return an array + * \return an array or FALSE is nothing found */ function load() { $sql="select opd_id,opd_poste,opd_amount,opd_comment,opd_debit". - " from op_predef_detail where od_id=".$this->operation->od_id. + " from op_predef_detail where od_id=$1 ". " order by opd_id"; - $res=$this->db->exec_sql($sql); + $res=$this->db->exec_sql($sql,[$this->operation->od_id]); $array=Database::fetch_all($res); return $array; } diff --git a/include/class/pre_operation.class.php b/include/class/pre_operation.class.php index 224d4d1f5..885e7a1fd 100644 --- a/include/class/pre_operation.class.php +++ b/include/class/pre_operation.class.php @@ -128,9 +128,9 @@ class Pre_operation function load() { $sql="select od_id,jrn_def_id,od_name,od_item,od_jrn_type,od_description". - " from op_predef where od_id=".$this->od_id. + " from op_predef where od_id=$1 ". " order by od_name"; - $res=$this->db->exec_sql($sql); + $res=$this->db->exec_sql($sql,[$this->od_id]); $array=Database::fetch_all($res); foreach (array('jrn_def_id','od_name','od_item','od_jrn_type','od_description') as $field) { $this->$field=$array[0][$field]; diff --git a/include/lib/database_core.class.php b/include/lib/database_core.class.php index dca335852..c4fb518ac 100644 --- a/include/lib/database_core.class.php +++ b/include/lib/database_core.class.php @@ -728,7 +728,7 @@ class DatabaseCore /**\brief wrapper for the function pg_fetch_all * \param $ret is the result of pg_exec (exec_sql) - * \return double array (row x col ) + * \return double array (row x col ) or false */ static function fetch_all($ret) diff --git a/include/modele.inc.php b/include/modele.inc.php index 2814fc001..dab6e08e4 100644 --- a/include/modele.inc.php +++ b/include/modele.inc.php @@ -111,7 +111,8 @@ if (isset($_POST["FMOD_NAME"])) if (Database::num_row($Res) != 0) { $a_lob = Database::fetch_all($Res); - for ($i = 0; $i < count($a_lob); $i++) + $nb_log=($a_lob == FALSE)?0:count($a_lob); + for ($i = 0; $i < $nb_lob; $i++) $cn_mod->lo_unlink($a_lob[$i]['jr_pj']); } $Res = $cn_mod->exec_sql("truncate table centralized"); diff --git a/include/template/acc_ledger_history_purchase_extended.php b/include/template/acc_ledger_history_purchase_extended.php index 5506b212f..d6429dbb5 100644 --- a/include/template/acc_ledger_history_purchase_extended.php +++ b/include/template/acc_ledger_history_purchase_extended.php @@ -131,7 +131,7 @@ $a_detail=Database::fetch_all($det); diff --git a/include/verif_bilan.inc.php b/include/verif_bilan.inc.php index 73e10e6bb..cf0181a13 100644 --- a/include/verif_bilan.inc.php +++ b/include/verif_bilan.inc.php @@ -66,7 +66,7 @@ order by jrn_def_name $res=$cn->exec_sql($sql); $jrn=Database::fetch_all($res); -$nb_jrn= count($jrn); +$nb_jrn= ($jrn == FALSE) ?0 :count($jrn); if ( $jrn ===false ) { echo $g_succeed." "._("Aucune anomalie dans les montants des journaux"); } @@ -158,7 +158,8 @@ having count(*) > 1 $poste=$cn->execute('get_poste',array($a_fiche_id[$i]['f_id'])); $tmp_qcode=$cn->execute('get_qcode',array($a_fiche_id[$i]['f_id'])); $qcode=Database::fetch_all($tmp_qcode); - if ( $qcode[0]['qcode']=="") { + + if ( $qcode == FALSE || $qcode[0]['qcode']=="") { continue; } ?> @@ -171,7 +172,8 @@ having count(*) > 1
  • @@ -229,7 +231,7 @@ $nb_account_used=count ($a_account_used); execute('get_operation',array($a_account_used[$i]['f_id'])); $a_operation=Database::fetch_all($ret_operation); - $nb_operation=count($a_operation); + $nb_operation=($a_operation == FALSE) ? 0 : count($a_operation); ?> From c941b2ae58487c537cc3ef4f4c26778e84dbce8e Mon Sep 17 00:00:00 2001 From: Dany De Bontridder Date: Sat, 24 Aug 2019 15:19:34 +0200 Subject: [PATCH 08/16] Unit Test : Acc_Account --- .../include/class/acc_account.classTest.php | 87 ++++++++++++++++++- 1 file changed, 83 insertions(+), 4 deletions(-) diff --git a/unit-test/include/class/acc_account.classTest.php b/unit-test/include/class/acc_account.classTest.php index ca3d34a2b..3e6d9cc0d 100644 --- a/unit-test/include/class/acc_account.classTest.php +++ b/unit-test/include/class/acc_account.classTest.php @@ -51,6 +51,7 @@ class Acc_AccountTest extends TestCase public function testSet_parameter() { $this->object->set_parameter("pcm_direct_use", "N"); + $this->assertEquals($this->object->get_parameter("pcm_direct_use"),"N"); } /** @@ -66,7 +67,8 @@ class Acc_AccountTest extends TestCase */ public function testLoad() { - $this->object->load(); + $r=$this->object->load(); + $this->assertNotEquals($r,-1); } /** @@ -83,7 +85,61 @@ class Acc_AccountTest extends TestCase */ public function testVerify() { - $this->object->verify(); + global $g_connection; + // duplicate + $duplicate=new Acc_Account($g_connection); + $duplicate->set_parameter('pcm_val', "400"); + $duplicate->set_parameter("pcm_lib", "duplicate"); + $duplicate->set_parameter("pcm_val_parent", "40"); + $duplicate->set_parameter("pcm_direct_use", "N"); + + try { + $duplicate->insert(); + } catch (Exception $ex) { + $this->assertEquals($ex->getCode(),EXC_DUPLICATE); + } + $duplicate->set_parameter('pcm_val','999TEST'); + try { + $duplicate->set_parameter("pcm_lib", ""); + $duplicate->insert(); + } catch (Exception $ex) { + $this->assertEquals($ex->getCode(),EXC_PARAM_VALUE); + } + $duplicate->set_parameter("pcm_lib", "duplicate"); + try { + $duplicate->set_parameter("pcm_val_parent", "999TEST"); + $duplicate->insert(); + + } catch (Exception $ex) { + $this->assertEquals($ex->getCode(),EXC_PARAM_VALUE); + } + + try { + $duplicate->set_parameter("pcm_val_parent", "xxx"); + $duplicate->insert(); + + } catch (Exception $ex) { + $this->assertEquals($ex->getCode(),EXC_PARAM_VALUE); + } + $duplicate->set_parameter("pcm_val_parent", "9"); + try { + $duplicate->set_parameter("pcm_direct_use", "?"); + $duplicate->insert(); + + } catch (Exception $ex) { + $this->assertEquals($ex->getCode(),EXC_PARAM_VALUE); + } + $duplicate->set_parameter("pcm_direct_use", "Y"); + try { + $duplicate->set_parameter('pcm_val',''); + $duplicate->insert(); + } catch (Exception $ex) { + $this->assertEquals($ex->getCode(),EXC_PARAM_VALUE); + } + $duplicate->set_parameter('pcm_val','999TEST'); + $duplicate->insert(); + $duplicate->delete(); + } /** @@ -91,7 +147,17 @@ class Acc_AccountTest extends TestCase */ public function testUpdate() { + global $g_connection; + $new_string="000001112222"; + $old_label=$this->object->get_lib(); + $this->object->set_parameter("pcm_lib", $new_string); $this->object->update(); + $check=new Acc_Account($g_connection,$this->object->get_parameter("pcm_val")); + $this->assertEquals($check->get_parameter("pcm_lib"),$new_string); + $check->set_parameter("pcm_lib", $old_label); + $check->update(); + $this->object->load(); + $this->assertEquals($this->object->get_lib(),$old_label); } /** @@ -133,7 +199,6 @@ class Acc_AccountTest extends TestCase } catch (Exception $e) { - echo $e->getTraceAsString(); $this->assertEquals($e->getCode(), EXC_PARAM_VALUE); } } @@ -143,7 +208,21 @@ class Acc_AccountTest extends TestCase */ public function testSave() { - $this->object->save(); + global $g_connection; + $check=new Acc_Account($g_connection,'999TEST'); + $check->set_parameter("pcm_lib", "TESTING"); + $check->set_parameter('pcm_val_parent','9'); + $check->set_parameter('pcm_direct_use','N'); + // insert + $check->save(); + $check_new=new Acc_Account($g_connection,'999TEST'); + $this->assertEquals($check_new->get_lib(),$check->get_lib()); + $check->set_parameter("pcm_lib","NEW VALUE"); + // update + $check->save(); + $check_new->load(); + $this->assertNotEquals($check_new->get_lib(),"TESTING"); + $check->delete(); } } From ecd6b5a0bf3f0747496d69cdf763bfe86a399214 Mon Sep 17 00:00:00 2001 From: Dany De Bontridder Date: Mon, 26 Aug 2019 09:28:23 +0200 Subject: [PATCH 09/16] traduction --- html/js/managetable.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/html/js/managetable.js b/html/js/managetable.js index 862116614..d67e77402 100644 --- a/html/js/managetable.js +++ b/html/js/managetable.js @@ -253,7 +253,7 @@ var ManageTable = function (p_table_name) this.param['ctl'] = p_ctl; var here=this; $(p_ctl+"_"+p_id).addClassName("highlight"); - smoke.confirm("Confirmez ?", + smoke.confirm(content[47], function (e) { if (e ) { From 78155161c189294efafc6959f2d79152efb8c035 Mon Sep 17 00:00:00 2001 From: Dany De Bontridder Date: Mon, 26 Aug 2019 11:36:24 +0200 Subject: [PATCH 10/16] New : InputSwitch, display a switch and change the value of a hidden variable --- html/js/scripts.js | 34 +++++++++++ include/lib/input_switch.class.php | 81 ++++++++++++++++++++++++++ scenario/HtmlInput.test.php | 91 ++++++++++++++++++++++++++++++ 3 files changed, 206 insertions(+) create mode 100644 include/lib/input_switch.class.php create mode 100644 scenario/HtmlInput.test.php diff --git a/html/js/scripts.js b/html/js/scripts.js index d7207bffb..81b05633c 100644 --- a/html/js/scripts.js +++ b/html/js/scripts.js @@ -3605,3 +3605,37 @@ function updatePreference() remove_waiting_box(); } + +/** + * turn on or off , set an domElement to 1 or 0 and change the icon + * @param string icon_domid : id of the domElement which must be changed + * @param string p_value_domid : id of domElement containing 1 or 0 + * @see param_jrn.php + */ +function toggle_onoff(icon_domid,p_value_domid) +{ + if ( $(p_value_domid).value==0) { + $(p_value_domid).value=1; + $(icon_domid).innerHTML=''; + $(icon_domid).style='color:green'; + } else { + $(p_value_domid).value=0; + $(icon_domid).innerHTML=''; + $(icon_domid).style='color:red'; + } +} +/** + * in CFGLED show or hide the row depending if the warning is enable or not + * + * @param {type} p_enable + * @param {type} p_row + * @returns {undefined} + */ +function toggle_row_warning_enable(p_enable,p_row) +{ + if ($(p_enable).value==1) { + $(p_row).show(); + } else { + $(p_row).hide(); + } +} \ No newline at end of file diff --git a/include/lib/input_switch.class.php b/include/lib/input_switch.class.php new file mode 100644 index 000000000..ba67d7f55 --- /dev/null +++ b/include/lib/input_switch.class.php @@ -0,0 +1,81 @@ + + * + * 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. + * Aut + * + */ + +// Copyright Author Dany De Bontridder danydb@noalyss.eu + +/** + * @file + * @brief show a switch, when you click on it an hidden field is changed, the value is 1 or 0 + */ +require_once NOALYSS_INCLUDE.'/lib/html_input.class.php'; + +class InputSwitch extends HtmlInput +{ + + var $icon; + var $value_container; + var $value; + + function __construct($name='', $value='', $p_id="") + { + $this->value_container=$name; + $this->value=$value; + $this->icon=$p_id; + $this->javascript=""; + } + + function input($p_name=NULL, $p_value=NULL) + { + if ($p_name!=NULL) + $this->value_container=$p_name; + if ($p_value!==NULL) + $this->value=$p_value; + + if ( $this->icon=="") $this->icon=uniqid ("inputSwitch"); + + if ( trim($this->value_container) ==="" || trim($this->value) === "") { + throw new Exception(_("Valeur invalide"),1); + } + if ($this->readOnly == TRUE) { + $this->display(); + return; + } + echo HtmlInput::hidden($this->value_container, $this->value); + + $this->javascript=sprintf('toggle_onoff(\'%s\',\'%s\');%s;',$this->icon,$this->value_container,$this->javascript); + + if ($this->value=='1') { + echo Icon_Action::iconon($this->icon, $this->javascript); + } else { + echo Icon_Action::iconoff($this->icon, $this->javascript); + } + } + function display() + { + if ($this->value=='1') { + echo Icon_Action::iconon($this->icon, ""); + } else { + echo Icon_Action::iconoff($this->icon, ""); + } + } + +} diff --git a/scenario/HtmlInput.test.php b/scenario/HtmlInput.test.php new file mode 100644 index 000000000..027f4eb73 --- /dev/null +++ b/scenario/HtmlInput.test.php @@ -0,0 +1,91 @@ + + * + * 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 Test the HtmlInput object it means the Inum, IText , ... + */ + +require_once NOALYSS_INCLUDE.'/lib/html_input.class.php'; +require_once NOALYSS_INCLUDE.'/lib/iaction.class.php'; +require_once NOALYSS_INCLUDE.'/lib/ibutton.class.php'; +require_once NOALYSS_INCLUDE.'/lib/icard.class.php'; +require_once NOALYSS_INCLUDE.'/lib/icheckbox.class.php'; +require_once NOALYSS_INCLUDE.'/lib/iconcerned.class.php'; +require_once NOALYSS_INCLUDE.'/lib/idate.class.php'; +require_once NOALYSS_INCLUDE.'/lib/ifile.class.php'; +require_once NOALYSS_INCLUDE.'/lib/ihidden.class.php'; +require_once NOALYSS_INCLUDE.'/lib/inum.class.php'; +require_once NOALYSS_INCLUDE.'/lib/iperiod.class.php'; +require_once NOALYSS_INCLUDE.'/lib/iposte.class.php'; +require_once NOALYSS_INCLUDE.'/lib/iradio.class.php'; +require_once NOALYSS_INCLUDE.'/lib/irelated_action.class.php'; +require_once NOALYSS_INCLUDE.'/lib/iselect.class.php'; +require_once NOALYSS_INCLUDE.'/lib/ispan.class.php'; +require_once NOALYSS_INCLUDE.'/lib/itext.class.php'; +require_once NOALYSS_INCLUDE.'/lib/itextarea.class.php'; +require_once NOALYSS_INCLUDE.'/lib/itva_popup.class.php'; +require_once NOALYSS_INCLUDE.'/lib/input_switch.class.php'; + +$http=new HttpInput(); +?> +
    +    
+
    +
    + + +

    Input_switch.class.php

    +

    Normal

    + 
    +        
+    $input_switch=new InputSwitch('input_switch_value',get("input_switch_value","string","0")?>);
+    $input_switch->input();
+
    + input_switch + get("input_switch_value","string","0")); + $input_switch->input(); + ?> +

    ReadOnly

    + 
    +    $input_switch=new InputSwitch('input_switch_readonly',0);
+    $input_switch->readOnly=TRUE;
+    $input_switch->input();
+
    + input_switch + readOnly=TRUE; + $input_switch->input(); + ?> +

    Submit

    + 
    +        echo HtmlInput::submit("submit", _("Envoi"));
+
    +

    + +

    + \ No newline at end of file From ae1725f955de2ba4b745f28dbf9fd94e013e23a7 Mon Sep 17 00:00:00 2001 From: Dany De Bontridder Date: Mon, 26 Aug 2019 11:37:46 +0200 Subject: [PATCH 11/16] New :: function Icon_Action::tips for short comment New : Icon_Action::unlock --- include/lib/icon_action.class.php | 23 +++++++++++++++++++++++ scenario/icon_actionTest.php | 7 ++++--- 2 files changed, 27 insertions(+), 3 deletions(-) diff --git a/include/lib/icon_action.class.php b/include/lib/icon_action.class.php index 7c59fef75..485e4802f 100644 --- a/include/lib/icon_action.class.php +++ b/include/lib/icon_action.class.php @@ -88,7 +88,21 @@ class Icon_Action return $r; } + /** + * Display a info in a bubble, text is given as parameter + * @param string $p_comment + * + * @return html string + */ + static function tips($p_comment) + { + $p_comment=htmlentities($p_comment); + $r=''; + $r.=""; + $r.=''; + return $r; + } /** * Display a icon ON * @param string $p_div id of element @@ -283,5 +297,14 @@ class Icon_Action */ static function unlock($p_id,$p_javascript) { + + $lock_cur=""; + + $r=sprintf( '%s', + $p_id, + $p_id, + $p_javascript, + $lock_cur); + return $r; } } diff --git a/scenario/icon_actionTest.php b/scenario/icon_actionTest.php index fe9fa9c28..4682d7e69 100644 --- a/scenario/icon_actionTest.php +++ b/scenario/icon_actionTest.php @@ -68,12 +68,13 @@ include_once NOALYSS_INCLUDE."/lib/icon_action.class.php";

    more

    -

    - menu -

    +

    Lock

    Unlock +

    +

    + Tips

    \ No newline at end of file From 9e3fcad959b4919b96ec280761a9a93350de5f7e Mon Sep 17 00:00:00 2001 From: Dany De Bontridder Date: Mon, 26 Aug 2019 14:03:44 +0200 Subject: [PATCH 12/16] Translation --- dev/get_database_item.sh | 9 +- html/lang/en_US/LC_MESSAGES/messages.po | 797 +++++++++-- html/lang/messages.po | 1721 +++++++++++++---------- html/lang/nl_NL/LC_MESSAGES/messages.po | 816 +++++++++-- 4 files changed, 2358 insertions(+), 985 deletions(-) diff --git a/dev/get_database_item.sh b/dev/get_database_item.sh index 273383c95..e4e300f67 100755 --- a/dev/get_database_item.sh +++ b/dev/get_database_item.sh @@ -3,7 +3,7 @@ export PGUSER=dany export PGPASSWORD=dany export PGHOST=localhost -export PGDATABASE=rel671mod1 +export PGDATABASE=rel70dossier48 export PGPORT=5432 ( echo "" ) >> ../include/database.item.php ( echo "" ) >> ../include/database.item.php ( echo "" ) >> ../include/database.item.php +( +psql -A -F" " -t -c "select '\jrn_def_negative_warning[]=_('''||replace(jrn_def_negative_warning,'''',E'\\\\''')||''');' from jrn_def where coalesce(trim(jrn_def_negative_warning),'')!='';" +echo "?>" ) >> ../include/database.item.php + + echo "File ../include/database.item.php is created" diff --git a/html/lang/en_US/LC_MESSAGES/messages.po b/html/lang/en_US/LC_MESSAGES/messages.po index 629d1fb0d..8cc29d166 100644 --- a/html/lang/en_US/LC_MESSAGES/messages.po +++ b/html/lang/en_US/LC_MESSAGES/messages.po @@ -3,15 +3,15 @@ # This file is distributed under the same license as the NOALYSS package. # Dany De Bontridder # -#: include/database.item.php:124 +#: include/database.item.php:126 # 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-08-15 11:12+0200\n" -"PO-Revision-Date: 2019-08-15 11:26+0100\n" +"POT-Creation-Date: 2019-08-26 13:23+0200\n" +"PO-Revision-Date: 2019-08-26 13:28+0100\n" "Last-Translator: dany \n" "Language-Team: French \n" "Language: en_US\n" @@ -78,6 +78,7 @@ msgstr "Grid 01: Operations for which the VAT is due (6%)" #: html/ajax_card.php:475 include/ajax/ajax_card.php:455 #: include/ajax/ajax_card.php:456 include/ajax/ajax_card.php:457 #: include/ajax/ajax_card.php:490 include/ajax/ajax_card.php:494 +#: include/ajax/ajax_card.php:495 msgid " Banque" msgstr "Bank" @@ -135,7 +136,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 +#: include/class/periode.class.php:704 include/class/periode.class.php:706 msgid " Début période : " msgstr "Start periode" @@ -146,6 +147,7 @@ msgstr "Sorry but this period is used" #: html/ajax_card.php:478 html/ajax_card.php:479 include/ajax/ajax_card.php:459 #: include/ajax/ajax_card.php:460 include/ajax/ajax_card.php:461 #: include/ajax/ajax_card.php:494 include/ajax/ajax_card.php:498 +#: include/ajax/ajax_card.php:499 msgid " Employé ou administrateur" msgstr "Manager or Employee" @@ -159,13 +161,13 @@ 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 +#: include/class/periode.class.php:706 include/class/periode.class.php:708 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 +#: include/class/periode.class.php:705 include/class/periode.class.php:707 msgid " Fin période : " msgstr "End Periode :" @@ -204,6 +206,7 @@ msgid " La version de votre installation est %s " msgstr "Your version is %s" #: include/class/acc_ledger.class.php:1136 +#: include/class/acc_ledger.class.php:1152 #, php-format msgid " Le poste %s appartient à fiche(s) dont : %s" msgstr "Accounting %s belong to the cards : %s" @@ -252,6 +255,7 @@ msgstr "VAT" #: include/class/acc_ledger.class.php:113 #: include/class/acc_ledger.class.php:115 #: include/class/acc_ledger.class.php:116 +#: include/class/acc_ledger.class.php:134 msgid " Tous les journaux" msgstr "All the ledgers" @@ -301,7 +305,7 @@ msgstr "to" #: html/ajax_card.php:465 html/ajax_card.php:466 html/ajax_card.php:467 #: include/ajax/ajax_card.php:447 include/ajax/ajax_card.php:448 #: include/ajax/ajax_card.php:449 include/ajax/ajax_card.php:482 -#: include/ajax/ajax_card.php:486 +#: include/ajax/ajax_card.php:486 include/ajax/ajax_card.php:487 msgid " d'administration" msgstr "of administration" @@ -309,7 +313,7 @@ msgstr "of administration" #: html/ajax_card.php:457 html/ajax_card.php:458 html/ajax_card.php:459 #: include/ajax/ajax_card.php:439 include/ajax/ajax_card.php:440 #: include/ajax/ajax_card.php:441 include/ajax/ajax_card.php:474 -#: include/ajax/ajax_card.php:478 +#: include/ajax/ajax_card.php:478 include/ajax/ajax_card.php:479 msgid " de clients" msgstr "of customers" @@ -317,6 +321,7 @@ msgstr "of customers" #: html/ajax_card.php:470 html/ajax_card.php:471 include/ajax/ajax_card.php:451 #: include/ajax/ajax_card.php:452 include/ajax/ajax_card.php:453 #: include/ajax/ajax_card.php:486 include/ajax/ajax_card.php:490 +#: include/ajax/ajax_card.php:491 msgid " de contacts" msgstr "of contacts" @@ -324,7 +329,7 @@ msgstr "of contacts" #: html/ajax_card.php:461 html/ajax_card.php:462 html/ajax_card.php:463 #: include/ajax/ajax_card.php:443 include/ajax/ajax_card.php:444 #: include/ajax/ajax_card.php:445 include/ajax/ajax_card.php:478 -#: include/ajax/ajax_card.php:482 +#: include/ajax/ajax_card.php:482 include/ajax/ajax_card.php:483 msgid " de fournisseurs" msgstr "of suppliers" @@ -439,7 +444,7 @@ msgid " paiement par " msgstr "Paid by" #: include/verif_bilan.inc.php:186 include/verif_bilan.inc.php:223 -#: include/verif_bilan.inc.php:226 +#: include/verif_bilan.inc.php:226 include/verif_bilan.inc.php:228 msgid " pour la fiche " msgstr "For the card" @@ -815,6 +820,7 @@ msgstr "Incorrect direct access" #: 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 #: include/class/acc_ledger.class.php:1034 +#: include/class/acc_ledger.class.php:1050 msgid "Accès interdit" msgstr "Forbidden access" @@ -864,6 +870,8 @@ msgstr "all access" #: include/database.item.php:208 include/database.item.php:222 #: include/cfgledger.inc.php:171 include/class/acc_ledger_search.class.php:1086 #: include/class/acc_ledger_search.class.php:1099 +#: include/template/tax_summary_display.php:176 include/database.item.php:235 +#: include/database.item.php:254 msgid "Achat" msgstr "Purchase" @@ -950,6 +958,9 @@ msgstr "Late" #: include/ajax/ajax_card.php:567 include/ajax/ajax_card.php:213 #: include/ajax/ajax_card.php:368 include/ajax/ajax_card.php:563 #: include/ajax/ajax_card.php:571 include/ajax/ajax_card.php:601 +#: include/ajax/ajax_card.php:214 include/ajax/ajax_card.php:369 +#: include/ajax/ajax_card.php:527 include/ajax/ajax_card.php:582 +#: include/ajax/ajax_card.php:594 include/ajax/ajax_card.php:624 msgid "Action interdite" msgstr "Forbidden" @@ -966,6 +977,7 @@ msgstr "Forbidden" #: 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:2748 msgid "Action non accessible" msgstr "Folder not available" @@ -973,6 +985,7 @@ msgstr "Folder not available" #: 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 +#: html/ajax_misc.php:396 msgid "Action non autorisée" msgstr "Unauthorized" @@ -1018,6 +1031,7 @@ msgstr "Accounting / Activity" #: 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:2299 msgid "Activé" msgstr "Activated" @@ -1042,7 +1056,8 @@ msgstr "Activated" #: include/template/detail-action.php:371 include/compta_ach.inc.php:293 #: include/compta_ven.inc.php:328 include/compta_ven.inc.php:331 #: include/template/form_ledger_detail.php:128 include/compta_ach.inc.php:296 -#: include/compta_ven.inc.php:339 +#: include/compta_ven.inc.php:339 include/compta_ven.inc.php:337 +#: include/compta_ach.inc.php:294 msgid "Actualiser" msgstr "Refresh" @@ -1101,6 +1116,7 @@ msgstr "Address" #: include/database.item.php:155 include/database.item.php:159 #: include/database.item.php:158 include/database.item.php:151 #: include/database.item.php:152 include/database.item.php:160 +#: include/database.item.php:163 msgid "Adresse " msgstr "Address" @@ -1142,6 +1158,7 @@ msgstr "Display also the closed actions" #: 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/tax_summary.inc.php:43 msgid "Afficher" msgstr "Display" @@ -1266,6 +1283,7 @@ msgstr "Add users" #: include/class/acc_ledger_purchase.class.php:1324 #: include/class/acc_ledger_sold.class.php:1358 #: include/class/acc_ledger_purchase.class.php:1327 +#: include/class/acc_ledger_sold.class.php:1367 msgid "Ajout article" msgstr "Add item" @@ -1322,13 +1340,14 @@ msgstr "Add a menu" #: include/modele.inc.php:346 include/modele.inc.php:360 #: include/modele.inc.php:401 include/modele.inc.php:384 #: include/modele.inc.php:385 include/modele.inc.php:390 +#: include/modele.inc.php:391 msgid "Ajout d'un modele" msgstr "Add a template" #: include/modele.inc.php:292 include/modele.inc.php:306 #: include/modele.inc.php:345 include/modele.inc.php:328 #: include/modele.inc.php:329 include/document_modele.inc.php:85 -#: include/modele.inc.php:334 +#: include/modele.inc.php:334 include/modele.inc.php:335 msgid "Ajout d'un modèle" msgstr "Add a template" @@ -1418,7 +1437,7 @@ msgstr "Configuration label" #: include/database.item.php:182 include/database.item.php:185 #: include/database.item.php:210 include/database.item.php:187 #: include/database.item.php:188 include/database.item.php:191 -#: include/database.item.php:202 +#: include/database.item.php:202 include/database.item.php:207 msgid "Ajout de fiche" msgstr "Adding Record" @@ -1455,6 +1474,7 @@ msgstr "Add repair card" #: 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:2204 msgid "Ajout journal" msgstr "Add ledger" @@ -1480,7 +1500,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 +#: include/class/periode.class.php:689 include/class/periode.class.php:691 msgid "Ajout période" msgstr "Add periode" @@ -1504,7 +1524,7 @@ msgstr "Add an Action here" #: include/modele.inc.php:254 include/modele.inc.php:278 #: include/dossier.inc.php:214 include/modele.inc.php:261 #: include/dossier.inc.php:217 include/dossier.inc.php:222 -#: include/modele.inc.php:262 +#: include/modele.inc.php:262 include/modele.inc.php:263 msgid "Ajouter" msgstr "Add" @@ -1542,7 +1562,7 @@ msgstr "Add an attachment" #: include/modele.inc.php:240 include/modele.inc.php:254 #: include/modele.inc.php:278 include/modele.inc.php:261 -#: include/modele.inc.php:262 +#: include/modele.inc.php:262 include/modele.inc.php:263 msgid "Ajouter un modèle" msgstr "Add a template" @@ -1609,6 +1629,8 @@ msgstr "Add a receipt" #: include/class/acc_ledger_purchase.class.php:1723 #: include/class/acc_ledger_sold.class.php:977 #: include/class/acc_ledger_purchase.class.php:1726 +#: include/class/acc_ledger_sold.class.php:986 +#: include/class/acc_ledger_purchase.class.php:1732 msgid "Ajoutez une pièce justificative " msgstr "Add a receipt" @@ -1749,6 +1771,7 @@ msgid "Année d'achat" msgstr "Year of purchase" #: include/class/periode.class.php:430 include/class/periode.class.php:432 +#: include/class/periode.class.php:434 #, php-format msgid "Année doit être entre %s et %s " msgstr "Year must be between %s and%s" @@ -1769,6 +1792,7 @@ msgid "Année invalide [" msgstr "Invalid year [" #: include/class/periode.class.php:427 include/class/periode.class.php:429 +#: include/class/periode.class.php:431 msgid "Année n'est pas un nombre" msgstr "year is not a number" @@ -1777,6 +1801,7 @@ msgid "Anomalie pour le compte " msgstr "Anomaly for the accounting" #: include/class/periode.class.php:648 include/class/periode.class.php:650 +#: include/class/periode.class.php:652 msgid "Août" msgstr "August" @@ -1879,6 +1904,7 @@ msgstr "" #: include/class/acc_ledger.class.php:1022 #: include/class/acc_ledger.class.php:597 #: include/class/acc_ledger.class.php:598 +#: include/class/acc_ledger.class.php:614 msgid "Attention : il vaut mieux utiliser les fiches que les postes comptables" msgstr "Warning : it is preferable to use card than accounting" @@ -1891,6 +1917,7 @@ msgstr "Warning : it is preferable to use card than accounting" #: 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:1223 msgid "" "Attention : il vaut mieux utiliser les fiches que les postes comptables " msgstr "Warning : it is preferable to use card than accounting" @@ -2035,6 +2062,10 @@ msgstr "" "Warning, IF the card changes its accounting , only the last one will " "be displayed" +#: include/class/acc_ledger.class.php:2555 +msgid "Attention, ce journal doit utiliser des montants négatifs" +msgstr "Warning this ledger must used negative amounts" + #: include/compta_ach.inc.php:70 include/compta_fin.inc.php:80 #: include/compta_ven.inc.php:80 include/operation_ods_confirm.inc.php:37 #: include/compta_ach.inc.php:72 include/compta_ach.inc.php:74 @@ -2175,6 +2206,9 @@ msgstr "No VAT code corresponds to the rate" #: 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:2355 +#: include/class/acc_ledger.class.php:2428 +#: include/class/acc_ledger.class.php:2614 msgid "Aucun compte en banque n'est donné" msgstr "No bank account given" @@ -2232,6 +2266,7 @@ msgstr "No record found" #: 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/follow_up.class.php:775 msgid "Aucun enregistrement trouvé" msgstr "No record found" @@ -2239,6 +2274,7 @@ msgstr "No record found" #: html/ajax_ledger.php:277 html/ajax_ledger.php:279 #: include/ajax/ajax_ledger.php:256 include/ajax/ajax_ledger.php:259 #: include/ajax/ajax_ledger.php:261 include/ajax/ajax_ledger.php:265 +#: include/ajax/ajax_ledger.php:266 msgid "Aucun fichier" msgstr "No file" @@ -2282,6 +2318,7 @@ msgstr "No template" #: include/modele.inc.php:245 include/modele.inc.php:259 #: include/modele.inc.php:283 include/modele.inc.php:266 #: include/modele.inc.php:267 include/modele.inc.php:272 +#: include/modele.inc.php:273 msgid "Aucun modèle disponible" msgstr "No available template" @@ -2325,6 +2362,7 @@ msgstr "No report defined" #: include/ajax/ajax_boxcard_search.php:70 #: include/class/acc_ledger.class.php:577 #: include/class/acc_ledger.class.php:578 +#: include/class/acc_ledger.class.php:594 msgid "Aucun résultat" msgstr "No result" @@ -2333,6 +2371,11 @@ msgstr "No result" msgid "Aucun titre" msgstr "No title" +#: include/class/tax_summary.class.php:116 +#: include/class/tax_summary.class.php:130 +msgid "Aucune Donnée" +msgstr "no data" + #: include/param_sec.inc.php:321 include/param_sec.inc.php:261 #: include/param_sec.inc.php:293 msgid "Aucune action" @@ -2359,7 +2402,7 @@ msgstr "All amount in ledger are normal" #: html/ajax_card.php:265 html/ajax_card.php:283 html/ajax_card.php:285 #: html/ajax_card.php:286 include/ajax/ajax_card.php:266 #: include/ajax/ajax_card.php:267 include/ajax/ajax_card.php:273 -#: include/ajax/ajax_card.php:275 +#: include/ajax/ajax_card.php:275 include/ajax/ajax_card.php:276 msgid "Aucune catégorie de fiche ne correspond à votre demande" msgstr "No class plug will match your request" @@ -2370,7 +2413,8 @@ msgstr "No class plug will match your request" #: include/ajax/ajax_card.php:376 include/ajax/ajax_card.php:255 #: include/ajax/ajax_card.php:377 include/ajax/ajax_card.php:261 #: include/ajax/ajax_card.php:410 include/ajax/ajax_card.php:264 -#: include/ajax/ajax_card.php:413 +#: include/ajax/ajax_card.php:413 include/ajax/ajax_card.php:265 +#: include/ajax/ajax_card.php:414 msgid "" "Aucune catégorie de fiche ne correspond à votre demande, le journal pourrait " "n'avoir accès à aucune fiche" @@ -2413,6 +2457,9 @@ msgstr "No description" #: 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/message_javascript.php:102 +#: include/template/ledger_detail_bottom.php:284 +#: include/template/tax_summary_display.php:105 +#: include/template/tax_summary_display.php:277 msgid "Aucune donnée" msgstr "no data" @@ -2432,7 +2479,7 @@ msgstr "No plugin available" #: html/ajax_card.php:172 html/ajax_card.php:190 html/ajax_card.php:191 #: html/ajax_card.php:192 include/ajax/ajax_card.php:172 #: include/ajax/ajax_card.php:173 include/ajax/ajax_card.php:176 -#: include/ajax/ajax_card.php:182 +#: include/ajax/ajax_card.php:182 include/ajax/ajax_card.php:183 msgid "Aucune fiche demandée" msgstr "No card Abebooks web sites" @@ -2467,7 +2514,7 @@ msgstr "No operation selected" #: include/ajax/ajax_history.php:197 include/ajax/ajax_history.php:199 #: include/ajax/ajax_history.php:117 include/ajax/ajax_history.php:202 #: include/ajax/ajax_history.php:121 include/ajax/ajax_history.php:207 -#: include/ajax/ajax_history.php:208 +#: include/ajax/ajax_history.php:208 include/ajax/ajax_history.php:209 msgid "Aucune opération pour l'exercice courant" msgstr "No operation for the current exercise" @@ -2526,6 +2573,8 @@ msgstr "No room to send" #: 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:1112 +#: include/class/acc_ledger.class.php:853 msgid "Aucune période ouverte" msgstr "No period opened" @@ -2591,6 +2640,7 @@ msgstr "another ledger" #: include/ajax/ajax_history.php:178 include/ajax/ajax_history.php:91 #: include/ajax/ajax_history.php:97 include/ajax/ajax_history.php:177 #: include/ajax/ajax_history.php:183 include/ajax/ajax_history.php:184 +#: include/ajax/ajax_history.php:179 include/ajax/ajax_history.php:185 msgid "Autre exercice" msgstr "Other exercise" @@ -2624,6 +2674,8 @@ msgstr "Other info" #: include/class/acc_ledger_purchase.class.php:1741 #: include/class/acc_ledger_sold.class.php:995 #: include/class/acc_ledger_purchase.class.php:1744 +#: include/class/acc_ledger_sold.class.php:1004 +#: include/class/acc_ledger_purchase.class.php:1750 msgid "Autre information : " msgstr "Other info" @@ -2701,12 +2753,22 @@ msgstr "With the card" msgid "Avertissement" msgstr "Warning" +#: include/template/param_jrn.php:106 +msgid "Avertissement montant positif" +msgstr "Warning positive amount" + +#: include/class/acc_ledger.class.php:2362 +msgid "Avertissement ne peut être vide" +msgstr "Warning can not be empty" + #: include/class/periode.class.php:647 include/class/periode.class.php:649 +#: include/class/periode.class.php:651 msgid "Avril" msgstr "April" #: include/database.item.php:55 include/database.item.php:58 #: include/database.item.php:52 include/database.item.php:50 +#: include/database.item.php:51 msgid "Axe analytique" msgstr "Analytic axis" @@ -2716,7 +2778,7 @@ msgstr "Analytic axis" #: include/modele.inc.php:331 include/dossier.inc.php:278 #: include/modele.inc.php:314 include/dossier.inc.php:281 #: include/dossier.inc.php:286 include/modele.inc.php:315 -#: include/modele.inc.php:320 +#: include/modele.inc.php:320 include/modele.inc.php:321 msgid "Backup" msgstr "Backup" @@ -2744,7 +2806,7 @@ msgstr "Backup for user" #: 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/fiche.inc.php:70 +#: include/fiche.inc.php:70 include/database.item.php:102 msgid "Balance" msgstr "Balance" @@ -2807,6 +2869,7 @@ msgstr "Tiers balance" #: 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:1325 msgid "Balance incorrecte" msgstr "wrong balance" @@ -2819,6 +2882,7 @@ msgstr "wrong balance" #: 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:1174 msgid "Balance incorrecte " msgstr "wrong balance" @@ -2833,11 +2897,13 @@ msgstr "Balance not voided" #: include/database.item.php:100 include/database.item.php:103 #: include/database.item.php:109 include/database.item.php:106 #: include/database.item.php:105 include/database.item.php:101 +#: include/database.item.php:102 msgid "Balance par catégorie de fiche" msgstr "Balance sheet by category" #: include/database.item.php:106 include/database.item.php:109 #: include/database.item.php:103 include/database.item.php:101 +#: include/database.item.php:102 msgid "" "Balance par catégorie de fiche ou pour toutes les fiches ayant un poste " "comptable" @@ -2903,6 +2969,7 @@ msgstr "Bank" #: include/modele.inc.php:324 include/modele.inc.php:338 #: include/modele.inc.php:377 include/modele.inc.php:360 #: include/modele.inc.php:361 include/modele.inc.php:366 +#: include/modele.inc.php:367 msgid "Basé sur" msgstr "Based on" @@ -2916,6 +2983,7 @@ msgstr "Database" #: include/modele.inc.php:378 include/modele.inc.php:392 #: include/modele.inc.php:441 include/modele.inc.php:424 #: include/modele.inc.php:428 include/modele.inc.php:433 +#: include/modele.inc.php:434 #, php-format msgid "Base de donnée %s mod %s est accèdée, déconnectez-vous d'abord" msgstr "Database %s mod %s is accessed, disconnect first" @@ -3010,7 +3078,7 @@ msgstr "Locked" #: include/database.item.php:194 include/database.item.php:197 #: include/database.item.php:195 include/database.item.php:174 #: include/database.item.php:175 include/database.item.php:178 -#: include/database.item.php:186 +#: include/database.item.php:186 include/database.item.php:191 msgid "Bon de commande Fournisseur" msgstr "Order Supplier" @@ -3018,7 +3086,7 @@ msgstr "Order Supplier" #: include/database.item.php:195 include/database.item.php:198 #: include/database.item.php:196 include/database.item.php:173 #: include/database.item.php:174 include/database.item.php:177 -#: include/database.item.php:185 +#: include/database.item.php:185 include/database.item.php:190 msgid "Bons de commande client" msgstr "Customer order" @@ -3087,6 +3155,10 @@ msgstr "Fund" msgid "Calcul automatique du poste comptable" msgstr "Automatic creation of the accounting" +#: include/database.item.php:141 +msgid "Calcul des totaux par TVA et par journal" +msgstr "Total VAT by ledger" + #: 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 @@ -3186,6 +3258,7 @@ msgstr "Document category" #: include/database.item.php:67 include/database.item.php:65 #: include/database.item.php:64 include/database.item.php:63 #: include/database.item.php:66 include/database.item.php:60 +#: include/database.item.php:59 msgid "Catégorie de documents" msgstr "Document category" @@ -3224,6 +3297,7 @@ msgstr "Existing category" #: html/ajax_card.php:530 html/ajax_card.php:529 include/ajax/ajax_card.php:509 #: include/ajax/ajax_card.php:510 include/ajax/ajax_card.php:511 #: include/ajax/ajax_card.php:544 include/ajax/ajax_card.php:548 +#: include/ajax/ajax_card.php:563 msgid "Catégorie existe déjà" msgstr "Category already exists" @@ -3237,6 +3311,7 @@ msgstr "Invalid category" #: html/ajax_card.php:532 html/ajax_card.php:531 include/ajax/ajax_card.php:511 #: include/ajax/ajax_card.php:512 include/ajax/ajax_card.php:513 #: include/ajax/ajax_card.php:546 include/ajax/ajax_card.php:550 +#: include/ajax/ajax_card.php:567 msgid "Catégorie sauvée" msgstr "Category saved" @@ -3311,7 +3386,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:556 +#: html/ajax_misc.php:554 html/ajax_misc.php:556 html/ajax_misc.php:560 msgid "Ce plugin n'existe pas " msgstr "No plugin" @@ -3326,7 +3401,7 @@ msgid "Cela pourrait avoir un impact sur les opérations déjà existantes" msgstr "It could have an impact on existing operations" #: include/verif_bilan.inc.php:151 include/verif_bilan.inc.php:188 -#: include/verif_bilan.inc.php:191 +#: include/verif_bilan.inc.php:191 include/verif_bilan.inc.php:193 msgid "" "Cela pourrait causer des différences entre les balances par fiches et celle " "par postes comptables, utilisez le plugin \n" @@ -3343,6 +3418,7 @@ msgstr "It could make difference between the balance by accountings and cards" #: 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:1690 msgid "Celui qui paie n' a pas de poste comptable" msgstr "Has no accounting entry" @@ -3441,6 +3517,8 @@ msgstr "This note is not yours" #: include/class/acc_ledger.class.php:216 #: include/class/acc_ledger.class.php:220 #: include/class/acc_ledger.class.php:221 +#: include/class/acc_ledger.class.php:235 +#: include/class/acc_ledger.class.php:239 msgid "Cette opération n'existe pas" msgstr "This account does not exist" @@ -3471,6 +3549,7 @@ msgstr "Change the status" #: html/ajax_ledger.php:522 html/ajax_ledger.php:529 html/ajax_ledger.php:531 #: include/ajax/ajax_ledger.php:508 include/ajax/ajax_ledger.php:511 #: include/ajax/ajax_ledger.php:515 include/ajax/ajax_ledger.php:516 +#: include/ajax/ajax_ledger.php:517 msgid "" "Changement impossible: on ne peut pas changer la date dans une période fermée" msgstr "Warning : you can not change in a closed period" @@ -3517,6 +3596,7 @@ msgstr "Reverse expenses" #: include/ajax/ajax_ledger.php:350 include/ajax/ajax_ledger.php:237 #: include/ajax/ajax_ledger.php:239 include/ajax/ajax_ledger.php:352 #: include/ajax/ajax_ledger.php:243 include/ajax/ajax_ledger.php:356 +#: include/ajax/ajax_ledger.php:244 include/ajax/ajax_ledger.php:357 msgid "Chargement" msgstr "Loading" @@ -3602,7 +3682,8 @@ msgstr "full path to postgresql" #: 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/ajax_misc.php:464 -#: include/lib/manage_table_sql.class.php:634 +#: include/lib/manage_table_sql.class.php:634 html/ajax_misc.php:468 +#: include/ajax/ajax_card.php:292 include/class/acc_ledger.class.php:2201 #, php-format msgid "Cherche" msgstr "Search" @@ -3649,7 +3730,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 +#: html/ajax_misc.php:462 html/ajax_misc.php:466 msgid "Choisissez la TVA" msgstr "Select the VAT" @@ -3661,6 +3742,7 @@ msgstr "Select the VAT" #: html/ajax_card.php:291 html/ajax_card.php:293 html/ajax_card.php:294 #: include/ajax/ajax_card.php:274 include/ajax/ajax_card.php:275 #: include/ajax/ajax_card.php:283 include/ajax/ajax_card.php:285 +#: include/ajax/ajax_card.php:286 msgid "" "Choisissez la catégorie de fiche à laquelle vous aimeriez ajouter une fiche" msgstr "Select the category of card" @@ -3721,6 +3803,7 @@ 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 +#: include/ajax/ajax_card.php:288 msgid "Choisissez une catégorie svp" msgstr "Select a category" @@ -3795,7 +3878,8 @@ msgstr "choice of distribution key" #: include/ajax/ajax_card.php:263 include/ajax/ajax_card.php:318 #: include/ajax/ajax_card.php:259 include/ajax/ajax_card.php:269 #: include/ajax/ajax_card.php:334 include/ajax/ajax_card.php:280 -#: include/ajax/ajax_card.php:337 +#: include/ajax/ajax_card.php:337 include/ajax/ajax_card.php:281 +#: include/ajax/ajax_card.php:338 msgid "Choix de la catégorie" msgstr "Category" @@ -3848,6 +3932,7 @@ msgstr "Select the type of paper" #: 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:2359 msgid "Choix du type de journal est obligatoire" msgstr "Select the type of ledger" @@ -3971,6 +4056,8 @@ msgstr "Invalid key" #: 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/class/acc_ledger_sold.class.php:1083 +#: include/class/acc_ledger_sold.class.php:1339 msgid "Client" msgstr "Customer" @@ -3993,7 +4080,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 +#: include/template/param_jrn.php:203 include/template/param_jrn.php:248 msgid "Clients (D)" msgstr "Customers(c)" @@ -4187,6 +4274,8 @@ msgstr "Internal code" #: include/class/acc_ledger_purchase.class.php:1833 #: include/class/acc_ledger_sold.class.php:1407 #: include/class/acc_ledger_purchase.class.php:1836 +#: include/class/acc_ledger_sold.class.php:1416 +#: include/class/acc_ledger_purchase.class.php:1842 msgid "Code Item" msgstr "Code" @@ -4254,6 +4343,15 @@ msgstr "Stock" #: 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/tax_summary_display.php:60 +#: include/template/tax_summary_display.php:116 +#: include/template/tax_summary_display.php:208 +#: include/template/tax_summary_display.php:288 +#: include/export/export_printtva_pdf.php:57 +#: include/export/export_printtva_pdf.php:212 +#: include/class/print_ledger_detail_item.class.php:163 +#: include/class/acc_ledger_sold.class.php:1426 +#: include/class/acc_ledger_purchase.class.php:1852 msgid "Code TVA" msgstr "VAT Code" @@ -4300,6 +4398,8 @@ msgstr "Menu code" #: include/class/acc_ledger_purchase.class.php:1838 #: include/class/acc_ledger_sold.class.php:1412 #: include/class/acc_ledger_purchase.class.php:1841 +#: include/class/acc_ledger_sold.class.php:1421 +#: include/class/acc_ledger_purchase.class.php:1847 msgid "Code fournisseur" msgstr "Dealer code" @@ -4350,6 +4450,8 @@ msgstr "Invalid code" #: include/class/acc_ledger_purchase.class.php:1830 #: include/class/acc_ledger_sold.class.php:1404 #: include/class/acc_ledger_purchase.class.php:1833 +#: include/class/acc_ledger_sold.class.php:1413 +#: include/class/acc_ledger_purchase.class.php:1839 msgid "Code journal" msgstr "Ledger code" @@ -4450,6 +4552,9 @@ msgstr "Start the uprade or the installation" #: 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/class/acc_ledger_history_generic.class.php:687 +#: include/class/acc_ledger_sold.class.php:1415 +#: include/class/acc_ledger_purchase.class.php:1841 msgid "Commentaire" msgstr "How" @@ -4482,6 +4587,8 @@ msgstr "Comment" #: include/class/acc_ledger_purchase.class.php:1840 #: include/class/acc_ledger_sold.class.php:1414 #: include/class/acc_ledger_purchase.class.php:1843 +#: include/class/acc_ledger_sold.class.php:1423 +#: include/class/acc_ledger_purchase.class.php:1849 msgid "Commentaire TVA" msgstr "Comment VAT" @@ -4539,6 +4646,7 @@ msgstr "Department" #: include/class/acc_ledger_sold.class.php:738 #: include/class/acc_ledger_purchase.class.php:1462 #: include/class/acc_ledger.class.php:622 +#: include/class/acc_ledger.class.php:638 msgid "Compt. Analytique" msgstr "Cost Accounting" @@ -4567,7 +4675,7 @@ msgstr "Cost Accounting" #: include/database.item.php:181 include/database.item.php:185 #: include/database.item.php:184 include/database.item.php:143 #: include/database.item.php:144 include/database.item.php:145 -#: include/database.item.php:150 +#: include/database.item.php:150 include/database.item.php:155 msgid "Compte bancaire" msgstr "Bank account" @@ -4587,6 +4695,7 @@ msgstr "Product with a debit result" #: 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:54 msgid "Compte en banque" msgstr "Bank account" @@ -4667,6 +4776,7 @@ msgstr "Regarding" #: include/database.item.php:235 include/database.item.php:212 #: include/database.item.php:213 include/database.item.php:216 #: include/database.item.php:236 include/database.item.php:214 +#: include/database.item.php:245 msgid "" "Concerne tous les achats, factures reçues, notes de crédit reçues et notes " "de frais" @@ -4676,6 +4786,7 @@ msgstr "Related to all sales, credit notes sent" #: include/database.item.php:236 include/database.item.php:213 #: include/database.item.php:214 include/database.item.php:217 #: include/database.item.php:237 include/database.item.php:215 +#: include/database.item.php:243 msgid "" "Concerne tous les mouvements financiers (comptes en banque, caisses, visa...)" msgstr "Balance of bank accounts, cash ..." @@ -4685,6 +4796,7 @@ msgstr "Balance of bank accounts, cash ..." #: include/database.item.php:237 include/database.item.php:214 #: include/database.item.php:215 include/database.item.php:218 #: include/database.item.php:238 include/database.item.php:216 +#: include/database.item.php:242 msgid "" "Concerne toutes les opérations comme les amortissements, les comptes TVA, ..." msgstr "Concerns all operations like VAT Accounting,..." @@ -4694,6 +4806,7 @@ msgstr "Concerns all operations like VAT Accounting,..." #: include/database.item.php:238 include/database.item.php:215 #: include/database.item.php:216 include/database.item.php:219 #: include/database.item.php:239 include/database.item.php:217 +#: include/database.item.php:244 msgid "Concerne toutes les ventes, notes de crédit envoyées" msgstr "Relates to all sales, credit notes sent" @@ -4707,6 +4820,7 @@ msgstr "Config. Menu" #: include/database.item.php:67 include/database.item.php:65 #: include/database.item.php:64 include/database.item.php:63 #: include/database.item.php:66 include/database.item.php:60 +#: include/database.item.php:59 msgid "Config. catégorie de documents" msgstr "Config. category of documents" @@ -4726,6 +4840,7 @@ msgstr "Payment method configuration" #: include/database.item.php:101 include/database.item.php:104 #: include/database.item.php:110 include/database.item.php:107 #: include/database.item.php:106 include/database.item.php:102 +#: include/database.item.php:103 msgid "Config. du plan comptable" msgstr "Config. Chart of Accounts" @@ -4765,6 +4880,10 @@ msgstr "" "Setting of the security , let you give a profile to your user , so they will " "be able to access the menu you decided" +#: include/database.item.php:139 +msgid "Configuration des devises" +msgstr "Configuration currency" + #: include/database.item.php:106 include/database.item.php:109 #: include/database.item.php:115 include/database.item.php:112 #: include/database.item.php:111 include/database.item.php:107 @@ -4877,7 +4996,8 @@ msgstr "Configuration label" #: include/compta_ach.inc.php:66 include/compta_fin.inc.php:79 #: include/compta_ven.inc.php:76 include/operation_ods_confirm.inc.php:31 #: include/compta_ach.inc.php:68 include/compta_ach.inc.php:70 -#: include/compta_ven.inc.php:78 +#: include/compta_ven.inc.php:78 include/compta_ven.inc.php:79 +#: include/compta_ach.inc.php:71 msgid "Confirmation" msgstr "Confirm" @@ -4942,7 +5062,7 @@ msgstr "Connect to NOALYSS" #: include/database.item.php:148 include/database.item.php:147 #: include/database.item.php:57 include/category_card.inc.php:75 #: include/database.item.php:60 include/database.item.php:52 -#: include/category_card.inc.php:77 +#: include/category_card.inc.php:77 include/database.item.php:53 msgid "Contact" msgstr "Contact" @@ -5045,6 +5165,7 @@ msgstr "Correcting accounting entry" #: include/compta_ach.inc.php:109 include/compta_ach.inc.php:111 #: include/compta_ven.inc.php:119 include/compta_ach.inc.php:115 #: include/compta_ven.inc.php:123 include/operation_ods_confirm.inc.php:90 +#: include/compta_ven.inc.php:121 include/compta_ach.inc.php:113 msgid "Corriger" msgstr "Correct" @@ -5052,6 +5173,7 @@ msgstr "Correct" #: include/database.item.php:207 include/database.item.php:204 #: include/database.item.php:177 include/database.item.php:178 #: include/database.item.php:181 include/database.item.php:189 +#: include/database.item.php:194 msgid "Courrier" msgstr "Email" @@ -5165,7 +5287,7 @@ msgstr "" #: include/database.item.php:183 include/database.item.php:186 #: include/database.item.php:211 include/database.item.php:188 #: include/database.item.php:189 include/database.item.php:192 -#: include/database.item.php:203 +#: include/database.item.php:203 include/database.item.php:208 msgid "Création, modification et effacement de fiche" msgstr "Creation, modification and deletion of record" @@ -5257,6 +5379,8 @@ msgstr "Credit" #: include/class/acc_ledger_history_generic.class.php:772 #: include/class/fiche.class.php:1480 #: include/class/pdfbalance_simple.class.php:57 +#: include/class/acc_ledger_history_generic.class.php:775 +#: include/class/acc_ledger.class.php:630 msgid "Crédit" msgstr "Credit" @@ -5274,7 +5398,7 @@ msgstr "Add users" #: include/database.item.php:219 include/database.item.php:196 #: include/database.item.php:197 include/database.item.php:200 -#: include/database.item.php:211 +#: include/database.item.php:211 include/database.item.php:216 msgid "Créer une note publique" msgstr "Add a new public note" @@ -5365,6 +5489,7 @@ msgstr "Add a new public note" #: include/class/follow_up.class.php:297 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/class/acc_ledger.class.php:2476 msgid "Créer une nouvelle fiche" msgstr "Add a new card" @@ -5432,6 +5557,7 @@ msgstr "Unallowed fee" #: 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:2818 msgid "Dans le dépôt" msgstr "In the warehouse" @@ -5658,6 +5784,14 @@ msgstr "Database::get_row returns too many rows" #: 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 +#: include/export/export_printtva_pdf.php:45 +#: include/class/acc_ledger_history_generic.class.php:683 +#: include/class/acc_ledger_history_generic.class.php:770 +#: include/class/acc_ledger_sold.class.php:1406 +#: include/class/acc_ledger.class.php:617 +#: include/class/acc_ledger.class.php:830 +#: include/class/acc_ledger_purchase.class.php:1832 +#, php-format msgid "Date" msgstr "Date" @@ -5689,7 +5823,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 +#: include/class/periode.class.php:519 include/class/periode.class.php:521 msgid "Date Début" msgstr "Start date" @@ -5702,7 +5836,8 @@ 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 +#: include/class/periode.class.php:520 include/database.item.php:179 +#: include/class/periode.class.php:522 msgid "Date Fin" msgstr "End Date" @@ -5771,7 +5906,7 @@ msgstr "Reminder before" #: include/database.item.php:148 include/lettering.account.inc.php:73 #: include/database.item.php:152 include/database.item.php:151 #: include/database.item.php:144 include/database.item.php:145 -#: include/database.item.php:153 +#: include/database.item.php:153 include/database.item.php:156 msgid "Date début" msgstr "Start date" @@ -5801,6 +5936,7 @@ msgstr "Start date for amortization\t" #: 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.class.php:1076 msgid "Date et periode ne correspondent pas" msgstr "Date and period do not match" @@ -5864,6 +6000,8 @@ msgstr "Date out of bound" #: include/class/acc_ledger.class.php:207 #: include/class/anc_acc_list.class.php:334 #: include/class/acc_ledger.class.php:1044 +#: include/class/acc_ledger.class.php:225 +#: include/class/acc_ledger.class.php:1060 msgid "Date invalide" msgstr "Invalid Date" @@ -5880,7 +6018,8 @@ msgstr "Invalid date" #: 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_ods.inc.php:132 +#: include/compta_ods.inc.php:132 include/compta_ven.inc.php:220 +#: include/compta_ach.inc.php:203 msgid "Date invalide, opération non extournée" msgstr "Invalid date, operation not reversed" @@ -5953,6 +6092,8 @@ msgstr "Date of operation" #: 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 +#: include/class/acc_ledger_sold.class.php:1407 +#: include/class/acc_ledger_purchase.class.php:1833 msgid "Date paiement" msgstr "Payment date" @@ -5990,6 +6131,8 @@ msgstr "Date of reception" #: include/class/acc_ledger_purchase.class.php:1825 #: include/class/acc_ledger_sold.class.php:1399 #: include/class/acc_ledger_purchase.class.php:1828 +#: include/class/acc_ledger_sold.class.php:1408 +#: include/class/acc_ledger_purchase.class.php:1834 msgid "Date échéance" msgstr " Limit Date" @@ -6073,6 +6216,7 @@ 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:108 +#: include/template/param_jrn.php:152 msgid "Dernière pièce numérotée" msgstr "Last numbered receipt" @@ -6088,7 +6232,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:409 +#: html/ajax_misc.php:407 html/ajax_misc.php:409 html/ajax_misc.php:413 msgid "Des actions dépendent de cette catégorie" msgstr "Event depends on this category" @@ -6267,6 +6411,8 @@ msgstr "Event depends on this category" #: 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 +#: include/template/param_jrn.php:129 include/modele.inc.php:249 +#: include/modele.inc.php:363 include/database.item.php:160 msgid "Description" msgstr "Description" @@ -6323,6 +6469,10 @@ msgstr "Recipient" msgid "Destinataire invalide" msgstr "Invalid recipient" +#: include/database.item.php:139 +msgid "Devises" +msgstr "Currency" + #: include/class/class_pdf_operation.php:378 #: include/class/pdf_operation.class.php:378 msgid "Diff" @@ -6429,7 +6579,7 @@ msgstr "Available in the ledgers" #: include/database.item.php:192 include/database.item.php:80 #: include/database.item.php:190 include/database.item.php:180 #: include/database.item.php:181 include/database.item.php:184 -#: include/database.item.php:77 +#: include/database.item.php:77 include/database.item.php:197 msgid "Divers" msgstr "Miscelleanous" @@ -6463,7 +6613,9 @@ msgstr "Miscelleanous" #: 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/class/acc_ledger_search.class.php:709 include/compta_ven.inc.php:186 +#: include/ajax/ajax_ledger.php:323 include/ajax/ajax_ledger.php:352 +#: include/compta_ach.inc.php:174 msgid "Document" msgstr "Document" @@ -6471,7 +6623,7 @@ msgstr "Document" #: include/database.item.php:191 include/database.item.php:194 #: include/database.item.php:192 include/database.item.php:172 #: include/database.item.php:173 include/database.item.php:176 -#: include/database.item.php:184 +#: include/database.item.php:184 include/database.item.php:189 msgid "Document Interne" msgstr "Internal Document" @@ -6612,7 +6764,7 @@ msgstr "" #: include/ext/importbank/index.php:141 #: include/ext/importbank/include/import_bank.class.php:463 #: include/ext/importbank/include/import_bank.class.php:484 -#: include/modele.inc.php:412 +#: include/modele.inc.php:412 include/modele.inc.php:413 msgid "Donnée invalide" msgstr "Invalid data" @@ -6717,6 +6869,7 @@ msgstr "Staffing" #: 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.class.php:1055 msgid "Double Encodage" msgstr "Double entries" @@ -6747,7 +6900,7 @@ msgstr "Duplicate" #: include/database.item.php:175 include/database.item.php:179 #: include/database.item.php:178 include/database.item.php:137 #: include/database.item.php:138 include/database.item.php:139 -#: include/database.item.php:144 +#: include/database.item.php:144 include/database.item.php:149 msgid "Durée Amortissement" msgstr "Amortization term" @@ -6838,6 +6991,9 @@ msgstr "Amortization term" #: include/class/acc_ledger_history_generic.class.php:771 #: include/class/fiche.class.php:1479 #: include/class/pdfbalance_simple.class.php:56 +#: include/class/acc_ledger_history_generic.class.php:774 +#: include/class/acc_ledger.class.php:629 +#: include/class/acc_ledger.class.php:905 msgid "Débit" msgstr "Debit" @@ -6863,6 +7019,7 @@ msgid "Débiteur" msgstr "Debit" #: include/class/periode.class.php:649 include/class/periode.class.php:651 +#: include/class/periode.class.php:653 msgid "Décembre" msgstr "December" @@ -6929,6 +7086,7 @@ msgstr "Disconnect" #: include/class/acc_ledger_purchase.class.php:1699 #: include/class/acc_ledger_sold.class.php:944 #: include/class/acc_ledger_purchase.class.php:1702 +#: include/class/acc_ledger_sold.class.php:946 msgid "Déduction acompte " msgstr "Amount already paid" @@ -7001,7 +7159,7 @@ msgstr "Purchase" #: include/database.item.php:180 include/database.item.php:184 #: include/database.item.php:183 include/database.item.php:142 #: include/database.item.php:143 include/database.item.php:144 -#: include/database.item.php:149 +#: include/database.item.php:149 include/database.item.php:154 msgid "Dépense charge du grant (partie privé) " msgstr "Expenditure charged to the grant (private party)" @@ -7054,6 +7212,7 @@ msgstr "Deactivate the language support" #: 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:2300 msgid "Désactivé" msgstr "Deactivated" @@ -7075,6 +7234,7 @@ msgstr "Sorry no data found" #: html/ajax_ledger.php:223 html/ajax_ledger.php:225 #: include/ajax/ajax_ledger.php:202 include/ajax/ajax_ledger.php:205 #: include/ajax/ajax_ledger.php:207 include/ajax/ajax_ledger.php:211 +#: include/ajax/ajax_ledger.php:212 msgid "Désolé il y a une erreur" msgstr "Sorry there was an error" @@ -7114,7 +7274,7 @@ msgstr "Sorry amount for analytic account are incorrect" #: include/modele.inc.php:413 include/dossier.inc.php:361 #: include/modele.inc.php:396 include/dossier.inc.php:377 #: include/dossier.inc.php:382 include/modele.inc.php:397 -#: include/modele.inc.php:402 +#: include/modele.inc.php:402 include/modele.inc.php:403 msgid "Désolé, vous n'avez pas coché la case" msgstr "Sorry the box is not checked" @@ -7219,6 +7379,7 @@ msgstr "Detail items" #: include/class/pre_op_ven.class.php:266 #: include/class/acc_ledger_sold.class.php:714 #: include/class/acc_ledger_sold.class.php:1206 +#: include/class/acc_ledger_sold.class.php:1215 msgid "Détail articles vendus" msgstr "Detail sold items" @@ -7270,6 +7431,7 @@ msgstr "Plugin detail" #: include/ajax/ajax_add_concerned_card.php:44 include/ajax/ajax_card.php:133 #: include/ajax/ajax_card.php:375 include/export/export_fiche_detail_pdf.php:53 #: include/ajax/ajax_add_concerned_card.php:48 include/ajax/ajax_card.php:378 +#: include/ajax/ajax_card.php:379 msgid "Détail fiche" msgstr "Card details" @@ -7278,6 +7440,7 @@ msgstr "Card details" #: html/ajax_card.php:563 include/ajax/ajax_card.php:543 #: include/ajax/ajax_card.php:544 include/ajax/ajax_card.php:545 #: include/ajax/ajax_card.php:578 include/ajax/ajax_card.php:582 +#: include/ajax/ajax_card.php:605 msgid "Détail fiche (sauvée)" msgstr "Card details(saved)" @@ -7385,6 +7548,8 @@ msgstr "Limit Date" #: include/class/acc_ledger_purchase.class.php:1773 #: include/class/acc_ledger_sold.class.php:1026 #: include/class/acc_ledger_purchase.class.php:1776 +#: include/class/acc_ledger_sold.class.php:1035 +#: include/class/acc_ledger_purchase.class.php:1782 msgid "Echeance dépassée" msgstr "Missed deadline" @@ -7485,6 +7650,7 @@ msgstr "Response Failed" #: include/class/acc_ledger_sold.class.php:1064 #: include/class/pdf_operation.class.php:70 #: include/class/acc_ledger_sold.class.php:1081 +#: include/class/acc_ledger_sold.class.php:1090 msgid "Echéance" msgstr "Date Limit" @@ -7553,7 +7719,7 @@ msgstr "Writing not possible" #: include/database.item.php:53 include/database.item.php:56 #: include/database.item.php:60 include/database.item.php:57 #: include/database.item.php:58 include/database.item.php:61 -#: include/database.item.php:55 +#: include/database.item.php:55 include/database.item.php:54 msgid "Ecriture prédefinie" msgstr "Predefined accounting" @@ -7576,6 +7742,7 @@ msgstr "Accounting" #: 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/ajax/ajax_card.php:172 msgid "Efface" msgstr "Remove" @@ -7602,6 +7769,7 @@ msgstr "Remove" #: include/modele.inc.php:342 include/modele.inc.php:356 #: include/modele.inc.php:398 include/modele.inc.php:381 #: include/modele.inc.php:382 include/modele.inc.php:387 +#: include/modele.inc.php:388 msgid "Effacement de toutes les données des plugins" msgstr "Clean all the plugins data" @@ -7611,6 +7779,7 @@ msgid "Effacement déclaration" msgstr "Erase statement" #: include/class/periode.class.php:673 include/class/periode.class.php:675 +#: include/class/periode.class.php:677 msgid "Effacement impossible" msgstr "Impossible removal" @@ -7625,6 +7794,7 @@ msgstr "Removal forbidden : VAT In use" #: html/ajax_ledger.php:186 html/ajax_ledger.php:187 #: include/ajax/ajax_ledger.php:164 include/ajax/ajax_ledger.php:167 #: include/ajax/ajax_ledger.php:168 include/ajax/ajax_ledger.php:172 +#: include/ajax/ajax_ledger.php:173 msgid "Effacement refusé" msgstr "Removal forbidden" @@ -7704,6 +7874,8 @@ msgstr "Removal forbidden" #: 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:325 include/modele.inc.php:317 +#: include/class/periode.class.php:598 include/class/periode.class.php:603 msgid "Effacer" msgstr "Remove" @@ -7717,6 +7889,7 @@ msgstr "Remove" #: include/compta_ven.inc.php:325 include/compta_ach.inc.php:296 #: include/compta_ven.inc.php:330 include/compta_ven.inc.php:333 #: include/compta_ach.inc.php:299 include/compta_ven.inc.php:341 +#: include/compta_ven.inc.php:339 include/compta_ach.inc.php:297 msgid "Effacer " msgstr "Remove" @@ -7757,7 +7930,7 @@ msgstr "Remove selected documents" #: include/database.item.php:185 include/database.item.php:188 #: include/database.item.php:213 include/database.item.php:190 #: include/database.item.php:191 include/database.item.php:194 -#: include/database.item.php:205 +#: include/database.item.php:205 include/database.item.php:210 msgid "Effacer les documents du suivi" msgstr "Clear documentation of monitoring" @@ -7770,13 +7943,13 @@ msgstr "Remove" #: include/database.item.php:220 include/database.item.php:197 #: include/database.item.php:198 include/database.item.php:201 -#: include/database.item.php:212 +#: include/database.item.php:212 include/database.item.php:217 msgid "Effacer une note publique" msgstr "Remove a public note" #: include/database.item.php:217 include/database.item.php:194 #: include/database.item.php:195 include/database.item.php:198 -#: include/database.item.php:209 +#: include/database.item.php:209 include/database.item.php:214 msgid "Effacer une opération " msgstr "Remove an operation" @@ -7806,6 +7979,7 @@ msgstr "Items" #: 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:85 +#: include/database.item.php:196 msgid "Email" msgstr "E-mail" @@ -7919,6 +8093,7 @@ msgstr "Encoding" #: include/database.item.php:60 include/database.item.php:63 #: include/database.item.php:57 include/database.item.php:55 +#: include/database.item.php:56 msgid "Encodage d'un extrait bancaire (=relevé bancaire)" msgstr "Encode bank receipt" @@ -7970,7 +8145,7 @@ msgstr "Remove all tags for the selected documents" #: include/database.item.php:216 include/database.item.php:193 #: include/database.item.php:194 include/database.item.php:197 -#: include/database.item.php:208 +#: include/database.item.php:208 include/database.item.php:213 msgid "Enlever une pièce justificative" msgstr "Remove a receipt" @@ -7990,7 +8165,8 @@ msgstr "Record" #: include/compta_ach.inc.php:110 include/compta_ach.inc.php:163 #: include/compta_ven.inc.php:118 include/compta_ach.inc.php:114 #: include/compta_ach.inc.php:167 include/compta_ven.inc.php:122 -#: include/ext/tva/ajax.php:111 +#: include/ext/tva/ajax.php:111 include/compta_ven.inc.php:120 +#: include/compta_ach.inc.php:112 include/compta_ach.inc.php:165 msgid "Enregistrement" msgstr "Record" @@ -8015,6 +8191,7 @@ msgstr "Recorded in" #: include/action.common.inc.php:316 include/compta_ven.inc.php:332 #: include/action.common.inc.php:191 include/action.common.inc.php:325 #: include/compta_ach.inc.php:298 include/compta_ven.inc.php:340 +#: include/compta_ven.inc.php:338 include/compta_ach.inc.php:296 msgid "Enregistrer" msgstr "Submit" @@ -8058,6 +8235,7 @@ msgstr "Enter the required information for Noalyss" #: include/ext/rapport_avance/include/template/parameter_send_mail_input.php:23 #: include/ext/rapport_avance/include/template/parameter_send_mail_input.php:27 +#: scenario/HtmlInput.test.php:89 msgid "Envoi" msgstr "Sending" @@ -8152,7 +8330,7 @@ msgstr "wrong balance diff = %s" #: include/class_noalyss_sql.php:316 include/lib/class_noalyss_sql.php:316 #: include/lib/data_sql.class.php:286 include/lib/noalyss_sql.class.php:391 -#: include/lib/data_sql.class.php:248 +#: include/lib/data_sql.class.php:248 include/lib/database_core.class.php:168 msgid "Erreur : exec_sql attend un array" msgstr "Error exec_sql expects an array" @@ -8250,6 +8428,7 @@ msgid "Erreur paramètre" msgstr "Settings error" #: include/ajax/ajax_card.php:356 include/ajax/ajax_card.php:359 +#: include/ajax/ajax_card.php:360 msgid "Erreur sauvegarde" msgstr "Error backup" @@ -8427,7 +8606,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 +#: include/class/periode.class.php:521 include/class/periode.class.php:523 msgid "Exercice" msgstr "Exercise" @@ -8436,6 +8615,7 @@ msgid "Exercice comptable d'achat" msgstr "Purchase accounting year" #: include/class/periode.class.php:424 include/class/periode.class.php:426 +#: include/class/periode.class.php:428 #, php-format msgid "Exercice doit être entre %s et %s " msgstr "Exercice is between %s and %s" @@ -8445,13 +8625,14 @@ msgid "Exercice invalide" msgstr "Invalid exercice" #: include/class/periode.class.php:421 include/class/periode.class.php:423 +#: include/class/periode.class.php:425 msgid "Exercice n'est pas un nombre" 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:469 +#: html/ajax_misc.php:467 html/ajax_misc.php:469 html/ajax_misc.php:473 msgid "Explication" msgstr "Explanation" @@ -8460,6 +8641,10 @@ msgstr "Explanation" msgid "Export" msgstr "Export CSV" +#: include/database.item.php:140 +msgid "Export ANC" +msgstr "Export ANC" + #: include/database.item.php:46 include/database.item.php:49 #: include/database.item.php:53 include/database.item.php:52 #: include/database.item.php:55 include/database.item.php:48 @@ -8517,7 +8702,7 @@ msgstr "Export balance" #: 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 +#: include/class/fiche.class.php:2215 include/class/tax_summary.class.php:334 msgid "Export CSV" msgstr "Export CSV" @@ -8617,7 +8802,7 @@ msgstr "Export Ledger" #: 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:1605 -#: include/class/fiche.class.php:2237 +#: include/class/fiche.class.php:2237 include/class/tax_summary.class.php:350 msgid "Export PDF" msgstr "Export PDF" @@ -8629,6 +8814,10 @@ msgstr "Export PDF" msgid "Export Poste détail" msgstr "Export Accountancy" +#: include/database.item.php:142 include/database.item.php:143 +msgid "Export Résumé TVA" +msgstr "Export summary VAT" + #: include/database.item.php:48 include/database.item.php:51 #: include/database.item.php:55 include/database.item.php:54 #: include/database.item.php:57 include/database.item.php:50 @@ -8779,6 +8968,7 @@ msgstr "Plugin" #: include/operation_ods_confirm.inc.php:53 include/compta_ach.inc.php:90 #: include/compta_ach.inc.php:92 include/compta_ven.inc.php:99 #: include/ajax/ajax_ledger.php:564 include/class/acc_operation.class.php:729 +#: include/ajax/ajax_ledger.php:565 msgid "Extourne" msgstr "Reverse" @@ -8786,6 +8976,7 @@ msgstr "Reverse" #: include/operation_ods_confirm.inc.php:61 #: include/operation_ods_confirm.inc.php:62 include/compta_ach.inc.php:104 #: include/compta_ach.inc.php:106 include/compta_ven.inc.php:113 +#: include/compta_ven.inc.php:111 msgid "Extourne opération" msgstr "Reverse operation" @@ -8806,6 +8997,8 @@ msgstr "Reverse operation" #: 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:333 +#: include/template/ledger_detail_bottom.php:346 msgid "Extourner" msgstr "Reverse" @@ -8815,6 +9008,7 @@ msgstr "Reverse" #: 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:348 msgid "" "Extourner une opération vous permet de l'annuler par son écriture inverse" msgstr "Avoid an operation by writing the reversed one" @@ -8823,11 +9017,12 @@ msgstr "Avoid an operation by writing the reversed one" #: 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_ods.inc.php:118 +#: include/compta_ven.inc.php:206 msgid "Extourné au " msgstr "Reversed on " #: include/compta_ach.inc.php:184 include/compta_ach.inc.php:186 -#: include/compta_ach.inc.php:191 +#: include/compta_ach.inc.php:191 include/compta_ach.inc.php:189 #, php-format msgid "Extourné au %s" msgstr "Reversed on %s" @@ -8874,6 +9069,7 @@ msgstr "Invoicing, send invoices by email, download" #: include/ext/invoicing/include/invoice_to_zip.inc.php:76 #: include/compta_ach.inc.php:89 include/compta_ven.inc.php:96 #: include/database.item.php:179 include/database.item.php:187 +#: include/database.item.php:192 msgid "Facture" msgstr "Invoice" @@ -8901,7 +9097,7 @@ msgstr "Bookmark" #: include/database.item.php:161 include/database.item.php:165 #: include/database.item.php:164 include/database.item.php:157 #: include/database.item.php:158 include/company.inc.php:124 -#: include/database.item.php:166 +#: include/database.item.php:166 include/database.item.php:169 msgid "Fax" msgstr "Fax" @@ -8981,6 +9177,8 @@ msgstr "Firm action" #: 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 #: include/template/ledger_detail_bottom.php:303 +#: include/template/ledger_detail_bottom.php:299 +#: include/template/ledger_detail_bottom.php:300 include/ajax/ajax_card.php:313 #, php-format msgid "Fermer" msgstr "close" @@ -9003,7 +9201,7 @@ msgstr "close" #: include/class/periode.class.php:585 #: include/class/periode_ledger_table.class.php:142 -#: include/class/periode.class.php:587 +#: include/class/periode.class.php:587 include/class/periode.class.php:589 msgid "Fermée" msgstr "Closed" @@ -9080,7 +9278,7 @@ msgstr "VAT record" #: include/ajax/ajax_card.php:345 include/ajax/ajax_card.php:346 #: include/ajax/ajax_card.php:347 include/ajax/ajax_add_concerned_card.php:50 #: include/ajax/ajax_card.php:380 include/ajax/ajax_add_concerned_card.php:54 -#: include/ajax/ajax_card.php:383 +#: include/ajax/ajax_card.php:383 include/ajax/ajax_card.php:384 msgid "Fiche contenant" msgstr "Card" @@ -9093,7 +9291,7 @@ msgstr "Inexistent card" msgid "Fiche non disponible pour journal" msgstr "Card not available for this ledger" -#: include/ajax/ajax_card.php:619 +#: include/ajax/ajax_card.php:619 include/ajax/ajax_card.php:642 msgid "Fiche non effacée" msgstr "Card not deleted" @@ -9121,7 +9319,8 @@ msgstr "Card not found" #: html/ajax_card.php:559 html/ajax_card.php:558 include/ajax/ajax_card.php:538 #: include/ajax/ajax_card.php:539 include/ajax/ajax_card.php:540 #: include/ajax/ajax_card.php:573 include/ajax/ajax_card.php:577 -#: include/ajax/ajax_card.php:607 +#: include/ajax/ajax_card.php:607 include/ajax/ajax_card.php:600 +#: include/ajax/ajax_card.php:630 msgid "Fiche non valide" msgstr "Invalid file" @@ -9132,7 +9331,7 @@ msgstr "Card for hours" #: html/ajax_card.php:304 html/ajax_card.php:340 html/ajax_card.php:342 #: html/ajax_card.php:343 include/ajax/ajax_card.php:323 #: include/ajax/ajax_card.php:324 include/ajax/ajax_card.php:342 -#: include/ajax/ajax_card.php:345 +#: include/ajax/ajax_card.php:345 include/ajax/ajax_card.php:346 msgid "Fiche sauvée" msgstr "Card saved" @@ -9154,7 +9353,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 +#: include/template/param_jrn.php:260 include/template/param_jrn.php:305 msgid "Fiches utilisables (D/C)" msgstr "Usable Cards (D/C)" @@ -9261,7 +9460,7 @@ msgstr "Filter per periode" #: 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 -#: include/class/acc_ledger_search.class.php:562 +#: include/class/acc_ledger_search.class.php:562 include/modele.inc.php:279 msgid "Filtre" msgstr "Filter" @@ -9367,6 +9566,7 @@ msgstr "Fin /MO" #: 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/lib/user_menu.php:136 +#: include/database.item.php:233 include/database.item.php:252 msgid "Financier" msgstr "Financial" @@ -9379,6 +9579,11 @@ msgstr "Export CSV" msgid "Format Invalide" msgstr "invalid format" +#: include/class/tax_summary.class.php:74 +#: include/class/tax_summary.class.php:93 +msgid "Format date invalide" +msgstr "invalid format" + #: include/ext/importbank/include/template/show_field.php:27 #: include/ext/importbank/include/template/show_transfer.php:168 #: include/ext/importbank/include/template/show_transfer.php:167 @@ -9482,7 +9687,7 @@ msgid "Fournisseur " msgstr "Supplier" #: 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:193 msgid "Fournisseurs (C)" msgstr "Supplier (C)" @@ -9506,6 +9711,7 @@ msgid "Français" msgstr "French" #: include/class/periode.class.php:647 include/class/periode.class.php:649 +#: include/class/periode.class.php:651 msgid "Février" msgstr "February" @@ -9514,7 +9720,7 @@ msgstr "February" #: include/ext/sav/include/template/sas_display_detail.php:111 #: include/database.item.php:166 include/database.item.php:165 #: include/database.item.php:158 include/database.item.php:159 -#: include/database.item.php:167 +#: include/database.item.php:167 include/database.item.php:170 msgid "GSM" msgstr "GSM" @@ -9549,7 +9755,7 @@ msgstr "Template management" #: include/database.item.php:53 include/database.item.php:56 #: include/database.item.php:60 include/database.item.php:57 #: include/database.item.php:58 include/database.item.php:61 -#: include/database.item.php:55 +#: include/database.item.php:55 include/database.item.php:54 msgid "Gestion des opérations prédéfinifies" msgstr "Manage predefined writing" @@ -9578,7 +9784,7 @@ msgstr "Users managements" #: include/database.item.php:163 include/database.item.php:166 #: include/database.item.php:170 include/database.item.php:169 #: include/database.item.php:168 include/database.item.php:172 -#: include/database.item.php:177 +#: include/database.item.php:177 include/database.item.php:180 msgid "Gestion stock" msgstr "Stock management" @@ -9596,6 +9802,7 @@ msgstr "Global period for all ledgers" #: include/class/acc_ledger.class.php:364 include/database.item.php:66 #: include/class/acc_ledger.class.php:372 #: include/class/acc_ledger.class.php:373 +#: include/class/acc_ledger.class.php:391 msgid "Grand Livre" msgstr "General Ledger" @@ -9751,6 +9958,7 @@ 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:52 msgid "Groupe" msgstr "Group" @@ -9763,7 +9971,7 @@ msgstr "Management group" #: include/database.item.php:50 include/database.item.php:53 #: include/database.item.php:62 include/database.item.php:59 #: include/database.item.php:58 include/database.item.php:56 -#: include/database.item.php:51 +#: include/database.item.php:51 include/database.item.php:52 msgid "Groupe analytique" msgstr "Analytical group" @@ -9868,6 +10076,7 @@ msgstr "Generate an invoice or upload a document" #: 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 +#: include/class/print_ledger_detail_item.class.php:161 msgid "HTVA" msgstr "wo VAT" @@ -9895,6 +10104,8 @@ msgstr "wo VAT" #: include/class/acc_ledger_purchase.class.php:1851 #: include/class/acc_ledger_sold.class.php:1422 #: include/class/acc_ledger_purchase.class.php:1854 +#: include/class/acc_ledger_sold.class.php:1431 +#: include/class/acc_ledger_purchase.class.php:1860 msgid "HTVA Opération" msgstr "Operation without tax" @@ -9917,7 +10128,7 @@ msgid "Heure" msgstr "Hour" #: include/verif_bilan.inc.php:127 include/verif_bilan.inc.php:165 -#: include/verif_bilan.inc.php:168 +#: include/verif_bilan.inc.php:168 include/verif_bilan.inc.php:169 msgid "Hist." msgstr "Hist." @@ -9943,6 +10154,7 @@ msgstr "Histo. Change" #: 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/fiche.inc.php:65 +#: include/ajax/ajax_card.php:167 msgid "Historique" msgstr "History" @@ -9958,11 +10170,13 @@ msgstr "Lettered history and different Amounts" #: include/database.item.php:69 include/database.item.php:67 #: include/database.item.php:66 include/database.item.php:65 #: include/database.item.php:68 include/database.item.php:62 +#: include/database.item.php:61 msgid "Historique achat" msgstr "Purchase history" #: include/database.item.php:65 include/database.item.php:68 #: include/database.item.php:62 include/database.item.php:60 +#: include/database.item.php:61 msgid "" "Historique de toutes vos opérations dans les journaux d'achats un menu de " "recherche, vous permettra de retrouver rapidement l'opération qui vous " @@ -10013,6 +10227,7 @@ msgstr "" #: include/database.item.php:61 include/database.item.php:64 #: include/database.item.php:58 include/database.item.php:56 +#: include/database.item.php:57 msgid "" "Historique de toutes vos opérations un menu de recherche dans une nouvelle " "fenêtre, vous permettra de retrouver rapidement l'opération qui vous " @@ -10181,7 +10396,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:557 +#: html/ajax_misc.php:555 html/ajax_misc.php:557 html/ajax_misc.php:561 msgid "Il y a une erreur, ce plugin n'existe pas" msgstr "This plugin doesn't exist" @@ -10362,6 +10577,7 @@ msgstr "It is not possible to remove this accounting.It is still in use" #: 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:2632 msgid "Impossible d'effacer un journal qui contient des opérations" msgstr "It is not possible to remove this ledger.It is still in use" @@ -10585,6 +10801,7 @@ msgstr "Give the folder for temporary files example c:/temp , /tmp,..." #: include/modele.inc.php:312 include/modele.inc.php:295 #: include/modele.inc.php:296 include/modele.inc.php:301 +#: include/modele.inc.php:302 msgid "Inexistant" msgstr "inexistent" @@ -10605,7 +10822,8 @@ msgstr "Extra info" #: include/ajax/ajax_ledger.php:96 include/ajax/ajax_ledger.php:118 #: include/ajax/ajax_ledger.php:103 include/ajax/ajax_ledger.php:125 #: include/template/ledger_detail_bottom.php:37 include/ext/tva/ajax.php:101 -#: include/ext/tva/ajax.php:200 +#: include/ext/tva/ajax.php:200 include/ajax/ajax_ledger.php:104 +#: include/ajax/ajax_ledger.php:126 msgid "Information" msgstr "Information" @@ -10750,6 +10968,9 @@ msgstr "Internal" #: 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/class/acc_ledger_history_generic.class.php:769 +#: include/class/acc_ledger_sold.class.php:1412 +#: include/class/acc_ledger_purchase.class.php:1838 msgid "Interne" msgstr "Internal" @@ -10759,6 +10980,7 @@ msgstr "Invalid command" #: include/modele.inc.php:318 include/modele.inc.php:301 #: include/modele.inc.php:302 include/modele.inc.php:307 +#: include/modele.inc.php:308 msgid "Invalide" msgstr "Invalide" @@ -10805,6 +11027,7 @@ msgid "Item" msgstr "Item" #: include/class/periode.class.php:647 include/class/periode.class.php:649 +#: include/class/periode.class.php:651 msgid "Janvier" msgstr "January" @@ -10871,10 +11094,13 @@ msgstr "Thursday" #: 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/export/export_printtva_csv.php:39 +#: include/export/export_printtva_csv.php:58 msgid "Journal" msgstr "Ledger" #: include/template/param_jrn.php:125 include/template/param_jrn.php:127 +#: include/template/param_jrn.php:171 msgid "Journal actif" msgstr "Enabled ledger" @@ -10897,6 +11123,7 @@ msgstr "Financial ledger misconfigured" #: 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:2919 msgid "Journal incorrect" msgstr "Incorrect ledger" @@ -10907,6 +11134,7 @@ msgstr "No existent ledger" #: include/ext/import_account/include/class_impacc_export.php:104 #: include/ext/import_account/include/impacc_export.class.php:104 +#: include/class/acc_ledger.class.php:2938 msgid "Journal invalide" msgstr "Invalid Ledger" @@ -10926,6 +11154,7 @@ msgstr "Ledger misconfigured" #: 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:2230 msgid "Journal n'existe pas" msgstr "The ledger does not exist" @@ -10953,6 +11182,7 @@ msgstr "Ledgers" #: 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:2136 msgid "Journaux Financier" msgstr "Financial" @@ -10963,6 +11193,7 @@ msgstr "Financial" #: 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:2137 msgid "Journaux d'Opérations diverses" msgstr "Miscellaneous ledger" @@ -10973,6 +11204,7 @@ msgstr "Miscellaneous ledger" #: 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:2135 msgid "Journaux d'achat" msgstr "Purchase ledger" @@ -10987,14 +11219,17 @@ msgstr "Purchase ledger" #: 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:2134 msgid "Journaux de vente" msgstr "Ledger of sales" #: include/class/periode.class.php:648 include/class/periode.class.php:650 +#: include/class/periode.class.php:652 msgid "Juillet" msgstr "July" #: include/class/periode.class.php:648 include/class/periode.class.php:650 +#: include/class/periode.class.php:652 msgid "Juin" msgstr "June" @@ -11191,6 +11426,8 @@ msgstr "The card" #: 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:1125 +#: include/class/acc_ledger.class.php:1268 #, php-format msgid "La fiche %s n'a pas de poste comptable" msgstr "The card% s Has No accountancy" @@ -11279,6 +11516,7 @@ msgstr "The mini-report" #: include/modele.inc.php:386 include/modele.inc.php:400 #: include/modele.inc.php:450 include/modele.inc.php:433 #: include/modele.inc.php:437 include/modele.inc.php:442 +#: include/modele.inc.php:443 #, php-format msgid "Le modèle %s est effacé" msgstr "Folder %s is dropped" @@ -11339,6 +11577,7 @@ msgstr "The name and the accounting base can not be empty" #: include/ajax/ajax_card.php:551 include/class/forecast.class.php:70 #: include/ajax/ajax_card.php:555 #: include/class/template_card_category.class.php:73 +#: include/ajax/ajax_card.php:574 msgid "Le nom ne peut pas être vide" msgstr "the name cannot be empty" @@ -11372,6 +11611,7 @@ msgid "Le poste" msgstr "The accounting item" #: include/class/acc_ledger.class.php:1124 +#: include/class/acc_ledger.class.php:1140 #, php-format msgid "Le poste %s n'est pas dans ce journal" msgstr "Account %s doesn't belong to this ledger" @@ -11528,6 +11768,7 @@ msgstr "The password do not match, the password is not changed" #: include/database.item.php:58 include/database.item.php:61 #: include/database.item.php:55 include/database.item.php:53 +#: include/database.item.php:54 msgid "" "Les opérations prédéfinies sont des opérations que vous faites régulièrement " "(loyer, abonnement,...) " @@ -11609,6 +11850,7 @@ msgstr "Lettering" #: include/database.item.php:68 include/database.item.php:66 #: include/database.item.php:65 include/database.item.php:64 #: include/database.item.php:67 include/database.item.php:61 +#: include/database.item.php:60 msgid "Lettrage par Fiche" msgstr "Lettering Card " @@ -11616,6 +11858,7 @@ msgstr "Lettering Card " #: include/database.item.php:107 include/database.item.php:104 #: include/database.item.php:103 include/database.item.php:105 #: include/database.item.php:108 include/database.item.php:100 +#: include/database.item.php:101 msgid "Lettrage par Poste" msgstr "Lettering Post" @@ -11623,6 +11866,7 @@ msgstr "Lettering Post" #: include/database.item.php:68 include/database.item.php:66 #: include/database.item.php:65 include/database.item.php:64 #: include/database.item.php:67 include/database.item.php:61 +#: include/database.item.php:60 msgid "Lettrage par fiche" msgstr "Lettering by card" @@ -11638,6 +11882,7 @@ msgstr "Lettering for the accounting" #: include/database.item.php:198 include/database.item.php:201 #: include/database.item.php:176 include/database.item.php:177 #: include/database.item.php:180 include/database.item.php:188 +#: include/database.item.php:193 msgid "Lettre de rappel" msgstr "Reminder" @@ -11816,6 +12061,14 @@ msgstr "label" #: 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/ledger_detail_bottom.php:356 +#: include/class/print_ledger_detail_item.class.php:158 +#: include/class/acc_ledger_history_generic.class.php:773 +#: include/class/acc_ledger_sold.class.php:1410 +#: include/class/acc_ledger.class.php:621 +#: include/class/acc_ledger.class.php:628 +#: include/class/acc_ledger.class.php:903 +#: include/class/acc_ledger_purchase.class.php:1836 #, php-format msgid "Libellé" msgstr "Label" @@ -11842,6 +12095,7 @@ msgstr "Label" #: include/class/acc_ledger_purchase.class.php:1700 #: include/class/acc_ledger_sold.class.php:945 #: include/class/acc_ledger_purchase.class.php:1703 +#: include/class/acc_ledger_sold.class.php:947 msgid "Libellé :" msgstr "Follows:" @@ -11933,6 +12187,7 @@ msgstr "List of contacts" #: include/database.item.php:57 include/database.item.php:60 #: include/database.item.php:54 include/database.item.php:52 +#: include/database.item.php:53 msgid "Liste de tous vos contacts" msgstr "List of contacts" @@ -11972,6 +12227,7 @@ msgstr "Manual changes in the repository , transfer between repository" #: include/database.item.php:51 include/database.item.php:54 #: include/database.item.php:58 include/database.item.php:57 #: include/database.item.php:60 include/database.item.php:52 +#: include/database.item.php:53 msgid "Liste des contacts" msgstr "List of contacts" @@ -12066,6 +12322,7 @@ msgid "Lundi" msgstr "Monday" #: include/class/periode.class.php:648 include/class/periode.class.php:650 +#: include/class/periode.class.php:652 msgid "Mai" msgstr "May" @@ -12138,6 +12395,7 @@ msgid "Marquer pour suppression" msgstr "Mark for deleting" #: include/class/periode.class.php:647 include/class/periode.class.php:649 +#: include/class/periode.class.php:651 msgid "Mars" msgstr "March" @@ -12281,6 +12539,7 @@ msgstr "Group of menus for report creation, verification of your bookkeeping" #: include/database.item.php:19 include/database.item.php:22 #: include/database.item.php:51 include/database.item.php:49 +#: include/database.item.php:62 msgid "Menu regroupant les plugins" msgstr "Group of plugins menus" @@ -12312,12 +12571,14 @@ msgstr "Wednesday" #: include/ext/invoicing/include/invoice_send_mail_input.inc.php:91 #: include/ext/invoicing/include/template/recorded_message_display.php:27 #: include/compta_ach.inc.php:111 include/compta_ven.inc.php:118 -#: include/operation_ods_confirm.inc.php:68 +#: include/operation_ods_confirm.inc.php:68 include/compta_ven.inc.php:116 +#: include/compta_ach.inc.php:109 msgid "Message" msgstr "Message" #: include/compta_ach.inc.php:109 include/compta_ven.inc.php:116 -#: include/operation_ods_confirm.inc.php:67 +#: include/operation_ods_confirm.inc.php:67 include/compta_ven.inc.php:114 +#: include/compta_ach.inc.php:107 msgid "Message extourne" msgstr "Message reverse" @@ -12354,6 +12615,14 @@ msgstr "Upgrade your database " msgid "Mettre à jour" msgstr "Update" +#: include/lib/message_javascript.php:106 +msgid "" +"Mettre à oui pour un journal dédié uniquement aux notes de crédit ou de " +"débit, il affichera un avertissement si le montant n'est pas en négatif" +msgstr "" +"Set it to YES if a ledger is dedicated to have only negative amount, and" +" issue a warning is the amount is positive" + #: 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 @@ -12361,6 +12630,7 @@ msgid "Mini-Rapport : " msgstr "Mini-Report" #: include/template/param_jrn.php:68 include/template/param_jrn.php:75 +#: include/template/param_jrn.php:119 msgid "Minimum de lignes à afficher" msgstr "Minimum rows to display" @@ -12479,6 +12749,8 @@ msgstr "Update templates" #: 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:156 +#: include/class/acc_ledger_sold.class.php:1046 +#: include/class/acc_ledger_purchase.class.php:1793 msgid "Mise à jour paiement" msgstr "Update payment" @@ -12534,6 +12806,7 @@ msgstr "Hardware modification" #: include/database.item.php:107 include/database.item.php:110 #: include/database.item.php:104 include/database.item.php:102 +#: include/database.item.php:103 msgid "" "Modification de votre plan comptable, parfois il est plus rapide d'utiliser " "le plugin \"Poste Comptable\"" @@ -12572,7 +12845,7 @@ msgstr "Periode modification" #: include/ajax/ajax_admin.php:297 include/modele.inc.php:313 #: include/ajax/ajax_admin.php:240 include/ajax/ajax_admin.php:318 #: include/modele.inc.php:318 include/ajax/ajax_admin.php:244 -#: include/ajax/ajax_admin.php:322 +#: include/ajax/ajax_admin.php:322 include/modele.inc.php:319 msgid "Modifie" msgstr "Modify" @@ -12625,7 +12898,7 @@ msgstr "Modify" #: include/database.item.php:187 include/database.item.php:190 #: include/database.item.php:215 include/database.item.php:192 #: include/database.item.php:193 include/database.item.php:196 -#: include/database.item.php:207 +#: include/database.item.php:207 include/database.item.php:212 msgid "Modifier le type de document" msgstr "Change the document type" @@ -12690,11 +12963,13 @@ msgstr "Module not found" #: include/database.item.php:57 include/database.item.php:60 #: include/database.item.php:63 include/database.item.php:59 #: include/database.item.php:62 include/database.item.php:65 +#: include/database.item.php:58 msgid "Module paramètre" msgstr "Setting" #: include/database.item.php:62 include/database.item.php:65 #: include/database.item.php:59 include/database.item.php:57 +#: include/database.item.php:58 msgid "Module paramètres" msgstr "Parameters module" @@ -12717,6 +12992,7 @@ msgstr "Template" #: 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:819 msgid "Modèle d'opération" msgstr "Entry template" @@ -12771,15 +13047,15 @@ 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 +#: include/lib/user_menu.php:76 include/modele.inc.php:259 msgid "Modèles" msgstr "Template" -#: include/modele.inc.php:326 +#: include/modele.inc.php:326 include/modele.inc.php:327 msgid "Modèles disponibles dans le dépôt" msgstr "Available template in the repository" -#: include/modele.inc.php:269 +#: include/modele.inc.php:269 include/modele.inc.php:270 msgid "Modèles locaux" msgstr "Local template" @@ -12789,7 +13065,7 @@ msgid "Mois" msgstr "Month" #: include/class/periode.class.php:438 include/class/periode.class.php:440 -#: include/class/periode.class.php:442 +#: include/class/periode.class.php:442 include/class/periode.class.php:444 msgid "Mois de début n'existe pas " msgstr "Starting month does not exist" @@ -12901,7 +13177,7 @@ msgstr "Starting month does not exist" #: 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/fiche.inc.php:531 -#: include/class/fiche.class.php:1399 +#: include/class/fiche.class.php:1399 include/class/acc_ledger.class.php:904 msgid "Montant" msgstr "Amount" @@ -12921,6 +13197,28 @@ msgstr "Amount Purchases" msgid "Montant Amorti" msgstr "Amount Cushioning" +#: include/template/tax_summary_display.php:64 +#: include/template/tax_summary_display.php:128 +#: include/template/tax_summary_display.php:213 +#: include/template/tax_summary_display.php:303 +#: include/export/export_printtva_csv.php:44 +#: include/export/export_printtva_csv.php:64 +#: include/export/export_printtva_pdf.php:58 +#: include/export/export_printtva_pdf.php:213 +msgid "Montant Autoliquidation" +msgstr "Autoreverse" + +#: include/template/tax_summary_display.php:62 +#: include/template/tax_summary_display.php:122 +#: include/template/tax_summary_display.php:210 +#: include/template/tax_summary_display.php:294 +#: include/export/export_printtva_csv.php:42 +#: include/export/export_printtva_csv.php:61 +#: include/export/export_printtva_pdf.php:57 +#: include/export/export_printtva_pdf.php:212 +msgid "Montant HT" +msgstr "Amount without VAT" + #: include/class_acc_ledger_purchase.php:1385 #: include/class_acc_ledger_sold.php:679 #: include/class_acc_ledger_purchase.php:1392 @@ -12963,9 +13261,17 @@ msgstr "Initial amount" #: include/class/acc_ledger_purchase.class.php:1830 #: include/class/acc_ledger_purchase.class.php:1848 #: include/class/acc_ledger_purchase.class.php:1851 +#: include/export/export_printtva_csv.php:65 +#: include/class/acc_ledger_purchase.class.php:1857 msgid "Montant ND" msgstr "Amount ND" +#: include/template/tax_summary_display.php:214 +#: include/template/tax_summary_display.php:306 +#: include/export/export_printtva_pdf.php:213 +msgid "Montant Non Déd" +msgstr "Amount ND" + #: include/class_acc_ledger_purchase.php:1384 #: include/class_acc_ledger_sold.php:678 include/template/detail-action.php:309 #: include/ext/import_account/include/class_impacc_operation.php:149 @@ -13021,6 +13327,16 @@ msgstr "Amount ND" #: include/class/acc_ledger_sold.class.php:1418 #: include/class/acc_ledger_purchase.class.php:1448 #: include/class/acc_ledger_purchase.class.php:1847 +#: include/template/tax_summary_display.php:63 +#: include/template/tax_summary_display.php:125 +#: include/template/tax_summary_display.php:212 +#: include/template/tax_summary_display.php:300 +#: include/export/export_printtva_csv.php:43 +#: include/export/export_printtva_csv.php:63 +#: include/export/export_printtva_pdf.php:57 +#: include/export/export_printtva_pdf.php:212 +#: include/class/acc_ledger_sold.class.php:1427 +#: include/class/acc_ledger_purchase.class.php:1853 msgid "Montant TVA" msgstr "VAT Amount" @@ -13037,6 +13353,7 @@ msgstr "VAT Amount" #: include/class/acc_ledger_purchase.class.php:1831 #: include/class/acc_ledger_purchase.class.php:1849 #: include/class/acc_ledger_purchase.class.php:1852 +#: include/class/acc_ledger_purchase.class.php:1858 msgid "Montant TVA ND" msgstr "VAT Amount" @@ -13106,7 +13423,7 @@ msgstr "Amount less or equal to" #: include/database.item.php:176 include/database.item.php:180 #: include/database.item.php:179 include/database.item.php:138 #: include/database.item.php:139 include/database.item.php:140 -#: include/database.item.php:145 +#: include/database.item.php:145 include/database.item.php:150 msgid "Montant initial" msgstr "Initial amount" @@ -13122,6 +13439,7 @@ msgstr "Initial amount" #: 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:1121 msgid "Montant invalide" msgstr "Invalid amount" @@ -13428,6 +13746,7 @@ msgstr "Do not complete if there is no representative" #: include/modele.inc.php:337 include/modele.inc.php:351 #: include/modele.inc.php:393 include/modele.inc.php:376 #: include/modele.inc.php:377 include/modele.inc.php:382 +#: include/modele.inc.php:383 msgid "" "Nettoyage de la comptabilité analytique : effacement des plans et des " "postes, les opérations\n" @@ -13438,6 +13757,7 @@ msgstr "" #: include/modele.inc.php:331 include/modele.inc.php:345 #: include/modele.inc.php:388 include/modele.inc.php:371 #: include/modele.inc.php:372 include/modele.inc.php:377 +#: include/modele.inc.php:378 msgid "" "Nettoyage de toutes les fiches (ce qui effacera client,\n" "\topérations prédéfinies fournisseurs modèles de " @@ -13449,6 +13769,7 @@ msgstr "" #: include/modele.inc.php:328 include/modele.inc.php:342 #: include/modele.inc.php:384 include/modele.inc.php:367 #: include/modele.inc.php:368 include/modele.inc.php:373 +#: include/modele.inc.php:374 msgid "" "Nettoyage des Documents et courriers (ce qui n'effacera pas les modèles de " "documents)" @@ -13551,6 +13872,8 @@ msgstr "No action" #: 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:1781 +#: include/modele.inc.php:248 include/modele.inc.php:359 +#: include/database.item.php:157 msgid "Nom" msgstr "Name" @@ -13582,6 +13905,8 @@ msgstr "name" #: include/class/acc_ledger_purchase.class.php:1839 #: include/class/acc_ledger_sold.class.php:1413 #: include/class/acc_ledger_purchase.class.php:1842 +#: include/class/acc_ledger_sold.class.php:1422 +#: include/class/acc_ledger_purchase.class.php:1848 msgid "Nom TVA" msgstr "Label VAT" @@ -13597,6 +13922,7 @@ msgstr "Database name" #: include/dossier.inc.php:239 include/modele.inc.php:280 #: include/dossier.inc.php:242 include/dossier.inc.php:247 #: include/modele.inc.php:281 include/modele.inc.php:286 +#: include/modele.inc.php:287 msgid "Nom base de données" msgstr "Database" @@ -13609,6 +13935,7 @@ msgstr "Card name" #: include/database.item.php:151 include/database.item.php:155 #: include/database.item.php:154 include/database.item.php:147 #: include/database.item.php:148 include/database.item.php:156 +#: include/database.item.php:159 msgid "Nom de la banque" msgstr "Name of bank" @@ -13679,6 +14006,8 @@ msgstr "Report Name" #: include/class/acc_ledger_purchase.class.php:1835 #: include/class/acc_ledger_sold.class.php:1409 #: include/class/acc_ledger_purchase.class.php:1838 +#: include/class/acc_ledger_sold.class.php:1418 +#: include/class/acc_ledger_purchase.class.php:1844 msgid "Nom fiche" msgstr "From card" @@ -13706,6 +14035,8 @@ msgstr "From card" #: include/class/acc_ledger_purchase.class.php:1837 #: include/class/acc_ledger_sold.class.php:1411 #: include/class/acc_ledger_purchase.class.php:1840 +#: include/class/acc_ledger_sold.class.php:1420 +#: include/class/acc_ledger_purchase.class.php:1846 msgid "Nom fournisseur" msgstr "Dealer name" @@ -13789,6 +14120,7 @@ msgstr "Incorrect number of columns" #: 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:2344 msgid "Nombre de ligne incorrect" msgstr "Number of incorrect rows" @@ -13811,6 +14143,7 @@ msgid "Nombre de mois" msgstr "Number of month" #: include/class/periode.class.php:436 include/class/periode.class.php:438 +#: include/class/periode.class.php:440 msgid "Nombre de mois doit être compris entre 1 & 60 " msgstr "Number of months must be between 1 and 60" @@ -13819,6 +14152,7 @@ msgid "Nombre de mois invalide" msgstr "Number of month invalid" #: include/class/periode.class.php:434 include/class/periode.class.php:436 +#: include/class/periode.class.php:438 msgid "Nombre de mois n'est pas un nombre" msgstr "Number of month is not a number" @@ -13886,6 +14220,8 @@ msgstr "Not Deductible from Tax" #: include/class/acc_ledger_purchase.class.php:1775 #: include/class/acc_ledger_sold.class.php:1028 #: include/class/acc_ledger_purchase.class.php:1778 +#: include/class/acc_ledger_sold.class.php:1037 +#: include/class/acc_ledger_purchase.class.php:1784 msgid "Non Payée" msgstr "Not paid" @@ -13899,6 +14235,7 @@ msgid "Non actif" msgstr "Disabled" #: include/ajax/ajax_ledger.php:31 include/ajax/ajax_poste.php:35 +#: include/ajax/ajax_ledger.php:32 msgid "Non authorisé" msgstr "not authorized" @@ -13959,6 +14296,7 @@ msgstr "Not found" #: 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:289 msgid "Non utilisée" msgstr "not used" @@ -13987,10 +14325,15 @@ msgstr "Normal" msgid "Note" msgstr "Note" +#: include/database.item.php:236 +msgid "Note de crédit" +msgstr "Credit Note" + #: include/database.item.php:176 include/database.item.php:179 #: include/database.item.php:192 include/database.item.php:195 #: include/database.item.php:193 include/database.item.php:181 #: include/database.item.php:182 include/database.item.php:185 +#: include/database.item.php:198 msgid "Note de frais" msgstr "Note of free" @@ -14057,14 +14400,14 @@ msgstr "new attribute" #: include/database.item.php:55 include/database.item.php:58 #: include/database.item.php:65 include/database.item.php:63 #: include/database.item.php:62 include/database.item.php:60 -#: include/database.item.php:57 +#: include/database.item.php:57 include/database.item.php:56 msgid "Nouvel extrait" msgstr "new entry" #: include/database.item.php:55 include/database.item.php:58 #: include/database.item.php:65 include/database.item.php:63 #: include/database.item.php:62 include/database.item.php:60 -#: include/database.item.php:57 +#: include/database.item.php:57 include/database.item.php:56 msgid "Nouvel extrait bancaire" msgstr "New bank statement" @@ -14095,6 +14438,7 @@ msgstr "New plugin" #: html/ajax_card.php:182 html/ajax_card.php:200 html/ajax_card.php:201 #: include/ajax/ajax_card.php:181 include/ajax/ajax_card.php:182 #: include/ajax/ajax_card.php:185 include/ajax/ajax_card.php:191 +#: include/ajax/ajax_card.php:192 msgid "Nouvelle fiche" msgstr "New card" @@ -14125,6 +14469,7 @@ msgstr "New row" #: 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:2837 msgid "Nouvelle opération" msgstr "New operations" @@ -14132,6 +14477,7 @@ msgstr "New operations" #: include/database.item.php:64 include/database.item.php:61 #: include/database.item.php:60 include/database.item.php:59 #: include/database.item.php:62 include/database.item.php:56 +#: include/database.item.php:55 msgid "Nouvelle opérations diverses" msgstr "New misc. operations" @@ -14147,6 +14493,7 @@ 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:651 +#: include/class/periode.class.php:653 msgid "Novembre" msgstr "November" @@ -14188,6 +14535,8 @@ msgstr "Internal number" #: include/class/acc_ledger_purchase.class.php:1740 #: include/class/acc_ledger_sold.class.php:994 #: include/class/acc_ledger_purchase.class.php:1743 +#: include/class/acc_ledger_sold.class.php:1003 +#: include/class/acc_ledger_purchase.class.php:1749 msgid "Numero de bon de commande : " msgstr "Number of ordering" @@ -14195,6 +14544,7 @@ msgstr "Number of ordering" #: include/database.item.php:164 include/database.item.php:168 #: include/database.item.php:167 include/database.item.php:160 #: include/database.item.php:161 include/database.item.php:169 +#: include/database.item.php:172 msgid "Numero de client" msgstr " customer id" @@ -14344,10 +14694,13 @@ msgstr "Internal number" #: include/class/acc_ledger_purchase.class.php:1822 #: include/class/acc_ledger_sold.class.php:1396 #: include/class/acc_ledger_purchase.class.php:1825 +#: include/class/acc_ledger_sold.class.php:1405 +#: include/class/acc_ledger_purchase.class.php:1831 msgid "Numéro opération" msgstr "Operation #" #: include/template/param_jrn.php:33 include/template/param_jrn.php:40 +#: include/template/param_jrn.php:46 msgid "Numérotation de chaque opération" msgstr "Numbering Each of operation" @@ -14366,6 +14719,7 @@ msgstr "#" #: include/class/acc_ledger_history_generic.class.php:765 #: include/export/export_ledger_csv.php:212 #: include/export/export_ledger_csv.php:220 +#: include/class/acc_ledger_history_generic.class.php:768 msgid "N° Pièce" msgstr "Receipt #" @@ -14401,6 +14755,8 @@ msgstr "Document No." #: include/class/acc_ledger_purchase.class.php:1834 #: include/class/acc_ledger_sold.class.php:1408 #: include/class/acc_ledger_purchase.class.php:1837 +#: include/class/acc_ledger_sold.class.php:1417 +#: include/class/acc_ledger_purchase.class.php:1843 msgid "N° fiche" msgstr "# Card" @@ -14428,6 +14784,8 @@ msgstr "# Card" #: include/class/acc_ledger_purchase.class.php:1836 #: include/class/acc_ledger_sold.class.php:1410 #: include/class/acc_ledger_purchase.class.php:1839 +#: include/class/acc_ledger_sold.class.php:1419 +#: include/class/acc_ledger_purchase.class.php:1845 msgid "N° fiche fournisseur" msgstr "# dealer card" @@ -14451,6 +14809,7 @@ 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:117 +#: include/template/param_jrn.php:161 msgid "N° pièce justificative" msgstr "Receipt number" @@ -14486,6 +14845,7 @@ msgstr "OK" #: 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:1367 msgid "OPERATION ANNULEE " msgstr "Canceled" @@ -14523,16 +14883,19 @@ msgid "" msgstr "Mandatory for FIN ledger: give here the card of the bank" #: include/template/param_jrn.php:61 include/template/param_jrn.php:68 +#: include/template/param_jrn.php:74 msgid "" "Obligatoire pour les journaux FIN : donner ici la fiche du compte en banque " "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:651 +#: include/class/periode.class.php:653 msgid "Octobre" msgstr "October" #: include/class/periode.class.php:688 include/class/periode.class.php:690 +#: include/class/periode.class.php:692 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" @@ -14615,12 +14978,13 @@ msgstr "Operation" #: include/database.item.php:231 include/database.item.php:208 #: include/database.item.php:209 include/database.item.php:212 #: include/database.item.php:229 include/database.item.php:210 +#: include/database.item.php:232 msgid "Opération Diverses" msgstr "Miscellaneous operation" #: html/ajax_ledger.php:156 html/ajax_ledger.php:174 html/ajax_ledger.php:175 #: include/ajax/ajax_ledger.php:152 include/ajax/ajax_ledger.php:155 -#: include/ajax/ajax_ledger.php:159 +#: include/ajax/ajax_ledger.php:159 include/ajax/ajax_ledger.php:160 msgid "Opération Effacée" msgstr "Removed accounting" @@ -14662,6 +15026,7 @@ msgstr "Sale transaction" #: include/database.item.php:59 include/database.item.php:62 #: include/database.item.php:56 include/database.item.php:54 +#: include/database.item.php:55 msgid "" "Opération diverses tels que les amortissements, les augmentations de " "capital, les salaires, ..." @@ -14685,6 +15050,7 @@ msgstr "recorded entry" #: html/ajax_ledger.php:564 html/ajax_ledger.php:576 html/ajax_ledger.php:578 #: include/ajax/ajax_ledger.php:555 include/ajax/ajax_ledger.php:558 #: include/ajax/ajax_ledger.php:563 include/ajax/ajax_ledger.php:568 +#: include/ajax/ajax_ledger.php:569 msgid "Opération extournée" msgstr "Reversed accounting" @@ -14693,6 +15059,7 @@ msgstr "Reversed accounting" #: 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:2874 msgid "Opération identique" msgstr "Same operation" @@ -14709,7 +15076,8 @@ msgstr "Operation not removed" #: 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_ods.inc.php:123 +#: include/compta_ods.inc.php:123 include/compta_ven.inc.php:212 +#: include/compta_ach.inc.php:195 msgid "Opération non extournée" msgstr "Not Reversed accounting" @@ -14739,7 +15107,7 @@ msgstr "Entry restored" #: html/ajax_ledger.php:525 include/ajax/ajax_ledger.php:502 #: include/ajax/ajax_ledger.php:504 include/ajax/ajax_ledger.php:508 #: include/anc_od.inc.php:121 include/ajax/ajax_ledger.php:509 -#: include/ext/modop/modop_save.php:165 +#: include/ext/modop/modop_save.php:165 include/ajax/ajax_ledger.php:510 msgid "Opération sauvée" msgstr "Entry saved" @@ -14773,6 +15141,7 @@ msgstr "Operation & Lettering" #: include/database.item.php:225 include/cfgledger.inc.php:167 #: include/database.item.php:56 include/database.item.php:248 #: include/database.item.php:223 include/cfgledger.inc.php:172 +#: include/database.item.php:55 include/database.item.php:255 msgid "Opérations Diverses" msgstr "Misc. operations" @@ -14908,7 +15277,7 @@ 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 +#: include/class/periode.class.php:587 include/class/periode.class.php:589 msgid "Ouvert" msgstr "Open" @@ -14952,6 +15321,7 @@ msgstr "PDF2PS is not installed" #: include/class/acc_ledger.class.php:225 #: include/class/acc_ledger.class.php:228 #: include/class/acc_ledger.class.php:229 +#: include/class/acc_ledger.class.php:247 msgid "PERIODE FERMEE" msgstr "Close period" @@ -14962,6 +15332,7 @@ msgstr "Close period" #: include/class/acc_ledger.class.php:1030 #: include/class/acc_ledger.class.php:605 #: include/class/acc_ledger.class.php:606 +#: include/class/acc_ledger.class.php:622 msgid "PJ Num" msgstr "Receipt #" @@ -14998,6 +15369,8 @@ msgstr "PDF2PS is not installed" #: include/class/acc_ledger_purchase.class.php:1847 #: include/class/acc_ledger_sold.class.php:1421 #: include/class/acc_ledger_purchase.class.php:1850 +#: include/class/acc_ledger_sold.class.php:1430 +#: include/class/acc_ledger_purchase.class.php:1856 msgid "PU" msgstr "Pu" @@ -15028,6 +15401,7 @@ msgstr "Pu" #: 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 +#: include/class/acc_ledger.class.php:2452 msgid "Paiement" msgstr "Payment" @@ -15054,6 +15428,7 @@ msgid "Paiement fournisseur" msgstr "Supplier Payment" #: include/class/print_ledger_detail_item.class.php:145 +#: include/class/print_ledger_detail_item.class.php:146 #, php-format msgid "Paiement montant %s date %s methoded %s " msgstr "Payment amount %s date %s means %s" @@ -15140,6 +15515,7 @@ msgstr "Company parametes" #: include/class/acc_ledger.class.php:854 #: include/class/acc_ledger.class.php:427 #: include/class/acc_ledger.class.php:428 +#: include/class/acc_ledger.class.php:443 msgid "Parametres journaux non trouves" msgstr "Ledger parameters not found" @@ -15161,6 +15537,7 @@ msgstr "Parameterization" #: include/template/menu_detail.php:75 include/menu.inc.php:114 #: include/database.item.php:59 include/database.item.php:62 #: include/ext/syndicat_tools/index.php:37 include/database.item.php:65 +#: include/database.item.php:58 msgid "Paramètre" msgstr "Parameter" @@ -15210,6 +15587,7 @@ msgstr "Invalid parameter" #: 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/periode.class.php:237 +#: include/class/acc_ledger.class.php:91 include/class/periode.class.php:239 msgid "Paramètre invalide" msgstr "Invalid parameter" @@ -15245,7 +15623,7 @@ msgstr "share" #: include/database.item.php:218 include/database.item.php:195 #: include/database.item.php:196 include/database.item.php:199 -#: include/database.item.php:210 +#: include/database.item.php:210 include/database.item.php:215 msgid "Partager une note" msgstr "Share a note" @@ -15257,7 +15635,7 @@ msgstr "Part of the name or share of the accounting item" #: include/database.item.php:179 include/database.item.php:183 #: include/database.item.php:182 include/database.item.php:141 #: include/database.item.php:142 include/database.item.php:143 -#: include/database.item.php:148 +#: include/database.item.php:148 include/database.item.php:153 msgid "Partie fiscalement non déductible" msgstr "Non-tax deductible portion" @@ -15356,7 +15734,9 @@ msgstr "Not given file" #: include/class/acc_ledger_purchase.class.php:1072 #: 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/class/acc_ledger_fin.class.php:1052 include/compta_ven.inc.php:251 +#: include/class/acc_ledger_sold.class.php:1132 +#: include/class/acc_ledger.class.php:790 include/compta_ach.inc.php:236 msgid "Pas de journal disponible" msgstr "No available ledger" @@ -15467,6 +15847,7 @@ msgstr "Period N-1" #: 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.class.php:1084 msgid "Periode fermee" msgstr "Closed Period" @@ -15518,6 +15899,10 @@ msgstr "" msgid "Permet de changer le poste comptable de base des catégories de fiches" msgstr "Let modify the base accounting of category of card" +#: include/database.item.php:139 +msgid "Permet de configurer les devises" +msgstr "Set currency" + #: include/database.item.php:102 include/database.item.php:105 #: include/database.item.php:99 include/database.item.php:97 msgid "" @@ -15536,6 +15921,7 @@ msgstr "Wrong permission, %s or %s is not writable" #: include/database.item.php:153 include/database.item.php:157 #: include/database.item.php:156 include/database.item.php:149 #: include/database.item.php:150 include/database.item.php:158 +#: include/database.item.php:161 msgid "Personne de contact " msgstr "Contact person" @@ -15658,6 +16044,9 @@ msgstr "Receipt" #: 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 +#: include/class/acc_ledger_sold.class.php:1411 +#: include/class/acc_ledger.class.php:874 +#: include/class/acc_ledger_purchase.class.php:1837 msgid "Pièce" msgstr "Receipt" @@ -15723,20 +16112,21 @@ msgstr "Analytic Plan" #: include/database.item.php:49 include/database.item.php:52 #: include/database.item.php:61 include/database.item.php:58 #: include/database.item.php:57 include/database.item.php:55 -#: include/database.item.php:50 +#: include/database.item.php:50 include/database.item.php:51 msgid "Plan Compt. analytique" msgstr "Plan Compt. analytical" #: include/database.item.php:101 include/database.item.php:104 #: include/database.item.php:110 include/database.item.php:107 #: include/database.item.php:106 include/database.item.php:102 +#: include/database.item.php:103 msgid "Plan Comptable" msgstr "Accounting system" #: include/database.item.php:49 include/database.item.php:52 #: include/database.item.php:61 include/database.item.php:58 #: include/database.item.php:57 include/database.item.php:55 -#: include/database.item.php:50 +#: include/database.item.php:50 include/database.item.php:51 msgid "Plan analytique" msgstr "Analytically" @@ -15862,6 +16252,12 @@ msgstr "Possible %d" #: 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/class/print_ledger_detail_item.class.php:157 +#: include/class/acc_ledger_history_generic.class.php:771 +#: include/class/acc_ledger_sold.class.php:1414 +#: include/class/acc_ledger.class.php:627 +#: include/class/acc_ledger.class.php:902 +#: include/class/acc_ledger_purchase.class.php:1840 msgid "Poste" msgstr "Account. Item" @@ -15918,6 +16314,7 @@ msgstr "Accounting basis of item" #: 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:1147 msgid "Poste Inexistant [" msgstr "non-existent accounting" @@ -15930,6 +16327,7 @@ msgstr "non-existent accounting" #: 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:1130 msgid "Poste Inexistant pour la fiche [" msgstr "Inexisting accountancy" @@ -15976,7 +16374,7 @@ msgid "Poste comptable" msgstr "Accounting" #: include/verif_bilan.inc.php:186 include/verif_bilan.inc.php:223 -#: include/verif_bilan.inc.php:226 +#: include/verif_bilan.inc.php:226 include/verif_bilan.inc.php:228 msgid "Poste comptable " msgstr "Accounting" @@ -16071,7 +16469,7 @@ msgid "Poste comptable utilisé pour les dettes envers la TVA" msgstr "Accounting item used for VAT debts" #: include/verif_bilan.inc.php:149 include/verif_bilan.inc.php:186 -#: include/verif_bilan.inc.php:189 +#: include/verif_bilan.inc.php:189 include/verif_bilan.inc.php:191 msgid "Poste comptable utilisé sans la fiche correspondante" msgstr "Accounting item used without the corresponding card" @@ -16123,6 +16521,7 @@ msgstr "Unknown accounting" #: 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:1144 msgid "Poste invalide [" msgstr "Invalid accounting [" @@ -16141,6 +16540,7 @@ msgid "Poste à créditer incorrect" msgstr "Post crediting incorrect" #: include/template/param_jrn.php:15 include/template/param_jrn.php:22 +#: include/template/param_jrn.php:25 msgid "Postes utilisables journal (débit/crédit) " msgstr "Available accounting ledger (debit / credit)" @@ -16232,6 +16632,7 @@ msgstr "For the card" #: 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:1708 #, php-format msgid "Pour la fiche %s le poste comptable [%s] n'existe pas" msgstr "For the card %s the accounting %s doesn't exist" @@ -16320,6 +16721,13 @@ msgstr "Priority" msgid "Priv/DNA" msgstr "Private/DNA" +#: include/template/tax_summary_display.php:211 +#: include/template/tax_summary_display.php:297 +#: include/export/export_printtva_csv.php:62 +#: include/export/export_printtva_pdf.php:212 +msgid "Privée" +msgstr "Private" + #: include/template/impress_reconciliation_detail.php:10 msgid "Prix HTVA" msgstr "wo VAT" @@ -16338,7 +16746,7 @@ msgstr "Price / unit" #: include/database.item.php:169 include/database.item.php:173 #: include/database.item.php:172 include/database.item.php:136 #: include/database.item.php:137 include/database.item.php:147 -#: include/database.item.php:152 +#: include/database.item.php:152 include/database.item.php:182 msgid "Prix achat" msgstr "Purchase price" @@ -16346,7 +16754,7 @@ msgstr "Purchase price" #: include/database.item.php:168 include/database.item.php:172 #: include/database.item.php:171 include/database.item.php:135 #: include/database.item.php:136 include/database.item.php:146 -#: include/database.item.php:151 +#: include/database.item.php:151 include/database.item.php:181 msgid "Prix vente" msgstr "Sale Price" @@ -16364,6 +16772,10 @@ msgstr "Price / unit" msgid "Prix/Un." msgstr "Price / unit" +#: include/class/print_ledger_detail_item.class.php:159 +msgid "Prix/Unit" +msgstr "Price / unit" + #: include/restore.inc.php:127 include/restore.inc.php:186 #: include/restore.inc.php:187 include/restore.inc.php:188 #: include/restore.inc.php:128 include/restore.inc.php:189 @@ -16447,6 +16859,7 @@ msgstr "Progr." #: include/database.item.php:205 include/database.item.php:202 #: include/database.item.php:178 include/database.item.php:179 #: include/database.item.php:182 include/database.item.php:190 +#: include/database.item.php:195 msgid "Proposition" msgstr "Proposal" @@ -16463,12 +16876,12 @@ msgid "Préfixe" msgstr "Prefix" #: 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:137 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 +#: include/template/param_jrn.php:97 include/template/param_jrn.php:141 msgid "Préfixe pièce justificative" msgstr "Prefix for receipt" @@ -16503,7 +16916,7 @@ msgstr "User's preference, display, default period, email and password" #: include/database.item.php:162 include/class/class_balance_age.php:146 #: include/database.item.php:165 include/user.inc.php:81 #: include/user.inc.php:145 include/class/balance_age.class.php:146 -#: include/database.item.php:170 +#: include/database.item.php:170 include/database.item.php:173 msgid "Prénom" msgstr "First Name" @@ -16584,6 +16997,8 @@ msgstr "Then perform the install procedure to upgrade the database" #: include/class/acc_ledger_sold.class.php:1400 #: include/class/acc_ledger_purchase.class.php:1829 #: include/ajax/ajax_preference.php:150 +#: include/class/acc_ledger_sold.class.php:1409 +#: include/class/acc_ledger_purchase.class.php:1835 msgid "Période" msgstr "Period" @@ -16625,6 +17040,7 @@ msgstr "period between%s and %s" #: include/class/acc_ledger_sold.class.php:693 #: include/class/acc_ledger_purchase.class.php:1415 #: include/class/acc_ledger.class.php:604 +#: include/class/acc_ledger.class.php:620 msgid "Période Comptable" msgstr "Accounting Period" @@ -16633,6 +17049,7 @@ msgid "Période N-1" msgstr "Period N-1" #: include/class/periode.class.php:251 include/class/periode.class.php:253 +#: include/class/periode.class.php:255 msgid "Période chevauchant une autre" msgstr "Period overlaping another one" @@ -16667,6 +17084,8 @@ msgstr "Period overlaping another one" #: 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:1116 +#: include/class/acc_ledger.class.php:858 msgid "Période comptable" msgstr "Accounting period" @@ -16685,6 +17104,11 @@ msgstr "Invalid start period" msgid "Période de fin non valable" msgstr "Invalid end period" +#: include/tax_summary.inc.php:39 +#, php-format +msgid "Période du %s au %s" +msgstr "period between%s and %s" + #: include/ext/importbank/include/import_bank.class.php:409 msgid "Période fermée" msgstr "Closed Period" @@ -16705,6 +17129,10 @@ msgstr "QCODE" msgid "QCode" msgstr "Code" +#: include/class/print_ledger_detail_item.class.php:160 +msgid "Quant." +msgstr "Quantity" + #: include/template/ledger_detail_ach.php:128 #: include/template/ledger_detail_ven.php:125 #: include/template/operation_detail_ach.php:46 @@ -16760,6 +17188,7 @@ msgstr "Quantity" #: 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:1779 +#: include/database.item.php:167 msgid "Quick Code" msgstr "Quick Code" @@ -16770,6 +17199,7 @@ msgstr "Quick Code" #: include/class/acc_ledger.class.php:1034 #: include/class/acc_ledger.class.php:609 #: include/class/acc_ledger.class.php:610 +#: include/class/acc_ledger.class.php:626 msgid "Quick Code ou " msgstr "QuickCode gold" @@ -16793,6 +17223,8 @@ msgstr "QuickCode gold" #: include/class/acc_ledger_history_generic.class.php:769 #: include/export/export_ledger_csv.php:213 #: include/export/export_ledger_csv.php:221 +#: include/class/print_ledger_detail_item.class.php:156 +#: include/class/acc_ledger_history_generic.class.php:772 msgid "QuickCode" msgstr "QuickCode" @@ -16941,6 +17373,7 @@ msgstr "Bank Reconciliation" #: 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 +#: include/ajax/ajax_card.php:386 include/database.item.php:57 #, php-format msgid "Recherche" msgstr "Search" @@ -16966,6 +17399,7 @@ msgstr "Advanced search" #: 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/fiche.inc.php:93 +#: include/ajax/ajax_card.php:412 msgid "Recherche de fiche" msgstr "Search Card" @@ -17006,7 +17440,7 @@ msgstr "Search Card" #: include/ext/rapport_avance/include/formulaire_param_detail.class.php:361 #: include/ext/rapport_avance/include/formulaire_param_detail.class.php:368 #: include/ajax/ajax_card.php:506 include/class/acc_report.class.php:151 -#: include/ajax/ajax_card.php:510 +#: include/ajax/ajax_card.php:510 include/ajax/ajax_card.php:511 msgid "Recherche poste" msgstr "Search accounting" @@ -17073,6 +17507,7 @@ msgstr "Reference" #: include/database.item.php:56 include/database.item.php:59 #: include/database.item.php:53 include/database.item.php:51 +#: include/database.item.php:52 msgid "Regroupement de compte analytique" msgstr "Analytical group" @@ -17212,6 +17647,7 @@ msgstr "Late" #: 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/modele.inc.php:404 include/modele.inc.php:444 msgid "Retour" msgstr "Return" @@ -17280,6 +17716,7 @@ msgstr "Summary Accounting class" #: include/database.item.php:199 include/database.item.php:206 #: include/database.item.php:183 include/database.item.php:184 #: include/database.item.php:187 include/database.item.php:195 +#: include/database.item.php:200 msgid "Réception commande Client" msgstr "reception of customer order" @@ -17287,6 +17724,7 @@ msgstr "reception of customer order" #: include/database.item.php:200 include/database.item.php:205 #: include/database.item.php:182 include/database.item.php:183 #: include/database.item.php:186 include/database.item.php:194 +#: include/database.item.php:199 msgid "Réception commande Fournisseur" msgstr "Command reception Supplier" @@ -17294,6 +17732,7 @@ msgstr "Command reception Supplier" #: include/database.item.php:202 include/database.item.php:207 #: include/database.item.php:184 include/database.item.php:185 #: include/database.item.php:188 include/database.item.php:196 +#: include/database.item.php:201 msgid "Réception magazine" msgstr "Front magazine" @@ -17305,6 +17744,7 @@ msgstr "Reconciliation" #: 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:1002 #, php-format msgid "Réconciliation/rapprochements : %s" msgstr "Reconciliation %s" @@ -17367,7 +17807,7 @@ msgstr "One day for closing" #: include/ext/importbank/include/template/confirm_transfer.php:275 #: include/ext/importbank/include/template/confirm_transfer.php:285 #: include/verif_bilan.inc.php:152 include/verif_bilan.inc.php:214 -#: include/verif_bilan.inc.php:217 +#: include/verif_bilan.inc.php:217 include/verif_bilan.inc.php:219 msgid "Résultat" msgstr "Result" @@ -17421,6 +17861,26 @@ msgstr "Summary previous " msgid "Résumé Exercice précédent" msgstr "Summary current" +#: include/export/export_printtva_pdf.php:49 include/database.item.php:141 +msgid "Résumé TVA" +msgstr "Summary VAT" + +#: include/export/export_printtva_pdf.php:301 +msgid "Résumé TVA Achat" +msgstr "Summary VAT Purchase" + +#: include/export/export_printtva_pdf.php:160 +msgid "Résumé TVA vente" +msgstr "Summary VAT Sales" + +#: include/template/tax_summary_display.php:281 +msgid "Résumé tous les journaux d'achat" +msgstr "Balance VAT on purchase ledgers" + +#: include/template/tax_summary_display.php:109 +msgid "Résumé tous les journaux de vente" +msgstr "Balance VAT on sales ledgers" + #: include/database.item.php:201 include/database.item.php:202 #: include/database.item.php:199 msgid "Réunion" @@ -17493,7 +17953,8 @@ msgstr "new line" #: include/class/fiche_def.class.php:812 include/cfgledger.inc.php:134 #: include/template/dashboard.php:350 include/ajax/ajax_card.php:203 #: include/ajax/ajax_card.php:517 include/ajax/ajax_mod_predf_op.php:54 -#: include/cfgledger.inc.php:137 +#: include/cfgledger.inc.php:137 include/ajax/ajax_card.php:204 +#: include/ajax/ajax_card.php:518 msgid "Sauve" msgstr "Save" @@ -17589,6 +18050,8 @@ msgstr "Save template %s" #: 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/ledger_detail_bottom.php:315 include/ajax/ajax_card.php:165 +#: include/class/acc_ledger.class.php:2044 msgid "Sauver" msgstr "Save" @@ -17702,6 +18165,7 @@ msgid "Selectionnez votre langue" msgstr "Select your language" #: include/class/periode.class.php:648 include/class/periode.class.php:650 +#: include/class/periode.class.php:652 msgid "Septembre" msgstr "September" @@ -17719,12 +18183,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 +#: include/template/param_jrn.php:145 include/template/param_jrn.php:190 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 +#: include/template/param_jrn.php:206 include/template/param_jrn.php:251 msgid "Services, fournitures ou biens vendus (C)" msgstr "Services, or sold good(D)" @@ -17785,6 +18249,7 @@ msgstr "" #: include/modele.inc.php:284 include/modele.inc.php:298 #: include/modele.inc.php:337 include/modele.inc.php:320 #: include/modele.inc.php:321 include/modele.inc.php:265 +#: include/modele.inc.php:266 msgid "" "Si vous voulez récupérer toutes les adaptations d'un dossier " "dans un autre dossier, vous pouvez en faire un modèle. Seules les fiches, la " @@ -17807,7 +18272,7 @@ msgstr "Situation" #: include/database.item.php:164 include/database.item.php:167 #: include/database.item.php:171 include/database.item.php:170 #: include/database.item.php:169 include/database.item.php:173 -#: include/database.item.php:178 +#: include/database.item.php:178 include/database.item.php:183 msgid "Société" msgstr "Company" @@ -17933,6 +18398,7 @@ msgid "Sortie ⎆" msgstr "Logout ⎆" #: include/class/periode.class.php:521 include/class/periode.class.php:523 +#: include/class/periode.class.php:525 msgid "Status" msgstr "Status" @@ -18092,7 +18558,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:468 +#: html/ajax_misc.php:466 html/ajax_misc.php:468 html/ajax_misc.php:472 msgid "Symbole" msgstr "Symbol" @@ -18216,6 +18682,7 @@ msgstr "Totals" #: 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/class/print_ledger_detail_item.class.php:164 msgid "TVA" msgstr "VAT" @@ -18248,6 +18715,7 @@ msgstr "VAT ND" #: 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 +#: include/class/print_ledger_detail_item.class.php:162 msgid "TVA NP" msgstr "VAT ND" @@ -18262,9 +18730,24 @@ msgstr "VAT ND" #: include/class/acc_ledger_purchase.class.php:1835 #: include/class/acc_ledger_purchase.class.php:1853 #: include/class/acc_ledger_purchase.class.php:1856 +#: include/class/acc_ledger_purchase.class.php:1862 msgid "TVA NP opération" msgstr "VAT NP Operation" +#: include/template/tax_summary_display.php:215 +#: include/template/tax_summary_display.php:309 +#: include/export/export_printtva_csv.php:66 +#: include/export/export_printtva_pdf.php:213 +msgid "TVA Non Déd" +msgstr "VAT Not Deductible" + +#: include/template/tax_summary_display.php:216 +#: include/template/tax_summary_display.php:312 +#: include/export/export_printtva_csv.php:67 +#: include/export/export_printtva_pdf.php:213 +msgid "TVA Non Déd & récup" +msgstr "TVA Ded" + #: include/class_acc_ledger_purchase.php:1785 #: include/class_acc_ledger_sold.php:1354 #: include/class_acc_ledger_purchase.php:1772 @@ -18284,6 +18767,8 @@ msgstr "VAT NP Operation" #: include/class/acc_ledger_purchase.class.php:1842 #: include/class/acc_ledger_sold.class.php:1416 #: include/class/acc_ledger_purchase.class.php:1845 +#: include/class/acc_ledger_sold.class.php:1425 +#: include/class/acc_ledger_purchase.class.php:1851 msgid "TVA Non Payé" msgstr "VAT Not paid" @@ -18311,6 +18796,8 @@ msgstr "VAT Not paid" #: include/class/acc_ledger_purchase.class.php:1852 #: include/class/acc_ledger_sold.class.php:1423 #: include/class/acc_ledger_purchase.class.php:1855 +#: include/class/acc_ledger_sold.class.php:1432 +#: include/class/acc_ledger_purchase.class.php:1861 msgid "TVA Opération" msgstr "VAT Operation" @@ -18344,6 +18831,8 @@ msgstr "VAT Sale (C)" #: include/class/acc_ledger_sold.class.php:1415 #: include/class/acc_ledger_purchase.class.php:1844 #: include/class/acc_ledger_history_sale.class.php:251 +#: include/class/acc_ledger_sold.class.php:1424 +#: include/class/acc_ledger_purchase.class.php:1850 msgid "TVA annulée" msgstr "canceled VAT " @@ -18351,7 +18840,7 @@ msgstr "canceled VAT " #: include/database.item.php:177 include/database.item.php:181 #: include/database.item.php:180 include/database.item.php:139 #: include/database.item.php:140 include/database.item.php:141 -#: include/database.item.php:146 +#: include/database.item.php:146 include/database.item.php:151 msgid "TVA non déductible" msgstr "Non-deductible VAT" @@ -18359,7 +18848,7 @@ msgstr "Non-deductible VAT" #: include/database.item.php:178 include/database.item.php:182 #: include/database.item.php:181 include/database.item.php:140 #: include/database.item.php:141 include/database.item.php:142 -#: include/database.item.php:147 +#: include/database.item.php:147 include/database.item.php:152 msgid "TVA non déductible récupérable par l'impôt" msgstr "Non-deductible VAT recoverable by the Tax" @@ -18376,6 +18865,7 @@ msgstr "Non-deductible VAT recoverable by the Tax" #: include/class/acc_ledger_purchase.class.php:1832 #: include/class/acc_ledger_purchase.class.php:1850 #: include/class/acc_ledger_purchase.class.php:1853 +#: include/class/acc_ledger_purchase.class.php:1859 msgid "TVA récup." msgstr "TVA Ded" @@ -18405,6 +18895,7 @@ msgstr "TVA Ded" #: 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/class/print_ledger_detail_item.class.php:165 msgid "TVAC" msgstr "with VAT" @@ -18500,7 +18991,15 @@ 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:471 +#: include/template/tax_summary_display.php:61 +#: include/template/tax_summary_display.php:119 +#: include/template/tax_summary_display.php:209 +#: include/template/tax_summary_display.php:291 +#: include/export/export_printtva_csv.php:41 +#: include/export/export_printtva_csv.php:60 +#: include/export/export_printtva_pdf.php:57 +#: include/export/export_printtva_pdf.php:212 msgid "Taux" msgstr "Spleen" @@ -18514,7 +19013,7 @@ msgstr "Spleen" #: include/database.item.php:150 include/template/ledger_detail_ven.php:131 #: include/database.item.php:154 include/database.item.php:153 #: include/database.item.php:146 include/database.item.php:147 -#: include/database.item.php:155 +#: include/database.item.php:155 include/database.item.php:158 msgid "Taux TVA" msgstr "VAT rate" @@ -18591,6 +19090,7 @@ msgstr "Theme" #: include/class/acc_ledger_history_generic.class.php:683 #: include/class/fiche.class.php:1476 include/export/export_ledger_csv.php:214 #: include/export/export_ledger_csv.php:222 +#: include/class/acc_ledger_history_generic.class.php:686 msgid "Tiers" msgstr "Tiers" @@ -18777,6 +19277,8 @@ msgstr "Sum Debit" #: include/class/acc_ledger_purchase.class.php:1845 #: include/class/acc_ledger_sold.class.php:1419 #: include/class/acc_ledger_purchase.class.php:1848 +#: include/class/acc_ledger_sold.class.php:1428 +#: include/class/acc_ledger_purchase.class.php:1854 msgid "Total HTVA" msgstr "Total VAT excluded" @@ -18885,6 +19387,7 @@ msgstr "Total level" #: 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:688 msgid "Total opération" msgstr "Total entries" @@ -18973,6 +19476,8 @@ msgstr "Total to distribute" #: 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/class/acc_ledger_history_generic.class.php:741 +#: include/class/acc_ledger.class.php:740 msgid "Totaux" msgstr "Total" @@ -19345,6 +19850,7 @@ msgstr "A moment please" #: 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:2349 msgid "Un journal avec ce nom existe déjà" msgstr "This name is already used" @@ -19433,7 +19939,12 @@ msgstr "Only not balanced accounting" msgid "Uniquement les opérations non lettrées" msgstr "Only unlettered actions" +#: include/template/param_jrn.php:93 +msgid "Uniquement note de débit ou crédit" +msgstr "Only credit note" + #: include/template/param_jrn.php:21 include/template/param_jrn.php:28 +#: include/template/param_jrn.php:31 msgid "" "Uniquement pour les journaux d'Opérations Diverses, les valeurs sont " "séparées par des espaces, on peut aussi\n" @@ -19571,6 +20082,7 @@ msgid "Utilisation directe" msgstr "Direct use" #: include/class/acc_ledger.class.php:1150 +#: include/class/acc_ledger.class.php:1166 #, php-format msgid "Utilisation directe interdite du poste comptable %s" msgstr "Forbidden use of the accounting %s" @@ -19608,6 +20120,8 @@ msgid "Val. Comptable Net" msgstr "Accounting system" #: include/class/user.class.php:1379 include/class/user.class.php:1408 +#: include/class/acc_ledger.class.php:2365 +#: include/lib/input_switch.class.php:56 msgid "Valeur invalide" msgstr "Invalid value" @@ -19734,6 +20248,8 @@ msgstr "Friday" #: include/database.item.php:211 include/database.item.php:221 #: include/cfgledger.inc.php:173 include/class/acc_ledger_search.class.php:1084 #: include/class/acc_ledger_search.class.php:1097 +#: include/template/tax_summary_display.php:29 include/database.item.php:234 +#: include/database.item.php:253 msgid "Vente" msgstr "Sale" @@ -19807,7 +20323,7 @@ msgstr "Please reconnect from another tab or by clicking on the link" #: include/database.item.php:164 include/database.item.php:163 #: include/database.item.php:156 include/ajax/ajax_mod_stock_repo.php:55 #: include/database.item.php:157 include/export/export_stock_resume_list.php:38 -#: include/database.item.php:165 +#: include/database.item.php:165 include/database.item.php:168 msgid "Ville" msgstr "City" @@ -19851,7 +20367,7 @@ msgstr "" #: include/database.item.php:186 include/database.item.php:189 #: include/database.item.php:214 include/database.item.php:191 #: include/database.item.php:192 include/database.item.php:195 -#: include/database.item.php:206 +#: include/database.item.php:206 include/database.item.php:211 msgid "Voir les documents du suivi" msgstr "See documents monitoring" @@ -20099,6 +20615,10 @@ msgstr "You must give the period" msgid "Vous devez donner un fichier" msgstr "You must give a card" +#: include/compta_ven.inc.php:80 include/compta_ach.inc.php:72 +msgid "Vous devez encore confirmer" +msgstr "You must confirm" + #: html/admin/setup.php:419 html/install.php:483 html/install.php:482 #: html/install.php:480 html/install.php:486 html/install.php:478 #: html/install.php:484 html/install.php:446 html/install.php:421 @@ -20202,6 +20722,7 @@ msgstr "" #: include/database.item.php:63 include/database.item.php:66 #: include/database.item.php:60 include/database.item.php:58 +#: include/database.item.php:59 msgid "" "Vous permet d'ajouter de nouveaux type de documents (bordereau de livraison, " "devis..)" @@ -20263,6 +20784,7 @@ 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 +#: include/class/acc_ledger.class.php:1095 #, php-format msgid "" "Vous utilisez le mode strict la dernière operation est la date du %s\n" @@ -20517,6 +21039,7 @@ msgstr "Ledgers" #: 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:2523 msgid "choix du type de journal" msgstr "Select the type of ledger" @@ -20541,6 +21064,7 @@ msgstr "Click here to update " #: 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 +#: html/ajax_misc.php:470 msgid "code" msgstr "code" @@ -20548,6 +21072,7 @@ msgstr "code" #: include/database.item.php:163 include/database.item.php:167 #: include/database.item.php:166 include/database.item.php:159 #: include/database.item.php:160 include/database.item.php:168 +#: include/database.item.php:171 msgid "code postal" msgstr "postal code" @@ -20585,7 +21110,7 @@ msgstr "Credit" #: include/database.item.php:184 include/database.item.php:187 #: include/database.item.php:212 include/database.item.php:189 #: include/database.item.php:190 include/database.item.php:193 -#: include/database.item.php:204 +#: include/database.item.php:204 include/database.item.php:209 msgid "création, modification et effacement de catégorie de fiche" msgstr "creation, modification and deletion of category record" @@ -20623,6 +21148,7 @@ msgstr "delete_param : fail" #: include/template/ledger_detail_bottom.php:200 #: include/template/ledger_detail_bottom.php:217 +#: include/template/ledger_detail_bottom.php:214 msgid "delta" msgstr "Delta" @@ -20678,6 +21204,7 @@ msgstr "e-mail" #: include/database.item.php:158 include/database.item.php:162 #: include/database.item.php:161 include/database.item.php:154 #: include/database.item.php:155 include/database.item.php:163 +#: include/database.item.php:166 msgid "email " msgstr "e-mail" @@ -20722,6 +21249,8 @@ msgstr "Between 61 and 90 days" #: 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:352 +#: include/ajax/ajax_ledger.php:545 msgid "entrez une date" msgstr "Give a date" @@ -20754,7 +21283,7 @@ msgstr "Error opening file" #: include/ajax/ajax_history.php:138 include/ajax/ajax_history.php:139 #: include/ajax/ajax_history.php:58 include/ajax/ajax_history.php:141 #: include/ajax/ajax_history.php:61 include/ajax/ajax_history.php:146 -#: include/ajax/ajax_history.php:147 +#: include/ajax/ajax_history.php:147 include/ajax/ajax_history.php:148 msgid "" "erreur aucune période par défaut, allez dans préférence pour en choisir une" msgstr "Warning : no default period, choose one in your preference" @@ -20802,7 +21331,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 +#: include/class/periode.class.php:709 include/class/periode.class.php:711 msgid "fermer" msgstr "close" @@ -20849,6 +21378,8 @@ msgstr "Current file" #: 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:1495 +#: include/class/acc_ledger.class.php:1512 msgid "get_default_card p_ledger_side is invalide [" msgstr "get_default_card p_ledger_side is invalide [" @@ -20876,6 +21407,7 @@ msgstr "Stock-History" #: include/dossier.inc.php:218 include/modele.inc.php:245 #: include/dossier.inc.php:221 include/dossier.inc.php:226 #: include/modele.inc.php:246 include/class/tva_rate_mtable.class.php:47 +#: include/modele.inc.php:247 msgid "id" msgstr "id" @@ -20908,6 +21440,7 @@ msgstr "inexistent" #: include/class/acc_ledger_history_generic.class.php:682 #: include/export/export_ledger_csv.php:216 #: include/export/export_ledger_csv.php:224 +#: include/class/acc_ledger_history_generic.class.php:685 msgid "internal" msgstr "Internal" @@ -20949,6 +21482,7 @@ msgstr "invalid parameter" #: 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 +#: include/class/acc_ledger_history_generic.class.php:762 msgid "journal" msgstr "Ledger" @@ -21042,6 +21576,7 @@ msgstr "Lettering" #: include/database.item.php:107 include/database.item.php:104 #: include/database.item.php:103 include/database.item.php:105 #: include/database.item.php:108 include/database.item.php:100 +#: include/database.item.php:101 msgid "lettrage par poste comptable" msgstr "lettering accounting item" @@ -21106,6 +21641,7 @@ msgstr "max_execution_time should be more than 60 " #: include/export/export_ledger_csv.php:215 #: include/export/export_ledger_csv.php:217 #: include/export/export_ledger_csv.php:225 +#: include/template/ledger_detail_bottom.php:213 msgid "montant" msgstr "Amount" @@ -21178,6 +21714,7 @@ msgid "n'existe pas" msgstr "does not exist" #: include/class/periode.class.php:520 include/class/periode.class.php:522 +#: include/class/periode.class.php:524 msgid "nb opérations" msgstr "Number of entries" @@ -21216,6 +21753,7 @@ msgstr "current issue" #: include/database.item.php:154 include/database.item.php:158 #: include/database.item.php:157 include/database.item.php:150 #: include/database.item.php:151 include/database.item.php:159 +#: include/database.item.php:162 msgid "numéro de tva " msgstr "VAT number" @@ -21290,6 +21828,7 @@ msgstr "No operation" #: include/class/fiche.class.php:1472 #: include/class/acc_ledger_history_generic.class.php:681 #: include/class/fiche.class.php:1473 +#: include/class/acc_ledger_history_generic.class.php:684 msgid "n° pièce" msgstr "receipt #" @@ -21332,6 +21871,7 @@ msgstr "open_basedir must be empty or set properly" #: 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 +#: include/class/acc_ledger_history_generic.class.php:767 msgid "operation" msgstr "Operation" @@ -21397,6 +21937,7 @@ msgstr "or QuickCode" #: include/class/acc_ledger_purchase.class.php:1711 #: include/class/acc_ledger_purchase.class.php:1729 #: include/class/acc_ledger_purchase.class.php:1732 +#: include/class/acc_ledger_purchase.class.php:1738 msgid "ou générer un document" msgstr "or generate a paper" @@ -21408,6 +21949,7 @@ msgstr "or generate a paper" #: include/class/class_acc_ledger_sold.php:941 #: include/class/acc_ledger_sold.class.php:966 #: include/class/acc_ledger_sold.class.php:983 +#: include/class/acc_ledger_sold.class.php:992 msgid "ou générer une facture" msgstr "or generate an invoice" @@ -21438,6 +21980,7 @@ msgstr "No template" #: include/database.item.php:156 include/database.item.php:160 #: include/database.item.php:159 include/database.item.php:152 #: include/database.item.php:153 include/database.item.php:161 +#: include/database.item.php:164 msgid "pays " msgstr "country" @@ -21631,6 +22174,8 @@ msgstr "QCode" #: include/class/acc_ledger_sold.class.php:1420 #: include/class/acc_ledger_purchase.class.php:1443 #: include/class/acc_ledger_purchase.class.php:1849 +#: include/class/acc_ledger_sold.class.php:1429 +#: include/class/acc_ledger_purchase.class.php:1855 msgid "quantité" msgstr "quantity" @@ -21697,7 +22242,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 +#: include/class/periode.class.php:708 include/class/periode.class.php:710 msgid "sauver" msgstr "Save" @@ -21758,6 +22303,7 @@ msgstr "Total credit" #: 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:672 msgid "solde créditeur:" msgstr "Sum credit" @@ -21777,6 +22323,7 @@ msgstr "Total debit" #: 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:671 msgid "solde débiteur:" msgstr "Sum debit" @@ -21817,6 +22364,7 @@ msgstr "text" #: include/class/acc_ledger.class.php:199 #: include/class/acc_ledger.class.php:202 #: include/class/acc_ledger.class.php:203 +#: include/class/acc_ledger.class.php:221 msgid "this->jr_id is not set ou opération inconnue" msgstr "Unknown operation" @@ -21865,6 +22413,10 @@ msgstr "Total" msgid "totaux" msgstr "Total" +#: include/database.item.php:141 +msgid "totaux par TVA et par journal" +msgstr "Total VAT by ledger" + #: include/ext/amortis/include/class_pdf_card.php:133 msgid "toutes_les_fiches.pdf" msgstr "all_cards.pdf" @@ -21901,6 +22453,7 @@ msgstr "vat" #: 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:526 html/ajax_misc.php:531 msgid "tva inconnue" msgstr "VAT unknown" @@ -21945,6 +22498,7 @@ msgstr "unknown type of ledger" #: include/database.item.php:157 include/database.item.php:161 #: include/database.item.php:160 include/database.item.php:153 #: include/database.item.php:154 include/database.item.php:162 +#: include/database.item.php:165 msgid "téléphone " msgstr "phone" @@ -21962,6 +22516,7 @@ msgstr "utf8" #: 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:318 msgid "verifie CA" msgstr "Check Analytic" @@ -21972,6 +22527,7 @@ msgstr "Check Analytic" #: include/class/acc_ledger.class.php:1156 #: include/class/acc_ledger.class.php:727 #: include/class/acc_ledger.class.php:728 +#: include/class/acc_ledger.class.php:744 msgid "verifie Imputation Analytique" msgstr "Verify Analytic" @@ -21992,6 +22548,7 @@ msgstr "Do you confirm" #: include/template/ledger_detail_bottom.php:174 #: include/template/ledger_detail_bottom.php:178 #: include/template/ledger_detail_bottom.php:195 +#: include/template/ledger_detail_bottom.php:192 msgid "vous confirmez?" msgstr "Do you confirm" diff --git a/html/lang/messages.po b/html/lang/messages.po index 4a1178ce0..dfd0d16a1 100644 --- a/html/lang/messages.po +++ b/html/lang/messages.po @@ -3,13 +3,13 @@ # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. # -#: include/database.item.php:124 +#: include/database.item.php:126 #, fuzzy msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-15 11:12+0200\n" +"POT-Creation-Date: 2019-08-26 13:23+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -52,15 +52,15 @@ msgstr "" #: 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/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 +#: include/ajax/ajax_card.php:167 include/database.item.php:5 +#: include/database.item.php:98 include/fiche.inc.php:65 msgid "Historique" msgstr "" #: html/ajax_card.php:172 html/ajax_card.php:190 html/ajax_card.php:191 #: html/ajax_card.php:192 include/ajax/ajax_card.php:172 #: include/ajax/ajax_card.php:173 include/ajax/ajax_card.php:176 -#: include/ajax/ajax_card.php:182 include/ajax/ajax_card.php:182 +#: include/ajax/ajax_card.php:182 include/ajax/ajax_card.php:183 msgid "Aucune fiche demandée" msgstr "" @@ -87,9 +87,9 @@ msgstr "" #: include/ajax/ajax_card.php:567 include/ajax/ajax_card.php:213 #: include/ajax/ajax_card.php:368 include/ajax/ajax_card.php:563 #: include/ajax/ajax_card.php:571 include/ajax/ajax_card.php:601 -#: include/ajax/ajax_card.php:213 include/ajax/ajax_card.php:368 -#: include/ajax/ajax_card.php:526 include/ajax/ajax_card.php:563 -#: include/ajax/ajax_card.php:571 include/ajax/ajax_card.php:601 +#: include/ajax/ajax_card.php:214 include/ajax/ajax_card.php:369 +#: include/ajax/ajax_card.php:527 include/ajax/ajax_card.php:582 +#: include/ajax/ajax_card.php:594 include/ajax/ajax_card.php:624 msgid "Action interdite" msgstr "" @@ -100,8 +100,8 @@ msgstr "" #: include/ajax/ajax_card.php:376 include/ajax/ajax_card.php:255 #: include/ajax/ajax_card.php:377 include/ajax/ajax_card.php:261 #: include/ajax/ajax_card.php:410 include/ajax/ajax_card.php:264 -#: include/ajax/ajax_card.php:413 include/ajax/ajax_card.php:264 -#: include/ajax/ajax_card.php:413 +#: include/ajax/ajax_card.php:413 include/ajax/ajax_card.php:265 +#: include/ajax/ajax_card.php:414 msgid "" "Aucune catégorie de fiche ne correspond à votre demande, le journal pourrait " "n'avoir accès à aucune fiche" @@ -110,7 +110,7 @@ msgstr "" #: html/ajax_card.php:265 html/ajax_card.php:283 html/ajax_card.php:285 #: html/ajax_card.php:286 include/ajax/ajax_card.php:266 #: include/ajax/ajax_card.php:267 include/ajax/ajax_card.php:273 -#: include/ajax/ajax_card.php:275 include/ajax/ajax_card.php:275 +#: include/ajax/ajax_card.php:275 include/ajax/ajax_card.php:276 msgid "Aucune catégorie de fiche ne correspond à votre demande" msgstr "" @@ -120,7 +120,7 @@ msgstr "" #: include/ajax/ajax_card.php:345 include/ajax/ajax_card.php:346 #: include/ajax/ajax_card.php:347 include/ajax/ajax_add_concerned_card.php:50 #: include/ajax/ajax_card.php:380 include/ajax/ajax_add_concerned_card.php:54 -#: include/ajax/ajax_card.php:383 include/ajax/ajax_card.php:383 +#: include/ajax/ajax_card.php:383 include/ajax/ajax_card.php:384 #: include/ajax/ajax_add_concerned_card.php:54 msgid "Fiche contenant" msgstr "" @@ -200,13 +200,13 @@ msgstr "" #: include/template/stock_histo_search.php:68 #: include/template/action_button.php:39 include/anc_acc_balance.inc.php:15 #: include/anc_group_balance.inc.php:16 include/anc_acc_table.inc.php:15 -#: include/ajax/ajax_card.php:385 include/ajax/ajax_admin.php:144 +#: include/ajax/ajax_card.php:386 include/ajax/ajax_admin.php:144 #: include/ajax/ajax_add_concerned_card.php:56 #: include/ajax/ajax_search_operation.php:66 #: include/ajax/ajax_search_operation.php:74 include/ajax/ajax_poste.php:63 #: include/ajax/ajax_anc_search.php:49 include/ajax/ajax_anc_search.php:58 #: include/menu.inc.php:140 include/menu.inc.php:143 -#: include/database.item.php:56 include/database.item.php:95 +#: include/database.item.php:57 include/database.item.php:97 #: 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/lettering.card.inc.php:102 @@ -226,7 +226,7 @@ msgstr "" #: 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/fiche.inc.php:93 -#: include/ajax/ajax_card.php:411 include/fiche.inc.php:93 +#: include/ajax/ajax_card.php:412 include/fiche.inc.php:93 msgid "Recherche de fiche" msgstr "" @@ -234,7 +234,7 @@ msgstr "" #: html/ajax_card.php:457 html/ajax_card.php:458 html/ajax_card.php:459 #: include/ajax/ajax_card.php:439 include/ajax/ajax_card.php:440 #: include/ajax/ajax_card.php:441 include/ajax/ajax_card.php:474 -#: include/ajax/ajax_card.php:478 include/ajax/ajax_card.php:478 +#: include/ajax/ajax_card.php:478 include/ajax/ajax_card.php:479 msgid " de clients" msgstr "" @@ -242,7 +242,7 @@ msgstr "" #: html/ajax_card.php:461 html/ajax_card.php:462 html/ajax_card.php:463 #: include/ajax/ajax_card.php:443 include/ajax/ajax_card.php:444 #: include/ajax/ajax_card.php:445 include/ajax/ajax_card.php:478 -#: include/ajax/ajax_card.php:482 include/ajax/ajax_card.php:482 +#: include/ajax/ajax_card.php:482 include/ajax/ajax_card.php:483 msgid " de fournisseurs" msgstr "" @@ -250,7 +250,7 @@ msgstr "" #: html/ajax_card.php:465 html/ajax_card.php:466 html/ajax_card.php:467 #: include/ajax/ajax_card.php:447 include/ajax/ajax_card.php:448 #: include/ajax/ajax_card.php:449 include/ajax/ajax_card.php:482 -#: include/ajax/ajax_card.php:486 include/ajax/ajax_card.php:486 +#: include/ajax/ajax_card.php:486 include/ajax/ajax_card.php:487 msgid " d'administration" msgstr "" @@ -291,7 +291,7 @@ msgstr "" #: include/ext/rapport_avance/include/formulaire_param_detail.class.php:361 #: include/ext/rapport_avance/include/formulaire_param_detail.class.php:368 #: include/ajax/ajax_card.php:506 include/class/acc_report.class.php:151 -#: include/ajax/ajax_card.php:510 include/ajax/ajax_card.php:510 +#: include/ajax/ajax_card.php:510 include/ajax/ajax_card.php:511 #: include/class/acc_report.class.php:151 msgid "Recherche poste" msgstr "" @@ -339,7 +339,7 @@ msgstr "" #: include/template/dashboard.php:350 #: 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/ajax/ajax_card.php:204 include/ajax/ajax_card.php:518 #: include/report.inc.php:88 include/report.inc.php:103 #: include/company.inc.php:149 include/class/fiche_def.class.php:812 msgid "Sauve" @@ -350,7 +350,7 @@ msgstr "" #: html/ajax_card.php:530 html/ajax_card.php:529 include/ajax/ajax_card.php:509 #: include/ajax/ajax_card.php:510 include/ajax/ajax_card.php:511 #: include/ajax/ajax_card.php:544 include/ajax/ajax_card.php:548 -#: include/ajax/ajax_card.php:548 +#: include/ajax/ajax_card.php:563 msgid "Catégorie existe déjà" msgstr "" @@ -359,7 +359,7 @@ msgstr "" #: html/ajax_card.php:532 html/ajax_card.php:531 include/ajax/ajax_card.php:511 #: include/ajax/ajax_card.php:512 include/ajax/ajax_card.php:513 #: include/ajax/ajax_card.php:546 include/ajax/ajax_card.php:550 -#: include/ajax/ajax_card.php:550 +#: include/ajax/ajax_card.php:567 msgid "Catégorie sauvée" msgstr "" @@ -374,8 +374,8 @@ msgstr "" #: html/ajax_card.php:559 html/ajax_card.php:558 include/ajax/ajax_card.php:538 #: include/ajax/ajax_card.php:539 include/ajax/ajax_card.php:540 #: include/ajax/ajax_card.php:573 include/ajax/ajax_card.php:577 -#: include/ajax/ajax_card.php:607 include/ajax/ajax_card.php:577 -#: include/ajax/ajax_card.php:607 +#: include/ajax/ajax_card.php:607 include/ajax/ajax_card.php:600 +#: include/ajax/ajax_card.php:630 msgid "Fiche non valide" msgstr "" @@ -387,13 +387,13 @@ msgstr "" #: include/ajax/ajax_ledger.php:103 include/ajax/ajax_ledger.php:125 #: include/template/ledger_detail_bottom.php:37 include/ext/tva/ajax.php:101 #: include/ext/tva/ajax.php:200 include/template/ledger_detail_bottom.php:37 -#: include/ajax/ajax_ledger.php:103 include/ajax/ajax_ledger.php:125 +#: include/ajax/ajax_ledger.php:104 include/ajax/ajax_ledger.php:126 msgid "Information" msgstr "" #: html/ajax_ledger.php:156 html/ajax_ledger.php:174 html/ajax_ledger.php:175 #: include/ajax/ajax_ledger.php:152 include/ajax/ajax_ledger.php:155 -#: include/ajax/ajax_ledger.php:159 include/ajax/ajax_ledger.php:159 +#: include/ajax/ajax_ledger.php:159 include/ajax/ajax_ledger.php:160 msgid "Opération Effacée" msgstr "" @@ -401,7 +401,7 @@ msgstr "" #: html/ajax_ledger.php:223 html/ajax_ledger.php:225 #: include/ajax/ajax_ledger.php:202 include/ajax/ajax_ledger.php:205 #: include/ajax/ajax_ledger.php:207 include/ajax/ajax_ledger.php:211 -#: include/ajax/ajax_ledger.php:211 +#: include/ajax/ajax_ledger.php:212 msgid "Désolé il y a une erreur" msgstr "" @@ -409,7 +409,7 @@ msgstr "" #: html/ajax_ledger.php:277 html/ajax_ledger.php:279 #: include/ajax/ajax_ledger.php:256 include/ajax/ajax_ledger.php:259 #: include/ajax/ajax_ledger.php:261 include/ajax/ajax_ledger.php:265 -#: include/ajax/ajax_ledger.php:265 +#: include/ajax/ajax_ledger.php:266 msgid "Aucun fichier" msgstr "" @@ -444,10 +444,10 @@ msgstr "" #: 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 -#: include/class/acc_ledger_search.class.php:709 include/compta_ach.inc.php:176 +#: include/template/ledger_detail_bottom.php:39 include/compta_ven.inc.php:186 +#: include/ajax/ajax_ledger.php:323 include/ajax/ajax_ledger.php:352 +#: include/database.item.php:89 include/class/document.class.php:172 +#: include/class/acc_ledger_search.class.php:709 include/compta_ach.inc.php:174 #: include/operation_ods_confirm.inc.php:52 msgid "Document" msgstr "" @@ -461,7 +461,7 @@ msgstr "" #: html/ajax_ledger.php:525 include/ajax/ajax_ledger.php:502 #: include/ajax/ajax_ledger.php:504 include/ajax/ajax_ledger.php:508 #: include/anc_od.inc.php:121 include/ajax/ajax_ledger.php:509 -#: include/ext/modop/modop_save.php:165 include/ajax/ajax_ledger.php:509 +#: include/ext/modop/modop_save.php:165 include/ajax/ajax_ledger.php:510 #: include/anc_od.inc.php:121 include/stock_inv.inc.php:40 msgid "Opération sauvée" msgstr "" @@ -470,7 +470,7 @@ msgstr "" #: html/ajax_ledger.php:522 html/ajax_ledger.php:529 html/ajax_ledger.php:531 #: include/ajax/ajax_ledger.php:508 include/ajax/ajax_ledger.php:511 #: include/ajax/ajax_ledger.php:515 include/ajax/ajax_ledger.php:516 -#: include/ajax/ajax_ledger.php:516 +#: include/ajax/ajax_ledger.php:517 msgid "" "Changement impossible: on ne peut pas changer la date dans une période fermée" msgstr "" @@ -479,7 +479,7 @@ msgstr "" #: html/ajax_ledger.php:564 html/ajax_ledger.php:576 html/ajax_ledger.php:578 #: include/ajax/ajax_ledger.php:555 include/ajax/ajax_ledger.php:558 #: include/ajax/ajax_ledger.php:563 include/ajax/ajax_ledger.php:568 -#: include/ajax/ajax_ledger.php:568 +#: include/ajax/ajax_ledger.php:569 msgid "Opération extournée" msgstr "" @@ -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 -#: html/ajax_misc.php:466 include/class/pdf_operation.class.php:149 +#: html/ajax_misc.php:470 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,29 @@ 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:467 +#: html/ajax_misc.php:465 html/ajax_misc.php:467 html/ajax_misc.php:471 +#: include/template/tax_summary_display.php:61 +#: include/template/tax_summary_display.php:119 +#: include/template/tax_summary_display.php:209 +#: include/template/tax_summary_display.php:291 +#: include/export/export_printtva_csv.php:41 +#: include/export/export_printtva_csv.php:60 +#: include/export/export_printtva_pdf.php:57 +#: include/export/export_printtva_pdf.php:212 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:468 +#: html/ajax_misc.php:466 html/ajax_misc.php:468 html/ajax_misc.php:472 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:469 +#: html/ajax_misc.php:467 html/ajax_misc.php:469 html/ajax_misc.php:473 msgid "Explication" msgstr "" @@ -526,7 +534,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 +#: html/ajax_misc.php:526 html/ajax_misc.php:531 msgid "tva inconnue" msgstr "" @@ -567,8 +575,8 @@ msgstr "" #: 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 -#: include/modele.inc.php:72 include/modele.inc.php:403 -#: include/modele.inc.php:443 include/report.inc.php:129 +#: include/modele.inc.php:72 include/modele.inc.php:404 +#: include/modele.inc.php:444 include/report.inc.php:129 #: include/forecast.inc.php:351 include/opening.inc.php:177 #: include/restore.inc.php:51 msgid "Retour" @@ -589,7 +597,7 @@ msgstr "" #: include/category_card.inc.php:81 include/template/letter_prop.php:22 #: include/template/letter_prop.php:65 include/template/letter_all.php:20 #: include/export/export_gl_csv.php:96 include/category_card.inc.php:81 -#: include/ajax/ajax_display_letter.php:49 include/database.item.php:72 +#: include/ajax/ajax_display_letter.php:49 include/database.item.php:74 msgid "Lettrage" msgstr "" @@ -742,14 +750,14 @@ msgstr "" #: 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 +#: include/template/ledger_detail_bottom.php:315 #: include/template/document_mod_change.php:86 #: include/template/anc_key_input.php:205 include/template/stock_inv.php:107 #: include/template/profile_sec_repository.php:59 include/cfgledger.inc.php:157 #: include/default_menu.inc.php:45 include/ajax/ajax_mod_stock_repo.php:79 -#: include/ajax/ajax_create_menu.php:16 include/ajax/ajax_card.php:164 +#: include/ajax/ajax_create_menu.php:16 include/ajax/ajax_card.php:165 #: include/ajax/ajax_display_letter.php:219 include/ajax/ajax_mod_menu.php:18 -#: include/class/acc_ledger.class.php:2028 +#: include/class/acc_ledger.class.php:2044 #: include/class/fiche_def.class.php:775 include/forecast.inc.php:262 #: include/forecast.inc.php:277 include/forecast.inc.php:297 #: include/forecast.inc.php:321 include/forecast.inc.php:368 @@ -794,7 +802,7 @@ msgstr "" #: 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 -#: include/database.item.php:170 include/balance.inc.php:306 +#: include/database.item.php:178 include/balance.inc.php:306 #: include/class/acc_plan_mtable.class.php:45 include/class/fiche.class.php:469 #: include/class/pdfbalance_simple.class.php:55 include/card_attr.inc.php:82 msgid "Poste Comptable" @@ -873,7 +881,7 @@ msgstr "" #: 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 +#: include/ajax/ajax_preference.php:69 include/database.item.php:81 msgid "Préférence" msgstr "" @@ -933,7 +941,7 @@ msgstr "" #: 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/modele.inc.php:279 include/menu.inc.php:146 #: include/balance.inc.php:101 include/class/acc_ledger_search.class.php:562 #: include/forecast.inc.php:386 msgid "Filtre" @@ -1003,7 +1011,7 @@ msgstr "" #: include/action.common.inc.php:191 include/action.common.inc.php:325 #: include/compta_ach.inc.php:298 include/compta_ven.inc.php:340 #: include/action.common.inc.php:191 include/action.common.inc.php:325 -#: include/compta_ven.inc.php:340 include/compta_ach.inc.php:298 +#: include/compta_ven.inc.php:338 include/compta_ach.inc.php:296 msgid "Enregistrer" msgstr "" @@ -1181,7 +1189,7 @@ msgstr "" #: 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/fiche.inc.php:116 include/class/acc_ledger.class.php:2476 #: include/class/pre_op_ach.class.php:174 #: include/class/pre_op_ach.class.php:182 include/class/follow_up.class.php:297 #: include/class/pre_op_advanced.class.php:173 @@ -1290,8 +1298,8 @@ msgstr "" #: include/export/export_fiche_balance_csv.php:57 include/profile.inc.php:359 #: include/dossier.inc.php:227 include/ajax/ajax_mod_stock_repo.php:39 #: include/ajax/ajax_get_profile.php:55 include/ajax/ajax_admin.php:229 -#: include/upgrade-template.php:51 include/modele.inc.php:247 -#: include/modele.inc.php:358 include/database.item.php:149 +#: include/upgrade-template.php:51 include/modele.inc.php:248 +#: include/modele.inc.php:359 include/database.item.php:157 #: include/class/acc_ledger_search.class.php:1104 #: include/class/acc_ledger_fin.class.php:549 #: include/class/acc_ledger_fin.class.php:754 @@ -1380,9 +1388,9 @@ msgstr "" #: include/class/acc_ledger_sold.class.php:1400 #: include/class/acc_ledger_purchase.class.php:1829 #: 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 +#: include/ajax/ajax_preference.php:150 include/database.item.php:86 +#: include/class/acc_ledger_sold.class.php:1409 +#: include/class/acc_ledger_purchase.class.php:1835 msgid "Période" msgstr "" @@ -1574,7 +1582,7 @@ msgstr "" #: include/ajax/ajax_card.php:551 include/class/forecast.class.php:70 #: include/ajax/ajax_card.php:555 #: include/class/template_card_category.class.php:73 -#: include/cat_document.inc.php:63 include/ajax/ajax_card.php:555 +#: include/cat_document.inc.php:63 include/ajax/ajax_card.php:574 #: include/class/forecast.class.php:70 #: include/class/template_card_category.class.php:73 msgid "Le nom ne peut pas être vide" @@ -1662,8 +1670,8 @@ msgstr "" #: include/template/stock_inv.php:67 #: include/export/export_stock_histo_csv.php:43 #: 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/ajax/ajax_anc_detail_operation.php:54 include/database.item.php:80 +#: include/database.item.php:112 #: 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 @@ -1705,7 +1713,7 @@ msgstr "" #: include/database.item.php:57 include/category_card.inc.php:75 #: include/database.item.php:60 include/database.item.php:52 #: include/category_card.inc.php:77 include/template/detail-action.php:49 -#: include/category_card.inc.php:77 include/database.item.php:52 +#: include/category_card.inc.php:77 include/database.item.php:53 msgid "Contact" msgstr "" @@ -1743,7 +1751,7 @@ msgstr "" #: include/database.item.php:73 include/database.item.php:67 #: include/database.item.php:101 include/category_card.inc.php:79 #: include/fiche.inc.php:70 include/category_card.inc.php:79 -#: include/database.item.php:65 include/database.item.php:101 +#: include/database.item.php:67 include/database.item.php:102 #: include/fiche.inc.php:70 msgid "Balance" msgstr "" @@ -1966,7 +1974,7 @@ msgstr "" #: include/template/ledger_detail_misc.php:46 #: include/template/ledger_detail_misc.php:101 #: include/template/ledger_detail_bottom.php:90 -#: include/template/ledger_detail_bottom.php:359 +#: include/template/ledger_detail_bottom.php:356 #: include/template/new_mod_payment.php:19 #: include/template/ledger_detail_ven.php:80 #: include/template/forecast-detail.php:14 @@ -1981,19 +1989,20 @@ msgstr "" #: 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/print_ledger_detail_item.class.php:158 +#: include/class/acc_ledger_history_generic.class.php:773 #: include/class/acc_ledger_sold.class.php:703 -#: include/class/acc_ledger_sold.class.php:1401 -#: include/class/acc_ledger.class.php:605 -#: include/class/acc_ledger.class.php:612 -#: include/class/acc_ledger.class.php:865 -#: include/class/acc_ledger.class.php:887 +#: include/class/acc_ledger_sold.class.php:1410 +#: include/class/acc_ledger.class.php:621 +#: include/class/acc_ledger.class.php:628 +#: include/class/acc_ledger.class.php:881 +#: include/class/acc_ledger.class.php:903 #: include/class/acc_ledger_fin.class.php:754 #: include/class/acc_plan_mtable.class.php:47 #: include/class/anc_operation.class.php:298 #: include/class/pre_op_advanced.class.php:197 #: include/class/acc_ledger_purchase.class.php:1425 -#: include/class/acc_ledger_purchase.class.php:1830 +#: include/class/acc_ledger_purchase.class.php:1836 #: include/class/pdf_operation.class.php:150 #: include/class/pdf_operation.class.php:195 #: include/class/pdf_operation.class.php:248 @@ -2048,7 +2057,7 @@ msgstr "" #: 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.class.php:1055 #: include/class/acc_ledger_fin.class.php:70 #: include/class/acc_ledger_purchase.class.php:80 msgid "Double Encodage" @@ -2086,7 +2095,7 @@ msgstr "" #: 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 +#: include/class/acc_ledger.class.php:1050 #: include/class/acc_ledger_fin.class.php:74 #: include/class/acc_ledger_purchase.class.php:75 msgid "Accès interdit" @@ -2115,7 +2124,7 @@ msgstr "" #: 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.class.php:1076 #: include/class/acc_ledger_fin.class.php:110 #: include/class/acc_ledger_fin.class.php:194 #: include/class/acc_ledger_purchase.class.php:104 @@ -2139,7 +2148,7 @@ msgstr "" #: 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.class.php:1084 #: include/class/acc_ledger_fin.class.php:116 #: include/class/acc_ledger_fin.class.php:200 #: include/class/acc_ledger_purchase.class.php:109 @@ -2228,7 +2237,7 @@ msgstr "" #: include/template/ledger_detail_ven.php:160 #: include/template/ledger_detail_ach.php:158 #: include/class/acc_ledger_sold.class.php:738 -#: include/class/acc_ledger.class.php:622 +#: include/class/acc_ledger.class.php:638 #: include/class/acc_ledger_fin.class.php:561 #: include/class/acc_ledger_purchase.class.php:1462 msgid "Compt. Analytique" @@ -2271,14 +2280,14 @@ msgstr "" #: include/class/acc_ledger_purchase.class.php:1072 #: 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/class/acc_ledger_fin.class.php:1052 include/compta_ven.inc.php:251 #: 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 +#: include/class/acc_ledger_sold.class.php:1132 +#: include/class/acc_ledger.class.php:790 #: include/class/acc_ledger_fin.class.php:314 #: include/class/acc_ledger_fin.class.php:1052 #: include/class/acc_ledger_purchase.class.php:1072 -#: include/compta_ach.inc.php:238 +#: include/compta_ach.inc.php:236 msgid "Pas de journal disponible" msgstr "" @@ -2382,8 +2391,8 @@ msgstr "" #: 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 +#: include/class/acc_ledger.class.php:225 +#: include/class/acc_ledger.class.php:1060 #: include/class/follow_up.class.php:1698 #: include/class/follow_up.class.php:1700 #: include/class/acc_ledger_purchase.class.php:89 @@ -2404,8 +2413,8 @@ msgstr "" #: include/class/acc_ledger.class.php:216 #: include/class/acc_ledger.class.php:220 #: include/class/acc_ledger.class.php:221 -#: include/class/acc_ledger.class.php:217 -#: include/class/acc_ledger.class.php:221 +#: include/class/acc_ledger.class.php:235 +#: include/class/acc_ledger.class.php:239 msgid "Cette opération n'existe pas" msgstr "" @@ -2416,7 +2425,7 @@ msgstr "" #: include/class/acc_ledger.class.php:225 #: include/class/acc_ledger.class.php:228 #: include/class/acc_ledger.class.php:229 -#: include/class/acc_ledger.class.php:229 +#: include/class/acc_ledger.class.php:247 msgid "PERIODE FERMEE" msgstr "" @@ -2442,6 +2451,7 @@ msgstr "" #: include/class/acc_ledger_search.class.php:943 #: include/class/acc_ledger_search.class.php:677 #: include/class/acc_ledger_search.class.php:943 +#: include/class/follow_up.class.php:775 msgid "Aucun enregistrement trouvé" msgstr "" @@ -2507,7 +2517,7 @@ msgstr "" #: include/class/acc_ledger.class.php:854 #: include/class/acc_ledger.class.php:427 #: include/class/acc_ledger.class.php:428 -#: include/class/acc_ledger.class.php:428 +#: include/class/acc_ledger.class.php:443 msgid "Parametres journaux non trouves" msgstr "" @@ -2724,6 +2734,8 @@ msgstr "" #: 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 #: include/audit_log.php:37 include/template/letter_prop.php:25 #: include/template/letter_prop.php:68 #: include/template/print_ledger_simple.php:7 @@ -2754,6 +2766,7 @@ msgstr "" #: include/export/export_poste_detail_csv.php:198 #: include/export/export_poste_detail_pdf.php:92 #: include/export/export_ledger_csv.php:219 +#: include/export/export_printtva_pdf.php:45 #: 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 @@ -2761,12 +2774,12 @@ msgstr "" #: 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 +#: include/class/acc_ledger_history_generic.class.php:683 +#: include/class/acc_ledger_history_generic.class.php:770 #: include/class/acc_ledger_sold.class.php:687 -#: 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_sold.class.php:1406 +#: include/class/acc_ledger.class.php:617 +#: include/class/acc_ledger.class.php:830 #: 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 @@ -2783,11 +2796,12 @@ msgstr "" #: include/class/acc_account_ledger.class.php:392 #: 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/acc_ledger_purchase.class.php:1832 #: include/class/pdf_operation.class.php:67 #: include/class/anc_grandlivre.class.php:213 #: include/class/balance_age.class.php:147 include/lib/ac_common.php:1210 #: include/card_attr.inc.php:80 +#, php-format msgid "Date" msgstr "" @@ -2814,7 +2828,7 @@ msgstr "" #: include/class/acc_ledger_purchase.class.php:1415 #: include/class/acc_ledger.class.php:604 #: include/class/acc_ledger_sold.class.php:693 -#: include/class/acc_ledger.class.php:604 +#: include/class/acc_ledger.class.php:620 #: include/class/acc_ledger_purchase.class.php:1415 msgid "Période Comptable" msgstr "" @@ -2826,7 +2840,7 @@ msgstr "" #: include/class/acc_ledger.class.php:1030 #: include/class/acc_ledger.class.php:605 #: include/class/acc_ledger.class.php:606 -#: include/class/acc_ledger.class.php:606 +#: include/class/acc_ledger.class.php:622 msgid "PJ Num" msgstr "" @@ -2837,7 +2851,7 @@ msgstr "" #: include/class/acc_ledger.class.php:1034 #: include/class/acc_ledger.class.php:609 #: include/class/acc_ledger.class.php:610 -#: include/class/acc_ledger.class.php:610 +#: include/class/acc_ledger.class.php:626 msgid "Quick Code ou " msgstr "" @@ -2927,15 +2941,16 @@ msgstr "" #: include/export/export_poste_detail_csv.php:79 #: include/export/export_poste_detail_csv.php:194 #: 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:768 -#: include/class/acc_ledger_sold.class.php:1405 -#: include/class/acc_ledger.class.php:611 -#: include/class/acc_ledger.class.php:886 +#: include/ajax/ajax_display_letter.php:50 include/database.item.php:64 +#: include/database.item.php:79 +#: include/class/print_ledger_detail_item.class.php:157 +#: include/class/acc_ledger_history_generic.class.php:771 +#: include/class/acc_ledger_sold.class.php:1414 +#: include/class/acc_ledger.class.php:627 +#: include/class/acc_ledger.class.php:902 #: 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/acc_ledger_purchase.class.php:1840 #: include/class/anc_grandlivre.class.php:214 #: include/class/anc_table.class.php:441 msgid "Poste" @@ -3042,9 +3057,9 @@ msgstr "" #: 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/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/acc_ledger_history_generic.class.php:774 +#: include/class/acc_ledger.class.php:629 +#: include/class/acc_ledger.class.php:905 #: include/class/anc_group_operation.class.php:137 #: include/class/acc_account_ledger.class.php:399 #: include/class/fiche.class.php:1479 @@ -3135,8 +3150,8 @@ msgstr "" #: 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/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_ledger_history_generic.class.php:775 +#: include/class/acc_ledger.class.php:630 #: include/class/acc_account_ledger.class.php:400 #: include/class/fiche.class.php:1480 #: include/class/anc_grandlivre.class.php:221 @@ -3209,9 +3224,9 @@ msgstr "" #: 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 +#: include/class/acc_ledger_history_generic.class.php:741 #: include/class/acc_ledger_sold.class.php:844 -#: include/class/acc_ledger.class.php:724 +#: include/class/acc_ledger.class.php:740 #: include/class/acc_account_ledger.class.php:439 #: include/class/fiche.class.php:1564 #: include/class/acc_ledger_purchase.class.php:1588 @@ -3226,7 +3241,7 @@ msgstr "" #: include/class/acc_ledger.class.php:1156 #: include/class/acc_ledger.class.php:727 #: include/class/acc_ledger.class.php:728 -#: include/class/acc_ledger.class.php:728 +#: include/class/acc_ledger.class.php:744 msgid "verifie Imputation Analytique" msgstr "" @@ -3263,8 +3278,8 @@ msgstr "" #: 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_sold.class.php:1112 +#: include/class/acc_ledger.class.php:853 #: include/class/acc_ledger_fin.class.php:294 #: include/class/acc_ledger_purchase.class.php:1046 msgid "Aucune période ouverte" @@ -3301,8 +3316,8 @@ msgstr "" #: 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_sold.class.php:1116 +#: include/class/acc_ledger.class.php:858 #: include/class/acc_ledger_purchase.class.php:1052 msgid "Période comptable" msgstr "" @@ -3401,6 +3416,7 @@ msgstr "" #: 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 #: include/template/balance_aged_result.php:47 #: include/template/print_ledger_simple.php:6 #: include/template/acc_ledger_history_financial_oneline.php:33 @@ -3416,13 +3432,13 @@ msgstr "" #: 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_sold.class.php:1411 +#: include/class/acc_ledger.class.php:874 #: 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 -#: include/class/acc_ledger_purchase.class.php:1831 +#: include/class/acc_ledger_purchase.class.php:1837 #: include/class/pdf_operation.class.php:79 #: include/class/anc_grandlivre.class.php:218 include/lib/ac_common.php:1212 msgid "Pièce" @@ -3550,7 +3566,7 @@ msgstr "" #: include/export/export_form_csv.php:72 #: 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.class.php:904 #: include/class/acc_ledger_search.class.php:652 #: include/class/acc_ledger_search.class.php:962 #: include/class/anc_group_operation.class.php:136 @@ -3606,8 +3622,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 +#: include/class/acc_ledger.class.php:1125 +#: include/class/acc_ledger.class.php:1268 #, php-format msgid "La fiche %s n'a pas de poste comptable" msgstr "" @@ -3621,7 +3637,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 +#: include/class/acc_ledger.class.php:1130 msgid "Poste Inexistant pour la fiche [" msgstr "" @@ -3656,7 +3672,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 +#: include/class/acc_ledger.class.php:1144 msgid "Poste invalide [" msgstr "" @@ -3669,7 +3685,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 +#: include/class/acc_ledger.class.php:1147 msgid "Poste Inexistant [" msgstr "" @@ -3682,7 +3698,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 +#: include/class/acc_ledger.class.php:1174 msgid "Balance incorrecte " msgstr "" @@ -3720,7 +3736,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 +#: include/class/acc_ledger.class.php:2230 msgid "Journal n'existe pas" msgstr "" @@ -3743,6 +3759,7 @@ msgstr "" #: 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/print_ledger_simple.class.php:274 #: include/class/acc_ledger_purchase.class.php:1701 msgid "Payé par" msgstr "" @@ -4139,9 +4156,10 @@ msgstr "" #: 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 #: 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/template/ledger_detail_ach.php:51 include/database.item.php:13 #: include/balance_age.inc.php:36 #: include/class/print_ledger_simple.class.php:105 #: include/class/acc_ledger_history_purchase.class.php:257 @@ -4192,7 +4210,7 @@ msgstr "" #: include/class/acc_ledger_purchase.class.php:1324 #: include/class/acc_ledger_sold.class.php:1358 #: include/class/acc_ledger_purchase.class.php:1327 -#: include/compta_fin.inc.php:148 include/class/acc_ledger_sold.class.php:1358 +#: include/compta_fin.inc.php:148 include/class/acc_ledger_sold.class.php:1367 #: include/class/pre_op_ach.class.php:406 #: include/class/acc_ledger_purchase.class.php:1327 #: include/class/pre_op_ven.class.php:410 @@ -4388,6 +4406,8 @@ msgstr "" #: 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_printtva_csv.php:39 +#: include/export/export_printtva_csv.php:58 #: include/export/export_histo_csv.php:37 #: include/export/export_ledger_pdf.php:83 include/compta_fin_saldo.inc.php:49 #: include/verif_bilan.inc.php:74 include/class/acc_ledger_sold.class.php:700 @@ -4568,9 +4588,9 @@ msgstr "" #: include/template/predf_ledger_detail.php:27 #: include/template/detail-action.php:320 #: include/class/acc_ledger_sold.class.php:721 -#: include/class/acc_ledger_sold.class.php:1420 +#: include/class/acc_ledger_sold.class.php:1429 #: include/class/acc_ledger_purchase.class.php:1443 -#: include/class/acc_ledger_purchase.class.php:1849 +#: include/class/acc_ledger_purchase.class.php:1855 msgid "quantité" msgstr "" @@ -4659,10 +4679,18 @@ msgstr "" #: include/class/acc_ledger_purchase.class.php:1448 #: include/class/acc_ledger_purchase.class.php:1847 #: include/template/detail-action.php:322 +#: include/template/tax_summary_display.php:63 +#: include/template/tax_summary_display.php:125 +#: include/template/tax_summary_display.php:212 +#: include/template/tax_summary_display.php:300 +#: include/export/export_printtva_csv.php:43 +#: include/export/export_printtva_csv.php:63 +#: include/export/export_printtva_pdf.php:57 +#: include/export/export_printtva_pdf.php:212 #: include/class/acc_ledger_sold.class.php:726 -#: include/class/acc_ledger_sold.class.php:1418 +#: include/class/acc_ledger_sold.class.php:1427 #: include/class/acc_ledger_purchase.class.php:1448 -#: include/class/acc_ledger_purchase.class.php:1847 +#: include/class/acc_ledger_purchase.class.php:1853 #: include/class/pdf_operation.class.php:153 #: include/class/pdf_operation.class.php:198 msgid "Montant TVA" @@ -4855,7 +4883,7 @@ msgstr "" #: include/class/acc_ledger_purchase.class.php:1699 #: include/class/acc_ledger_sold.class.php:944 #: include/class/acc_ledger_purchase.class.php:1702 -#: include/class/acc_ledger_sold.class.php:944 +#: include/class/acc_ledger_sold.class.php:946 #: include/class/acc_ledger_purchase.class.php:1702 msgid "Déduction acompte " msgstr "" @@ -4882,7 +4910,7 @@ msgstr "" #: include/class/acc_ledger_purchase.class.php:1700 #: include/class/acc_ledger_sold.class.php:945 #: include/class/acc_ledger_purchase.class.php:1703 -#: include/class/acc_ledger_sold.class.php:945 +#: include/class/acc_ledger_sold.class.php:947 #: include/class/acc_ledger_purchase.class.php:1703 msgid "Libellé :" msgstr "" @@ -4911,8 +4939,8 @@ msgstr "" #: include/class/acc_ledger_purchase.class.php:1723 #: include/class/acc_ledger_sold.class.php:977 #: include/class/acc_ledger_purchase.class.php:1726 -#: include/class/acc_ledger_sold.class.php:977 -#: include/class/acc_ledger_purchase.class.php:1726 +#: include/class/acc_ledger_sold.class.php:986 +#: include/class/acc_ledger_purchase.class.php:1732 #: include/operation_ods_confirm.inc.php:76 msgid "Ajoutez une pièce justificative " msgstr "" @@ -4930,7 +4958,7 @@ msgstr "" #: include/class/acc_ledger_purchase.class.php:1711 #: include/class/acc_ledger_purchase.class.php:1729 #: include/class/acc_ledger_purchase.class.php:1732 -#: include/class/acc_ledger_purchase.class.php:1732 +#: include/class/acc_ledger_purchase.class.php:1738 msgid "ou générer un document" msgstr "" @@ -4956,8 +4984,8 @@ msgstr "" #: include/class/acc_ledger_purchase.class.php:1740 #: include/class/acc_ledger_sold.class.php:994 #: include/class/acc_ledger_purchase.class.php:1743 -#: include/class/acc_ledger_sold.class.php:994 -#: include/class/acc_ledger_purchase.class.php:1743 +#: include/class/acc_ledger_sold.class.php:1003 +#: include/class/acc_ledger_purchase.class.php:1749 msgid "Numero de bon de commande : " msgstr "" @@ -4983,8 +5011,8 @@ msgstr "" #: include/class/acc_ledger_purchase.class.php:1741 #: include/class/acc_ledger_sold.class.php:995 #: include/class/acc_ledger_purchase.class.php:1744 -#: include/class/acc_ledger_sold.class.php:995 -#: include/class/acc_ledger_purchase.class.php:1744 +#: include/class/acc_ledger_sold.class.php:1004 +#: include/class/acc_ledger_purchase.class.php:1750 msgid "Autre information : " msgstr "" @@ -5010,8 +5038,8 @@ msgstr "" #: include/class/acc_ledger_purchase.class.php:1773 #: include/class/acc_ledger_sold.class.php:1026 #: include/class/acc_ledger_purchase.class.php:1776 -#: include/class/acc_ledger_sold.class.php:1026 -#: include/class/acc_ledger_purchase.class.php:1776 +#: include/class/acc_ledger_sold.class.php:1035 +#: include/class/acc_ledger_purchase.class.php:1782 msgid "Echeance dépassée" msgstr "" @@ -5037,8 +5065,8 @@ msgstr "" #: include/class/acc_ledger_purchase.class.php:1775 #: include/class/acc_ledger_sold.class.php:1028 #: include/class/acc_ledger_purchase.class.php:1778 -#: include/class/acc_ledger_sold.class.php:1028 -#: include/class/acc_ledger_purchase.class.php:1778 +#: include/class/acc_ledger_sold.class.php:1037 +#: include/class/acc_ledger_purchase.class.php:1784 msgid "Non Payée" msgstr "" @@ -5067,8 +5095,8 @@ msgstr "" #: 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:156 -#: include/class/acc_ledger_sold.class.php:1037 -#: include/class/acc_ledger_purchase.class.php:1787 +#: include/class/acc_ledger_sold.class.php:1046 +#: include/class/acc_ledger_purchase.class.php:1793 #: include/history_operation.inc.php:156 msgid "Mise à jour paiement" msgstr "" @@ -5169,11 +5197,11 @@ msgstr "" #: include/template/acc_ledger_history_sale_oneline.php:44 #: 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/database.item.php:17 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 +#: include/class/acc_ledger_sold.class.php:1083 +#: include/class/acc_ledger_sold.class.php:1339 #: include/class/pdf_operation.class.php:103 #: include/class/pre_op_ven.class.php:397 msgid "Client" @@ -5202,7 +5230,7 @@ msgstr "" #: include/class/acc_ledger_sold.class.php:714 #: include/class/acc_ledger_sold.class.php:1206 #: include/class/acc_ledger_sold.class.php:714 -#: include/class/acc_ledger_sold.class.php:1206 +#: include/class/acc_ledger_sold.class.php:1215 #: include/class/pre_op_ven.class.php:266 msgid "Détail articles vendus" msgstr "" @@ -5227,7 +5255,7 @@ msgstr "" #: include/class/class_acc_ledger_sold.php:941 #: include/class/acc_ledger_sold.class.php:966 #: include/class/acc_ledger_sold.class.php:983 -#: include/class/acc_ledger_sold.class.php:983 +#: include/class/acc_ledger_sold.class.php:992 msgid "ou générer une facture" msgstr "" @@ -5243,7 +5271,7 @@ msgstr "" #: include/class/acc_ledger_sold.class.php:1064 #: include/class/pdf_operation.class.php:70 #: include/class/acc_ledger_sold.class.php:1081 -#: include/class/acc_ledger_sold.class.php:1081 +#: include/class/acc_ledger_sold.class.php:1090 #: include/class/pdf_operation.class.php:70 msgid "Echéance" msgstr "" @@ -5463,7 +5491,7 @@ msgstr "" #: 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/param_jrn.php:129 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 @@ -5491,8 +5519,8 @@ msgstr "" #: include/compta_fin_saldo.inc.php:50 include/ajax/ajax_admin.php:234 #: include/ajax/ajax_boxcard_search.php:59 #: 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/modele.inc.php:249 include/modele.inc.php:363 +#: include/menu.inc.php:110 include/database.item.php:160 #: include/class/print_ledger_simple.class.php:108 #: include/class/tva_rate_mtable.class.php:50 #: include/class/acc_ledger_search.class.php:654 @@ -5525,8 +5553,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/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:9 +#: include/database.item.php:52 include/class/anc_account_table.class.php:50 msgid "Groupe" msgstr "" @@ -5751,7 +5779,7 @@ msgstr "" #: include/template/acc_ledger_history_financial_oneline.php:31 #: include/template/acc_ledger_history_financial_oneline.php:32 #: include/template/acc_ledger_history_financial_oneline.php:32 -#: include/template/form_ledger_fin.php:25 include/database.item.php:69 +#: include/template/form_ledger_fin.php:25 include/database.item.php:71 #: include/class/anticipation.class.php:293 msgid "Banque" msgstr "" @@ -5981,15 +6009,15 @@ msgstr "" #: 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/ledger_detail_bottom.php:325 #: 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 #: include/ajax/ajax_admin.php:268 include/ajax/ajax_admin.php:293 -#: include/ajax/ajax_view_mod_stock.php:55 include/modele.inc.php:316 +#: include/ajax/ajax_view_mod_stock.php:55 include/modele.inc.php:317 #: include/class/document_type.class.php:82 #: include/class/anc_operation.class.php:317 -#: include/class/periode.class.php:596 include/class/periode.class.php:601 +#: include/class/periode.class.php:598 include/class/periode.class.php:603 #: include/class/document_modele.class.php:71 #: include/lib/manage_table_sql.class.php:768 include/forecast.inc.php:347 #: include/card_attr.inc.php:110 @@ -6286,7 +6314,7 @@ msgstr "" #: 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:681 +#: include/class/acc_ledger_history_generic.class.php:684 #: include/class/fiche.class.php:1473 msgid "n° pièce" msgstr "" @@ -6347,7 +6375,7 @@ msgstr "" #: include/template/operation_detail_misc.php:33 #: include/template/operation_detail_ach.php:35 #: include/template/ledger_detail_ach.php:118 -#: include/ajax/ajax_boxcard_search.php:50 include/database.item.php:159 +#: include/ajax/ajax_boxcard_search.php:50 include/database.item.php:167 #: include/class/acc_ledger_fin.class.php:753 #: include/class/fiche.class.php:1779 msgid "Quick Code" @@ -6576,10 +6604,10 @@ msgstr "" #: html/user_login.php:106 html/recherche.php:87 html/recherche.php:132 #: 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_bottom.php:299 +#: include/template/ledger_detail_bottom.php:300 #: include/template/ledger_detail_top.php:16 -#: include/template/action_search.php:156 include/ajax/ajax_card.php:312 +#: include/template/action_search.php:156 include/ajax/ajax_card.php:313 #: include/class/extension.class.php:270 include/lib/html_input.class.php:434 #: include/lib/html_input.class.php:449 #, php-format @@ -6855,7 +6883,7 @@ msgstr "" #: include/database.item.php:161 include/database.item.php:165 #: include/database.item.php:164 include/database.item.php:157 #: include/database.item.php:158 include/company.inc.php:124 -#: include/database.item.php:166 include/database.item.php:161 +#: include/database.item.php:166 include/database.item.php:169 #: include/company.inc.php:124 msgid "Fax" msgstr "" @@ -6952,9 +6980,9 @@ msgstr "" #: include/compta_ach.inc.php:110 include/compta_ach.inc.php:163 #: include/compta_ven.inc.php:118 include/compta_ach.inc.php:114 #: include/compta_ach.inc.php:167 include/compta_ven.inc.php:122 -#: include/ext/tva/ajax.php:111 include/compta_ven.inc.php:122 -#: include/compta_fin.inc.php:116 include/compta_ach.inc.php:114 -#: include/compta_ach.inc.php:167 +#: include/ext/tva/ajax.php:111 include/compta_ven.inc.php:120 +#: include/compta_fin.inc.php:116 include/compta_ach.inc.php:112 +#: include/compta_ach.inc.php:165 msgid "Enregistrement" msgstr "" @@ -6967,8 +6995,8 @@ msgstr "" #: include/compta_ach.inc.php:109 include/compta_ach.inc.php:111 #: include/compta_ven.inc.php:119 include/compta_ach.inc.php:115 #: include/compta_ven.inc.php:123 include/operation_ods_confirm.inc.php:90 -#: include/compta_ven.inc.php:123 include/compta_fin.inc.php:85 -#: include/compta_ach.inc.php:115 include/operation_ods_confirm.inc.php:90 +#: include/compta_ven.inc.php:121 include/compta_fin.inc.php:85 +#: include/compta_ach.inc.php:113 include/operation_ods_confirm.inc.php:90 msgid "Corriger" msgstr "" @@ -6995,8 +7023,8 @@ msgstr "" #: include/template/form_ledger_detail.php:128 include/compta_ach.inc.php:296 #: include/compta_ven.inc.php:339 include/template/form_ledger_detail.php:128 #: include/template/predf_ledger_detail.php:57 -#: include/template/detail-action.php:373 include/compta_ven.inc.php:339 -#: include/compta_ach.inc.php:296 +#: include/template/detail-action.php:373 include/compta_ven.inc.php:337 +#: include/compta_ach.inc.php:294 msgid "Actualiser" msgstr "" @@ -7010,7 +7038,7 @@ msgstr "" #: include/compta_ven.inc.php:325 include/compta_ach.inc.php:296 #: include/compta_ven.inc.php:330 include/compta_ven.inc.php:333 #: include/compta_ach.inc.php:299 include/compta_ven.inc.php:341 -#: include/compta_ven.inc.php:341 include/compta_ach.inc.php:299 +#: include/compta_ven.inc.php:339 include/compta_ach.inc.php:297 msgid "Effacer " msgstr "" @@ -7064,64 +7092,65 @@ 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/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 +#: include/template/tax_summary_display.php:176 include/cfgledger.inc.php:171 +#: include/database.item.php:4 include/database.item.php:68 +#: include/database.item.php:235 include/database.item.php:254 #: include/class/acc_ledger_search.class.php:1099 msgid "Achat" msgstr "" #: include/database.item.php:2 include/database.item.php:5 #: include/database.item.php:7 include/database.item.php:10 -#: include/database.item.php:4 include/database.item.php:2 +#: include/database.item.php:4 include/database.item.php:4 msgid "Nouvel achat ou dépense" msgstr "" #: include/database.item.php:3 include/database.item.php:6 #: include/database.item.php:8 include/database.item.php:11 -#: include/database.item.php:5 include/database.item.php:3 +#: include/database.item.php:5 include/database.item.php:5 msgid "Historique des imputations analytiques" msgstr "" #: 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 include/database.item.php:4 +#: include/database.item.php:6 include/database.item.php:6 msgid "Balance simple" msgstr "" #: 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 include/database.item.php:4 +#: include/database.item.php:6 include/database.item.php:6 msgid "Balance simple des imputations analytiques" msgstr "" #: include/database.item.php:5 include/database.item.php:8 #: include/database.item.php:10 include/database.item.php:13 -#: include/database.item.php:7 include/database.item.php:5 +#: include/database.item.php:7 include/database.item.php:7 msgid "Tableau" msgstr "" #: include/database.item.php:5 include/database.item.php:8 #: include/database.item.php:10 include/database.item.php:13 -#: include/database.item.php:7 include/database.item.php:5 +#: include/database.item.php:7 include/database.item.php:7 msgid "Tableau lié à la comptabilité" 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 include/database.item.php:6 +#: include/database.item.php:8 include/database.item.php:8 msgid "Balance Analytique/comptabilité" 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 include/database.item.php:6 +#: include/database.item.php:8 include/database.item.php:8 msgid "Lien entre comptabilité et Comptabilité analytique" msgstr "" #: include/database.item.php:7 include/database.item.php:10 #: include/database.item.php:12 include/database.item.php:15 -#: include/database.item.php:9 include/database.item.php:7 +#: include/database.item.php:9 include/database.item.php:9 msgid "Balance par groupe" msgstr "" @@ -7164,7 +7193,8 @@ msgstr "" #: include/template/operation_detail_ach.php:54 #: include/template/acc_ledger_history_sale_extended.php:52 #: include/template/acc_ledger_history_sale_extended.php:130 -#: include/template/ledger_detail_ach.php:135 include/database.item.php:8 +#: include/template/ledger_detail_ach.php:135 include/database.item.php:10 +#: include/class/print_ledger_detail_item.class.php:164 #: include/class/acc_ledger_history_sale.class.php:250 #: include/class/pdf_operation.class.php:152 #: include/class/pdf_operation.class.php:197 @@ -7173,7 +7203,7 @@ msgstr "" #: include/database.item.php:8 include/database.item.php:11 #: include/database.item.php:13 include/database.item.php:16 -#: include/database.item.php:10 include/database.item.php:8 +#: include/database.item.php:10 include/database.item.php:10 msgid "Config. de la tva" msgstr "" @@ -7189,33 +7219,34 @@ 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/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 +#: include/class/acc_ledger_search.class.php:1097 +#: include/template/tax_summary_display.php:29 include/cfgledger.inc.php:173 +#: include/database.item.php:11 include/database.item.php:234 +#: include/database.item.php:253 include/class/acc_ledger_search.class.php:1097 msgid "Vente" msgstr "" #: include/database.item.php:9 include/database.item.php:12 #: include/database.item.php:14 include/database.item.php:17 -#: include/database.item.php:11 include/database.item.php:9 +#: include/database.item.php:11 include/database.item.php:11 msgid "Nouvelle vente ou recette" msgstr "" #: include/database.item.php:10 include/database.item.php:13 #: include/database.item.php:15 include/database.item.php:18 -#: include/database.item.php:12 include/database.item.php:10 +#: include/database.item.php:12 include/database.item.php:12 msgid "Config. Menu" msgstr "" #: include/database.item.php:10 include/database.item.php:13 #: include/database.item.php:15 include/database.item.php:18 -#: include/database.item.php:12 include/database.item.php:10 +#: include/database.item.php:12 include/database.item.php:12 msgid "Configuration des menus et plugins" msgstr "" #: include/database.item.php:11 include/database.item.php:14 #: include/database.item.php:16 include/database.item.php:19 -#: include/database.item.php:13 include/database.item.php:11 +#: include/database.item.php:13 include/database.item.php:13 msgid "Suivi fournisseur" msgstr "" @@ -7224,27 +7255,27 @@ msgstr "" #: include/database.item.php:120 include/database.item.php:117 #: include/database.item.php:116 include/database.item.php:17 #: include/database.item.php:20 include/database.item.php:14 -#: include/database.item.php:112 include/database.item.php:12 -#: include/database.item.php:112 +#: include/database.item.php:112 include/database.item.php:14 +#: include/database.item.php:114 msgid "Opérations diverses" msgstr "" #: include/database.item.php:12 include/database.item.php:15 #: include/database.item.php:17 include/database.item.php:20 -#: include/database.item.php:14 include/database.item.php:12 +#: include/database.item.php:14 include/database.item.php:14 msgid "OD analytique" msgstr "" #: include/database.item.php:13 include/database.item.php:16 #: include/database.item.php:18 include/database.item.php:21 -#: include/database.item.php:15 include/database.item.php:13 +#: include/database.item.php:15 include/database.item.php:15 msgid "Création de rapport" msgstr "" #: include/database.item.php:14 include/database.item.php:17 #: include/database.item.php:15 include/database.item.php:20 #: include/database.item.php:23 include/database.item.php:16 -#: include/database.item.php:14 +#: include/database.item.php:16 msgid "saut de ligne" msgstr "" @@ -7257,14 +7288,14 @@ msgstr "" #: include/database.item.php:108 include/database.item.php:105 #: include/database.item.php:104 include/database.item.php:21 #: include/database.item.php:24 include/database.item.php:17 -#: include/database.item.php:15 +#: include/database.item.php:17 msgid "Suivi client" msgstr "" #: include/database.item.php:16 include/database.item.php:19 #: include/database.item.php:23 include/database.item.php:22 #: include/database.item.php:25 include/database.item.php:18 -#: include/database.item.php:16 +#: include/database.item.php:18 msgid "Historique stock" msgstr "" @@ -7276,7 +7307,7 @@ msgstr "" #: include/database.item.php:17 include/database.item.php:20 #: include/database.item.php:24 include/database.item.php:23 #: include/database.item.php:26 include/database.item.php:19 -#: include/database.item.php:17 +#: include/database.item.php:19 msgid "Export Historique" msgstr "" @@ -7285,7 +7316,7 @@ msgstr "" #: include/database.item.php:25 include/database.item.php:26 #: include/database.item.php:24 include/database.item.php:27 #: include/database.item.php:28 include/database.item.php:20 -#: include/database.item.php:18 include/database.item.php:19 +#: include/database.item.php:20 include/database.item.php:21 msgid "Export Journaux" msgstr "" @@ -7294,7 +7325,7 @@ msgstr "" #: include/database.item.php:27 include/database.item.php:28 #: include/database.item.php:26 include/database.item.php:29 #: include/database.item.php:30 include/database.item.php:22 -#: include/database.item.php:20 include/database.item.php:21 +#: include/database.item.php:22 include/database.item.php:23 msgid "Export Poste détail" msgstr "" @@ -7303,7 +7334,7 @@ msgstr "" #: include/database.item.php:29 include/database.item.php:30 #: include/database.item.php:28 include/database.item.php:31 #: include/database.item.php:32 include/database.item.php:24 -#: include/database.item.php:22 include/database.item.php:23 +#: include/database.item.php:24 include/database.item.php:25 msgid "Export Fiche détail" msgstr "" @@ -7312,7 +7343,7 @@ msgstr "" #: include/database.item.php:31 include/database.item.php:32 #: include/database.item.php:30 include/database.item.php:33 #: include/database.item.php:34 include/database.item.php:26 -#: include/database.item.php:24 include/database.item.php:25 +#: include/database.item.php:26 include/database.item.php:27 msgid "Export Fiche balance" msgstr "" @@ -7321,7 +7352,7 @@ msgstr "" #: include/database.item.php:33 include/database.item.php:34 #: include/database.item.php:32 include/database.item.php:35 #: include/database.item.php:36 include/database.item.php:28 -#: include/database.item.php:26 include/database.item.php:27 +#: include/database.item.php:28 include/database.item.php:29 msgid "Export report" msgstr "" @@ -7330,7 +7361,7 @@ msgstr "" #: include/database.item.php:35 include/database.item.php:36 #: include/database.item.php:34 include/database.item.php:37 #: include/database.item.php:38 include/database.item.php:30 -#: include/database.item.php:28 include/database.item.php:29 +#: include/database.item.php:30 include/database.item.php:31 msgid "Export Fiche" msgstr "" @@ -7339,14 +7370,14 @@ msgstr "" #: include/database.item.php:37 include/database.item.php:38 #: include/database.item.php:36 include/database.item.php:39 #: include/database.item.php:40 include/database.item.php:32 -#: include/database.item.php:30 include/database.item.php:31 +#: include/database.item.php:32 include/database.item.php:33 msgid "Export Grand Livre" msgstr "" #: include/database.item.php:32 include/database.item.php:35 #: include/database.item.php:39 include/database.item.php:38 #: include/database.item.php:41 include/database.item.php:34 -#: include/database.item.php:32 +#: include/database.item.php:34 msgid "Export Sécurité" msgstr "" @@ -7355,14 +7386,14 @@ msgstr "" #: include/database.item.php:40 include/database.item.php:42 #: include/database.item.php:39 include/database.item.php:41 #: include/database.item.php:44 include/database.item.php:37 -#: include/database.item.php:33 include/database.item.php:35 +#: include/database.item.php:35 include/database.item.php:37 msgid "Export Comptabilité analytique" msgstr "" #: include/database.item.php:34 include/database.item.php:37 #: include/database.item.php:41 include/database.item.php:40 #: include/database.item.php:43 include/database.item.php:36 -#: include/database.item.php:34 +#: include/database.item.php:36 msgid "Export Comptabilité analytique balance simple" msgstr "" @@ -7371,7 +7402,7 @@ msgstr "" #: include/database.item.php:43 include/database.item.php:44 #: include/database.item.php:42 include/database.item.php:45 #: include/database.item.php:46 include/database.item.php:38 -#: include/database.item.php:36 include/database.item.php:37 +#: include/database.item.php:38 include/database.item.php:39 msgid "Export Comptabilité analytique balance double" msgstr "" @@ -7380,98 +7411,98 @@ msgstr "" #: include/database.item.php:45 include/database.item.php:46 #: include/database.item.php:44 include/database.item.php:47 #: include/database.item.php:48 include/database.item.php:40 -#: include/database.item.php:38 include/database.item.php:39 +#: include/database.item.php:40 include/database.item.php:41 msgid "Export Balance comptable" msgstr "" #: include/database.item.php:40 include/database.item.php:43 #: include/database.item.php:47 include/database.item.php:46 #: include/database.item.php:49 include/database.item.php:42 -#: include/database.item.php:40 +#: include/database.item.php:42 msgid "Export Tableau Analytique" msgstr "" #: include/database.item.php:41 include/database.item.php:44 #: include/database.item.php:48 include/database.item.php:47 #: include/database.item.php:50 include/database.item.php:43 -#: include/database.item.php:41 +#: include/database.item.php:43 msgid "Export Historique Compt. Analytique" msgstr "" #: include/database.item.php:42 include/database.item.php:45 #: include/database.item.php:49 include/database.item.php:48 #: include/database.item.php:51 include/database.item.php:44 -#: include/database.item.php:42 +#: include/database.item.php:44 msgid "Export Balance groupe analytique" msgstr "" #: include/database.item.php:43 include/database.item.php:46 #: include/database.item.php:50 include/database.item.php:49 #: include/database.item.php:52 include/database.item.php:45 -#: include/database.item.php:43 +#: include/database.item.php:45 msgid "Export Bilan" msgstr "" #: include/database.item.php:44 include/database.item.php:47 #: include/database.item.php:51 include/database.item.php:50 #: include/database.item.php:53 include/database.item.php:46 -#: include/database.item.php:44 +#: include/database.item.php:46 msgid "Impression Grand-Livre" msgstr "" #: include/database.item.php:45 include/database.item.php:48 #: include/database.item.php:52 include/database.item.php:51 #: include/database.item.php:54 include/database.item.php:47 -#: include/database.item.php:45 +#: include/database.item.php:47 msgid "Export définition d'un raport" msgstr "" #: include/database.item.php:46 include/database.item.php:49 #: include/database.item.php:53 include/database.item.php:52 #: include/database.item.php:55 include/database.item.php:48 -#: include/database.item.php:46 +#: include/database.item.php:48 msgid "Export Action Gestion" msgstr "" #: include/database.item.php:47 include/database.item.php:50 #: include/database.item.php:54 include/database.item.php:53 #: include/database.item.php:56 include/database.item.php:49 -#: include/database.item.php:47 +#: include/database.item.php:49 msgid "Export Historique mouvement stock" msgstr "" #: include/database.item.php:48 include/database.item.php:51 #: include/database.item.php:55 include/database.item.php:54 #: include/database.item.php:57 include/database.item.php:50 -#: include/database.item.php:48 +#: include/database.item.php:50 msgid "Export Résumé list stock" msgstr "" #: include/database.item.php:49 include/database.item.php:52 #: include/database.item.php:61 include/database.item.php:58 #: include/database.item.php:57 include/database.item.php:55 -#: include/database.item.php:50 include/database.item.php:50 +#: include/database.item.php:50 include/database.item.php:51 msgid "Plan Compt. analytique" msgstr "" #: include/database.item.php:49 include/database.item.php:52 #: include/database.item.php:61 include/database.item.php:58 #: include/database.item.php:57 include/database.item.php:55 -#: include/database.item.php:50 include/database.item.php:50 +#: include/database.item.php:50 include/database.item.php:51 msgid "Plan analytique" msgstr "" #: include/database.item.php:50 include/database.item.php:53 #: include/database.item.php:62 include/database.item.php:59 #: include/database.item.php:58 include/database.item.php:56 -#: include/database.item.php:51 include/database.item.php:51 +#: include/database.item.php:51 include/database.item.php:52 msgid "Groupe analytique" msgstr "" #: include/database.item.php:51 include/database.item.php:54 #: include/database.item.php:58 include/database.item.php:57 #: include/database.item.php:60 include/database.item.php:52 -#: include/database.item.php:52 +#: include/database.item.php:53 msgid "Liste des contacts" msgstr "" @@ -7485,7 +7516,7 @@ msgstr "" #: include/database.item.php:51 include/upgrade.inc.php:35 #: include/ajax/ajax_navigator.php:106 include/database.item.php:49 #: include/cfgplugin.inc.php:113 include/upgrade.inc.php:35 -#: include/ajax/ajax_navigator.php:106 include/database.item.php:49 +#: include/ajax/ajax_navigator.php:106 include/database.item.php:62 msgid "Extension" msgstr "" @@ -7493,21 +7524,21 @@ msgstr "" #: include/database.item.php:59 include/database.item.php:62 #: include/database.item.php:61 include/database.item.php:19 #: include/database.item.php:22 include/database.item.php:51 -#: include/database.item.php:49 include/database.item.php:49 +#: include/database.item.php:49 include/database.item.php:62 msgid "Extensions (plugins)" msgstr "" #: include/database.item.php:53 include/database.item.php:56 #: include/database.item.php:60 include/database.item.php:57 #: include/database.item.php:58 include/database.item.php:61 -#: include/database.item.php:55 include/database.item.php:53 +#: include/database.item.php:55 include/database.item.php:54 msgid "Ecriture prédefinie" msgstr "" #: include/database.item.php:53 include/database.item.php:56 #: include/database.item.php:60 include/database.item.php:57 #: include/database.item.php:58 include/database.item.php:61 -#: include/database.item.php:55 include/database.item.php:53 +#: include/database.item.php:55 include/database.item.php:54 msgid "Gestion des opérations prédéfinifies" msgstr "" @@ -7518,8 +7549,8 @@ msgstr "" #: include/database.item.php:225 include/cfgledger.inc.php:167 #: include/database.item.php:56 include/database.item.php:248 #: include/database.item.php:223 include/cfgledger.inc.php:172 -#: include/cfgledger.inc.php:172 include/database.item.php:54 -#: include/database.item.php:223 +#: include/cfgledger.inc.php:172 include/database.item.php:55 +#: include/database.item.php:255 msgid "Opérations Diverses" msgstr "" @@ -7527,21 +7558,21 @@ msgstr "" #: include/database.item.php:64 include/database.item.php:61 #: include/database.item.php:60 include/database.item.php:59 #: include/database.item.php:62 include/database.item.php:56 -#: include/database.item.php:54 +#: include/database.item.php:55 msgid "Nouvelle opérations diverses" msgstr "" #: include/database.item.php:55 include/database.item.php:58 #: include/database.item.php:65 include/database.item.php:63 #: include/database.item.php:62 include/database.item.php:60 -#: include/database.item.php:57 include/database.item.php:55 +#: include/database.item.php:57 include/database.item.php:56 msgid "Nouvel extrait" msgstr "" #: include/database.item.php:55 include/database.item.php:58 #: include/database.item.php:65 include/database.item.php:63 #: include/database.item.php:62 include/database.item.php:60 -#: include/database.item.php:57 include/database.item.php:55 +#: include/database.item.php:57 include/database.item.php:56 msgid "Nouvel extrait bancaire" msgstr "" @@ -7553,14 +7584,14 @@ msgstr "" #: include/database.item.php:59 include/database.item.php:62 #: include/ext/syndicat_tools/index.php:37 include/database.item.php:65 #: include/template/menu_detail.php:75 include/menu.inc.php:114 -#: include/database.item.php:57 include/card_attr.inc.php:98 +#: include/database.item.php:58 include/card_attr.inc.php:98 msgid "Paramètre" msgstr "" #: include/database.item.php:57 include/database.item.php:60 #: include/database.item.php:63 include/database.item.php:59 #: include/database.item.php:62 include/database.item.php:65 -#: include/database.item.php:57 +#: include/database.item.php:58 msgid "Module paramètre" msgstr "" @@ -7568,7 +7599,7 @@ msgstr "" #: include/database.item.php:67 include/database.item.php:65 #: include/database.item.php:64 include/database.item.php:63 #: include/database.item.php:66 include/database.item.php:60 -#: include/database.item.php:58 +#: include/database.item.php:59 msgid "Catégorie de documents" msgstr "" @@ -7576,7 +7607,7 @@ msgstr "" #: include/database.item.php:67 include/database.item.php:65 #: include/database.item.php:64 include/database.item.php:63 #: include/database.item.php:66 include/database.item.php:60 -#: include/database.item.php:58 +#: include/database.item.php:59 msgid "Config. catégorie de documents" msgstr "" @@ -7584,7 +7615,7 @@ msgstr "" #: include/database.item.php:68 include/database.item.php:66 #: include/database.item.php:65 include/database.item.php:64 #: include/database.item.php:67 include/database.item.php:61 -#: include/database.item.php:59 +#: include/database.item.php:60 msgid "Lettrage par Fiche" msgstr "" @@ -7592,7 +7623,7 @@ msgstr "" #: include/database.item.php:68 include/database.item.php:66 #: include/database.item.php:65 include/database.item.php:64 #: include/database.item.php:67 include/database.item.php:61 -#: include/database.item.php:59 +#: include/database.item.php:60 msgid "Lettrage par fiche" msgstr "" @@ -7600,7 +7631,7 @@ msgstr "" #: include/database.item.php:69 include/database.item.php:67 #: include/database.item.php:66 include/database.item.php:65 #: include/database.item.php:68 include/database.item.php:62 -#: include/database.item.php:60 +#: include/database.item.php:61 msgid "Historique achat" msgstr "" @@ -7608,7 +7639,7 @@ msgstr "" #: 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 -#: include/database.item.php:61 +#: include/database.item.php:63 msgid "Historique opérations diverses" msgstr "" @@ -7616,7 +7647,7 @@ msgstr "" #: include/database.item.php:71 include/database.item.php:69 #: include/database.item.php:68 include/database.item.php:67 #: include/database.item.php:70 include/database.item.php:64 -#: include/database.item.php:62 +#: include/database.item.php:64 msgid "Impression du détail d'un poste comptable" msgstr "" @@ -7624,7 +7655,7 @@ msgstr "" #: include/database.item.php:66 include/database.item.php:72 #: include/database.item.php:70 include/database.item.php:69 #: include/database.item.php:68 include/database.item.php:71 -#: include/database.item.php:65 include/database.item.php:63 +#: include/database.item.php:65 include/database.item.php:65 msgid "Rapport" msgstr "" @@ -7632,7 +7663,7 @@ msgstr "" #: include/database.item.php:72 include/database.item.php:70 #: include/database.item.php:69 include/database.item.php:68 #: include/database.item.php:71 include/database.item.php:65 -#: include/database.item.php:63 +#: include/database.item.php:65 msgid "Impression de rapport" msgstr "" @@ -7645,8 +7676,8 @@ msgstr "" #: include/class/class_acc_ledger.php:352 include/database.item.php:72 #: include/class/acc_ledger.class.php:364 include/database.item.php:66 #: include/class/acc_ledger.class.php:372 -#: include/class/acc_ledger.class.php:373 include/database.item.php:64 -#: include/class/acc_ledger.class.php:373 +#: include/class/acc_ledger.class.php:373 include/database.item.php:66 +#: include/class/acc_ledger.class.php:391 msgid "Grand Livre" msgstr "" @@ -7654,7 +7685,7 @@ msgstr "" #: include/database.item.php:73 include/database.item.php:71 #: include/database.item.php:70 include/database.item.php:69 #: include/database.item.php:72 include/database.item.php:66 -#: include/database.item.php:64 +#: include/database.item.php:66 msgid "Impression du grand livre" msgstr "" @@ -7662,7 +7693,7 @@ msgstr "" #: include/database.item.php:74 include/database.item.php:72 #: include/database.item.php:71 include/database.item.php:70 #: include/database.item.php:73 include/database.item.php:67 -#: include/database.item.php:65 +#: include/database.item.php:67 msgid "Impression des balances comptables" msgstr "" @@ -7670,7 +7701,7 @@ msgstr "" #: include/database.item.php:75 include/database.item.php:73 #: include/database.item.php:72 include/database.item.php:71 #: include/database.item.php:74 include/database.item.php:68 -#: include/database.item.php:66 +#: include/database.item.php:68 msgid "Menu achat" msgstr "" @@ -7678,7 +7709,7 @@ msgstr "" #: include/database.item.php:76 include/database.item.php:74 #: include/database.item.php:73 include/database.item.php:72 #: include/database.item.php:75 include/database.item.php:69 -#: include/database.item.php:67 +#: include/database.item.php:69 msgid "Menu et profil" msgstr "" @@ -7686,7 +7717,7 @@ msgstr "" #: include/database.item.php:76 include/database.item.php:74 #: include/database.item.php:73 include/database.item.php:72 #: include/database.item.php:75 include/database.item.php:69 -#: include/database.item.php:67 +#: include/database.item.php:69 msgid "Menu " msgstr "" @@ -7705,7 +7736,7 @@ msgstr "" #: include/template/menu_detail.php:18 #: include/template/action_other_action.php:22 #: include/ajax/ajax_get_profile.php:120 include/menu.inc.php:127 -#: include/database.item.php:68 include/database.item.php:115 +#: include/database.item.php:70 include/database.item.php:117 msgid "Impression" msgstr "" @@ -7713,7 +7744,7 @@ msgstr "" #: include/database.item.php:77 include/database.item.php:75 #: include/database.item.php:74 include/database.item.php:73 #: include/database.item.php:76 include/database.item.php:70 -#: include/database.item.php:68 +#: include/database.item.php:70 msgid "Menu impression" msgstr "" @@ -7721,7 +7752,7 @@ msgstr "" #: include/database.item.php:78 include/database.item.php:76 #: include/database.item.php:75 include/database.item.php:74 #: include/database.item.php:77 include/database.item.php:71 -#: include/database.item.php:69 +#: include/database.item.php:71 msgid "Information Banque" msgstr "" @@ -7729,7 +7760,7 @@ msgstr "" #: 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 -#: include/database.item.php:70 +#: include/database.item.php:72 msgid "Grand'Livre" msgstr "" @@ -7737,21 +7768,21 @@ msgstr "" #: 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 -#: include/database.item.php:70 +#: include/database.item.php:72 msgid "Grand livre analytique" msgstr "" #: include/database.item.php:71 include/database.item.php:74 #: include/database.item.php:14 include/database.item.php:76 #: include/database.item.php:79 include/database.item.php:73 -#: include/database.item.php:71 +#: include/database.item.php:73 msgid "Gestion" msgstr "" #: include/database.item.php:71 include/database.item.php:74 #: include/database.item.php:14 include/database.item.php:76 #: include/database.item.php:79 include/database.item.php:73 -#: include/database.item.php:71 +#: include/database.item.php:73 msgid "Module gestion" msgstr "" @@ -7762,7 +7793,7 @@ msgstr "" #: 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/database.item.php:75 include/lib/user_menu.php:81 #: include/lib/user_menu.php:100 msgid "Accueil" msgstr "" @@ -7774,7 +7805,7 @@ msgstr "" #: include/template/security_list_action.php:63 #: include/class/pdf_operation.class.php:371 include/database.item.php:76 #: include/template/security_list_action.php:66 -#: include/template/security_list_action.php:66 include/database.item.php:74 +#: include/template/security_list_action.php:66 include/database.item.php:76 #: include/class/pdf_operation.class.php:371 msgid "Comptabilité" msgstr "" @@ -7782,7 +7813,7 @@ msgstr "" #: include/database.item.php:74 include/database.item.php:77 #: include/database.item.php:82 include/database.item.php:80 #: include/database.item.php:79 include/database.item.php:76 -#: include/database.item.php:74 +#: include/database.item.php:76 msgid "Module comptabilité" msgstr "" @@ -7794,15 +7825,15 @@ msgstr "" #: include/database.item.php:192 include/database.item.php:80 #: include/database.item.php:190 include/database.item.php:180 #: include/database.item.php:181 include/database.item.php:184 -#: include/database.item.php:77 include/database.item.php:75 -#: include/database.item.php:184 +#: include/database.item.php:77 include/database.item.php:77 +#: include/database.item.php:197 msgid "Divers" msgstr "" #: include/database.item.php:75 include/database.item.php:78 #: include/database.item.php:83 include/database.item.php:81 #: include/database.item.php:80 include/database.item.php:77 -#: include/database.item.php:75 +#: include/database.item.php:77 msgid "Paramètres divers" msgstr "" @@ -7813,7 +7844,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/lib/user_menu.php:82 -#: include/lib/user_menu.php:101 include/database.item.php:99 +#: include/lib/user_menu.php:101 include/database.item.php:104 #: include/lib/user_menu.php:82 include/lib/user_menu.php:101 msgid "Sortie" msgstr "" @@ -7834,7 +7865,7 @@ msgstr "" #: include/param_sec.inc.php:221 include/template/action_search.php:52 #: include/database.item.php:76 include/param_sec.inc.php:221 #: include/template/user_sec_profile.php:35 -#: include/template/action_search.php:52 include/database.item.php:76 +#: include/template/action_search.php:52 include/database.item.php:78 msgid "Profil" msgstr "" @@ -7842,7 +7873,7 @@ msgstr "" #: include/database.item.php:85 include/database.item.php:82 #: include/database.item.php:81 include/database.item.php:84 #: include/database.item.php:78 include/database.item.php:76 -#: include/database.item.php:76 +#: include/database.item.php:78 msgid "Configuration profil" msgstr "" @@ -7850,7 +7881,7 @@ msgstr "" #: include/database.item.php:86 include/database.item.php:83 #: include/database.item.php:82 include/database.item.php:85 #: include/database.item.php:79 include/database.item.php:77 -#: include/database.item.php:77 +#: include/database.item.php:79 msgid "Config. poste comptable de base" msgstr "" @@ -7858,7 +7889,7 @@ msgstr "" #: include/database.item.php:87 include/database.item.php:84 #: include/database.item.php:83 include/database.item.php:86 #: include/database.item.php:80 include/database.item.php:78 -#: include/database.item.php:78 +#: include/database.item.php:80 msgid "Liste,Balance,Historique par fiche" msgstr "" @@ -7866,7 +7897,7 @@ msgstr "" #: include/database.item.php:89 include/database.item.php:86 #: include/database.item.php:85 include/database.item.php:88 #: include/database.item.php:82 include/database.item.php:80 -#: include/database.item.php:80 +#: include/database.item.php:82 msgid "Configuration étiquette" msgstr "" @@ -7874,91 +7905,91 @@ msgstr "" #: include/database.item.php:89 include/database.item.php:86 #: include/database.item.php:85 include/database.item.php:88 #: include/database.item.php:82 include/database.item.php:80 -#: include/database.item.php:80 +#: include/database.item.php:82 msgid "Configuration des tags" msgstr "" #: include/database.item.php:82 include/database.item.php:85 #: include/database.item.php:90 include/database.item.php:87 #: include/database.item.php:86 include/database.item.php:84 -#: include/database.item.php:82 +#: include/database.item.php:84 msgid "Balance croisée double" msgstr "" #: include/database.item.php:82 include/database.item.php:85 #: include/database.item.php:90 include/database.item.php:87 #: include/database.item.php:86 include/database.item.php:84 -#: include/database.item.php:82 +#: include/database.item.php:84 msgid "Balance double croisées des imputations analytiques" msgstr "" #: include/database.item.php:83 include/database.item.php:86 #: include/database.item.php:91 include/database.item.php:88 #: include/database.item.php:87 include/database.item.php:85 -#: include/database.item.php:83 +#: include/database.item.php:85 msgid "Sociétés" msgstr "" #: include/database.item.php:83 include/database.item.php:86 #: include/database.item.php:91 include/database.item.php:88 #: include/database.item.php:87 include/database.item.php:85 -#: include/database.item.php:83 +#: include/database.item.php:85 msgid "Parametre societe" msgstr "" #: include/database.item.php:84 include/database.item.php:87 #: include/database.item.php:92 include/database.item.php:89 #: include/database.item.php:88 include/database.item.php:86 -#: include/database.item.php:84 +#: include/database.item.php:86 msgid "Gestion des périodes" msgstr "" #: include/database.item.php:85 include/database.item.php:88 #: include/database.item.php:93 include/database.item.php:90 #: include/database.item.php:89 include/database.item.php:87 -#: include/database.item.php:85 +#: include/database.item.php:87 msgid "Vérification " msgstr "" #: include/database.item.php:85 include/database.item.php:88 #: include/database.item.php:93 include/database.item.php:90 #: include/database.item.php:89 include/database.item.php:87 -#: include/database.item.php:85 +#: include/database.item.php:87 msgid "Vérification de la comptabilité" msgstr "" #: include/database.item.php:86 include/database.item.php:89 #: include/database.item.php:94 include/database.item.php:91 #: include/database.item.php:90 include/database.item.php:88 -#: include/database.item.php:86 +#: include/database.item.php:88 msgid "Ecriture Ouverture" msgstr "" #: include/database.item.php:86 include/database.item.php:89 #: include/database.item.php:94 include/database.item.php:91 #: include/database.item.php:90 include/database.item.php:88 -#: include/database.item.php:86 +#: include/database.item.php:88 msgid "Ecriture d'ouverture" msgstr "" #: include/database.item.php:87 include/database.item.php:90 #: include/database.item.php:95 include/database.item.php:92 #: include/database.item.php:91 include/database.item.php:89 -#: include/database.item.php:87 +#: include/database.item.php:89 msgid "Config. modèle de document" msgstr "" #: include/database.item.php:88 include/database.item.php:91 #: include/database.item.php:96 include/database.item.php:93 #: include/database.item.php:92 include/database.item.php:90 -#: include/database.item.php:88 +#: include/database.item.php:90 msgid "journaux" msgstr "" #: include/database.item.php:88 include/database.item.php:91 #: include/database.item.php:96 include/database.item.php:93 #: include/database.item.php:92 include/database.item.php:90 -#: include/database.item.php:88 +#: include/database.item.php:90 msgid "Configuration des journaux" msgstr "" @@ -7966,63 +7997,63 @@ msgstr "" #: include/database.item.php:97 include/database.item.php:94 #: include/database.item.php:93 include/export/export_security_pdf.php:89 #: include/database.item.php:91 include/export/export_security_pdf.php:89 -#: include/database.item.php:89 +#: include/database.item.php:91 msgid "Sécurité" msgstr "" #: include/database.item.php:89 include/database.item.php:92 #: include/database.item.php:97 include/database.item.php:94 #: include/database.item.php:93 include/database.item.php:91 -#: include/database.item.php:89 +#: include/database.item.php:91 msgid "configuration de la sécurité" msgstr "" #: include/database.item.php:90 include/database.item.php:93 #: include/database.item.php:98 include/database.item.php:95 #: include/database.item.php:94 include/database.item.php:92 -#: include/database.item.php:90 +#: include/database.item.php:92 msgid "Attribut de fiche" msgstr "" #: include/database.item.php:90 include/database.item.php:93 #: include/database.item.php:98 include/database.item.php:95 #: include/database.item.php:94 include/database.item.php:92 -#: include/database.item.php:90 +#: include/database.item.php:92 msgid "Gestion des attributs de fiches " msgstr "" #: include/database.item.php:91 include/database.item.php:94 #: include/database.item.php:99 include/database.item.php:96 #: include/database.item.php:95 include/database.item.php:93 -#: include/database.item.php:91 +#: include/database.item.php:93 msgid "Etat des stock" msgstr "" #: include/database.item.php:92 include/database.item.php:95 #: include/database.item.php:100 include/database.item.php:97 #: include/database.item.php:96 include/database.item.php:94 -#: include/database.item.php:92 +#: include/database.item.php:94 msgid "Modification Stocks" msgstr "" #: include/database.item.php:92 include/database.item.php:95 #: include/database.item.php:100 include/database.item.php:97 #: include/database.item.php:96 include/database.item.php:94 -#: include/database.item.php:92 +#: include/database.item.php:94 msgid "Modification des stocks (inventaire)" msgstr "" #: include/database.item.php:93 include/database.item.php:96 #: include/database.item.php:101 include/database.item.php:98 #: include/database.item.php:97 include/database.item.php:95 -#: include/database.item.php:93 +#: include/database.item.php:95 msgid "Histo. Changement" msgstr "" #: include/database.item.php:93 include/database.item.php:96 #: include/database.item.php:101 include/database.item.php:98 #: include/database.item.php:97 include/database.item.php:95 -#: include/database.item.php:93 +#: include/database.item.php:95 msgid "Liste des changements manuels des stocks" msgstr "" @@ -8031,14 +8062,14 @@ msgstr "" #: include/database.item.php:99 include/database.item.php:98 #: include/ajax/ajax_navigator.php:23 include/database.item.php:96 #: include/ajax/ajax_navigator.php:28 include/ajax/ajax_navigator.php:28 -#: include/database.item.php:94 +#: include/database.item.php:96 msgid "Navigateur" msgstr "" #: include/database.item.php:94 include/database.item.php:97 #: include/database.item.php:102 include/database.item.php:99 #: include/database.item.php:98 include/database.item.php:96 -#: include/database.item.php:94 +#: include/database.item.php:96 msgid "Menu simplifié pour retrouver rapidement un menu" msgstr "" @@ -8048,28 +8079,28 @@ msgstr "" #: include/database.item.php:113 include/database.item.php:102 #: include/database.item.php:110 include/database.item.php:101 #: include/database.item.php:109 include/database.item.php:99 -#: include/database.item.php:97 include/database.item.php:105 +#: include/database.item.php:99 include/database.item.php:107 msgid "Rapprochement" msgstr "" #: include/database.item.php:97 include/database.item.php:100 #: include/database.item.php:105 include/database.item.php:102 #: include/database.item.php:101 include/database.item.php:99 -#: include/database.item.php:97 +#: include/database.item.php:99 msgid "Rapprochement bancaire" msgstr "" #: include/database.item.php:98 include/database.item.php:101 #: include/database.item.php:106 include/database.item.php:103 #: include/database.item.php:102 include/database.item.php:100 -#: include/database.item.php:98 +#: include/database.item.php:100 msgid "Soldes" msgstr "" #: include/database.item.php:98 include/database.item.php:101 #: include/database.item.php:106 include/database.item.php:103 #: include/database.item.php:102 include/database.item.php:100 -#: include/database.item.php:98 +#: include/database.item.php:100 msgid "Solde des comptes en banques, caisse..." msgstr "" @@ -8077,7 +8108,7 @@ msgstr "" #: include/database.item.php:107 include/database.item.php:104 #: include/database.item.php:103 include/database.item.php:105 #: include/database.item.php:108 include/database.item.php:100 -#: include/database.item.php:100 +#: include/database.item.php:101 msgid "Lettrage par Poste" msgstr "" @@ -8085,91 +8116,91 @@ msgstr "" #: include/database.item.php:107 include/database.item.php:104 #: include/database.item.php:103 include/database.item.php:105 #: include/database.item.php:108 include/database.item.php:100 -#: include/database.item.php:100 +#: include/database.item.php:101 msgid "lettrage par poste comptable" msgstr "" #: include/database.item.php:100 include/database.item.php:103 #: include/database.item.php:109 include/database.item.php:106 #: include/database.item.php:105 include/database.item.php:101 -#: include/database.item.php:101 +#: include/database.item.php:102 msgid "Balance par catégorie de fiche" msgstr "" #: include/database.item.php:101 include/database.item.php:104 #: include/database.item.php:110 include/database.item.php:107 #: include/database.item.php:106 include/database.item.php:102 -#: include/database.item.php:102 +#: include/database.item.php:103 msgid "Plan Comptable" msgstr "" #: include/database.item.php:101 include/database.item.php:104 #: include/database.item.php:110 include/database.item.php:107 #: include/database.item.php:106 include/database.item.php:102 -#: include/database.item.php:102 +#: include/database.item.php:103 msgid "Config. du plan comptable" msgstr "" #: include/database.item.php:102 include/database.item.php:105 #: include/database.item.php:111 include/database.item.php:108 #: include/database.item.php:107 include/database.item.php:103 -#: include/database.item.php:103 +#: include/database.item.php:105 msgid "Historique vente" msgstr "" #: include/database.item.php:102 include/database.item.php:105 #: include/database.item.php:111 include/database.item.php:108 #: include/database.item.php:107 include/database.item.php:103 -#: include/database.item.php:103 +#: include/database.item.php:105 msgid "Historique des ventes" msgstr "" #: include/database.item.php:103 include/database.item.php:106 #: include/database.item.php:112 include/database.item.php:109 #: include/database.item.php:108 include/database.item.php:104 -#: include/database.item.php:104 +#: include/database.item.php:106 msgid "Historique financier" msgstr "" #: include/database.item.php:104 include/database.item.php:107 #: include/database.item.php:113 include/database.item.php:110 #: include/database.item.php:109 include/database.item.php:105 -#: include/database.item.php:105 +#: include/database.item.php:107 msgid "Impression des rapprochements" msgstr "" #: include/database.item.php:105 include/database.item.php:108 #: include/database.item.php:114 include/database.item.php:111 #: include/database.item.php:110 include/database.item.php:106 -#: include/database.item.php:106 +#: include/database.item.php:108 msgid "Bilan" msgstr "" #: include/database.item.php:105 include/database.item.php:108 #: include/database.item.php:114 include/database.item.php:111 #: include/database.item.php:110 include/database.item.php:106 -#: include/database.item.php:106 +#: include/database.item.php:108 msgid "Impression de bilan" msgstr "" #: include/database.item.php:106 include/database.item.php:109 #: include/database.item.php:115 include/database.item.php:112 #: include/database.item.php:111 include/database.item.php:107 -#: include/database.item.php:107 +#: include/database.item.php:109 msgid "Configuration des dépôts" msgstr "" #: include/database.item.php:106 include/database.item.php:109 #: include/database.item.php:115 include/database.item.php:112 #: include/database.item.php:111 include/database.item.php:107 -#: include/database.item.php:107 +#: include/database.item.php:109 msgid "Configuration dépôts" msgstr "" #: include/database.item.php:107 include/database.item.php:110 #: include/database.item.php:116 include/database.item.php:113 #: include/database.item.php:112 include/database.item.php:108 -#: include/database.item.php:108 +#: include/database.item.php:110 msgid "Stock" msgstr "" @@ -8186,91 +8217,91 @@ msgstr "" #: include/ext/import_card/include/template/input_file.php:36 #: include/ext/import_card/include/template/input_format.php:25 #: include/database.item.php:109 include/template/fiche_def_input.php:6 -#: include/database.item.php:109 +#: include/database.item.php:111 msgid "Catégorie de fiche" msgstr "" #: include/database.item.php:108 include/database.item.php:111 #: include/database.item.php:117 include/database.item.php:114 #: include/database.item.php:113 include/database.item.php:109 -#: include/database.item.php:109 +#: include/database.item.php:111 msgid "Gestion catégorie de fiche" msgstr "" #: include/database.item.php:109 include/database.item.php:112 #: include/database.item.php:118 include/database.item.php:115 #: include/database.item.php:114 include/database.item.php:110 -#: include/database.item.php:110 +#: include/database.item.php:112 msgid "Configuration de catégorie de fiches" msgstr "" #: include/database.item.php:110 include/database.item.php:113 #: include/database.item.php:119 include/database.item.php:116 #: include/database.item.php:115 include/database.item.php:111 -#: include/database.item.php:111 +#: include/database.item.php:113 msgid "Etat des documents" msgstr "" #: include/database.item.php:111 include/database.item.php:114 #: include/database.item.php:120 include/database.item.php:117 #: include/database.item.php:116 include/database.item.php:112 -#: include/database.item.php:112 +#: include/database.item.php:114 msgid "Menu opérations diverses" msgstr "" #: include/database.item.php:112 include/database.item.php:115 #: include/database.item.php:121 include/database.item.php:118 #: include/database.item.php:117 include/database.item.php:113 -#: include/database.item.php:113 +#: include/database.item.php:115 msgid "Impression Journaux" msgstr "" #: include/database.item.php:112 include/database.item.php:115 #: include/database.item.php:121 include/database.item.php:118 #: include/database.item.php:117 include/database.item.php:113 -#: include/database.item.php:113 +#: include/database.item.php:115 msgid "Impression des journaux" msgstr "" #: include/database.item.php:113 include/database.item.php:116 #: include/database.item.php:122 include/database.item.php:119 #: include/database.item.php:118 include/database.item.php:114 -#: include/database.item.php:114 +#: include/database.item.php:116 msgid "Vente / Recette" msgstr "" #: include/database.item.php:113 include/database.item.php:116 #: include/database.item.php:122 include/database.item.php:119 #: include/database.item.php:118 include/database.item.php:114 -#: include/database.item.php:114 +#: include/database.item.php:116 msgid "Menu ventes et recettes" msgstr "" #: include/database.item.php:114 include/database.item.php:117 #: include/database.item.php:123 include/database.item.php:120 #: include/database.item.php:119 include/database.item.php:115 -#: include/database.item.php:115 +#: include/database.item.php:117 msgid "Impression compta. analytique" msgstr "" #: include/database.item.php:115 include/database.item.php:118 #: include/database.item.php:124 include/database.item.php:121 #: include/database.item.php:120 include/database.item.php:116 -#: include/database.item.php:116 +#: include/database.item.php:118 msgid "Compta Analytique" msgstr "" #: include/database.item.php:115 include/database.item.php:118 #: include/database.item.php:124 include/database.item.php:121 #: include/database.item.php:120 include/database.item.php:116 -#: include/database.item.php:116 +#: include/database.item.php:118 msgid "Module comptabilité analytique" msgstr "" #: include/database.item.php:116 include/database.item.php:119 #: include/database.item.php:125 include/database.item.php:122 #: include/database.item.php:121 include/database.item.php:117 -#: include/database.item.php:117 +#: include/database.item.php:119 msgid "Tableau de bord" msgstr "" @@ -8279,14 +8310,14 @@ msgstr "" #: include/database.item.php:123 include/database.item.php:122 #: include/balance.inc.php:92 include/balance.inc.php:93 #: include/balance.inc.php:96 include/database.item.php:118 -#: include/database.item.php:118 include/balance.inc.php:96 +#: include/database.item.php:120 include/balance.inc.php:96 msgid "Avancé" msgstr "" #: include/database.item.php:117 include/database.item.php:120 #: include/database.item.php:126 include/database.item.php:123 #: include/database.item.php:122 include/database.item.php:118 -#: include/database.item.php:118 +#: include/database.item.php:120 msgid "Menu avancé" msgstr "" @@ -8299,49 +8330,49 @@ msgstr "" #: include/database.item.php:127 include/database.item.php:141 #: include/database.item.php:140 include/database.item.php:132 #: include/database.item.php:133 include/database.item.php:136 -#: include/database.item.php:131 include/database.item.php:131 +#: include/database.item.php:131 include/database.item.php:133 msgid "Raccourci vers vos menus préférés" msgstr "" #: include/database.item.php:119 include/database.item.php:122 #: include/database.item.php:128 include/database.item.php:124 #: include/database.item.php:123 include/database.item.php:127 -#: include/database.item.php:121 include/database.item.php:119 +#: include/database.item.php:121 include/database.item.php:121 msgid "Trésorerie" msgstr "" #: include/database.item.php:119 include/database.item.php:122 #: include/database.item.php:128 include/database.item.php:124 #: include/database.item.php:123 include/database.item.php:127 -#: include/database.item.php:121 include/database.item.php:119 +#: include/database.item.php:121 include/database.item.php:121 msgid "Menu Financier" msgstr "" #: include/database.item.php:120 include/database.item.php:123 #: include/database.item.php:129 include/database.item.php:125 #: include/database.item.php:124 include/database.item.php:128 -#: include/database.item.php:122 include/database.item.php:120 +#: include/database.item.php:122 include/database.item.php:122 msgid "Liste Suivi" msgstr "" #: include/database.item.php:120 include/database.item.php:123 #: include/database.item.php:129 include/database.item.php:125 #: include/database.item.php:124 include/database.item.php:128 -#: include/database.item.php:122 include/database.item.php:120 +#: include/database.item.php:122 include/database.item.php:122 msgid "Document de suivi sous forme de liste" msgstr "" #: include/database.item.php:121 include/database.item.php:124 #: include/database.item.php:130 include/database.item.php:126 #: include/database.item.php:125 include/database.item.php:129 -#: include/database.item.php:123 include/database.item.php:121 +#: include/database.item.php:123 include/database.item.php:123 msgid "Moyen de paiement" msgstr "" #: include/database.item.php:121 include/database.item.php:124 #: include/database.item.php:130 include/database.item.php:126 #: include/database.item.php:125 include/database.item.php:129 -#: include/database.item.php:123 include/database.item.php:121 +#: include/database.item.php:123 include/database.item.php:123 msgid "Config. des méthodes de paiement" msgstr "" @@ -8354,35 +8385,35 @@ msgstr "" #: 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 html/user_login.php:143 -#: include/admin_repo.inc.php:65 include/database.item.php:122 +#: include/admin_repo.inc.php:65 include/database.item.php:124 msgid "Administration" msgstr "" #: include/database.item.php:122 include/database.item.php:125 #: include/database.item.php:131 include/database.item.php:127 #: include/database.item.php:126 include/database.item.php:130 -#: include/database.item.php:124 include/database.item.php:122 +#: include/database.item.php:124 include/database.item.php:124 msgid "Suivi administration, banque" msgstr "" #: include/database.item.php:123 include/database.item.php:126 #: include/database.item.php:132 include/database.item.php:128 #: include/database.item.php:127 include/database.item.php:131 -#: include/database.item.php:125 include/database.item.php:123 +#: include/database.item.php:125 include/database.item.php:125 msgid "Prévision" msgstr "" #: include/database.item.php:124 include/database.item.php:127 #: include/database.item.php:133 include/database.item.php:129 #: include/database.item.php:128 include/database.item.php:132 -#: include/database.item.php:126 include/database.item.php:124 +#: include/database.item.php:126 include/database.item.php:126 msgid "Export opérations rapprochées" msgstr "" #: include/database.item.php:124 include/database.item.php:127 #: include/database.item.php:133 include/database.item.php:129 #: include/database.item.php:128 include/database.item.php:132 -#: include/database.item.php:126 include/database.item.php:124 +#: include/database.item.php:126 include/database.item.php:126 msgid "Export opérations rapprochées en CSV" msgstr "" @@ -8401,14 +8432,14 @@ msgstr "" #: html/user_login.php:115 html/user_login.php:115 include/param_sec.inc.php:99 #: include/param_sec.inc.php:158 include/user.inc.php:173 #: include/user_detail.inc.php:175 include/export/export_security_pdf.php:112 -#: include/database.item.php:125 +#: include/database.item.php:127 msgid "Administrateur" msgstr "" #: include/database.item.php:125 include/database.item.php:128 #: include/database.item.php:134 include/database.item.php:130 #: include/database.item.php:129 include/database.item.php:133 -#: include/database.item.php:127 include/database.item.php:125 +#: include/database.item.php:127 include/database.item.php:127 msgid "Suivi des gérants, administrateurs et salariés" msgstr "" @@ -8420,21 +8451,21 @@ msgstr "" #: include/ajax/ajax_get_menu_detail.php:71 include/ajax/ajax_add_menu.php:157 #: include/database.item.php:134 include/ajax/ajax_add_menu.php:165 #: include/database.item.php:128 include/ajax/ajax_add_menu.php:165 -#: include/ajax/ajax_get_menu_detail.php:71 include/database.item.php:126 +#: include/ajax/ajax_get_menu_detail.php:71 include/database.item.php:128 msgid "Menu par défaut" msgstr "" #: include/database.item.php:126 include/database.item.php:129 #: include/database.item.php:135 include/database.item.php:131 #: include/database.item.php:130 include/database.item.php:134 -#: include/database.item.php:128 include/database.item.php:126 +#: include/database.item.php:128 include/database.item.php:128 msgid "Configuration des menus par défaut" msgstr "" #: include/database.item.php:127 include/database.item.php:130 #: include/database.item.php:136 include/database.item.php:132 #: include/database.item.php:131 include/database.item.php:135 -#: include/database.item.php:129 include/database.item.php:127 +#: include/database.item.php:129 include/database.item.php:129 msgid "Agenda" msgstr "" @@ -8442,7 +8473,7 @@ msgstr "" #: include/database.item.php:168 include/database.item.php:172 #: include/database.item.php:171 include/database.item.php:135 #: include/database.item.php:136 include/database.item.php:146 -#: include/database.item.php:151 include/database.item.php:146 +#: include/database.item.php:151 include/database.item.php:181 msgid "Prix vente" msgstr "" @@ -8450,7 +8481,7 @@ msgstr "" #: include/database.item.php:169 include/database.item.php:173 #: include/database.item.php:172 include/database.item.php:136 #: include/database.item.php:137 include/database.item.php:147 -#: include/database.item.php:152 include/database.item.php:147 +#: include/database.item.php:152 include/database.item.php:182 msgid "Prix achat" msgstr "" @@ -8458,7 +8489,7 @@ msgstr "" #: include/database.item.php:175 include/database.item.php:179 #: include/database.item.php:178 include/database.item.php:137 #: include/database.item.php:138 include/database.item.php:139 -#: include/database.item.php:144 include/database.item.php:139 +#: include/database.item.php:144 include/database.item.php:149 msgid "Durée Amortissement" msgstr "" @@ -8466,7 +8497,7 @@ msgstr "" #: include/database.item.php:176 include/database.item.php:180 #: include/database.item.php:179 include/database.item.php:138 #: include/database.item.php:139 include/database.item.php:140 -#: include/database.item.php:145 include/database.item.php:140 +#: include/database.item.php:145 include/database.item.php:150 msgid "Montant initial" msgstr "" @@ -8474,7 +8505,7 @@ msgstr "" #: include/database.item.php:177 include/database.item.php:181 #: include/database.item.php:180 include/database.item.php:139 #: include/database.item.php:140 include/database.item.php:141 -#: include/database.item.php:146 include/database.item.php:141 +#: include/database.item.php:146 include/database.item.php:151 msgid "TVA non déductible" msgstr "" @@ -8482,7 +8513,7 @@ msgstr "" #: include/database.item.php:178 include/database.item.php:182 #: include/database.item.php:181 include/database.item.php:140 #: include/database.item.php:141 include/database.item.php:142 -#: include/database.item.php:147 include/database.item.php:142 +#: include/database.item.php:147 include/database.item.php:152 msgid "TVA non déductible récupérable par l'impôt" msgstr "" @@ -8490,7 +8521,7 @@ msgstr "" #: include/database.item.php:179 include/database.item.php:183 #: include/database.item.php:182 include/database.item.php:141 #: include/database.item.php:142 include/database.item.php:143 -#: include/database.item.php:148 include/database.item.php:143 +#: include/database.item.php:148 include/database.item.php:153 msgid "Partie fiscalement non déductible" msgstr "" @@ -8498,7 +8529,7 @@ msgstr "" #: include/database.item.php:180 include/database.item.php:184 #: include/database.item.php:183 include/database.item.php:142 #: include/database.item.php:143 include/database.item.php:144 -#: include/database.item.php:149 include/database.item.php:144 +#: include/database.item.php:149 include/database.item.php:154 msgid "Dépense charge du grant (partie privé) " msgstr "" @@ -8506,7 +8537,7 @@ msgstr "" #: include/database.item.php:181 include/database.item.php:185 #: include/database.item.php:184 include/database.item.php:143 #: include/database.item.php:144 include/database.item.php:145 -#: include/database.item.php:150 include/database.item.php:145 +#: include/database.item.php:150 include/database.item.php:155 msgid "Compte bancaire" msgstr "" @@ -8517,7 +8548,7 @@ msgstr "" #: include/database.item.php:148 include/lettering.account.inc.php:73 #: include/database.item.php:152 include/database.item.php:151 #: include/database.item.php:144 include/database.item.php:145 -#: include/database.item.php:153 include/database.item.php:148 +#: include/database.item.php:153 include/database.item.php:156 #: include/lettering.gestion.inc.php:27 include/lettering.account.inc.php:73 #: include/lettering.card.inc.php:69 msgid "Date début" @@ -8536,7 +8567,7 @@ msgstr "" #: include/database.item.php:155 include/template/ledger_detail_ven.php:131 #: include/template/operation_detail_ven.php:40 #: include/template/operation_detail_ach.php:39 -#: include/template/ledger_detail_ach.php:122 include/database.item.php:150 +#: include/template/ledger_detail_ach.php:122 include/database.item.php:158 msgid "Taux TVA" msgstr "" @@ -8544,7 +8575,7 @@ msgstr "" #: include/database.item.php:151 include/database.item.php:155 #: include/database.item.php:154 include/database.item.php:147 #: include/database.item.php:148 include/database.item.php:156 -#: include/database.item.php:151 +#: include/database.item.php:159 msgid "Nom de la banque" msgstr "" @@ -8552,7 +8583,7 @@ msgstr "" #: include/database.item.php:153 include/database.item.php:157 #: include/database.item.php:156 include/database.item.php:149 #: include/database.item.php:150 include/database.item.php:158 -#: include/database.item.php:153 +#: include/database.item.php:161 msgid "Personne de contact " msgstr "" @@ -8560,7 +8591,7 @@ msgstr "" #: include/database.item.php:154 include/database.item.php:158 #: include/database.item.php:157 include/database.item.php:150 #: include/database.item.php:151 include/database.item.php:159 -#: include/database.item.php:154 +#: include/database.item.php:162 msgid "numéro de tva " msgstr "" @@ -8568,7 +8599,7 @@ msgstr "" #: include/database.item.php:155 include/database.item.php:159 #: include/database.item.php:158 include/database.item.php:151 #: include/database.item.php:152 include/database.item.php:160 -#: include/database.item.php:155 +#: include/database.item.php:163 msgid "Adresse " msgstr "" @@ -8576,7 +8607,7 @@ msgstr "" #: include/database.item.php:156 include/database.item.php:160 #: include/database.item.php:159 include/database.item.php:152 #: include/database.item.php:153 include/database.item.php:161 -#: include/database.item.php:156 +#: include/database.item.php:164 msgid "pays " msgstr "" @@ -8584,7 +8615,7 @@ msgstr "" #: include/database.item.php:157 include/database.item.php:161 #: include/database.item.php:160 include/database.item.php:153 #: include/database.item.php:154 include/database.item.php:162 -#: include/database.item.php:157 +#: include/database.item.php:165 msgid "téléphone " msgstr "" @@ -8592,7 +8623,7 @@ msgstr "" #: include/database.item.php:158 include/database.item.php:162 #: include/database.item.php:161 include/database.item.php:154 #: include/database.item.php:155 include/database.item.php:163 -#: include/database.item.php:158 +#: include/database.item.php:166 msgid "email " msgstr "" @@ -8608,7 +8639,7 @@ msgstr "" #: include/database.item.php:157 include/export/export_stock_resume_list.php:38 #: include/database.item.php:165 include/template/stock_summary_list.php:40 #: include/export/export_stock_resume_list.php:38 -#: include/ajax/ajax_mod_stock_repo.php:55 include/database.item.php:160 +#: include/ajax/ajax_mod_stock_repo.php:55 include/database.item.php:168 #: include/stock_cfg.inc.php:67 msgid "Ville" msgstr "" @@ -8618,7 +8649,7 @@ msgstr "" #: include/ext/sav/include/template/sas_display_detail.php:111 #: include/database.item.php:166 include/database.item.php:165 #: include/database.item.php:158 include/database.item.php:159 -#: include/database.item.php:167 include/database.item.php:162 +#: include/database.item.php:167 include/database.item.php:170 msgid "GSM" msgstr "" @@ -8626,7 +8657,7 @@ msgstr "" #: include/database.item.php:163 include/database.item.php:167 #: include/database.item.php:166 include/database.item.php:159 #: include/database.item.php:160 include/database.item.php:168 -#: include/database.item.php:163 +#: include/database.item.php:171 msgid "code postal" msgstr "" @@ -8634,7 +8665,7 @@ msgstr "" #: include/database.item.php:164 include/database.item.php:168 #: include/database.item.php:167 include/database.item.php:160 #: include/database.item.php:161 include/database.item.php:169 -#: include/database.item.php:164 +#: include/database.item.php:172 msgid "Numero de client" msgstr "" @@ -8650,7 +8681,7 @@ msgstr "" #: include/user.inc.php:145 include/class/balance_age.class.php:146 #: include/database.item.php:170 include/user.inc.php:81 #: include/user.inc.php:145 include/template/todo_list_list_user.php:43 -#: include/database.item.php:165 include/class/balance_age.class.php:146 +#: include/database.item.php:173 include/class/balance_age.class.php:146 msgid "Prénom" msgstr "" @@ -8658,7 +8689,7 @@ msgstr "" #: include/database.item.php:170 include/database.item.php:174 #: include/database.item.php:173 include/database.item.php:162 #: include/database.item.php:163 include/database.item.php:166 -#: include/database.item.php:171 include/database.item.php:166 +#: include/database.item.php:171 include/database.item.php:174 msgid "Contrepartie pour TVA récup par impot" msgstr "" @@ -8666,7 +8697,7 @@ msgstr "" #: include/database.item.php:171 include/database.item.php:175 #: include/database.item.php:174 include/database.item.php:163 #: include/database.item.php:164 include/database.item.php:167 -#: include/database.item.php:172 include/database.item.php:167 +#: include/database.item.php:172 include/database.item.php:175 msgid "Contrepartie pour TVA non Ded." msgstr "" @@ -8674,7 +8705,7 @@ msgstr "" #: include/database.item.php:172 include/database.item.php:176 #: include/database.item.php:175 include/database.item.php:164 #: include/database.item.php:165 include/database.item.php:168 -#: include/database.item.php:173 include/database.item.php:168 +#: include/database.item.php:173 include/database.item.php:176 msgid "Contrepartie pour dépense à charge du gérant" msgstr "" @@ -8682,7 +8713,7 @@ msgstr "" #: include/database.item.php:173 include/database.item.php:177 #: include/database.item.php:176 include/database.item.php:165 #: include/database.item.php:166 include/database.item.php:169 -#: include/database.item.php:174 include/database.item.php:169 +#: include/database.item.php:174 include/database.item.php:177 msgid "Contrepartie pour dépense fiscal. non déd." msgstr "" @@ -8696,23 +8727,23 @@ msgstr "" #: 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 include/ajax/ajax_display_letter.php:116 -#: include/database.item.php:171 +#: include/database.item.php:179 #: include/class/periode_ledger_table.class.php:99 -#: include/class/periode.class.php:520 +#: include/class/periode.class.php:522 msgid "Date Fin" msgstr "" #: include/database.item.php:163 include/database.item.php:166 #: include/database.item.php:170 include/database.item.php:169 #: include/database.item.php:168 include/database.item.php:172 -#: include/database.item.php:177 include/database.item.php:172 +#: include/database.item.php:177 include/database.item.php:180 msgid "Gestion stock" msgstr "" #: include/database.item.php:164 include/database.item.php:167 #: include/database.item.php:171 include/database.item.php:170 #: include/database.item.php:169 include/database.item.php:173 -#: include/database.item.php:178 include/database.item.php:173 +#: include/database.item.php:178 include/database.item.php:183 msgid "Société" msgstr "" @@ -8720,7 +8751,7 @@ msgstr "" #: include/database.item.php:191 include/database.item.php:194 #: include/database.item.php:192 include/database.item.php:172 #: include/database.item.php:173 include/database.item.php:176 -#: include/database.item.php:184 include/database.item.php:176 +#: include/database.item.php:184 include/database.item.php:189 msgid "Document Interne" msgstr "" @@ -8728,7 +8759,7 @@ msgstr "" #: include/database.item.php:195 include/database.item.php:198 #: include/database.item.php:196 include/database.item.php:173 #: include/database.item.php:174 include/database.item.php:177 -#: include/database.item.php:185 include/database.item.php:177 +#: include/database.item.php:185 include/database.item.php:190 msgid "Bons de commande client" msgstr "" @@ -8736,7 +8767,7 @@ msgstr "" #: include/database.item.php:194 include/database.item.php:197 #: include/database.item.php:195 include/database.item.php:174 #: include/database.item.php:175 include/database.item.php:178 -#: include/database.item.php:186 include/database.item.php:178 +#: include/database.item.php:186 include/database.item.php:191 msgid "Bon de commande Fournisseur" msgstr "" @@ -8751,8 +8782,8 @@ msgstr "" #: include/ext/invoicing/include/invoice_to_zip.inc.php:76 #: include/compta_ach.inc.php:89 include/compta_ven.inc.php:96 #: include/database.item.php:179 include/database.item.php:187 -#: include/compta_ven.inc.php:96 include/database.item.php:179 -#: include/compta_ach.inc.php:89 +#: include/compta_ven.inc.php:94 include/database.item.php:192 +#: include/compta_ach.inc.php:87 msgid "Facture" msgstr "" @@ -8760,7 +8791,7 @@ msgstr "" #: include/database.item.php:198 include/database.item.php:201 #: include/database.item.php:176 include/database.item.php:177 #: include/database.item.php:180 include/database.item.php:188 -#: include/database.item.php:180 +#: include/database.item.php:193 msgid "Lettre de rappel" msgstr "" @@ -8768,7 +8799,7 @@ msgstr "" #: include/database.item.php:207 include/database.item.php:204 #: include/database.item.php:177 include/database.item.php:178 #: include/database.item.php:181 include/database.item.php:189 -#: include/database.item.php:181 +#: include/database.item.php:194 msgid "Courrier" msgstr "" @@ -8776,7 +8807,7 @@ msgstr "" #: include/database.item.php:205 include/database.item.php:202 #: include/database.item.php:178 include/database.item.php:179 #: include/database.item.php:182 include/database.item.php:190 -#: include/database.item.php:182 +#: include/database.item.php:195 msgid "Proposition" msgstr "" @@ -8790,7 +8821,7 @@ msgstr "" #: include/user.inc.php:84 include/database.item.php:191 #: 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 +#: include/database.item.php:196 msgid "Email" msgstr "" @@ -8798,7 +8829,7 @@ msgstr "" #: include/database.item.php:192 include/database.item.php:195 #: include/database.item.php:193 include/database.item.php:181 #: include/database.item.php:182 include/database.item.php:185 -#: include/database.item.php:185 +#: include/database.item.php:198 msgid "Note de frais" msgstr "" @@ -8806,7 +8837,7 @@ msgstr "" #: include/database.item.php:200 include/database.item.php:205 #: include/database.item.php:182 include/database.item.php:183 #: include/database.item.php:186 include/database.item.php:194 -#: include/database.item.php:186 +#: include/database.item.php:199 msgid "Réception commande Fournisseur" msgstr "" @@ -8814,7 +8845,7 @@ msgstr "" #: include/database.item.php:199 include/database.item.php:206 #: include/database.item.php:183 include/database.item.php:184 #: include/database.item.php:187 include/database.item.php:195 -#: include/database.item.php:187 +#: include/database.item.php:200 msgid "Réception commande Client" msgstr "" @@ -8822,49 +8853,49 @@ msgstr "" #: include/database.item.php:202 include/database.item.php:207 #: include/database.item.php:184 include/database.item.php:185 #: include/database.item.php:188 include/database.item.php:196 -#: include/database.item.php:188 +#: include/database.item.php:201 msgid "Réception magazine" msgstr "" #: include/database.item.php:182 include/database.item.php:185 #: include/database.item.php:210 include/database.item.php:187 #: include/database.item.php:188 include/database.item.php:191 -#: include/database.item.php:202 include/database.item.php:191 +#: include/database.item.php:202 include/database.item.php:207 msgid "Ajout de fiche" msgstr "" #: include/database.item.php:183 include/database.item.php:186 #: include/database.item.php:211 include/database.item.php:188 #: include/database.item.php:189 include/database.item.php:192 -#: include/database.item.php:203 include/database.item.php:192 +#: include/database.item.php:203 include/database.item.php:208 msgid "Création, modification et effacement de fiche" msgstr "" #: include/database.item.php:184 include/database.item.php:187 #: include/database.item.php:212 include/database.item.php:189 #: include/database.item.php:190 include/database.item.php:193 -#: include/database.item.php:204 include/database.item.php:193 +#: include/database.item.php:204 include/database.item.php:209 msgid "création, modification et effacement de catégorie de fiche" msgstr "" #: include/database.item.php:185 include/database.item.php:188 #: include/database.item.php:213 include/database.item.php:190 #: include/database.item.php:191 include/database.item.php:194 -#: include/database.item.php:205 include/database.item.php:194 +#: include/database.item.php:205 include/database.item.php:210 msgid "Effacer les documents du suivi" msgstr "" #: include/database.item.php:186 include/database.item.php:189 #: include/database.item.php:214 include/database.item.php:191 #: include/database.item.php:192 include/database.item.php:195 -#: include/database.item.php:206 include/database.item.php:195 +#: include/database.item.php:206 include/database.item.php:211 msgid "Voir les documents du suivi" msgstr "" #: include/database.item.php:187 include/database.item.php:190 #: include/database.item.php:215 include/database.item.php:192 #: include/database.item.php:193 include/database.item.php:196 -#: include/database.item.php:207 include/database.item.php:196 +#: include/database.item.php:207 include/database.item.php:212 msgid "Modifier le type de document" msgstr "" @@ -8875,7 +8906,7 @@ msgstr "" #: include/database.item.php:202 include/database.item.php:201 #: include/database.item.php:203 include/database.item.php:204 #: include/database.item.php:206 include/database.item.php:220 -#: include/database.item.php:202 include/database.item.php:204 +#: include/database.item.php:223 include/database.item.php:225 msgid "Caisse" msgstr "" @@ -8883,7 +8914,7 @@ msgstr "" #: include/database.item.php:219 include/database.item.php:224 #: include/database.item.php:201 include/database.item.php:202 #: include/database.item.php:205 include/database.item.php:203 -#: include/database.item.php:203 +#: include/database.item.php:224 msgid "Paiement électronique" msgstr "" @@ -8892,7 +8923,7 @@ msgstr "" #: include/database.item.php:226 include/database.item.php:203 #: include/database.item.php:204 include/database.item.php:207 #: include/database.item.php:221 include/database.item.php:205 -#: include/database.item.php:205 +#: include/database.item.php:226 msgid "Par gérant ou administrateur" msgstr "" @@ -8908,8 +8939,8 @@ msgstr "" #: 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/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/cfgledger.inc.php:170 include/database.item.php:233 +#: include/database.item.php:252 include/class/acc_ledger_search.class.php:1095 #: include/lib/user_menu.php:136 msgid "Financier" msgstr "" @@ -8919,7 +8950,7 @@ msgstr "" #: include/database.item.php:231 include/database.item.php:208 #: include/database.item.php:209 include/database.item.php:212 #: include/database.item.php:229 include/database.item.php:210 -#: include/database.item.php:210 +#: include/database.item.php:232 msgid "Opération Diverses" msgstr "" @@ -8928,7 +8959,7 @@ msgstr "" #: include/database.item.php:235 include/database.item.php:212 #: include/database.item.php:213 include/database.item.php:216 #: include/database.item.php:236 include/database.item.php:214 -#: include/database.item.php:214 +#: include/database.item.php:245 msgid "" "Concerne tous les achats, factures reçues, notes de crédit reçues et notes " "de frais" @@ -8938,7 +8969,7 @@ msgstr "" #: include/database.item.php:236 include/database.item.php:213 #: include/database.item.php:214 include/database.item.php:217 #: include/database.item.php:237 include/database.item.php:215 -#: include/database.item.php:215 +#: include/database.item.php:243 msgid "" "Concerne tous les mouvements financiers (comptes en banque, caisses, visa...)" msgstr "" @@ -8948,7 +8979,7 @@ msgstr "" #: include/database.item.php:237 include/database.item.php:214 #: include/database.item.php:215 include/database.item.php:218 #: include/database.item.php:238 include/database.item.php:216 -#: include/database.item.php:216 +#: include/database.item.php:242 msgid "" "Concerne toutes les opérations comme les amortissements, les comptes TVA, ..." msgstr "" @@ -8958,7 +8989,7 @@ msgstr "" #: include/database.item.php:238 include/database.item.php:215 #: include/database.item.php:216 include/database.item.php:219 #: include/database.item.php:239 include/database.item.php:217 -#: include/database.item.php:217 +#: include/database.item.php:244 msgid "Concerne toutes les ventes, notes de crédit envoyées" msgstr "" @@ -9042,7 +9073,7 @@ msgstr "" #: include/dossier.inc.php:214 include/modele.inc.php:261 #: include/dossier.inc.php:217 include/dossier.inc.php:222 #: include/modele.inc.php:262 include/anc_group.inc.php:81 -#: include/dossier.inc.php:222 include/modele.inc.php:262 +#: include/dossier.inc.php:222 include/modele.inc.php:263 msgid "Ajouter" msgstr "" @@ -9065,7 +9096,7 @@ msgstr "" #: include/modele.inc.php:314 include/dossier.inc.php:281 #: include/dossier.inc.php:286 include/modele.inc.php:315 #: include/modele.inc.php:320 include/dossier.inc.php:286 -#: include/modele.inc.php:320 +#: include/modele.inc.php:321 msgid "Backup" msgstr "" @@ -9091,8 +9122,8 @@ msgstr "" #: include/dossier.inc.php:353 include/compta_ach.inc.php:89 #: include/compta_ach.inc.php:91 include/compta_ven.inc.php:98 #: include/dossier.inc.php:358 include/upgrade.inc.php:36 -#: include/compta_ven.inc.php:98 include/upgrade.inc.php:36 -#: include/dossier.inc.php:358 include/compta_ach.inc.php:91 +#: include/compta_ven.inc.php:96 include/upgrade.inc.php:36 +#: include/dossier.inc.php:358 include/compta_ach.inc.php:89 #: include/operation_ods_confirm.inc.php:51 msgid "Modèle" msgstr "" @@ -9116,7 +9147,7 @@ msgstr "" #: include/modele.inc.php:318 include/ajax/ajax_admin.php:244 #: include/ajax/ajax_admin.php:322 include/template/list_mod_payment.php:79 #: include/ajax/ajax_admin.php:244 include/ajax/ajax_admin.php:322 -#: include/modele.inc.php:318 +#: include/modele.inc.php:319 msgid "Modifie" msgstr "" @@ -9143,7 +9174,7 @@ msgstr "" #: include/modele.inc.php:396 include/dossier.inc.php:377 #: include/dossier.inc.php:382 include/modele.inc.php:397 #: include/modele.inc.php:402 include/dossier.inc.php:382 -#: include/modele.inc.php:402 +#: include/modele.inc.php:403 msgid "Désolé, vous n'avez pas coché la case" msgstr "" @@ -9238,12 +9269,12 @@ msgstr "" #: 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:529 -#: include/class/acc_ledger_history_generic.class.php:766 -#: include/class/acc_ledger_sold.class.php:1403 +#: include/class/acc_ledger_history_generic.class.php:769 +#: include/class/acc_ledger_sold.class.php:1412 #: include/class/print_ledger_misc.class.php:45 #: include/class/acc_reconciliation.class.php:492 #: include/class/fiche.class.php:1475 -#: include/class/acc_ledger_purchase.class.php:1832 +#: include/class/acc_ledger_purchase.class.php:1838 #: include/class/anc_grandlivre.class.php:219 #: include/class/balance_age.class.php:149 msgid "Interne" @@ -9660,7 +9691,7 @@ 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/cfgledger.inc.php:139 include/ajax/ajax_card.php:171 +#: include/cfgledger.inc.php:139 include/ajax/ajax_card.php:172 #: include/ajax/ajax_admin.php:254 include/ajax/ajax_admin.php:280 msgid "Efface" msgstr "" @@ -9757,7 +9788,7 @@ 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/lib/user_menu.php:76 include/modele.inc.php:258 +#: include/lib/user_menu.php:76 include/modele.inc.php:259 #: include/lib/user_menu.php:76 msgid "Modèles" msgstr "" @@ -10222,11 +10253,11 @@ msgstr "" #: 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:684 -#: include/class/acc_ledger_sold.class.php:1406 +#: include/class/acc_ledger_history_generic.class.php:687 +#: include/class/acc_ledger_sold.class.php:1415 #: include/class/acc_ledger_fin.class.php:550 #: include/class/print_ledger_misc.class.php:47 -#: include/class/acc_ledger_purchase.class.php:1835 +#: include/class/acc_ledger_purchase.class.php:1841 #: include/class/pdf_operation.class.php:82 msgid "Commentaire" msgstr "" @@ -10296,8 +10327,15 @@ msgstr "" #: include/template/detail-action.php:321 #: 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 +#: include/template/tax_summary_display.php:60 +#: include/template/tax_summary_display.php:116 +#: include/template/tax_summary_display.php:208 +#: include/template/tax_summary_display.php:288 +#: include/export/export_printtva_pdf.php:57 +#: include/export/export_printtva_pdf.php:212 +#: include/class/print_ledger_detail_item.class.php:163 +#: include/class/acc_ledger_sold.class.php:1426 +#: include/class/acc_ledger_purchase.class.php:1852 msgid "Code TVA" msgstr "" @@ -10514,8 +10552,8 @@ msgstr "" #: include/template/form_ledger_detail.php:76 #: include/template/predf_ledger_detail.php:21 #: include/template/predf_ledger_detail.php:74 -#: include/class/acc_ledger_sold.class.php:1419 -#: include/class/acc_ledger_purchase.class.php:1848 +#: include/class/acc_ledger_sold.class.php:1428 +#: include/class/acc_ledger_purchase.class.php:1854 msgid "Total HTVA" msgstr "" @@ -10808,6 +10846,7 @@ msgstr "" #: 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 #: include/template/ledger_detail_ven.php:136 #: include/template/acc_ledger_history_purchase_oneline.php:53 #: include/template/operation_detail_ven.php:44 @@ -10819,6 +10858,7 @@ msgstr "" #: include/template/acc_ledger_history_sale_extended.php:129 #: include/template/ledger_detail_ach.php:133 #: include/class/print_ledger_simple.class.php:110 +#: include/class/print_ledger_detail_item.class.php:161 #: include/class/acc_ledger_history_purchase.class.php:260 #: include/class/acc_ledger_history_sale.class.php:249 msgid "HTVA" @@ -10870,6 +10910,7 @@ msgstr "" #: 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 +#: include/class/print_ledger_detail_item.class.php:165 msgid "TVAC" msgstr "" @@ -10889,7 +10930,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 +#: include/template/ledger_detail_bottom.php:318 msgid "verifie CA" msgstr "" @@ -10910,8 +10951,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 +#: include/template/ledger_detail_bottom.php:333 +#: include/template/ledger_detail_bottom.php:346 msgid "Extourner" msgstr "" @@ -11053,12 +11094,12 @@ msgid "Nom journal" msgstr "" #: include/template/param_jrn.php:15 include/template/param_jrn.php:22 -#: include/template/param_jrn.php:22 +#: include/template/param_jrn.php:25 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 +#: include/template/param_jrn.php:31 msgid "" "Uniquement pour les journaux d'Opérations Diverses, les valeurs sont " "séparées par des espaces, on peut aussi\n" @@ -11066,7 +11107,7 @@ msgid "" msgstr "" #: include/template/param_jrn.php:33 include/template/param_jrn.php:40 -#: include/template/param_jrn.php:40 +#: include/template/param_jrn.php:46 msgid "Numérotation de chaque opération" msgstr "" @@ -11074,7 +11115,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/param_jrn.php:54 #: include/template/operation_detail_fin.php:31 #: include/template/ledger_detail_fin.php:35 #: include/compta_fin_saldo.inc.php:48 @@ -11092,12 +11133,12 @@ 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 include/template/param_jrn.php:137 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 include/template/param_jrn.php:141 msgid "Préfixe pièce justificative" msgstr "" @@ -11114,13 +11155,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 +#: include/template/param_jrn.php:152 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 +#: include/template/param_jrn.php:161 msgid "N° pièce justificative" msgstr "" @@ -11284,7 +11325,7 @@ msgstr "" #: include/ext/coprop/index.php:44 include/database.item.php:3 #: include/database.item.php:143 include/database.item.php:139 #: include/database.item.php:138 include/database.item.php:131 -#: include/database.item.php:129 include/database.item.php:129 +#: include/database.item.php:129 include/database.item.php:131 msgid "Clef de répartition" msgstr "" @@ -11387,7 +11428,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/periode.class.php:237 -#: include/class/acc_ledger.class.php:89 include/class/periode.class.php:237 +#: include/class/acc_ledger.class.php:91 include/class/periode.class.php:239 #: include/lib/http_input.class.php:123 msgid "Paramètre invalide" msgstr "" @@ -11436,7 +11477,7 @@ msgstr "" #: include/ext/importbank/include/template/confirm_transfer.php:285 #: include/verif_bilan.inc.php:152 include/verif_bilan.inc.php:214 #: include/verif_bilan.inc.php:217 include/audit_log.php:40 -#: include/verif_bilan.inc.php:152 include/verif_bilan.inc.php:217 +#: include/verif_bilan.inc.php:152 include/verif_bilan.inc.php:219 msgid "Résultat" msgstr "" @@ -11557,7 +11598,7 @@ msgstr "" #: 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:521 include/bank.inc.php:72 +#: include/class/periode.class.php:523 include/bank.inc.php:72 #: include/impress_bilan.inc.php:49 msgid "Exercice" msgstr "" @@ -11603,7 +11644,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 +#: include/tax_summary.inc.php:43 include/lib/message_javascript.php:96 msgid "Afficher" msgstr "" @@ -11884,7 +11925,7 @@ msgstr "" #: include/ajax/ajax_card.php:375 include/export/export_fiche_detail_pdf.php:53 #: include/ajax/ajax_add_concerned_card.php:48 include/ajax/ajax_card.php:378 #: include/export/export_fiche_detail_pdf.php:53 include/ajax/ajax_card.php:133 -#: include/ajax/ajax_card.php:378 include/ajax/ajax_add_concerned_card.php:48 +#: include/ajax/ajax_card.php:379 include/ajax/ajax_add_concerned_card.php:48 msgid "Détail fiche" msgstr "" @@ -11938,7 +11979,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_ledger.class.php:1121 #: include/class/acc_compute.class.php:195 msgid "Montant invalide" msgstr "" @@ -12087,7 +12128,7 @@ msgstr "" #: 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 +#: include/class/tax_summary.class.php:334 include/anc_pa.inc.php:123 msgid "Export CSV" msgstr "" @@ -12193,10 +12234,12 @@ msgstr "" #: 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 #: include/export/export_poste_detail_csv.php:83 #: include/export/export_poste_detail_csv.php:196 #: include/export/export_ledger_csv.php:221 -#: include/class/acc_ledger_history_generic.class.php:769 +#: include/class/print_ledger_detail_item.class.php:156 +#: include/class/acc_ledger_history_generic.class.php:772 #: include/class/acc_account_ledger.class.php:394 #: include/class/balance_age.class.php:144 msgid "QuickCode" @@ -12239,8 +12282,8 @@ msgstr "" #: include/ext/invoicing/include/invoice_send_mail_input.inc.php:91 #: include/ext/invoicing/include/template/recorded_message_display.php:27 #: include/compta_ach.inc.php:111 include/compta_ven.inc.php:118 -#: include/operation_ods_confirm.inc.php:68 include/compta_ven.inc.php:118 -#: include/compta_ach.inc.php:111 include/operation_ods_confirm.inc.php:68 +#: include/operation_ods_confirm.inc.php:68 include/compta_ven.inc.php:116 +#: include/compta_ach.inc.php:109 include/operation_ods_confirm.inc.php:68 msgid "Message" msgstr "" @@ -12981,6 +13024,7 @@ msgstr "" #: include/ext/rapport_avance/include/template/parameter_send_mail_input.php:23 #: include/ext/rapport_avance/include/template/parameter_send_mail_input.php:27 +#: scenario/HtmlInput.test.php:89 msgid "Envoi" msgstr "" @@ -13035,7 +13079,7 @@ msgstr "" #: html/ajax_card.php:182 html/ajax_card.php:200 html/ajax_card.php:201 #: include/ajax/ajax_card.php:181 include/ajax/ajax_card.php:182 #: include/ajax/ajax_card.php:185 include/ajax/ajax_card.php:191 -#: include/ajax/ajax_card.php:191 +#: include/ajax/ajax_card.php:192 msgid "Nouvelle fiche" msgstr "" @@ -13048,8 +13092,8 @@ msgstr "" #: include/ajax/ajax_card.php:263 include/ajax/ajax_card.php:318 #: include/ajax/ajax_card.php:259 include/ajax/ajax_card.php:269 #: include/ajax/ajax_card.php:334 include/ajax/ajax_card.php:280 -#: include/ajax/ajax_card.php:337 include/ajax/ajax_card.php:280 -#: include/ajax/ajax_card.php:337 +#: include/ajax/ajax_card.php:337 include/ajax/ajax_card.php:281 +#: include/ajax/ajax_card.php:338 msgid "Choix de la catégorie" msgstr "" @@ -13061,7 +13105,7 @@ msgstr "" #: html/ajax_card.php:304 html/ajax_card.php:340 html/ajax_card.php:342 #: html/ajax_card.php:343 include/ajax/ajax_card.php:323 #: include/ajax/ajax_card.php:324 include/ajax/ajax_card.php:342 -#: include/ajax/ajax_card.php:345 include/ajax/ajax_card.php:345 +#: include/ajax/ajax_card.php:345 include/ajax/ajax_card.php:346 msgid "Fiche sauvée" msgstr "" @@ -13069,7 +13113,7 @@ msgstr "" #: html/ajax_card.php:470 html/ajax_card.php:471 include/ajax/ajax_card.php:451 #: include/ajax/ajax_card.php:452 include/ajax/ajax_card.php:453 #: include/ajax/ajax_card.php:486 include/ajax/ajax_card.php:490 -#: include/ajax/ajax_card.php:490 +#: include/ajax/ajax_card.php:491 msgid " de contacts" msgstr "" @@ -13078,7 +13122,7 @@ msgstr "" #: html/ajax_card.php:563 include/ajax/ajax_card.php:543 #: include/ajax/ajax_card.php:544 include/ajax/ajax_card.php:545 #: include/ajax/ajax_card.php:578 include/ajax/ajax_card.php:582 -#: include/ajax/ajax_card.php:582 +#: include/ajax/ajax_card.php:605 msgid "Détail fiche (sauvée)" msgstr "" @@ -13090,7 +13134,7 @@ msgstr "" #: include/ajax/ajax_history.php:58 include/ajax/ajax_history.php:141 #: include/ajax/ajax_history.php:61 include/ajax/ajax_history.php:146 #: include/ajax/ajax_history.php:147 include/ajax/ajax_history.php:61 -#: include/ajax/ajax_history.php:147 include/balance_card.inc.php:36 +#: include/ajax/ajax_history.php:148 include/balance_card.inc.php:36 msgid "" "erreur aucune période par défaut, allez dans préférence pour en choisir une" msgstr "" @@ -13109,7 +13153,7 @@ msgstr "" #: include/ajax/ajax_history.php:97 include/ajax/ajax_history.php:177 #: include/ajax/ajax_history.php:183 include/ajax/ajax_history.php:184 #: include/ajax/ajax_history.php:91 include/ajax/ajax_history.php:97 -#: include/ajax/ajax_history.php:178 include/ajax/ajax_history.php:184 +#: include/ajax/ajax_history.php:179 include/ajax/ajax_history.php:185 msgid "Autre exercice" msgstr "" @@ -13122,7 +13166,7 @@ msgstr "" #: include/ajax/ajax_history.php:117 include/ajax/ajax_history.php:202 #: include/ajax/ajax_history.php:121 include/ajax/ajax_history.php:207 #: include/ajax/ajax_history.php:208 include/ajax/ajax_history.php:121 -#: include/ajax/ajax_history.php:208 include/balance_card.inc.php:70 +#: include/ajax/ajax_history.php:209 include/balance_card.inc.php:70 msgid "Aucune opération pour l'exercice courant" msgstr "" @@ -13137,7 +13181,7 @@ msgstr "" #: include/ajax/ajax_ledger.php:350 include/ajax/ajax_ledger.php:237 #: include/ajax/ajax_ledger.php:239 include/ajax/ajax_ledger.php:352 #: include/ajax/ajax_ledger.php:243 include/ajax/ajax_ledger.php:356 -#: include/ajax/ajax_ledger.php:243 include/ajax/ajax_ledger.php:356 +#: include/ajax/ajax_ledger.php:244 include/ajax/ajax_ledger.php:357 msgid "Chargement" msgstr "" @@ -13152,8 +13196,8 @@ 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 +#: include/template/ledger_detail_bottom.php:352 +#: include/ajax/ajax_ledger.php:545 msgid "entrez une date" msgstr "" @@ -13177,8 +13221,9 @@ msgstr "" #: 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 #: include/template/ledger_detail_fin.php:60 -#: include/template/ledger_detail_bottom.php:216 +#: include/template/ledger_detail_bottom.php:213 #: include/export/export_ledger_csv.php:225 #: include/ajax/ajax_display_letter.php:55 #: include/class/acc_reconciliation.class.php:489 @@ -13237,6 +13282,7 @@ msgstr "" #: 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 +#: include/class/tax_summary.class.php:350 msgid "Export PDF" msgstr "" @@ -13323,7 +13369,9 @@ 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/lib/message_javascript.php:102 -#: include/template/ledger_detail_bottom.php:287 +#: include/template/ledger_detail_bottom.php:284 +#: include/template/tax_summary_display.php:105 +#: include/template/tax_summary_display.php:277 #: include/export/export_fiche_detail_csv.php:60 #: include/lib/message_javascript.php:102 include/lib/ac_common.php:1247 msgid "Aucune donnée" @@ -13412,7 +13460,7 @@ msgstr "" #: include/class/acc_ledger.class.php:577 #: include/class/acc_ledger.class.php:578 include/template/dashboard.php:175 #: include/export/export_gl_csv.php:90 include/ajax/ajax_boxcard_search.php:70 -#: include/class/acc_ledger.class.php:578 +#: include/class/acc_ledger.class.php:594 msgid "Aucun résultat" msgstr "" @@ -13793,7 +13841,7 @@ msgstr "" #: include/dossier.inc.php:218 include/modele.inc.php:245 #: include/dossier.inc.php:221 include/dossier.inc.php:226 #: include/modele.inc.php:246 include/class/tva_rate_mtable.class.php:47 -#: include/dossier.inc.php:226 include/modele.inc.php:246 +#: include/dossier.inc.php:226 include/modele.inc.php:247 #: include/class/tva_rate_mtable.class.php:47 include/card_attr.inc.php:94 msgid "id" msgstr "" @@ -14017,7 +14065,7 @@ msgstr "" #: include/class/acc_ledger.class.php:113 #: include/class/acc_ledger.class.php:115 #: include/class/acc_ledger.class.php:116 -#: include/class/acc_ledger.class.php:116 +#: include/class/acc_ledger.class.php:134 msgid " Tous les journaux" msgstr "" @@ -14028,7 +14076,7 @@ msgstr "" #: include/class/acc_ledger.class.php:199 #: include/class/acc_ledger.class.php:202 #: include/class/acc_ledger.class.php:203 -#: include/class/acc_ledger.class.php:203 +#: include/class/acc_ledger.class.php:221 msgid "this->jr_id is not set ou opération inconnue" msgstr "" @@ -14108,11 +14156,12 @@ msgstr "" #: 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 #: 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.class.php:2452 #: 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 @@ -14155,6 +14204,7 @@ msgstr "" #: include/class/fiche.class.php:1475 #: include/class/acc_ledger_history_generic.class.php:683 #: include/class/fiche.class.php:1476 include/export/export_ledger_csv.php:214 +#: include/export/export_ledger_csv.php:222 #: include/template/operation_detail_fin.php:32 #: include/template/acc_ledger_history_financial_oneline.php:34 #: include/template/ledger_detail_fin.php:45 @@ -14163,7 +14213,7 @@ msgstr "" #: 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 +#: include/class/acc_ledger_history_generic.class.php:686 #: include/class/acc_ledger_search.class.php:650 #: include/class/print_ledger_misc.class.php:46 #: include/class/acc_account_ledger.class.php:396 @@ -14190,7 +14240,7 @@ msgstr "" #: include/class/acc_ledger.class.php:1022 #: include/class/acc_ledger.class.php:597 #: include/class/acc_ledger.class.php:598 -#: include/class/acc_ledger.class.php:598 +#: include/class/acc_ledger.class.php:614 msgid "Attention : il vaut mieux utiliser les fiches que les postes comptables" msgstr "" @@ -14203,7 +14253,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 +#: include/class/acc_ledger.class.php:1223 msgid "" "Attention : il vaut mieux utiliser les fiches que les postes comptables " msgstr "" @@ -14219,7 +14269,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 +#: include/class/acc_ledger.class.php:1325 msgid "Balance incorrecte" msgstr "" @@ -14233,7 +14283,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 +#: include/class/acc_ledger.class.php:1367 msgid "OPERATION ANNULEE " msgstr "" @@ -14247,7 +14297,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 +#: include/class/acc_ledger.class.php:1690 msgid "Celui qui paie n' a pas de poste comptable" msgstr "" @@ -14261,7 +14311,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 +#: include/class/acc_ledger.class.php:1708 #, php-format msgid "Pour la fiche %s le poste comptable [%s] n'existe pas" msgstr "" @@ -14277,7 +14327,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 +#: include/class/acc_ledger.class.php:2134 msgid "Journaux de vente" msgstr "" @@ -14317,7 +14367,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 +#: include/class/acc_ledger.class.php:2344 msgid "Nombre de ligne incorrect" msgstr "" @@ -14333,7 +14383,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 +#: include/class/acc_ledger.class.php:2349 msgid "Un journal avec ce nom existe déjà" msgstr "" @@ -14376,9 +14426,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 +#: include/class/acc_ledger.class.php:2355 +#: include/class/acc_ledger.class.php:2428 +#: include/class/acc_ledger.class.php:2614 msgid "Aucun compte en banque n'est donné" msgstr "" @@ -14395,7 +14445,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 +#: include/class/acc_ledger.class.php:2523 msgid "choix du type de journal" msgstr "" @@ -14412,7 +14462,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 +#: include/class/acc_ledger.class.php:2632 msgid "Impossible d'effacer un journal qui contient des opérations" msgstr "" @@ -14429,7 +14479,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 +#: include/class/acc_ledger.class.php:2748 msgid "Action non accessible" msgstr "" @@ -14699,6 +14749,9 @@ msgstr "" #: 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 #: include/template/ledger_detail_ven.php:45 #: include/template/acc_ledger_history_purchase_oneline.php:38 #: include/template/acc_ledger_history_sale_oneline.php:35 @@ -14706,10 +14759,10 @@ msgstr "" #: 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_sold.class.php:1407 #: 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 +#: include/class/acc_ledger_purchase.class.php:1833 msgid "Date paiement" msgstr "" @@ -14759,6 +14812,7 @@ msgstr "" #: 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 #: include/template/dashboard.php:344 #: include/template/security_list_action.php:72 #: include/export/export_histo_csv.php:45 @@ -14909,8 +14963,8 @@ msgstr "" #: include/compta_ven.inc.php:92 include/compta_ach.inc.php:86 #: include/compta_ven.inc.php:95 include/compta_ach.inc.php:88 #: include/compta_ach.inc.php:90 include/compta_ven.inc.php:97 -#: include/template/stock_histo_search.php:51 include/compta_ven.inc.php:97 -#: include/compta_ach.inc.php:90 +#: include/template/stock_histo_search.php:51 include/compta_ven.inc.php:95 +#: include/compta_ach.inc.php:88 msgid "Dépôt" msgstr "" @@ -15232,8 +15286,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 +#: include/class/acc_ledger.class.php:1495 +#: include/class/acc_ledger.class.php:1512 msgid "get_default_card p_ledger_side is invalide [" msgstr "" @@ -15262,8 +15316,8 @@ msgstr "" #: include/class/acc_ledger_purchase.class.php:1822 #: include/class/acc_ledger_sold.class.php:1396 #: include/class/acc_ledger_purchase.class.php:1825 -#: include/class/acc_ledger_sold.class.php:1396 -#: include/class/acc_ledger_purchase.class.php:1825 +#: include/class/acc_ledger_sold.class.php:1405 +#: include/class/acc_ledger_purchase.class.php:1831 msgid "Numéro opération" msgstr "" @@ -15291,8 +15345,8 @@ msgstr "" #: include/class/acc_ledger_purchase.class.php:1825 #: include/class/acc_ledger_sold.class.php:1399 #: include/class/acc_ledger_purchase.class.php:1828 -#: include/class/acc_ledger_sold.class.php:1399 -#: include/class/acc_ledger_purchase.class.php:1828 +#: include/class/acc_ledger_sold.class.php:1408 +#: include/class/acc_ledger_purchase.class.php:1834 msgid "Date échéance" msgstr "" @@ -15326,8 +15380,8 @@ msgstr "" #: include/class/acc_ledger_purchase.class.php:1833 #: include/export/export_poste_detail_csv.php:81 #: include/export/export_fiche_detail_csv.php:73 -#: include/class/acc_ledger_sold.class.php:1404 -#: include/class/acc_ledger_purchase.class.php:1833 +#: include/class/acc_ledger_sold.class.php:1413 +#: include/class/acc_ledger_purchase.class.php:1839 msgid "Code journal" msgstr "" @@ -15355,8 +15409,8 @@ msgstr "" #: include/class/acc_ledger_purchase.class.php:1833 #: include/class/acc_ledger_sold.class.php:1407 #: include/class/acc_ledger_purchase.class.php:1836 -#: include/class/acc_ledger_sold.class.php:1407 -#: include/class/acc_ledger_purchase.class.php:1836 +#: include/class/acc_ledger_sold.class.php:1416 +#: include/class/acc_ledger_purchase.class.php:1842 msgid "Code Item" msgstr "" @@ -15384,8 +15438,8 @@ msgstr "" #: include/class/acc_ledger_purchase.class.php:1834 #: include/class/acc_ledger_sold.class.php:1408 #: include/class/acc_ledger_purchase.class.php:1837 -#: include/class/acc_ledger_sold.class.php:1408 -#: include/class/acc_ledger_purchase.class.php:1837 +#: include/class/acc_ledger_sold.class.php:1417 +#: include/class/acc_ledger_purchase.class.php:1843 msgid "N° fiche" msgstr "" @@ -15413,8 +15467,8 @@ msgstr "" #: include/class/acc_ledger_purchase.class.php:1835 #: include/class/acc_ledger_sold.class.php:1409 #: include/class/acc_ledger_purchase.class.php:1838 -#: include/class/acc_ledger_sold.class.php:1409 -#: include/class/acc_ledger_purchase.class.php:1838 +#: include/class/acc_ledger_sold.class.php:1418 +#: include/class/acc_ledger_purchase.class.php:1844 msgid "Nom fiche" msgstr "" @@ -15442,8 +15496,8 @@ msgstr "" #: include/class/acc_ledger_purchase.class.php:1836 #: include/class/acc_ledger_sold.class.php:1410 #: include/class/acc_ledger_purchase.class.php:1839 -#: include/class/acc_ledger_sold.class.php:1410 -#: include/class/acc_ledger_purchase.class.php:1839 +#: include/class/acc_ledger_sold.class.php:1419 +#: include/class/acc_ledger_purchase.class.php:1845 msgid "N° fiche fournisseur" msgstr "" @@ -15471,8 +15525,8 @@ msgstr "" #: include/class/acc_ledger_purchase.class.php:1837 #: include/class/acc_ledger_sold.class.php:1411 #: include/class/acc_ledger_purchase.class.php:1840 -#: include/class/acc_ledger_sold.class.php:1411 -#: include/class/acc_ledger_purchase.class.php:1840 +#: include/class/acc_ledger_sold.class.php:1420 +#: include/class/acc_ledger_purchase.class.php:1846 msgid "Nom fournisseur" msgstr "" @@ -15500,8 +15554,8 @@ msgstr "" #: include/class/acc_ledger_purchase.class.php:1838 #: include/class/acc_ledger_sold.class.php:1412 #: include/class/acc_ledger_purchase.class.php:1841 -#: include/class/acc_ledger_sold.class.php:1412 -#: include/class/acc_ledger_purchase.class.php:1841 +#: include/class/acc_ledger_sold.class.php:1421 +#: include/class/acc_ledger_purchase.class.php:1847 msgid "Code fournisseur" msgstr "" @@ -15529,8 +15583,8 @@ msgstr "" #: include/class/acc_ledger_purchase.class.php:1839 #: include/class/acc_ledger_sold.class.php:1413 #: include/class/acc_ledger_purchase.class.php:1842 -#: include/class/acc_ledger_sold.class.php:1413 -#: include/class/acc_ledger_purchase.class.php:1842 +#: include/class/acc_ledger_sold.class.php:1422 +#: include/class/acc_ledger_purchase.class.php:1848 msgid "Nom TVA" msgstr "" @@ -15558,8 +15612,8 @@ msgstr "" #: include/class/acc_ledger_purchase.class.php:1840 #: include/class/acc_ledger_sold.class.php:1414 #: include/class/acc_ledger_purchase.class.php:1843 -#: include/class/acc_ledger_sold.class.php:1414 -#: include/class/acc_ledger_purchase.class.php:1843 +#: include/class/acc_ledger_sold.class.php:1423 +#: include/class/acc_ledger_purchase.class.php:1849 msgid "Commentaire TVA" msgstr "" @@ -15589,9 +15643,9 @@ msgstr "" #: include/class/acc_ledger_sold.class.php:1415 #: include/class/acc_ledger_purchase.class.php:1844 #: include/class/acc_ledger_history_sale.class.php:251 -#: include/class/acc_ledger_sold.class.php:1415 +#: include/class/acc_ledger_sold.class.php:1424 #: include/class/acc_ledger_history_sale.class.php:251 -#: include/class/acc_ledger_purchase.class.php:1844 +#: include/class/acc_ledger_purchase.class.php:1850 msgid "TVA annulée" msgstr "" @@ -15627,8 +15681,8 @@ msgstr "" #: include/class/acc_ledger_purchase.class.php:1847 #: include/class/acc_ledger_sold.class.php:1421 #: include/class/acc_ledger_purchase.class.php:1850 -#: include/class/acc_ledger_sold.class.php:1421 -#: include/class/acc_ledger_purchase.class.php:1850 +#: include/class/acc_ledger_sold.class.php:1430 +#: include/class/acc_ledger_purchase.class.php:1856 msgid "PU" msgstr "" @@ -15645,7 +15699,8 @@ msgstr "" #: include/class/acc_ledger_purchase.class.php:1830 #: include/class/acc_ledger_purchase.class.php:1848 #: include/class/acc_ledger_purchase.class.php:1851 -#: include/class/acc_ledger_purchase.class.php:1851 +#: include/export/export_printtva_csv.php:65 +#: include/class/acc_ledger_purchase.class.php:1857 msgid "Montant ND" msgstr "" @@ -15662,7 +15717,7 @@ msgstr "" #: include/class/acc_ledger_purchase.class.php:1831 #: include/class/acc_ledger_purchase.class.php:1849 #: include/class/acc_ledger_purchase.class.php:1852 -#: include/class/acc_ledger_purchase.class.php:1852 +#: include/class/acc_ledger_purchase.class.php:1858 msgid "Montant TVA ND" msgstr "" @@ -15679,7 +15734,7 @@ msgstr "" #: include/class/acc_ledger_purchase.class.php:1832 #: include/class/acc_ledger_purchase.class.php:1850 #: include/class/acc_ledger_purchase.class.php:1853 -#: include/class/acc_ledger_purchase.class.php:1853 +#: include/class/acc_ledger_purchase.class.php:1859 msgid "TVA récup." msgstr "" @@ -15707,8 +15762,8 @@ msgstr "" #: include/class/acc_ledger_purchase.class.php:1851 #: include/class/acc_ledger_sold.class.php:1422 #: include/class/acc_ledger_purchase.class.php:1854 -#: include/class/acc_ledger_sold.class.php:1422 -#: include/class/acc_ledger_purchase.class.php:1854 +#: include/class/acc_ledger_sold.class.php:1431 +#: include/class/acc_ledger_purchase.class.php:1860 msgid "HTVA Opération" msgstr "" @@ -15736,8 +15791,8 @@ msgstr "" #: include/class/acc_ledger_purchase.class.php:1852 #: include/class/acc_ledger_sold.class.php:1423 #: include/class/acc_ledger_purchase.class.php:1855 -#: include/class/acc_ledger_sold.class.php:1423 -#: include/class/acc_ledger_purchase.class.php:1855 +#: include/class/acc_ledger_sold.class.php:1432 +#: include/class/acc_ledger_purchase.class.php:1861 msgid "TVA Opération" msgstr "" @@ -16084,28 +16139,28 @@ 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/class/periode.class.php:704 include/ajax/ajax_periode.php:171 -#: include/class/periode.class.php:704 +#: include/class/periode.class.php:706 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/class/periode.class.php:705 include/ajax/ajax_periode.php:172 -#: include/class/periode.class.php:705 +#: include/class/periode.class.php:707 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/class/periode.class.php:706 include/ajax/ajax_periode.php:173 -#: include/class/periode.class.php:706 +#: include/class/periode.class.php:708 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/class/periode.class.php:708 include/ajax/ajax_periode.php:175 -#: include/class/periode.class.php:708 +#: include/class/periode.class.php:710 msgid "sauver" msgstr "" @@ -16237,7 +16292,7 @@ msgstr "" #: 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 -#: include/ajax/ajax_card.php:287 +#: include/ajax/ajax_card.php:288 msgid "Choisissez une catégorie svp" msgstr "" @@ -16245,7 +16300,7 @@ msgstr "" #: html/ajax_card.php:475 include/ajax/ajax_card.php:455 #: include/ajax/ajax_card.php:456 include/ajax/ajax_card.php:457 #: include/ajax/ajax_card.php:490 include/ajax/ajax_card.php:494 -#: include/ajax/ajax_card.php:494 +#: include/ajax/ajax_card.php:495 msgid " Banque" msgstr "" @@ -16351,7 +16406,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 +#: include/class/acc_ledger.class.php:2204 msgid "Ajout journal" msgstr "" @@ -16367,7 +16422,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 +#: include/class/acc_ledger.class.php:2818 msgid "Dans le dépôt" msgstr "" @@ -16545,7 +16600,7 @@ msgstr "" #: include/class_noalyss_sql.php:316 include/lib/class_noalyss_sql.php:316 #: include/lib/data_sql.class.php:286 include/lib/noalyss_sql.class.php:391 #: include/lib/data_sql.class.php:248 include/lib/noalyss_sql.class.php:391 -#: include/lib/data_sql.class.php:248 +#: include/lib/data_sql.class.php:248 include/lib/database_core.class.php:168 msgid "Erreur : exec_sql attend un array" msgstr "" @@ -16568,17 +16623,16 @@ msgstr "" #: include/compta_ach.inc.php:66 include/compta_fin.inc.php:79 #: include/compta_ven.inc.php:76 include/operation_ods_confirm.inc.php:31 #: include/compta_ach.inc.php:68 include/compta_ach.inc.php:70 -#: include/compta_ven.inc.php:78 include/compta_ven.inc.php:78 +#: include/compta_ven.inc.php:78 include/compta_ven.inc.php:79 #: include/compta_fin.inc.php:79 include/compta_ach.inc.php:70 -#: include/operation_ods_confirm.inc.php:31 +#: include/compta_ach.inc.php:71 include/operation_ods_confirm.inc.php:31 msgid "Confirmation" msgstr "" #: include/compta_ach.inc.php:70 include/compta_fin.inc.php:80 #: include/compta_ven.inc.php:80 include/operation_ods_confirm.inc.php:37 #: include/compta_ach.inc.php:72 include/compta_ach.inc.php:74 -#: include/compta_ven.inc.php:82 include/compta_ven.inc.php:82 -#: include/compta_fin.inc.php:80 include/compta_ach.inc.php:74 +#: include/compta_ven.inc.php:82 include/compta_fin.inc.php:80 #: include/operation_ods_confirm.inc.php:37 msgid "" "Attention, cette opération n'est pas encore sauvée : vous devez encore " @@ -16588,22 +16642,22 @@ msgstr "" #: include/compta_ach.inc.php:82 include/compta_ach.inc.php:85 #: include/compta_ven.inc.php:94 include/compta_ach.inc.php:87 #: include/compta_ach.inc.php:89 include/compta_ven.inc.php:96 -#: include/compta_ven.inc.php:96 include/compta_ach.inc.php:89 +#: include/compta_ven.inc.php:94 include/compta_ach.inc.php:87 msgid "Générer une facture ou charger un document" msgstr "" #: include/compta_ach.inc.php:83 include/compta_ach.inc.php:86 #: include/compta_ven.inc.php:95 include/compta_ach.inc.php:88 #: include/compta_ach.inc.php:90 include/compta_ven.inc.php:97 -#: include/compta_ven.inc.php:97 include/compta_ach.inc.php:90 +#: include/compta_ven.inc.php:95 include/compta_ach.inc.php:88 msgid "Choix du dépôt" msgstr "" #: include/compta_ach.inc.php:84 include/compta_ach.inc.php:87 #: include/compta_ven.inc.php:96 include/operation_ods_confirm.inc.php:51 #: include/compta_ach.inc.php:89 include/compta_ach.inc.php:91 -#: include/compta_ven.inc.php:98 include/compta_ven.inc.php:98 -#: include/compta_ach.inc.php:91 include/operation_ods_confirm.inc.php:51 +#: include/compta_ven.inc.php:98 include/compta_ven.inc.php:96 +#: include/compta_ach.inc.php:89 include/operation_ods_confirm.inc.php:51 msgid "Modèle à sauver" msgstr "" @@ -16729,17 +16783,17 @@ msgid "Attention " msgstr "" #: include/verif_bilan.inc.php:127 include/verif_bilan.inc.php:165 -#: include/verif_bilan.inc.php:168 include/verif_bilan.inc.php:168 +#: include/verif_bilan.inc.php:168 include/verif_bilan.inc.php:169 msgid "Hist." msgstr "" #: include/verif_bilan.inc.php:149 include/verif_bilan.inc.php:186 -#: include/verif_bilan.inc.php:189 include/verif_bilan.inc.php:189 +#: include/verif_bilan.inc.php:189 include/verif_bilan.inc.php:191 msgid "Poste comptable utilisé sans la fiche correspondante" msgstr "" #: include/verif_bilan.inc.php:151 include/verif_bilan.inc.php:188 -#: include/verif_bilan.inc.php:191 include/verif_bilan.inc.php:191 +#: include/verif_bilan.inc.php:191 include/verif_bilan.inc.php:193 msgid "" "Cela pourrait causer des différences entre les balances par fiches et celle " "par postes comptables, utilisez le plugin \n" @@ -16747,12 +16801,12 @@ msgid "" msgstr "" #: include/verif_bilan.inc.php:186 include/verif_bilan.inc.php:223 -#: include/verif_bilan.inc.php:226 include/verif_bilan.inc.php:226 +#: include/verif_bilan.inc.php:226 include/verif_bilan.inc.php:228 msgid "Poste comptable " msgstr "" #: include/verif_bilan.inc.php:186 include/verif_bilan.inc.php:223 -#: include/verif_bilan.inc.php:226 include/verif_bilan.inc.php:226 +#: include/verif_bilan.inc.php:226 include/verif_bilan.inc.php:228 msgid " pour la fiche " msgstr "" @@ -16787,7 +16841,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 +#: include/template/ledger_detail_bottom.php:289 msgid "Non utilisée" msgstr "" @@ -16809,7 +16863,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 +#: include/class/acc_ledger.class.php:2359 msgid "Choix du type de journal est obligatoire" msgstr "" @@ -16832,8 +16886,8 @@ msgstr "" #: include/class/acc_ledger_purchase.class.php:1842 #: include/class/acc_ledger_sold.class.php:1416 #: include/class/acc_ledger_purchase.class.php:1845 -#: include/class/acc_ledger_sold.class.php:1416 -#: include/class/acc_ledger_purchase.class.php:1845 +#: include/class/acc_ledger_sold.class.php:1425 +#: include/class/acc_ledger_purchase.class.php:1851 msgid "TVA Non Payé" msgstr "" @@ -16848,7 +16902,7 @@ msgstr "" #: include/class/acc_ledger_purchase.class.php:1835 #: include/class/acc_ledger_purchase.class.php:1853 #: include/class/acc_ledger_purchase.class.php:1856 -#: include/class/acc_ledger_purchase.class.php:1856 +#: include/class/acc_ledger_purchase.class.php:1862 msgid "TVA NP opération" msgstr "" @@ -16963,9 +17017,11 @@ msgstr "" #: 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 #: include/template/operation_detail_ven.php:45 #: include/template/operation_detail_ach.php:53 #: include/class/print_ledger_simple.class.php:116 +#: include/class/print_ledger_detail_item.class.php:162 #: include/class/acc_ledger_history_purchase.class.php:264 msgid "TVA NP" msgstr "" @@ -17048,14 +17104,14 @@ msgstr "" #: include/database.item.php:2 include/database.item.php:142 #: include/database.item.php:138 include/database.item.php:137 #: include/database.item.php:130 include/database.item.php:128 -#: include/database.item.php:128 +#: include/database.item.php:130 msgid "Export pièce PDF" msgstr "" #: include/database.item.php:4 include/database.item.php:144 #: include/database.item.php:140 include/database.item.php:139 #: include/database.item.php:132 include/database.item.php:130 -#: include/database.item.php:130 +#: include/database.item.php:132 msgid "Configuration extension" msgstr "" @@ -17070,7 +17126,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 +#: include/class/acc_ledger.class.php:2837 msgid "Nouvelle opération" msgstr "" @@ -17274,7 +17330,7 @@ msgstr "" #: html/ajax_card.php:291 html/ajax_card.php:293 html/ajax_card.php:294 #: include/ajax/ajax_card.php:274 include/ajax/ajax_card.php:275 #: include/ajax/ajax_card.php:283 include/ajax/ajax_card.php:285 -#: include/ajax/ajax_card.php:285 +#: include/ajax/ajax_card.php:286 msgid "" "Choisissez la catégorie de fiche à laquelle vous aimeriez ajouter une fiche" msgstr "" @@ -17331,7 +17387,7 @@ msgstr "" #: html/ajax_ledger.php:186 html/ajax_ledger.php:187 #: include/ajax/ajax_ledger.php:164 include/ajax/ajax_ledger.php:167 #: include/ajax/ajax_ledger.php:168 include/ajax/ajax_ledger.php:172 -#: include/ajax/ajax_ledger.php:172 +#: include/ajax/ajax_ledger.php:173 msgid "Effacement refusé" msgstr "" @@ -17593,8 +17649,8 @@ msgstr "" #: include/operation_ods_confirm.inc.php:53 include/compta_ach.inc.php:90 #: include/compta_ach.inc.php:92 include/compta_ven.inc.php:99 #: include/ajax/ajax_ledger.php:564 include/class/acc_operation.class.php:729 -#: include/compta_ven.inc.php:99 include/ajax/ajax_ledger.php:564 -#: include/class/acc_operation.class.php:729 include/compta_ach.inc.php:92 +#: include/compta_ven.inc.php:97 include/ajax/ajax_ledger.php:565 +#: include/class/acc_operation.class.php:729 include/compta_ach.inc.php:90 #: include/operation_ods_confirm.inc.php:53 msgid "Extourne" msgstr "" @@ -17603,7 +17659,7 @@ msgstr "" #: include/operation_ods_confirm.inc.php:61 #: include/operation_ods_confirm.inc.php:62 include/compta_ach.inc.php:104 #: include/compta_ach.inc.php:106 include/compta_ven.inc.php:113 -#: include/compta_ven.inc.php:113 include/compta_ach.inc.php:106 +#: include/compta_ven.inc.php:111 include/compta_ach.inc.php:104 #: include/operation_ods_confirm.inc.php:62 msgid "Extourne opération" msgstr "" @@ -17612,7 +17668,7 @@ msgstr "" #: 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_ods.inc.php:118 -#: include/compta_ven.inc.php:208 include/compta_ods.inc.php:118 +#: include/compta_ven.inc.php:206 include/compta_ods.inc.php:118 msgid "Extourné au " msgstr "" @@ -17621,8 +17677,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_ods.inc.php:123 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:212 +#: include/compta_ods.inc.php:123 include/compta_ach.inc.php:195 msgid "Opération non extournée" msgstr "" @@ -17631,8 +17687,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_ods.inc.php:132 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:220 +#: include/compta_ods.inc.php:132 include/compta_ach.inc.php:203 msgid "Date invalide, opération non extournée" msgstr "" @@ -17650,7 +17706,7 @@ msgstr "" #: include/modele.inc.php:245 include/modele.inc.php:259 #: include/modele.inc.php:283 include/modele.inc.php:266 #: include/modele.inc.php:267 include/modele.inc.php:272 -#: include/modele.inc.php:272 +#: include/modele.inc.php:273 msgid "Aucun modèle disponible" msgstr "" @@ -17660,7 +17716,7 @@ msgstr "" #: include/dossier.inc.php:239 include/modele.inc.php:280 #: include/dossier.inc.php:242 include/dossier.inc.php:247 #: include/modele.inc.php:281 include/modele.inc.php:286 -#: include/dossier.inc.php:247 include/modele.inc.php:286 +#: include/dossier.inc.php:247 include/modele.inc.php:287 msgid "Nom base de données" msgstr "" @@ -17668,7 +17724,7 @@ msgstr "" #: include/modele.inc.php:345 include/modele.inc.php:328 #: include/modele.inc.php:329 include/document_modele.inc.php:85 #: include/modele.inc.php:334 include/document_modele.inc.php:85 -#: include/modele.inc.php:334 +#: include/modele.inc.php:335 msgid "Ajout d'un modèle" msgstr "" @@ -17770,7 +17826,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 +#: include/template/ledger_detail_bottom.php:348 msgid "" "Extourner une opération vous permet de l'annuler par son écriture inverse" msgstr "" @@ -17958,7 +18014,7 @@ msgstr "" #: include/class/periode_ledger_table.class.php:98 #: 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 +#: include/class/periode.class.php:521 msgid "Date Début" msgstr "" @@ -18115,14 +18171,14 @@ msgstr "" #: include/modele.inc.php:240 include/modele.inc.php:254 #: include/modele.inc.php:278 include/modele.inc.php:261 -#: include/modele.inc.php:262 include/modele.inc.php:262 +#: include/modele.inc.php:262 include/modele.inc.php:263 msgid "Ajouter un modèle" msgstr "" #: include/modele.inc.php:284 include/modele.inc.php:298 #: include/modele.inc.php:337 include/modele.inc.php:320 #: include/modele.inc.php:321 include/modele.inc.php:265 -#: include/modele.inc.php:265 +#: include/modele.inc.php:266 msgid "" "Si vous voulez récupérer toutes les adaptations d'un dossier " "dans un autre dossier, vous pouvez en faire un modèle. Seules les fiches, la " @@ -18134,14 +18190,14 @@ msgstr "" #: include/modele.inc.php:324 include/modele.inc.php:338 #: include/modele.inc.php:377 include/modele.inc.php:360 #: include/modele.inc.php:361 include/modele.inc.php:366 -#: include/modele.inc.php:366 +#: include/modele.inc.php:367 msgid "Basé sur" msgstr "" #: include/modele.inc.php:328 include/modele.inc.php:342 #: include/modele.inc.php:384 include/modele.inc.php:367 #: include/modele.inc.php:368 include/modele.inc.php:373 -#: include/modele.inc.php:373 +#: include/modele.inc.php:374 msgid "" "Nettoyage des Documents et courriers (ce qui n'effacera pas les modèles de " "documents)" @@ -18150,7 +18206,7 @@ msgstr "" #: include/modele.inc.php:331 include/modele.inc.php:345 #: include/modele.inc.php:388 include/modele.inc.php:371 #: include/modele.inc.php:372 include/modele.inc.php:377 -#: include/modele.inc.php:377 +#: include/modele.inc.php:378 msgid "" "Nettoyage de toutes les fiches (ce qui effacera client,\n" "\topérations prédéfinies fournisseurs modèles de " @@ -18160,7 +18216,7 @@ msgstr "" #: include/modele.inc.php:337 include/modele.inc.php:351 #: include/modele.inc.php:393 include/modele.inc.php:376 #: include/modele.inc.php:377 include/modele.inc.php:382 -#: include/modele.inc.php:382 +#: include/modele.inc.php:383 msgid "" "Nettoyage de la comptabilité analytique : effacement des plans et des " "postes, les opérations\n" @@ -18170,21 +18226,21 @@ msgstr "" #: include/modele.inc.php:342 include/modele.inc.php:356 #: include/modele.inc.php:398 include/modele.inc.php:381 #: include/modele.inc.php:382 include/modele.inc.php:387 -#: include/modele.inc.php:387 +#: include/modele.inc.php:388 msgid "Effacement de toutes les données des plugins" msgstr "" #: include/modele.inc.php:346 include/modele.inc.php:360 #: include/modele.inc.php:401 include/modele.inc.php:384 #: include/modele.inc.php:385 include/modele.inc.php:390 -#: include/modele.inc.php:390 +#: include/modele.inc.php:391 msgid "Ajout d'un modele" msgstr "" #: include/modele.inc.php:378 include/modele.inc.php:392 #: include/modele.inc.php:441 include/modele.inc.php:424 #: include/modele.inc.php:428 include/modele.inc.php:433 -#: include/modele.inc.php:433 +#: include/modele.inc.php:434 #, php-format msgid "Base de donnée %s mod %s est accèdée, déconnectez-vous d'abord" msgstr "" @@ -18192,7 +18248,7 @@ msgstr "" #: include/modele.inc.php:386 include/modele.inc.php:400 #: include/modele.inc.php:450 include/modele.inc.php:433 #: include/modele.inc.php:437 include/modele.inc.php:442 -#: include/modele.inc.php:442 +#: include/modele.inc.php:443 #, php-format msgid "Le modèle %s est effacé" msgstr "" @@ -18245,7 +18301,7 @@ msgstr "" #: html/ajax_card.php:478 html/ajax_card.php:479 include/ajax/ajax_card.php:459 #: include/ajax/ajax_card.php:460 include/ajax/ajax_card.php:461 #: include/ajax/ajax_card.php:494 include/ajax/ajax_card.php:498 -#: include/ajax/ajax_card.php:498 +#: include/ajax/ajax_card.php:499 msgid " Employé ou administrateur" msgstr "" @@ -18295,13 +18351,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 -#: html/ajax_misc.php:392 include/lib/message_javascript.php:92 +#: html/ajax_misc.php:396 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:409 +#: html/ajax_misc.php:407 html/ajax_misc.php:409 html/ajax_misc.php:413 msgid "Des actions dépendent de cette catégorie" msgstr "" @@ -18423,7 +18479,7 @@ msgstr "" #: 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 include/ajax/ajax_periode.php:176 -#: include/class/periode.class.php:709 +#: include/class/periode.class.php:711 msgid "fermer" msgstr "" @@ -18434,7 +18490,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 +#: include/class/acc_ledger.class.php:2135 msgid "Journaux d'achat" msgstr "" @@ -18445,7 +18501,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 +#: include/class/acc_ledger.class.php:2136 msgid "Journaux Financier" msgstr "" @@ -18456,7 +18512,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 +#: include/class/acc_ledger.class.php:2137 msgid "Journaux d'Opérations diverses" msgstr "" @@ -18609,7 +18665,7 @@ msgstr "" #: include/template/ledger_detail_bottom.php:174 #: include/template/ledger_detail_bottom.php:178 #: include/template/ledger_detail_bottom.php:195 -#: include/template/ledger_detail_bottom.php:195 +#: include/template/ledger_detail_bottom.php:192 msgid "vous confirmez?" msgstr "" @@ -18860,14 +18916,14 @@ msgstr "" #: include/database.item.php:141 include/database.item.php:140 #: include/database.item.php:132 include/database.item.php:133 #: include/database.item.php:136 include/database.item.php:131 -#: include/database.item.php:131 +#: include/database.item.php:133 msgid "Favori ★ " msgstr "" #: include/database.item.php:142 include/database.item.php:141 #: include/database.item.php:103 include/database.item.php:104 #: 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/database.item.php:104 msgid "Sortie ⎆" msgstr "" @@ -18875,14 +18931,14 @@ msgstr "" #: include/database.item.php:142 include/database.item.php:5 #: include/database.item.php:6 include/database.item.php:134 #: include/database.item.php:135 include/database.item.php:132 -#: include/database.item.php:133 include/database.item.php:132 -#: include/database.item.php:133 +#: include/database.item.php:133 include/database.item.php:134 +#: include/database.item.php:135 msgid "Balance agée" msgstr "" #: include/database.item.php:144 include/database.item.php:143 #: include/database.item.php:6 include/database.item.php:135 -#: include/database.item.php:133 include/database.item.php:133 +#: include/database.item.php:133 include/database.item.php:135 msgid "Export Balance agée" msgstr "" @@ -18916,31 +18972,31 @@ msgstr "" #: include/database.item.php:216 include/database.item.php:193 #: include/database.item.php:194 include/database.item.php:197 -#: include/database.item.php:208 include/database.item.php:197 +#: include/database.item.php:208 include/database.item.php:213 msgid "Enlever une pièce justificative" msgstr "" #: include/database.item.php:217 include/database.item.php:194 #: include/database.item.php:195 include/database.item.php:198 -#: include/database.item.php:209 include/database.item.php:198 +#: include/database.item.php:209 include/database.item.php:214 msgid "Effacer une opération " msgstr "" #: include/database.item.php:218 include/database.item.php:195 #: include/database.item.php:196 include/database.item.php:199 -#: include/database.item.php:210 include/database.item.php:199 +#: include/database.item.php:210 include/database.item.php:215 msgid "Partager une note" msgstr "" #: include/database.item.php:219 include/database.item.php:196 #: include/database.item.php:197 include/database.item.php:200 -#: include/database.item.php:211 include/database.item.php:200 +#: include/database.item.php:211 include/database.item.php:216 msgid "Créer une note publique" msgstr "" #: include/database.item.php:220 include/database.item.php:197 #: include/database.item.php:198 include/database.item.php:201 -#: include/database.item.php:212 include/database.item.php:201 +#: include/database.item.php:212 include/database.item.php:217 msgid "Effacer une note publique" msgstr "" @@ -18954,13 +19010,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:556 +#: html/ajax_misc.php:554 html/ajax_misc.php:556 html/ajax_misc.php:560 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:557 +#: html/ajax_misc.php:555 html/ajax_misc.php:557 html/ajax_misc.php:561 msgid "Il y a une erreur, ce plugin n'existe pas" msgstr "" @@ -19462,13 +19518,13 @@ msgstr "" #: include/database.item.php:5 include/database.item.php:6 #: include/database.item.php:134 include/database.item.php:135 #: include/database.item.php:132 include/database.item.php:133 -#: include/database.item.php:132 include/database.item.php:133 +#: include/database.item.php:134 include/database.item.php:135 msgid "Balance agée pour les clients et fournisseurs" msgstr "" #: include/database.item.php:7 include/database.item.php:10 #: include/database.item.php:4 include/database.item.php:2 -#: include/database.item.php:2 +#: include/database.item.php:4 msgid "" "Vous permet d'encoder des achats, dépenses, des notes de frais ou des notes " "de crédits, vous pouvez spécifier un bénéficiaire ou un autre moyen de " @@ -19477,7 +19533,7 @@ msgstr "" #: include/database.item.php:13 include/database.item.php:16 #: include/database.item.php:10 include/database.item.php:8 -#: include/database.item.php:8 +#: include/database.item.php:10 msgid "" "Permet d'ajouter des taux de TVA ou de les modifier ainsi que les postes " "comptables de ces TVA, ces TVA sont utilisables dans les menus de vente et " @@ -19486,31 +19542,31 @@ msgstr "" #: include/database.item.php:14 include/database.item.php:17 #: include/database.item.php:11 include/database.item.php:9 -#: include/database.item.php:9 +#: include/database.item.php:11 msgid "Encodage de tous vos revenus ou vente" msgstr "" #: include/database.item.php:15 include/database.item.php:18 #: include/database.item.php:12 include/database.item.php:10 -#: include/database.item.php:10 +#: include/database.item.php:12 msgid "Ajout de menu ou de plugins" msgstr "" #: include/database.item.php:16 include/database.item.php:19 #: include/database.item.php:13 include/database.item.php:11 -#: include/database.item.php:11 +#: include/database.item.php:13 msgid "Suivi des fournisseurs : devis, lettres, email...." msgstr "" #: include/database.item.php:17 include/database.item.php:20 #: include/database.item.php:14 include/database.item.php:12 -#: include/database.item.php:12 +#: include/database.item.php:14 msgid "Opérations diverses en Analytique" msgstr "" #: include/database.item.php:18 include/database.item.php:21 #: include/database.item.php:15 include/database.item.php:13 -#: include/database.item.php:13 +#: include/database.item.php:15 msgid "" "Création de rapport sur mesure, comme les ratios, vous permet de créer des " "graphiques de vos données (vente, achat...)" @@ -19518,37 +19574,37 @@ msgstr "" #: include/database.item.php:19 include/database.item.php:22 #: include/database.item.php:51 include/database.item.php:49 -#: include/database.item.php:49 +#: include/database.item.php:62 msgid "Menu regroupant les plugins" msgstr "" #: include/database.item.php:21 include/database.item.php:24 #: include/database.item.php:17 include/database.item.php:15 -#: include/database.item.php:15 +#: include/database.item.php:17 msgid "Suivi client : devis, réunion, courrier, commande..." msgstr "" #: include/database.item.php:55 include/database.item.php:58 #: include/database.item.php:52 include/database.item.php:50 -#: include/database.item.php:50 +#: include/database.item.php:51 msgid "Axe analytique" msgstr "" #: include/database.item.php:56 include/database.item.php:59 #: include/database.item.php:53 include/database.item.php:51 -#: include/database.item.php:51 +#: include/database.item.php:52 msgid "Regroupement de compte analytique" msgstr "" #: include/database.item.php:57 include/database.item.php:60 #: include/database.item.php:54 include/database.item.php:52 -#: include/database.item.php:52 +#: include/database.item.php:53 msgid "Liste de tous vos contacts" msgstr "" #: include/database.item.php:58 include/database.item.php:61 #: include/database.item.php:55 include/database.item.php:53 -#: include/database.item.php:53 +#: include/database.item.php:54 msgid "" "Les opérations prédéfinies sont des opérations que vous faites régulièrement " "(loyer, abonnement,...) " @@ -19556,7 +19612,7 @@ msgstr "" #: include/database.item.php:59 include/database.item.php:62 #: include/database.item.php:56 include/database.item.php:54 -#: include/database.item.php:54 +#: include/database.item.php:55 msgid "" "Opération diverses tels que les amortissements, les augmentations de " "capital, les salaires, ..." @@ -19564,13 +19620,13 @@ msgstr "" #: include/database.item.php:60 include/database.item.php:63 #: include/database.item.php:57 include/database.item.php:55 -#: include/database.item.php:55 +#: include/database.item.php:56 msgid "Encodage d'un extrait bancaire (=relevé bancaire)" msgstr "" #: include/database.item.php:61 include/database.item.php:64 #: include/database.item.php:58 include/database.item.php:56 -#: include/database.item.php:56 +#: include/database.item.php:57 msgid "" "Historique de toutes vos opérations un menu de recherche dans une nouvelle " "fenêtre, vous permettra de retrouver rapidement l'opération qui vous " @@ -19579,13 +19635,13 @@ msgstr "" #: include/database.item.php:62 include/database.item.php:65 #: include/database.item.php:59 include/database.item.php:57 -#: include/database.item.php:57 +#: include/database.item.php:58 msgid "Module paramètres" msgstr "" #: include/database.item.php:63 include/database.item.php:66 #: include/database.item.php:60 include/database.item.php:58 -#: include/database.item.php:58 +#: include/database.item.php:59 msgid "" "Vous permet d'ajouter de nouveaux type de documents (bordereau de livraison, " "devis..)" @@ -19593,7 +19649,7 @@ msgstr "" #: include/database.item.php:65 include/database.item.php:68 #: include/database.item.php:62 include/database.item.php:60 -#: include/database.item.php:60 +#: include/database.item.php:61 msgid "" "Historique de toutes vos opérations dans les journaux d'achats un menu de " "recherche, vous permettra de retrouver rapidement l'opération qui vous " @@ -19602,7 +19658,7 @@ msgstr "" #: include/database.item.php:66 include/database.item.php:69 #: include/database.item.php:63 include/database.item.php:61 -#: include/database.item.php:61 +#: include/database.item.php:63 msgid "" "Historique de toutes vos opérations dans les journaux d'opérations diverses " "un menu de recherche, vous permettra de retrouver rapidement l'opération qui " @@ -19611,7 +19667,7 @@ msgstr "" #: include/database.item.php:68 include/database.item.php:71 #: include/database.item.php:65 include/database.item.php:63 -#: include/database.item.php:63 +#: include/database.item.php:65 msgid "" "Impression de rapport personnalisé, il est aussi possible d'exporter en CSV " "afin de faire des graphiques" @@ -19619,49 +19675,49 @@ msgstr "" #: include/database.item.php:71 include/database.item.php:74 #: include/database.item.php:68 include/database.item.php:66 -#: include/database.item.php:66 +#: include/database.item.php:68 msgid "Regroupement pour les menus d'achats(nouvelle opération, historique...)" msgstr "" #: include/database.item.php:72 include/database.item.php:75 #: include/database.item.php:69 include/database.item.php:67 -#: include/database.item.php:67 +#: include/database.item.php:69 msgid "Regroupement pour les menus et les profils" msgstr "" #: include/database.item.php:74 include/database.item.php:77 #: include/database.item.php:71 include/database.item.php:69 -#: include/database.item.php:69 +#: include/database.item.php:71 msgid "Regroupement des menus des journaux de trésorerie" msgstr "" #: include/database.item.php:75 include/database.item.php:78 #: include/database.item.php:72 include/database.item.php:70 -#: include/database.item.php:70 +#: include/database.item.php:72 msgid "Grand livre pour la comptabilité analytique" msgstr "" #: include/database.item.php:77 include/database.item.php:80 #: include/database.item.php:74 include/database.item.php:72 -#: include/database.item.php:72 +#: include/database.item.php:74 msgid "Menu Lettrage" msgstr "" #: include/database.item.php:78 include/database.item.php:81 #: include/database.item.php:75 include/database.item.php:73 -#: include/database.item.php:73 +#: include/database.item.php:75 msgid "Choix de votre dossier" msgstr "" #: include/database.item.php:80 include/database.item.php:83 #: include/database.item.php:77 include/database.item.php:75 -#: include/database.item.php:75 +#: include/database.item.php:77 msgid "Menu de différents paramètres" msgstr "" #: include/database.item.php:81 include/database.item.php:84 #: include/database.item.php:78 include/database.item.php:76 -#: include/database.item.php:76 +#: include/database.item.php:78 msgid "" "Configuration des profils des utilisateurs, permet de fixer les journaux, " "profils dans les documents et stock que ce profil peut utiliser. Cela " @@ -19670,7 +19726,7 @@ msgstr "" #: include/database.item.php:83 include/database.item.php:86 #: include/database.item.php:80 include/database.item.php:78 -#: include/database.item.php:78 +#: include/database.item.php:80 msgid "" "Permet d'avoir la balance de toutes vos fiches, les résumés exportables en " "CSV, les historiques avec ou sans lettrages" @@ -19678,7 +19734,7 @@ msgstr "" #: include/database.item.php:84 include/database.item.php:87 #: include/database.item.php:81 include/database.item.php:79 -#: include/database.item.php:79 +#: include/database.item.php:81 msgid "" "Préférence de l'utilisateur, apparence de l'application pour l'utilisateur, " "période par défaut et mot de passe" @@ -19686,7 +19742,7 @@ msgstr "" #: include/database.item.php:85 include/database.item.php:88 #: include/database.item.php:82 include/database.item.php:80 -#: include/database.item.php:80 +#: include/database.item.php:82 msgid "" "Configuration des tags ou dossiers, on l'appele tag ou dossier suivant la " "façon dont vous utilisez \n" @@ -19695,7 +19751,7 @@ msgstr "" #: include/database.item.php:88 include/database.item.php:91 #: include/database.item.php:85 include/database.item.php:83 -#: include/database.item.php:83 +#: include/database.item.php:85 msgid "" "Information sur votre société : nom, adresse... utilisé lors de la " "génération de documents" @@ -19703,7 +19759,7 @@ msgstr "" #: include/database.item.php:89 include/database.item.php:92 #: include/database.item.php:86 include/database.item.php:84 -#: include/database.item.php:84 +#: include/database.item.php:86 msgid "" "Gestion des périodes : clôture, ajout de période, afin de créer des périodes " "vous pouvez aussi utiliser le plugin outil comptable" @@ -19711,7 +19767,7 @@ msgstr "" #: include/database.item.php:90 include/database.item.php:93 #: include/database.item.php:87 include/database.item.php:85 -#: include/database.item.php:85 +#: include/database.item.php:87 msgid "" "Vérifie que votre comptabilité ne contient pas d'erreur de base, tels que " "l'équilibre entre le passif et l'actif, l'utilisation des postes " @@ -19720,7 +19776,7 @@ msgstr "" #: include/database.item.php:91 include/database.item.php:94 #: include/database.item.php:88 include/database.item.php:86 -#: include/database.item.php:86 +#: include/database.item.php:88 msgid "" "Ecriture d'ouverture ou écriture à nouveau, reporte les soldes des comptes " "de l'année passé du poste comptable 0xxx à 5xxxx sur l'année courante" @@ -19734,7 +19790,7 @@ msgstr "" #: include/database.item.php:93 include/database.item.php:96 #: include/database.item.php:90 include/database.item.php:88 -#: include/database.item.php:88 +#: include/database.item.php:90 msgid "" "Création et modification des journaux, préfixe des pièces justificatives, " "numérotation, catégories de fiches accessibles à ce journal" @@ -19742,7 +19798,7 @@ msgstr "" #: include/database.item.php:94 include/database.item.php:97 #: include/database.item.php:91 include/database.item.php:89 -#: include/database.item.php:89 +#: include/database.item.php:91 msgid "" "Configuration de la sécurité, vous permet de donner un profil à vos " "utilisateurs, cela leur permettra d'utiliser ce que vous souhaitez qu'ils " @@ -19751,7 +19807,7 @@ msgstr "" #: include/database.item.php:95 include/database.item.php:98 #: include/database.item.php:92 include/database.item.php:90 -#: include/database.item.php:90 +#: include/database.item.php:92 msgid "" "Permet d'ajouter de nouveaux attributs que vous pourrez par la suite ajouter " "à des catégories de fiches" @@ -19759,19 +19815,19 @@ msgstr "" #: include/database.item.php:96 include/database.item.php:99 #: include/database.item.php:93 include/database.item.php:91 -#: include/database.item.php:91 +#: include/database.item.php:93 msgid "Etat des stock de l'exercice indiqué" msgstr "" #: include/database.item.php:97 include/database.item.php:100 #: include/database.item.php:94 include/database.item.php:92 -#: include/database.item.php:92 +#: include/database.item.php:94 msgid "Modification des stocks, menu utilisé pour l'inventaire" msgstr "" #: include/database.item.php:98 include/database.item.php:101 #: include/database.item.php:95 include/database.item.php:93 -#: include/database.item.php:93 +#: include/database.item.php:95 msgid "" "Liste des changements manuels des stocks, inventaire, transfert de " "marchandises entre dépôts..." @@ -19779,7 +19835,7 @@ msgstr "" #: include/database.item.php:99 include/database.item.php:102 #: include/database.item.php:96 include/database.item.php:94 -#: include/database.item.php:94 +#: include/database.item.php:96 msgid "" "Le navigateur vous présente une liste de menu auquel vous avez accès et vous " "permet d'accèder plus rapidement au menu que vous souhaitez" @@ -19787,7 +19843,7 @@ msgstr "" #: include/database.item.php:100 include/database.item.php:103 #: include/database.item.php:97 include/database.item.php:95 -#: include/database.item.php:95 +#: include/database.item.php:97 msgid "" "Historique de toutes vos opérations dans tous les journaux auquels vous " "avez accès, vous permettra de retrouver rapidement l'opération qui vous " @@ -19796,7 +19852,7 @@ msgstr "" #: include/database.item.php:101 include/database.item.php:104 #: include/database.item.php:98 include/database.item.php:96 -#: include/database.item.php:96 +#: include/database.item.php:98 msgid "" "Historique de toutes vos opérations un menu de recherche, vous permettra de " "retrouver rapidement l'opération qui vous intéresse" @@ -19804,7 +19860,7 @@ msgstr "" #: include/database.item.php:102 include/database.item.php:105 #: include/database.item.php:99 include/database.item.php:97 -#: include/database.item.php:97 +#: include/database.item.php:99 msgid "" "Permet de faire correspondre vos extraits bancaires avec les opérations de " "vente ou d'achat, le lettrage se fait automatiquement" @@ -19812,7 +19868,7 @@ msgstr "" #: include/database.item.php:103 include/database.item.php:106 #: include/database.item.php:100 include/database.item.php:98 -#: include/database.item.php:98 +#: include/database.item.php:100 msgid "" "Solde des journaux de trésorerie cela concerne les comptes en banques, " "caisse , les chèques... " @@ -19820,13 +19876,13 @@ msgstr "" #: include/database.item.php:104 include/database.item.php:107 #: include/database.item.php:101 include/database.item.php:99 -#: include/database.item.php:99 +#: include/database.item.php:104 msgid "Déconnexion " msgstr "" #: include/database.item.php:106 include/database.item.php:109 #: include/database.item.php:103 include/database.item.php:101 -#: include/database.item.php:101 +#: include/database.item.php:102 msgid "" "Balance par catégorie de fiche ou pour toutes les fiches ayant un poste " "comptable" @@ -19834,7 +19890,7 @@ msgstr "" #: include/database.item.php:107 include/database.item.php:110 #: include/database.item.php:104 include/database.item.php:102 -#: include/database.item.php:102 +#: include/database.item.php:103 msgid "" "Modification de votre plan comptable, parfois il est plus rapide d'utiliser " "le plugin \"Poste Comptable\"" @@ -19842,7 +19898,7 @@ msgstr "" #: include/database.item.php:108 include/database.item.php:111 #: include/database.item.php:105 include/database.item.php:103 -#: include/database.item.php:103 +#: include/database.item.php:105 msgid "" "Historique de toutes vos opérations dans les journaux de vente un menu de " "recherche, vous permettra de retrouver rapidement l'opération qui vous " @@ -19851,7 +19907,7 @@ msgstr "" #: include/database.item.php:109 include/database.item.php:112 #: include/database.item.php:106 include/database.item.php:104 -#: include/database.item.php:104 +#: include/database.item.php:106 msgid "" "Historique de toutes vos opérations dans les journaux de trésorerie un menu " "de recherche, vous permettra de retrouver rapidement l'opération qui vous " @@ -19860,7 +19916,7 @@ msgstr "" #: include/database.item.php:110 include/database.item.php:113 #: include/database.item.php:107 include/database.item.php:105 -#: include/database.item.php:105 +#: include/database.item.php:107 msgid "" "Impression des rapprochements : opérations non rapprochées ou avec des " "montants différents" @@ -19868,7 +19924,7 @@ msgstr "" #: include/database.item.php:111 include/database.item.php:114 #: include/database.item.php:108 include/database.item.php:106 -#: include/database.item.php:106 +#: include/database.item.php:108 msgid "" "Impression de bilan, ce module est basique, il est plus intéressant " "d'utiliser le plugin \"rapport avancés\"" @@ -19876,15 +19932,15 @@ msgstr "" #: include/database.item.php:112 include/database.item.php:115 #: include/database.item.php:109 include/database.item.php:107 -#: include/database.item.php:107 +#: include/database.item.php:109 msgid "Configuration des entrepots de dépôts" msgstr "" #: include/database.item.php:113 include/database.item.php:115 #: include/database.item.php:116 include/database.item.php:118 #: include/database.item.php:110 include/database.item.php:112 -#: include/database.item.php:108 include/database.item.php:108 -#: include/database.item.php:110 +#: include/database.item.php:108 include/database.item.php:110 +#: include/database.item.php:112 msgid "" "Permet d'ajouter de nouvelles catégorie de fiche, d'ajouter des attributs à " "ces catégories (numéro de téléphone, gsm, email...)" @@ -19892,13 +19948,13 @@ msgstr "" #: include/database.item.php:114 include/database.item.php:117 #: include/database.item.php:111 include/database.item.php:109 -#: include/database.item.php:109 +#: include/database.item.php:111 msgid "Permet de changer le poste comptable de base des catégories de fiches" msgstr "" #: include/database.item.php:116 include/database.item.php:119 #: include/database.item.php:113 include/database.item.php:111 -#: include/database.item.php:111 +#: include/database.item.php:113 msgid "" "Permet d'ajouter des état pour les documents utilisés dans le suivi (à " "faire, à suivre...)" @@ -19906,7 +19962,7 @@ msgstr "" #: include/database.item.php:117 include/database.item.php:120 #: include/database.item.php:114 include/database.item.php:112 -#: include/database.item.php:112 +#: include/database.item.php:114 msgid "" "Regroupement pour les menus d'opérations diverses (nouvelle opération, " "historique...)" @@ -19914,7 +19970,7 @@ msgstr "" #: include/database.item.php:118 include/database.item.php:121 #: include/database.item.php:115 include/database.item.php:113 -#: include/database.item.php:113 +#: include/database.item.php:115 msgid "" "Impression des journaux avec les détails pour les parties privés, la TVA et " "ce qui est non déductibles en ce qui concerne les journaux de vente et " @@ -19923,13 +19979,13 @@ msgstr "" #: include/database.item.php:119 include/database.item.php:122 #: include/database.item.php:116 include/database.item.php:114 -#: include/database.item.php:114 +#: include/database.item.php:116 msgid "Regroupement des menus ventes et recettes" msgstr "" #: include/database.item.php:122 include/database.item.php:125 #: include/database.item.php:119 include/database.item.php:117 -#: include/database.item.php:117 +#: include/database.item.php:119 msgid "" "Tableau de suivi, vous permet de voir en un coup d'oeil vos dernières " "opérations, un petit calendrier, une liste de chose à faire..." @@ -19937,21 +19993,21 @@ msgstr "" #: include/database.item.php:123 include/database.item.php:126 #: include/database.item.php:120 include/database.item.php:118 -#: include/database.item.php:118 +#: include/database.item.php:120 msgid "" "Menu regroupant la création de rapport, la vérification de la comptabilité..." msgstr "" #: include/database.item.php:124 include/database.item.php:127 #: include/database.item.php:121 include/database.item.php:119 -#: include/database.item.php:119 +#: include/database.item.php:121 msgid "" "Regroupement pour les menus de trésorerie (nouvelle opération, historique...)" msgstr "" #: include/database.item.php:125 include/database.item.php:128 #: include/database.item.php:122 include/database.item.php:120 -#: include/database.item.php:120 +#: include/database.item.php:122 msgid "" "Liste de vos suivis, en fait de tous les documents, réunions ... dont vous " "avez besoin afin de suivre vos clients, fournisseurs ou administrations. Il " @@ -19961,7 +20017,7 @@ msgstr "" #: include/database.item.php:126 include/database.item.php:129 #: include/database.item.php:123 include/database.item.php:121 -#: include/database.item.php:121 +#: include/database.item.php:123 msgid "" "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 " @@ -19971,13 +20027,13 @@ msgstr "" #: include/database.item.php:127 include/database.item.php:130 #: include/database.item.php:124 include/database.item.php:122 -#: include/database.item.php:122 +#: include/database.item.php:124 msgid "Suivi des administrations : courrrier, déclarations." msgstr "" #: include/database.item.php:128 include/database.item.php:131 #: include/database.item.php:125 include/database.item.php:123 -#: include/database.item.php:123 +#: include/database.item.php:125 msgid "" "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 " @@ -19986,7 +20042,7 @@ msgstr "" #: include/database.item.php:130 include/database.item.php:133 #: include/database.item.php:127 include/database.item.php:125 -#: include/database.item.php:125 +#: include/database.item.php:127 msgid "" "Suivi de vos salariés, managers ainsi que des administrateurs, pour les " "documents et les opérations comptables" @@ -19994,7 +20050,7 @@ msgstr "" #: include/database.item.php:131 include/database.item.php:134 #: include/database.item.php:128 include/database.item.php:126 -#: include/database.item.php:126 +#: include/database.item.php:128 msgid "" "Configuration des menus par défaut, ces menus sont appelés par des actions " "dans d'autres menus" @@ -20002,12 +20058,12 @@ msgstr "" #: include/database.item.php:132 include/database.item.php:135 #: include/database.item.php:129 include/database.item.php:127 -#: include/database.item.php:127 +#: include/database.item.php:129 msgid "Agenda, présentation du suivi sous forme d'agenda " msgstr "" #: include/database.item.php:133 include/database.item.php:136 -#: include/database.item.php:131 include/database.item.php:131 +#: include/database.item.php:131 include/database.item.php:133 msgid "Ce menu vous présente un menu rapide de vos menus préférés" msgstr "" @@ -20037,7 +20093,7 @@ msgid "Accès non autorisé" msgstr "" #: include/ajax/ajax_ledger.php:31 include/ajax/ajax_poste.php:35 -#: include/ajax/ajax_poste.php:35 include/ajax/ajax_ledger.php:31 +#: include/ajax/ajax_poste.php:35 include/ajax/ajax_ledger.php:32 msgid "Non authorisé" msgstr "" @@ -20142,7 +20198,7 @@ msgstr "" #: include/ext/importbank/include/import_bank.class.php:463 #: include/ext/importbank/include/import_bank.class.php:484 #: include/modele.inc.php:412 include/compta_fin_rec.inc.php:115 -#: include/compta_fin_rec.inc.php:122 include/modele.inc.php:412 +#: include/compta_fin_rec.inc.php:122 include/modele.inc.php:413 msgid "Donnée invalide" msgstr "" @@ -20338,17 +20394,17 @@ msgstr "" #: html/user_login.php:158 html/ajax_misc.php:462 #: 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 +#: html/ajax_misc.php:468 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 #: include/template/fiche_def_list.php:32 #: include/template/result_cat_card_summary.php:5 include/dossier.inc.php:239 -#: include/compta_fin_saldo.inc.php:44 include/ajax/ajax_card.php:291 +#: include/compta_fin_saldo.inc.php:44 include/ajax/ajax_card.php:292 #: include/ajax/ajax_navigator.php:46 include/ajax/ajax_boxcard_search.php:46 #: 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/acc_ledger.class.php:2201 #: include/class/anc_listing.class.php:76 include/class/fiche.class.php:2247 #: include/lib/manage_table_sql.class.php:634 #, php-format @@ -20896,13 +20952,13 @@ msgstr "" #: include/modele.inc.php:312 include/modele.inc.php:295 #: include/modele.inc.php:296 include/modele.inc.php:301 -#: include/modele.inc.php:301 +#: include/modele.inc.php:302 msgid "Inexistant" msgstr "" #: include/modele.inc.php:318 include/modele.inc.php:301 #: include/modele.inc.php:302 include/modele.inc.php:307 -#: include/modele.inc.php:307 +#: include/modele.inc.php:308 msgid "Invalide" msgstr "" @@ -21064,8 +21120,9 @@ msgstr "" #: 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 #: include/export/export_ledger_csv.php:46 -#: include/class/acc_ledger_history_generic.class.php:759 +#: include/class/acc_ledger_history_generic.class.php:762 #: include/class/acc_ledger_history_purchase.class.php:244 #: include/class/acc_reconciliation.class.php:487 #: include/class/acc_reconciliation.class.php:511 @@ -21092,7 +21149,9 @@ msgstr "" #: 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:255 +#: include/export/export_ledger_csv.php:218 +#: include/class/acc_ledger_history_generic.class.php:767 #: include/class/acc_ledger_history_purchase.class.php:255 #: include/class/acc_ledger_history_sale.class.php:244 msgid "operation" @@ -21109,7 +21168,8 @@ msgstr "" #: include/class/acc_ledger_history_generic.class.php:765 #: include/export/export_ledger_csv.php:212 #: include/export/export_ledger_csv.php:220 -#: include/class/acc_ledger_history_generic.class.php:765 +#: include/export/export_ledger_csv.php:220 +#: include/class/acc_ledger_history_generic.class.php:768 msgid "N° Pièce" msgstr "" @@ -21120,6 +21180,7 @@ msgstr "" #: include/export/export_ledger_csv.php:213 #: include/export/export_ledger_csv.php:215 #: include/export/export_ledger_csv.php:223 +#: include/export/export_ledger_csv.php:223 msgid "commentaire" msgstr "" @@ -21134,7 +21195,8 @@ msgstr "" #: include/class/acc_ledger_history_generic.class.php:682 #: include/export/export_ledger_csv.php:216 #: include/export/export_ledger_csv.php:224 -#: include/class/acc_ledger_history_generic.class.php:682 +#: include/export/export_ledger_csv.php:224 +#: include/class/acc_ledger_history_generic.class.php:685 #: include/class/acc_reconciliation.class.php:484 msgid "internal" msgstr "" @@ -21156,6 +21218,7 @@ msgstr "" #: 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 +#: 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" @@ -21168,6 +21231,7 @@ msgstr "" #: 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 +#: include/class/acc_ledger_history_purchase.class.php:261 msgid "privé" msgstr "" @@ -21178,6 +21242,7 @@ msgstr "" #: 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 +#: include/class/acc_ledger_history_purchase.class.php:262 msgid "DNA" msgstr "" @@ -21188,6 +21253,7 @@ msgstr "" #: 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 +#: include/class/acc_ledger_history_purchase.class.php:263 msgid "tva non ded." msgstr "" @@ -21439,12 +21505,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 include/template/param_jrn.php:190 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 include/template/param_jrn.php:193 msgid "Fournisseurs (C)" msgstr "" @@ -21457,7 +21523,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 include/template/param_jrn.php:305 msgid "Fiches utilisables (D/C)" msgstr "" @@ -21897,6 +21963,7 @@ msgstr "" #: include/ext/import_account/include/class_impacc_export.php:104 #: include/ext/import_account/include/impacc_export.class.php:104 +#: include/class/acc_ledger.class.php:2938 msgid "Journal invalide" msgstr "" @@ -21995,7 +22062,7 @@ msgid "Installé par défaut dans %s" msgstr "" #: include/compta_ach.inc.php:184 include/compta_ach.inc.php:186 -#: include/compta_ach.inc.php:191 include/compta_ach.inc.php:191 +#: include/compta_ach.inc.php:191 include/compta_ach.inc.php:189 #, php-format msgid "Extourné au %s" msgstr "" @@ -22083,7 +22150,7 @@ 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 +#: include/class/acc_ledger.class.php:2874 msgid "Opération identique" msgstr "" @@ -22272,17 +22339,17 @@ msgid "TOTAUX" msgstr "" #: include/database.item.php:7 include/database.item.php:136 -#: include/database.item.php:134 include/database.item.php:134 +#: include/database.item.php:134 include/database.item.php:136 msgid "Exporte la pièce" msgstr "" #: include/database.item.php:8 include/database.item.php:137 -#: include/database.item.php:135 include/database.item.php:135 +#: include/database.item.php:135 include/database.item.php:137 msgid "Export le document" msgstr "" #: include/database.item.php:9 include/database.item.php:138 -#: include/database.item.php:136 include/database.item.php:136 +#: include/database.item.php:136 include/database.item.php:138 msgid "Exporte le modèle de document" msgstr "" @@ -22406,17 +22473,17 @@ msgstr "" #: include/template/ledger_detail_bottom.php:200 #: include/template/ledger_detail_bottom.php:217 -#: include/template/ledger_detail_bottom.php:217 +#: include/template/ledger_detail_bottom.php:214 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 include/template/param_jrn.php:248 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 include/template/param_jrn.php:251 msgid "Services, fournitures ou biens vendus (C)" msgstr "" @@ -22466,7 +22533,7 @@ msgid "Aucune description" msgstr "" #: include/ajax/ajax_card.php:356 include/ajax/ajax_card.php:359 -#: include/ajax/ajax_card.php:359 +#: include/ajax/ajax_card.php:360 msgid "Erreur sauvegarde" msgstr "" @@ -22636,7 +22703,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 +#: include/class/acc_ledger.class.php:819 msgid "Modèle d'opération" msgstr "" @@ -22644,7 +22711,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 +#: include/class/acc_ledger.class.php:1002 #, php-format msgid "Réconciliation/rapprochements : %s" msgstr "" @@ -22861,7 +22928,7 @@ 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 html/ajax_misc.php:466 msgid "Choisissez la TVA" msgstr "" @@ -22942,13 +23009,13 @@ msgid " %s est effacé" msgstr "" #: include/compta_ach.inc.php:109 include/compta_ven.inc.php:116 -#: include/operation_ods_confirm.inc.php:67 include/compta_ven.inc.php:116 -#: include/compta_ach.inc.php:109 include/operation_ods_confirm.inc.php:67 +#: include/operation_ods_confirm.inc.php:67 include/compta_ven.inc.php:114 +#: include/compta_ach.inc.php:107 include/operation_ods_confirm.inc.php:67 msgid "Message extourne" msgstr "" #: include/database.item.php:89 include/database.item.php:87 -#: include/database.item.php:87 +#: include/database.item.php:89 msgid "" "Chargement de modèles de documents qui seront générés par NOALYSS, les " "formats utilisables sont libreoffice, html, text et rtf" @@ -22967,11 +23034,11 @@ msgstr "" msgid "Détails TVA" msgstr "" -#: include/modele.inc.php:269 include/modele.inc.php:269 +#: include/modele.inc.php:269 include/modele.inc.php:270 msgid "Modèles locaux" msgstr "" -#: include/modele.inc.php:326 include/modele.inc.php:326 +#: include/modele.inc.php:326 include/modele.inc.php:327 msgid "Modèles disponibles dans le dépôt" msgstr "" @@ -23025,7 +23092,7 @@ msgstr "" #: include/periode.inc.php:113 include/class/periode.class.php:687 #: include/class/periode.class.php:689 include/periode.inc.php:113 -#: include/class/periode.class.php:689 +#: include/class/periode.class.php:691 msgid "Ajout période" msgstr "" @@ -23137,7 +23204,7 @@ msgid "Date création" msgstr "" #: include/template/param_jrn.php:125 include/template/param_jrn.php:127 -#: include/template/param_jrn.php:127 +#: include/template/param_jrn.php:171 msgid "Journal actif" msgstr "" @@ -23325,7 +23392,7 @@ msgstr "" msgid "Modèle installé " msgstr "" -#: include/ajax/ajax_card.php:619 include/ajax/ajax_card.php:619 +#: include/ajax/ajax_card.php:619 include/ajax/ajax_card.php:642 msgid "Fiche non effacée" msgstr "" @@ -23432,27 +23499,28 @@ 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 +#: include/class/acc_ledger.class.php:2299 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 +#: include/class/acc_ledger.class.php:2300 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 +#: include/class/acc_ledger.class.php:2919 msgid "Journal incorrect" msgstr "" #: include/class/acc_ledger_history.class.php:46 #: include/class/acc_ledger_history.class.php:47 #: include/class/acc_ledger_history.class.php:48 +#: include/class/acc_ledger_history.class.php:48 msgid "pa_ledger doit être un tableau" msgstr "" @@ -23462,24 +23530,26 @@ msgstr "" #: include/class/acc_ledger_history.class.php:122 #: include/class/acc_ledger_history.class.php:110 #: include/class/acc_ledger_history.class.php:123 +#: include/class/acc_ledger_history.class.php:110 +#: include/class/acc_ledger_history.class.php:123 msgid "invalid parameter" 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 +#: include/class/acc_ledger_history_generic.class.php:671 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 +#: include/class/acc_ledger_history_generic.class.php:672 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 +#: include/class/acc_ledger_history_generic.class.php:688 msgid "Total opération" msgstr "" @@ -23489,6 +23559,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_purchase.class.php:276 +#: include/class/acc_ledger_history_purchase.class.php:276 #: include/class/acc_ledger_history_sale.class.php:262 msgid "TVAC/TTC" msgstr "" @@ -23578,55 +23649,55 @@ msgid "Installé le %s" msgstr "" #: include/class/periode.class.php:251 include/class/periode.class.php:253 -#: include/class/periode.class.php:253 +#: include/class/periode.class.php:255 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 +#: include/class/periode.class.php:425 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 +#: include/class/periode.class.php:428 #, 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 +#: include/class/periode.class.php:431 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 +#: include/class/periode.class.php:434 #, 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 +#: include/class/periode.class.php:438 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 +#: include/class/periode.class.php:440 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:442 include/class/periode.class.php:440 -#: include/class/periode.class.php:442 +#: include/class/periode.class.php:442 include/class/periode.class.php:442 +#: include/class/periode.class.php:444 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 +#: include/class/periode.class.php:524 msgid "nb opérations" msgstr "" #: include/class/periode.class.php:521 include/class/periode.class.php:523 -#: include/class/periode.class.php:523 +#: include/class/periode.class.php:525 msgid "Status" msgstr "" @@ -23634,7 +23705,7 @@ msgstr "" #: 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 +#: include/class/periode.class.php:589 msgid "Fermée" msgstr "" @@ -23644,77 +23715,77 @@ msgstr "" #: 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 +#: include/class/periode.class.php:589 msgid "Ouvert" msgstr "" #: include/class/periode.class.php:647 include/class/periode.class.php:649 -#: include/class/periode.class.php:649 +#: include/class/periode.class.php:651 msgid "Janvier" msgstr "" #: include/class/periode.class.php:647 include/class/periode.class.php:649 -#: include/class/periode.class.php:649 +#: include/class/periode.class.php:651 msgid "Février" msgstr "" #: include/class/periode.class.php:647 include/class/periode.class.php:649 -#: include/class/periode.class.php:649 +#: include/class/periode.class.php:651 msgid "Mars" msgstr "" #: include/class/periode.class.php:647 include/class/periode.class.php:649 -#: include/class/periode.class.php:649 +#: include/class/periode.class.php:651 msgid "Avril" msgstr "" #: include/class/periode.class.php:648 include/class/periode.class.php:650 -#: include/class/periode.class.php:650 +#: include/class/periode.class.php:652 msgid "Mai" msgstr "" #: include/class/periode.class.php:648 include/class/periode.class.php:650 -#: include/class/periode.class.php:650 +#: include/class/periode.class.php:652 msgid "Juin" msgstr "" #: include/class/periode.class.php:648 include/class/periode.class.php:650 -#: include/class/periode.class.php:650 +#: include/class/periode.class.php:652 msgid "Juillet" msgstr "" #: include/class/periode.class.php:648 include/class/periode.class.php:650 -#: include/class/periode.class.php:650 +#: include/class/periode.class.php:652 msgid "Août" msgstr "" #: include/class/periode.class.php:648 include/class/periode.class.php:650 -#: include/class/periode.class.php:650 +#: include/class/periode.class.php:652 msgid "Septembre" msgstr "" #: include/class/periode.class.php:649 include/class/periode.class.php:651 -#: include/class/periode.class.php:651 +#: include/class/periode.class.php:653 msgid "Octobre" msgstr "" #: include/class/periode.class.php:649 include/class/periode.class.php:651 -#: include/class/periode.class.php:651 +#: include/class/periode.class.php:653 msgid "Novembre" msgstr "" #: include/class/periode.class.php:649 include/class/periode.class.php:651 -#: include/class/periode.class.php:651 +#: include/class/periode.class.php:653 msgid "Décembre" msgstr "" #: include/class/periode.class.php:673 include/class/periode.class.php:675 -#: include/class/periode.class.php:675 +#: include/class/periode.class.php:677 msgid "Effacement impossible" msgstr "" #: include/class/periode.class.php:688 include/class/periode.class.php:690 -#: include/class/periode.class.php:690 +#: include/class/periode.class.php:692 msgid "On ne peut ajouter une période que sur un exercice qui existe déjà" msgstr "" @@ -23824,7 +23895,8 @@ msgid "" msgstr "" #: include/class/user.class.php:1379 include/class/user.class.php:1408 -#: include/class/user.class.php:1379 include/class/user.class.php:1408 +#: include/class/acc_ledger.class.php:2365 include/class/user.class.php:1379 +#: include/class/user.class.php:1408 include/lib/input_switch.class.php:56 msgid "Valeur invalide" msgstr "" @@ -23902,14 +23974,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 +#: include/template/param_jrn.php:74 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 +#: include/template/param_jrn.php:119 msgid "Minimum de lignes à afficher" msgstr "" @@ -24029,7 +24101,7 @@ msgid "solde crediteur" msgstr "" #: include/class/acc_ledger.class.php:1079 -#: include/class/acc_ledger.class.php:1079 +#: include/class/acc_ledger.class.php:1095 #, php-format msgid "" "Vous utilisez le mode strict la dernière operation est la date du %s\n" @@ -24037,19 +24109,19 @@ msgid "" msgstr "" #: include/class/acc_ledger.class.php:1124 -#: include/class/acc_ledger.class.php:1124 +#: include/class/acc_ledger.class.php:1140 #, 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 +#: include/class/acc_ledger.class.php:1152 #, 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 +#: include/class/acc_ledger.class.php:1166 #, php-format msgid "Utilisation directe interdite du poste comptable %s" msgstr "" @@ -24363,37 +24435,198 @@ msgstr "" 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 #: 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 #: include/export/export_ledger_csv.php:143 msgid "Methode paiement" msgstr "" +#: include/export/export_ledger_csv.php:144 #: include/export/export_ledger_csv.php:144 msgid "Opération paiement" msgstr "" #: include/class/print_ledger_detail_item.class.php:145 +#: include/class/print_ledger_detail_item.class.php:146 #, 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 #: 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 #: 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 #: 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/template/param_jrn.php:93 +msgid "Uniquement note de débit ou crédit" +msgstr "" + +#: include/template/param_jrn.php:106 +msgid "Avertissement montant positif" +msgstr "" + +#: include/template/tax_summary_display.php:62 +#: include/template/tax_summary_display.php:122 +#: include/template/tax_summary_display.php:210 +#: include/template/tax_summary_display.php:294 +#: include/export/export_printtva_csv.php:42 +#: include/export/export_printtva_csv.php:61 +#: include/export/export_printtva_pdf.php:57 +#: include/export/export_printtva_pdf.php:212 +msgid "Montant HT" +msgstr "" + +#: include/template/tax_summary_display.php:64 +#: include/template/tax_summary_display.php:128 +#: include/template/tax_summary_display.php:213 +#: include/template/tax_summary_display.php:303 +#: include/export/export_printtva_csv.php:44 +#: include/export/export_printtva_csv.php:64 +#: include/export/export_printtva_pdf.php:58 +#: include/export/export_printtva_pdf.php:213 +msgid "Montant Autoliquidation" +msgstr "" + +#: include/template/tax_summary_display.php:109 +msgid "Résumé tous les journaux de vente" +msgstr "" + +#: include/template/tax_summary_display.php:211 +#: include/template/tax_summary_display.php:297 +#: include/export/export_printtva_csv.php:62 +#: include/export/export_printtva_pdf.php:212 +msgid "Privée" +msgstr "" + +#: include/template/tax_summary_display.php:214 +#: include/template/tax_summary_display.php:306 +#: include/export/export_printtva_pdf.php:213 +msgid "Montant Non Déd" +msgstr "" + +#: include/template/tax_summary_display.php:215 +#: include/template/tax_summary_display.php:309 +#: include/export/export_printtva_csv.php:66 +#: include/export/export_printtva_pdf.php:213 +msgid "TVA Non Déd" +msgstr "" + +#: include/template/tax_summary_display.php:216 +#: include/template/tax_summary_display.php:312 +#: include/export/export_printtva_csv.php:67 +#: include/export/export_printtva_pdf.php:213 +msgid "TVA Non Déd & récup" +msgstr "" + +#: include/template/tax_summary_display.php:281 +msgid "Résumé tous les journaux d'achat" +msgstr "" + +#: include/compta_ven.inc.php:80 include/compta_ach.inc.php:72 +msgid "Vous devez encore confirmer" +msgstr "" + +#: include/tax_summary.inc.php:39 +#, php-format +msgid "Période du %s au %s" +msgstr "" + +#: include/export/export_printtva_pdf.php:49 include/database.item.php:141 +msgid "Résumé TVA" +msgstr "" + +#: include/export/export_printtva_pdf.php:160 +msgid "Résumé TVA vente" +msgstr "" + +#: include/export/export_printtva_pdf.php:301 +msgid "Résumé TVA Achat" +msgstr "" + +#: include/database.item.php:139 +msgid "Devises" +msgstr "" + +#: include/database.item.php:139 +msgid "Configuration des devises" +msgstr "" + +#: include/database.item.php:139 +msgid "Permet de configurer les devises" +msgstr "" + +#: include/database.item.php:140 +msgid "Export ANC" +msgstr "" + +#: include/database.item.php:141 +msgid "totaux par TVA et par journal" +msgstr "" + +#: include/database.item.php:141 +msgid "Calcul des totaux par TVA et par journal" +msgstr "" + +#: include/database.item.php:142 include/database.item.php:143 +msgid "Export Résumé TVA" +msgstr "" + +#: include/database.item.php:236 +msgid "Note de crédit" +msgstr "" + +#: include/class/print_ledger_detail_item.class.php:159 +msgid "Prix/Unit" +msgstr "" + +#: include/class/print_ledger_detail_item.class.php:160 +msgid "Quant." +msgstr "" + +#: include/class/acc_ledger.class.php:2362 +msgid "Avertissement ne peut être vide" +msgstr "" + +#: include/class/acc_ledger.class.php:2555 +msgid "Attention, ce journal doit utiliser des montants négatifs" +msgstr "" + +#: include/class/tax_summary.class.php:74 +#: include/class/tax_summary.class.php:93 +msgid "Format date invalide" +msgstr "" + +#: include/class/tax_summary.class.php:116 +#: include/class/tax_summary.class.php:130 +msgid "Aucune Donnée" +msgstr "" + +#: include/lib/message_javascript.php:106 +msgid "" +"Mettre à oui pour un journal dédié uniquement aux notes de crédit ou de " +"débit, il affichera un avertissement si le montant n'est pas en négatif" +msgstr "" diff --git a/html/lang/nl_NL/LC_MESSAGES/messages.po b/html/lang/nl_NL/LC_MESSAGES/messages.po index 2facf4735..e8b2a2648 100644 --- a/html/lang/nl_NL/LC_MESSAGES/messages.po +++ b/html/lang/nl_NL/LC_MESSAGES/messages.po @@ -4,12 +4,12 @@ # # dany , 2014. # Dany De Bontridder , 2015, 2018, 2019. -#: include/database.item.php:124 +#: include/database.item.php:126 msgid "" msgstr "" "Project-Id-Version: NOALYSS\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-15 11:12+0200\n" +"POT-Creation-Date: 2019-08-26 13:23+0200\n" "PO-Revision-Date: 2019-07-31 13:23+0100\n" "Last-Translator: dany \n" "Language-Team: English \n" @@ -81,6 +81,7 @@ msgstr "" #: html/ajax_card.php:475 include/ajax/ajax_card.php:455 #: include/ajax/ajax_card.php:456 include/ajax/ajax_card.php:457 #: include/ajax/ajax_card.php:490 include/ajax/ajax_card.php:494 +#: include/ajax/ajax_card.php:495 msgid " Banque" msgstr "Bank" @@ -138,7 +139,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 +#: include/class/periode.class.php:704 include/class/periode.class.php:706 msgid " Début période : " msgstr "Begin" @@ -149,6 +150,7 @@ msgstr "" #: html/ajax_card.php:478 html/ajax_card.php:479 include/ajax/ajax_card.php:459 #: include/ajax/ajax_card.php:460 include/ajax/ajax_card.php:461 #: include/ajax/ajax_card.php:494 include/ajax/ajax_card.php:498 +#: include/ajax/ajax_card.php:499 msgid " Employé ou administrateur" msgstr "Manager of bediende" @@ -162,13 +164,13 @@ 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 +#: include/class/periode.class.php:706 include/class/periode.class.php:708 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 +#: include/class/periode.class.php:705 include/class/periode.class.php:707 msgid " Fin période : " msgstr "End " @@ -207,6 +209,7 @@ msgid " La version de votre installation est %s " msgstr "" #: include/class/acc_ledger.class.php:1136 +#: include/class/acc_ledger.class.php:1152 #, php-format msgid " Le poste %s appartient à fiche(s) dont : %s" msgstr "" @@ -255,6 +258,7 @@ msgstr "BTW" #: include/class/acc_ledger.class.php:113 #: include/class/acc_ledger.class.php:115 #: include/class/acc_ledger.class.php:116 +#: include/class/acc_ledger.class.php:134 msgid " Tous les journaux" msgstr "Alle dagboeken" @@ -300,7 +304,7 @@ msgstr "tot" #: html/ajax_card.php:465 html/ajax_card.php:466 html/ajax_card.php:467 #: include/ajax/ajax_card.php:447 include/ajax/ajax_card.php:448 #: include/ajax/ajax_card.php:449 include/ajax/ajax_card.php:482 -#: include/ajax/ajax_card.php:486 +#: include/ajax/ajax_card.php:486 include/ajax/ajax_card.php:487 msgid " d'administration" msgstr "van de administratie" @@ -308,7 +312,7 @@ msgstr "van de administratie" #: html/ajax_card.php:457 html/ajax_card.php:458 html/ajax_card.php:459 #: include/ajax/ajax_card.php:439 include/ajax/ajax_card.php:440 #: include/ajax/ajax_card.php:441 include/ajax/ajax_card.php:474 -#: include/ajax/ajax_card.php:478 +#: include/ajax/ajax_card.php:478 include/ajax/ajax_card.php:479 msgid " de clients" msgstr "van klanten" @@ -316,6 +320,7 @@ msgstr "van klanten" #: html/ajax_card.php:470 html/ajax_card.php:471 include/ajax/ajax_card.php:451 #: include/ajax/ajax_card.php:452 include/ajax/ajax_card.php:453 #: include/ajax/ajax_card.php:486 include/ajax/ajax_card.php:490 +#: include/ajax/ajax_card.php:491 msgid " de contacts" msgstr "van contacten" @@ -323,7 +328,7 @@ msgstr "van contacten" #: html/ajax_card.php:461 html/ajax_card.php:462 html/ajax_card.php:463 #: include/ajax/ajax_card.php:443 include/ajax/ajax_card.php:444 #: include/ajax/ajax_card.php:445 include/ajax/ajax_card.php:478 -#: include/ajax/ajax_card.php:482 +#: include/ajax/ajax_card.php:482 include/ajax/ajax_card.php:483 msgid " de fournisseurs" msgstr "van leveranciers" @@ -439,7 +444,7 @@ msgid " paiement par " msgstr "betaling in" #: include/verif_bilan.inc.php:186 include/verif_bilan.inc.php:223 -#: include/verif_bilan.inc.php:226 +#: include/verif_bilan.inc.php:226 include/verif_bilan.inc.php:228 #, fuzzy msgid " pour la fiche " msgstr "VOOR Het blad" @@ -803,6 +808,7 @@ msgstr "Foute toegang" #: 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 #: include/class/acc_ledger.class.php:1034 +#: include/class/acc_ledger.class.php:1050 msgid "Accès interdit" msgstr "Verboden toegang" @@ -858,6 +864,8 @@ msgstr "Verboden toegang" #: include/database.item.php:208 include/database.item.php:222 #: include/cfgledger.inc.php:171 include/class/acc_ledger_search.class.php:1086 #: include/class/acc_ledger_search.class.php:1099 +#: include/template/tax_summary_display.php:176 include/database.item.php:235 +#: include/database.item.php:254 msgid "Achat" msgstr "Aankoop" @@ -947,6 +955,9 @@ msgstr "Achterstallige actie" #: include/ajax/ajax_card.php:567 include/ajax/ajax_card.php:213 #: include/ajax/ajax_card.php:368 include/ajax/ajax_card.php:563 #: include/ajax/ajax_card.php:571 include/ajax/ajax_card.php:601 +#: include/ajax/ajax_card.php:214 include/ajax/ajax_card.php:369 +#: include/ajax/ajax_card.php:527 include/ajax/ajax_card.php:582 +#: include/ajax/ajax_card.php:594 include/ajax/ajax_card.php:624 msgid "Action interdite" msgstr "Verboden handeling" @@ -963,6 +974,7 @@ msgstr "Verboden handeling" #: 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:2748 msgid "Action non accessible" msgstr "Actie is ontoegankelijk" @@ -971,6 +983,7 @@ msgstr "Actie is ontoegankelijk" #: 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 +#: html/ajax_misc.php:396 #, fuzzy msgid "Action non autorisée" msgstr "Bewerking Opgeslagen" @@ -1020,6 +1033,7 @@ msgstr "rekening" #: 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:2299 #, fuzzy msgid "Activé" msgstr "Actie" @@ -1045,7 +1059,8 @@ msgstr "Actie" #: include/template/detail-action.php:371 include/compta_ach.inc.php:293 #: include/compta_ven.inc.php:328 include/compta_ven.inc.php:331 #: include/template/form_ledger_detail.php:128 include/compta_ach.inc.php:296 -#: include/compta_ven.inc.php:339 +#: include/compta_ven.inc.php:339 include/compta_ven.inc.php:337 +#: include/compta_ach.inc.php:294 msgid "Actualiser" msgstr "Updaten" @@ -1106,6 +1121,7 @@ msgstr "Adres" #: include/database.item.php:155 include/database.item.php:159 #: include/database.item.php:158 include/database.item.php:151 #: include/database.item.php:152 include/database.item.php:160 +#: include/database.item.php:163 msgid "Adresse " msgstr "Adres" @@ -1148,6 +1164,7 @@ msgstr "Toon ook de gesloten acties" #: 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/tax_summary.inc.php:43 msgid "Afficher" msgstr "Weergeven" @@ -1273,6 +1290,7 @@ msgstr "Gebruiker toevoegen" #: include/class/acc_ledger_purchase.class.php:1324 #: include/class/acc_ledger_sold.class.php:1358 #: include/class/acc_ledger_purchase.class.php:1327 +#: include/class/acc_ledger_sold.class.php:1367 msgid "Ajout article" msgstr "Artikel toevoegen" @@ -1335,6 +1353,7 @@ msgstr "Toevoeging van een menu" #: include/modele.inc.php:346 include/modele.inc.php:360 #: include/modele.inc.php:401 include/modele.inc.php:384 #: include/modele.inc.php:385 include/modele.inc.php:390 +#: include/modele.inc.php:391 #, fuzzy msgid "Ajout d'un modele" msgstr "Toevoeging van een menu" @@ -1342,7 +1361,7 @@ msgstr "Toevoeging van een menu" #: include/modele.inc.php:292 include/modele.inc.php:306 #: include/modele.inc.php:345 include/modele.inc.php:328 #: include/modele.inc.php:329 include/document_modele.inc.php:85 -#: include/modele.inc.php:334 +#: include/modele.inc.php:334 include/modele.inc.php:335 #, fuzzy msgid "Ajout d'un modèle" msgstr "Toevoeging van een menu" @@ -1437,7 +1456,7 @@ msgstr "Toevoeging van een label" #: include/database.item.php:182 include/database.item.php:185 #: include/database.item.php:210 include/database.item.php:187 #: include/database.item.php:188 include/database.item.php:191 -#: include/database.item.php:202 +#: include/database.item.php:202 include/database.item.php:207 msgid "Ajout de fiche" msgstr "Een dossier toevoegen" @@ -1478,6 +1497,7 @@ msgstr "Geen omslag" #: 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:2204 #, fuzzy msgid "Ajout journal" msgstr "Boek Naam" @@ -1506,7 +1526,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 +#: include/class/periode.class.php:689 include/class/periode.class.php:691 #, fuzzy msgid "Ajout période" msgstr "Artikel toevoegen" @@ -1533,7 +1553,7 @@ msgstr "Hierbij een actie toevoegen" #: include/modele.inc.php:254 include/modele.inc.php:278 #: include/dossier.inc.php:214 include/modele.inc.php:261 #: include/dossier.inc.php:217 include/dossier.inc.php:222 -#: include/modele.inc.php:262 +#: include/modele.inc.php:262 include/modele.inc.php:263 msgid "Ajouter" msgstr "Toevoegen" @@ -1573,7 +1593,7 @@ msgstr "Een bestand toevoegen" #: include/modele.inc.php:240 include/modele.inc.php:254 #: include/modele.inc.php:278 include/modele.inc.php:261 -#: include/modele.inc.php:262 +#: include/modele.inc.php:262 include/modele.inc.php:263 #, fuzzy msgid "Ajouter un modèle" msgstr "Geen enkel model" @@ -1643,6 +1663,8 @@ msgstr "Voeg een kasstuk toe" #: include/class/acc_ledger_purchase.class.php:1723 #: include/class/acc_ledger_sold.class.php:977 #: include/class/acc_ledger_purchase.class.php:1726 +#: include/class/acc_ledger_sold.class.php:986 +#: include/class/acc_ledger_purchase.class.php:1732 msgid "Ajoutez une pièce justificative " msgstr "Voeg een kasstuk toe" @@ -1788,6 +1810,7 @@ msgid "Année d'achat" msgstr "Jaar van de aankoop" #: include/class/periode.class.php:430 include/class/periode.class.php:432 +#: include/class/periode.class.php:434 #, fuzzy, php-format msgid "Année doit être entre %s et %s " msgstr "Tussen de data %s en %s" @@ -1808,6 +1831,7 @@ msgid "Année invalide [" msgstr "Ongeldig jaar [" #: include/class/periode.class.php:427 include/class/periode.class.php:429 +#: include/class/periode.class.php:431 #, fuzzy msgid "Année n'est pas un nombre" msgstr "tarief is geen getal" @@ -1818,6 +1842,7 @@ msgid "Anomalie pour le compte " msgstr "Belettering voor de boekhoudkundige positie" #: include/class/periode.class.php:648 include/class/periode.class.php:650 +#: include/class/periode.class.php:652 msgid "Août" msgstr "" @@ -1929,6 +1954,7 @@ msgstr "" #: include/class/acc_ledger.class.php:1022 #: include/class/acc_ledger.class.php:597 #: include/class/acc_ledger.class.php:598 +#: include/class/acc_ledger.class.php:614 msgid "Attention : il vaut mieux utiliser les fiches que les postes comptables" msgstr "" "Opgelet: het is beter om de fiches te gebruiken in plaats van de " @@ -1943,6 +1969,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:1223 msgid "" "Attention : il vaut mieux utiliser les fiches que les postes comptables " msgstr "" @@ -2096,6 +2123,10 @@ msgid "" "le dernier qui est affiché" msgstr "" +#: include/class/acc_ledger.class.php:2555 +msgid "Attention, ce journal doit utiliser des montants négatifs" +msgstr "" + #: include/compta_ach.inc.php:70 include/compta_fin.inc.php:80 #: include/compta_ven.inc.php:80 include/operation_ods_confirm.inc.php:37 #: include/compta_ach.inc.php:72 include/compta_ach.inc.php:74 @@ -2244,6 +2275,9 @@ msgstr "Geen enkel BTW-code komt overeen met dit tarief" #: 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:2355 +#: include/class/acc_ledger.class.php:2428 +#: include/class/acc_ledger.class.php:2614 msgid "Aucun compte en banque n'est donné" msgstr "Geen enkele bankrekening is gegeven" @@ -2304,6 +2338,7 @@ msgstr "Geen enkele record gevonden" #: 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/follow_up.class.php:775 msgid "Aucun enregistrement trouvé" msgstr "Geen enkele record gevonden" @@ -2311,6 +2346,7 @@ msgstr "Geen enkele record gevonden" #: html/ajax_ledger.php:277 html/ajax_ledger.php:279 #: include/ajax/ajax_ledger.php:256 include/ajax/ajax_ledger.php:259 #: include/ajax/ajax_ledger.php:261 include/ajax/ajax_ledger.php:265 +#: include/ajax/ajax_ledger.php:266 msgid "Aucun fichier" msgstr "Geen bestand" @@ -2356,6 +2392,7 @@ msgstr "" #: include/modele.inc.php:245 include/modele.inc.php:259 #: include/modele.inc.php:283 include/modele.inc.php:266 #: include/modele.inc.php:267 include/modele.inc.php:272 +#: include/modele.inc.php:273 #, fuzzy msgid "Aucun modèle disponible" msgstr "Geen enkele sleutel beschikbaar" @@ -2401,6 +2438,7 @@ msgstr "Geen bepaald rapport" #: include/ajax/ajax_boxcard_search.php:70 #: include/class/acc_ledger.class.php:577 #: include/class/acc_ledger.class.php:578 +#: include/class/acc_ledger.class.php:594 msgid "Aucun résultat" msgstr "Geen resultaten" @@ -2410,6 +2448,12 @@ msgstr "Geen resultaten" msgid "Aucun titre" msgstr "Geen enkele klant" +#: include/class/tax_summary.class.php:116 +#: include/class/tax_summary.class.php:130 +#, fuzzy +msgid "Aucune Donnée" +msgstr "Geen enkel gegeven" + #: include/param_sec.inc.php:321 include/param_sec.inc.php:261 #: include/param_sec.inc.php:293 #, fuzzy @@ -2438,7 +2482,7 @@ msgstr "Geen filter, alle dagboeken" #: html/ajax_card.php:265 html/ajax_card.php:283 html/ajax_card.php:285 #: html/ajax_card.php:286 include/ajax/ajax_card.php:266 #: include/ajax/ajax_card.php:267 include/ajax/ajax_card.php:273 -#: include/ajax/ajax_card.php:275 +#: include/ajax/ajax_card.php:275 include/ajax/ajax_card.php:276 msgid "Aucune catégorie de fiche ne correspond à votre demande" msgstr "Geen enkel bestandscategorie voldoet aan uw vraag" @@ -2449,7 +2493,8 @@ msgstr "Geen enkel bestandscategorie voldoet aan uw vraag" #: include/ajax/ajax_card.php:376 include/ajax/ajax_card.php:255 #: include/ajax/ajax_card.php:377 include/ajax/ajax_card.php:261 #: include/ajax/ajax_card.php:410 include/ajax/ajax_card.php:264 -#: include/ajax/ajax_card.php:413 +#: include/ajax/ajax_card.php:413 include/ajax/ajax_card.php:265 +#: include/ajax/ajax_card.php:414 msgid "" "Aucune catégorie de fiche ne correspond à votre demande, le journal pourrait " "n'avoir accès à aucune fiche" @@ -2498,6 +2543,9 @@ msgstr "Beschrijving" #: 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/message_javascript.php:102 +#: include/template/ledger_detail_bottom.php:284 +#: include/template/tax_summary_display.php:105 +#: include/template/tax_summary_display.php:277 msgid "Aucune donnée" msgstr "Geen enkel gegeven" @@ -2517,7 +2565,7 @@ msgstr "Geen enkele extensie is beschikbaar" #: html/ajax_card.php:172 html/ajax_card.php:190 html/ajax_card.php:191 #: html/ajax_card.php:192 include/ajax/ajax_card.php:172 #: include/ajax/ajax_card.php:173 include/ajax/ajax_card.php:176 -#: include/ajax/ajax_card.php:182 +#: include/ajax/ajax_card.php:182 include/ajax/ajax_card.php:183 msgid "Aucune fiche demandée" msgstr "Geen bestand gevraag" @@ -2553,7 +2601,7 @@ msgstr "Geen enkele operatie in de huidige oefening" #: include/ajax/ajax_history.php:197 include/ajax/ajax_history.php:199 #: include/ajax/ajax_history.php:117 include/ajax/ajax_history.php:202 #: include/ajax/ajax_history.php:121 include/ajax/ajax_history.php:207 -#: include/ajax/ajax_history.php:208 +#: include/ajax/ajax_history.php:208 include/ajax/ajax_history.php:209 msgid "Aucune opération pour l'exercice courant" msgstr "Geen enkele operatie in de huidige oefening" @@ -2613,6 +2661,8 @@ msgstr "Geen enkel stuk om te verzenden" #: 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:1112 +#: include/class/acc_ledger.class.php:853 msgid "Aucune période ouverte" msgstr "Geen enkele periode open" @@ -2680,6 +2730,7 @@ msgstr "Boek Naam" #: include/ajax/ajax_history.php:178 include/ajax/ajax_history.php:91 #: include/ajax/ajax_history.php:97 include/ajax/ajax_history.php:177 #: include/ajax/ajax_history.php:183 include/ajax/ajax_history.php:184 +#: include/ajax/ajax_history.php:179 include/ajax/ajax_history.php:185 msgid "Autre exercice" msgstr "Een andere oefening" @@ -2713,6 +2764,8 @@ msgstr "Andere informatie" #: include/class/acc_ledger_purchase.class.php:1741 #: include/class/acc_ledger_sold.class.php:995 #: include/class/acc_ledger_purchase.class.php:1744 +#: include/class/acc_ledger_sold.class.php:1004 +#: include/class/acc_ledger_purchase.class.php:1750 msgid "Autre information : " msgstr "Andere informatie :" @@ -2796,12 +2849,24 @@ msgstr "Met het bestand" msgid "Avertissement" msgstr "Aflossing" +#: include/template/param_jrn.php:106 +#, fuzzy +msgid "Avertissement montant positif" +msgstr "Aflossing" + +#: include/class/acc_ledger.class.php:2362 +#, fuzzy +msgid "Avertissement ne peut être vide" +msgstr "De naam mag niet leeg zijn" + #: include/class/periode.class.php:647 include/class/periode.class.php:649 +#: include/class/periode.class.php:651 msgid "Avril" msgstr "" #: include/database.item.php:55 include/database.item.php:58 #: include/database.item.php:52 include/database.item.php:50 +#: include/database.item.php:51 #, fuzzy msgid "Axe analytique" msgstr "Analytisch" @@ -2812,7 +2877,7 @@ msgstr "Analytisch" #: include/modele.inc.php:331 include/dossier.inc.php:278 #: include/modele.inc.php:314 include/dossier.inc.php:281 #: include/dossier.inc.php:286 include/modele.inc.php:315 -#: include/modele.inc.php:320 +#: include/modele.inc.php:320 include/modele.inc.php:321 msgid "Backup" msgstr "Back-up" @@ -2842,7 +2907,7 @@ msgstr "Gebruiker toevoegen" #: 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/fiche.inc.php:70 +#: include/fiche.inc.php:70 include/database.item.php:102 msgid "Balance" msgstr "Evenwicht" @@ -2909,6 +2974,7 @@ msgstr "Balans van de leverancier" #: 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:1325 msgid "Balance incorrecte" msgstr "Foute balans" @@ -2921,6 +2987,7 @@ msgstr "Foute balans" #: 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:1174 msgid "Balance incorrecte " msgstr "Foute balans" @@ -2936,11 +3003,13 @@ msgstr "Niet gesoldeerd balans" #: include/database.item.php:100 include/database.item.php:103 #: include/database.item.php:109 include/database.item.php:106 #: include/database.item.php:105 include/database.item.php:101 +#: include/database.item.php:102 msgid "Balance par catégorie de fiche" msgstr "Balans per bestandscategorie" #: include/database.item.php:106 include/database.item.php:109 #: include/database.item.php:103 include/database.item.php:101 +#: include/database.item.php:102 msgid "" "Balance par catégorie de fiche ou pour toutes les fiches ayant un poste " "comptable" @@ -3009,6 +3078,7 @@ msgstr "Bank" #: include/modele.inc.php:324 include/modele.inc.php:338 #: include/modele.inc.php:377 include/modele.inc.php:360 #: include/modele.inc.php:361 include/modele.inc.php:366 +#: include/modele.inc.php:367 msgid "Basé sur" msgstr "" @@ -3022,6 +3092,7 @@ msgstr "Database" #: include/modele.inc.php:378 include/modele.inc.php:392 #: include/modele.inc.php:441 include/modele.inc.php:424 #: include/modele.inc.php:428 include/modele.inc.php:433 +#: include/modele.inc.php:434 #, fuzzy, php-format msgid "Base de donnée %s mod %s est accèdée, déconnectez-vous d'abord" msgstr "is in use of, logout eerst" @@ -3120,7 +3191,7 @@ msgstr "" #: include/database.item.php:194 include/database.item.php:197 #: include/database.item.php:195 include/database.item.php:174 #: include/database.item.php:175 include/database.item.php:178 -#: include/database.item.php:186 +#: include/database.item.php:186 include/database.item.php:191 msgid "Bon de commande Fournisseur" msgstr "Bestelbon van de leverancier" @@ -3128,7 +3199,7 @@ msgstr "Bestelbon van de leverancier" #: include/database.item.php:195 include/database.item.php:198 #: include/database.item.php:196 include/database.item.php:173 #: include/database.item.php:174 include/database.item.php:177 -#: include/database.item.php:185 +#: include/database.item.php:185 include/database.item.php:190 msgid "Bons de commande client" msgstr "Bestelbon van de klant" @@ -3201,6 +3272,10 @@ msgstr "Kas" msgid "Calcul automatique du poste comptable" msgstr "Automatisch aanmaken van de boekhoudkundige post" +#: include/database.item.php:141 +msgid "Calcul des totaux par TVA et par journal" +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 @@ -3302,6 +3377,7 @@ msgstr "Categorie van het document" #: include/database.item.php:67 include/database.item.php:65 #: include/database.item.php:64 include/database.item.php:63 #: include/database.item.php:66 include/database.item.php:60 +#: include/database.item.php:59 msgid "Catégorie de documents" msgstr "Categorie van de documenten" @@ -3342,6 +3418,7 @@ msgstr "Bestaande categorie" #: html/ajax_card.php:530 html/ajax_card.php:529 include/ajax/ajax_card.php:509 #: include/ajax/ajax_card.php:510 include/ajax/ajax_card.php:511 #: include/ajax/ajax_card.php:544 include/ajax/ajax_card.php:548 +#: include/ajax/ajax_card.php:563 msgid "Catégorie existe déjà" msgstr "De categorie bestaat al." @@ -3356,6 +3433,7 @@ msgstr "Ongeldige code" #: html/ajax_card.php:532 html/ajax_card.php:531 include/ajax/ajax_card.php:511 #: include/ajax/ajax_card.php:512 include/ajax/ajax_card.php:513 #: include/ajax/ajax_card.php:546 include/ajax/ajax_card.php:550 +#: include/ajax/ajax_card.php:567 msgid "Catégorie sauvée" msgstr "Opgeslagen categorie" @@ -3435,7 +3513,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:556 +#: html/ajax_misc.php:554 html/ajax_misc.php:556 html/ajax_misc.php:560 #, fuzzy msgid "Ce plugin n'existe pas " msgstr "Dit plan bestaat niet" @@ -3452,7 +3530,7 @@ msgid "Cela pourrait avoir un impact sur les opérations déjà existantes" msgstr "" #: include/verif_bilan.inc.php:151 include/verif_bilan.inc.php:188 -#: include/verif_bilan.inc.php:191 +#: include/verif_bilan.inc.php:191 include/verif_bilan.inc.php:193 msgid "" "Cela pourrait causer des différences entre les balances par fiches et celle " "par postes comptables, utilisez le plugin \n" @@ -3469,6 +3547,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:1690 msgid "Celui qui paie n' a pas de poste comptable" msgstr "De persoon die betaald heeft geen boekhoudkundige post" @@ -3570,6 +3649,8 @@ msgstr "Deze extensie bestaat niet" #: include/class/acc_ledger.class.php:216 #: include/class/acc_ledger.class.php:220 #: include/class/acc_ledger.class.php:221 +#: include/class/acc_ledger.class.php:235 +#: include/class/acc_ledger.class.php:239 msgid "Cette opération n'existe pas" msgstr "Deze operatie bestaat niet" @@ -3602,6 +3683,7 @@ msgstr "Veranderingen van de toestanden" #: html/ajax_ledger.php:522 html/ajax_ledger.php:529 html/ajax_ledger.php:531 #: include/ajax/ajax_ledger.php:508 include/ajax/ajax_ledger.php:511 #: include/ajax/ajax_ledger.php:515 include/ajax/ajax_ledger.php:516 +#: include/ajax/ajax_ledger.php:517 msgid "" "Changement impossible: on ne peut pas changer la date dans une période fermée" msgstr "" @@ -3652,6 +3734,7 @@ msgstr "Kosten" #: include/ajax/ajax_ledger.php:350 include/ajax/ajax_ledger.php:237 #: include/ajax/ajax_ledger.php:239 include/ajax/ajax_ledger.php:352 #: include/ajax/ajax_ledger.php:243 include/ajax/ajax_ledger.php:356 +#: include/ajax/ajax_ledger.php:244 include/ajax/ajax_ledger.php:357 msgid "Chargement" msgstr "Laden" @@ -3733,7 +3816,8 @@ 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/ajax_misc.php:464 -#: include/lib/manage_table_sql.class.php:634 +#: include/lib/manage_table_sql.class.php:634 html/ajax_misc.php:468 +#: include/ajax/ajax_card.php:292 include/class/acc_ledger.class.php:2201 #, fuzzy, php-format msgid "Cherche" msgstr "Vinden" @@ -3782,7 +3866,7 @@ msgid "" 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:466 #, fuzzy msgid "Choisissez la TVA" msgstr "Kies de BTW" @@ -3796,6 +3880,7 @@ msgstr "Kies de BTW" #: html/ajax_card.php:291 html/ajax_card.php:293 html/ajax_card.php:294 #: include/ajax/ajax_card.php:274 include/ajax/ajax_card.php:275 #: include/ajax/ajax_card.php:283 include/ajax/ajax_card.php:285 +#: include/ajax/ajax_card.php:286 #, fuzzy msgid "" "Choisissez la catégorie de fiche à laquelle vous aimeriez ajouter une fiche" @@ -3867,6 +3952,7 @@ 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 +#: include/ajax/ajax_card.php:288 #, fuzzy msgid "Choisissez une catégorie svp" msgstr "Kies een dossier" @@ -3946,7 +4032,8 @@ msgstr "Een sleutel kiezen" #: include/ajax/ajax_card.php:263 include/ajax/ajax_card.php:318 #: include/ajax/ajax_card.php:259 include/ajax/ajax_card.php:269 #: include/ajax/ajax_card.php:334 include/ajax/ajax_card.php:280 -#: include/ajax/ajax_card.php:337 +#: include/ajax/ajax_card.php:337 include/ajax/ajax_card.php:281 +#: include/ajax/ajax_card.php:338 msgid "Choix de la catégorie" msgstr "Een categorie kiezen" @@ -4002,6 +4089,7 @@ msgstr "Keuze van het soort dagboek" #: 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:2359 #, fuzzy msgid "Choix du type de journal est obligatoire" msgstr "Keuze van het soort dagboek" @@ -4131,6 +4219,8 @@ msgstr "Ongeldige sleutel" #: 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/class/acc_ledger_sold.class.php:1083 +#: include/class/acc_ledger_sold.class.php:1339 msgid "Client" msgstr "Klant" @@ -4156,7 +4246,7 @@ msgid "Clients (C)" msgstr "Klant" #: 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:248 #, fuzzy msgid "Clients (D)" msgstr "Klant" @@ -4359,6 +4449,8 @@ msgstr "Interne code" #: include/class/acc_ledger_purchase.class.php:1833 #: include/class/acc_ledger_sold.class.php:1407 #: include/class/acc_ledger_purchase.class.php:1836 +#: include/class/acc_ledger_sold.class.php:1416 +#: include/class/acc_ledger_purchase.class.php:1842 msgid "Code Item" msgstr "Item code" @@ -4426,6 +4518,15 @@ msgstr "Stock code" #: 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/tax_summary_display.php:60 +#: include/template/tax_summary_display.php:116 +#: include/template/tax_summary_display.php:208 +#: include/template/tax_summary_display.php:288 +#: include/export/export_printtva_pdf.php:57 +#: include/export/export_printtva_pdf.php:212 +#: include/class/print_ledger_detail_item.class.php:163 +#: include/class/acc_ledger_sold.class.php:1426 +#: include/class/acc_ledger_purchase.class.php:1852 msgid "Code TVA" msgstr "BTW-code" @@ -4474,6 +4575,8 @@ msgstr "Menucode" #: include/class/acc_ledger_purchase.class.php:1838 #: include/class/acc_ledger_sold.class.php:1412 #: include/class/acc_ledger_purchase.class.php:1841 +#: include/class/acc_ledger_sold.class.php:1421 +#: include/class/acc_ledger_purchase.class.php:1847 msgid "Code fournisseur" msgstr "Levernacierscode" @@ -4524,6 +4627,8 @@ msgstr "Ongeldige code" #: include/class/acc_ledger_purchase.class.php:1830 #: include/class/acc_ledger_sold.class.php:1404 #: include/class/acc_ledger_purchase.class.php:1833 +#: include/class/acc_ledger_sold.class.php:1413 +#: include/class/acc_ledger_purchase.class.php:1839 msgid "Code journal" msgstr "Code dagboek" @@ -4626,6 +4731,9 @@ msgstr "" #: 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/class/acc_ledger_history_generic.class.php:687 +#: include/class/acc_ledger_sold.class.php:1415 +#: include/class/acc_ledger_purchase.class.php:1841 msgid "Commentaire" msgstr "Commentaar" @@ -4659,6 +4767,8 @@ msgstr "Commentaar" #: include/class/acc_ledger_purchase.class.php:1840 #: include/class/acc_ledger_sold.class.php:1414 #: include/class/acc_ledger_purchase.class.php:1843 +#: include/class/acc_ledger_sold.class.php:1423 +#: include/class/acc_ledger_purchase.class.php:1849 msgid "Commentaire TVA" msgstr "Opmerking BTW" @@ -4717,6 +4827,7 @@ msgstr "Gemeente" #: include/class/acc_ledger_sold.class.php:738 #: include/class/acc_ledger_purchase.class.php:1462 #: include/class/acc_ledger.class.php:622 +#: include/class/acc_ledger.class.php:638 msgid "Compt. Analytique" msgstr "Analytischer ekening" @@ -4746,7 +4857,7 @@ msgstr "Export Cost Accounting" #: include/database.item.php:181 include/database.item.php:185 #: include/database.item.php:184 include/database.item.php:143 #: include/database.item.php:144 include/database.item.php:145 -#: include/database.item.php:150 +#: include/database.item.php:150 include/database.item.php:155 msgid "Compte bancaire" msgstr "Bankrekening" @@ -4767,6 +4878,7 @@ msgstr "Resultatenrekening : product met debetsaldo" #: 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:54 msgid "Compte en banque" msgstr "Bankrekening" @@ -4853,6 +4965,7 @@ msgstr "Wat betreft" #: include/database.item.php:235 include/database.item.php:212 #: include/database.item.php:213 include/database.item.php:216 #: include/database.item.php:236 include/database.item.php:214 +#: include/database.item.php:245 msgid "" "Concerne tous les achats, factures reçues, notes de crédit reçues et notes " "de frais" @@ -4864,6 +4977,7 @@ msgstr "" #: include/database.item.php:236 include/database.item.php:213 #: include/database.item.php:214 include/database.item.php:217 #: include/database.item.php:237 include/database.item.php:215 +#: include/database.item.php:243 msgid "" "Concerne tous les mouvements financiers (comptes en banque, caisses, visa...)" msgstr "" @@ -4874,6 +4988,7 @@ msgstr "" #: include/database.item.php:237 include/database.item.php:214 #: include/database.item.php:215 include/database.item.php:218 #: include/database.item.php:238 include/database.item.php:216 +#: include/database.item.php:242 msgid "" "Concerne toutes les opérations comme les amortissements, les comptes TVA, ..." msgstr "Betreft alle handelingen als aflossingen, BTW-rekeningen ..." @@ -4883,6 +4998,7 @@ msgstr "Betreft alle handelingen als aflossingen, BTW-rekeningen ..." #: include/database.item.php:238 include/database.item.php:215 #: include/database.item.php:216 include/database.item.php:219 #: include/database.item.php:239 include/database.item.php:217 +#: include/database.item.php:244 msgid "Concerne toutes les ventes, notes de crédit envoyées" msgstr "Wat betreft alle verkopen, gestuurde creditnota's " @@ -4896,6 +5012,7 @@ msgstr "Config. Menu" #: include/database.item.php:67 include/database.item.php:65 #: include/database.item.php:64 include/database.item.php:63 #: include/database.item.php:66 include/database.item.php:60 +#: include/database.item.php:59 msgid "Config. catégorie de documents" msgstr "Config. categorie van de documenten" @@ -4915,6 +5032,7 @@ msgstr "Config. van de betaalmiddelen" #: include/database.item.php:101 include/database.item.php:104 #: include/database.item.php:110 include/database.item.php:107 #: include/database.item.php:106 include/database.item.php:102 +#: include/database.item.php:103 msgid "Config. du plan comptable" msgstr "Config. van het boekhoudkundig plan" @@ -4953,6 +5071,11 @@ msgid "" "puissent utiliser" msgstr "" +#: include/database.item.php:139 +#, fuzzy +msgid "Configuration des devises" +msgstr "Configuratie van de tags" + #: include/database.item.php:106 include/database.item.php:109 #: include/database.item.php:115 include/database.item.php:112 #: include/database.item.php:111 include/database.item.php:107 @@ -5062,7 +5185,8 @@ msgstr "Configuratie van de label" #: include/compta_ach.inc.php:66 include/compta_fin.inc.php:79 #: include/compta_ven.inc.php:76 include/operation_ods_confirm.inc.php:31 #: include/compta_ach.inc.php:68 include/compta_ach.inc.php:70 -#: include/compta_ven.inc.php:78 +#: include/compta_ven.inc.php:78 include/compta_ven.inc.php:79 +#: include/compta_ach.inc.php:71 #, fuzzy msgid "Confirmation" msgstr "Informatie" @@ -5131,7 +5255,7 @@ msgstr "" #: include/database.item.php:148 include/database.item.php:147 #: include/database.item.php:57 include/category_card.inc.php:75 #: include/database.item.php:60 include/database.item.php:52 -#: include/category_card.inc.php:77 +#: include/category_card.inc.php:77 include/database.item.php:53 msgid "Contact" msgstr "Contact" @@ -5242,6 +5366,7 @@ msgstr "Boekhoudkundig schrijven aanmaken" #: include/compta_ach.inc.php:109 include/compta_ach.inc.php:111 #: include/compta_ven.inc.php:119 include/compta_ach.inc.php:115 #: include/compta_ven.inc.php:123 include/operation_ods_confirm.inc.php:90 +#: include/compta_ven.inc.php:121 include/compta_ach.inc.php:113 msgid "Corriger" msgstr "Verbeteren" @@ -5249,6 +5374,7 @@ msgstr "Verbeteren" #: include/database.item.php:207 include/database.item.php:204 #: include/database.item.php:177 include/database.item.php:178 #: include/database.item.php:181 include/database.item.php:189 +#: include/database.item.php:194 msgid "Courrier" msgstr "Post" @@ -5368,7 +5494,7 @@ msgstr "" #: include/database.item.php:183 include/database.item.php:186 #: include/database.item.php:211 include/database.item.php:188 #: include/database.item.php:189 include/database.item.php:192 -#: include/database.item.php:203 +#: include/database.item.php:203 include/database.item.php:208 msgid "Création, modification et effacement de fiche" msgstr "De fiche aanmaken, bewerken en verwijderen " @@ -5462,6 +5588,8 @@ msgstr "Crébit" #: include/class/acc_ledger_history_generic.class.php:772 #: include/class/fiche.class.php:1480 #: include/class/pdfbalance_simple.class.php:57 +#: include/class/acc_ledger_history_generic.class.php:775 +#: include/class/acc_ledger.class.php:630 msgid "Crédit" msgstr "Creditzijde" @@ -5482,7 +5610,7 @@ msgstr "Gebruiker" #: include/database.item.php:219 include/database.item.php:196 #: include/database.item.php:197 include/database.item.php:200 -#: include/database.item.php:211 +#: include/database.item.php:211 include/database.item.php:216 #, fuzzy msgid "Créer une note publique" msgstr "Een nieuwe fiche aanmaken" @@ -5574,6 +5702,7 @@ msgstr "Een nieuwe fiche aanmaken" #: include/class/follow_up.class.php:297 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/class/acc_ledger.class.php:2476 msgid "Créer une nouvelle fiche" msgstr "Een nieuwe fiche aanmaken" @@ -5647,6 +5776,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:2818 #, fuzzy msgid "Dans le dépôt" msgstr "Deposito" @@ -5874,6 +6004,14 @@ msgstr "" #: 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 +#: include/export/export_printtva_pdf.php:45 +#: include/class/acc_ledger_history_generic.class.php:683 +#: include/class/acc_ledger_history_generic.class.php:770 +#: include/class/acc_ledger_sold.class.php:1406 +#: include/class/acc_ledger.class.php:617 +#: include/class/acc_ledger.class.php:830 +#: include/class/acc_ledger_purchase.class.php:1832 +#, php-format msgid "Date" msgstr "Datum" @@ -5905,7 +6043,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 +#: include/class/periode.class.php:519 include/class/periode.class.php:521 #, fuzzy msgid "Date Début" msgstr "Begindatum" @@ -5919,7 +6057,8 @@ 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 +#: include/class/periode.class.php:520 include/database.item.php:179 +#: include/class/periode.class.php:522 msgid "Date Fin" msgstr "Einddatum" @@ -5991,7 +6130,7 @@ msgstr "Datum van herinnering voor" #: include/database.item.php:148 include/lettering.account.inc.php:73 #: include/database.item.php:152 include/database.item.php:151 #: include/database.item.php:144 include/database.item.php:145 -#: include/database.item.php:153 +#: include/database.item.php:153 include/database.item.php:156 msgid "Date début" msgstr "Begindatum" @@ -6022,6 +6161,7 @@ msgstr "Totaal afschrijvingen" #: 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.class.php:1076 msgid "Date et periode ne correspondent pas" msgstr "Datum en periode komen niet overeen" @@ -6086,6 +6226,8 @@ msgstr "Uiterste datum" #: include/class/acc_ledger.class.php:207 #: include/class/anc_acc_list.class.php:334 #: include/class/acc_ledger.class.php:1044 +#: include/class/acc_ledger.class.php:225 +#: include/class/acc_ledger.class.php:1060 msgid "Date invalide" msgstr "Ongeldig datum" @@ -6103,7 +6245,8 @@ msgstr "Ongeldig datum" #: 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_ods.inc.php:132 +#: include/compta_ods.inc.php:132 include/compta_ven.inc.php:220 +#: include/compta_ach.inc.php:203 #, fuzzy msgid "Date invalide, opération non extournée" msgstr "Handeling is niet gevonden" @@ -6179,6 +6322,8 @@ msgstr "Datum van de verrichting" #: 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 +#: include/class/acc_ledger_sold.class.php:1407 +#: include/class/acc_ledger_purchase.class.php:1833 msgid "Date paiement" msgstr "Datum van de betaling" @@ -6217,6 +6362,8 @@ msgstr "Aankoopdatum" #: include/class/acc_ledger_purchase.class.php:1825 #: include/class/acc_ledger_sold.class.php:1399 #: include/class/acc_ledger_purchase.class.php:1828 +#: include/class/acc_ledger_sold.class.php:1408 +#: include/class/acc_ledger_purchase.class.php:1834 msgid "Date échéance" msgstr "Vervaldatum" @@ -6302,6 +6449,7 @@ 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:108 +#: include/template/param_jrn.php:152 msgid "Dernière pièce numérotée" msgstr "Laatst genummerd stuk" @@ -6318,7 +6466,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:409 +#: html/ajax_misc.php:407 html/ajax_misc.php:409 html/ajax_misc.php:413 #, fuzzy msgid "Des actions dépendent de cette catégorie" msgstr "Kan dit bestand op te slaan" @@ -6498,6 +6646,8 @@ msgstr "Kan dit bestand op te slaan" #: 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 +#: include/template/param_jrn.php:129 include/modele.inc.php:249 +#: include/modele.inc.php:363 include/database.item.php:160 msgid "Description" msgstr "Beschrijving" @@ -6556,6 +6706,10 @@ msgstr "Ontvanger" msgid "Destinataire invalide" msgstr "Ongeldig jaar" +#: include/database.item.php:139 +msgid "Devises" +msgstr "" + #: include/class/class_pdf_operation.php:378 #: include/class/pdf_operation.class.php:378 #, fuzzy @@ -6669,7 +6823,7 @@ msgstr "Beschikbaar in de dagboeken" #: include/database.item.php:192 include/database.item.php:80 #: include/database.item.php:190 include/database.item.php:180 #: include/database.item.php:181 include/database.item.php:184 -#: include/database.item.php:77 +#: include/database.item.php:77 include/database.item.php:197 msgid "Divers" msgstr "Divers" @@ -6703,7 +6857,9 @@ msgstr "Divers" #: 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/class/acc_ledger_search.class.php:709 include/compta_ven.inc.php:186 +#: include/ajax/ajax_ledger.php:323 include/ajax/ajax_ledger.php:352 +#: include/compta_ach.inc.php:174 msgid "Document" msgstr "Document" @@ -6711,7 +6867,7 @@ msgstr "Document" #: include/database.item.php:191 include/database.item.php:194 #: include/database.item.php:192 include/database.item.php:172 #: include/database.item.php:173 include/database.item.php:176 -#: include/database.item.php:184 +#: include/database.item.php:184 include/database.item.php:189 msgid "Document Interne" msgstr "Intern document" @@ -6851,7 +7007,7 @@ msgstr "" #: include/ext/importbank/index.php:141 #: include/ext/importbank/include/import_bank.class.php:463 #: include/ext/importbank/include/import_bank.class.php:484 -#: include/modele.inc.php:412 +#: include/modele.inc.php:412 include/modele.inc.php:413 #, fuzzy msgid "Donnée invalide" msgstr "Ongeldig jaar" @@ -6965,6 +7121,7 @@ msgstr "Staffing" #: 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.class.php:1055 msgid "Double Encodage" msgstr "Dubbel gecodeerd" @@ -6996,7 +7153,7 @@ msgstr "Uitleg" #: include/database.item.php:175 include/database.item.php:179 #: include/database.item.php:178 include/database.item.php:137 #: include/database.item.php:138 include/database.item.php:139 -#: include/database.item.php:144 +#: include/database.item.php:144 include/database.item.php:149 msgid "Durée Amortissement" msgstr "Afschrijvingstermijn" @@ -7087,6 +7244,9 @@ msgstr "Afschrijvingstermijn" #: include/class/acc_ledger_history_generic.class.php:771 #: include/class/fiche.class.php:1479 #: include/class/pdfbalance_simple.class.php:56 +#: include/class/acc_ledger_history_generic.class.php:774 +#: include/class/acc_ledger.class.php:629 +#: include/class/acc_ledger.class.php:905 msgid "Débit" msgstr "debiet" @@ -7114,6 +7274,7 @@ msgid "Débiteur" msgstr "schuldenaar" #: include/class/periode.class.php:649 include/class/periode.class.php:651 +#: include/class/periode.class.php:653 msgid "Décembre" msgstr "" @@ -7182,6 +7343,7 @@ msgstr "Afmelden" #: include/class/acc_ledger_purchase.class.php:1699 #: include/class/acc_ledger_sold.class.php:944 #: include/class/acc_ledger_purchase.class.php:1702 +#: include/class/acc_ledger_sold.class.php:946 msgid "Déduction acompte " msgstr "Borg aftrek" @@ -7258,7 +7420,7 @@ msgstr "Uitgaven" #: include/database.item.php:180 include/database.item.php:184 #: include/database.item.php:183 include/database.item.php:142 #: include/database.item.php:143 include/database.item.php:144 -#: include/database.item.php:149 +#: include/database.item.php:149 include/database.item.php:154 msgid "Dépense charge du grant (partie privé) " msgstr "Uitgaven ten laste van de subsidie ​​(private partij)" @@ -7315,6 +7477,7 @@ 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:2300 msgid "Désactivé" msgstr "" @@ -7336,6 +7499,7 @@ msgstr "Sorry Geen Result van stuurprogramma" #: html/ajax_ledger.php:223 html/ajax_ledger.php:225 #: include/ajax/ajax_ledger.php:202 include/ajax/ajax_ledger.php:205 #: include/ajax/ajax_ledger.php:207 include/ajax/ajax_ledger.php:211 +#: include/ajax/ajax_ledger.php:212 msgid "Désolé il y a une erreur" msgstr "Sorry er is een fout opgetreden" @@ -7377,7 +7541,7 @@ msgstr "Cost Accounting Module" #: include/modele.inc.php:413 include/dossier.inc.php:361 #: include/modele.inc.php:396 include/dossier.inc.php:377 #: include/dossier.inc.php:382 include/modele.inc.php:397 -#: include/modele.inc.php:402 +#: include/modele.inc.php:402 include/modele.inc.php:403 msgid "Désolé, vous n'avez pas coché la case" msgstr "Sorry hebt u Het niet VAK aangekruisd" @@ -7482,6 +7646,7 @@ msgstr "Detail gekochte Artikelen" #: include/class/pre_op_ven.class.php:266 #: include/class/acc_ledger_sold.class.php:714 #: include/class/acc_ledger_sold.class.php:1206 +#: include/class/acc_ledger_sold.class.php:1215 msgid "Détail articles vendus" msgstr "Detail VERKOCHT Artikelen" @@ -7535,6 +7700,7 @@ msgstr "Extensie detail" #: include/ajax/ajax_add_concerned_card.php:44 include/ajax/ajax_card.php:133 #: include/ajax/ajax_card.php:375 include/export/export_fiche_detail_pdf.php:53 #: include/ajax/ajax_add_concerned_card.php:48 include/ajax/ajax_card.php:378 +#: include/ajax/ajax_card.php:379 msgid "Détail fiche" msgstr "Detail van de fiche" @@ -7543,6 +7709,7 @@ msgstr "Detail van de fiche" #: html/ajax_card.php:563 include/ajax/ajax_card.php:543 #: include/ajax/ajax_card.php:544 include/ajax/ajax_card.php:545 #: include/ajax/ajax_card.php:578 include/ajax/ajax_card.php:582 +#: include/ajax/ajax_card.php:605 msgid "Détail fiche (sauvée)" msgstr "Detail van de fiche (opgeslagen)" @@ -7654,6 +7821,8 @@ msgstr "Termijn" #: include/class/acc_ledger_purchase.class.php:1773 #: include/class/acc_ledger_sold.class.php:1026 #: include/class/acc_ledger_purchase.class.php:1776 +#: include/class/acc_ledger_sold.class.php:1035 +#: include/class/acc_ledger_purchase.class.php:1782 msgid "Echeance dépassée" msgstr "termijn wordt overschreden" @@ -7761,6 +7930,7 @@ msgstr "Aanmaken" #: include/class/acc_ledger_sold.class.php:1064 #: include/class/pdf_operation.class.php:70 #: include/class/acc_ledger_sold.class.php:1081 +#: include/class/acc_ledger_sold.class.php:1090 msgid "Echéance" msgstr "Termijn" @@ -7830,7 +8000,7 @@ msgstr "Boekhoudend schrijven" #: include/database.item.php:53 include/database.item.php:56 #: include/database.item.php:60 include/database.item.php:57 #: include/database.item.php:58 include/database.item.php:61 -#: include/database.item.php:55 +#: include/database.item.php:55 include/database.item.php:54 msgid "Ecriture prédefinie" msgstr "Het schrijven van vooraf gedefinieerde" @@ -7853,6 +8023,7 @@ msgstr "Boekingen" #: 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/ajax/ajax_card.php:172 msgid "Efface" msgstr "Wissen" @@ -7881,6 +8052,7 @@ msgstr "Erasure" #: include/modele.inc.php:342 include/modele.inc.php:356 #: include/modele.inc.php:398 include/modele.inc.php:381 #: include/modele.inc.php:382 include/modele.inc.php:387 +#: include/modele.inc.php:388 msgid "Effacement de toutes les données des plugins" msgstr "" @@ -7890,6 +8062,7 @@ msgid "Effacement déclaration" msgstr "Deze verklaring verwijderen" #: include/class/periode.class.php:673 include/class/periode.class.php:675 +#: include/class/periode.class.php:677 #, fuzzy msgid "Effacement impossible" msgstr "Export is onmogelijk" @@ -7906,6 +8079,7 @@ msgstr "Erasure" #: html/ajax_ledger.php:186 html/ajax_ledger.php:187 #: include/ajax/ajax_ledger.php:164 include/ajax/ajax_ledger.php:167 #: include/ajax/ajax_ledger.php:168 include/ajax/ajax_ledger.php:172 +#: include/ajax/ajax_ledger.php:173 #, fuzzy msgid "Effacement refusé" msgstr "Erasure" @@ -7986,6 +8160,8 @@ msgstr "Erasure" #: 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:325 include/modele.inc.php:317 +#: include/class/periode.class.php:598 include/class/periode.class.php:603 msgid "Effacer" msgstr "Wissen" @@ -7999,6 +8175,7 @@ msgstr "Wissen" #: include/compta_ven.inc.php:325 include/compta_ach.inc.php:296 #: include/compta_ven.inc.php:330 include/compta_ven.inc.php:333 #: include/compta_ach.inc.php:299 include/compta_ven.inc.php:341 +#: include/compta_ven.inc.php:339 include/compta_ach.inc.php:297 msgid "Effacer " msgstr "Wissen" @@ -8039,7 +8216,7 @@ msgstr "De geselecteerde documenten verwijderen" #: include/database.item.php:185 include/database.item.php:188 #: include/database.item.php:213 include/database.item.php:190 #: include/database.item.php:191 include/database.item.php:194 -#: include/database.item.php:205 +#: include/database.item.php:205 include/database.item.php:210 msgid "Effacer les documents du suivi" msgstr "Duidelijke documentatie van de monitoring" @@ -8053,14 +8230,14 @@ msgstr "Wissen" #: include/database.item.php:220 include/database.item.php:197 #: include/database.item.php:198 include/database.item.php:201 -#: include/database.item.php:212 +#: include/database.item.php:212 include/database.item.php:217 #, fuzzy msgid "Effacer une note publique" msgstr "Zei blad Wissen" #: include/database.item.php:217 include/database.item.php:194 #: include/database.item.php:195 include/database.item.php:198 -#: include/database.item.php:209 +#: include/database.item.php:209 include/database.item.php:214 #, fuzzy msgid "Effacer une opération " msgstr "Alle activiteiten" @@ -8091,6 +8268,7 @@ msgstr "Elementen" #: 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:85 +#: include/database.item.php:196 msgid "Email" msgstr "E-mail" @@ -8203,6 +8381,7 @@ msgstr "Coderen" #: include/database.item.php:60 include/database.item.php:63 #: include/database.item.php:57 include/database.item.php:55 +#: include/database.item.php:56 msgid "Encodage d'un extrait bancaire (=relevé bancaire)" msgstr "" @@ -8257,7 +8436,7 @@ msgstr "Verwijder alle tags geselecteerde documenten" #: include/database.item.php:216 include/database.item.php:193 #: include/database.item.php:194 include/database.item.php:197 -#: include/database.item.php:208 +#: include/database.item.php:208 include/database.item.php:213 #, fuzzy msgid "Enlever une pièce justificative" msgstr "Voeg een kasstuk toe" @@ -8278,7 +8457,8 @@ msgstr "OPSLAAN" #: include/compta_ach.inc.php:110 include/compta_ach.inc.php:163 #: include/compta_ven.inc.php:118 include/compta_ach.inc.php:114 #: include/compta_ach.inc.php:167 include/compta_ven.inc.php:122 -#: include/ext/tva/ajax.php:111 +#: include/ext/tva/ajax.php:111 include/compta_ven.inc.php:120 +#: include/compta_ach.inc.php:112 include/compta_ach.inc.php:165 msgid "Enregistrement" msgstr "Opgeslagen" @@ -8304,6 +8484,7 @@ msgstr "Opgeslagen" #: include/action.common.inc.php:316 include/compta_ven.inc.php:332 #: include/action.common.inc.php:191 include/action.common.inc.php:325 #: include/compta_ach.inc.php:298 include/compta_ven.inc.php:340 +#: include/compta_ven.inc.php:338 include/compta_ach.inc.php:296 msgid "Enregistrer" msgstr "OPSLAAN" @@ -8350,6 +8531,7 @@ msgstr "" #: include/ext/rapport_avance/include/template/parameter_send_mail_input.php:23 #: include/ext/rapport_avance/include/template/parameter_send_mail_input.php:27 +#: scenario/HtmlInput.test.php:89 msgid "Envoi" msgstr "Verzending" @@ -8446,7 +8628,7 @@ msgstr "Foute balans" #: include/class_noalyss_sql.php:316 include/lib/class_noalyss_sql.php:316 #: include/lib/data_sql.class.php:286 include/lib/noalyss_sql.class.php:391 -#: include/lib/data_sql.class.php:248 +#: include/lib/data_sql.class.php:248 include/lib/database_core.class.php:168 msgid "Erreur : exec_sql attend un array" msgstr "" @@ -8554,6 +8736,7 @@ msgid "Erreur paramètre" msgstr "Module instellen" #: include/ajax/ajax_card.php:356 include/ajax/ajax_card.php:359 +#: include/ajax/ajax_card.php:360 #, fuzzy msgid "Erreur sauvegarde" msgstr "laatste back-up" @@ -8737,7 +8920,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 +#: include/class/periode.class.php:521 include/class/periode.class.php:523 msgid "Exercice" msgstr "Oefening" @@ -8747,6 +8930,7 @@ msgid "Exercice comptable d'achat" msgstr "Boekhoudkundig aankoopjaar" #: include/class/periode.class.php:424 include/class/periode.class.php:426 +#: include/class/periode.class.php:428 #, php-format msgid "Exercice doit être entre %s et %s " msgstr "" @@ -8757,6 +8941,7 @@ msgid "Exercice invalide" msgstr "Ongeldig datum" #: include/class/periode.class.php:421 include/class/periode.class.php:423 +#: include/class/periode.class.php:425 #, fuzzy msgid "Exercice n'est pas un nombre" msgstr "tarief is geen getal" @@ -8764,7 +8949,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:469 +#: html/ajax_misc.php:467 html/ajax_misc.php:469 html/ajax_misc.php:473 msgid "Explication" msgstr "Uitleg" @@ -8773,6 +8958,11 @@ msgstr "Uitleg" msgid "Export" msgstr "Export" +#: include/database.item.php:140 +#, fuzzy +msgid "Export ANC" +msgstr "Export CSV" + #: include/database.item.php:46 include/database.item.php:49 #: include/database.item.php:53 include/database.item.php:52 #: include/database.item.php:55 include/database.item.php:48 @@ -8831,7 +9021,7 @@ msgstr "Balans export" #: 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 +#: include/class/fiche.class.php:2215 include/class/tax_summary.class.php:334 msgid "Export CSV" msgstr "Export CSV" @@ -8931,7 +9121,7 @@ msgstr "Export Kranten" #: 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:1605 -#: include/class/fiche.class.php:2237 +#: include/class/fiche.class.php:2237 include/class/tax_summary.class.php:350 msgid "Export PDF" msgstr "PDF exporteren" @@ -8943,6 +9133,11 @@ msgstr "PDF exporteren" msgid "Export Poste détail" msgstr "Export Item Detail" +#: include/database.item.php:142 include/database.item.php:143 +#, fuzzy +msgid "Export Résumé TVA" +msgstr "Samenvatting Export lijst voorraad" + #: include/database.item.php:48 include/database.item.php:51 #: include/database.item.php:55 include/database.item.php:54 #: include/database.item.php:57 include/database.item.php:50 @@ -9103,6 +9298,7 @@ msgstr "Uitbreidingen (plugins)" #: include/operation_ods_confirm.inc.php:53 include/compta_ach.inc.php:90 #: include/compta_ach.inc.php:92 include/compta_ven.inc.php:99 #: include/ajax/ajax_ledger.php:564 include/class/acc_operation.class.php:729 +#: include/ajax/ajax_ledger.php:565 #, fuzzy msgid "Extourne" msgstr "Extourner" @@ -9111,6 +9307,7 @@ msgstr "Extourner" #: include/operation_ods_confirm.inc.php:61 #: include/operation_ods_confirm.inc.php:62 include/compta_ach.inc.php:104 #: include/compta_ach.inc.php:106 include/compta_ven.inc.php:113 +#: include/compta_ven.inc.php:111 #, fuzzy msgid "Extourne opération" msgstr "Alle activiteiten" @@ -9132,6 +9329,8 @@ msgstr "Alle activiteiten" #: 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:333 +#: include/template/ledger_detail_bottom.php:346 msgid "Extourner" msgstr "Extourner" @@ -9141,6 +9340,7 @@ msgstr "Extourner" #: 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:348 msgid "" "Extourner une opération vous permet de l'annuler par son écriture inverse" msgstr "" @@ -9149,12 +9349,13 @@ msgstr "" #: 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_ods.inc.php:118 +#: include/compta_ven.inc.php:206 #, fuzzy msgid "Extourné au " msgstr "Export Kranten" #: include/compta_ach.inc.php:184 include/compta_ach.inc.php:186 -#: include/compta_ach.inc.php:191 +#: include/compta_ach.inc.php:191 include/compta_ach.inc.php:189 #, fuzzy, php-format msgid "Extourné au %s" msgstr "Export Kranten" @@ -9204,6 +9405,7 @@ msgstr "" #: include/ext/invoicing/include/invoice_to_zip.inc.php:76 #: include/compta_ach.inc.php:89 include/compta_ven.inc.php:96 #: include/database.item.php:179 include/database.item.php:187 +#: include/database.item.php:192 msgid "Facture" msgstr "Faktuur" @@ -9232,7 +9434,7 @@ msgstr "Favorieten" #: include/database.item.php:161 include/database.item.php:165 #: include/database.item.php:164 include/database.item.php:157 #: include/database.item.php:158 include/company.inc.php:124 -#: include/database.item.php:166 +#: include/database.item.php:166 include/database.item.php:169 msgid "Fax" msgstr "Fax" @@ -9312,6 +9514,8 @@ msgstr "Krachtdadig optreden" #: 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 #: include/template/ledger_detail_bottom.php:303 +#: include/template/ledger_detail_bottom.php:299 +#: include/template/ledger_detail_bottom.php:300 include/ajax/ajax_card.php:313 #, php-format msgid "Fermer" msgstr "Dicht" @@ -9337,7 +9541,7 @@ msgstr "Dicht" #: include/class/periode.class.php:585 #: include/class/periode_ledger_table.class.php:142 -#: include/class/periode.class.php:587 +#: include/class/periode.class.php:587 include/class/periode.class.php:589 #, fuzzy msgid "Fermée" msgstr "Dicht" @@ -9419,7 +9623,7 @@ msgstr "BTW fiche" #: include/ajax/ajax_card.php:345 include/ajax/ajax_card.php:346 #: include/ajax/ajax_card.php:347 include/ajax/ajax_add_concerned_card.php:50 #: include/ajax/ajax_card.php:380 include/ajax/ajax_add_concerned_card.php:54 -#: include/ajax/ajax_card.php:383 +#: include/ajax/ajax_card.php:383 include/ajax/ajax_card.php:384 msgid "Fiche contenant" msgstr "Blad Bevat" @@ -9434,7 +9638,7 @@ msgstr "Map niet bestaat" msgid "Fiche non disponible pour journal" msgstr "Geen enkele printer is beschikbaar om toegevoegd te worden" -#: include/ajax/ajax_card.php:619 +#: include/ajax/ajax_card.php:619 include/ajax/ajax_card.php:642 #, fuzzy msgid "Fiche non effacée" msgstr "Undeleted opnemen" @@ -9463,7 +9667,8 @@ msgstr "Record niet gevonden" #: html/ajax_card.php:559 html/ajax_card.php:558 include/ajax/ajax_card.php:538 #: include/ajax/ajax_card.php:539 include/ajax/ajax_card.php:540 #: include/ajax/ajax_card.php:573 include/ajax/ajax_card.php:577 -#: include/ajax/ajax_card.php:607 +#: include/ajax/ajax_card.php:607 include/ajax/ajax_card.php:600 +#: include/ajax/ajax_card.php:630 msgid "Fiche non valide" msgstr "Ongeldige opnemen" @@ -9474,7 +9679,7 @@ msgstr "" #: html/ajax_card.php:304 html/ajax_card.php:340 html/ajax_card.php:342 #: html/ajax_card.php:343 include/ajax/ajax_card.php:323 #: include/ajax/ajax_card.php:324 include/ajax/ajax_card.php:342 -#: include/ajax/ajax_card.php:345 +#: include/ajax/ajax_card.php:345 include/ajax/ajax_card.php:346 msgid "Fiche sauvée" msgstr "Opslagen fiche" @@ -9499,7 +9704,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 +#: include/template/param_jrn.php:260 include/template/param_jrn.php:305 msgid "Fiches utilisables (D/C)" msgstr "" @@ -9612,7 +9817,7 @@ msgstr "Gefilterd per categorie" #: 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 -#: include/class/acc_ledger_search.class.php:562 +#: include/class/acc_ledger_search.class.php:562 include/modele.inc.php:279 msgid "Filtre" msgstr "Filter" @@ -9722,6 +9927,7 @@ msgstr "" #: 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/lib/user_menu.php:136 +#: include/database.item.php:233 include/database.item.php:252 msgid "Financier" msgstr "Financieel" @@ -9736,6 +9942,12 @@ msgstr "Export CSV" msgid "Format Invalide" msgstr "act ongeldig" +#: include/class/tax_summary.class.php:74 +#: include/class/tax_summary.class.php:93 +#, fuzzy +msgid "Format date invalide" +msgstr "act ongeldig" + #: include/ext/importbank/include/template/show_field.php:27 #: include/ext/importbank/include/template/show_transfer.php:168 #: include/ext/importbank/include/template/show_transfer.php:167 @@ -9844,7 +10056,7 @@ msgid "Fournisseur " msgstr "Leverancier" #: 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:193 #, fuzzy msgid "Fournisseurs (C)" msgstr "Leverancier" @@ -9869,6 +10081,7 @@ msgid "Français" msgstr "Frans" #: include/class/periode.class.php:647 include/class/periode.class.php:649 +#: include/class/periode.class.php:651 msgid "Février" msgstr "" @@ -9877,7 +10090,7 @@ msgstr "" #: include/ext/sav/include/template/sas_display_detail.php:111 #: include/database.item.php:166 include/database.item.php:165 #: include/database.item.php:158 include/database.item.php:159 -#: include/database.item.php:167 +#: include/database.item.php:167 include/database.item.php:170 msgid "GSM" msgstr "GSM" @@ -9912,7 +10125,7 @@ msgstr "Managementmodellen" #: include/database.item.php:53 include/database.item.php:56 #: include/database.item.php:60 include/database.item.php:57 #: include/database.item.php:58 include/database.item.php:61 -#: include/database.item.php:55 +#: include/database.item.php:55 include/database.item.php:54 msgid "Gestion des opérations prédéfinifies" msgstr "Operations Management prédéfinifies" @@ -9939,7 +10152,7 @@ msgstr "Users Beheer" #: include/database.item.php:163 include/database.item.php:166 #: include/database.item.php:170 include/database.item.php:169 #: include/database.item.php:168 include/database.item.php:172 -#: include/database.item.php:177 +#: include/database.item.php:177 include/database.item.php:180 msgid "Gestion stock" msgstr "Voorraadbeheer" @@ -9958,6 +10171,7 @@ msgstr "Geen filter, alle dagboeken" #: include/class/acc_ledger.class.php:364 include/database.item.php:66 #: include/class/acc_ledger.class.php:372 #: include/class/acc_ledger.class.php:373 +#: include/class/acc_ledger.class.php:391 msgid "Grand Livre" msgstr "Grootboek" @@ -10127,6 +10341,7 @@ msgstr "Grid 86: overnames in België en intra ABC sales" #: 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:52 msgid "Groupe" msgstr "Groep" @@ -10140,7 +10355,7 @@ msgstr "Management Module" #: include/database.item.php:50 include/database.item.php:53 #: include/database.item.php:62 include/database.item.php:59 #: include/database.item.php:58 include/database.item.php:56 -#: include/database.item.php:51 +#: include/database.item.php:51 include/database.item.php:52 msgid "Groupe analytique" msgstr "Analytische groep" @@ -10251,6 +10466,7 @@ msgstr "" #: 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 +#: include/class/print_ledger_detail_item.class.php:161 msgid "HTVA" msgstr "Zonder BTW" @@ -10278,6 +10494,8 @@ msgstr "Zonder BTW" #: include/class/acc_ledger_purchase.class.php:1851 #: include/class/acc_ledger_sold.class.php:1422 #: include/class/acc_ledger_purchase.class.php:1854 +#: include/class/acc_ledger_sold.class.php:1431 +#: include/class/acc_ledger_purchase.class.php:1860 msgid "HTVA Opération" msgstr "Operatie exclusief BTW" @@ -10300,7 +10518,7 @@ msgid "Heure" msgstr "Tijd" #: include/verif_bilan.inc.php:127 include/verif_bilan.inc.php:165 -#: include/verif_bilan.inc.php:168 +#: include/verif_bilan.inc.php:168 include/verif_bilan.inc.php:169 msgid "Hist." msgstr "" @@ -10326,6 +10544,7 @@ msgstr "Histo. Verandering" #: 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/fiche.inc.php:65 +#: include/ajax/ajax_card.php:167 msgid "Historique" msgstr "Historisch" @@ -10341,11 +10560,13 @@ msgstr "Geschiedenis Scholar en verschillende hoeveelheden" #: include/database.item.php:69 include/database.item.php:67 #: include/database.item.php:66 include/database.item.php:65 #: include/database.item.php:68 include/database.item.php:62 +#: include/database.item.php:61 msgid "Historique achat" msgstr "Historische aankoop" #: include/database.item.php:65 include/database.item.php:68 #: include/database.item.php:62 include/database.item.php:60 +#: include/database.item.php:61 msgid "" "Historique de toutes vos opérations dans les journaux d'achats un menu de " "recherche, vous permettra de retrouver rapidement l'opération qui vous " @@ -10386,6 +10607,7 @@ msgstr "" #: include/database.item.php:61 include/database.item.php:64 #: include/database.item.php:58 include/database.item.php:56 +#: include/database.item.php:57 msgid "" "Historique de toutes vos opérations un menu de recherche dans une nouvelle " "fenêtre, vous permettra de retrouver rapidement l'opération qui vous " @@ -10554,7 +10776,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:557 +#: html/ajax_misc.php:555 html/ajax_misc.php:557 html/ajax_misc.php:561 msgid "Il y a une erreur, ce plugin n'existe pas" msgstr "" @@ -10747,6 +10969,7 @@ msgstr "Onmogelijk om de waarde te veranderen: post is al in gebruik" #: 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:2632 msgid "Impossible d'effacer un journal qui contient des opérations" msgstr "" "Onmogelijk om een journaal te verwijderen waarin operaties nog actief zijn" @@ -10963,6 +11186,7 @@ msgstr "" #: include/modele.inc.php:312 include/modele.inc.php:295 #: include/modele.inc.php:296 include/modele.inc.php:301 +#: include/modele.inc.php:302 #, fuzzy msgid "Inexistant" msgstr "onbestaand" @@ -10985,7 +11209,8 @@ msgstr "" #: include/ajax/ajax_ledger.php:96 include/ajax/ajax_ledger.php:118 #: include/ajax/ajax_ledger.php:103 include/ajax/ajax_ledger.php:125 #: include/template/ledger_detail_bottom.php:37 include/ext/tva/ajax.php:101 -#: include/ext/tva/ajax.php:200 +#: include/ext/tva/ajax.php:200 include/ajax/ajax_ledger.php:104 +#: include/ajax/ajax_ledger.php:126 msgid "Information" msgstr "Informatie" @@ -11132,6 +11357,9 @@ msgstr "Intern" #: 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/class/acc_ledger_history_generic.class.php:769 +#: include/class/acc_ledger_sold.class.php:1412 +#: include/class/acc_ledger_purchase.class.php:1838 msgid "Interne" msgstr "Intern" @@ -11142,6 +11370,7 @@ msgstr "Bestelbon" #: include/modele.inc.php:318 include/modele.inc.php:301 #: include/modele.inc.php:302 include/modele.inc.php:307 +#: include/modele.inc.php:308 #, fuzzy msgid "Invalide" msgstr "Bevestigen" @@ -11195,6 +11424,7 @@ msgid "Item" msgstr "Item code" #: include/class/periode.class.php:647 include/class/periode.class.php:649 +#: include/class/periode.class.php:651 msgid "Janvier" msgstr "" @@ -11261,10 +11491,13 @@ msgstr "Donderdag" #: 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/export/export_printtva_csv.php:39 +#: include/export/export_printtva_csv.php:58 msgid "Journal" msgstr "Journaal" #: include/template/param_jrn.php:125 include/template/param_jrn.php:127 +#: include/template/param_jrn.php:171 #, fuzzy msgid "Journal actif" msgstr "Totale activa" @@ -11289,6 +11522,7 @@ msgstr "Financiële journalen" #: 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:2919 #, fuzzy msgid "Journal incorrect" msgstr "Fout bedrag" @@ -11300,6 +11534,7 @@ msgstr "Onbestaand dagboek" #: include/ext/import_account/include/class_impacc_export.php:104 #: include/ext/import_account/include/impacc_export.class.php:104 +#: include/class/acc_ledger.class.php:2938 #, fuzzy msgid "Journal invalide" msgstr "Journaal" @@ -11321,6 +11556,7 @@ msgstr "Financiële journalen" #: 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:2230 msgid "Journal n'existe pas" msgstr "Inloggen bestaat niet" @@ -11349,6 +11585,7 @@ msgstr "Dagboeken" #: 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:2136 #, fuzzy msgid "Journaux Financier" msgstr "Financiële journalen" @@ -11360,6 +11597,7 @@ msgstr "Financiële journalen" #: 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:2137 #, fuzzy msgid "Journaux d'Opérations diverses" msgstr "Jounalen over Verschillende Handelingen" @@ -11372,6 +11610,7 @@ msgstr "Jounalen over Verschillende Handelingen" #: 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:2135 #, fuzzy msgid "Journaux d'achat" msgstr "Inkoopdagboeken" @@ -11387,15 +11626,18 @@ msgstr "Inkoopdagboeken" #: 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:2134 msgid "Journaux de vente" msgstr "Geschiedenis verkopen " #: include/class/periode.class.php:648 include/class/periode.class.php:650 +#: include/class/periode.class.php:652 #, fuzzy msgid "Juillet" msgstr "City" #: include/class/periode.class.php:648 include/class/periode.class.php:650 +#: include/class/periode.class.php:652 msgid "Juin" msgstr "" @@ -11578,6 +11820,8 @@ msgstr "Het blad" #: 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:1125 +#: include/class/acc_ledger.class.php:1268 #, php-format msgid "La fiche %s n'a pas de poste comptable" msgstr "De% s-plug heeft geen financieel administratieve post" @@ -11667,6 +11911,7 @@ msgstr "De quick ratio is een verhouding die op uw homepage verschijnt" #: include/modele.inc.php:386 include/modele.inc.php:400 #: include/modele.inc.php:450 include/modele.inc.php:433 #: include/modele.inc.php:437 include/modele.inc.php:442 +#: include/modele.inc.php:443 #, fuzzy, php-format msgid "Le modèle %s est effacé" msgstr "Lege regels worden gewist" @@ -11729,6 +11974,7 @@ msgstr "EEN Naam bij post are Moeder Verplicht" #: include/ajax/ajax_card.php:551 include/class/forecast.class.php:70 #: include/ajax/ajax_card.php:555 #: include/class/template_card_category.class.php:73 +#: include/ajax/ajax_card.php:574 msgid "Le nom ne peut pas être vide" msgstr "De Naam mag are niet leeg" @@ -11763,6 +12009,7 @@ msgid "Le poste" msgstr "Van rekening" #: include/class/acc_ledger.class.php:1124 +#: include/class/acc_ledger.class.php:1140 #, fuzzy, php-format msgid "Le poste %s n'est pas dans ce journal" msgstr "wordt niet in this journaal" @@ -11925,6 +12172,7 @@ msgstr "Wachtwoorden komen niet overeen. Wachtwoord ongewijzigd" #: include/database.item.php:58 include/database.item.php:61 #: include/database.item.php:55 include/database.item.php:53 +#: include/database.item.php:54 msgid "" "Les opérations prédéfinies sont des opérations que vous faites régulièrement " "(loyer, abonnement,...) " @@ -11999,6 +12247,7 @@ msgstr "Belettering" #: include/database.item.php:68 include/database.item.php:66 #: include/database.item.php:65 include/database.item.php:64 #: include/database.item.php:67 include/database.item.php:61 +#: include/database.item.php:60 msgid "Lettrage par Fiche" msgstr "Belettering Sheet" @@ -12006,6 +12255,7 @@ msgstr "Belettering Sheet" #: include/database.item.php:107 include/database.item.php:104 #: include/database.item.php:103 include/database.item.php:105 #: include/database.item.php:108 include/database.item.php:100 +#: include/database.item.php:101 msgid "Lettrage par Poste" msgstr "Belettering Bericht" @@ -12013,6 +12263,7 @@ msgstr "Belettering Bericht" #: include/database.item.php:68 include/database.item.php:66 #: include/database.item.php:65 include/database.item.php:64 #: include/database.item.php:67 include/database.item.php:61 +#: include/database.item.php:60 msgid "Lettrage par fiche" msgstr "Belettering vel" @@ -12028,6 +12279,7 @@ msgstr "Belettering voor de boekhoudkundige positie" #: include/database.item.php:198 include/database.item.php:201 #: include/database.item.php:176 include/database.item.php:177 #: include/database.item.php:180 include/database.item.php:188 +#: include/database.item.php:193 msgid "Lettre de rappel" msgstr "Herinnering" @@ -12207,6 +12459,14 @@ msgstr "smaad" #: 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/ledger_detail_bottom.php:356 +#: include/class/print_ledger_detail_item.class.php:158 +#: include/class/acc_ledger_history_generic.class.php:773 +#: include/class/acc_ledger_sold.class.php:1410 +#: include/class/acc_ledger.class.php:621 +#: include/class/acc_ledger.class.php:628 +#: include/class/acc_ledger.class.php:903 +#: include/class/acc_ledger_purchase.class.php:1836 #, php-format msgid "Libellé" msgstr "Opstellen" @@ -12233,6 +12493,7 @@ msgstr "Opstellen" #: include/class/acc_ledger_purchase.class.php:1700 #: include/class/acc_ledger_sold.class.php:945 #: include/class/acc_ledger_purchase.class.php:1703 +#: include/class/acc_ledger_sold.class.php:947 msgid "Libellé :" msgstr "Volgt:" @@ -12327,6 +12588,7 @@ msgstr "Lijst met contacten" #: include/database.item.php:57 include/database.item.php:60 #: include/database.item.php:54 include/database.item.php:52 +#: include/database.item.php:53 #, fuzzy msgid "Liste de tous vos contacts" msgstr "Lijst met contacten" @@ -12365,6 +12627,7 @@ msgstr "" #: include/database.item.php:51 include/database.item.php:54 #: include/database.item.php:58 include/database.item.php:57 #: include/database.item.php:60 include/database.item.php:52 +#: include/database.item.php:53 msgid "Liste des contacts" msgstr "Lijst met contacten" @@ -12463,6 +12726,7 @@ msgid "Lundi" msgstr "Maandag" #: include/class/periode.class.php:648 include/class/periode.class.php:650 +#: include/class/periode.class.php:652 #, fuzzy msgid "Mai" msgstr "Dinsdag" @@ -12542,6 +12806,7 @@ msgid "Marquer pour suppression" msgstr "Print menu" #: include/class/periode.class.php:647 include/class/periode.class.php:649 +#: include/class/periode.class.php:651 msgid "Mars" msgstr "" @@ -12690,6 +12955,7 @@ msgstr "" #: include/database.item.php:19 include/database.item.php:22 #: include/database.item.php:51 include/database.item.php:49 +#: include/database.item.php:62 msgid "Menu regroupant les plugins" msgstr "" @@ -12721,12 +12987,14 @@ msgstr "Woensdag" #: include/ext/invoicing/include/invoice_send_mail_input.inc.php:91 #: include/ext/invoicing/include/template/recorded_message_display.php:27 #: include/compta_ach.inc.php:111 include/compta_ven.inc.php:118 -#: include/operation_ods_confirm.inc.php:68 +#: include/operation_ods_confirm.inc.php:68 include/compta_ven.inc.php:116 +#: include/compta_ach.inc.php:109 msgid "Message" msgstr "Bericht" #: include/compta_ach.inc.php:109 include/compta_ven.inc.php:116 -#: include/operation_ods_confirm.inc.php:67 +#: include/operation_ods_confirm.inc.php:67 include/compta_ven.inc.php:114 +#: include/compta_ach.inc.php:107 #, fuzzy msgid "Message extourne" msgstr "Bericht" @@ -12766,6 +13034,12 @@ msgstr "" msgid "Mettre à jour" msgstr "Up-to-date brengen" +#: include/lib/message_javascript.php:106 +msgid "" +"Mettre à oui pour un journal dédié uniquement aux notes de crédit ou de " +"débit, il affichera un avertissement si le montant n'est pas en négatif" +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 @@ -12773,6 +13047,7 @@ msgid "Mini-Rapport : " msgstr "Mini-Report:" #: include/template/param_jrn.php:68 include/template/param_jrn.php:75 +#: include/template/param_jrn.php:119 #, fuzzy msgid "Minimum de lignes à afficher" msgstr "Geen bestand" @@ -12903,6 +13178,8 @@ msgstr "Kies een dossier" #: 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:156 +#: include/class/acc_ledger_sold.class.php:1046 +#: include/class/acc_ledger_purchase.class.php:1793 msgid "Mise à jour paiement" msgstr "OPSLAAN" @@ -12961,6 +13238,7 @@ msgstr "Materiaal aanpassen " #: include/database.item.php:107 include/database.item.php:110 #: include/database.item.php:104 include/database.item.php:102 +#: include/database.item.php:103 msgid "" "Modification de votre plan comptable, parfois il est plus rapide d'utiliser " "le plugin \"Poste Comptable\"" @@ -12999,7 +13277,7 @@ msgstr "Materiaal aanpassen " #: include/ajax/ajax_admin.php:297 include/modele.inc.php:313 #: include/ajax/ajax_admin.php:240 include/ajax/ajax_admin.php:318 #: include/modele.inc.php:318 include/ajax/ajax_admin.php:244 -#: include/ajax/ajax_admin.php:322 +#: include/ajax/ajax_admin.php:322 include/modele.inc.php:319 msgid "Modifie" msgstr "Veranderen" @@ -13053,7 +13331,7 @@ msgstr "Deze plug-in veranderen " #: include/database.item.php:187 include/database.item.php:190 #: include/database.item.php:215 include/database.item.php:192 #: include/database.item.php:193 include/database.item.php:196 -#: include/database.item.php:207 +#: include/database.item.php:207 include/database.item.php:212 msgid "Modifier le type de document" msgstr "Wijzig het type document" @@ -13119,11 +13397,13 @@ msgstr "Module bestaat niet" #: include/database.item.php:57 include/database.item.php:60 #: include/database.item.php:63 include/database.item.php:59 #: include/database.item.php:62 include/database.item.php:65 +#: include/database.item.php:58 msgid "Module paramètre" msgstr "Module instellen" #: include/database.item.php:62 include/database.item.php:65 #: include/database.item.php:59 include/database.item.php:57 +#: include/database.item.php:58 #, fuzzy msgid "Module paramètres" msgstr "Module instellen" @@ -13149,6 +13429,7 @@ msgstr "Model" #: 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:819 #, fuzzy msgid "Modèle d'opération" msgstr "Operatiemodel" @@ -13210,15 +13491,15 @@ 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 +#: include/lib/user_menu.php:76 include/modele.inc.php:259 msgid "Modèles" msgstr "Modellen" -#: include/modele.inc.php:326 +#: include/modele.inc.php:326 include/modele.inc.php:327 msgid "Modèles disponibles dans le dépôt" msgstr "" -#: include/modele.inc.php:269 +#: include/modele.inc.php:269 include/modele.inc.php:270 #, fuzzy msgid "Modèles locaux" msgstr "Modellen" @@ -13229,7 +13510,7 @@ msgid "Mois" msgstr "Maand" #: include/class/periode.class.php:438 include/class/periode.class.php:440 -#: include/class/periode.class.php:442 +#: include/class/periode.class.php:442 include/class/periode.class.php:444 #, fuzzy msgid "Mois de début n'existe pas " msgstr "Dit plan bestaat niet" @@ -13342,7 +13623,7 @@ msgstr "Dit plan bestaat niet" #: 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/fiche.inc.php:531 -#: include/class/fiche.class.php:1399 +#: include/class/fiche.class.php:1399 include/class/acc_ledger.class.php:904 msgid "Montant" msgstr "Bedrag" @@ -13363,6 +13644,30 @@ msgstr "Bedrag van de aankopen " msgid "Montant Amorti" msgstr "Afgeschreven hoeveelheid" +#: include/template/tax_summary_display.php:64 +#: include/template/tax_summary_display.php:128 +#: include/template/tax_summary_display.php:213 +#: include/template/tax_summary_display.php:303 +#: include/export/export_printtva_csv.php:44 +#: include/export/export_printtva_csv.php:64 +#: include/export/export_printtva_pdf.php:58 +#: include/export/export_printtva_pdf.php:213 +#, fuzzy +msgid "Montant Autoliquidation" +msgstr "Datum van de verrichting" + +#: include/template/tax_summary_display.php:62 +#: include/template/tax_summary_display.php:122 +#: include/template/tax_summary_display.php:210 +#: include/template/tax_summary_display.php:294 +#: include/export/export_printtva_csv.php:42 +#: include/export/export_printtva_csv.php:61 +#: include/export/export_printtva_pdf.php:57 +#: include/export/export_printtva_pdf.php:212 +#, fuzzy +msgid "Montant HT" +msgstr "BTW Bedrag Zonder" + #: include/class_acc_ledger_purchase.php:1385 #: include/class_acc_ledger_sold.php:679 #: include/class_acc_ledger_purchase.php:1392 @@ -13406,9 +13711,19 @@ msgstr "OOrspronkelijk bedrag" #: include/class/acc_ledger_purchase.class.php:1830 #: include/class/acc_ledger_purchase.class.php:1848 #: include/class/acc_ledger_purchase.class.php:1851 +#: include/export/export_printtva_csv.php:65 +#: include/class/acc_ledger_purchase.class.php:1857 msgid "Montant ND" msgstr "Niet terug te vorderen bedrag" +# ND is welke afkorting? +#: include/template/tax_summary_display.php:214 +#: include/template/tax_summary_display.php:306 +#: include/export/export_printtva_pdf.php:213 +#, fuzzy +msgid "Montant Non Déd" +msgstr "Niet terug te vorderen bedrag" + #: include/class_acc_ledger_purchase.php:1384 #: include/class_acc_ledger_sold.php:678 include/template/detail-action.php:309 #: include/ext/import_account/include/class_impacc_operation.php:149 @@ -13464,6 +13779,16 @@ msgstr "Niet terug te vorderen bedrag" #: include/class/acc_ledger_sold.class.php:1418 #: include/class/acc_ledger_purchase.class.php:1448 #: include/class/acc_ledger_purchase.class.php:1847 +#: include/template/tax_summary_display.php:63 +#: include/template/tax_summary_display.php:125 +#: include/template/tax_summary_display.php:212 +#: include/template/tax_summary_display.php:300 +#: include/export/export_printtva_csv.php:43 +#: include/export/export_printtva_csv.php:63 +#: include/export/export_printtva_pdf.php:57 +#: include/export/export_printtva_pdf.php:212 +#: include/class/acc_ledger_sold.class.php:1427 +#: include/class/acc_ledger_purchase.class.php:1853 msgid "Montant TVA" msgstr "BTW Bedrag" @@ -13481,6 +13806,7 @@ msgstr "BTW Bedrag" #: include/class/acc_ledger_purchase.class.php:1831 #: include/class/acc_ledger_purchase.class.php:1849 #: include/class/acc_ledger_purchase.class.php:1852 +#: include/class/acc_ledger_purchase.class.php:1858 msgid "Montant TVA ND" msgstr "Bedrag niet terug te vorderen BTW" @@ -13550,7 +13876,7 @@ msgstr "Bedrag kleiner dan of gelijk aan" #: include/database.item.php:176 include/database.item.php:180 #: include/database.item.php:179 include/database.item.php:138 #: include/database.item.php:139 include/database.item.php:140 -#: include/database.item.php:145 +#: include/database.item.php:145 include/database.item.php:150 msgid "Montant initial" msgstr "Oorspronkelijk bedrag" @@ -13566,6 +13892,7 @@ msgstr "Oorspronkelijk bedrag" #: 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:1121 msgid "Montant invalide" msgstr "Ongeldig bedrag" @@ -13892,6 +14219,7 @@ msgstr "Niet compleet als er geen vertegenwoordiger" #: include/modele.inc.php:337 include/modele.inc.php:351 #: include/modele.inc.php:393 include/modele.inc.php:376 #: include/modele.inc.php:377 include/modele.inc.php:382 +#: include/modele.inc.php:383 msgid "" "Nettoyage de la comptabilité analytique : effacement des plans et des " "postes, les opérations\n" @@ -13901,6 +14229,7 @@ msgstr "" #: include/modele.inc.php:331 include/modele.inc.php:345 #: include/modele.inc.php:388 include/modele.inc.php:371 #: include/modele.inc.php:372 include/modele.inc.php:377 +#: include/modele.inc.php:378 msgid "" "Nettoyage de toutes les fiches (ce qui effacera client,\n" "\topérations prédéfinies fournisseurs modèles de " @@ -13910,6 +14239,7 @@ msgstr "" #: include/modele.inc.php:328 include/modele.inc.php:342 #: include/modele.inc.php:384 include/modele.inc.php:367 #: include/modele.inc.php:368 include/modele.inc.php:373 +#: include/modele.inc.php:374 msgid "" "Nettoyage des Documents et courriers (ce qui n'effacera pas les modèles de " "documents)" @@ -14013,6 +14343,8 @@ msgstr "Geen handeling" #: 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:1781 +#: include/modele.inc.php:248 include/modele.inc.php:359 +#: include/database.item.php:157 msgid "Nom" msgstr "Naam" @@ -14045,6 +14377,8 @@ msgstr "Naam TVA" #: include/class/acc_ledger_purchase.class.php:1839 #: include/class/acc_ledger_sold.class.php:1413 #: include/class/acc_ledger_purchase.class.php:1842 +#: include/class/acc_ledger_sold.class.php:1422 +#: include/class/acc_ledger_purchase.class.php:1848 msgid "Nom TVA" msgstr "Naam TVA" @@ -14061,6 +14395,7 @@ msgstr "Database" #: include/dossier.inc.php:239 include/modele.inc.php:280 #: include/dossier.inc.php:242 include/dossier.inc.php:247 #: include/modele.inc.php:281 include/modele.inc.php:286 +#: include/modele.inc.php:287 #, fuzzy msgid "Nom base de données" msgstr "Database" @@ -14075,6 +14410,7 @@ msgstr "Naam fiche" #: include/database.item.php:151 include/database.item.php:155 #: include/database.item.php:154 include/database.item.php:147 #: include/database.item.php:148 include/database.item.php:156 +#: include/database.item.php:159 msgid "Nom de la banque" msgstr "Naam van de bank" @@ -14150,6 +14486,8 @@ msgstr "Documentnaam" #: include/class/acc_ledger_purchase.class.php:1835 #: include/class/acc_ledger_sold.class.php:1409 #: include/class/acc_ledger_purchase.class.php:1838 +#: include/class/acc_ledger_sold.class.php:1418 +#: include/class/acc_ledger_purchase.class.php:1844 msgid "Nom fiche" msgstr "Naam fiche" @@ -14177,6 +14515,8 @@ msgstr "Naam fiche" #: include/class/acc_ledger_purchase.class.php:1837 #: include/class/acc_ledger_sold.class.php:1411 #: include/class/acc_ledger_purchase.class.php:1840 +#: include/class/acc_ledger_sold.class.php:1420 +#: include/class/acc_ledger_purchase.class.php:1846 msgid "Nom fournisseur" msgstr "Naam leverancier" @@ -14263,6 +14603,7 @@ msgstr "Aantal foute rijen" #: 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:2344 msgid "Nombre de ligne incorrect" msgstr "Aantal foute rijen" @@ -14288,6 +14629,7 @@ msgid "Nombre de mois" msgstr "Aantal geregistreerde lijnen" #: include/class/periode.class.php:436 include/class/periode.class.php:438 +#: include/class/periode.class.php:440 msgid "Nombre de mois doit être compris entre 1 & 60 " msgstr "" @@ -14297,6 +14639,7 @@ msgid "Nombre de mois invalide" msgstr "Aantal ongeldige annuïteiten" #: include/class/periode.class.php:434 include/class/periode.class.php:436 +#: include/class/periode.class.php:438 #, fuzzy msgid "Nombre de mois n'est pas un nombre" msgstr "tarief is geen getal" @@ -14366,6 +14709,8 @@ msgstr "Niet aftrekbaar" #: include/class/acc_ledger_purchase.class.php:1775 #: include/class/acc_ledger_sold.class.php:1028 #: include/class/acc_ledger_purchase.class.php:1778 +#: include/class/acc_ledger_sold.class.php:1037 +#: include/class/acc_ledger_purchase.class.php:1784 msgid "Non Payée" msgstr "Niet Betaald '" @@ -14381,6 +14726,7 @@ msgid "Non actif" msgstr "Geen handeling" #: include/ajax/ajax_ledger.php:31 include/ajax/ajax_poste.php:35 +#: include/ajax/ajax_ledger.php:32 #, fuzzy msgid "Non authorisé" msgstr "niet use of" @@ -14446,6 +14792,7 @@ msgstr "Niet gevonden" #: 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:289 #, fuzzy msgid "Non utilisée" msgstr "niet use of" @@ -14475,10 +14822,16 @@ msgstr "" msgid "Note" msgstr "Nota" +#: include/database.item.php:236 +#, fuzzy +msgid "Note de crédit" +msgstr "Saldo credit" + #: include/database.item.php:176 include/database.item.php:179 #: include/database.item.php:192 include/database.item.php:195 #: include/database.item.php:193 include/database.item.php:181 #: include/database.item.php:182 include/database.item.php:185 +#: include/database.item.php:198 msgid "Note de frais" msgstr "Onkostennota" @@ -14548,14 +14901,14 @@ msgstr "Nieuwe extract" #: include/database.item.php:55 include/database.item.php:58 #: include/database.item.php:65 include/database.item.php:63 #: include/database.item.php:62 include/database.item.php:60 -#: include/database.item.php:57 +#: include/database.item.php:57 include/database.item.php:56 msgid "Nouvel extrait" msgstr "Nieuwe extract" #: include/database.item.php:55 include/database.item.php:58 #: include/database.item.php:65 include/database.item.php:63 #: include/database.item.php:62 include/database.item.php:60 -#: include/database.item.php:57 +#: include/database.item.php:57 include/database.item.php:56 msgid "Nouvel extrait bancaire" msgstr "Nieuwe bankafschrift" @@ -14587,6 +14940,7 @@ msgstr "Nieuwe extensie" #: html/ajax_card.php:182 html/ajax_card.php:200 html/ajax_card.php:201 #: include/ajax/ajax_card.php:181 include/ajax/ajax_card.php:182 #: include/ajax/ajax_card.php:185 include/ajax/ajax_card.php:191 +#: include/ajax/ajax_card.php:192 msgid "Nouvelle fiche" msgstr "Nieuwe fiche" @@ -14617,6 +14971,7 @@ msgstr "Nieuwe lijn" #: 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:2837 #, fuzzy msgid "Nouvelle opération" msgstr "Nieuwe verschillende bewerkingen" @@ -14625,6 +14980,7 @@ msgstr "Nieuwe verschillende bewerkingen" #: include/database.item.php:64 include/database.item.php:61 #: include/database.item.php:60 include/database.item.php:59 #: include/database.item.php:62 include/database.item.php:56 +#: include/database.item.php:55 msgid "Nouvelle opérations diverses" msgstr "Nieuwe verschillende bewerkingen" @@ -14640,6 +14996,7 @@ msgid "Nouvelle version disponible %s , votre version %s" msgstr "" #: include/class/periode.class.php:649 include/class/periode.class.php:651 +#: include/class/periode.class.php:653 #, fuzzy msgid "Novembre" msgstr "Aantal" @@ -14683,6 +15040,8 @@ msgstr "Num.interne" #: include/class/acc_ledger_purchase.class.php:1740 #: include/class/acc_ledger_sold.class.php:994 #: include/class/acc_ledger_purchase.class.php:1743 +#: include/class/acc_ledger_sold.class.php:1003 +#: include/class/acc_ledger_purchase.class.php:1749 msgid "Numero de bon de commande : " msgstr "Nummer van bestelbon" @@ -14690,6 +15049,7 @@ msgstr "Nummer van bestelbon" #: include/database.item.php:164 include/database.item.php:168 #: include/database.item.php:167 include/database.item.php:160 #: include/database.item.php:161 include/database.item.php:169 +#: include/database.item.php:172 msgid "Numero de client" msgstr "Aantal klanten" @@ -14843,10 +15203,13 @@ msgstr "Num.interne" #: include/class/acc_ledger_purchase.class.php:1822 #: include/class/acc_ledger_sold.class.php:1396 #: include/class/acc_ledger_purchase.class.php:1825 +#: include/class/acc_ledger_sold.class.php:1405 +#: include/class/acc_ledger_purchase.class.php:1831 msgid "Numéro opération" msgstr "Operatienummer" #: include/template/param_jrn.php:33 include/template/param_jrn.php:40 +#: include/template/param_jrn.php:46 msgid "Numérotation de chaque opération" msgstr "Nummering van elke operatie" @@ -14865,6 +15228,7 @@ msgstr "Nr." #: include/class/acc_ledger_history_generic.class.php:765 #: include/export/export_ledger_csv.php:212 #: include/export/export_ledger_csv.php:220 +#: include/class/acc_ledger_history_generic.class.php:768 #, fuzzy msgid "N° Pièce" msgstr "Stuk nr." @@ -14901,6 +15265,8 @@ msgstr "Document nr." #: include/class/acc_ledger_purchase.class.php:1834 #: include/class/acc_ledger_sold.class.php:1408 #: include/class/acc_ledger_purchase.class.php:1837 +#: include/class/acc_ledger_sold.class.php:1417 +#: include/class/acc_ledger_purchase.class.php:1843 msgid "N° fiche" msgstr "Fiche nr." @@ -14928,6 +15294,8 @@ msgstr "Fiche nr." #: include/class/acc_ledger_purchase.class.php:1836 #: include/class/acc_ledger_sold.class.php:1410 #: include/class/acc_ledger_purchase.class.php:1839 +#: include/class/acc_ledger_sold.class.php:1419 +#: include/class/acc_ledger_purchase.class.php:1845 msgid "N° fiche fournisseur" msgstr "Nr. van Leveranciersfiche" @@ -14954,6 +15322,7 @@ 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:117 +#: include/template/param_jrn.php:161 msgid "N° pièce justificative" msgstr "Nummer" @@ -14989,6 +15358,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:1367 msgid "OPERATION ANNULEE " msgstr "OPERATIE ONGEDAAN GEMAAKT" @@ -15027,6 +15397,7 @@ msgid "" msgstr "Verplicht voor FIN kranten geven hier de Data Bank gebruikt" #: include/template/param_jrn.php:61 include/template/param_jrn.php:68 +#: include/template/param_jrn.php:74 #, fuzzy msgid "" "Obligatoire pour les journaux FIN : donner ici la fiche du compte en banque " @@ -15034,10 +15405,12 @@ msgid "" msgstr "Verplicht voor FIN kranten geven hier de Data Bank gebruikt" #: include/class/periode.class.php:649 include/class/periode.class.php:651 +#: include/class/periode.class.php:653 msgid "Octobre" msgstr "" #: include/class/periode.class.php:688 include/class/periode.class.php:690 +#: include/class/periode.class.php:692 msgid "On ne peut ajouter une période que sur un exercice qui existe déjà" msgstr "" @@ -15124,12 +15497,13 @@ msgstr "Operatie" #: include/database.item.php:231 include/database.item.php:208 #: include/database.item.php:209 include/database.item.php:212 #: include/database.item.php:229 include/database.item.php:210 +#: include/database.item.php:232 msgid "Opération Diverses" msgstr "Diverse operatie" #: html/ajax_ledger.php:156 html/ajax_ledger.php:174 html/ajax_ledger.php:175 #: include/ajax/ajax_ledger.php:152 include/ajax/ajax_ledger.php:155 -#: include/ajax/ajax_ledger.php:159 +#: include/ajax/ajax_ledger.php:159 include/ajax/ajax_ledger.php:160 msgid "Opération Effacée" msgstr "Operatie Ontruimde" @@ -15173,6 +15547,7 @@ msgstr "Operatie van verkopen" #: include/database.item.php:59 include/database.item.php:62 #: include/database.item.php:56 include/database.item.php:54 +#: include/database.item.php:55 msgid "" "Opération diverses tels que les amortissements, les augmentations de " "capital, les salaires, ..." @@ -15197,6 +15572,7 @@ msgstr "Operatie bij het begin" #: html/ajax_ledger.php:564 html/ajax_ledger.php:576 html/ajax_ledger.php:578 #: include/ajax/ajax_ledger.php:555 include/ajax/ajax_ledger.php:558 #: include/ajax/ajax_ledger.php:563 include/ajax/ajax_ledger.php:568 +#: include/ajax/ajax_ledger.php:569 msgid "Opération extournée" msgstr "Werking omgekeerd" @@ -15205,6 +15581,7 @@ msgstr "Werking omgekeerd" #: 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:2874 #, fuzzy msgid "Opération identique" msgstr "Operatie van verkopen" @@ -15223,7 +15600,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_ods.inc.php:123 +#: include/compta_ods.inc.php:123 include/compta_ven.inc.php:212 +#: include/compta_ach.inc.php:195 #, fuzzy msgid "Opération non extournée" msgstr "Werking omgekeerd" @@ -15257,7 +15635,7 @@ msgstr "Opgeslagen Operatie" #: html/ajax_ledger.php:525 include/ajax/ajax_ledger.php:502 #: include/ajax/ajax_ledger.php:504 include/ajax/ajax_ledger.php:508 #: include/anc_od.inc.php:121 include/ajax/ajax_ledger.php:509 -#: include/ext/modop/modop_save.php:165 +#: include/ext/modop/modop_save.php:165 include/ajax/ajax_ledger.php:510 msgid "Opération sauvée" msgstr "Opgeslagen Operatie" @@ -15291,6 +15669,7 @@ msgstr "Operations & Belettering" #: include/database.item.php:225 include/cfgledger.inc.php:167 #: include/database.item.php:56 include/database.item.php:248 #: include/database.item.php:223 include/cfgledger.inc.php:172 +#: include/database.item.php:55 include/database.item.php:255 msgid "Opérations Diverses" msgstr "Verschillende bewerkingen" @@ -15438,7 +15817,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 +#: include/class/periode.class.php:587 include/class/periode.class.php:589 #, fuzzy msgid "Ouvert" msgstr "OPSLAAN" @@ -15488,6 +15867,7 @@ msgstr "TKPDF is niet geïnstalleerd" #: include/class/acc_ledger.class.php:225 #: include/class/acc_ledger.class.php:228 #: include/class/acc_ledger.class.php:229 +#: include/class/acc_ledger.class.php:247 msgid "PERIODE FERMEE" msgstr "Gesloten periode" @@ -15498,6 +15878,7 @@ msgstr "Gesloten periode" #: include/class/acc_ledger.class.php:1030 #: include/class/acc_ledger.class.php:605 #: include/class/acc_ledger.class.php:606 +#: include/class/acc_ledger.class.php:622 msgid "PJ Num" msgstr "Bewijs nummer" @@ -15537,6 +15918,8 @@ msgstr "TKPDF is niet geïnstalleerd" #: include/class/acc_ledger_purchase.class.php:1847 #: include/class/acc_ledger_sold.class.php:1421 #: include/class/acc_ledger_purchase.class.php:1850 +#: include/class/acc_ledger_sold.class.php:1430 +#: include/class/acc_ledger_purchase.class.php:1856 msgid "PU" msgstr "Eenheidsprijs" @@ -15567,6 +15950,7 @@ msgstr "Eenheidsprijs" #: 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 +#: include/class/acc_ledger.class.php:2452 msgid "Paiement" msgstr "Betaling" @@ -15593,6 +15977,7 @@ msgid "Paiement fournisseur" msgstr "Betaling van de leverancier" #: include/class/print_ledger_detail_item.class.php:145 +#: include/class/print_ledger_detail_item.class.php:146 #, php-format msgid "Paiement montant %s date %s methoded %s " msgstr "" @@ -15685,6 +16070,7 @@ msgstr "Parameter bedrijf" #: include/class/acc_ledger.class.php:854 #: include/class/acc_ledger.class.php:427 #: include/class/acc_ledger.class.php:428 +#: include/class/acc_ledger.class.php:443 msgid "Parametres journaux non trouves" msgstr "Parameters van niet journaal van stuurprogramma" @@ -15706,6 +16092,7 @@ msgstr "Parameter" #: include/template/menu_detail.php:75 include/menu.inc.php:114 #: include/database.item.php:59 include/database.item.php:62 #: include/ext/syndicat_tools/index.php:37 include/database.item.php:65 +#: include/database.item.php:58 msgid "Paramètre" msgstr "Parameter" @@ -15760,6 +16147,7 @@ msgstr "Parameter is ongeldig" #: 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/periode.class.php:237 +#: include/class/acc_ledger.class.php:91 include/class/periode.class.php:239 msgid "Paramètre invalide" msgstr "Parameter is ongeldig" @@ -15798,7 +16186,7 @@ msgstr "Percentage" #: include/database.item.php:218 include/database.item.php:195 #: include/database.item.php:196 include/database.item.php:199 -#: include/database.item.php:210 +#: include/database.item.php:210 include/database.item.php:215 msgid "Partager une note" msgstr "" @@ -15810,7 +16198,7 @@ msgstr "Een deel van de financieel administratieve post of etiket" #: include/database.item.php:179 include/database.item.php:183 #: include/database.item.php:182 include/database.item.php:141 #: include/database.item.php:142 include/database.item.php:143 -#: include/database.item.php:148 +#: include/database.item.php:148 include/database.item.php:153 msgid "Partie fiscalement non déductible" msgstr "Fiscaal niet aftrekbare gedeelte" @@ -15911,7 +16299,9 @@ msgstr "Geen documenten gegeven" #: include/class/acc_ledger_purchase.class.php:1072 #: 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/class/acc_ledger_fin.class.php:1052 include/compta_ven.inc.php:251 +#: include/class/acc_ledger_sold.class.php:1132 +#: include/class/acc_ledger.class.php:790 include/compta_ach.inc.php:236 msgid "Pas de journal disponible" msgstr "Journaal available Geen" @@ -16025,6 +16415,7 @@ msgstr "Periode" #: 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.class.php:1084 msgid "Periode fermee" msgstr "Gesloten periode" @@ -16071,6 +16462,10 @@ msgstr "" msgid "Permet de changer le poste comptable de base des catégories de fiches" msgstr "" +#: include/database.item.php:139 +msgid "Permet de configurer les devises" +msgstr "" + #: include/database.item.php:102 include/database.item.php:105 #: include/database.item.php:99 include/database.item.php:97 msgid "" @@ -16087,6 +16482,7 @@ msgstr "" #: include/database.item.php:153 include/database.item.php:157 #: include/database.item.php:156 include/database.item.php:149 #: include/database.item.php:150 include/database.item.php:158 +#: include/database.item.php:161 msgid "Personne de contact " msgstr "Contactpersoon" @@ -16211,6 +16607,9 @@ msgstr "stuk" #: 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 +#: include/class/acc_ledger_sold.class.php:1411 +#: include/class/acc_ledger.class.php:874 +#: include/class/acc_ledger_purchase.class.php:1837 msgid "Pièce" msgstr "Bewijs" @@ -16281,20 +16680,21 @@ msgstr "Analytic Plan" #: include/database.item.php:49 include/database.item.php:52 #: include/database.item.php:61 include/database.item.php:58 #: include/database.item.php:57 include/database.item.php:55 -#: include/database.item.php:50 +#: include/database.item.php:50 include/database.item.php:51 msgid "Plan Compt. analytique" msgstr "Plan Compt. analytisch" #: include/database.item.php:101 include/database.item.php:104 #: include/database.item.php:110 include/database.item.php:107 #: include/database.item.php:106 include/database.item.php:102 +#: include/database.item.php:103 msgid "Plan Comptable" msgstr "Accounting Plan" #: include/database.item.php:49 include/database.item.php:52 #: include/database.item.php:61 include/database.item.php:58 #: include/database.item.php:57 include/database.item.php:55 -#: include/database.item.php:50 +#: include/database.item.php:50 include/database.item.php:51 msgid "Plan analytique" msgstr "Analytisch" @@ -16426,6 +16826,12 @@ msgstr "Archief" #: 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/class/print_ledger_detail_item.class.php:157 +#: include/class/acc_ledger_history_generic.class.php:771 +#: include/class/acc_ledger_sold.class.php:1414 +#: include/class/acc_ledger.class.php:627 +#: include/class/acc_ledger.class.php:902 +#: include/class/acc_ledger_purchase.class.php:1840 msgid "Poste" msgstr "Rekening" @@ -16483,6 +16889,7 @@ msgstr "Basis rekening" #: 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:1147 msgid "Poste Inexistant [" msgstr "Niet aanwezig positie [" @@ -16495,6 +16902,7 @@ msgstr "Niet aanwezig positie [" #: 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:1130 msgid "Poste Inexistant pour la fiche [" msgstr "Niet aanwezig post voor details [" @@ -16544,7 +16952,7 @@ msgid "Poste comptable" msgstr "Accountant Vacature" #: include/verif_bilan.inc.php:186 include/verif_bilan.inc.php:223 -#: include/verif_bilan.inc.php:226 +#: include/verif_bilan.inc.php:226 include/verif_bilan.inc.php:228 #, fuzzy msgid "Poste comptable " msgstr "Accountant Vacature" @@ -16652,7 +17060,7 @@ msgid "Poste comptable utilisé pour les dettes envers la TVA" msgstr "Rekenitem gebruikt voor BTW-schulden" #: include/verif_bilan.inc.php:149 include/verif_bilan.inc.php:186 -#: include/verif_bilan.inc.php:189 +#: include/verif_bilan.inc.php:189 include/verif_bilan.inc.php:191 #, fuzzy msgid "Poste comptable utilisé sans la fiche correspondante" msgstr "Rekenitem gebruikt voor voorschotten aan de BTW" @@ -16708,6 +17116,7 @@ msgstr "Onbekende post" #: 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:1144 msgid "Poste invalide [" msgstr "Ongeldig bericht [" @@ -16727,6 +17136,7 @@ msgid "Poste à créditer incorrect" msgstr "De te crediteren post in fout" #: include/template/param_jrn.php:15 include/template/param_jrn.php:22 +#: include/template/param_jrn.php:25 msgid "Postes utilisables journal (débit/crédit) " msgstr "Bericht bruikbare krant (debet / credit)" @@ -16822,6 +17232,7 @@ msgstr "VOOR Het blad" #: 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:1708 #, php-format msgid "Pour la fiche %s le poste comptable [%s] n'existe pas" msgstr "Voor de fiche % s, bestaat de de begrotingspost % s niet" @@ -16913,6 +17324,13 @@ msgstr "Prioriteit" msgid "Priv/DNA" msgstr "" +#: include/template/tax_summary_display.php:211 +#: include/template/tax_summary_display.php:297 +#: include/export/export_printtva_csv.php:62 +#: include/export/export_printtva_pdf.php:212 +msgid "Privée" +msgstr "" + #: include/template/impress_reconciliation_detail.php:10 msgid "Prix HTVA" msgstr "Priijs exclusief BTW" @@ -16933,7 +17351,7 @@ msgstr "Prijs / A" #: include/database.item.php:169 include/database.item.php:173 #: include/database.item.php:172 include/database.item.php:136 #: include/database.item.php:137 include/database.item.php:147 -#: include/database.item.php:152 +#: include/database.item.php:152 include/database.item.php:182 msgid "Prix achat" msgstr "Aankoopprijs" @@ -16941,7 +17359,7 @@ msgstr "Aankoopprijs" #: include/database.item.php:168 include/database.item.php:172 #: include/database.item.php:171 include/database.item.php:135 #: include/database.item.php:136 include/database.item.php:146 -#: include/database.item.php:151 +#: include/database.item.php:151 include/database.item.php:181 msgid "Prix vente" msgstr "Verkoopprijs" @@ -16959,6 +17377,11 @@ msgstr "Prijs / A" msgid "Prix/Un." msgstr "Prijs / A." +#: include/class/print_ledger_detail_item.class.php:159 +#, fuzzy +msgid "Prix/Unit" +msgstr "Prijs / A" + #: include/restore.inc.php:127 include/restore.inc.php:186 #: include/restore.inc.php:187 include/restore.inc.php:188 #: include/restore.inc.php:128 include/restore.inc.php:189 @@ -17046,6 +17469,7 @@ msgstr "Prog." #: include/database.item.php:205 include/database.item.php:202 #: include/database.item.php:178 include/database.item.php:179 #: include/database.item.php:182 include/database.item.php:190 +#: include/database.item.php:195 msgid "Proposition" msgstr "Voorstel" @@ -17063,12 +17487,12 @@ msgid "Préfixe" msgstr "Voorvoegsel" #: 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:137 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 +#: include/template/param_jrn.php:97 include/template/param_jrn.php:141 msgid "Préfixe pièce justificative" msgstr "Prefix voucher" @@ -17103,7 +17527,7 @@ msgstr "" #: include/database.item.php:162 include/class/class_balance_age.php:146 #: include/database.item.php:165 include/user.inc.php:81 #: include/user.inc.php:145 include/class/balance_age.class.php:146 -#: include/database.item.php:170 +#: include/database.item.php:170 include/database.item.php:173 msgid "Prénom" msgstr "Voornaam" @@ -17182,6 +17606,8 @@ msgstr "" #: include/class/acc_ledger_sold.class.php:1400 #: include/class/acc_ledger_purchase.class.php:1829 #: include/ajax/ajax_preference.php:150 +#: include/class/acc_ledger_sold.class.php:1409 +#: include/class/acc_ledger_purchase.class.php:1835 msgid "Période" msgstr "Periode" @@ -17224,6 +17650,7 @@ msgstr "periode tussen% s [% s] en [% s]" #: include/class/acc_ledger_sold.class.php:693 #: include/class/acc_ledger_purchase.class.php:1415 #: include/class/acc_ledger.class.php:604 +#: include/class/acc_ledger.class.php:620 msgid "Période Comptable" msgstr "Boekhoudingsperiode" @@ -17233,6 +17660,7 @@ msgid "Période N-1" msgstr "Periode" #: include/class/periode.class.php:251 include/class/periode.class.php:253 +#: include/class/periode.class.php:255 msgid "Période chevauchant une autre" msgstr "" @@ -17267,6 +17695,8 @@ msgstr "" #: 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:1116 +#: include/class/acc_ledger.class.php:858 msgid "Période comptable" msgstr "Boekhoudingsperiode" @@ -17285,6 +17715,11 @@ msgstr "Periode Start ongeldig" msgid "Période de fin non valable" msgstr "Periode van ongeldige einde" +#: include/tax_summary.inc.php:39 +#, fuzzy, php-format +msgid "Période du %s au %s" +msgstr "periode tussen% s [% s] en [% s]" + #: include/ext/importbank/include/import_bank.class.php:409 #, fuzzy msgid "Période fermée" @@ -17308,6 +17743,11 @@ msgstr "" msgid "QCode" msgstr "Code" +#: include/class/print_ledger_detail_item.class.php:160 +#, fuzzy +msgid "Quant." +msgstr "Hoeveelheid" + #: include/template/ledger_detail_ach.php:128 #: include/template/ledger_detail_ven.php:125 #: include/template/operation_detail_ach.php:46 @@ -17363,6 +17803,7 @@ msgstr "Hoeveelheid" #: 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:1779 +#: include/database.item.php:167 msgid "Quick Code" msgstr "Quick Code" @@ -17373,6 +17814,7 @@ msgstr "Quick Code" #: include/class/acc_ledger.class.php:1034 #: include/class/acc_ledger.class.php:609 #: include/class/acc_ledger.class.php:610 +#: include/class/acc_ledger.class.php:626 msgid "Quick Code ou " msgstr "Quick Code of" @@ -17396,6 +17838,8 @@ msgstr "Quick Code of" #: include/class/acc_ledger_history_generic.class.php:769 #: include/export/export_ledger_csv.php:213 #: include/export/export_ledger_csv.php:221 +#: include/class/print_ledger_detail_item.class.php:156 +#: include/class/acc_ledger_history_generic.class.php:772 msgid "QuickCode" msgstr "QuickCode" @@ -17546,6 +17990,7 @@ msgstr "Bank Verzoening" #: 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 +#: include/ajax/ajax_card.php:386 include/database.item.php:57 #, php-format msgid "Recherche" msgstr "Vinden" @@ -17571,6 +18016,7 @@ msgstr "Gedetailleerder Zoeken" #: 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/fiche.inc.php:93 +#: include/ajax/ajax_card.php:412 msgid "Recherche de fiche" msgstr "VIND EEN blad" @@ -17611,7 +18057,7 @@ msgstr "VIND EEN blad" #: include/ext/rapport_avance/include/formulaire_param_detail.class.php:361 #: include/ext/rapport_avance/include/formulaire_param_detail.class.php:368 #: include/ajax/ajax_card.php:506 include/class/acc_report.class.php:151 -#: include/ajax/ajax_card.php:510 +#: include/ajax/ajax_card.php:510 include/ajax/ajax_card.php:511 msgid "Recherche poste" msgstr "Bericht Vinden" @@ -17678,6 +18124,7 @@ msgstr "Verwijzing" #: include/database.item.php:56 include/database.item.php:59 #: include/database.item.php:53 include/database.item.php:51 +#: include/database.item.php:52 #, fuzzy msgid "Regroupement de compte analytique" msgstr "Analytische groep" @@ -17825,6 +18272,7 @@ msgstr "Is te laat" #: 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/modele.inc.php:404 include/modele.inc.php:444 msgid "Retour" msgstr "Terug" @@ -17896,6 +18344,7 @@ msgstr "" #: include/database.item.php:199 include/database.item.php:206 #: include/database.item.php:183 include/database.item.php:184 #: include/database.item.php:187 include/database.item.php:195 +#: include/database.item.php:200 msgid "Réception commande Client" msgstr "Client commando receptie" @@ -17903,6 +18352,7 @@ msgstr "Client commando receptie" #: include/database.item.php:200 include/database.item.php:205 #: include/database.item.php:182 include/database.item.php:183 #: include/database.item.php:186 include/database.item.php:194 +#: include/database.item.php:199 msgid "Réception commande Fournisseur" msgstr "Command receptie Leverancier" @@ -17910,6 +18360,7 @@ msgstr "Command receptie Leverancier" #: include/database.item.php:202 include/database.item.php:207 #: include/database.item.php:184 include/database.item.php:185 #: include/database.item.php:188 include/database.item.php:196 +#: include/database.item.php:201 msgid "Réception magazine" msgstr "Voorkant tijdschrift" @@ -17922,6 +18373,7 @@ msgstr "Beschrijving" #: 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:1002 #, fuzzy, php-format msgid "Réconciliation/rapprochements : %s" msgstr "Beschrijving" @@ -17980,7 +18432,7 @@ msgstr "" #: include/ext/importbank/include/template/confirm_transfer.php:275 #: include/ext/importbank/include/template/confirm_transfer.php:285 #: include/verif_bilan.inc.php:152 include/verif_bilan.inc.php:214 -#: include/verif_bilan.inc.php:217 +#: include/verif_bilan.inc.php:217 include/verif_bilan.inc.php:219 msgid "Résultat" msgstr "Resultaat" @@ -18035,6 +18487,31 @@ msgstr "" msgid "Résumé Exercice précédent" msgstr "" +#: include/export/export_printtva_pdf.php:49 include/database.item.php:141 +#, fuzzy +msgid "Résumé TVA" +msgstr "Overzicht" + +#: include/export/export_printtva_pdf.php:301 +#, fuzzy +msgid "Résumé TVA Achat" +msgstr "Overzicht" + +#: include/export/export_printtva_pdf.php:160 +#, fuzzy +msgid "Résumé TVA vente" +msgstr "Overzicht" + +#: include/template/tax_summary_display.php:281 +#, fuzzy +msgid "Résumé tous les journaux d'achat" +msgstr "Alle dagboeken" + +#: include/template/tax_summary_display.php:109 +#, fuzzy +msgid "Résumé tous les journaux de vente" +msgstr "Alle dagboeken" + #: include/database.item.php:201 include/database.item.php:202 #: include/database.item.php:199 msgid "Réunion" @@ -18108,7 +18585,8 @@ msgstr "Nieuwe lijn" #: include/class/fiche_def.class.php:812 include/cfgledger.inc.php:134 #: include/template/dashboard.php:350 include/ajax/ajax_card.php:203 #: include/ajax/ajax_card.php:517 include/ajax/ajax_mod_predf_op.php:54 -#: include/cfgledger.inc.php:137 +#: include/cfgledger.inc.php:137 include/ajax/ajax_card.php:204 +#: include/ajax/ajax_card.php:518 msgid "Sauve" msgstr "OPSLAAN" @@ -18204,6 +18682,8 @@ msgstr "Geen enkel model" #: 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/ledger_detail_bottom.php:315 include/ajax/ajax_card.php:165 +#: include/class/acc_ledger.class.php:2044 msgid "Sauver" msgstr "OPSLAAN" @@ -18325,6 +18805,7 @@ msgid "Selectionnez votre langue" msgstr "Selecteer uw taal" #: include/class/periode.class.php:648 include/class/periode.class.php:650 +#: include/class/periode.class.php:652 msgid "Septembre" msgstr "" @@ -18344,12 +18825,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 +#: include/template/param_jrn.php:145 include/template/param_jrn.php:190 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 +#: include/template/param_jrn.php:206 include/template/param_jrn.php:251 msgid "Services, fournitures ou biens vendus (C)" msgstr "" @@ -18411,6 +18892,7 @@ msgstr "" #: include/modele.inc.php:284 include/modele.inc.php:298 #: include/modele.inc.php:337 include/modele.inc.php:320 #: include/modele.inc.php:321 include/modele.inc.php:265 +#: include/modele.inc.php:266 msgid "" "Si vous voulez récupérer toutes les adaptations d'un dossier " "dans un autre dossier, vous pouvez en faire un modèle. Seules les fiches, la " @@ -18431,7 +18913,7 @@ msgstr "Situatie" #: include/database.item.php:164 include/database.item.php:167 #: include/database.item.php:171 include/database.item.php:170 #: include/database.item.php:169 include/database.item.php:173 -#: include/database.item.php:178 +#: include/database.item.php:178 include/database.item.php:183 msgid "Société" msgstr "Vennootschap" @@ -18561,6 +19043,7 @@ msgid "Sortie ⎆" msgstr "Uitgang" #: include/class/periode.class.php:521 include/class/periode.class.php:523 +#: include/class/periode.class.php:525 msgid "Status" msgstr "" @@ -18727,7 +19210,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:468 +#: html/ajax_misc.php:466 html/ajax_misc.php:468 html/ajax_misc.php:472 msgid "Symbole" msgstr "Symbool" @@ -18856,6 +19339,7 @@ msgstr "" #: 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/class/print_ledger_detail_item.class.php:164 msgid "TVA" msgstr "BTW" @@ -18888,6 +19372,7 @@ msgstr "BTW ND" #: 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 +#: include/class/print_ledger_detail_item.class.php:162 #, fuzzy msgid "TVA NP" msgstr "BTW ND" @@ -18903,10 +19388,27 @@ msgstr "BTW ND" #: include/class/acc_ledger_purchase.class.php:1835 #: include/class/acc_ledger_purchase.class.php:1853 #: include/class/acc_ledger_purchase.class.php:1856 +#: include/class/acc_ledger_purchase.class.php:1862 #, fuzzy msgid "TVA NP opération" msgstr "BTW handeling" +#: include/template/tax_summary_display.php:215 +#: include/template/tax_summary_display.php:309 +#: include/export/export_printtva_csv.php:66 +#: include/export/export_printtva_pdf.php:213 +#, fuzzy +msgid "TVA Non Déd" +msgstr "Niet Betaald '" + +#: include/template/tax_summary_display.php:216 +#: include/template/tax_summary_display.php:312 +#: include/export/export_printtva_csv.php:67 +#: include/export/export_printtva_pdf.php:213 +#, fuzzy +msgid "TVA Non Déd & récup" +msgstr "BTW ingevorderd" + #: include/class_acc_ledger_purchase.php:1785 #: include/class_acc_ledger_sold.php:1354 #: include/class_acc_ledger_purchase.php:1772 @@ -18926,6 +19428,8 @@ msgstr "BTW handeling" #: include/class/acc_ledger_purchase.class.php:1842 #: include/class/acc_ledger_sold.class.php:1416 #: include/class/acc_ledger_purchase.class.php:1845 +#: include/class/acc_ledger_sold.class.php:1425 +#: include/class/acc_ledger_purchase.class.php:1851 #, fuzzy msgid "TVA Non Payé" msgstr "Niet Betaald '" @@ -18954,6 +19458,8 @@ msgstr "Niet Betaald '" #: include/class/acc_ledger_purchase.class.php:1852 #: include/class/acc_ledger_sold.class.php:1423 #: include/class/acc_ledger_purchase.class.php:1855 +#: include/class/acc_ledger_sold.class.php:1432 +#: include/class/acc_ledger_purchase.class.php:1861 msgid "TVA Opération" msgstr "BTW handeling" @@ -18987,6 +19493,8 @@ msgstr "" #: include/class/acc_ledger_sold.class.php:1415 #: include/class/acc_ledger_purchase.class.php:1844 #: include/class/acc_ledger_history_sale.class.php:251 +#: include/class/acc_ledger_sold.class.php:1424 +#: include/class/acc_ledger_purchase.class.php:1850 msgid "TVA annulée" msgstr "Geannuleerd BTW" @@ -18994,7 +19502,7 @@ msgstr "Geannuleerd BTW" #: include/database.item.php:177 include/database.item.php:181 #: include/database.item.php:180 include/database.item.php:139 #: include/database.item.php:140 include/database.item.php:141 -#: include/database.item.php:146 +#: include/database.item.php:146 include/database.item.php:151 msgid "TVA non déductible" msgstr "Niet-aftrekbare BTW" @@ -19002,7 +19510,7 @@ msgstr "Niet-aftrekbare BTW" #: include/database.item.php:178 include/database.item.php:182 #: include/database.item.php:181 include/database.item.php:140 #: include/database.item.php:141 include/database.item.php:142 -#: include/database.item.php:147 +#: include/database.item.php:147 include/database.item.php:152 msgid "TVA non déductible récupérable par l'impôt" msgstr "Niet-aftrekbare BTW terugvorderbaar door de Belastingdienst" @@ -19019,6 +19527,7 @@ msgstr "Niet-aftrekbare BTW terugvorderbaar door de Belastingdienst" #: include/class/acc_ledger_purchase.class.php:1832 #: include/class/acc_ledger_purchase.class.php:1850 #: include/class/acc_ledger_purchase.class.php:1853 +#: include/class/acc_ledger_purchase.class.php:1859 msgid "TVA récup." msgstr "BTW ingevorderd" @@ -19048,6 +19557,7 @@ msgstr "BTW ingevorderd" #: 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/class/print_ledger_detail_item.class.php:165 msgid "TVAC" msgstr "BTW Met" @@ -19141,7 +19651,15 @@ 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:471 +#: include/template/tax_summary_display.php:61 +#: include/template/tax_summary_display.php:119 +#: include/template/tax_summary_display.php:209 +#: include/template/tax_summary_display.php:291 +#: include/export/export_printtva_csv.php:41 +#: include/export/export_printtva_csv.php:60 +#: include/export/export_printtva_pdf.php:57 +#: include/export/export_printtva_pdf.php:212 msgid "Taux" msgstr "Tarief" @@ -19155,7 +19673,7 @@ msgstr "Tarief" #: include/database.item.php:150 include/template/ledger_detail_ven.php:131 #: include/database.item.php:154 include/database.item.php:153 #: include/database.item.php:146 include/database.item.php:147 -#: include/database.item.php:155 +#: include/database.item.php:155 include/database.item.php:158 msgid "Taux TVA" msgstr "BTW%" @@ -19233,6 +19751,7 @@ msgstr "Thema" #: include/class/acc_ledger_history_generic.class.php:683 #: include/class/fiche.class.php:1476 include/export/export_ledger_csv.php:214 #: include/export/export_ledger_csv.php:222 +#: include/class/acc_ledger_history_generic.class.php:686 msgid "Tiers" msgstr "Derde" @@ -19427,6 +19946,8 @@ msgstr "Debet Totaal" #: include/class/acc_ledger_purchase.class.php:1845 #: include/class/acc_ledger_sold.class.php:1419 #: include/class/acc_ledger_purchase.class.php:1848 +#: include/class/acc_ledger_sold.class.php:1428 +#: include/class/acc_ledger_purchase.class.php:1854 msgid "Total HTVA" msgstr "Totaal Zonder BTW" @@ -19537,6 +20058,7 @@ msgstr "Totale niveau" #: 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:688 #, fuzzy msgid "Total opération" msgstr "Retail operatie" @@ -19628,6 +20150,8 @@ msgstr "Total Credit" #: 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/class/acc_ledger_history_generic.class.php:741 +#: include/class/acc_ledger.class.php:740 msgid "Totaux" msgstr "Totalen" @@ -20021,6 +20545,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:2349 msgid "Un journal avec ce nom existe déjà" msgstr "Een journaal met deze naam bestaat al" @@ -20117,7 +20642,12 @@ msgstr "Enkel open rekeningen" msgid "Uniquement les opérations non lettrées" msgstr "Alleen interne acties" +#: include/template/param_jrn.php:93 +msgid "Uniquement note de débit ou crédit" +msgstr "" + #: include/template/param_jrn.php:21 include/template/param_jrn.php:28 +#: include/template/param_jrn.php:31 msgid "" "Uniquement pour les journaux d'Opérations Diverses, les valeurs sont " "séparées par des espaces, on peut aussi\n" @@ -20270,6 +20800,7 @@ msgid "Utilisation directe" msgstr "Gebruik van de voorraden" #: include/class/acc_ledger.class.php:1150 +#: include/class/acc_ledger.class.php:1166 #, fuzzy, php-format msgid "Utilisation directe interdite du poste comptable %s" msgstr "Automatisch aanmaken van de boekhoudkundige post" @@ -20310,6 +20841,8 @@ msgid "Val. Comptable Net" msgstr "Accounting Plan" #: include/class/user.class.php:1379 include/class/user.class.php:1408 +#: include/class/acc_ledger.class.php:2365 +#: include/lib/input_switch.class.php:56 #, fuzzy msgid "Valeur invalide" msgstr "Ongeldige waarden" @@ -20441,6 +20974,8 @@ msgstr "Vrijdag" #: include/database.item.php:211 include/database.item.php:221 #: include/cfgledger.inc.php:173 include/class/acc_ledger_search.class.php:1084 #: include/class/acc_ledger_search.class.php:1097 +#: include/template/tax_summary_display.php:29 include/database.item.php:234 +#: include/database.item.php:253 msgid "Vente" msgstr "Verkoop" @@ -20515,7 +21050,7 @@ msgstr "" #: include/database.item.php:164 include/database.item.php:163 #: include/database.item.php:156 include/ajax/ajax_mod_stock_repo.php:55 #: include/database.item.php:157 include/export/export_stock_resume_list.php:38 -#: include/database.item.php:165 +#: include/database.item.php:165 include/database.item.php:168 msgid "Ville" msgstr "City" @@ -20558,7 +21093,7 @@ msgstr "" #: include/database.item.php:186 include/database.item.php:189 #: include/database.item.php:214 include/database.item.php:191 #: include/database.item.php:192 include/database.item.php:195 -#: include/database.item.php:206 +#: include/database.item.php:206 include/database.item.php:211 msgid "Voir les documents du suivi" msgstr "Zie documenten controle" @@ -20813,6 +21348,11 @@ msgstr "U moet de periode geven" msgid "Vous devez donner un fichier" msgstr "U moet de periode geven" +#: include/compta_ven.inc.php:80 include/compta_ach.inc.php:72 +#, fuzzy +msgid "Vous devez encore confirmer" +msgstr "U moet corrigeren" + #: html/admin/setup.php:419 html/install.php:483 html/install.php:482 #: html/install.php:480 html/install.php:486 html/install.php:478 #: html/install.php:484 html/install.php:446 html/install.php:421 @@ -20916,6 +21456,7 @@ msgstr "" #: include/database.item.php:63 include/database.item.php:66 #: include/database.item.php:60 include/database.item.php:58 +#: include/database.item.php:59 msgid "" "Vous permet d'ajouter de nouveaux type de documents (bordereau de livraison, " "devis..)" @@ -20977,6 +21518,7 @@ msgid "Vous utilisez le mode strict la dernière operation est la date du " msgstr "U van Gebruikt Strikt-modus, datum van de laatste is Operatie" #: include/class/acc_ledger.class.php:1079 +#: include/class/acc_ledger.class.php:1095 #, fuzzy, php-format msgid "" "Vous utilisez le mode strict la dernière operation est la date du %s\n" @@ -21237,6 +21779,7 @@ msgstr "keuze van de dagboeken" #: 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:2523 msgid "choix du type de journal" msgstr "keuze van de soort dagboek" @@ -21262,6 +21805,7 @@ msgstr "Klik hier om uw voorkeuren bij te werken" #: 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 +#: html/ajax_misc.php:470 msgid "code" msgstr "code" @@ -21269,6 +21813,7 @@ msgstr "code" #: include/database.item.php:163 include/database.item.php:167 #: include/database.item.php:166 include/database.item.php:159 #: include/database.item.php:160 include/database.item.php:168 +#: include/database.item.php:171 msgid "code postal" msgstr "postcode" @@ -21308,7 +21853,7 @@ msgstr "Credit" #: include/database.item.php:184 include/database.item.php:187 #: include/database.item.php:212 include/database.item.php:189 #: include/database.item.php:190 include/database.item.php:193 -#: include/database.item.php:204 +#: include/database.item.php:204 include/database.item.php:209 msgid "création, modification et effacement de catégorie de fiche" msgstr "aanmaken, wijzigen en verwijderen van categorie opnemen" @@ -21351,6 +21896,7 @@ msgstr "" #: include/template/ledger_detail_bottom.php:200 #: include/template/ledger_detail_bottom.php:217 +#: include/template/ledger_detail_bottom.php:214 msgid "delta" msgstr "delta" @@ -21411,6 +21957,7 @@ msgstr "e-mail" #: include/database.item.php:158 include/database.item.php:162 #: include/database.item.php:161 include/database.item.php:154 #: include/database.item.php:155 include/database.item.php:163 +#: include/database.item.php:166 msgid "email " msgstr "e-mail" @@ -21456,6 +22003,8 @@ msgstr "Tussen 61 en 90 dagen" #: 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:352 +#: include/ajax/ajax_ledger.php:545 msgid "entrez une date" msgstr "datum invoeren" @@ -21488,7 +22037,7 @@ msgstr "fout bij het openen van het bestand" #: include/ajax/ajax_history.php:138 include/ajax/ajax_history.php:139 #: include/ajax/ajax_history.php:58 include/ajax/ajax_history.php:141 #: include/ajax/ajax_history.php:61 include/ajax/ajax_history.php:146 -#: include/ajax/ajax_history.php:147 +#: include/ajax/ajax_history.php:147 include/ajax/ajax_history.php:148 msgid "" "erreur aucune période par défaut, allez dans préférence pour en choisir une" msgstr "" @@ -21537,7 +22086,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 +#: include/class/periode.class.php:709 include/class/periode.class.php:711 #, fuzzy msgid "fermer" msgstr "Dicht" @@ -21591,6 +22140,8 @@ msgstr "Huidige menu" #: 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:1495 +#: include/class/acc_ledger.class.php:1512 msgid "get_default_card p_ledger_side is invalide [" msgstr "get_default_card p_ledger_side is invalide [" @@ -21622,6 +22173,7 @@ msgstr "Stock Geschiedenis" #: include/dossier.inc.php:218 include/modele.inc.php:245 #: include/dossier.inc.php:221 include/dossier.inc.php:226 #: include/modele.inc.php:246 include/class/tva_rate_mtable.class.php:47 +#: include/modele.inc.php:247 msgid "id" msgstr "id" @@ -21655,6 +22207,7 @@ msgstr "onbestaand" #: include/class/acc_ledger_history_generic.class.php:682 #: include/export/export_ledger_csv.php:216 #: include/export/export_ledger_csv.php:224 +#: include/class/acc_ledger_history_generic.class.php:685 #, fuzzy msgid "internal" msgstr "Intern" @@ -21698,6 +22251,7 @@ msgstr "ongeldig parameter " #: 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 +#: include/class/acc_ledger_history_generic.class.php:762 #, fuzzy msgid "journal" msgstr "Journaal" @@ -21795,6 +22349,7 @@ msgstr "belettering" #: include/database.item.php:107 include/database.item.php:104 #: include/database.item.php:103 include/database.item.php:105 #: include/database.item.php:108 include/database.item.php:100 +#: include/database.item.php:101 msgid "lettrage par poste comptable" msgstr "belettering rekenitem" @@ -21862,6 +22417,7 @@ msgstr "" #: include/export/export_ledger_csv.php:215 #: include/export/export_ledger_csv.php:217 #: include/export/export_ledger_csv.php:225 +#: include/template/ledger_detail_bottom.php:213 msgid "montant" msgstr "bedrag" @@ -21934,6 +22490,7 @@ msgid "n'existe pas" msgstr "doorsturingslijst is leeg niet" #: include/class/periode.class.php:520 include/class/periode.class.php:522 +#: include/class/periode.class.php:524 #, fuzzy msgid "nb opérations" msgstr "Operatie" @@ -21978,6 +22535,7 @@ msgstr "huidige uitgave" #: include/database.item.php:154 include/database.item.php:158 #: include/database.item.php:157 include/database.item.php:150 #: include/database.item.php:151 include/database.item.php:159 +#: include/database.item.php:162 msgid "numéro de tva " msgstr "BTW-nummer" @@ -22055,6 +22613,7 @@ msgstr "Operatienr." #: include/class/fiche.class.php:1472 #: include/class/acc_ledger_history_generic.class.php:681 #: include/class/fiche.class.php:1473 +#: include/class/acc_ledger_history_generic.class.php:684 msgid "n° pièce" msgstr "Geen ruimte" @@ -22097,6 +22656,7 @@ msgstr "" #: 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 +#: include/class/acc_ledger_history_generic.class.php:767 #, fuzzy msgid "operation" msgstr "Operatie" @@ -22169,6 +22729,7 @@ msgstr "of QuickCode" #: include/class/acc_ledger_purchase.class.php:1711 #: include/class/acc_ledger_purchase.class.php:1729 #: include/class/acc_ledger_purchase.class.php:1732 +#: include/class/acc_ledger_purchase.class.php:1738 msgid "ou générer un document" msgstr "Maak van een document" @@ -22180,6 +22741,7 @@ msgstr "Maak van een document" #: include/class/class_acc_ledger_sold.php:941 #: include/class/acc_ledger_sold.class.php:966 #: include/class/acc_ledger_sold.class.php:983 +#: include/class/acc_ledger_sold.class.php:992 msgid "ou générer une facture" msgstr "Creeren een faktuur" @@ -22211,6 +22773,7 @@ msgstr "Beschikbaar Geen model" #: include/database.item.php:156 include/database.item.php:160 #: include/database.item.php:159 include/database.item.php:152 #: include/database.item.php:153 include/database.item.php:161 +#: include/database.item.php:164 msgid "pays " msgstr "land" @@ -22409,6 +22972,8 @@ msgstr "Qcode" #: include/class/acc_ledger_sold.class.php:1420 #: include/class/acc_ledger_purchase.class.php:1443 #: include/class/acc_ledger_purchase.class.php:1849 +#: include/class/acc_ledger_sold.class.php:1429 +#: include/class/acc_ledger_purchase.class.php:1855 msgid "quantité" msgstr "hoeveelheid" @@ -22479,7 +23044,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 +#: include/class/periode.class.php:708 include/class/periode.class.php:710 #, fuzzy msgid "sauver" msgstr "OPSLAAN" @@ -22544,6 +23109,7 @@ msgstr "Creditsaldo" #: 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:672 #, fuzzy msgid "solde créditeur:" msgstr "Creditsaldo" @@ -22565,6 +23131,7 @@ msgstr "Debetsaldo" #: 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:671 #, fuzzy msgid "solde débiteur:" msgstr "Debetsaldo" @@ -22609,6 +23176,7 @@ msgstr "Text" #: include/class/acc_ledger.class.php:199 #: include/class/acc_ledger.class.php:202 #: include/class/acc_ledger.class.php:203 +#: include/class/acc_ledger.class.php:221 msgid "this->jr_id is not set ou opération inconnue" msgstr "this->jr_id is not set of onbekende handeling" @@ -22658,6 +23226,11 @@ msgstr "Totaal" msgid "totaux" msgstr "Totalen" +#: include/database.item.php:141 +#, fuzzy +msgid "totaux par TVA et par journal" +msgstr "Gefilterd per dagboek" + #: include/ext/amortis/include/class_pdf_card.php:133 msgid "toutes_les_fiches.pdf" msgstr "toutes_les_fiches.pdf" @@ -22694,6 +23267,7 @@ msgstr "btw" #: 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:526 html/ajax_misc.php:531 msgid "tva inconnue" msgstr "onbekend btw" @@ -22741,6 +23315,7 @@ msgstr "Soort boek van" #: include/database.item.php:157 include/database.item.php:161 #: include/database.item.php:160 include/database.item.php:153 #: include/database.item.php:154 include/database.item.php:162 +#: include/database.item.php:165 msgid "téléphone " msgstr "telefoon" @@ -22758,6 +23333,7 @@ msgstr "utf8" #: 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:318 msgid "verifie CA" msgstr "Controlleren Analytischrekening" @@ -22768,6 +23344,7 @@ msgstr "Controlleren Analytischrekening" #: include/class/acc_ledger.class.php:1156 #: include/class/acc_ledger.class.php:727 #: include/class/acc_ledger.class.php:728 +#: include/class/acc_ledger.class.php:744 msgid "verifie Imputation Analytique" msgstr "Toerekening geverifieerd Analytische" @@ -22788,6 +23365,7 @@ msgstr "u bevestigt" #: include/template/ledger_detail_bottom.php:174 #: include/template/ledger_detail_bottom.php:178 #: include/template/ledger_detail_bottom.php:195 +#: include/template/ledger_detail_bottom.php:192 #, fuzzy msgid "vous confirmez?" msgstr "u bevestigt" From 6013a983880c3b787584113b2d2cbb233162e968 Mon Sep 17 00:00:00 2001 From: Dany De Bontridder Date: Mon, 26 Aug 2019 14:04:07 +0200 Subject: [PATCH 13/16] CSS : add a class "warning" --- html/style-classic.css | 11 +++++++++++ html/style-classic7.css | 14 +++++++++++--- html/style-light.css | 10 ++++++++++ 3 files changed, 32 insertions(+), 3 deletions(-) diff --git a/html/style-classic.css b/html/style-classic.css index 359afcf48..ae70d4123 100644 --- a/html/style-classic.css +++ b/html/style-classic.css @@ -2305,4 +2305,15 @@ div.progressbar { background-color:darkblue; color:antiquewhite; font-weight: bolder; +} +/** + * Warning + */ +span.warning { + color:red; + font-style: normal; + font-weight: bold; + background-color: #eddadd; + padding:10px; + border:red solid 1px; } \ No newline at end of file diff --git a/html/style-classic7.css b/html/style-classic7.css index 1ecf30d30..66477a645 100644 --- a/html/style-classic7.css +++ b/html/style-classic7.css @@ -54,9 +54,7 @@ input:focus { font-style: italic; } -span.notice { - font-weight: bold; -} + a.mtitle span.notice { text-decoration: underline; } @@ -2281,3 +2279,13 @@ div.progressbar { color:antiquewhite; font-weight: bolder; } +/** + * Warning + */ +span.warning { + color:red; + font-style: normal; + font-weight: bold; + background-color: #eddadd; + padding:10px; +} \ No newline at end of file diff --git a/html/style-light.css b/html/style-light.css index 0b237d6ac..4baa63afb 100644 --- a/html/style-light.css +++ b/html/style-light.css @@ -2226,3 +2226,13 @@ div.progressbar { color:antiquewhite; font-weight: bolder; } +/** + * Warning + */ +span.warning { + color:red; + font-style: normal; + font-weight: bold; + background-color: #eddadd; + padding:10px; +} \ No newline at end of file From 03cf9df2385723a4c471638ec39e23a23b7f73e0 Mon Sep 17 00:00:00 2001 From: Dany De Bontridder Date: Mon, 26 Aug 2019 14:06:22 +0200 Subject: [PATCH 14/16] Translation --- include/database.item.php | 58 +++++++++++++++++++++++++++++++++------ 1 file changed, 50 insertions(+), 8 deletions(-) diff --git a/include/database.item.php b/include/database.item.php index 2ed2767f2..e309c3de1 100644 --- a/include/database.item.php +++ b/include/database.item.php @@ -1,4 +1,6 @@ + +Timing is on. +Autocommit is OFF +\jrn_def_negative_warning[]=_('Attention, ce journal doit utiliser des montants négatifs'); +\jrn_def_negative_warning[]=_('Attention, ce journal doit utiliser des montants négatifs'); +\jrn_def_negative_warning[]=_('WARNING ! WARNING !'); +\jrn_def_negative_warning[]=_('Attention, ce journal doit utiliser des montants négatifs'); +\jrn_def_negative_warning[]=_('Attention, ce journal doit utiliser des montants négatifs'); +Time: 1,223 ms ?> From c997708f95b68bcf6e03a9a716c553cbb4c5616d Mon Sep 17 00:00:00 2001 From: Dany De Bontridder Date: Mon, 26 Aug 2019 15:04:08 +0200 Subject: [PATCH 15/16] =?UTF-8?q?New=20Task=201728:=20Aide=20=C3=A0=20l'en?= =?UTF-8?q?codage=20-=20Journaux=20n=C3=A9gatifs=20(note=20de=20cr=C3=A9di?= =?UTF-8?q?t)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- include/cfgledger.inc.php | 8 +- include/class/acc_ledger.class.php | 83 +++- include/class/acc_ledger_fin.class.php | 2 +- include/class/acc_ledger_purchase.class.php | 10 +- include/class/acc_ledger_sold.class.php | 11 +- include/class/periode.class.php | 20 +- include/class/tax_summary.class.php | 355 ++++++++++++++ include/compta_ach.inc.php | 12 +- include/compta_fin.inc.php | 6 +- include/compta_ods.inc.php | 26 +- include/compta_ven.inc.php | 20 +- include/database/jrn_def_sql.class.php | 456 +++--------------- include/export/export_printtva_csv.php | 83 ++++ include/export/export_printtva_pdf.php | 353 ++++++++++++++ include/lib/message_javascript.php | 2 +- include/operation_ods_new.inc.php | 2 +- include/tax_summary.inc.php | 72 +++ include/template/param_jrn.php | 187 ++++--- include/template/tax_summary_display.php | 375 ++++++++++++++ .../include/class/acc_balanceTest.class.php | 15 +- .../include/class/acc_ledgerTest.class.php | 319 ++++++++---- 21 files changed, 1794 insertions(+), 623 deletions(-) create mode 100644 include/class/tax_summary.class.php create mode 100644 include/export/export_printtva_csv.php create mode 100644 include/export/export_printtva_pdf.php create mode 100644 include/tax_summary.inc.php create mode 100644 include/template/tax_summary_display.php diff --git a/include/cfgledger.inc.php b/include/cfgledger.inc.php index 9da41a3a9..679827d06 100644 --- a/include/cfgledger.inc.php +++ b/include/cfgledger.inc.php @@ -54,7 +54,7 @@ if ( $action_frm == 'update') { try { - $ledger->id=$http->post('p_jrn',"number"); + $ledger->set_ledger_id($http->post('p_jrn',"number")); if ( $ledger->load() == -1) throw new Exception (_('Journal inexistant')); $ledger->verify_ledger($_POST); $ledger->update($_POST); @@ -72,7 +72,7 @@ if ( $action_frm == 'update') ////////////////////////////////////////////////////////////////////////// if ($action_frm == 'delete' ) { - $ledger->id=$http->post('p_jrn',"number"); + $ledger->set_ledger_id($http->post('p_jrn',"number")); $ledger->load(); $name=$ledger->get_name(); try { @@ -104,7 +104,7 @@ if (isset($_POST['add'])) $ledger->verify_ledger($_POST); $ledger->save_new($_POST); $sa="detail"; - $a[]=["key"=>'p_jrn',"value"=>$ledger->id]; + $a[]=["key"=>'p_jrn',"value"=>$ledger->get_ledger_id()]; put_global($a); $show_menu=1; } @@ -129,7 +129,7 @@ switch ($sa) case 'detail': /* detail of a ledger */ try { - $ledger->id=$http->request('p_jrn',"number"); + $ledger->set_ledger_id($http->request('p_jrn',"number")); echo '
    '; echo '
    '; echo $ledger->display_ledger(); diff --git a/include/class/acc_ledger.class.php b/include/class/acc_ledger.class.php index 7487b7ba6..a25125772 100644 --- a/include/class/acc_ledger.class.php +++ b/include/class/acc_ledger.class.php @@ -22,6 +22,7 @@ require_once NOALYSS_INCLUDE.'/lib/iselect.class.php'; require_once NOALYSS_INCLUDE.'/lib/icard.class.php'; require_once NOALYSS_INCLUDE.'/lib/ispan.class.php'; require_once NOALYSS_INCLUDE.'/lib/ihidden.class.php'; +require_once NOALYSS_INCLUDE.'/lib/input_switch.class.php'; require_once NOALYSS_INCLUDE.'/lib/idate.class.php'; require_once NOALYSS_INCLUDE.'/lib/itext.class.php'; require_once NOALYSS_INCLUDE.'/lib/icheckbox.class.php'; @@ -75,11 +76,12 @@ class Acc_Ledger extends jrn_def_sql function __construct($p_cn, $p_id) { $this->id=$p_id; - $this->name=&$this->jrn_def_name; + $this->ledger_name=&$this->jrn_def_name; $this->jrn_def_id=&$this->id; $this->db=$p_cn; $this->row=null; $this->nb=MAX_ARTICLE; + parent::__construct($p_cn, $p_id); } function get_last_pj() @@ -104,7 +106,23 @@ class Acc_Ledger extends jrn_def_sql $this->db->create_sequence("s_jrn_pj".$this->id); return 0; } - + /** + * Set the jrn_def.jrn_def_id + * @param integer $p_id + */ + function set_ledger_id($p_id) + { + $this->id=$p_id; + $this->jrn_def_id=&$this->id; + } + /** + * Set the jrn_def.jrn_def_id + * @return integer + */ + function get_ledger_id() + { + return $this->id; + } /** * @brief Return the type of a ledger (ACH,VEN,ODS or FIN) or GL * @@ -113,7 +131,7 @@ class Acc_Ledger extends jrn_def_sql { if ($this->id==0) { - $this->name=_(" Tous les journaux"); + $this->ledger_name=_(" Tous les journaux"); $this->type="GL"; return "GL"; } @@ -370,8 +388,8 @@ class Acc_Ledger extends jrn_def_sql { if ($this->id==0) { - $this->name=_("Grand Livre"); - return $this->name; + $this->ledger_name=_("Grand Livre"); + return $this->ledger_name; } $Res=$this->db->exec_sql("select jrn_def_name from ". @@ -380,7 +398,7 @@ class Acc_Ledger extends jrn_def_sql if ($Max==0) return null; $ret=Database::fetch_array($Res, 0); - $this->name=$ret['jrn_def_name']; + $this->ledger_name=$ret['jrn_def_name']; return $ret['jrn_def_name']; } @@ -417,18 +435,15 @@ class Acc_Ledger extends jrn_def_sql if ($this->id==0) return; - $Res=$this->db->exec_sql("select jrn_Def_id,jrn_def_name,jrn_def_class_deb,jrn_def_class_cred,jrn_def_type, - jrn_deb_max_line,jrn_cred_max_line,jrn_def_ech,jrn_def_ech_lib,jrn_def_code, - jrn_def_fiche_deb,jrn_def_fiche_cred,jrn_def_pj_pref + $Res=$this->db->get_row("select * from jrn_Def where jrn_def_id=$1", array($this->id)); - $Count=Database::num_row($Res); - if ($Count==0) + if ($Res == NULL) { echo '

    '._('Parametres journaux non trouves').'

    '; return null; } - return Database::fetch_array($Res, 0); + return $Res; } /** @@ -1015,7 +1030,7 @@ class Acc_Ledger extends jrn_def_sql * permitted card, 5 not in the user's period, 6 closed period * */ - function verify($p_array) + function verify_operation($p_array) { if (is_array($p_array)==false||empty($p_array)) throw new Exception("Array empty"); @@ -2285,6 +2300,12 @@ class Acc_Ledger extends jrn_def_sql ["label"=>_("Désactivé"),"value"=>0] ]; $actif->selected=$this->jrn_enable; + + $negative=new InputSwitch('negative_amount',$this->jrn_def_negative_amount); + + $negative_warning=new IText("negative_warning",_($this->jrn_def_negative_warning)); + $negative_warning->size=80; + require_once NOALYSS_TEMPLATE.'/param_jrn.php'; } @@ -2337,6 +2358,12 @@ class Acc_Ledger extends jrn_def_sql { throw new Exception(_('Choix du type de journal est obligatoire')); } + if ($negative_amount == 1 && trim($negative_warning)=="") { + throw new Exception(_("Avertissement ne peut être vide")); + } + if ( $negative_amount <> 0 && $negative_amount <> 1 ){ + throw new Exception(_("Valeur invalide")); + } } catch (Exception $e) { @@ -2365,6 +2392,9 @@ class Acc_Ledger extends jrn_def_sql $this->jrn_deb_max_line=($min_row<1)?1:$min_row; $this->jrn_def_description=$p_description; $this->jrn_enable=$jrn_enable; + $this->jrn_def_negative_amount=$negative_amount; + $this->jrn_def_negative_warning=$negative_warning; + switch ($this->jrn_def_type) { case 'ACH': @@ -2521,6 +2551,9 @@ class Acc_Ledger extends jrn_def_sql $cn=$this->db; $min_row=new INum("min_row", MAX_ARTICLE); $min_row->prec=0; + $negative=new InputSwitch('negative_amount',0); + $negative_warning=new IText('negative_warning',_("Attention, ce journal doit utiliser des montants négatifs")); + $negative_warning->size=80; require_once NOALYSS_TEMPLATE.'/param_jrn.php'; } @@ -2544,6 +2577,11 @@ class Acc_Ledger extends jrn_def_sql trim(substr($this->jrn_def_type, 0, 1)), Acc_Ledger::next_number($this->db, $this->jrn_def_type)); $this->jrn_def_description=$p_description; + $this->currency_id=0; + $this->jrn_def_negative_amount=$negative_amount; + $this->jrn_def_negative_warning=$negative_warning; + $this->jrn_enable=1; + switch ($this->jrn_def_type) { case 'ACH': @@ -2577,7 +2615,7 @@ class Acc_Ledger extends jrn_def_sql $this->jrn_def_num_op=(isset($numb_operation))?1:0; break; } - + parent::insert(); } @@ -2888,6 +2926,23 @@ class Acc_Ledger extends jrn_def_sql return FALSE; } + /** + * If the amount is positive and the ledger expects a negative amount, il will return the saved warning + * + * @param int $p_amount amount to check + * @throws Exception 1 if invalid ledger + */ + function display_negative_warning($p_amount) + { + if ($this->id == 0) { + throw new Exception(_("Journal invalide"), 1); + } + $ledger=new Jrn_def_SQL($this->db,$this->id); + if ( $p_amount > 0 && $ledger->getp("jrn_def_negative_amount")==1){ + return _($ledger->getp("jrn_def_negative_warning")); + } + return ""; + } } ?> diff --git a/include/class/acc_ledger_fin.class.php b/include/class/acc_ledger_fin.class.php index d361faa72..b9023ac70 100644 --- a/include/class/acc_ledger_fin.class.php +++ b/include/class/acc_ledger_fin.class.php @@ -53,7 +53,7 @@ class Acc_Ledger_Fin extends Acc_Ledger * @throw Exception on error occurs */ - public function verify($p_array) + public function verify_operation($p_array) { global $g_user; if (is_array($p_array ) == false || empty($p_array)) diff --git a/include/class/acc_ledger_purchase.class.php b/include/class/acc_ledger_purchase.class.php index 56cb2946d..f47974928 100644 --- a/include/class/acc_ledger_purchase.class.php +++ b/include/class/acc_ledger_purchase.class.php @@ -58,7 +58,7 @@ class Acc_Ledger_Purchase extends Acc_Ledger *\return String *\throw Exception if an error occurs */ - public function verify($p_array) + public function verify_operation($p_array) { global $g_parameter,$g_user; @@ -1705,7 +1705,13 @@ EOF; $r.='
    '; } // check for upload piece - + /* + * warning if the amount is positive and expecting a negative one + */ + $negative=$this->display_negative_warning($tot); + if ( $negative != "") { + $r.=span($negative,'class="warning" '); + } return $r; } diff --git a/include/class/acc_ledger_sold.class.php b/include/class/acc_ledger_sold.class.php index 053638385..ae4535a38 100644 --- a/include/class/acc_ledger_sold.class.php +++ b/include/class/acc_ledger_sold.class.php @@ -62,7 +62,7 @@ class Acc_Ledger_Sold extends Acc_Ledger { * \throw Exception if an error occurs */ - public function verify($p_array) { + public function verify_operation($p_array) { global $g_parameter, $g_user; if (is_array($p_array ) == false || empty($p_array)) @@ -904,6 +904,8 @@ EOF; $r.='
    Total '.hb($tot); } $r.=''; + + /* Add hidden */ $r.=HtmlInput::hidden('e_client', $e_client); $r.=HtmlInput::hidden('nb_item', $nb_item); @@ -958,6 +960,13 @@ EOF; } $r.=HtmlInput::hidden("e_quant" . $i, ${"e_quant" . $i}); } + /* + * warning if the amount is positive and expecting a negative one + */ + $negative=$this->display_negative_warning($tot); + if ( $negative != "") { + $r.=span($negative,'class="warning" '); + } return $r; } diff --git a/include/class/periode.class.php b/include/class/periode.class.php index 322dd120a..734cdba41 100644 --- a/include/class/periode.class.php +++ b/include/class/periode.class.php @@ -104,18 +104,20 @@ class Periode { /* if jrn_Def_id == 0 then we check the global otherwise we check a ledger */ - if ($this->jrn_def_id!=0) + if ($this->jrn_def_id!=0){ $sql="select status from jrn_periode ". - " where jrn_def_id=".$this->jrn_def_id. - " and p_id =".$this->p_id; - else + " where jrn_def_id=$1 ". + " and p_id = $2"; + $status=$this->cn->get_value($sql,[$this->jrn_def_id,$this->p_id]); + } + else { $sql="select p_closed as status from parm_periode ". " where ". - " p_id =".$this->p_id; - $res=$this->cn->exec_sql($sql); - $status=Database::fetch_result($res, 0, 0); - if ($status=='OP'||$status=='f') - return 1; + " p_id = $1 "; + $status=$this->cn->get_value($sql,[$this->p_id]); + } + + if ($status=='OP'||$status=='f') return 1; return 0; } diff --git a/include/class/tax_summary.class.php b/include/class/tax_summary.class.php new file mode 100644 index 000000000..8c482b238 --- /dev/null +++ b/include/class/tax_summary.class.php @@ -0,0 +1,355 @@ +db=$db; + $this->set_date_start($p_start); + $this->set_date_end($p_end); + + } + + /** + * @return Database + */ + public function get_db() + { + return $this->db; + return $this; + } + + /** + * @param Database $db + */ + public function set_db($db) + { + $this->db = $db; + return $this; + } + + /** + * @return mixed + */ + public function get_date_start() + { + return $this->date_start; + return $this; + } + + /** + * @param mixed $date_start + */ + public function set_date_start($date_start) + { + if (isDate($date_start) == NULL) throw Exception(_("Format date invalide") . $date_start); + $this->date_start = $date_start; + return $this; + } + + /** + * @return mixed + */ + public function get_date_end() + { + return $this->date_end; + return $this; + } + + /** + * @param mixed $date_end + */ + public function set_date_end($date_end) + { + if (isDate($date_end) == NULL) throw Exception(_("Format date invalide") . $date_end); + $this->date_end = $date_end; + return $this; + } + + /** + * @brief depends of quant_* table, so we must check first that everything + * is in these tables + */ + function check() + { + /*-------------SALE ---------------------------------*/ + $sql="select count(*) + from + jrnx + join quant_sold on (quant_sold.j_id = jrnx.j_id) + where + jrnx.j_jrn_def in (select jrn_def_id from jrn_def where jrn_def_type = 'VEN') + and j_date >= to_date($1,'DD.MM.YYYY') + and j_date <= to_date($2,'DD.MM.YYYY') + "; + $cnt=$this->db->get_value($sql,[$this->date_start,$this->date_end]); + if ($cnt == 0) { + throw new Exception(_("Aucune Donnée")); + } + /*-------------Purchase ---------------------------------*/ + $sql="select count(*) + from + jrnx + join quant_purchase as qp on (jrnx.j_id = qp.j_id) + where + jrnx.j_jrn_def in (select jrn_def_id from jrn_def where jrn_def_type = 'ACH') + and j_date >= to_date($1,'DD.MM.YYYY') + and j_date <= to_date($2,'DD.MM.YYYY') + "; + $cnt=$this->db->get_value($sql,[$this->date_start,$this->date_end]); + if ($cnt == 0) { + throw new Exception(_("Aucune Donnée")); + + } + } + + /** + * Total for each sales ledger + * @return array + */ + function get_row_sale() + { + global $g_user; + $sql_ledger=$g_user->get_ledger_sql('ALL',3); + $sql="with detail_tva as ( + select + sum(qs_vat) as amount_vat, + sum(qs_vat_sided) as amount_sided, + sum(qs_price) as amount_wovat, + qs_vat_code, + j_jrn_def + from + quant_sold + join tva_rate on (qs_vat_code=tva_rate.tva_id) + join jrnx on (quant_sold.j_id=jrnx.j_id) + join jrn_def on (jrn_def.jrn_def_id=jrnx.j_jrn_def) + where + j_date >= to_date($1,'DD.MM.YYYY') + and j_date <= to_date($2,'DD.MM.YYYY') + and {$sql_ledger} + group by j_jrn_def,qs_vat_code) + select jrn_def_name, + tva_label , + qs_vat_code, + tva_rate, + tva_both_side, + amount_vat, + amount_wovat, + amount_sided + from + detail_tva + join tva_rate on (tva_rate.tva_id=qs_vat_code) + join jrn_def on (jrn_def.jrn_def_id=j_jrn_def) + + order by jrn_def_name,tva_label"; + $array=$this->db->get_array($sql,[$this->date_start,$this->date_end]); + return $array; + + } + + + /** + * Total for each purchase ledger + * @return array + */ + function get_row_purchase() + { + global $g_user; + $sql_ledger=$g_user->get_ledger_sql('ALL',3); + $sql="with detail_tva as ( + select + sum(qp_vat) as amount_vat, + sum(qp_vat_sided) as amount_sided, + sum(qp_price) as amount_wovat, + sum(qp_nd_amount) as amount_noded_amount, + sum(qp_nd_tva) as amount_noded_tax, + sum(qp_nd_tva_recup) as amount_noded_return, + sum(qp_dep_priv) as amount_private, + qp_vat_code, + j_jrn_def + from + quant_purchase + join tva_rate on (qp_vat_code=tva_rate.tva_id) + join jrnx on (quant_purchase.j_id=jrnx.j_id) + join jrn_def on (jrn_def.jrn_def_id=jrnx.j_jrn_def) + where + j_date >= to_date($1,'DD.MM.YYYY') + and j_date <= to_date($2,'DD.MM.YYYY') + and {$sql_ledger} + group by j_jrn_def,qp_vat_code) + select jrn_def_name, + tva_label , + tva_rate, + tva_both_side, + qp_vat_code, + amount_vat, + amount_wovat, + amount_sided, + amount_noded_amount, + amount_noded_tax, + amount_noded_return, + amount_private + from + detail_tva + join tva_rate on (tva_rate.tva_id=qp_vat_code) + join jrn_def on (jrn_def.jrn_def_id=j_jrn_def) + order by jrn_def_name,tva_label"; + $array=$this->db->get_array($sql,[$this->date_start,$this->date_end]); + return $array; + } + + /** + * Summary for all sales ledger + */ + function get_summary_sale() + { + global $g_user; + $sql_ledger=$g_user->get_ledger_sql('ALL',3); + $sql="with detail_tva as ( + select + sum(qs_vat) as amount_vat, + sum(qs_vat_sided) as amount_sided, + sum(qs_price) as amount_wovat, + qs_vat_code + from + quant_sold + join tva_rate on (qs_vat_code=tva_rate.tva_id) + join jrnx on (quant_sold.j_id=jrnx.j_id) + join jrn_def on (jrn_def.jrn_def_id=jrnx.j_jrn_def) + where + j_date >= to_date($1,'DD.MM.YYYY') + and j_date <= to_date($2,'DD.MM.YYYY') + and {$sql_ledger} + group by qs_vat_code) + select + tva_label , + qs_vat_code, + tva_rate, + tva_both_side, + amount_vat, + amount_wovat, + amount_sided + from + detail_tva + join tva_rate on (tva_rate.tva_id=qs_vat_code) + order by tva_label"; + $array=$this->db->get_array($sql,[$this->date_start,$this->date_end]); + return $array; + } + /** + * Summary for all purchase ledger + */ + function get_summary_purchase() + { + global $g_user; + $sql_ledger=$g_user->get_ledger_sql('ALL',3); + $sql="with detail_tva as ( + select + sum(qp_vat) as amount_vat, + sum(qp_vat_sided) as amount_sided, + sum(qp_price) as amount_wovat, + sum(qp_nd_amount) as amount_noded_amount, + sum(qp_nd_tva) as amount_noded_tax, + sum(qp_nd_tva_recup) as amount_noded_return, + sum(qp_dep_priv) as amount_private, + qp_vat_code + from + quant_purchase + join tva_rate on (qp_vat_code=tva_rate.tva_id) + join jrnx on (quant_purchase.j_id=jrnx.j_id) + join jrn_def on (jrn_def.jrn_def_id=jrnx.j_jrn_def) + where + j_date >= to_date($1,'DD.MM.YYYY') + and j_date <= to_date($2,'DD.MM.YYYY') + and {$sql_ledger} + group by qp_vat_code) + select + tva_label , + tva_rate, + tva_both_side, + qp_vat_code, + amount_vat, + amount_wovat, + amount_sided, + amount_noded_amount, + amount_noded_tax, + amount_noded_return, + amount_private + from + detail_tva + join tva_rate on (tva_rate.tva_id=qp_vat_code) + order by tva_label"; + $array=$this->db->get_array($sql,[$this->date_start,$this->date_end]); + + return $array; + } + /** + * @brief display the summary of VAT in the range of date + */ + function display() + { + require_once NOALYSS_INCLUDE."/template/tax_summary_display.php"; + } + /** + * @brief display a form to export in CSV + * @see export_printtva_csv.php + */ + function form_export_csv() + { + echo ''; + echo Dossier::hidden(); + echo HtmlInput::hidden("act",'CSV:printtva'); + echo HtmlInput::hidden("date_start",$this->date_start); + echo HtmlInput::hidden("date_end",$this->date_end); + + echo HtmlInput::submit("CSV:printtva",_("Export CSV")); + echo ''; + } + + /** + * @brief display a form to export in PDF + * @see export_printtva_pdf.php + */ + function form_export_pdf() + { + echo '
    '; + echo Dossier::hidden(); + echo HtmlInput::hidden("act",'PDF:printtva'); + echo HtmlInput::hidden("date_start",$this->date_start); + echo HtmlInput::hidden("date_end",$this->date_end); + + echo HtmlInput::submit("PDF:printtva",_("Export PDF")); + echo ''; + } + + +} diff --git a/include/compta_ach.inc.php b/include/compta_ach.inc.php index 5ad7e6ea2..71f2af850 100644 --- a/include/compta_ach.inc.php +++ b/include/compta_ach.inc.php @@ -54,7 +54,7 @@ if (isset($_POST['view_invoice'])) $Ledger = new Acc_Ledger_Purchase($cn, $post_jrn); try { - $Ledger->verify($_POST); + $Ledger->verify_operation($_POST); } catch (Exception $e) { @@ -68,10 +68,8 @@ if (isset($_POST['view_invoice'])) echo '
    '; echo '
    '; echo h1(_("Confirmation")); - echo '
    '; - - echo '
    '; - echo h2(_("Attention, cette opération n'est pas encore sauvée : vous devez encore confirmer"),' class="notice"'); + echo h1(_("Confirmation")); + echo span(_("Vous devez encore confirmer"),' class="notice"'); echo '
    '; echo '
    '; @@ -136,7 +134,7 @@ if (isset($_POST['record'])) $Ledger = new Acc_Ledger_Purchase($cn, $post_jrn); try { - $Ledger->verify($_POST); + $Ledger->verify_operation($_POST); } catch (Exception $e) { @@ -252,7 +250,7 @@ echo '
    '; echo '
    '; -echo '

    '.$p_msg.'

    '; +echo ''.$p_msg.''; try { $payment=$http->request("e_mp", "string",0); diff --git a/include/compta_fin.inc.php b/include/compta_fin.inc.php index 080916d1a..397b30098 100644 --- a/include/compta_fin.inc.php +++ b/include/compta_fin.inc.php @@ -65,7 +65,7 @@ if ( isset($_POST['save'])) { try { - $Ledger->verify($_POST); + $Ledger->verify_operation($_POST); } catch (Exception $e) { @@ -97,7 +97,7 @@ if ( isset($_POST['confirm'])) { try { - $Ledger->verify($_POST); + $Ledger->verify_operation($_POST); } catch (Exception $e) { @@ -133,7 +133,7 @@ if ( isset($_POST['correct'])) //---------------------------------------- // Blank form //---------------------------------------- -echo '

    '.$p_msg.'

    '; +echo ''.$p_msg.''; echo '
    '; echo HtmlInput::hidden('ledger_type','fin'); diff --git a/include/compta_ods.inc.php b/include/compta_ods.inc.php index cbdabcb98..c6360dade 100644 --- a/include/compta_ods.inc.php +++ b/include/compta_ods.inc.php @@ -72,17 +72,17 @@ if (!isset($_POST['summary']) && !isset($_POST['save'])) } elseif (isset($_POST['summary'])) { - try { - $ledger->verify($_POST); - require_once NOALYSS_INCLUDE.'/operation_ods_confirm.inc.php'; - } catch (Exception $e) - { - echo alert($e->getMessage()); - $p_msg=$e->getMessage(); - require_once NOALYSS_INCLUDE.'/operation_ods_new.inc.php'; + try { + $ledger->verify_operation($_POST); + require_once NOALYSS_INCLUDE.'/operation_ods_confirm.inc.php'; + } catch (Exception $e) + { + echo alert($e->getMessage()); + $p_msg=$e->getMessage(); + require_once NOALYSS_INCLUDE.'/operation_ods_new.inc.php'; - } - return; + } + return; } elseif (isset($_POST['save'])) { @@ -120,16 +120,16 @@ elseif (isset($_POST['save'])) } catch (Exception $e) { - echo '

    '._('Opération non extournée'). + echo ''._('Opération non extournée'). $e->getMessage(). - '

    '; + ''; } } else { // warning because date is invalid - echo '

    '._('Date invalide, opération non extournée').'

    '; + echo ''._('Date invalide, opération non extournée').''; } } echo '
      '; diff --git a/include/compta_ven.inc.php b/include/compta_ven.inc.php index 756466904..702bb71b2 100644 --- a/include/compta_ven.inc.php +++ b/include/compta_ven.inc.php @@ -37,7 +37,7 @@ $str_dossier=dossier::get(); global $g_parameter; $http=new HttpInput(); $strac=$http->request('ac'); -$ac="ac=".$_REQUEST['ac']; +$ac="ac=".$strac; $p_msg=""; //---------------------------------------------------------------------- // Encode a new invoice @@ -48,7 +48,7 @@ $p_msg=""; // Check privilege if ( isset($_REQUEST['p_jrn']) && - $g_user->check_jrn($_REQUEST['p_jrn']) != 'W' ) + $g_user->check_jrn($http->post("p_jrn","number")) != 'W' ) { NoAccess(); @@ -58,10 +58,11 @@ $p_msg=""; /* if a new invoice is encoded, we display a form for confirmation */ if ( isset ($_POST['view_invoice'] ) ) { - $Ledger=new Acc_Ledger_Sold($cn,$_POST['p_jrn']); + $p_jrn=$http->post("p_jrn","number"); + $Ledger=new Acc_Ledger_Sold($cn,$p_jrn); try { - $Ledger->verify($_POST); + $Ledger->verify_operation($_POST); } catch (Exception $e) { @@ -76,10 +77,7 @@ $p_msg=""; echo '
      '; echo h1(_("Confirmation")); - echo '
      '; - - echo '
      '; - echo h2(_("Attention, cette opération n'est pas encore sauvée : vous devez encore confirmer"),' class="notice"'); + echo span(_("Vous devez encore confirmer"),' class="notice"'); echo '
      '; echo '
      '; @@ -152,7 +150,7 @@ show_tabs(a_tab,'facturation_div_id'); $Ledger=new Acc_Ledger_Sold($cn,$_POST['p_jrn']); try { - $Ledger->verify($_POST); + $Ledger->verify_operation($_POST); } catch (Exception $e) { @@ -272,7 +270,7 @@ echo $op->form_get('do.php?'.$url); echo '
      '; */ echo '
      '; -echo '

      '.$p_msg.'

      '; +echo ''.$p_msg.''; try { $payment=$http->request("e_mp","string", 0); @@ -316,7 +314,7 @@ try else { echo HtmlInput::hidden("ledger_type", "VEN"); - echo HtmlInput::hidden("ac", $_REQUEST['ac']); + echo HtmlInput::hidden("ac", $strac); echo HtmlInput::hidden("sa", "p"); echo $Ledger->input($array); diff --git a/include/database/jrn_def_sql.class.php b/include/database/jrn_def_sql.class.php index 4f7afc406..413e4d267 100644 --- a/include/database/jrn_def_sql.class.php +++ b/include/database/jrn_def_sql.class.php @@ -1,5 +1,7 @@ column_name,"email"=>"column_name_email","val3"=>0); */ - protected $variable = array( - "jrn_def_id" => "jrn_def_id", - "jrn_def_name" => "jrn_def_name" - , "jrn_def_class_deb" => "jrn_def_class_deb" - , "jrn_def_class_cred" => "jrn_def_class_cred" - , "jrn_def_fiche_deb" => "jrn_def_fiche_deb" - , "jrn_def_fiche_cred" => "jrn_def_fiche_cred" - , "jrn_deb_max_line" => "jrn_deb_max_line" - , "jrn_cred_max_line" => "jrn_cred_max_line" - , "jrn_def_ech" => "jrn_def_ech" - , "jrn_def_ech_lib" => "jrn_def_ech_lib" - , "jrn_def_type" => "jrn_def_type" - , "jrn_def_code" => "jrn_def_code" - , "jrn_def_pj_pref" => "jrn_def_pj_pref" - , "jrn_def_bank" => "jrn_def_bank" - , "jrn_def_num_op" => "jrn_def_num_op" - , "jrn_def_description" => "jrn_def_description" - ); + function __construct(Database $p_cn, $p_id=-1) + { + $this->table="public.jrn_def"; + $this->primary_key="jrn_def_id"; + /* + * List of columns + */ + $this->name=array( + "jrn_def_id"=>"jrn_def_id" + , "jrn_def_name"=>"jrn_def_name" + , "jrn_def_class_deb"=>"jrn_def_class_deb" + , "jrn_def_class_cred"=>"jrn_def_class_cred" + , "jrn_def_fiche_deb"=>"jrn_def_fiche_deb" + , "jrn_def_fiche_cred"=>"jrn_def_fiche_cred" + , "jrn_deb_max_line"=>"jrn_deb_max_line" + , "jrn_cred_max_line"=>"jrn_cred_max_line" + , "jrn_def_ech"=>"jrn_def_ech" + , "jrn_def_ech_lib"=>"jrn_def_ech_lib" + , "jrn_def_type"=>"jrn_def_type" + , "jrn_def_code"=>"jrn_def_code" + , "jrn_def_pj_pref"=>"jrn_def_pj_pref" + , "jrn_def_bank"=>"jrn_def_bank" + , "jrn_def_num_op"=>"jrn_def_num_op" + , "jrn_def_description"=>"jrn_def_description" + , "jrn_enable"=>"jrn_enable" + , "currency_id"=>"currency_id" + , "jrn_def_negative_amount"=>"jrn_def_negative_amount" + , "jrn_def_negative_warning"=>"jrn_def_negative_warning" + ); + /* + * Type of columns + */ + $this->type=array( + "jrn_def_id"=>"numeric" + , "jrn_def_name"=>"text" + , "jrn_def_class_deb"=>"text" + , "jrn_def_class_cred"=>"text" + , "jrn_def_fiche_deb"=>"text" + , "jrn_def_fiche_cred"=>"text" + , "jrn_deb_max_line"=>"numeric" + , "jrn_cred_max_line"=>"numeric" + , "jrn_def_ech"=>"boolean" + , "jrn_def_ech_lib"=>"text" + , "jrn_def_type"=>"text" + , "jrn_def_code"=>"text" + , "jrn_def_pj_pref"=>"text" + , "jrn_def_bank"=>"numeric" + , "jrn_def_num_op"=>"numeric" + , "jrn_def_description"=>"text" + , "jrn_enable"=>"numeric" + , "currency_id"=>"numeric" + , "jrn_def_negative_amount"=>"text" + ,"jrn_def_negative_warning"=>"text" + ); - function __construct(& $p_cn, $p_id=-1) - { - $this->db = $p_cn; - $this->jrn_def_id = $p_id; - if ($p_id == -1) - { - /* Initialize an empty object */ - foreach ($this->variable as $key => $value) - $this->$value = null; - $this->jrn_def_id = $p_id; - } - else - { - /* load it */ + $this->default=array( + "jrn_def_id"=>"auto" + ); - $this->load(); - } - } - - public function get_parameter($p_string) - { - if (array_key_exists($p_string, $this->variable)) - { - $idx = $this->variable[$p_string]; - return $this->$idx; - } - else - throw new Exception(__FILE__ . ":" . __LINE__ . $p_string . 'Erreur attribut inexistant'); - } - - public function set_parameter($p_string, $p_value) - { - if (array_key_exists($p_string, $this->variable)) - { - $idx = $this->variable[$p_string]; - $this->$idx = $p_value; - } - else - throw new Exception(__FILE__ . ":" . __LINE__ . $p_string . 'Erreur attribut inexistant'); - } - - public function get_info() - { - return var_export($this, true); - } - - public function verify_sql() - { - // Verify that the elt we want to add is correct - /* verify only the datatype */ - if (trim($this->jrn_def_name) == '') - $this->jrn_def_name = null; - if (trim($this->jrn_def_class_deb) == '') - $this->jrn_def_class_deb = null; - if (trim($this->jrn_def_class_cred) == '') - $this->jrn_def_class_cred = null; - if (trim($this->jrn_def_fiche_deb) == '') - $this->jrn_def_fiche_deb = null; - if (trim($this->jrn_def_fiche_cred) == '') - $this->jrn_def_fiche_cred = null; - if (trim($this->jrn_deb_max_line) == '') - $this->jrn_deb_max_line = null; - if ($this->jrn_deb_max_line !== null && settype($this->jrn_deb_max_line, 'float') == false) - throw new Exception('DATATYPE jrn_deb_max_line $this->jrn_deb_max_line non numerique'); - if (trim($this->jrn_cred_max_line) == '') - $this->jrn_cred_max_line = null; - if ($this->jrn_cred_max_line !== null && settype($this->jrn_cred_max_line, 'float') == false) - throw new Exception('DATATYPE jrn_cred_max_line $this->jrn_cred_max_line non numerique'); - if (trim($this->jrn_def_ech) == '') - $this->jrn_def_ech = null; - if (trim($this->jrn_def_ech_lib) == '') - $this->jrn_def_ech_lib = null; - if (trim($this->jrn_def_type) == '') - $this->jrn_def_type = null; - if (trim($this->jrn_def_code) == '') - $this->jrn_def_code = null; - if (trim($this->jrn_def_pj_pref) == '') - $this->jrn_def_pj_pref = null; - if (trim($this->jrn_def_bank) == '') - $this->jrn_def_bank = null; - if ($this->jrn_def_bank !== null && settype($this->jrn_def_bank, 'float') == false) - throw new Exception('DATATYPE jrn_def_bank $this->jrn_def_bank non numerique'); - if (trim($this->jrn_def_num_op) == '') - $this->jrn_def_num_op = null; - if ($this->jrn_def_num_op !== null && settype($this->jrn_def_num_op, 'float') == false) - throw new Exception('DATATYPE jrn_def_num_op $this->jrn_def_num_op non numerique'); - } - - public function save($p_string='') - { - /* please adapt */ - if ($this->jrn_def_id == -1) - $this->insert(); - else - $this->update(); - } - - /** - * @brief retrieve array of object thanks a condition - * @param $cond condition (where clause) (optional by default all the rows are fetched) - * you can use this parameter for the order or subselect - * @param $p_array array for the SQL stmt - * @see Database::exec_sql get_object Database::num_row - * @return the return value of exec_sql - */ - public function seek($cond='', $p_array=null) - { - $sql = "select * from public.jrn_def $cond"; - $aobj = array(); - $ret = $this->db->exec_sql($sql, $p_array); - return $ret; - } - - /** - * get_seek return the next object, the return of the query must have all the column - * of the object - * @param $p_ret is the return value of an exec_sql - * @param $idx is the index - * @see seek - * @return object - */ - public function get_object($p_ret, $idx) - { - // map each row in a object - $oobj = new Jrn_Def_sql($this->db); - $array = Database::fetch_array($p_ret, $idx); - foreach ($array as $idx => $value) - { - $oobj->$idx = $value; - } - return $oobj; - } - - public function insert($p_array=null) - { - if ($this->verify_sql() != 0) - return; - if ($this->jrn_def_id == -1) - { - /* please adapt */ - $sql = "insert into public.jrn_def(jrn_def_name -,jrn_def_class_deb -,jrn_def_class_cred -,jrn_def_fiche_deb -,jrn_def_fiche_cred -,jrn_deb_max_line -,jrn_cred_max_line -,jrn_def_ech -,jrn_def_ech_lib -,jrn_def_type -,jrn_def_code -,jrn_def_pj_pref -,jrn_def_bank -,jrn_def_num_op -,jrn_def_description -) values ($1 -,$2 -,$3 -,$4 -,$5 -,$6 -,$7 -,$8 -,$9 -,$10 -,$11 -,$12 -,$13 -,$14 -,$15 -) returning jrn_def_id"; - - $this->jrn_def_id = $this->db->get_value( - $sql, array($this->jrn_def_name - , $this->jrn_def_class_deb - , $this->jrn_def_class_cred - , $this->jrn_def_fiche_deb - , $this->jrn_def_fiche_cred - , $this->jrn_deb_max_line - , $this->jrn_cred_max_line - , $this->jrn_def_ech - , $this->jrn_def_ech_lib - , $this->jrn_def_type - , $this->jrn_def_code - , $this->jrn_def_pj_pref - , $this->jrn_def_bank - , $this->jrn_def_num_op - , strip_tags($this->jrn_def_description) - ) - ); - } - else - { - $sql = "insert into public.jrn_def(jrn_def_name -,jrn_def_class_deb -,jrn_def_class_cred -,jrn_def_fiche_deb -,jrn_def_fiche_cred -,jrn_deb_max_line -,jrn_cred_max_line -,jrn_def_ech -,jrn_def_ech_lib -,jrn_def_type -,jrn_def_code -,jrn_def_pj_pref -,jrn_def_bank -,jrn_def_num_op -,jrn_def_id -,jrn_def_description, -jrn_enable) values ($1 -,$2 -,$3 -,$4 -,$5 -,$6 -,$7 -,$8 -,$9 -,$10 -,$11 -,$12 -,$13 -,$14 -,$15 -,$16 -,1 -) returning jrn_def_id"; - - $this->jrn_def_id = $this->db->get_value( - $sql, array($this->jrn_def_name - , $this->jrn_def_class_deb - , $this->jrn_def_class_cred - , $this->jrn_def_fiche_deb - , $this->jrn_def_fiche_cred - , $this->jrn_deb_max_line - , $this->jrn_cred_max_line - , $this->jrn_def_ech - , $this->jrn_def_ech_lib - , $this->jrn_def_type - , $this->jrn_def_code - , $this->jrn_def_pj_pref - , $this->jrn_def_bank - , $this->jrn_def_num_op - , $this->jrn_def_id - , strip_tags($this->jrn_def_description)) - ); - } - } - - public function update($p_string='') - { - if ($this->verify_sql() != 0) - return; - /* please adapt */ - $sql = " update public.jrn_def set jrn_def_name = $1 -,jrn_def_class_deb = $2 -,jrn_def_class_cred = $3 -,jrn_def_fiche_deb = $4 -,jrn_def_fiche_cred = $5 -,jrn_deb_max_line = $6 -,jrn_cred_max_line = $7 -,jrn_def_ech = $8 -,jrn_def_ech_lib = $9 -,jrn_def_type = $10 -,jrn_def_code = $11 -,jrn_def_pj_pref = $12 -,jrn_def_bank = $13 -,jrn_def_num_op = $14 -,jrn_def_description = $15 -,jrn_enable=$17 - where jrn_def_id= $16"; - $res = $this->db->exec_sql( - $sql, array($this->jrn_def_name - , $this->jrn_def_class_deb - , $this->jrn_def_class_cred - , $this->jrn_def_fiche_deb - , $this->jrn_def_fiche_cred - , $this->jrn_deb_max_line - , $this->jrn_cred_max_line - , $this->jrn_def_ech - , $this->jrn_def_ech_lib - , $this->jrn_def_type - , $this->jrn_def_code - , $this->jrn_def_pj_pref - , $this->jrn_def_bank - , $this->jrn_def_num_op - , strip_tags($this->jrn_def_description) - , $this->jrn_def_id - , $this->jrn_enable - ) - ); - } - - /** - * @brief load a object - * @return 0 on success -1 the object is not found - */ - public function load() - { - - $sql = "select jrn_def_name -,jrn_def_class_deb -,jrn_def_class_cred -,jrn_def_fiche_deb -,jrn_def_fiche_cred -,jrn_deb_max_line -,jrn_cred_max_line -,jrn_def_ech -,jrn_def_ech_lib -,jrn_def_type -,jrn_def_code -,jrn_def_pj_pref -,jrn_def_bank -,jrn_def_num_op -,jrn_def_description -,jrn_enable - from public.jrn_def where jrn_def_id=$1"; - /* please adapt */ - $res = $this->db->get_array( - $sql, array($this->jrn_def_id) - ); - - if (count($res) == 0) - { - /* Initialize an empty object */ - foreach ($this->variable as $key => $value) - $this->$key = ''; - - return -1; - } - foreach ($res[0] as $idx => $value) - { - $this->$idx = $value; - } - return 0; - } - - public function delete() - { - $sql = "delete from public.jrn_def where jrn_def_id=$1"; - $res = $this->db->exec_sql($sql, array($this->jrn_def_id)); - } - - /** - * Unit test for the class - */ - static function test_me() - { - } + $this->date_format="DD.MM.YYYY"; + parent::__construct($p_cn, $p_id); + } } - -// Jrn_Def_sql::test_me(); -?> diff --git a/include/export/export_printtva_csv.php b/include/export/export_printtva_csv.php new file mode 100644 index 000000000..c84ffe267 --- /dev/null +++ b/include/export/export_printtva_csv.php @@ -0,0 +1,83 @@ +get("date_start"),$http->get("date_end")); +$tax_summary->check(); + +$csv=new Noalyss_Csv("summary_tva"); +$csv->send_header(); +// Sale +$csv->write_header([ + _("Journal"), + ("Code TVA"), + _("Taux"), + _("Montant HT"), + _("Montant TVA"), + _("Montant Autoliquidation")]); +$array=$tax_summary->get_row_sale(); +$nb_array=count($array); +for ($i=0;$i < $nb_array;$i++) { + $csv->add ($array[$i]['jrn_def_name']); + $csv->add ($array[$i]['tva_label']); + $csv->add ($array[$i]['tva_rate'],'number'); + $csv->add ($array[$i]['amount_wovat'],'number'); + $csv->add ($array[$i]['amount_vat'],'number'); + $csv->add ($array[$i]['amount_sided'],'number'); + $csv->write(); +} +//Purchase +$csv->write_header([ + _("Journal"), + ("Code TVA"), + _("Taux"), + _("Montant HT"), + _("Privée"), + _("Montant TVA"), + _("Montant Autoliquidation"), + _("Montant ND"), + _("TVA Non Déd"), + _("TVA Non Déd & récup") + ]); +$array=$tax_summary->get_row_purchase(); +$nb_array=count($array); +for ($i=0;$i < $nb_array;$i++) { + $csv->add ($array[$i]['jrn_def_name']); + $csv->add ($array[$i]['tva_label']); + $csv->add ($array[$i]['tva_rate'],'number'); + $csv->add ($array[$i]['amount_wovat'],'number'); + $csv->add ($array[$i]['amount_private'],'number'); + $csv->add ($array[$i]['amount_vat'],'number'); + $csv->add ($array[$i]['amount_sided'],'number'); + $csv->add ($array[$i]['amount_noded_amount'],'number'); + $csv->add ($array[$i]['amount_noded_tax'],'number'); + $csv->add ($array[$i]['amount_noded_return'],'number'); + $csv->write(); +} diff --git a/include/export/export_printtva_pdf.php b/include/export/export_printtva_pdf.php new file mode 100644 index 000000000..ab337ea0a --- /dev/null +++ b/include/export/export_printtva_pdf.php @@ -0,0 +1,353 @@ +request("date_start"); +$to_periode = $http->request("date_end"); + + +$gDossier = dossier::id(); + +/* Security */ +$cn = Dossier::connect(); +$tax_summary = new Tax_Summary($cn, $from_periode, $to_periode); +$pdf = new PDFLand($cn); +$pdf->setDossierInfo(sprintf(_("Date") . " : %s %s", $from_periode, $to_periode)); +$pdf->AliasNbPages(); +$pdf->AddPage(); +$pdf->SetAuthor('NOALYSS'); +$pdf->setTitle(_("Résumé TVA"), true); + + + + +//------------------------------------------------------------------------- +// Sales +//------------------------------------------------------------------------- +$a_sale_header = [_("Code TVA"), _("Taux"), _("Montant HT"), _("Montant TVA"), + _("Montant Autoliquidation")]; +$nb_sale = count($a_sale_header); +$array = $tax_summary->get_row_sale(); +// Table header +$nb_array = count($array); +$tot_vat = 0; +$tot_wovat = 0; +$tot_sided = 0; +$ledger_name = ""; +//------------------------------------------------------------------------- +// For each sale ledger +//------------------------------------------------------------------------- +// Table with total +$a_col=['tva_label','tva_rate','amount_wovat','amount_vat','amount_sided']; +$nb_col=count($a_col); +$a_tot=[]; +// initialize totals +for ($e=2;$e<$nb_col;$e++){ + $a_tot[$a_col[$e]]=0; +} + +for ($i = 0; $i < $nb_array; $i++) { + for ($e=2;$e<$nb_col;$e++){ + $colname=$a_col[$e]; + $a_tot[$colname]=bcadd($a_tot[$colname],$array[$i][$colname]); + } + + if ($i == 0) { + // Display ledger name + + $ledger_name = $array[$i]['jrn_def_name']; + $pdf->SetFont('DejaVuCond', 'B', 10); + $pdf->write_cell(50, 8, $ledger_name); + $pdf->line_new(); + + // Display Header + $pdf->SetFont('DejaVuCond', 'B', 7); + for ($e=0;$e<$nb_col;$e++){ + if ( $e == 0 ) { + $pdf->write_cell(40, 5,$a_sale_header[$e], 1, 0, 'L'); + } else { + $pdf->write_cell(40, 5,$a_sale_header[$e], 1, 0, 'R'); + } + $a_tot[$colname]=0; + } + $pdf->line_new(); + $pdf->SetFont('DejaVuCond', '', 7); + } + if ($ledger_name != $array[$i]['jrn_def_name']) { + // Display totals + $pdf->SetFont('DejaVuCond', 'B', 7); + $pdf->line_new(); + $pdf->write_cell(70, 5, ""); + for ($e=2;$e<$nb_col;$e++){ + $colname=$a_col[$e]; + $pdf->write_cell(40, 5, nbm($a_tot[$colname]), 0, 0, 'R'); + $a_tot[$colname]=0; + } + $pdf->line_new(); + $pdf->SetFont('DejaVuCond', 'B', 7); + + // Display ledger name + $ledger_name = $array[$i]['jrn_def_name']; + $pdf->SetFont('DejaVuCond', 'B', 10); + $pdf->write_cell(50, 8, $ledger_name); + $pdf->line_new(); + + // Display Header + for ($e=0;$e<$nb_col;$e++){ + if ( $e == 0 ) { + $pdf->write_cell(40, 5,$a_sale_header[$e], 1, 0, 'L'); + } else { + $pdf->write_cell(40, 5,$a_sale_header[$e], 1, 0, 'R'); + } + $a_tot[$colname]=0; + } + } + for ($e=0;$e<$nb_col;$e++){ + $colname=$a_col[$e]; + if ( $e ==0 ) { + $pdf->write_cell(40, 5, $array[$i][$colname], 1, 0, 'L'); + } elseif ($e == 1 ){ + $pdf->write_cell(40, 5, nbm($array[$i][$colname]*100), 1, 0, 'R'); + }else { + $pdf->write_cell(40, 5, nbm($array[$i][$colname]), 1, 0, 'R'); + } + } + $pdf->line_new(); +} +$pdf->SetFont('DejaVuCond', 'B', 7); +$pdf->write_cell(80, 5, ""); +for ($e=2;$e<$nb_col;$e++){ + $colname=$a_col[$e]; + $pdf->write_cell(40, 5, nbm($a_tot[$colname]), 1, 0, 'R'); +} + +//------------------------------------------------------------------------- +// Summary sales +//------------------------------------------------------------------------- +$a_sum = $tax_summary->get_summary_sale(); +$pdf->line_new(); +$pdf->SetFont('DejaVuCond', 'B', 10); +$pdf->write_cell(50, 8, _("Résumé TVA vente")); +$pdf->line_new(); + +$pdf->SetFont('DejaVuCond', 'B', 7); +for ($i = 0; $i < $nb_sale; $i++) { + if ($i > 0 ) { + $pdf->write_cell(40, 5, $a_sale_header[$i], 1, 0, 'R'); + } else { + $pdf->write_cell(40, 5, $a_sale_header[$i], 1, 0, 'L'); + } +} +$pdf->line_new(); + +$nb_array = count($array); +// initialize totals +for ($e=2;$e<$nb_col;$e++){ + $a_tot[$a_col[$e]]=0; +} +$pdf->SetFont('DejaVuCond', '', 7); + +for ($i = 0; $i < $nb_array; $i++) { + // display each row + for ($e=0;$e<$nb_col;$e++){ + $colname=$a_col[$e]; + if ( $e ==0 ) { + // first column TVA_LABEL + $pdf->write_cell(40, 5, $array[$i][$colname], 1, 0, 'L'); + } elseif ($e == 1 ){ + // Secund col. tva rate + $pdf->write_cell(40, 5, nbm($array[$i][$colname]*100), 1, 0, 'R'); + }else { + // Other cols,display amount and compute total + $a_tot[$colname] = bcadd($a_tot[$colname], $array[$i][$colname]); + $pdf->write_cell(40, 5, nbm($array[$i][$colname]), 1, 0, 'R'); + } + } + $pdf->line_new(); +} +$pdf->SetFont('DejaVuCond', 'B', 7); +$pdf->write_cell(80, 5, ""); +for ($e=2;$e<$nb_col;$e++){ + $colname=$a_col[$e]; + $pdf->write_cell(40, 5, nbm($a_tot[$colname]), 1, 0, 'R'); +} +$pdf->line_new(); + +//------------------------------------------------------------------------------------------ +// Purchase +//------------------------------------------------------------------------------------------ +$array = $tax_summary->get_row_purchase(); +$a_colp=['tva_label','tva_rate','amount_wovat','amount_private','amount_vat','amount_sided', + 'amount_noded_amount','amount_noded_tax','amount_noded_return']; +$a_purchase_header = [_("Code TVA"), _("Taux"), _("Montant HT"), _("Privée"), _("Montant TVA"), + _("Montant Autoliquidation"), _("Montant Non Déd"), _("TVA Non Déd"), _("TVA Non Déd & récup")]; +$nb_purchase = count($a_purchase_header); + +for ($e=2;$e<$nb_col;$e++){ + $a_tot[$a_col[$e]]=0; +} + +for ($i = 0; $i < $nb_array; $i++) { + for ($e=2;$e<$nb_col;$e++){ + $colname=$a_col[$e]; + $a_tot[$colname]=bcadd($a_tot[$colname],$array[$i][$colname]); + } + + if ($i == 0) { + // Display ledger name + + $ledger_name = $array[$i]['jrn_def_name']; + $pdf->SetFont('DejaVuCond', 'B', 10); + $pdf->write_cell(50, 8, $ledger_name); + $pdf->line_new(); + + // Display Header + $pdf->SetFont('DejaVuCond', 'B', 7); + for ($e=0;$e<$nb_col;$e++){ + if ( $e == 0 ) { + $pdf->write_cell(40, 5,$a_purchase_header[$e], 1, 0, 'L'); + } else { + $pdf->write_cell(40, 5,$a_purchase_header[$e], 1, 0, 'R'); + } + $a_tot[$colname]=0; + } + $pdf->line_new(); + $pdf->SetFont('DejaVuCond', '', 7); + } + if ($ledger_name != $array[$i]['jrn_def_name']) { + // Display totals + $pdf->SetFont('DejaVuCond', 'B', 7); + $pdf->line_new(); + $pdf->write_cell(70, 5, ""); + for ($e=2;$e<$nb_col;$e++){ + $colname=$a_col[$e]; + $pdf->write_cell(40, 5, nbm($a_tot[$colname]), 0, 0, 'R'); + $a_tot[$colname]=0; + } + $pdf->line_new(); + $pdf->SetFont('DejaVuCond', 'B', 7); + + // Display ledger name + $ledger_name = $array[$i]['jrn_def_name']; + $pdf->SetFont('DejaVuCond', 'B', 10); + $pdf->write_cell(50, 8, $ledger_name); + $pdf->line_new(); + + // Display Header + for ($e=0;$e<$nb_col;$e++){ + if ( $e == 0 ) { + $pdf->write_cell(40, 5,$a_purchase_header[$e], 1, 0, 'L'); + } else { + $pdf->write_cell(40, 5,$a_purchase_header[$e], 1, 0, 'R'); + } + $a_tot[$colname]=0; + } + } + for ($e=0;$e<$nb_col;$e++){ + $colname=$a_col[$e]; + if ( $e ==0 ) { + $pdf->write_cell(40, 5, $array[$i][$colname], 1, 0, 'L'); + } elseif ($e == 1 ){ + $pdf->write_cell(40, 5, nbm($array[$i][$colname]*100), 1, 0, 'R'); + }else { + $pdf->write_cell(40, 5, nbm($array[$i][$colname]), 1, 0, 'R'); + } + } + $pdf->line_new(); +} +$pdf->SetFont('DejaVuCond', 'B', 7); +$pdf->write_cell(80, 5, ""); +for ($e=2;$e<$nb_col;$e++){ + $colname=$a_col[$e]; + $pdf->write_cell(40, 5, nbm($a_tot[$colname]), 1, 0, 'R'); +} + +//------------------------------------------------------------------------- +// Summary sales +//------------------------------------------------------------------------- +$a_sum = $tax_summary->get_summary_sale(); +$pdf->line_new(); +$pdf->SetFont('DejaVuCond', 'B', 10); +$pdf->write_cell(50, 8, _("Résumé TVA Achat")); +$pdf->line_new(); + +$pdf->SetFont('DejaVuCond', 'B', 7); +for ($e=0;$e<$nb_col;$e++){ + if ( $e == 0 ) { + $pdf->write_cell(40, 5,$a_purchase_header[$e], 1, 0, 'L'); + } else { + $pdf->write_cell(40, 5,$a_purchase_header[$e], 1, 0, 'R'); + } + $a_tot[$colname]=0; +} +$pdf->line_new(); + +$nb_array = count($array); +// initialize totals +for ($e=2;$e<$nb_col;$e++){ + $a_tot[$a_col[$e]]=0; +} +$pdf->SetFont('DejaVuCond', '', 7); + +for ($i = 0; $i < $nb_array; $i++) { + // display each row + for ($e=0;$e<$nb_col;$e++){ + $colname=$a_col[$e]; + if ( $e ==0 ) { + // first column TVA_LABEL + $pdf->write_cell(40, 5, $array[$i][$colname], 1, 0, 'L'); + } elseif ($e == 1 ){ + // Secund col. tva rate + $pdf->write_cell(40, 5, nbm($array[$i][$colname]*100), 1, 0, 'R'); + }else { + // Other cols,display amount and compute total + $a_tot[$colname] = bcadd($a_tot[$colname], $array[$i][$colname]); + $pdf->write_cell(40, 5, nbm($array[$i][$colname]), 1, 0, 'R'); + } + } + $pdf->line_new(); +} +$pdf->SetFont('DejaVuCond', 'B', 7); +$pdf->write_cell(80, 5, ""); +for ($e=2;$e<$nb_col;$e++){ + $colname=$a_col[$e]; + $pdf->write_cell(40, 5, nbm($a_tot[$colname]), 1, 0, 'R'); +} +$pdf->line_new(); + + +//---------------------------------- Output -------------------------------------------------- + +$fDate = date('Ymd-Hi'); + +$pdf->Output('tva-' . $fDate . '.pdf', 'D'); \ No newline at end of file diff --git a/include/lib/message_javascript.php b/include/lib/message_javascript.php index 03c3f3fb0..9333a2dd2 100644 --- a/include/lib/message_javascript.php +++ b/include/lib/message_javascript.php @@ -103,5 +103,5 @@ content[69]=""; content[70]=""; content[71]=""; content[72]=""; - +content[73]=""; \ No newline at end of file diff --git a/include/operation_ods_new.inc.php b/include/operation_ods_new.inc.php index f3dcacdc7..9396314ad 100644 --- a/include/operation_ods_new.inc.php +++ b/include/operation_ods_new.inc.php @@ -63,7 +63,7 @@ if ( isset ($_GET['action']) && ! isset($_POST['correct']) && ! isset($correct) $p_post=null; if ( isset($_REQUEST['pre_def']) && $_REQUEST['pre_def'] != '') { - $op->set_od_id($_REQUEST['pre_def']); + $op->set_od_id($http->request('pre_def','number')); $p_post=$op->compute_array(); } } diff --git a/include/tax_summary.inc.php b/include/tax_summary.inc.php new file mode 100644 index 000000000..650ddbe0c --- /dev/null +++ b/include/tax_summary.inc.php @@ -0,0 +1,72 @@ +get_limit_current_exercice(); + +$start = $http->request("start_date", "date", $limit[0]); +$end = $http->request("end_date", "date", $limit[1]); + +$start_periode = new IDate("start_date", $start); +$end_periode = new IDate("end_date", $end); +echo ''; +echo HtmlInput::array_to_hidden(['gDossier','ac'],$_GET); +echo HtmlInput::hidden("do","display"); +printf(_("Période du %s au %s"), + $start_periode->input(), + $end_periode->input()); + +echo HtmlInput::submit("show_tax_summary",_("Afficher")); +echo ''; +echo '
      '; +if ( $http->get("do","string","no") == "display") +{ + $tax_summary=new Tax_Summary($cn,$start_periode->value,$end_periode->value); + try { + $tax_summary->check(); + echo '
        '; + echo '
      • '; + echo $tax_summary->form_export_csv(); + echo '
        • '; + echo '
      • '; + echo $tax_summary->form_export_pdf(); + echo '
        • '; + echo '
      '; + $tax_summary->display(); + echo '
        '; + echo '
      • '; + echo $tax_summary->form_export_csv(); + echo '
        • '; + echo '
      • '; + echo $tax_summary->form_export_pdf(); + echo '
        • '; + echo '
      '; + + } catch (Exception $e) { + echo $e->getMessage(); + } +} diff --git a/include/template/param_jrn.php b/include/template/param_jrn.php index 4e9e5058b..b5af8cec9 100644 --- a/include/template/param_jrn.php +++ b/include/template/param_jrn.php @@ -16,10 +16,13 @@
    - - - - - - - + + + + + + + + + - - + + + + + + + + + + + - + + + - + @@ -103,32 +147,33 @@ echo $str_add_button; - - - - + + + + - - - - - - - + + + + + + + +
    + @@ -33,46 +36,87 @@ if ( $new || $type=='ODS' ): endif; ?> -
    - - - input();?> -
    - - -name='bank'; -$card->extra=$cn->make_list('select fd_id from fiche_def where frd_id=4'); -$card->set_dblclick("fill_ipopcard(this);"); -$card->set_function('fill_data'); -$card->set_attribute('ipopup','ipop_card'); -$list=$cn->make_list('select fd_id from fiche_def where frd_id=4'); -$card->set_attribute('typecard',$list); +
    + + + input();?> +
    + + + name='bank'; + $card->extra=$cn->make_list('select fd_id from fiche_def where frd_id=4'); + $card->set_dblclick("fill_ipopcard(this);"); + $card->set_function('fill_data'); + $card->set_attribute('ipopup','ipop_card'); + $list=$cn->make_list('select fd_id from fiche_def where frd_id=4'); + $card->set_attribute('typecard',$list); -$card->value=$qcode_bank; -echo $card->search(); -echo $card->input(); -echo $str_add_button; + $card->value=$qcode_bank; + echo $card->search(); + echo $card->input(); + echo $str_add_button; + ?> + + +
    - -
    + + + + javascript="toggle_row_warning_enable('negative_amount','row_warning')"; + $negative->input(); + ?> +
    + + + input();?> +
    input()?>
    - - - - -
    + + + + +
    - - - - -
    - - - input()?> -
    + + + + +
    + + + input()?> +
    @@ -365,6 +410,8 @@ echo $str_add_button; $('type_ods').style.display='none'; $('type_fin').style.display='none'; $('type_fin2').style.display='none'; + $('neg_amount').style.display='none'; + $('row_warning').style.display='none'; } function show_ledger_div() { @@ -381,6 +428,19 @@ echo $str_add_button; hide_row(); $('type_ods').style.display='table-row'; break; + case 'ACH': + hide_row(); + $('neg_amount').style.display='table-row'; + toggle_row_warning_enable('negative_amount','row_warning'); + + break; + case 'VEN': + hide_row(); + $('neg_amount').style.display='table-row'; + toggle_row_warning_enable('negative_amount','row_warning'); + + break; + default: hide_row(); } @@ -396,3 +456,10 @@ echo $str_add_button; ?> + + + \ No newline at end of file diff --git a/include/template/tax_summary_display.php b/include/template/tax_summary_display.php new file mode 100644 index 000000000..84bb1b530 --- /dev/null +++ b/include/template/tax_summary_display.php @@ -0,0 +1,375 @@ + +

    + +get_row_sale(); +$nb_array=count($array); +$ledger=""; +$r=0; +$tot_vat=0;$tot_wovat=0;$tot_sided=0; + +for ($i=0;$i < $nb_array;$i++): + + if ( $ledger != $array[$i]['jrn_def_name']): + if ( $ledger != "") : + // last row with total + echo ''; + echo td(); + echo td(); + echo td(nbm($tot_wovat),' class="num" '); + echo td(nbm($tot_vat),' class="num" '); + echo td(nbm($tot_sided),' class="num" '); + echo ''; + echo ''; + endif; + $ledger=$array[$i]['jrn_def_name']; + //reinitialize sum + $tot_vat=0;$tot_wovat=0;$tot_sided=0; + + printf("

    %s

    ",$ledger); + echo ''; + echo ''; + echo th(_("Code TVA")); + echo th(_("Taux"),'class="num"'); + echo th(_("Montant HT"),'class="num"'); + echo th(_("Montant TVA"),'class="num"'); + echo th(_("Montant Autoliquidation"),'class="num"'); + echo ''; + $r=0; + endif; + $color=($r%2==0)?"even":"odd"; +?> + + + + + + + + + + 0): +// last row with total + echo ''; + echo td(); + echo td(); + echo td(nbm($tot_wovat),' class="num" '); + echo td(nbm($tot_vat),' class="num" '); + echo td(nbm($tot_sided),' class="num" '); + echo ''; +else: + echo _("Aucune donnée"); +endif; + echo '
    + + + % + + + + + + +
    '; +?> +

    +get_summary_sale(); +?> + + + + + + + + + + + + + + + + + +'; + echo td(); + echo td(); + echo td(nbm($tot_wovat),' class="num" '); + echo td(nbm($tot_vat),' class="num" '); + echo td(nbm($tot_sided),' class="num" '); + echo ''; + ?> +
    + + + + + + + + + +
    + + + % + + + + + + +
    +get_summary_sale(); + + +?> +

    +get_row_purchase(); +$nb_array=count($array); +$ledger=""; +$r=0; +$tot_vat=0;$tot_wovat=0;$tot_sided=0;$tot_noded_amount=0;$tot_noded_tax=0;$tot_noded_return=0;$tot_private=0; +for ($i=0;$i < $nb_array;$i++): + + if ( $ledger != $array[$i]['jrn_def_name']): + if ( $ledger != "") : + // last row with total + echo ''; + echo td(); + echo td(); + echo td(nbm($tot_wovat),' class="num" '); + echo td(nbm($tot_private),' class="num" '); + echo td(nbm($tot_vat),' class="num" '); + echo td(nbm($tot_sided),' class="num" '); + echo td(nbm($tot_noded_amount),' class="num" '); + echo td(nbm($tot_noded_tax),' class="num" '); + echo td(nbm($tot_noded_return),' class="num" '); + echo ''; + echo ''; + endif; + $ledger=$array[$i]['jrn_def_name']; + //reinitialize sum + $tot_vat=0;$tot_wovat=0;$tot_sided=0;$tot_noded_amount=0;$tot_noded_tax=0;$tot_noded_return=0;$tot_private=0; + + printf("

    %s

    ",$ledger); + echo ''; + echo ''; + echo th(_("Code TVA")); + echo th(_("Taux"),'class="num"'); + echo th(_("Montant HT"),'class="num"'); + echo th(_("Privée"),'class="num"'); + echo th(_("Montant TVA"),'class="num"'); + echo th(_("Montant Autoliquidation"),'class="num"'); + echo th(_("Montant Non Déd"),'class="num"'); + echo th(_("TVA Non Déd"),'class="num"'); + echo th(_("TVA Non Déd & récup"),'class="num"'); + echo ''; + $r=0; + endif; + $color=($r%2==0)?"even":"odd"; + ?> + + + + + + + + + + + + + + 0): + echo ''; + echo td(); + echo td(); + echo td(nbm($tot_wovat),' class="num" '); + echo td(nbm($tot_private),' class="num" '); + echo td(nbm($tot_vat),' class="num" '); + echo td(nbm($tot_sided),' class="num" '); + echo td(nbm($tot_noded_amount),' class="num" '); + echo td(nbm($tot_noded_tax),' class="num" '); + echo td(nbm($tot_noded_return),' class="num" '); + echo ''; +else: + echo _("Aucune donnée"); +endif; +echo '
    + + + % + + + + + + + + + + + + + + +
    '; +?> +

    +get_summary_purchase(); +?> + + + + + + + + + + + + + + + + + + + + + + + + + + '; + echo td(); + echo td(); + echo td(nbm($tot_wovat),' class="num" '); + echo td(nbm($tot_private),' class="num" '); + echo td(nbm($tot_vat),' class="num" '); + echo td(nbm($tot_sided),' class="num" '); + echo td(nbm($tot_noded_amount),' class="num" '); + echo td(nbm($tot_noded_tax),' class="num" '); + echo td(nbm($tot_noded_return),' class="num" '); + echo ''; + ?> +
    + + + + + + + + + + + + + + + + + +
    + + + % + + + + + + + + + + + + + + +
    diff --git a/unit-test/include/class/acc_balanceTest.class.php b/unit-test/include/class/acc_balanceTest.class.php index 0799c9b48..0cb572496 100644 --- a/unit-test/include/class/acc_balanceTest.class.php +++ b/unit-test/include/class/acc_balanceTest.class.php @@ -18,11 +18,13 @@ class Acc_BalanceTest extends TestCase */ protected function setUp() { - global $g_connection, $g_parameter; + global $g_connection, $g_parameter,$g_user; $_REQUEST['gDossier']=DOSSIER; $g_connection=new Database(DOSSIER); $g_parameter=new Noalyss_Parameter_Folder($g_connection); $this->object=new Acc_Balance($g_connection); + + } /** @@ -40,11 +42,12 @@ class Acc_BalanceTest extends TestCase */ public function testGet_row() { - $this->object->get_row(1,200); - // Remove the following lines when you implement this test. - $this->markTestIncomplete( - 'DATA : cannot be tested' - ); + global $g_connection,$g_user; + $g_user=new User($g_connection,1); + + $max=$g_connection->get_value("select max(p_id) from parm_periode"); + $min=$g_connection->get_value("select min(p_id) from parm_periode"); + $this->object->get_row($min,$max); } /** diff --git a/unit-test/include/class/acc_ledgerTest.class.php b/unit-test/include/class/acc_ledgerTest.class.php index efc81cb63..1c91653d3 100644 --- a/unit-test/include/class/acc_ledgerTest.class.php +++ b/unit-test/include/class/acc_ledgerTest.class.php @@ -17,6 +17,32 @@ class Acc_LedgerTest extends TestCase $dataSet->addTable('jrn', dirname(__FILE__)."/jrn.csv"); return $dataSet; } + /** + * Get an operation + * @global type $g_connection + * @return type + */ + private function get_jrn_id($p_ledger='ODS') + { + global $g_connection; + $jr_id=$g_connection->get_value("select max(jr_id) from jrn join jrn_def " + . "on (jrn_def_id=jr_def_id) " + . " where " + . " jrn_def_type=$1",[$p_ledger]); + return $jr_id; + } + /** + * Return 1 if operation does exist otherwise zero + * @global type $g_connection + * @param type $p_jr_id + * @return type + */ + private function exist_operation($p_jr_id) + { + global $g_connection; + $jr_id=$g_connection->get_value("select count(*) from jrn where jr_id=$1",[$p_jr_id]); + return $jr_id; + } /** * Sets up the fixture, for example, opens a network connection. * This method is called before a test is executed. @@ -43,9 +69,10 @@ class Acc_LedgerTest extends TestCase public function testGet_last_pj() { - $this->object->id=1; - $array=$this->object->get_last(2); - $this->assertEquals(2,count($array)); + $this->object->id=2; + $sPj=$this->object->get_last_pj(2); + print_r("get_last_pj $sPj"); + $this->assertEquals(5,$sPj); } @@ -78,16 +105,51 @@ class Acc_LedgerTest extends TestCase */ public function testDelete() { + global $g_connection; + $jr_id=$g_connection->get_value("select max(jr_id) from jrn"); + $this->object->jr_id=$jr_id; $this->object->delete(); + $count=$g_connection->get_value("select count(*) from jrn where jr_id=$1",[$jr_id]); + $this->assertEquals($count,0); + } + public function delete_ledger() + { + global $g_connection; + // a . create a ledger and delete it + $array=["p_jrn_def_name"=>"UNITTEST","p_ech_lib"=>"","p_jrn_deb_max_line"=>7,'p_jrn_type'=>'ODS','jrn_def_pj_pref'=>'TT/','min_row'=>5,'p_description'=>'LEDGER UNIT TEST','jrn_def_negative_amount'=>0,'jrn_def_negative_warning'=>'Warning']; + $this->object->save_new($array); + + // Get it + $last_ledger_inserted=$g_connection->get_value("select max(jrn_def_id) from jrn_def"); + $name=$g_connection->get_value("select jrn_def_name from jrn_def where jrn_def_id=$1",[$last_ledger_inserted]); + $this->assertEquals($name,'UNITTEST'); + + // drop it + $this->object->delete_ledger(); + $cnt=$g_connection->get_value("select count(*) from jrn_def where jrn_def_id=$1",[$last_ledger_inserted]); + $this->assertEquals($cnt,0); + $ok=0; + // Try to delete a ledger which is used + try { + $jr_id=$g_connection->get_value("select max(jr_id) from jrn"); + $ledger_id=$g_connection->get_value("select jr_def_id from jrn where jr_id=$1",[$jr_id]); + $ledger=new Acc_Legder($g_connection,$ledger_id); + $ledger->delete_ledger(); + } catch (Exception $ex) { + $ok=1; + } + $this->assertEquals($ok,1); + $cnt=$g_connection->get_value("select count(*) from jrn_def where jrn_def_id=$1",[$ledger_id]); + $this->assertEquals($cnt,1); } - /** * @covers Acc_Ledger::display_warning * @todo Implement testDisplay_warning(). */ public function testDisplay_warning() { - $this->object->display_warning("Alert", "warning"); + $str=$this->object->display_warning(["First Line","Second Line"], "warning"); + $this->assertEquals('

    warning

    1. First Line
    2. Second Line

    ',$str); } /** @@ -96,7 +158,22 @@ class Acc_LedgerTest extends TestCase */ public function testReverse() { - $this->object->reverse('01.01.2014'); + global $g_connection; + $this->object->jr_id=$g_connection->get_value("select max(jr_id) from jrn "); + $this->assertLessThan($this->object->jr_id,"0","found jr_id ".$this->object->jr_id); + $this->assertFalse(empty($this->object->jr_id),"not found jr_id "); + + $this->object->id=$g_connection->get_value("select jr_def_id from jrn where jr_id=$1",[$this->object->jr_id]); + $this->assertGreaterThan($this->object->id,"0","found id ".$this->object->id); + $this->assertFalse(empty($this->object->id),"not found id "); + print_r("jr_id = ".$this->object->jr_id); + print_r("id = ".$this->object->id); + $date=$g_connection->get_value ("select to_char(max(p_start),'DD.MM.YYYY') from parm_periode where p_closed='f'"); + $this->object->reverse($date,'unit test'.$date); + $check=$g_connection->get_value("select jr_id from jrn where jr_comment=$1",["unit test".$date]); + $this->assertFalse(empty($check),"NOT REVERSED" ); + $this->object->jr_id=$check; + $this->object->delete(); } /** @@ -110,28 +187,22 @@ class Acc_LedgerTest extends TestCase $this->assertEquals('Achat',$name); } - /** - * @covers Acc_Ledger::get_row - * @todo Implement testGet_row(). - */ - public function testGet_row() - { - // Remove the following lines when you implement this test. - $this->markTestIncomplete( - 'This test has not been implemented yet.' - ); - } - /** * @covers Acc_Ledger::get_rowSimple * @todo Implement testGet_rowSimple(). */ public function testGet_rowSimple() { - // Remove the following lines when you implement this test. - $this->markTestIncomplete( - 'This test has not been implemented yet.' - ); + global $g_connection; + $last=$g_connection->get_value("select max(p_id) from parm_periode"); + $first=$g_connection->get_value("select min(p_id) from parm_periode"); + $id=$this->object->id; + $this->object->id=2; + $array=$this->object->get_rowSimple($first,$last); + $this->assertTrue(is_array($array),"get_rowSimple does not return an array"); + $this->assertGreaterThan(0,count($array)); + $this->object->id=$id; + } /** @@ -140,46 +211,9 @@ class Acc_LedgerTest extends TestCase */ public function testGuess_pj() { - // Remove the following lines when you implement this test. - $this->markTestIncomplete( - 'This test has not been implemented yet.' - ); - } - - /** - * @covers Acc_Ledger::list_operation_to_reconcile - * @todo Implement testList_operation_to_reconcile(). - */ - public function testList_operation_to_reconcile() - { - // Remove the following lines when you implement this test. - $this->markTestIncomplete( - 'This test has not been implemented yet.' - ); - } - - /** - * @covers Acc_Ledger::list_operation - * @todo Implement testList_operation(). - */ - public function testList_operation() - { - // Remove the following lines when you implement this test. - $this->markTestIncomplete( - 'This test has not been implemented yet.' - ); - } - - /** - * @covers Acc_Ledger::get_detail - * @todo Implement testGet_detail(). - */ - public function testGet_detail() - { - // Remove the following lines when you implement this test. - $this->markTestIncomplete( - 'This test has not been implemented yet.' - ); + $this->object->id=2; + $r=$this->object->guess_pj(); + $this->assertEquals("VEN6",$r); } /** @@ -188,10 +222,11 @@ class Acc_LedgerTest extends TestCase */ public function testGet_propertie() { - // Remove the following lines when you implement this test. - $this->markTestIncomplete( - 'This test has not been implemented yet.' - ); + global $g_connection; + $this->object->id=2; + $array=$this->object->get_propertie(); + // there are 16 columns in jrn_def + $this->assertEquals(count($array),20); } /** @@ -205,7 +240,38 @@ class Acc_LedgerTest extends TestCase 'This test has not been implemented yet.' ); } - + /** + * @covers Acc_Ledger::display_negative_warning + */ + public function testDisplay_negative_warning() + { + global $g_connection; + $msg="WARNING ! WARNING !"; + $acc_ledger=new Jrn_def_SQL($g_connection,2); + $acc_ledger_old=clone $acc_ledger; + $acc_ledger->setp("jrn_def_negative_amount",1); + $acc_ledger->setp("jrn_def_negative_warning",$msg); + $acc_ledger->save(); + $this->object->set_ledger_id(2); + $result=$this->object->display_negative_warning(-1); + $this->assertEquals($result,""); + $result=$this->object->display_negative_warning(1); + $this->assertEquals($result,$msg); + + $acc_ledger_old->save(); + $id=$this->object->get_ledger_id(); + $ok=0; + try { + $this->object->set_ledger_id(0); + $result=$this->object->display_negative_warning(1); + } catch (Exception $e) { + $this->assertEquals($e->getCode(),1); + $ok=1; + } + $this->assertEquals($ok,1); + $this->object->set_ledger_id($id); + + } /** * @covers Acc_Ledger::get_solde * @todo Implement testGet_solde(). @@ -666,9 +732,36 @@ class Acc_LedgerTest extends TestCase */ public function testGet_tiers() { - $this->object->get_tiers($p_jrn_type, $jr_id); - } + global $g_connection; + $jr_id=$this->get_jrn_id(); + $this->assertEquals($this->object->get_tiers("ODS", $jr_id)," "); + $jr_id=$this->get_jrn_id("ACH"); + $this->assertTrue($this->object->get_tiers("ACH",$jr_id)!=' '); + + $jr_id=$this->get_jrn_id("FIN"); + $this->assertTrue($this->object->get_tiers('FIN',$jr_id)!=' '); + + $jr_id=$this->get_jrn_id("VEN"); + $this->assertTrue($this->object->get_tiers("VEN",$jr_id)!=' '); + + } + public function testGet_tiers_id() + { + global $g_connection; + $jr_id=$this->get_jrn_id(); + $this->assertEquals($this->object->get_tiers_id("ODS", $jr_id),0); + + $jr_id=$this->get_jrn_id("ACH"); + $this->assertGreaterThan(0,$this->object->get_tiers_id("ACH",$jr_id)); + + $jr_id=$this->get_jrn_id("FIN"); + $this->assertGreaterThan(0,$this->object->get_tiers_id("FIN",$jr_id)); + + $jr_id=$this->get_jrn_id("VEN"); + $this->assertGreaterThan(0,$this->object->get_tiers_id("VEN",$jr_id)); + + } /** * @covers Acc_Ledger::listing * @todo Implement testListing(). @@ -719,14 +812,12 @@ class Acc_LedgerTest extends TestCase /** * @covers Acc_Ledger::input_paid - * @todo Implement testInput_paid(). */ public function testInput_paid() { - // Remove the following lines when you implement this test. - $this->markTestIncomplete( - 'This test has not been implemented yet.' - ); + $r=$this->object->input_paid(0); + $this->assertStringStartsWith('
    ',$r); + $this->assertStringEndsWith('
    ',$r); } /** @@ -743,14 +834,30 @@ class Acc_LedgerTest extends TestCase /** * @covers Acc_Ledger::save_new - * @todo Implement testSave_new(). */ public function testSave_new() { - // Remove the following lines when you implement this test. - $this->markTestIncomplete( - 'This test has not been implemented yet.' - ); + global $g_connection; + + $array=["p_jrn_name"=>"UNITTEST", + "p_ech_lib"=>"", + "p_jrn_deb_max_line"=>7, + 'p_jrn_class_deb'=>'4*', + 'p_jrn_type'=>'ODS', + 'jrn_def_pj_pref'=>'TT/', + 'min_row'=>5, + 'p_description'=>'LEDGER UNIT TEST', + 'jrn_def_negative_amount'=>0, + 'jrn_def_negative_warning'=>'Warning']; + + + $this->object->save_new($array); + $jrn_def_id=$g_connection->get_value("select jrn_def_id from jrn_def where jrn_def_name=$1",[$array['p_jrn_name']]); + $this->assertGreaterThan($jrn_def_id,0); + $ledger=new Acc_Ledger($g_connection,$jrn_def_id); + $ledger->delete_ledger(); + $jrn_def_id=$g_connection->get_value("select jrn_def_id from jrn_def where jrn_def_name=$1",[$array['p_jrn_name']]); + $this->assertEquals($jrn_def_id,""); } /** @@ -759,10 +866,23 @@ class Acc_LedgerTest extends TestCase */ public function testDelete_ledger() { - // Remove the following lines when you implement this test. - $this->markTestIncomplete( - 'This test has not been implemented yet.' - ); + global $g_connection; + $array=["p_jrn_name"=>"UNITTEST", + "p_ech_lib"=>"", + "p_jrn_deb_max_line"=>7, + 'p_jrn_class_deb'=>'4*', + 'p_jrn_type'=>'ODS', + 'jrn_def_pj_pref'=>'TT/', + 'min_row'=>5, + 'p_description'=>'LEDGER UNIT TEST']; + + $this->object->save_new($array); + $jrn_def_id=$g_connection->get_value("select jrn_def_id from jrn_def where jrn_def_name=$1",[$array['p_jrn_name']]); + $this->assertGreaterThan($jrn_def_id,0); + $ledger=new Acc_Ledger($g_connection,$jrn_def_id); + $ledger->delete_ledger(); + $jrn_def_id=$g_connection->get_value("select jrn_def_id from jrn_def where jrn_def_name=$1",[$array['p_jrn_name']]); + $this->assertEquals($jrn_def_id,""); } /** @@ -771,10 +891,15 @@ class Acc_LedgerTest extends TestCase */ public function testGet_operation_date() { - // Remove the following lines when you implement this test. - $this->markTestIncomplete( - 'This test has not been implemented yet.' - ); + $res=$this->object->get_operation_date('01.01.2010','VEN','>'); + $this->assertGreaterThan(0,count($res),'Failed VEN'); + $res=$this->object->get_operation_date('01.01.2010','ACH','>'); + $this->assertGreaterThan(0,count($res),'Failed ACH '); + $res=$this->object->get_operation_date('01.01.2000','VEN','<'); + $this->assertEquals(count($res),0,'Failed VEN before '); + $res=$this->object->get_operation_date('01.01.2000','ACH','<'); + $this->assertEquals(count($res),0,'Failed ACH before'); + } /** @@ -783,10 +908,7 @@ class Acc_LedgerTest extends TestCase */ public function testGet_supplier_now() { - // Remove the following lines when you implement this test. - $this->markTestIncomplete( - 'This test has not been implemented yet.' - ); + $this->assertTrue(is_array($this->object->get_supplier_now())); } /** @@ -795,10 +917,7 @@ class Acc_LedgerTest extends TestCase */ public function testGet_supplier_late() { - // Remove the following lines when you implement this test. - $this->markTestIncomplete( - 'This test has not been implemented yet.' - ); + $this->assertTrue(is_array($this->object->get_supplier_late())); } /** @@ -807,10 +926,7 @@ class Acc_LedgerTest extends TestCase */ public function testGet_customer_now() { - // Remove the following lines when you implement this test. - $this->markTestIncomplete( - 'This test has not been implemented yet.' - ); + $this->assertTrue(is_array($this->object->get_customer_now())); } /** @@ -819,10 +935,7 @@ class Acc_LedgerTest extends TestCase */ public function testGet_customer_late() { - // Remove the following lines when you implement this test. - $this->markTestIncomplete( - 'This test has not been implemented yet.' - ); + $this->assertTrue(is_array($this->object->get_customer_late())); } /** From dfc79b6a296a61272c6f9ed8d1a6b5f141d15404 Mon Sep 17 00:00:00 2001 From: Dany De Bontridder Date: Mon, 26 Aug 2019 15:09:45 +0200 Subject: [PATCH 16/16] =?UTF-8?q?Fix=200001728:=20Aide=20=C3=A0=20l'encoda?= =?UTF-8?q?ge=20-=20Journaux=20n=C3=A9gatifs=20(note=20de=20cr=C3=A9dit)?= =?UTF-8?q?=20SQL=20Scripts?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- include/constant.php | 2 +- include/sql/patch/upgrade136.sql | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 include/sql/patch/upgrade136.sql diff --git a/include/constant.php b/include/constant.php index 81911ffb5..d157706d8 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",136); +define ("DBVERSION",137); define ("MONO_DATABASE",25); define ("DBVERSIONREPO",18); define ('NOTFOUND','--not found--'); diff --git a/include/sql/patch/upgrade136.sql b/include/sql/patch/upgrade136.sql new file mode 100644 index 000000000..c74314ef4 --- /dev/null +++ b/include/sql/patch/upgrade136.sql @@ -0,0 +1,15 @@ +begin; + +alter table jrn_def add column jrn_def_negative_amount char(1) default '0'; +update jrn_def set jrn_def_negative_amount = '0'; +alter table jrn_def add constraint negative_amount_ck check (jrn_def_negative_amount in ('1','0')); +alter table jrn_def alter jrn_def_negative_amount set not null; +comment on column jrn_def.jrn_def_negative_amount is '1 echo a warning if you are not using an negative amount, default 0 for no warning'; +alter table jrn_def add column jrn_def_negative_warning text; +update jrn_def set jrn_def_negative_warning = 'Attention, ce journal doit utiliser des montants négatifs'; +comment on column jrn_def.jrn_def_negative_warning is 'Yell a warning if the amount if not negative , in the case of jrn_def_negative_amount is Y'; + + + +insert into version (val,v_description) values (137,'Ledger warning'); +commit ; \ No newline at end of file