Adds add_co_code and moves to RAISE EXCEPTION for errors which prevent going forward

git-svn-id: https://ledger-smb.svn.sourceforge.net/svnroot/ledger-smb/trunk@2378 4979c152-3d1c-0410-bac9-87ea11338e46

4 files changed, 49 insertions, 1 deletions

diff --git a/LedgerSMB/GL.pm b/LedgerSMB/GL.pm
index 22976c2d..c399b1cf 100644
--- a/LedgerSMB/GL.pm
+++ b/LedgerSMB/GL.pm
@@ -564,6 +564,7 @@ sub transaction {
         my $results = $sth->fetchall_hashref('setting_key');
         $form->{closedto} = $results->{'closedto'}->{'value'};
         $form->{revtrans} = $results->{'revtrans'}->{'value'};
+        #$form->{separate_duties} = $results->{'separate_duties'}->{'value'};
         $sth->finish;
 
         $query = qq|SELECT g.*, d.description AS department
diff --git a/UI/Contact/contact.css b/UI/Contact/contact.css
index 2f0575df..ff0e3903 100644
--- a/UI/Contact/contact.css
+++ b/UI/Contact/contact.css
@@ -31,3 +31,29 @@ div.note_contents {
 div label {
 	margin-left: 1em;
 }
+
+/* This shouldnot go in SVN trunk */
+#company_div .note_contents {
+	display: none;
+}
+
+table {
+	width: 100%;
+}
+
+#credit-row { 
+	display: none;
+}
+
+#discount-gifi-row {
+	display: none;
+}
+
+#line-two {
+	display: none;
+}
+
+#line-three {
+	display: none;
+}
+
diff --git a/UI/Contact/contact.html b/UI/Contact/contact.html
index 83d63c1a..9aeaad82 100644
--- a/UI/Contact/contact.html
+++ b/UI/Contact/contact.html
@@ -234,6 +234,9 @@ problems with multi-word single-quoted constructs in PI tags. -CT  -->
 </div>
 <?lsmb END ?>
 </div>
+<?lsmb IF entity_id;
+INCLUDE 'rates_div.html';
+END -?>
 <?lsmb IF entity_id ?>
 <div id="credit_div">
 <div class="listtop"><strong>Accounts</strong></div>
@@ -545,6 +548,24 @@ problems with multi-word single-quoted constructs in PI tags. -CT  -->
 			type = "text",
 			size = "20"
 		} ?>
+		<!-- 
+			if the following button and script show up in svn 
+			/trunk, please remove them.  -CT -->
+		<script type="text/javascript">
+			function show_lines(){
+				var e;
+				e = document.getElementById('line-two');
+				e.style.display = 'inline';
+				e = document.getElementById('line-three');
+				e.style.display = 'inline';
+				e = document.getElementById('show-lines-button');
+				e.style.display = 'none';
+				return false;
+			}
+		</script>
+		<button onclick="javascript: return show_lines()" 
+			id="show-lines-button" type="button"><?lsmb text('Show More Lines') ?>
+		</button> <!-- end custom section -->
 	</div>
 	<div> 
 		<?lsmb PROCESS input element_data = {
diff --git a/scripts/drafts.pl b/scripts/drafts.pl
index f7771f30..7d6008ec 100644
--- a/scripts/drafts.pl
+++ b/scripts/drafts.pl
@@ -11,7 +11,7 @@ sub search {
     $request->{class_types} = [
 	{text => $request->{_locale}->text('AR'),  value => 'ar'},
 	{text => $request->{_locale}->text('AP'),  value => 'ap'},
-	{text => $request->{_locale}->text('GL'),  value => 'GL'},
+	{text => $request->{_locale}->text('GL'),  value => 'gl'},
     ];
     my $template = LedgerSMB::Template->new(
         user =>$request->{_user},