From 18e15b44b4dda09f5d5a8a416e3f6524fb8b2a64 Mon Sep 17 00:00:00 2001
From: einhverfr <einhverfr@4979c152-3d1c-0410-bac9-87ea11338e46>
Date: Sun, 18 Nov 2007 20:35:31 +0000
Subject: More customer/vendor screen/stored proc fixes.  Note that since
 locations are mapped many<->many with companies and persons, I have moved the
 location class foreign key into the mapping tables.

git-svn-id: https://ledger-smb.svn.sourceforge.net/svnroot/ledger-smb/trunk@1879 4979c152-3d1c-0410-bac9-87ea11338e46
---
 scripts/customer.pl | 39 +++++++++++++++++++++++----------------
 scripts/payment.pl  |  4 ++--
 2 files changed, 25 insertions(+), 18 deletions(-)

(limited to 'scripts')

diff --git a/scripts/customer.pl b/scripts/customer.pl
index 7fc238da..76fa8a56 100644
--- a/scripts/customer.pl
+++ b/scripts/customer.pl
@@ -44,14 +44,14 @@ of the customer informations.
 sub get {
     
     my ($request) = @_;
-    my $customer = LedgerSMB::DBObject::Company->new(base => $request, copy => 'all');
+    my $customer = LedgerSMB::DBObject::Customer->new(base => $request, copy => 'all');
     
     $customer->set( entity_class=> '2' );
     my $result = $customer->get();
     
     my $template = LedgerSMB::Template->new( user => $user, 
-	template => 'Customer/customer.html', language => $user->{language}, 
-        format => 'html');
+	template => 'Customer/customer', language => $user->{language}, 
+        format => 'HTML');
     $template->render($results);
         
 }
@@ -70,12 +70,16 @@ This method creates a blank screen for entering a customer's information.
 
 sub add {
     my ($request) = @_;
-    my $customer = LedgerSMB::DBObject::Company->new(base => $request, copy => 'all');
+    my $customer = LedgerSMB::DBObject::Customer->new(base => $request, copy => 'all');
     $customer->set(entity_class=>2);
-    my $template = LedgerSMB::Template->new( user => $user, 
-	template => 'Customer/customer.html', language => $user->{language}, 
-        format => 'html');
-    $template->render($results);
+    my $template = LedgerSMB::Template->new( 
+	user => $user, 
+	template => 'customer', 
+	path => 'UI/Customer',
+	locale => $request->{_locale}, 
+        format => 'HTML');
+    $request->{script} = 'Customer/customer';
+    $template->render($request);
 }
 
 =pod
@@ -100,13 +104,13 @@ sub search {
     if ($request->type() eq 'POST') {
         # assume it's asking us to do the search, now
         
-        my $customer = LedgerSMB::DBObject::Company->new(base => $request, copy => 'all');
+        my $customer = LedgerSMB::DBObject::Customer->new(base => $request, copy => 'all');
         $customer->set(entity_class=>2);
         my $results = $customer->search($customer->{search_pattern});
 
         my $template = LedgerSMB::Template->new( user => $user, 
-    	template => 'Customer/customer.html', language => $user->{language}, 
-            format => 'html');
+    	template => 'Customer/customer', language => $user->{language}, 
+            format => 'HTML');
         $template->render($results);
         
     }
@@ -114,9 +118,12 @@ sub search {
         
         # grab the happy search page out.
         
-        my $template = LedgerSMB::Template->new( user => $user, 
-    	template => 'Customer/customer_search.html', language => $user->{language}, 
-            format => 'html');
+        my $template = LedgerSMB::Template->new( 
+		user => $user,
+		path => 'UI/Customer' ,
+    		template => 'customer_search', 
+		locale => $request->{_locale}, 
+		format => 'HTML');
             
         $template->render();
     }
@@ -151,8 +158,8 @@ sub save {
         my $result = $customer->save();
 
         my $template = LedgerSMB::Template->new( user => $user, 
-    	template => 'Customer/customer.html', language => $user->{language}, 
-            format => 'html');
+    	template => 'Customer/customer', language => $user->{language}, 
+            format => 'HTML');
         $template->render($result);
     } 
     else {
diff --git a/scripts/payment.pl b/scripts/payment.pl
index 01e32fc7..b6dd87d4 100644
--- a/scripts/payment.pl
+++ b/scripts/payment.pl
@@ -157,8 +157,8 @@ my $template;
   $template = LedgerSMB::Template->new(
   user     => $request->{_user},
   locale   => $request->{_locale},
-#  path     => 'UI/payments',
-  path     => 'UI',
+  path     => 'UI/payments',
+#  path     => 'UI',
   template => 'payment1',
   format => 'HTML', );
 $template->render($select);# And finally, Lets print the screen :)
-- 
cgit v1.2.3