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

[..hidden..]

Revision: 3194
          http://ledger-smb.svn.sourceforge.net/ledger-smb/?rev=3194&view=rev
Author:   einhverfr
Date:     2011-05-31 17:17:40 +0000 (Tue, 31 May 2011)

Log Message:
-----------
Committing John's report patch

Modified Paths:
--------------
    trunk/UI/rp-email.html
    trunk/bin/rp.pl
    trunk/sql/Pg-database.sql

Modified: trunk/UI/rp-email.html
===================================================================
--- trunk/UI/rp-email.html	2011-05-31 17:16:14 UTC (rev 3193)
+++ trunk/UI/rp-email.html	2011-05-31 17:17:40 UTC (rev 3194)
@@ -20,11 +20,8 @@
 	<tr>
 	  <th align="right" nowrap="nowrap"><?lsmb text('Subject') ?></th>
 	  <td><?lsmb PROCESS input element_data={name => 'subject', size=> '30', value => form.subject} ?></td>
-<?lsmb IF user.role == 'admin' OR user.role == 'manager' ?>
 	  <th align="right" nowrap="nowrap"><?lsmb text('Bcc') ?></th>
-	  <td><?lsmb PROCESS input element_data={name => 'bcc', size=> '30', value => form.bcc} ?></td><?lsmb
-ELSE ?><th> </th><td> </td><?lsmb
-END ?>
+	  <td><?lsmb PROCESS input element_data={name => 'bcc', size=> '30', value => form.bcc} ?></td>
 	</tr>
       </table>
     </td>

Modified: trunk/bin/rp.pl
===================================================================
--- trunk/bin/rp.pl	2011-05-31 17:16:14 UTC (rev 3193)
+++ trunk/bin/rp.pl	2011-05-31 17:17:40 UTC (rev 3194)
@@ -1413,7 +1413,7 @@
 
     &print_options;
 
-    for (qw(email cc bcc subject message type sendmode format action nextsub)) {
+    for (qw(subject message type sendmode format action nextsub)) {
         delete $form->{$_};
     }
 

Modified: trunk/sql/Pg-database.sql
===================================================================
--- trunk/sql/Pg-database.sql	2011-05-31 17:16:14 UTC (rev 3193)
+++ trunk/sql/Pg-database.sql	2011-05-31 17:17:40 UTC (rev 3194)
@@ -940,8 +940,9 @@
         emd.creditlimit,
         emd.terms,
         emd.meta_number as customernumber,
-        emd.cc,
-        emd.bcc,
+        ece.contact as email,
+        ecc.contact as cc,
+        ecb.contact as bcc,
         emd.business_id,
         emd.language_code,
         emd.pricegroup_id,
@@ -954,6 +955,9 @@
     FROM entity_credit_account emd 
     LEFT JOIN entity_bank_account eba on emd.entity_id = eba.entity_id
     Left join entity_note ein on ein.ref_key = emd.entity_id
+    LEFT JOIN eca_to_contact ece ON emd.id = ece.credit_id AND ece.contact_class_id = 12
+    LEFT JOIN eca_to_contact ecc ON emd.id = ecc.credit_id AND ecc.contact_class_id = 13
+    LEFT JOIN eca_to_contact ecb ON emd.id = ecb.credit_id AND ecb.contact_class_id = 14
     join company c on c.entity_id = emd.entity_id
     join entity e on c.entity_id = e.id
     where emd.entity_class = 2;


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