';
$view.=ShowOperationExpert($cn,$p_id,0);
$view.='';
diff --git a/include/adm_card.inc.php b/include/adm_card.inc.php
index 73ff85e07..6280106e1 100644
--- a/include/adm_card.inc.php
+++ b/include/adm_card.inc.php
@@ -28,13 +28,6 @@
*/
require_once('class_contact.php');
require_once('class_ipopup.php');
-echo js_include('accounting_item.js');
-echo js_include('prototype.js');
-echo js_include('scriptaculous.js');
-echo js_include('effects.js');
-echo js_include('controls.js');
-echo js_include('dragdrop.js');
-echo js_include('card.js');
echo ICard::ipopup('ipopcard');
diff --git a/include/class_lettering.php b/include/class_lettering.php
index 6ec47e4a7..f82143424 100644
--- a/include/class_lettering.php
+++ b/include/class_lettering.php
@@ -318,7 +318,7 @@ class Lettering_Account extends Lettering{
$filter_amount=" and j_montant >= $this->fil_amount_min and j_montant<=$this->fil_amount_max ";
$sql="
select j_id,j_date,to_char(j_date,'DD.MM.YYYY') as j_date_fmt,
-j_montant,j_debit,jr_comment,jr_internal,
+j_montant,j_debit,jr_comment,jr_internal,jr_id,jr_def_id,
coalesce(comptaproc.get_letter_jnt(j_id),-1) as letter
from jrnx join jrn on (j_grpt = jr_grpt_id)
where j_poste = $1 and j_date >= to_date($2,'DD.MM.YYYY') and j_date <= to_date ($3,'DD.MM.YYYY')
@@ -336,7 +336,7 @@ order by j_date,j_id";
public function get_all() {
$sql="
select j_id,j_date,to_char(j_date,'DD.MM.YYYY') as j_date_fmt,
-j_montant,j_debit,jr_comment,jr_internal,
+j_montant,j_debit,jr_comment,jr_internal,jr_id,jr_def_id,
coalesce(comptaproc.get_letter_jnt(j_id),-1) as letter
from jrnx join jrn on (j_grpt = jr_grpt_id)
where j_poste = $1 and j_date >= to_date($2,'DD.MM.YYYY') and j_date <= to_date ($3,'DD.MM.YYYY')
@@ -351,7 +351,7 @@ order by j_date,j_id";
public function get_letter() {
$sql="
select j_id,j_date,to_char(j_date,'DD.MM.YYYY') as j_date_fmt,
-j_montant,j_debit,jr_comment,jr_internal,
+j_montant,j_debit,jr_comment,jr_internal,jr_id,jr_def_id,
coalesce(comptaproc.get_letter_jnt(j_id),-1) as letter
from jrnx join jrn on (j_grpt = jr_grpt_id)
where j_poste = $1 and j_date >= to_date($2,'DD.MM.YYYY') and j_date <= to_date ($3,'DD.MM.YYYY')
@@ -367,7 +367,7 @@ order by j_date,j_id";
public function get_unletter() {
$sql="
select j_id,j_date,to_char(j_date,'DD.MM.YYYY') as j_date_fmt,
-j_montant,j_debit,jr_comment,jr_internal,
+j_montant,j_debit,jr_comment,jr_internal,jr_id,jr_def_id,
coalesce(comptaproc.get_letter_jnt(j_id),-1) as letter
from jrnx join jrn on (j_grpt = jr_grpt_id)
where j_poste = $1 and j_date >= to_date($2,'DD.MM.YYYY') and j_date <= to_date ($3,'DD.MM.YYYY')
@@ -427,7 +427,7 @@ class Lettering_Card extends Lettering{
$filter_amount=" and j_montant between $this->fil_amount_min and $this->fil_amount_max ";
$sql="
select j_id,j_date,to_char(j_date,'DD.MM.YYYY') as j_date_fmt,
-j_montant,j_debit,jr_comment,jr_internal,
+j_montant,j_debit,jr_comment,jr_internal,jr_id,jr_def_id,
coalesce(comptaproc.get_letter_jnt(j_id),-1) as letter
from jrnx join jrn on (j_grpt = jr_grpt_id)
where j_qcode = upper($1) and j_date >= to_date($2,'DD.MM.YYYY') and j_date <= to_date ($3,'DD.MM.YYYY')
@@ -444,7 +444,7 @@ order by j_date,j_id";
public function get_all() {
$sql="
select j_id,j_date,to_char(j_date,'DD.MM.YYYY') as j_date_fmt,
-j_montant,j_debit,jr_comment,jr_internal,
+j_montant,j_debit,jr_comment,jr_internal,jr_id,jr_def_id,
coalesce(comptaproc.get_letter_jnt(j_id),-1) as letter
from jrnx join jrn on (j_grpt = jr_grpt_id)
where j_qcode = upper($1) and j_date >= to_date($2,'DD.MM.YYYY') and j_date <= to_date ($3,'DD.MM.YYYY')
@@ -460,7 +460,7 @@ order by j_date,j_id";
public function get_letter() {
$sql="
select j_id,j_date,to_char(j_date,'DD.MM.YYYY') as j_date_fmt,
-j_montant,j_debit,jr_comment,jr_internal,
+j_montant,j_debit,jr_comment,jr_internal,jr_id,jr_def_id,
coalesce(comptaproc.get_letter_jnt(j_id),-1) as letter
from jrnx join jrn on (j_grpt = jr_grpt_id)
where j_qcode = upper($1) and j_date >= to_date($2,'DD.MM.YYYY') and j_date <= to_date ($3,'DD.MM.YYYY')
@@ -475,7 +475,7 @@ order by j_date,j_id";
public function get_unletter() {
$sql="
select j_id,j_date,to_char(j_date,'DD.MM.YYYY') as j_date_fmt,
-j_montant,j_debit,jr_comment,jr_internal,
+j_montant,j_debit,jr_comment,jr_internal,jr_id,jr_def_id,
coalesce(comptaproc.get_letter_jnt(j_id),-1) as letter
from jrnx join jrn on (j_grpt = jr_grpt_id)
where j_qcode = upper($1) and j_date >= to_date($2,'DD.MM.YYYY') and j_date <= to_date ($3,'DD.MM.YYYY')
diff --git a/include/client_card.inc.php b/include/client_card.inc.php
index df42da62c..e3b34ee06 100644
--- a/include/client_card.inc.php
+++ b/include/client_card.inc.php
@@ -28,13 +28,6 @@
*/
require_once('class_contact.php');
require_once('class_ipopup.php');
-echo js_include('accounting_item.js');
-echo js_include('prototype.js');
-echo js_include('scriptaculous.js');
-echo js_include('effects.js');
-echo js_include('controls.js');
-echo js_include('dragdrop.js');
-echo js_include('card.js');
echo ICard::ipopup('ipopcard');
diff --git a/include/jrn.php b/include/jrn.php
index 51454a1b5..bd0f85fc7 100644
--- a/include/jrn.php
+++ b/include/jrn.php
@@ -177,8 +177,9 @@ function ShowOperationExpert($p_cn,$p_jr_id,$p_mode=1)
if ( $p_mode == 1 ) {
$r.="";
+ $r.='