[Phpcompta-dev] r4637 - in phpcompta/trunk: include include/template sql

[phpcompta-dev]

Author: danydb
Date: 2011-12-20 16:56:25 +0100 (Tue, 20 Dec 2011)
New Revision: 4637

Modified:
   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
   phpcompta/trunk/sql/upgrade.sql
Log:
#315 D?\195?\169tail article 
Erreur dans script SQL 
Change MYUPDLAB par MY_UPDLAB

Si MY_UPDLAB == Y alors input sinon span

Modified: phpcompta/trunk/include/class_acc_ledger_purchase.php
===================================================================
--- phpcompta/trunk/include/class_acc_ledger_purchase.php       2011-12-20 
14:59:11 UTC (rev 4636)
+++ phpcompta/trunk/include/class_acc_ledger_purchase.php       2011-12-20 
15:56:25 UTC (rev 4637)
@@ -1149,7 +1149,14 @@
             $htva->value=0;
             $array[$i]['htva']=$htva->input();
 
-            $Span=new IText("e_march".$i."_label");
+            if ( $g_parameter->MY_UPDLAB == 'Y')
+            {
+                $Span=new IText("e_march".$i."_label");
+                $Span->size=45;
+            } else
+            {
+                $Span=new ISpan("e_march".$i."_label");
+            }
             $Span->value=$march_label;
             $Span->setReadOnly(false);
             // card's name, price

Modified: phpcompta/trunk/include/class_acc_ledger_sold.php
===================================================================
--- phpcompta/trunk/include/class_acc_ledger_sold.php   2011-12-20 14:59:11 UTC 
(rev 4636)
+++ phpcompta/trunk/include/class_acc_ledger_sold.php   2011-12-20 15:56:25 UTC 
(rev 4637)
@@ -1187,10 +1187,8 @@
                          ;
             if ( $flag_tva=='Y')
             {
-                
$march_tva_id=(isset(${"e_march$i"."_tva_id"}))?${"e_march$i"."_tva_id"}:""
-                              ;
-                
$march_tva_amount=(isset(${"e_march$i"."_tva_amount"}))?${"e_march$i"."_tva_amount"}:""
-                                  ;
+                
$march_tva_id=(isset(${"e_march$i"."_tva_id"}))?${"e_march$i"."_tva_id"}:"";
+                
$march_tva_amount=(isset(${"e_march$i"."_tva_amount"}))?${"e_march$i"."_tva_amount"}:"";
             }
             
$march_label=(isset(${"e_march".$i."_label"}))?${"e_march".$i."_label"}:"";
 
@@ -1252,8 +1250,15 @@
             $tvac->value=0;
             $array[$i]['tvac']=$tvac->input();
 
-
-            $Span=new IText("e_march".$i."_label");
+            if ( $g_parameter->MY_UPDLAB == 'Y')
+            {
+                $Span=new IText("e_march".$i."_label");
+                $Span->size=45;
+            } else
+            {
+                $Span=new ISpan("e_march".$i."_label");
+            }
+            $Span->value=$march_label;
             $Span->setReadOnly(false);
             // card's name, price
             //--

Modified: phpcompta/trunk/include/template/ledger_detail_ach.php
===================================================================
--- phpcompta/trunk/include/template/ledger_detail_ach.php      2011-12-20 
14:59:11 UTC (rev 4636)
+++ phpcompta/trunk/include/template/ledger_detail_ach.php      2011-12-20 
15:56:25 UTC (rev 4637)
@@ -149,7 +149,7 @@
      $tva->load();
      $sym_tva=h($tva->get_parameter('label'));
    }
-   if ($owner->MYUPDLAB == 'Y')
+   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']);

Modified: phpcompta/trunk/include/template/ledger_detail_ven.php
===================================================================
--- phpcompta/trunk/include/template/ledger_detail_ven.php      2011-12-20 
14:59:11 UTC (rev 4636)
+++ phpcompta/trunk/include/template/ledger_detail_ven.php      2011-12-20 
15:56:25 UTC (rev 4637)
@@ -139,7 +139,7 @@
                                $fiche->id, $gDossier, 
$fiche->strAttribut(ATTR_DEF_QUICKCODE));
 
     $row = td($view_history);
-    if ($owner->MYUPDLAB == 'Y')
+    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']);

Modified: phpcompta/trunk/sql/upgrade.sql
===================================================================
--- phpcompta/trunk/sql/upgrade.sql     2011-12-20 14:59:11 UTC (rev 4636)
+++ phpcompta/trunk/sql/upgrade.sql     2011-12-20 15:56:25 UTC (rev 4637)
@@ -1,2 +1,2 @@
 update jrnx set j_text = null from jrn where jr_grpt_id=j_grpt and 
j_text=jr_comment;
-insert into parameter (pr_option,pr_value) values ('MY_UPDLAB','N');
+insert into parameter (pr_id,pr_value) values ('MY_UPDLAB','N');