[Phpcompta-dev] r4638 - in phpcompta/trunk/include: . template

[phpcompta-dev]

Author: danydb
Date: 2011-12-20 17:25:02 +0100 (Tue, 20 Dec 2011)
New Revision: 4638

Modified:
   phpcompta/trunk/include/class_acc_ledger_purchase.php
   phpcompta/trunk/include/class_acc_ledger_sold.php
   phpcompta/trunk/include/class_acc_operation.php
   phpcompta/trunk/include/template/ledger_detail_ach.php
   phpcompta/trunk/include/template/ledger_detail_ven.php
Log:
#315 D?\195?\169tail article 
MY_UPDLAB == N
Fix bug with j_text

Modified: phpcompta/trunk/include/class_acc_ledger_purchase.php
===================================================================
--- phpcompta/trunk/include/class_acc_ledger_purchase.php       2011-12-20 
15:56:25 UTC (rev 4637)
+++ phpcompta/trunk/include/class_acc_ledger_purchase.php       2011-12-20 
16:25:02 UTC (rev 4638)
@@ -1328,7 +1328,10 @@
             /* retrieve information for card */
             $fiche=new Fiche($this->db);
             $fiche->get_by_qcode(${"e_march".$i});
-            $fiche_name=h(${"e_march".$i."_label"});
+            if ( $g_parameter->MY_UPDLAB=='Y')
+                $fiche_name=h(${"e_march".$i."_label"});
+            else
+                $fiche_name=$fiche->strAttribut (ATTR_DEF_NAME);
 
             if ( $g_parameter->MY_TVA_USE=='Y')
             {

Modified: phpcompta/trunk/include/class_acc_ledger_sold.php
===================================================================
--- phpcompta/trunk/include/class_acc_ledger_sold.php   2011-12-20 15:56:25 UTC 
(rev 4637)
+++ phpcompta/trunk/include/class_acc_ledger_sold.php   2011-12-20 16:25:02 UTC 
(rev 4638)
@@ -720,7 +720,10 @@
             /* retrieve information for card */
             $fiche=new Fiche($this->db);
             $fiche->get_by_qcode(${"e_march".$i});
-            $fiche_name=h(${"e_march".$i."_label"});
+            if ( $g_parameter->MY_UPDLAB=='Y')
+                $fiche_name=h(${"e_march".$i."_label"});
+            else
+                $fiche_name=$fiche->strAttribut (ATTR_DEF_NAME);
             if ( $g_parameter->MY_TVA_USE=='Y')
             {
                 $oTva=new Acc_Tva($this->db);

Modified: phpcompta/trunk/include/class_acc_operation.php
===================================================================
--- phpcompta/trunk/include/class_acc_operation.php     2011-12-20 15:56:25 UTC 
(rev 4637)
+++ phpcompta/trunk/include/class_acc_operation.php     2011-12-20 16:25:02 UTC 
(rev 4638)
@@ -555,7 +555,7 @@
         }
        $sql="select n_text from jrn_note where jr_id=$1";
        $this->det->note=$this->db->get_value($sql,array($this->jr_id));
-       $this->det->note=preg_replace('/< 
*script/i','[script',$this->det->note);
+       $this->det->note=strip_tags($this->det->note);
     }
 }
 /////////////////////////////////////////////////////////////////////////////
@@ -602,8 +602,8 @@
     {
         parent::get();
         $sql="SELECT qs_id, qs_internal, qs_fiche, qs_quantite, qs_price, 
qs_vat,
-             qs_vat_code, qs_client, qs_valid, j_id
-             FROM quant_sold where j_id in (select j_id from jrnx where 
j_grpt=$1)";
+             qs_vat_code, qs_client, qs_valid, j_id,j_text
+             FROM quant_sold  join jrnx using(j_id) where j_grpt=$1";
         
$this->det->array=$this->db->get_array($sql,array($this->det->jr_grpt_id));
     }
 }
@@ -627,8 +627,8 @@
         parent::get();
         $sql="SELECT qp_id, qp_internal, j_id, qp_fiche, qp_quantite, 
qp_price, qp_vat,
              qp_vat_code, qp_nd_amount, qp_nd_tva, qp_nd_tva_recup, 
qp_supplier,
-             qp_valid, qp_dep_priv
-             FROM quant_purchase  where j_id in (select j_id from jrnx where 
j_grpt=$1)";
+             qp_valid, qp_dep_priv,j_text
+             FROM quant_purchase  join jrnx using(j_id) where j_grpt=$1";
         
$this->det->array=$this->db->get_array($sql,array($this->det->jr_grpt_id));
     }
 }

Modified: phpcompta/trunk/include/template/ledger_detail_ach.php
===================================================================
--- phpcompta/trunk/include/template/ledger_detail_ach.php      2011-12-20 
15:56:25 UTC (rev 4637)
+++ phpcompta/trunk/include/template/ledger_detail_ach.php      2011-12-20 
16:25:02 UTC (rev 4638)
@@ -151,13 +151,13 @@
    }
    if ($owner->MY_UPDLAB == 'Y')
     {
-        $l_lib = ($q[$e]['j_text'] == '') ? $fiche->strAttribut(ATTR_DEF_NAME) 
: $q[$e]['j_text'];
-        $hidden = HtmlInput::hidden("j_id[]", $q[$e]['j_id']);
+        $l_lib = ($q['j_text'] == '') ? $fiche->strAttribut(ATTR_DEF_NAME) : 
$q['j_text'];
+        $hidden = HtmlInput::hidden("j_id[]", $q['j_id']);
         $input = new IText("e_march" . $q[$e]['j_id'] . "_label", $l_lib);
     }
     else
     {
-        $input = new ISpan("e_march" . $q[$e]['j_id'] . "_label");
+        $input = new ISpan("e_march" . $q['j_id'] . "_label");
         $hidden = HtmlInput::hidden("j_id[]", $q[$e]['j_id']);
         $input->value = $fiche->strAttribut(ATTR_DEF_NAME);
     }

Modified: phpcompta/trunk/include/template/ledger_detail_ven.php
===================================================================
--- phpcompta/trunk/include/template/ledger_detail_ven.php      2011-12-20 
15:56:25 UTC (rev 4637)
+++ phpcompta/trunk/include/template/ledger_detail_ven.php      2011-12-20 
16:25:02 UTC (rev 4638)
@@ -141,13 +141,13 @@
     $row = td($view_history);
     if ($owner->MY_UPDLAB == 'Y')
     {
-        $l_lib = ($q[$e]['j_text'] == '') ? $fiche->strAttribut(ATTR_DEF_NAME) 
: $q[$e]['j_text'];
-        $hidden = HtmlInput::hidden("j_id[]", $q[$e]['j_id']);
-        $input = new IText("e_march" . $q[$e]['j_id'] . "_label", $l_lib);
+        $l_lib = ($q['j_text'] == '') ? $fiche->strAttribut(ATTR_DEF_NAME) : 
$q['j_text'];
+        $hidden = HtmlInput::hidden("j_id[]", $q['j_id']);
+        $input = new IText("e_march" . $q['j_id'] . "_label", $l_lib);
     }
     else
     {
-        $input = new ISpan("e_march" . $q[$e]['j_id'] . "_label");
+        $input = new ISpan("e_march" . $q['j_id'] . "_label");
         $hidden = HtmlInput::hidden("j_id[]", $q[$e]['j_id']);
         $input->value = $fiche->strAttribut(ATTR_DEF_NAME);
     }