[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Noalyss-commit] [noalyss] 135/238: Translation
From: |
Dany De Bontridder |
Subject: |
[Noalyss-commit] [noalyss] 135/238: Translation |
Date: |
Sat, 26 Oct 2019 04:40:51 -0400 (EDT) |
sparkyx pushed a commit to annotated tag rel7110
in repository noalyss.
commit b3ada4106f531fac32525ee2a56ef298d34db2ad
Author: Dany De Bontridder <address@hidden>
Date: Fri Dec 28 10:40:48 2018 +0100
Translation
---
include/class/acc_ledger.class.php | 17 +++++++++++------
1 file changed, 11 insertions(+), 6 deletions(-)
diff --git a/include/class/acc_ledger.class.php
b/include/class/acc_ledger.class.php
index 0d6b9a9..2d15344 100644
--- a/include/class/acc_ledger.class.php
+++ b/include/class/acc_ledger.class.php
@@ -762,6 +762,7 @@ class Acc_Ledger extends jrn_def_sql
function input($p_array=null, $p_readonly=0)
{
global $g_parameter, $g_user;
+ $http=new HttpInput();
$this->nb=$this->get_min_row();
if ($p_readonly==1)
return $this->confirm($p_array);
@@ -787,7 +788,8 @@ class Acc_Ledger extends jrn_def_sql
$wLedger=$this->select_ledger('ODS', 2,FALSE);
if ($wLedger==null)
throw new Exception(_('Pas de journal disponible'));
-
$wLedger->javascript="onChange='update_name();update_predef(\"ods\",\"t\",\"".$_REQUEST['ac']."\");$add_js'";
+ $ac=$http->request("ac");
+
$wLedger->javascript="onChange='update_name();update_predef(\"ods\",\"t\",\"".$ac."\");$add_js'";
$label=" Journal ".Icon_Action::infobulle(2);
$ret.="<table>";
@@ -803,8 +805,11 @@ class Acc_Ledger extends jrn_def_sql
$op->set('ledger', $this->id);
$op->set('ledger_type', "ODS");
$op->set('direct', 't');
- $url=http_build_query(array('action'=>'use_opd',
'p_jrn_predef'=>$this->id,
- 'ac'=>$_REQUEST['ac'], 'gDossier'=>dossier::id()));
+ $url=http_build_query(
+ array('action'=>'use_opd',
+ 'p_jrn_predef'=>$this->id,
+ 'ac'=>$ac,
+ 'gDossier'=>dossier::id()));
echo $op->form_get('do.php?'.$url);
echo '</div>';
@@ -1047,12 +1052,12 @@ class Acc_Ledger extends jrn_def_sql
/* check for a double reload */
if (isset($mt)&&$this->db->count_sql('select jr_mt from jrn where
jr_mt=$1',
array($mt))!=0)
- throw new Exception('Double Encodage', 5);
+ throw new Exception(_('Double Encodage'), 5);
// Check the periode and the date
if (isDate($e_date)==null)
{
- throw new Exception('Date invalide', 2);
+ throw new Exception(_('Date invalide'), 2);
}
$periode=new Periode($this->db);
/* find the periode if we have enabled the check_periode
@@ -1076,7 +1081,7 @@ class Acc_Ledger extends jrn_def_sql
// Periode ferme
if ($this->is_closed($periode->p_id)==1)
{
- throw new Exception('Periode fermee', 6);
+ throw new Exception(_('Periode fermee'), 6);
}
/* check if we are using the strict mode */
if ($this->check_strict()==true)
- [Noalyss-commit] [noalyss] 119/238: currency : adapt middle of payment, (continued)
- [Noalyss-commit] [noalyss] 119/238: currency : adapt middle of payment, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 124/238: Currency : when we pay at the same time as we record the sale / purchase , either the bank is in euro (default currency) or the sale/purchase has the same currency than the financial ledger, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 126/238: Merge branch 'master' into r700-currency, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 146/238: Currency : history for accounting , correct amount in currency, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 139/238: Translation, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 133/238: Translation, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 142/238: Currency : Precision 6, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 156/238: Merge branch 'r700-currency' of gitlab.noalyss.eu:noalyss/noalyss into r700-currency, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 143/238: Currency : precision 6, display default currency , protect used currency against delete, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 134/238: use of httpInput, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 135/238: Translation,
Dany De Bontridder <=
- [Noalyss-commit] [noalyss] 151/238: Task #1660 : place the button for the inventory on the top, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 155/238: Task #0001309: Association d'une opération avec elle-même., Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 163/238: PHP 7.2 mistyped command, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 171/238: Mantis #0001666: Export CSV depuis histo ne filtre pas par journal, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 169/238: Mantis #0001688: Affichage centime dans l'écran de confirmation, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 184/238: CSS : cosmetic, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 172/238: Mantis #0001682: CA - ajouter possibilité d'exporter le plan analytique, add action CSV:Analytic_Axis, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 186/238: Fix Inappropriate merge, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 194/238: TEST : fix some little bugs, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 187/238: Wrong merge broke fiche.class.php, Dany De Bontridder, 2019/10/26