From 7092813f0cfcdba1e93d2a221d60cb1b5c7f27dd Mon Sep 17 00:00:00 2001
From: Dany De Bontridder <dany@alchimerys.be>
Date: Tue, 20 Dec 2011 15:56:25 +0000
Subject: [PATCH] =?UTF-8?q?#315=20D=C3=A9tail=20article=20Erreur=20dans=20?=
 =?UTF-8?q?script=20SQL=20Change=20MYUPDLAB=20par=20MY=5FUPDLAB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Si MY_UPDLAB == Y alors input sinon span
---
 include/class_acc_ledger_purchase.php  |  9 ++++++++-
 include/class_acc_ledger_sold.php      | 17 +++++++++++------
 include/template/ledger_detail_ach.php |  2 +-
 include/template/ledger_detail_ven.php |  2 +-
 sql/upgrade.sql                        |  2 +-
 5 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/include/class_acc_ledger_purchase.php b/include/class_acc_ledger_purchase.php
index 917bfdf37..5209f7114 100644
--- a/include/class_acc_ledger_purchase.php
+++ b/include/class_acc_ledger_purchase.php
@@ -1149,7 +1149,14 @@ class  Acc_Ledger_Purchase extends Acc_Ledger
             $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
diff --git a/include/class_acc_ledger_sold.php b/include/class_acc_ledger_sold.php
index 96b9aeac5..b6da5aa74 100644
--- a/include/class_acc_ledger_sold.php
+++ b/include/class_acc_ledger_sold.php
@@ -1187,10 +1187,8 @@ class  Acc_Ledger_Sold extends Acc_Ledger
                          ;
             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 @@ class  Acc_Ledger_Sold extends Acc_Ledger
             $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
             //--
diff --git a/include/template/ledger_detail_ach.php b/include/template/ledger_detail_ach.php
index 84e9ffae8..eccfa82c1 100644
--- a/include/template/ledger_detail_ach.php
+++ b/include/template/ledger_detail_ach.php
@@ -149,7 +149,7 @@ echo '</tr>';
      $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']);
diff --git a/include/template/ledger_detail_ven.php b/include/template/ledger_detail_ven.php
index 62a78264b..9c90f49d7 100644
--- a/include/template/ledger_detail_ven.php
+++ b/include/template/ledger_detail_ven.php
@@ -139,7 +139,7 @@ echo '</tr>';
 				$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']);
diff --git a/sql/upgrade.sql b/sql/upgrade.sql
index 0eae79acd..e9b4349fb 100644
--- a/sql/upgrade.sql
+++ b/sql/upgrade.sql
@@ -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');