SF.net SVN: ledger-smb:[4885] trunk

[..hidden..]

Revision: 4885
          http://ledger-smb.svn.sourceforge.net/ledger-smb/?rev=4885&view=rev
Author:   einhverfr
Date:     2012-06-11 02:08:52 +0000 (Mon, 11 Jun 2012)
Log Message:
-----------
Transaction description added to invoice screens

Modified Paths:
--------------
    trunk/Changelog
    trunk/LedgerSMB/IR.pm
    trunk/LedgerSMB/IS.pm
    trunk/bin/arap.pl
    trunk/bin/ir.pl
    trunk/bin/is.pl

Modified: trunk/Changelog
===================================================================
--- trunk/Changelog	2012-06-10 10:56:05 UTC (rev 4884)
+++ trunk/Changelog	2012-06-11 02:08:52 UTC (rev 4885)
@@ -17,7 +17,7 @@
 * invoice.unit is now unbounded numeric to reduce errors (Chris T, 3516235)
 * Invoices with inventory subject to draft/vouchers workflows (Chris T)
 * Added Equity (Temp) account type (Chris T)
-* Added description field to AR/AP transaction screen (Chris T)
+* Added description field to transaction and invoice screens (Chris T)
 * Removed ability to repost/delete transactions (Chris T)
 
 New RESTful Web Services Framework

Modified: trunk/LedgerSMB/IR.pm
===================================================================
--- trunk/LedgerSMB/IR.pm	2012-06-10 10:56:05 UTC (rev 4884)
+++ trunk/LedgerSMB/IR.pm	2012-06-11 02:08:52 UTC (rev 4885)
@@ -750,6 +750,7 @@
 		   SET invnumber = ?,
 		       ordnumber = ?,
 		       quonumber = ?,
+                       description = ?,
 		       transdate = ?,
 		       amount = ?,
 		       netamount = ?,
@@ -771,7 +772,7 @@
     $sth = $dbh->prepare($query);
     $sth->execute(
         $form->{invnumber},     $form->{ordnumber},     $form->{quonumber},
-        $form->{transdate},     $invamount,
+        $form->{description},   $form->{transdate},     $invamount,
         $invnetamount,          $form->{paid},          $form->{datepaid},
         $form->{duedate},       $form->{shippingpoint}, $form->{shipvia},
         $form->{taxincluded},   $form->{notes},         $form->{intnotes},
@@ -1066,7 +1067,7 @@
 			       a.ordnumber, a.quonumber, a.paid, a.taxincluded,
 			       a.notes, a.intnotes, a.curr AS currency, 
 			       a.entity_credit_account as vendor_id, a.language_code, a.ponumber,
-			       a.on_hold, a.reverse
+			       a.on_hold, a.reverse, a.description
 			  FROM ap a
 			 WHERE id = ?|;
         $sth = $dbh->prepare($query);

Modified: trunk/LedgerSMB/IS.pm
===================================================================
--- trunk/LedgerSMB/IS.pm	2012-06-10 10:56:05 UTC (rev 4884)
+++ trunk/LedgerSMB/IS.pm	2012-06-11 02:08:52 UTC (rev 4885)
@@ -1606,6 +1606,7 @@
 		       invnumber = ?,
 		       ordnumber = ?,
 		       quonumber = ?,
+                       description = ?,
 		       transdate = ?,
 		       entity_credit_account = ?,
 		       amount = ?,
@@ -1631,7 +1632,8 @@
     $sth = $dbh->prepare($query);
     $sth->execute(
         $form->{invnumber},     $form->{ordnumber},
-        $form->{quonumber},     $form->{transdate} || 'now',
+        $form->{quonumber},     $form->{description}, 
+        $form->{transdate} || 'now',
         $form->{customer_id},   $invamount,
         $invnetamount,          $form->{paid},
         $form->{datepaid} || 'now',      $form->{duedate} || 'now',
@@ -1926,7 +1928,7 @@
 			          a.person_id, e.name AS employee, a.till, 
 			          a.reverse,
 			          a.language_code, a.ponumber,
-			          a.on_hold
+			          a.on_hold, a.description
 			     FROM ar a
 			LEFT JOIN entity_employee em ON (em.entity_id = a.person_id)
 			INNER JOIN entity e ON e.id = em.entity_id

Modified: trunk/bin/arap.pl
===================================================================
--- trunk/bin/arap.pl	2012-06-10 10:56:05 UTC (rev 4884)
+++ trunk/bin/arap.pl	2012-06-11 02:08:52 UTC (rev 4885)
@@ -523,7 +523,7 @@
 }
 
 sub repost {
-    $form->error($locale->text('Reposting Not Allowed');
+    $form->error($locale->text('Reposting Not Allowed'));
 }
 
 sub schedule {

Modified: trunk/bin/ir.pl
===================================================================
--- trunk/bin/ir.pl	2012-06-10 10:56:05 UTC (rev 4884)
+++ trunk/bin/ir.pl	2012-06-11 02:08:52 UTC (rev 4885)
@@ -514,6 +514,12 @@
 	      </tr>
               $department
 	      $exchangerate
+            <tr>
+               <th align="right" nowrap>| . $locale->text('Description') . qq|
+               </th>
+               <td><input type="text" name="description" size="40" 
+                   value="| . $form->{description} . qq|" /></td>
+            </tr>
 	    </table>
 	  </td>
 	  <td align=right>

Modified: trunk/bin/is.pl
===================================================================
--- trunk/bin/is.pl	2012-06-10 10:56:05 UTC (rev 4884)
+++ trunk/bin/is.pl	2012-06-11 02:08:52 UTC (rev 4885)
@@ -533,6 +533,12 @@
 	      </tr>
 	      $department
 	      $exchangerate
+            <tr>
+               <th align="right" nowrap>| . $locale->text('Description') . qq|
+               </th>
+               <td><input type="text" name="description" size="40" 
+                   value="| . $form->{description} . qq|" /></td>
+            </tr>
 	      <tr>
 		<th align=right nowrap>| . $locale->text('Shipping Point') . qq|</th>
 		<td colspan=3><input name="shippingpoint" size="35" value="$form->{shippingpoint}"></td>

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.