+
{$title}
{$checkbox->input()} {$label} {$row['ac_rate']}%: {$msg} {$amount->input()}
-
-
EOF;
+
+ $out.=""._("Total opération").
+ "".
+ "".
+ "
";
return $out;
}
diff --git a/include/class/acc_ledger_purchase.class.php b/include/class/acc_ledger_purchase.class.php
index c21205f9a..20ff4c7fd 100644
--- a/include/class/acc_ledger_purchase.class.php
+++ b/include/class/acc_ledger_purchase.class.php
@@ -1217,6 +1217,7 @@ class Acc_Ledger_Purchase extends Acc_Ledger
$add_js.='update_name();';
$add_js.='update_pay_method();';
$add_js.='update_row("sold_item");';
+ $add_js.='update_other_tax()';
$wLedger=$this->select_ledger('ACH',2,FALSE);
@@ -1499,7 +1500,9 @@ class Acc_Ledger_Purchase extends Acc_Ledger
}
// set focus on date
$r.= create_script("$('".$Date->id."').focus()");
+ $r.='';
$r.=$this->input_additional_tax();
+ $r.='
';
return $r;
}
diff --git a/include/class/acc_ledger_sale.class.php b/include/class/acc_ledger_sale.class.php
index 067999802..608be7a10 100644
--- a/include/class/acc_ledger_sale.class.php
+++ b/include/class/acc_ledger_sale.class.php
@@ -1329,6 +1329,7 @@ EOF;
$add_js.='update_name();';
$add_js.='update_pay_method();';
$add_js.='update_row("sold_item");';
+ $add_js.='update_other_tax()';
$wLedger = $this->select_ledger('VEN', 2,FALSE);
if ($wLedger == null)
@@ -1581,7 +1582,9 @@ EOF;
$r.=HtmlInput::hidden('jrn_type', 'VEN');
$r.= Html_Input_Noalyss::ledger_add_item("O");
$r.= create_script("$('" . $Date->id . "').focus()");
+ $r.='';
$r.=$this->input_additional_tax();
+ $r.='
';
return $r;
}
/**
diff --git a/scenario/test_postgres_json_array.php b/scenario/test_postgres_json_array.php
index e69de29bb..4847b09c7 100644
--- a/scenario/test_postgres_json_array.php
+++ b/scenario/test_postgres_json_array.php
@@ -0,0 +1,31 @@
+get_db();
+
+$ret = pg_query($cnx,"select * from jrn_def ");
+
+$result=pg_fetch_all($ret);
+
+echo "retrieve ",count($result);
+
+$ret=pg_query($cnx,"drop table if exists public.test_array_int");
+
+$ret = pg_query ($cnx,
+"CREATE TABLE public.test_array_int(
+ ac_id serial4 NOT NULL PRIMARY KEY ,
+ ac_label text NOT NULL,
+ ac_rate numeric(5, 2) NOT NULL,
+ ajrn_def_id _int4 NULL); "
+);
+if ( ! $ret ){
+ die ("cannot create public.test_array_int");
+}
+$ret=pg_query($cnx,
+ "insert into public.test_array_int(ac_label,ac_rate,ajrn_def_id) values ('ligne 1',1.2,'{1,2}')");
+
+$ret=pg_query_params($cnx,
+ "insert into public.test_array_int(ac_label,ac_rate,ajrn_def_id) values ($1,$2,$3)",
+array('ligne 1',1.2,'{1,2}'));
+
+
+$ret=pg_query($cnx,"drop table if exists public.test_array_int");
\ No newline at end of file