[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
SF.net SVN: ledger-smb:[4679] trunk

Subject: SF.net SVN: ledger-smb:[4679] trunk
From: ..hidden..
Date: Wed, 25 Apr 2012 02:40:05 +0000
Revision: 4679
          http://ledger-smb.svn.sourceforge.net/ledger-smb/?rev=4679&view=rev
Author:   einhverfr
Date:     2012-04-25 02:40:05 +0000 (Wed, 25 Apr 2012)
Log Message:
-----------
Merging from branches/1.3

Modified Paths:
--------------
    trunk/Changelog
    trunk/LedgerSMB/RP.pm
    trunk/LedgerSMB/Scripts/admin.pm
    trunk/bin/rp.pl
    trunk/doc/release_notes

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


Property changes on: trunk
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/1.3:3711-4672
   + /branches/1.3:3711-4678

Modified: trunk/Changelog
===================================================================
--- trunk/Changelog	2012-04-25 02:30:57 UTC (rev 4678)
+++ trunk/Changelog	2012-04-25 02:40:05 UTC (rev 4679)
@@ -54,6 +54,9 @@
 * Changes in <head> element for non-Latin characters, HTML invoices (Erik H)
 * Corrected untranslated string in Contact management screen (Chris T)
 * Corrected permissions issue creating pricelist (Chris T, 3513861)
+* Correcting ordering of aging reports so currencies are clustered (Chris T)
+* Fixed curr totals not showing for aging rpts (Chris T, 3512591, h/t John L)
+* Fixed new user screen not respecting default country (Chris T, 3513760)
 
 Changelog for 1.3.15
 * Update WX POS (almost there) - readme and code  (Andres B, item 3516949)

Modified: trunk/LedgerSMB/RP.pm
===================================================================
--- trunk/LedgerSMB/RP.pm	2012-04-25 02:30:57 UTC (rev 4678)
+++ trunk/LedgerSMB/RP.pm	2012-04-25 02:40:05 UTC (rev 4679)
@@ -1841,7 +1841,7 @@
                        a.curr, a.ponumber, a.notes, c.language_code
 		HAVING sum(p.due) <> 0|;
 
-    $query .= qq| ORDER BY e.legal_name, ctid, curr, $transdate, invnumber|;
+    $query .= qq| ORDER BY curr, e.legal_name, ctid, $transdate, invnumber|;
     $sth = $dbh->prepare($query) || $form->dberror($query);
 
     $sth->execute($form->{todate}, $form->{todate}, $form->{todate}, 


Property changes on: trunk/LedgerSMB/Scripts/account.pm
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/1.3/LedgerSMB/Scripts/account.pm:4369-4672
/branches/1.3/scripts/account.pl:3711-4368
   + /branches/1.3/LedgerSMB/Scripts/account.pm:4369-4678
/branches/1.3/scripts/account.pl:3711-4368

Modified: trunk/LedgerSMB/Scripts/admin.pm
===================================================================
--- trunk/LedgerSMB/Scripts/admin.pm	2012-04-25 02:30:57 UTC (rev 4678)
+++ trunk/LedgerSMB/Scripts/admin.pm	2012-04-25 02:40:05 UTC (rev 4679)
@@ -164,6 +164,8 @@
     #my ($request) = @_;
     my $request = shift @_;
     my $admin = LedgerSMB::DBObject::Admin->new(base=>$request, copy=>'all');
+
+    my $setting = LedgerSMB::Setting->new(base => $request, copy => 'base');
     
     my @sal = $admin->get_salutations();
     
@@ -182,6 +184,7 @@
     
         $template->render(
             {
+                default_country => $setting->get('default_country'),
                 salutations=>..hidden..,
                 roles=>$groups,
                 countries=>$admin->get_countries(),


Property changes on: trunk/LedgerSMB/Scripts/admin.pm
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/1.3/LedgerSMB/Scripts/admin.pm:3901-4672
/branches/1.3/scripts/admin.pl:3711-3903,4273-4287
   + /branches/1.3/LedgerSMB/Scripts/admin.pm:3901-4678
/branches/1.3/scripts/admin.pl:3711-4678


Property changes on: trunk/LedgerSMB/Scripts/customer.pm
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/1.3/LedgerSMB/Scripts/customer.pm:4288-4672
/branches/1.3/scripts/customer.pl:4273-4287
   + /branches/1.3/LedgerSMB/Scripts/customer.pm:4288-4678
/branches/1.3/scripts/customer.pl:4273-4287


Property changes on: trunk/LedgerSMB/Scripts/employee.pm
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/1.3/LedgerSMB/Scripts/employee.pm:3712-4672
/branches/1.3/scripts/employee.pl:3842-3843,4273-4287,4289-4310
   + /branches/1.3/LedgerSMB/Scripts/employee.pm:3712-4678
/branches/1.3/scripts/employee.pl:3842-3843,4273-4287,4289-4310


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


Property changes on: trunk/LedgerSMB/Scripts/journal.pm
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/1.3/LedgerSMB/Scripts/journal.pm:4288-4672
/branches/1.3/scripts/journal.pl:3711-4328
   + /branches/1.3/LedgerSMB/Scripts/journal.pm:4288-4678
/branches/1.3/scripts/journal.pl:3711-4328


Property changes on: trunk/LedgerSMB/Scripts/login.pm
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/1.3/LedgerSMB/Scripts/login.pm:4193-4672
/branches/1.3/scripts/login.pl:3711-4192
   + /branches/1.3/LedgerSMB/Scripts/login.pm:4193-4678
/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-4672
/branches/1.3/scripts/menu.pl:3711-4192,4273-4287
   + /branches/1.3/LedgerSMB/Scripts/menu.pm:4155-4678
/branches/1.3/scripts/menu.pl:3711-4192,4273-4287


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


Property changes on: trunk/LedgerSMB/Scripts/recon.pm
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/1.3/LedgerSMB/Scripts/recon.pm:3711-4672
/branches/1.3/scripts/recon.pl:4194-4271,4273-4287,4393-4438
   + /branches/1.3/LedgerSMB/Scripts/recon.pm:3711-4678
/branches/1.3/scripts/recon.pl:4194-4271,4273-4287,4393-4438


Property changes on: trunk/LedgerSMB/Scripts/setup.pm
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/1.3/LedgerSMB/Scripts/setup.pm:3937-4672
/branches/1.3/scripts/setup.pl:3711-4550
   + /branches/1.3/LedgerSMB/Scripts/setup.pm:3937-4678
/branches/1.3/scripts/setup.pl:3711-4550


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


Property changes on: trunk/LedgerSMB/Scripts/vendor.pm
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/1.3/LedgerSMB/Scripts/vendor.pm:4288-4672
/branches/1.3/scripts/vendor.pl:4273-4287
   + /branches/1.3/LedgerSMB/Scripts/vendor.pm:4288-4678
/branches/1.3/scripts/vendor.pl:4273-4287

Modified: trunk/bin/rp.pl
===================================================================
--- trunk/bin/rp.pl	2012-04-25 02:30:57 UTC (rev 4678)
+++ trunk/bin/rp.pl	2012-04-25 02:40:05 UTC (rev 4679)
@@ -1054,7 +1054,7 @@
                 $column_data{c90}   = $c90total;
                 $column_data{total} = $total;
 
-                push @{$currencies[0]{totals}}, \%column_data;
+                $currencies[0]{totals} =  \%column_data;
 
                 $c0subtotal  = 0;
                 $c30subtotal = 0;
@@ -1221,9 +1221,9 @@
     $column_data{c60}   = $c60total;
     $column_data{c90}   = $c90total;
     $column_data{total} = $total;
-    
-    $currencies[0]{total} = \%column_data;
 
+    $currencies[0]{totals} = \%column_data;
+
     $row_alignment{c0}     = 'right';
     $row_alignment{c30}    = 'right';
     $row_alignment{c60}    = 'right';
@@ -1303,6 +1303,7 @@
         path => 'UI',
         format => $format,
         );
+
     $template->render({
         form => $form,
         hiddens => \%hiddens,

Modified: trunk/doc/release_notes
===================================================================
--- trunk/doc/release_notes	2012-04-25 02:30:57 UTC (rev 4678)
+++ trunk/doc/release_notes	2012-04-25 02:40:05 UTC (rev 4679)
@@ -1,7 +1,7 @@
 RELEASE NOTES
 LedgerSMB 1.3
 
-Latest Revision:  1.3.14, March 28, 2012.
+Latest Revision:  1.3.16, April 25, 2012.
 
 1:  Welcome to LedgerSMB
 
@@ -125,19 +125,35 @@
 gain/loss will be realized per the time when the payment was in effect and 
 not reversed.
 
-3.3:  Missing Annual Daily Straight Line Stored Procedure
+3.3:  Invoice unit column throws error when too long.
 
-Apparently the stored procedure for handling asset depreciation where the annual
-daily straight line method is selected is missing.  More typically, the annual
-monthly method is used.  For now, use that method instead.
+The unit column in the invoice is limited to 5 characters and will throw an SQl error when it is too long.  The error looks like:
 
-The differences between these methods do not result in financial differences
-over the course of a year.  Rather they affect how that annual depreciation is
-spread out over the year.  In daily, the year is divided into equal parts per
-day so we depreciate less in February than in August.  In monthly, we depreciate
-1/12th of the annual depreciation amount each month, so February and August show
-the same depreciation values.
+UPDATE invoice
+SET trans_id = ?,
+parts_id = ?,
+description = ?,
+qty = ?,
+sellprice = ?,
+fxsellprice = ?,
+discount = ?,
+allocated = ?,
+unit = ?,
+deliverydate = ?,
+project_id = ?,
+serialnumber = ?,
+precision = ?,
+notes = ?
+WHERE id = ?
+ERROR: value too long for type character varying(5)
 
+Due to compatibility issues, a fix for this has been included for 1.4, but is
+not planned to be backported for 1.3.
+
+If you need change the maximum length, you can:
+
+ALTER TABLE invoice SET unit TYPE varchar([length]);
+
 4:  Differences between LedgerSMB and SQL-Ledger(TM)
 
 4.1: Login name restrictions


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-4672
/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-4678
/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.
Prev by Date: SF.net SVN: ledger-smb:[4678] branches/1.3
Next by Date: SF.net SVN: ledger-smb:[4680] branches/1.3
Previous by thread: SF.net SVN: ledger-smb:[4678] branches/1.3
Next by thread: SF.net SVN: ledger-smb:[4680] branches/1.3
Index(es):
- Date
- Thread