[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
SF.net SVN: ledger-smb:[4324] trunk
- Subject: SF.net SVN: ledger-smb:[4324] trunk
- From: ..hidden..
- Date: Fri, 17 Feb 2012 09:59:37 +0000
Revision: 4324
http://ledger-smb.svn.sourceforge.net/ledger-smb/?rev=4324&view=rev
Author: einhverfr
Date: 2012-02-17 09:59:36 +0000 (Fri, 17 Feb 2012)
Log Message:
-----------
Merging from branches/1.3
Modified Paths:
--------------
trunk/Changelog
trunk/LedgerSMB/Form.pm
trunk/LedgerSMB.pm
trunk/doc/release_notes
trunk/sql/modules/EndOfYear.sql
Property Changed:
----------------
trunk/
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-4310
+ /branches/1.3:3711-4323
Modified: trunk/Changelog
===================================================================
--- trunk/Changelog 2012-02-17 09:31:56 UTC (rev 4323)
+++ trunk/Changelog 2012-02-17 09:59:36 UTC (rev 4324)
@@ -13,6 +13,9 @@
Initial Release: Monday, Oct 12 2011
Supported Presently
+Changelog for 1.3.12
+* Corrected processing of <?lsmb tags in order/invoice numbers (Chris T)
+
Changelog for 1.3.11
* Fixed outstanding report for payment reversal and partial payments (Chris T)
* Fixed handling of non-existing roles in menu grants (Chris T)
Modified: trunk/LedgerSMB/Form.pm
===================================================================
--- trunk/LedgerSMB/Form.pm 2012-02-17 09:31:56 UTC (rev 4323)
+++ trunk/LedgerSMB/Form.pm 2012-02-17 09:59:36 UTC (rev 4324)
@@ -3196,7 +3196,7 @@
# <?lsmb PHONE ?> for customer and vendors
my $num = $_;
- ($num) = $num =~ /(\d+)/;
+ ($num) = $num =~ /\D*(\d+)\D*$/;
if ( defined $num ) {
my $incnum;
@@ -3279,7 +3279,7 @@
}
if ( $param =~ /<\?lsmb (yy|mm|dd)/i ) {
-
+ my $test_param = $1;
# SC: XXX Does this even work anymore?
my $p = $param;
$p =~ s/(<|>|%)//g;
@@ -3291,13 +3291,15 @@
my @a = $self->split_date( $myconfig->{dateformat},
$self->{transdate} );
- for ( sort keys %d ) { push @p, $a[ $d{$_} ] if ( $p =~ /$_/ ) }
+ for my $k( sort keys %d ) { push @p, $a[ $d{$k} ]
+ if ( $param =~ /$k/i ) }
$str = join $spc, @p;
- $var =~ s/$param/$str/;
+ $var =~ s/<\?lsmb $test_param \?>/$str/i;
}
if ( $param =~ /<\?lsmb curr/i ) {
- $var =~ s/$param/$self->{currency}/;
+ my $curr = $self->{currency} || $self->{curr};
+ $var =~ s/<\?lsmb curr \?>/$curr/i;
}
}
}
Property changes on: trunk/LedgerSMB/Scripts/admin.pm
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/1.3/LedgerSMB/Scripts/admin.pm:3901-4310
/branches/1.3/scripts/admin.pl:3711-3903,4273-4287
+ /branches/1.3/LedgerSMB/Scripts/admin.pm:3901-4323
/branches/1.3/scripts/admin.pl:3711-3903,4273-4287
Property changes on: trunk/LedgerSMB/Scripts/customer.pm
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/1.3/LedgerSMB/Scripts/customer.pm:4288-4310
/branches/1.3/scripts/customer.pl:4273-4287
+ /branches/1.3/LedgerSMB/Scripts/customer.pm:4288-4323
/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-4310
/branches/1.3/scripts/employee.pl:3842-3843,4273-4287,4289-4310
+ /branches/1.3/LedgerSMB/Scripts/employee.pm:3712-4323
/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-4310
/branches/1.3/scripts/file.pl:3711-4138
+ /branches/1.3/LedgerSMB/Scripts/file.pm:3711-4323
/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-4310
/branches/1.3/scripts/journal.pl:4273-4287
+ /branches/1.3/LedgerSMB/Scripts/journal.pm:4288-4323
/branches/1.3/scripts/journal.pl:4273-4287
Property changes on: trunk/LedgerSMB/Scripts/login.pm
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/1.3/LedgerSMB/Scripts/login.pm:4193-4310
/branches/1.3/scripts/login.pl:3711-4192
+ /branches/1.3/LedgerSMB/Scripts/login.pm:4193-4323
/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-4310
/branches/1.3/scripts/menu.pl:3711-4192,4273-4287
+ /branches/1.3/LedgerSMB/Scripts/menu.pm:4155-4323
/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-4310
/branches/1.3/scripts/payment.pl:3711-4310
+ /branches/1.3/LedgerSMB/Scripts/payment.pm:4010-4323
/branches/1.3/scripts/payment.pl:3711-4310
Property changes on: trunk/LedgerSMB/Scripts/recon.pm
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/1.3/LedgerSMB/Scripts/recon.pm:3711-4310
/branches/1.3/scripts/recon.pl:4194-4271,4273-4287
+ /branches/1.3/LedgerSMB/Scripts/recon.pm:3711-4323
/branches/1.3/scripts/recon.pl:4194-4271,4273-4287
Property changes on: trunk/LedgerSMB/Scripts/setup.pm
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/1.3/LedgerSMB/Scripts/setup.pm:3937-4310
/branches/1.3/scripts/setup.pl:3711-4216,4273-4287
+ /branches/1.3/LedgerSMB/Scripts/setup.pm:3937-4323
/branches/1.3/scripts/setup.pl:3711-4216,4273-4287
Property changes on: trunk/LedgerSMB/Scripts/taxform.pm
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/1.3/LedgerSMB/Scripts/taxform.pm:4193-4310
/branches/1.3/scripts/taxform.pl:3711-4192,4273-4287
+ /branches/1.3/LedgerSMB/Scripts/taxform.pm:4193-4323
/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-4310
/branches/1.3/scripts/vendor.pl:4273-4287
+ /branches/1.3/LedgerSMB/Scripts/vendor.pm:4288-4323
/branches/1.3/scripts/vendor.pl:4273-4287
Modified: trunk/LedgerSMB.pm
===================================================================
--- trunk/LedgerSMB.pm 2012-02-17 09:31:56 UTC (rev 4323)
+++ trunk/LedgerSMB.pm 2012-02-17 09:59:36 UTC (rev 4324)
@@ -357,7 +357,6 @@
{
$self->_db_init;
}
-
LedgerSMB::Company_Config::initialize($self);
#TODO move before _db_init to avoid _db_init with invalid session?
Modified: trunk/doc/release_notes
===================================================================
--- trunk/doc/release_notes 2012-02-17 09:31:56 UTC (rev 4323)
+++ trunk/doc/release_notes 2012-02-17 09:59:36 UTC (rev 4324)
@@ -1,7 +1,7 @@
RELEASE NOTES
LedgerSMB 1.3
-Latest Revision: 1.3.3, October 28th.
+Latest Revision: 1.3.11, February 15, 2012.
1: Welcome to LedgerSMB
@@ -15,7 +15,7 @@
* Perl 5.8.
* Apache, IIS, or other web server that supports CGI.
-* PostgreSQL 8.2 or higher.
+* PostgreSQL 8.3 or higher.
* Any operating system that supports the above environment.
* The following CPAN modules:
* Data::Dumper
@@ -86,6 +86,11 @@
repost invoices) in an upcoming version as we continue to re-engineer the
application.
+Also the current design of foreign exchange handling means that if you reverse a
+payment, the foreing exchange gains and losses will not be exactly reversed
+unless you are able to reverse on the same day. If reversed on different days the gain/loss will be realized per the time when the payment was in effect and
+not reversed.
+
4: Differences between LedgerSMB and SQL-Ledger(TM)
4.1: Login name restrictions
@@ -117,7 +122,7 @@
the longtable package in LaTeX.
5: Roadmap
-This project has no defined roadmap but rather a set of statements and
+This project has a losely defined roadmap and a set of statements and
objectives contained in the documentation manager and trackers of sourceforge.
In general, our development is focused around the following principles:
@@ -135,9 +140,11 @@
anyway. These include:
* Integrated budgetting module
-* Rewritten AR/AP/GL handling
* Rewritten reports
-* Rewritten invoices and orders
+* Rewritten project/department handling to include nested departments
+* Funds accounting
+* Rewritten Sales Orders
+* A framework for implementing payroll solutions
6: Get Involved
Contributors should start by joining the LedgerSMB users and devel lists. Code
Modified: trunk/sql/modules/EndOfYear.sql
===================================================================
--- trunk/sql/modules/EndOfYear.sql 2012-02-17 09:31:56 UTC (rev 4323)
+++ trunk/sql/modules/EndOfYear.sql 2012-02-17 09:59:36 UTC (rev 4324)
@@ -165,8 +165,7 @@
$$ LANGUAGE PLPGSQL;
COMMENT ON FUNCTION eoy_reopen_books(in_end_date date) IS
-$$ Removes checkpoints and reverses yearend transactions starting on
-in_end_date$$;
+$$ Removes checkpoints and reverses yearend transactions on in_end_date$$;
CREATE OR REPLACE FUNCTION account__obtain_balance
(in_transdate date, in_account_id int)
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-4310
/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-4323
/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.