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

[..hidden..]

Revision: 2619
          http://ledger-smb.svn.sourceforge.net/ledger-smb/?rev=2619&view=rev
Author:   einhverfr
Date:     2009-06-04 00:48:34 +0000 (Thu, 04 Jun 2009)

Log Message:
-----------
Last tax form changes in place

Modified Paths:
--------------
    trunk/UI/taxform/add_taxform.html
    trunk/sql/modules/Roles.sql

Added Paths:
-----------
    trunk/LedgerSMB/DBObject/TaxForm.pm

Removed Paths:
-------------
    trunk/LedgerSMB/TaxForm.pm

Copied: trunk/LedgerSMB/DBObject/TaxForm.pm (from rev 2618, trunk/LedgerSMB/TaxForm.pm)
===================================================================
--- trunk/LedgerSMB/DBObject/TaxForm.pm	                        (rev 0)
+++ trunk/LedgerSMB/DBObject/TaxForm.pm	2009-06-04 00:48:34 UTC (rev 2619)
@@ -0,0 +1,37 @@
+#! /usr/bin/perl
+
+package LedgerSMB::DBObject::TaxForm;
+
+use base qw(LedgerSMB::DBObject);
+
+use strict;
+
+sub save 
+{
+  
+    my ($self) = shift @_;
+    my ($ref) = $self->exec_method(funcname => 'tax_form__save');
+    $self->{taxform_id} = $ref->{'tax_form__save'};
+  
+    $self->{dbh}->commit();
+
+    
+}
+
+sub get_metadata
+{
+    my ($self) = @_;
+
+    @{$self->{countries}} = $self->exec_method(
+                funcname => 'location_list_country'
+    );
+
+    my ($ref) = $self->call_procedure(procname => 'setting_get', args => ['default_country']);
+    $self->{default_country} = $ref->{setting_get};
+}
+
+1;
+   
+
+    
+1;

Deleted: trunk/LedgerSMB/TaxForm.pm
===================================================================
--- trunk/LedgerSMB/TaxForm.pm	2009-06-04 00:24:23 UTC (rev 2618)
+++ trunk/LedgerSMB/TaxForm.pm	2009-06-04 00:48:34 UTC (rev 2619)
@@ -1,37 +0,0 @@
-#! /usr/bin/perl
-
-package LedgerSMB::DBObject::TaxForm;
-
-use base qw(LedgerSMB::DBObject);
-
-use strict;
-
-sub save 
-{
-  
-    my ($self) = shift @_;
-    my ($ref) = $self->execute_method(funcname => 'tax_form__save');
-    $self->{taxform_id} = $ref->{'tax_form__save'};
-  
-    $self->{dbh}->commit();
-
-    
-}
-
-sub get_metadata
-{
-    my ($self) = @_;
-
-    @{$self->{countries}} = $self->exec_method(
-                funcname => 'location_list_country'
-    );
-
-    my ($ref) = $self->call_procedure(procname => 'setting_get', args => ['default_country']);
-    $self->{default_country} = $ref->{setting_get};
-}
-
-1;
-   
-
-    
-1;

Modified: trunk/UI/taxform/add_taxform.html
===================================================================
--- trunk/UI/taxform/add_taxform.html	2009-06-04 00:24:23 UTC (rev 2618)
+++ trunk/UI/taxform/add_taxform.html	2009-06-04 00:48:34 UTC (rev 2619)
@@ -16,7 +16,7 @@
 
 <?lsmb IF countries ?>
  <?lsmb PROCESS select element_data = {
-		name = "country_code"
+		name = "country_id"
 		default_values = [default_country]
 		options = countries
 		value_attr = "id"
@@ -31,10 +31,10 @@
 <div class="labelledinput">
   
      <?lsmb PROCESS input element_data = {
-	name = "taxform_name"
+	name = "form_name"
 	type = "text"
-	value = taxform_name
-	label = "Description"
+	value = form_name
+	label = text("Description:")
 	size = '15'
                                          } 
      ?>

Modified: trunk/sql/modules/Roles.sql
===================================================================
--- trunk/sql/modules/Roles.sql	2009-06-04 00:24:23 UTC (rev 2618)
+++ trunk/sql/modules/Roles.sql	2009-06-04 00:48:34 UTC (rev 2619)
@@ -1235,7 +1235,9 @@
 WITH INHERIT NOLOGIN;
 
 GRANT ALL ON country_tax_form TO "lsmb_<?lsmb dbname ?>__save_tax_form";
+GRANT ALL ON country_tax_form_id_seq TO "lsmb_<?lsmb dbname ?>__save_tax_form";
 
+
 CREATE ROLE "lsmb_<?lsmb dbname ?>__edit_template"
 WITH INHERIT NOLOGIN;
 


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