Merging fix from trunk regarding locked descriptions

git-svn-id: svn://svn.code.sf.net/p/ledger-smb/code/branches/1.3@5921 4979c152-3d1c-0410-bac9-87ea11338e46
pongraczi · Jul 24, 2013 · 9b644c2 · 9b644c2
1 parent 37e7810
commit 9b644c2
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 14 deletions.
diff --git a/LedgerSMB/OE.pm b/LedgerSMB/OE.pm
@@ -824,6 +824,12 @@ sub retrieve {
 		SELECT value, current_date FROM defaults
 		 WHERE setting_key = 'curr'|;
     ( $form->{currencies}, $form->{transdate} ) = $dbh->selectrow_array($query);
+
+    $query = qq|
+		SELECT value FROM defaults
+		 WHERE setting_key = 'lock_description'|;
+    ( $form->{lock_description}) = $dbh->selectrow_array($query);
+
 
     if ( $form->{id} ) {
 

diff --git a/bin/io.pl b/bin/io.pl
@@ -285,20 +285,23 @@ sub display_row {
         $linetotal = $form->round_amount( $linetotal * $form->{"qty_$i"}, 
                                          $moneyplaces);
 
-        if (
-            ( $rows = $form->numtextrows( $form->{"description_$i"}, 46, 6 ) ) >
-            1 )
-        {
-            $form->{"description_$i"} =
-              $form->quote( $form->{"description_$i"} );
-            $column_data{description} =
-qq|<td><textarea name="description_$i" rows=$rows $desc_disabled cols=46 wrap=soft>$form->{"description_$i"}</textarea></td>|;
-        }
-        else {
-            $form->{"description_$i"} =
-              $form->quote( $form->{"description_$i"} );
-            $column_data{description} =
+        $form->{"description_$i"} = $form->quote( $form->{"description_$i"} );
+        if ($desc_disabled){
+            $column_data{description} = qq|<td>$form->{"description_$i"} |
+             . qq|<input type="hidden" name="description_$i"
+                        value="$form->{"description_$i"}" /></td>|
+        } else {
+            if (
+                ( $rows = $form->numtextrows( $form->{"description_$i"}, 46, 6 ) ) >
+                1 )
+            {
+                    $column_data{description} =
+qq|<td><textarea name="description_$i" rows=$rows cols=46 wrap=soft>$form->{"description_$i"}</textarea></td>|;
+            }
+            else {
+                 $column_data{description} =
 qq|<td><input name="description_$i" $desc_disabled size=48 value="$form->{"description_$i"}"></td>|;
+            }
         }
 
         for (qw(partnumber sku unit)) {

diff --git a/bin/oe.pl b/bin/oe.pl
@@ -610,7 +610,8 @@ sub form_header {
     }
     $form->hide_form(qw(entity_control_code meta_number address city));
     $form->hide_form(
-        qw(id type formname media format printed emailed queued vc title discount creditlimit creditremaining tradediscount business recurring form_id nextsub)
+        qw(id type formname media format printed emailed queued vc title discount creditlimit creditremaining tradediscount business recurring form_id nextsub
+   lock_description)
     );
 
     print qq|