[Phpcompta-dev] r4636 - in phpcompta/trunk: html include include/template

[phpcompta-dev]

Author: danydb
Date: 2011-12-20 15:59:11 +0100 (Tue, 20 Dec 2011)
New Revision: 4636

Modified:
   phpcompta/trunk/html/ajax_ledger.php
   phpcompta/trunk/include/class_acc_ledger_purchase.php
   phpcompta/trunk/include/class_acc_ledger_sold.php
   phpcompta/trunk/include/template/ledger_detail_ach.php
   phpcompta/trunk/include/template/ledger_detail_ven.php
Log:
#315 D?\195?\169tail article 
Param?\195?\168trable dans COMPANY, affichage diff?\195?\169rent si N ou Y, 
mise ?\195?\160 jour impossible si N

Modified: phpcompta/trunk/html/ajax_ledger.php
===================================================================
--- phpcompta/trunk/html/ajax_ledger.php        2011-12-20 14:50:40 UTC (rev 
4635)
+++ phpcompta/trunk/html/ajax_ledger.php        2011-12-20 14:59:11 UTC (rev 
4636)
@@ -45,6 +45,7 @@
   {
     exit();
   }
+ global $g_parameter;
 $action=$_REQUEST['act'];
 $jr_id=$_REQUEST['jr_id'];
 $div=$_REQUEST['div'];         /* the div source and target for javascript */
@@ -362,11 +363,14 @@
            $cn->exec_sql("select comptaproc.jrn_add_note($1,$2)",
                          array($jr_id,$_POST['jrn_note']));
             $rapt=$_POST['rapt'];
-            $a_rowid=$_POST["j_id"];
-            for ($e=0;$e<count($a_rowid);$e++)
+            if ( $g_parameter->MYUPDLAB=='Y')
             {
-                $id="e_march".$a_rowid[$e]."_label";
-                $cn->exec_sql('update jrnx set j_text=$1 where j_id=$2',  
array(strip_tags($_POST[$id]),$a_rowid[$e]));
+                $a_rowid=$_POST["j_id"];
+                for ($e=0;$e<count($a_rowid);$e++)
+                {
+                    $id="e_march".$a_rowid[$e]."_label";
+                    $cn->exec_sql('update jrnx set j_text=$1 where j_id=$2',  
array(strip_tags($_POST[$id]),$a_rowid[$e]));
+                }
             }
             if (trim($rapt) != '')
             {

Modified: phpcompta/trunk/include/class_acc_ledger_purchase.php
===================================================================
--- phpcompta/trunk/include/class_acc_ledger_purchase.php       2011-12-20 
14:50:40 UTC (rev 4635)
+++ phpcompta/trunk/include/class_acc_ledger_purchase.php       2011-12-20 
14:59:11 UTC (rev 4636)
@@ -390,7 +390,10 @@
                 $acc_operation->type='d';
                 $acc_operation->periode=$tperiode;
                 $acc_operation->qcode="";
-                $acc_operation->desc=strip_tags(${"e_march".$i."_label"});
+                if ( $g_parameter->MY_UPDLAB=='Y')
+                    $acc_operation->desc=strip_tags(${"e_march".$i."_label"});
+                else
+                    $acc_operation->desc=null;
 
 
 

Modified: phpcompta/trunk/include/class_acc_ledger_sold.php
===================================================================
--- phpcompta/trunk/include/class_acc_ledger_sold.php   2011-12-20 14:50:40 UTC 
(rev 4635)
+++ phpcompta/trunk/include/class_acc_ledger_sold.php   2011-12-20 14:59:11 UTC 
(rev 4636)
@@ -307,7 +307,11 @@
                 $acc_operation->jrn=$p_jrn;
                 $acc_operation->type='c';
                 $acc_operation->periode=$tperiode;
-                $acc_operation->desc=strip_tags(${"e_march".$i."_label"});
+                if ( $g_parameter->MY_UPDLAB=='Y')
+                    $acc_operation->desc=strip_tags(${"e_march".$i."_label"});
+                else
+                    $acc_operation->desc=null;
+
                 $acc_operation->qcode=${"e_march".$i};
                 if ( $amount < 0 ) $tot_debit=bcadd($tot_debit,abs($amount));
 

Modified: phpcompta/trunk/include/template/ledger_detail_ach.php
===================================================================
--- phpcompta/trunk/include/template/ledger_detail_ach.php      2011-12-20 
14:50:40 UTC (rev 4635)
+++ phpcompta/trunk/include/template/ledger_detail_ach.php      2011-12-20 
14:59:11 UTC (rev 4636)
@@ -149,9 +149,18 @@
      $tva->load();
      $sym_tva=h($tva->get_parameter('label'));
    }
-    
$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);
+   if ($owner->MYUPDLAB == '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);
+    }
+    else
+    {
+        $input = new ISpan("e_march" . $q[$e]['j_id'] . "_label");
+        $hidden = HtmlInput::hidden("j_id[]", $q[$e]['j_id']);
+        $input->value = $fiche->strAttribut(ATTR_DEF_NAME);
+    }
     $row.=td($input->input().$hidden);
     $row.=td($sym_tva,'style="text-align:center"');
        $pu=bcdiv($q['qp_price'],$q['qp_quantite']);

Modified: phpcompta/trunk/include/template/ledger_detail_ven.php
===================================================================
--- phpcompta/trunk/include/template/ledger_detail_ven.php      2011-12-20 
14:50:40 UTC (rev 4635)
+++ phpcompta/trunk/include/template/ledger_detail_ven.php      2011-12-20 
14:59:11 UTC (rev 4636)
@@ -138,10 +138,20 @@
     $view_history= sprintf('<A class="line" 
HREF="javascript:view_history_card(\'%s\',\'%s\')" >%s</A>',
                                $fiche->id, $gDossier, 
$fiche->strAttribut(ATTR_DEF_QUICKCODE));
 
-    $row=td($view_history);
-    
$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);
+    $row = td($view_history);
+    if ($owner->MYUPDLAB == '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);
+    }
+    else
+    {
+        $input = new ISpan("e_march" . $q[$e]['j_id'] . "_label");
+        $hidden = HtmlInput::hidden("j_id[]", $q[$e]['j_id']);
+        $input->value = $fiche->strAttribut(ATTR_DEF_NAME);
+    }
+
     $row.=td($input->input().$hidden);
     $sym_tva='';
        $pu=bcdiv($q['qs_price'],$q['qs_quantite']);