[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

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



Revision: 4217
          http://ledger-smb.svn.sourceforge.net/ledger-smb/?rev=4217&view=rev
Author:   einhverfr
Date:     2011-12-15 15:16:04 +0000 (Thu, 15 Dec 2011)
Log Message:
-----------
Merging from branches/1.3

Modified Paths:
--------------
    trunk/Changelog
    trunk/LedgerSMB/AA.pm
    trunk/LedgerSMB/Database.pm
    trunk/LedgerSMB/Form.pm
    trunk/LedgerSMB/IC.pm
    trunk/LedgerSMB/RP.pm
    trunk/LedgerSMB/ScriptLib/Company.pm
    trunk/LedgerSMB/Scripts/setup.pm
    trunk/LedgerSMB/Sysconfig.pm
    trunk/LedgerSMB/Template/LaTeX.pm
    trunk/LedgerSMB.pm
    trunk/UI/Contact/search.html
    trunk/UI/form-dynatable.html
    trunk/UI/logout.html
    trunk/UI/taxform/1099-INT-base.tex
    trunk/bin/aa.pl
    trunk/dists/rpm/ledgersmb.spec
    trunk/ledgersmb.conf.default
    trunk/sql/Pg-database.sql
    trunk/sql/modules/Company.sql
    trunk/sql/modules/Roles.sql

Property Changed:
----------------
    trunk/
    trunk/LedgerSMB/Scripts/admin.pm
    trunk/LedgerSMB/Scripts/employee.pm
    trunk/LedgerSMB/Scripts/file.pm
    trunk/LedgerSMB/Scripts/login.pm
    trunk/LedgerSMB/Scripts/menu.pm
    trunk/LedgerSMB/Scripts/payment.pm
    trunk/LedgerSMB/Scripts/setup.pm
    trunk/LedgerSMB/Scripts/taxform.pm
    trunk/sql/upgrade/1.2-1.3-manual.sql


Property changes on: trunk
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/1.3:3711-4192
   + /branches/1.3:3711-4215

Modified: trunk/Changelog
===================================================================
--- trunk/Changelog	2011-12-15 15:07:37 UTC (rev 4216)
+++ trunk/Changelog	2011-12-15 15:16:04 UTC (rev 4217)
@@ -9,6 +9,13 @@
 Initial Release:  Monday, Oct 12 2011
 Supported Presently
 
+Changelog for 1.3.10
+* Fixes for permissions for exchangerate table (Erik H)
+* Fixes for POS cashier permissions.  (Chris T)
+* More Localization Fixes (Herman V)
+* Customer/Vendor Search now shows records without credit accounts (Herman V)
+* Better error handling contrib modules not found (Chris T)
+
 Changelog for 1.3.9
 * More logging enhancements (Herman V)
 * Translation fixes in tax form reports (Chris T)
@@ -20,7 +27,12 @@
 * Corrected error message in old handler (Herman V)
 * Reduced warnings in logs (Herman V and Chris T)
 * Corrected "Not a CODE reference" in payment processing (Herman V)
+* Corrected year/month not working on payment dropdowns (Herman V)
+* Can now be installed via RPM. (Chris T)
 
+Chris T is Chris Travers
+Herman V is Herman Vierendeels
+
 Changelog for 1.3.8:
 * Fixed duplicate key error saving taxes (Herman V)
 * Fixed not null violation when inserting bank acct w/o bic (Chris T)

Modified: trunk/LedgerSMB/AA.pm
===================================================================
--- trunk/LedgerSMB/AA.pm	2011-12-15 15:07:37 UTC (rev 4216)
+++ trunk/LedgerSMB/AA.pm	2011-12-15 15:16:04 UTC (rev 4217)
@@ -453,19 +453,21 @@
            $dbh->prepare($query)->execute(@queryargs)
               || $form->dberror($query);
 
-	   $query="select max(entry_id) from acc_trans;";
-	   my $sth1=$dbh->prepare($query);
-
-	   $sth1->execute();
-
-	   my $entry_id=$sth1->fetchrow()  || $form->dberror($query);	  
-
-           my $report=($taxformfound and $ref->{taxformcheck})?"true":"false";
-
-	   AA->update_ac_tax_form($form,$dbh,$entry_id,$report);
-
+           if($taxformfound)
+           {
+            $query="select max(entry_id) from acc_trans;";
+            my $sth1=$dbh->prepare($query);
+            $sth1->execute();
+            my $entry_id=$sth1->fetchrow()  || $form->dberror($query);
+            my $report=($taxformfound and $ref->{taxformcheck})?"true":"false";
+            AA->update_ac_tax_form($form,$dbh,$entry_id,$report);
+           }
+           else
+           {
+            $logger->debug("skipping ac_tax_form because no tax_form");
+           }
         }
-    }
+    }#foreach
 
     # save taxes
     foreach $ref ( @{ $form->{acc_trans}{taxes} } ) {
@@ -844,6 +846,8 @@
     my $acc_trans_flds;
     my $approved = ($form->{approved}) ? 'TRUE' : 'FALSE';
 
+    #print STDERR localtime()." AA.pm transactions \$approved=$approved\n";
+
     if ( $form->{vc} eq 'vendor' ) {
         $ml      = -1;
         $ARAP    = 'AP';
@@ -1185,6 +1189,7 @@
                    $group_by
 			ORDER BY $sortorder";
     }
+    #print STDERR localtime()." AA.pm transactions query=$query\n";
     my $sth = $dbh->prepare($query);
     $sth->execute(@paidargs) || $form->dberror($query);
 

Modified: trunk/LedgerSMB/Database.pm
===================================================================
--- trunk/LedgerSMB/Database.pm	2011-12-15 15:07:37 UTC (rev 4216)
+++ trunk/LedgerSMB/Database.pm	2011-12-15 15:16:04 UTC (rev 4217)
@@ -351,6 +351,26 @@
    return $retval;
 }
 
+=item $db->server_version();
+
+Connects to the server and returns the version number in x.y.z format.
+
+=cut
+
+sub server_version {
+    my $self = shift @_;
+    my $creds = LedgerSMB::Auth->get_credentials();
+    my $dbh = DBI->connect(
+        "dbi:Pg:dbname=template1", 
+         "$creds->{login}", "$creds->{password}", { AutoCommit => 0 }
+    );
+    my ($version) = $dbh->selectrow_array('SELECT version()');
+    $version =~ /(\d+\.\d+\.\d+)/;
+    my $retval = $1;
+    $dbh->disconnect;
+    return $retval;
+}
+
 =item $db->create();
 
 Creates a database and loads the contrib files.  This is done from template0, 

Modified: trunk/LedgerSMB/Form.pm
===================================================================
--- trunk/LedgerSMB/Form.pm	2011-12-15 15:07:37 UTC (rev 4216)
+++ trunk/LedgerSMB/Form.pm	2011-12-15 15:16:04 UTC (rev 4217)
@@ -196,21 +196,30 @@
 
 sub open_form {
     my ($self) = @_;
+    my @results ;
     if ($self->{form_id} =~ '^\s*$'){
         delete $self->{form_id};
     }
     if (!$ENV{GATEWAY_INTERFACE}){
         return 1;
     }
+    #HV session_id not always set in LedgerSMB/Auth/DB.pm because of mix old,new code-chain?
+    if($self->{session_id})
+    {
     my $sth = $self->{dbh}->prepare('select form_open(?)');
-    #HV session_id not always set in LedgerSMB/Auth/DB.pm because of mix old,new code-chain?
     my $rc=$sth->execute($self->{session_id});#HV ERROR:Invalid session,if count(*) FROM session!=1,multiple login
     if(! $rc)
     {
      $logger->error("select form_open \$self->{form_id}=$self->{form_id} \$self->{session_id}=$self->{session_id} \$rc=$rc,invalid count FROM session?");
      return undef;
     }
-    my @results = $sth->fetchrow_array();
+    @results = $sth->fetchrow_array();
+    }
+    else
+    {
+     $logger->debug("no \$self->{session_id}!");
+     return undef;
+    }
 
     $self->{form_id} = $results[0];
     return $results[0];
@@ -1402,6 +1411,13 @@
     ) or $self->dberror;
     #HV trying to trace DBI->connect statements
     $logger->debug("DBI->connect dbh=$dbh");
+    my $dbi_trace=$LedgerSMB::Sysconfig::DBI_TRACE;
+    if($dbi_trace)
+    {
+     $logger->debug("\$dbi_trace=$dbi_trace");
+     $dbh->trace(split /=/,$dbi_trace,2);#http://search.cpan.org/~timb/DBI-1.616/DBI.pm#TRACING
+    }
+
     $dbh->{pg_enable_utf8} = 1;
 
     # set db options
@@ -3240,22 +3256,22 @@
 
 sub update_defaults {
 
-    my ( $self, $myconfig, $fld, $nocommit) = @_;
+    my ( $self, $myconfig, $fld,$dbh_parm,$nocommit) = @_;
 
     if ( !$self->{dbh} && $self ) {
         $self->db_init($myconfig);
     }
 
-    my $dbh = $self->{dbh};
+    #my $dbh = $self->{dbh};
 
-    if ( !$self ) {
-        $dbh = $_[3];
-    }
+    #if ( !$self ) { #if !$self, previous statement would already have failed!
+    #    $dbh = $_[3];
+    #}
 
     my $query = qq|
 		SELECT value FROM defaults 
 		 WHERE setting_key = ? FOR UPDATE|;
-    my $sth = $dbh->prepare($query);
+    my $sth = $self->{dbh}->prepare($query);
     $sth->execute($fld);
     ($_) = $sth->fetchrow_array();
 
@@ -3379,10 +3395,10 @@
 		   SET value = ?
 		 WHERE setting_key = ?|;
 
-    $sth = $dbh->prepare($query);
+    $sth = $self->{dbh}->prepare($query);
     $sth->execute( $dbvar, $fld ) || $self->dberror($query);
 
-    $dbh->commit if !defined $nocommit;
+    $self->{dbh}->commit if !defined $nocommit;
 
     $var;
 }

Modified: trunk/LedgerSMB/IC.pm
===================================================================
--- trunk/LedgerSMB/IC.pm	2011-12-15 15:07:37 UTC (rev 4216)
+++ trunk/LedgerSMB/IC.pm	2011-12-15 15:16:04 UTC (rev 4217)
@@ -241,8 +241,9 @@
 
 sub save {
     my ( $self, $myconfig, $form ) = @_;
+    my $nocommit=1;
     $form->{partnumber} =
-      $form->update_defaults( $myconfig, "partnumber", $dbh )
+      $form->update_defaults( $myconfig, "partnumber", $dbh,$nocommit)
       if !$form->{partnumber};
 
     ( $form->{inventory_accno} ) = split( /--/, $form->{IC_inventory} );

Modified: trunk/LedgerSMB/RP.pm
===================================================================
--- trunk/LedgerSMB/RP.pm	2011-12-15 15:07:37 UTC (rev 4216)
+++ trunk/LedgerSMB/RP.pm	2011-12-15 15:16:04 UTC (rev 4217)
@@ -2068,8 +2068,8 @@
     }
 
     ( $form->{fromdate}, $form->{todate} ) =
-      $form->from_to( $form->{year}, $form->{month}, $form->{interval} )
-      if $form->{year} && $form->{month};
+      $form->from_to( $form->{fromyear}, $form->{frommonth}, $form->{interval} )
+      if $form->{fromyear} && $form->{frommonth};
 
     if ( $form->{fromdate} ) {
         $where .= " AND ac.transdate >= " . $dbh->quote( $form->{fromdate} );

Modified: trunk/LedgerSMB/ScriptLib/Company.pm
===================================================================
--- trunk/LedgerSMB/ScriptLib/Company.pm	2011-12-15 15:07:37 UTC (rev 4216)
+++ trunk/LedgerSMB/ScriptLib/Company.pm	2011-12-15 15:16:04 UTC (rev 4217)
@@ -380,13 +380,13 @@
 
     my @rows;
     for $ref (@{$company->{search_results}}){
+    if(!$ref->{meta_number}){$ref->{meta_number}='';}
+    my $http_href="$get_url&entity_id=$ref->{entity_id}"."&meta_number=$ref->{meta_number}";
 	push @rows, 
-                {legal_name   => $ref->{legal_name},
+                {legal_name   => {text=>$ref->{legal_name},href=>$http_href},
 		entity_control_code => $ref->{entity_control_code},
 		credit_description => $ref->{credit_description},
-                meta_number   => {text => $ref->{meta_number},
-                                  href => "$get_url&entity_id=$ref->{entity_id}"		                           . "&meta_number=$ref->{meta_number}"
-		                 },
+                meta_number   => {text=>$ref->{meta_number}},
 		business_type => $ref->{business_type},
                 curr          => $ref->{curr},
                 };


Property changes on: trunk/LedgerSMB/Scripts/admin.pm
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/1.3/LedgerSMB/Scripts/admin.pm:3901-4192
/branches/1.3/scripts/admin.pl:3711-3903
   + /branches/1.3/LedgerSMB/Scripts/admin.pm:3901-4215
/branches/1.3/scripts/admin.pl:3711-3903


Property changes on: trunk/LedgerSMB/Scripts/employee.pm
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/1.3/LedgerSMB/Scripts/employee.pm:3712-4192
/branches/1.3/scripts/employee.pl:3842-3843
   + /branches/1.3/LedgerSMB/Scripts/employee.pm:3712-4215
/branches/1.3/scripts/employee.pl:3842-3843


Property changes on: trunk/LedgerSMB/Scripts/file.pm
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/1.3/LedgerSMB/Scripts/file.pm:3711-4192
/branches/1.3/scripts/file.pl:3711-4138
   + /branches/1.3/LedgerSMB/Scripts/file.pm:3711-4215
/branches/1.3/scripts/file.pl:3711-4138


Property changes on: trunk/LedgerSMB/Scripts/login.pm
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/1.3/scripts/login.pl:3711-4192
   + /branches/1.3/LedgerSMB/Scripts/login.pm:4193-4215
/branches/1.3/scripts/login.pl:3711-4192


Property changes on: trunk/LedgerSMB/Scripts/menu.pm
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/1.3/LedgerSMB/Scripts/menu.pm:4155-4192
/branches/1.3/scripts/menu.pl:3711-4192
   + /branches/1.3/LedgerSMB/Scripts/menu.pm:4155-4215
/branches/1.3/scripts/menu.pl:3711-4192


Property changes on: trunk/LedgerSMB/Scripts/payment.pm
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/1.3/LedgerSMB/Scripts/payment.pm:4010-4192
/branches/1.3/scripts/payment.pl:3711-4192
   + /branches/1.3/LedgerSMB/Scripts/payment.pm:4010-4215
/branches/1.3/scripts/payment.pl:3711-4192

Modified: trunk/LedgerSMB/Scripts/setup.pm
===================================================================
--- trunk/LedgerSMB/Scripts/setup.pm	2011-12-15 15:07:37 UTC (rev 4216)
+++ trunk/LedgerSMB/Scripts/setup.pm	2011-12-15 15:16:04 UTC (rev 4217)
@@ -59,6 +59,25 @@
             company_name => $request->{database},
                 password => $creds->{password}}
     );
+    my $server_info = $database->server_version;
+    my @sv_info = split '.', $server_info;
+    if (($sv_info[0] > 9)or ($sv_info[0]  == 9 and $sv_info[1] >= 1)){
+       if (! -f "$ENV{PG_CONTRIB_DIR}/tablefunc.control"){
+            $request->error($request->{_locale}->text(
+                      'Cannot find Contrib scripts in [_1].',
+                      $ENV{PG_CONTRIB_DIR}
+            ));
+       }
+    } else {
+       if (! -f "$ENV{PG_CONTRIB_DIR}/tablefunc.sql"){
+            $request->error($request->{_locale}->text(
+                      'Cannot find Contrib scripts in [_1].',
+                      $ENV{PG_CONTRIB_DIR}
+            ));
+      
+       }
+    }
+    
     my $version_info = $database->get_info();
     if(!$request->{dbh}){$request->{dbh}=$database->{dbh};}#allow upper stack to disconnect dbh when leaving
     $request->{login_name} = $version_info->{username};
@@ -758,7 +777,7 @@
     $database->process_roles('Roles.sql');
     # Credentials set above via environment variables --CT
     #avoid msg commit ineffective with AutoCommit enabled
-    $request->{dbh} = DBI->connect("dbi:Pg:dbname=$request->{database}",{AutoCommit=>0});
+    $request->{dbh} = DBI->connect("dbi:Pg:dbname=$request->{database}",$creds->{login},$creds->{password},{AutoCommit=>0});
     my $dbh = $request->{dbh};
     my $sth = $dbh->prepare(
           'UPDATE defaults SET value = ? WHERE setting_key = ?'


Property changes on: trunk/LedgerSMB/Scripts/setup.pm
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/1.3/LedgerSMB/Scripts/setup.pm:3937-4192
/branches/1.3/scripts/setup.pl:3711-4192
   + /branches/1.3/LedgerSMB/Scripts/setup.pm:3937-4215
/branches/1.3/scripts/setup.pl:3711-4216


Property changes on: trunk/LedgerSMB/Scripts/taxform.pm
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/1.3/scripts/taxform.pl:3711-4192
   + /branches/1.3/LedgerSMB/Scripts/taxform.pm:4193-4215
/branches/1.3/scripts/taxform.pl:3711-4192

Modified: trunk/LedgerSMB/Sysconfig.pm
===================================================================
--- trunk/LedgerSMB/Sysconfig.pm	2011-12-15 15:07:37 UTC (rev 4216)
+++ trunk/LedgerSMB/Sysconfig.pm	2011-12-15 15:16:04 UTC (rev 4217)
@@ -95,6 +95,7 @@
 
 our $no_db_str = 'database';
 our $log_level = 'ERROR';
+our $DBI_TRACE=0;
 # available printers
 our %printer;
 
@@ -102,7 +103,7 @@
 read_config( 'ledgersmb.conf' => %config ) or die;
 # Root variables
 for my $var (
-    qw(pathsep logging log_level check_max_invoices language auth latex
+    qw(pathsep logging log_level DBI_TRACE check_max_invoices language auth latex
     db_autoupdate force_username_case max_post_size decimal_places cookie_name
     return_accno no_db_str tempdir cache_templates)
   )

Modified: trunk/LedgerSMB/Template/LaTeX.pm
===================================================================
--- trunk/LedgerSMB/Template/LaTeX.pm	2011-12-15 15:07:37 UTC (rev 4216)
+++ trunk/LedgerSMB/Template/LaTeX.pm	2011-12-15 15:16:04 UTC (rev 4217)
@@ -144,6 +144,7 @@
 		START_TAG => quotemeta('<?lsmb'),
 		END_TAG => quotemeta('?>'),
 		DELIMITER => ';',
+                ENCODING => 'utf8',
 		DEBUG => ($parent->{debug})? 'dirs': undef,
 		DEBUG_FORMAT => '',
 		}) || throw Error::Simple Template::Latex->error(); 
@@ -151,7 +152,7 @@
 		$source, 
 		{%$cleanvars, %$LedgerSMB::Template::TTI18N::ttfuncs,
 			'escape' => \&preprocess},
-		"$parent->{outputfile}.$format", binmode => 1)) {
+		"$parent->{outputfile}.$format", {binmode => 1})) {
 		throw Error::Simple $template->error();
 	}
 	if (lc $format eq 'dvi') {

Modified: trunk/LedgerSMB.pm
===================================================================
--- trunk/LedgerSMB.pm	2011-12-15 15:07:37 UTC (rev 4216)
+++ trunk/LedgerSMB.pm	2011-12-15 15:16:04 UTC (rev 4217)
@@ -848,7 +848,12 @@
         "dbi:Pg:dbname=$dbname", "$creds->{login}", "$creds->{password}", { AutoCommit => 0 }
     ); 
     $logger->debug("DBI->connect dbh=$self->{dbh}");
-     #my $dbh = $self->{dbh};
+    my $dbi_trace=$LedgerSMB::Sysconfig::DBI_TRACE;
+    if($dbi_trace)
+    {
+     $logger->debug("\$dbi_trace=$dbi_trace");
+     $self->{dbh}->trace(split /=/,$dbi_trace,2);#http://search.cpan.org/~timb/DBI-1.616/DBI.pm#TRACING
+    }
 
 
     if (($self->{script} eq 'login.pl') && ($self->{action} eq 
@@ -856,7 +861,6 @@
         if (!$self->{dbh}){
             $self->{_auth_error} = $DBI::errstr;
         }
-
         return;
     }
     elsif (!$self->{dbh}){

Modified: trunk/UI/Contact/search.html
===================================================================
--- trunk/UI/Contact/search.html	2011-12-15 15:07:37 UTC (rev 4216)
+++ trunk/UI/Contact/search.html	2011-12-15 15:16:04 UTC (rev 4217)
@@ -106,7 +106,7 @@
                 <td>
                    <?lsmb text('From'); ' '; INCLUDE input element_data={
   size = '11', name = 'startdatefrom', class = 'date', title = user.dateformat};
-                          text('To'); ' '; INCLUDE input element_data={
+                          text('Date to'); ' '; INCLUDE input element_data={
   size = '11', name = 'startdateto', class = 'date', title = user.dateformat} ?>
                 </td>
               </tr>

Modified: trunk/UI/form-dynatable.html
===================================================================
--- trunk/UI/form-dynatable.html	2011-12-15 15:07:37 UTC (rev 4216)
+++ trunk/UI/form-dynatable.html	2011-12-15 15:16:04 UTC (rev 4217)
@@ -67,6 +67,7 @@
 	PROCESS input element_data=row.$column.input ?>
     <?lsmb ELSIF row.$column.select.defined;
 	PROCESS select element_data=row.$column.select ?>
+    <?lsmb ELSIF row.$column.text.defined;row.$column.text ?>
     <?lsmb ELSE; row.$column; END ?>
   </<?lsmb s ?>>
   <?lsmb END ?>

Modified: trunk/UI/logout.html
===================================================================
--- trunk/UI/logout.html	2011-12-15 15:07:37 UTC (rev 4216)
+++ trunk/UI/logout.html	2011-12-15 15:16:04 UTC (rev 4217)
@@ -1,7 +1,7 @@
 <?lsmb INCLUDE 'ui-header.html' include_script = scripts ?> 
 <?lsmb PROCESS elements.html ?> 
 <body>
-<h1 class="info">Logout Successful</h1>
+<h1 class="info"><?lsmb text('Logout Successful')?></h1>
 <p><a href="login.pl"><?lsmb text('Return to the login screen.') ?></a>
 </body>
 </html>

Modified: trunk/UI/taxform/1099-INT-base.tex
===================================================================
--- trunk/UI/taxform/1099-INT-base.tex	2011-12-15 15:07:37 UTC (rev 4216)
+++ trunk/UI/taxform/1099-INT-base.tex	2011-12-15 15:16:04 UTC (rev 4217)
@@ -1,27 +1,43 @@
-<?lsmb BLOCK taxform ?>
-\begin{textblock}{4}[0,1](0.5, 1)
-<?lsmb company_name ?>
-<?lsmb company_address ?>
+\documentclass[usletter]{article}
+\usepackage{textpos}
+\usepackage[top=0.0in, bottom=0in, left=0in, right=0in]{geometry}
+\setlength{\parindent}{0pt}
+\setlength{\TPHorizModule}{1in}
+\setlength{\TPVertModule}{1in}
+<?lsmb BLOCK taxformpart ?>
+\begin{textblock}{4}[0,1](1, 1.5)
+<?lsmb company_name ?>\\
+<?lsmb company_address ?>\\
 Tel: <?lsmb company_telephone ?>
 \end{textblock}
 
-\begin{textblock}{2}[0,1](0.5, 2)
+\begin{textblock}{2}[0,1](1, 3.5)
 <?lsmb my_tax_code ?>
 \end{textblock}
 
-\begin{textblock}{2}[0,1](2.5, 2)
+\begin{textblock}{2}[0,1](3, 3.5)
 <?lsmb taxnumber ?>
 \end{textblock}
 
-\begin{textblock}{4}[0,1](0.5, 2.5)
-<?lsmb pay_to_name ?>\\
-<?lsmb IF line_one; line_one ?> \\ <?lsmb END -?>
-<?lsmb IF line_two; line_two ?> \\ <? END -?>
-<?lsmb IF line_three; line_three ?> \\ <? END -?>
+\begin{textblock}{4}[0,1](1, 4)
+<?lsmb legal_name ?>\\
+<?lsmb IF street1 ?><?lsmb street1 ?>\\ <?lsmb END ?>
+<?lsmb IF street2 ?><?lsmb street2 ?>\\ <?lsmb END ?>
+<?lsmb IF street3 ?><?lsmb street3 ?>\\ <?lsmb END ?>
 <?lsmb city ?>, <?lsmb state ?> <?lsmb mail_code ?>
 \end{textblock}
 
 \begin{textblock}{2}[0,1](4.5, 1.5)
-<?lsmb total ?>
+<?lsmb total_sum ?>
 \end{textblock}
-<?lsmb END # Block ?>
+<?lsmb END # Block taxformpart ?>
+<?lsmb BLOCK taxform ?>
+<?lsmb PROCESS taxformpart ?>
+\clearpage
+<?lsmb PROCESS taxformpart ?>
+\clearpage
+<?lsmb PROCESS taxformpart ?>
+\clearpage
+<?lsmb PROCESS taxformpart ?>
+\clearpage
+<?lsmb END #BLOCK taxform ?>

Modified: trunk/bin/aa.pl
===================================================================
--- trunk/bin/aa.pl	2011-12-15 15:07:37 UTC (rev 4216)
+++ trunk/bin/aa.pl	2011-12-15 15:16:04 UTC (rev 4217)
@@ -1726,7 +1726,7 @@
 	<tr>
 	  <th align=right nowrap>| . $locale->text('From') . qq|</th>
 	  <td><input class="date" name=transdatefrom size=11 title="$myconfig{dateformat}"></td>
-	  <th align=right>| . $locale->text('To') . qq|</th>
+	  <th align=right>| . $locale->text('Date to') . qq|</th>
 	  <td><input class="date" name=transdateto size=11 title="$myconfig{dateformat}"></td>
 	</tr>
 	$selectfrom

Modified: trunk/dists/rpm/ledgersmb.spec
===================================================================
--- trunk/dists/rpm/ledgersmb.spec	2011-12-15 15:07:37 UTC (rev 4216)
+++ trunk/dists/rpm/ledgersmb.spec	2011-12-15 15:16:04 UTC (rev 4217)
@@ -1,7 +1,7 @@
 # RPM spec written for and tested on CentOS 4 and CentOS 5 
 Summary: LedgerSMB - Open Source accounting software
 Name: ledgersmb
-Version: 1.3.4
+Version: 1.3.9
 Release: 1
 License: GPL
 URL: http://www.ledgersmb.org/
@@ -144,8 +144,8 @@
 
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/*.conf
 
-%doc doc/{COPYRIGHT,faq.html,LedgerSMB-manual.pdf,README,release_notes}
-%doc BUGS Changelog CONTRIBUTORS INSTALL LICENSE README.translations UPGRADE
+%doc doc/{COPYRIGHT,faq.html,LedgerSMB-manual.pdf,release_notes}
+%doc Changelog CONTRIBUTORS INSTALL LICENSE README.translations UPGRADE
 
 
 %changelog

Modified: trunk/ledgersmb.conf.default
===================================================================
--- trunk/ledgersmb.conf.default	2011-12-15 15:07:37 UTC (rev 4216)
+++ trunk/ledgersmb.conf.default	2011-12-15 15:16:04 UTC (rev 4217)
@@ -7,6 +7,8 @@
 language : 
 
 log_level : ERROR
+#DBI_TRACE : 1=/tmp/dbi.trace
+DBI_TRACE : 0
 # For Windows, uncomment the pathsep line:
 # pathsep : ;
 

Modified: trunk/sql/Pg-database.sql
===================================================================
--- trunk/sql/Pg-database.sql	2011-12-15 15:07:37 UTC (rev 4216)
+++ trunk/sql/Pg-database.sql	2011-12-15 15:16:04 UTC (rev 4217)
@@ -1506,7 +1506,9 @@
 COMMENT ON TABLE ar IS
 $$ Summary/header information for AR transactions and sales invoices.
 Note that some constraints here are hard to enforce because we haven not gotten 
-to rewriting the relevant code here.$$;
+to rewriting the relevant code here.
+HV TODO drop entity_id
+$$;
 
 COMMENT ON COLUMN ar.invnumber IS
 $$ Text identifier for the invoice.  Must be unique.$$;
@@ -1589,7 +1591,9 @@
 COMMENT ON TABLE ap IS
 $$ Summary/header information for AP transactions and vendor invoices.
 Note that some constraints here are hard to enforce because we haven not gotten 
-to rewriting the relevant code here.$$;
+to rewriting the relevant code here.
+HV TODO drop entity_id
+$$;
 
 COMMENT ON COLUMN ap.invnumber IS
 $$ Text identifier for the invoice.  Must be unique.$$;
@@ -2127,8 +2131,8 @@
     t_reference := t_row.reference;
 END IF;
 
-INSERT INTO audittrail (trans_id, reference, action, person_id)
-values (t_row.id, t_reference, TG_OP, person__get_my_entity_id());
+INSERT INTO audittrail (trans_id,tablename,reference, action, person_id)
+values (t_row.id,TG_RELNAME,t_reference, TG_OP, person__get_my_entity_id());
 
 return null; -- AFTER TRIGGER ONLY, SAFE
 END;

Modified: trunk/sql/modules/Company.sql
===================================================================
--- trunk/sql/modules/Company.sql	2011-12-15 15:07:37 UTC (rev 4216)
+++ trunk/sql/modules/Company.sql	2011-12-15 15:16:04 UTC (rev 4217)
@@ -202,7 +202,7 @@
  group by id, name, meta_number, curr, parts_id, partnumber, description, unit
  order by meta_number;
 $$ LANGUAGE SQL;
-
+--HV coalesce(ec.entity_class,e.entity_class) in case entity but not yet entity_credit_account
 CREATE OR REPLACE FUNCTION company__search
 (in_account_class int, in_contact text, in_contact_info text[], 
 	in_meta_number text, in_address text, in_city text, in_state text, 
@@ -235,7 +235,7 @@
                       SELECT * from entity_credit_account
                        WHERE in_meta_number IS NULL) ec ON (ec.entity_id = e.id)
 		LEFT JOIN business b ON (ec.business_id = b.id)
-		WHERE ec.entity_class = in_account_class
+		WHERE coalesce(ec.entity_class,e.entity_class) = in_account_class
 			AND (c.id IN (select company_id FROM company_to_contact
 				WHERE contact ILIKE ALL(t_contact_info))
 				OR '' ILIKE ALL(t_contact_info))

Modified: trunk/sql/modules/Roles.sql
===================================================================
--- trunk/sql/modules/Roles.sql	2011-12-15 15:07:37 UTC (rev 4216)
+++ trunk/sql/modules/Roles.sql	2011-12-15 15:16:04 UTC (rev 4217)
@@ -1,5 +1,13 @@
 GRANT ALL ON SCHEMA public TO public; -- required for Pg 8.2
 
+-- Exchange rate creation (required insert and update on 'exchangerate' table)
+
+CREATE ROLE "lsmb_<?lsmb dbname ?>__exchangerate_edit"
+WITH INHERIT NOLOGIN;
+
+GRANT INSERT, UPDATE ON exchangerate
+TO "lsmb_<?lsmb dbname ?>__exchangerate_edit";
+
 -- Basic file attachments
 
 CREATE ROLE "lsmb_<?lsmb dbname ?>__file_read"
@@ -40,6 +48,7 @@
 GRANT ALL ON file_base_id_seq TO "lsmb_<?lsmb dbname ?>__file_attach_tx";
 GRANT ALL ON file_base_id_seq TO "lsmb_<?lsmb dbname ?>__file_attach_part";
 GRANT ALL ON file_base_id_seq TO "lsmb_<?lsmb dbname ?>__file_attach_order";
+
 -- Contacts
 
 CREATE ROLE "lsmb_<?lsmb dbname ?>__contact_read"
@@ -207,7 +216,8 @@
 -- AR
 CREATE ROLE "lsmb_<?lsmb dbname ?>__ar_transaction_create"
 WITH INHERIT NOLOGIN
-IN ROLE "lsmb_<?lsmb dbname ?>__contact_read";
+IN ROLE "lsmb_<?lsmb dbname ?>__contact_read",
+"lsmb_<?lsmb dbname ?>__exchangerate_edit";
 
 GRANT INSERT ON ar, invoice_note 
 TO "lsmb_<?lsmb dbname ?>__ar_transaction_create";
@@ -318,7 +328,8 @@
 
 CREATE ROLE "lsmb_<?lsmb dbname ?>__sales_order_create"
 WITH INHERIT NOLOGIN
-IN ROLE "lsmb_<?lsmb dbname ?>__contact_read";
+IN ROLE "lsmb_<?lsmb dbname ?>__contact_read",
+"lsmb_<?lsmb dbname ?>__exchangerate_edit";
 
 GRANT INSERT, UPDATE ON oe TO "lsmb_<?lsmb dbname ?>__sales_order_create";
 GRANT ALL ON oe_id_seq TO "lsmb_<?lsmb dbname ?>__sales_order_create";
@@ -337,7 +348,8 @@
 
 CREATE ROLE "lsmb_<?lsmb dbname ?>__sales_quotation_create"
 WITH INHERIT NOLOGIN
-IN ROLE "lsmb_<?lsmb dbname ?>__contact_read";
+IN ROLE "lsmb_<?lsmb dbname ?>__contact_read",
+"lsmb_<?lsmb dbname ?>__exchangerate_edit";
 
 GRANT INSERT, UPDATE ON oe TO "lsmb_<?lsmb dbname ?>__sales_quotation_create";
 GRANT ALL ON oe_id_seq TO "lsmb_<?lsmb dbname ?>__sales_quotation_create";
@@ -396,7 +408,8 @@
 -- AP
 CREATE ROLE "lsmb_<?lsmb dbname ?>__ap_transaction_create"
 WITH INHERIT NOLOGIN
-IN ROLE "lsmb_<?lsmb dbname ?>__contact_read";
+IN ROLE "lsmb_<?lsmb dbname ?>__contact_read",
+"lsmb_<?lsmb dbname ?>__exchangerate_edit";
 
 GRANT SELECT, INSERT ON ap, invoice_note 
 TO "lsmb_<?lsmb dbname ?>__ap_transaction_create";
@@ -503,7 +516,8 @@
 
 CREATE ROLE "lsmb_<?lsmb dbname ?>__purchase_order_create"
 WITH INHERIT NOLOGIN
-IN ROLE "lsmb_<?lsmb dbname ?>__contact_read";
+IN ROLE "lsmb_<?lsmb dbname ?>__contact_read",
+"lsmb_<?lsmb dbname ?>__exchangerate_edit";
 
 GRANT INSERT, UPDATE ON oe TO "lsmb_<?lsmb dbname ?>__purchase_order_create";
 GRANT INSERT, UPDATE ON orderitems TO "lsmb_<?lsmb dbname ?>__purchase_order_create";
@@ -523,7 +537,8 @@
 
 CREATE ROLE "lsmb_<?lsmb dbname ?>__rfq_create"
 WITH INHERIT NOLOGIN
-IN ROLE "lsmb_<?lsmb dbname ?>__contact_read";
+IN ROLE "lsmb_<?lsmb dbname ?>__contact_read",
+"lsmb_<?lsmb dbname ?>__exchangerate_edit";
 
 GRANT INSERT, UPDATE ON oe TO "lsmb_<?lsmb dbname ?>__rfq_create";
 GRANT INSERT, UPDATE ON orderitems TO "lsmb_<?lsmb dbname ?>__rfq_create";
@@ -580,6 +595,8 @@
 WITH INHERIT NOLOGIN
 IN ROLE "lsmb_<?lsmb dbname ?>__contact_read";
 
+GRANT "lsmb_<?lsmb dbname ?>__ar_transaction_create" TO "lsmb_<?lsmb dbname ?>__pos_enter";
+
 GRANT SELECT, INSERT ON invoice TO "lsmb_<?lsmb dbname ?>__pos_enter";
 GRANT INSERT ON inventory TO "lsmb_<?lsmb dbname ?>__pos_enter";
 GRANT INSERT ON ar TO "lsmb_<?lsmb dbname ?>__pos_enter";


Property changes on: trunk/sql/upgrade/1.2-1.3-manual.sql
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/1.3/sql/upgrade/1.2-1.3-manual.sql:3712-4192
/branches/1.3/sql/upgrade/1.2-1.3.sql:3711-3851
/trunk/sql/upgrade/1.2-1.3.sql:858-3710
   + /branches/1.3/sql/upgrade/1.2-1.3-manual.sql:3712-4215
/branches/1.3/sql/upgrade/1.2-1.3.sql:3711-3851
/trunk/sql/upgrade/1.2-1.3.sql:858-3710

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