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

[..hidden..]

Revision: 6485
          http://sourceforge.net/p/ledger-smb/code/6485
Author:   einhverfr
Date:     2014-01-17 02:59:11 +0000 (Fri, 17 Jan 2014)
Log Message:
-----------

Adding rounded tax module
Correcting namespace handling in LedgerSMB::Tax to make inheritance work in 
this case

Modified Paths:
--------------
    trunk/LedgerSMB/Tax.pm
    trunk/LedgerSMB/Taxes/Simple.pm
    trunk/sql/Pg-database.sql
    trunk/sql/modules/Fixes.sql

Modified: trunk/LedgerSMB/Tax.pm
===================================================================
--- trunk/LedgerSMB/Tax.pm	2014-01-16 13:30:31 UTC (rev 6484)
+++ trunk/LedgerSMB/Tax.pm	2014-01-17 02:59:11 UTC (rev 6485)
@@ -75,7 +75,7 @@
         my $module = $ref->{'taxmodulename'};
         require "LedgerSMB/Taxes/${module}.pm";
         $module =~ s/\//::/g;
-        my $tax = ( eval 'Taxes::' . $module )->new();
+        my $tax = ( eval 'LedgerSMB::Taxes::' . $module )->new();
 
         $tax->pass( $ref->{'pass'} );
         $tax->account($taxaccount);

Modified: trunk/LedgerSMB/Taxes/Simple.pm
===================================================================
--- trunk/LedgerSMB/Taxes/Simple.pm	2014-01-16 13:30:31 UTC (rev 6484)
+++ trunk/LedgerSMB/Taxes/Simple.pm	2014-01-17 02:59:11 UTC (rev 6485)
@@ -24,7 +24,7 @@
 # extract_tax - sets $value to the tax value on a tax-included subtotal
 #
 #====================================================================
-package Taxes::Simple;
+package LedgerSMB::Taxes::Simple;
 
 use Class::Struct;
 use Math::BigFloat;

Modified: trunk/sql/Pg-database.sql
===================================================================
--- trunk/sql/Pg-database.sql	2014-01-16 13:30:31 UTC (rev 6484)
+++ trunk/sql/Pg-database.sql	2014-01-17 02:59:11 UTC (rev 6485)
@@ -2387,9 +2387,8 @@
 
 INSERT INTO taxmodule (
   taxmodule_id, taxmodulename
-  ) VALUES (
-  1, 'Simple'
-);
+  ) VALUES (1, 'Simple'), 
+  (2, 'Rounded');
 
 CREATE TABLE ac_tax_form (
         entry_id int references acc_trans(entry_id) primary key,

Modified: trunk/sql/modules/Fixes.sql
===================================================================
--- trunk/sql/modules/Fixes.sql	2014-01-16 13:30:31 UTC (rev 6484)
+++ trunk/sql/modules/Fixes.sql	2014-01-17 02:59:11 UTC (rev 6485)
@@ -5,10 +5,8 @@
 
 -- Chris Travers
 
--- during 1.4m2
+-- BETA 1-3 (delete a month after Beta 4)
 
--- BETA 1
-
 BEGIN;
 
 CREATE TABLE lsmb_group (
@@ -324,3 +322,8 @@
   from users
  WHERE id NOT IN (select id from lsmb_roles where role_name = lsmb__role_prefix() || 'base_user');
 COMMIT;
+
+BEGIN;
+INSERT INTO taxmodule (taxmodule_id, taxmodulename) values (2, 'Rounded');
+COMMIT;
+-- Beta 4 fixes below

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


------------------------------------------------------------------------------
CenturyLink Cloud: The Leader in Enterprise Cloud Services.
Learn Why More Businesses Are Choosing CenturyLink Cloud For
Critical Workloads, Development Environments & Everything In Between.
Get a Quote or Start a Free Trial Today. 
http://pubads.g.doubleclick.net/gampad/clk?id=119420431&iu=/4140/ostg.clktrk
_______________________________________________
Ledger-smb-commits mailing list
..hidden..
https://lists.sourceforge.net/lists/listinfo/ledger-smb-commits