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

Subject: SF.net SVN: ledger-smb:[4349] trunk
From: ..hidden..
Date: Thu, 23 Feb 2012 02:50:35 +0000
Revision: 4349
          http://ledger-smb.svn.sourceforge.net/ledger-smb/?rev=4349&view=rev
Author:   einhverfr
Date:     2012-02-23 02:50:35 +0000 (Thu, 23 Feb 2012)
Log Message:
-----------
Merging from branches/1.3

Modified Paths:
--------------
    trunk/CONTRIBUTORS
    trunk/Changelog
    trunk/LedgerSMB/DBObject/Business_Unit.pm
    trunk/LedgerSMB.pm
    trunk/dists/rpm/build.sh
    trunk/sql/Pg-database.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-4328
   + /branches/1.3:3711-4348

Modified: trunk/CONTRIBUTORS
===================================================================
--- trunk/CONTRIBUTORS	2012-02-23 02:41:24 UTC (rev 4348)
+++ trunk/CONTRIBUTORS	2012-02-23 02:50:35 UTC (rev 4349)
@@ -104,9 +104,13 @@
 Rich Walker <rw @ shadowrobot.com> has provided assistance in the dists/deb 
 documentation for Debian installations.
 
+Hilton Day < hilton.day @ gmail.com > has contributed a fix for the RPM build 
+process.
+
 Steven Marshall <steven.marshall @ tatylee.com> Contributed a bug fix for the 
 menu.
 
+
 Original Authors of SQL-Ledger:
 ===================================
 Dieter Simader <dsimader @ sql-ledger.com>

Modified: trunk/Changelog
===================================================================
--- trunk/Changelog	2012-02-23 02:41:24 UTC (rev 4348)
+++ trunk/Changelog	2012-02-23 02:50:35 UTC (rev 4349)
@@ -8,9 +8,14 @@
 * Projects and Departments can now have subprojects and Departments (Chris T)
 * Project/department mechanism generalized to support funds, etc (Chris T)
 * Removed the Config::Std dependency and moved to Config::General (Chris T)
-* Merged in transaction import add-on for 1.4, also for other csv's (Chris T)
 * Improved error handling using Try::Tiny and die (Chris T)
 
+New CSV Import Module (Chris T)
+* Imports GL transactions
+* Imports AP batches
+* Extensible
+* field maps can be overridden
+
 New Business Reporting Unit System (Chris T)
 * Replaces Projects and Departments
 * Business reporting units may be nested
@@ -27,7 +32,13 @@
 * Corrected erroneous log messages from debugging 1.3.11 (Chris T)
 * Autocomplete ajaxselect now work (degraded) without Javascript (Chris T)
 * Autocomplete ajaxselect now accept full entry without waiting (Chris T)
+* Inlined add_custom_field's argument names for autodocumentation (Chris T)
+* Updated add_custom_field to run on PostgreSQL 9.0 (Chris T)
+* Updated dists/rpm/build.sh to support RHEL 5 (Hilton D)
+* Corrected stylesheet not set on error pages (Chris T)
 
+Hilton D is Hilton Day
+
 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/DBObject/Business_Unit.pm
===================================================================
--- trunk/LedgerSMB/DBObject/Business_Unit.pm	2012-02-23 02:41:24 UTC (rev 4348)
+++ trunk/LedgerSMB/DBObject/Business_Unit.pm	2012-02-23 02:50:35 UTC (rev 4349)
@@ -136,7 +136,9 @@
 sub save {
     my ($self) = @_;
     my ($ref) = $self->exec_method({funcname => 'business_unit__save'});
+    $self->prepare_dbhash($ref);
     $self = $self->new($ref);
+    $self->dbh->commit;
 }   
 
 =item list ($date, $credit_id, $class)


Property changes on: trunk/LedgerSMB/Scripts/admin.pm
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/1.3/LedgerSMB/Scripts/admin.pm:3901-4328
/branches/1.3/scripts/admin.pl:3711-3903,4273-4287
   + /branches/1.3/LedgerSMB/Scripts/admin.pm:3901-4348
/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-4328
/branches/1.3/scripts/customer.pl:4273-4287
   + /branches/1.3/LedgerSMB/Scripts/customer.pm:4288-4348
/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-4328
/branches/1.3/scripts/employee.pl:3842-3843,4273-4287,4289-4310
   + /branches/1.3/LedgerSMB/Scripts/employee.pm:3712-4348
/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-4328
/branches/1.3/scripts/file.pl:3711-4138
   + /branches/1.3/LedgerSMB/Scripts/file.pm:3711-4348
/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-4328
/branches/1.3/scripts/journal.pl:3711-4328
   + /branches/1.3/LedgerSMB/Scripts/journal.pm:4288-4348
/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-4328
/branches/1.3/scripts/login.pl:3711-4192
   + /branches/1.3/LedgerSMB/Scripts/login.pm:4193-4348
/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-4328
/branches/1.3/scripts/menu.pl:3711-4192,4273-4287
   + /branches/1.3/LedgerSMB/Scripts/menu.pm:4155-4348
/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-4328
/branches/1.3/scripts/payment.pl:3711-4310
   + /branches/1.3/LedgerSMB/Scripts/payment.pm:4010-4348
/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-4328
/branches/1.3/scripts/recon.pl:4194-4271,4273-4287
   + /branches/1.3/LedgerSMB/Scripts/recon.pm:3711-4348
/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-4328
/branches/1.3/scripts/setup.pl:3711-4216,4273-4287
   + /branches/1.3/LedgerSMB/Scripts/setup.pm:3937-4348
/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-4328
/branches/1.3/scripts/taxform.pl:3711-4192,4273-4287
   + /branches/1.3/LedgerSMB/Scripts/taxform.pm:4193-4348
/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-4328
/branches/1.3/scripts/vendor.pl:4273-4287
   + /branches/1.3/LedgerSMB/Scripts/vendor.pm:4288-4348
/branches/1.3/scripts/vendor.pl:4273-4287

Modified: trunk/LedgerSMB.pm
===================================================================
--- trunk/LedgerSMB.pm	2012-02-23 02:41:24 UTC (rev 4348)
+++ trunk/LedgerSMB.pm	2012-02-23 02:50:35 UTC (rev 4349)
@@ -813,7 +813,7 @@
 
         
         print qq|Content-Type: text/html; charset=utf-8\n\n|;
-        print "<head></head>";
+        print "<head><link rel='stylesheet' href='css/$self->{_user}->{stylesheet}' type='text/css'></head>";
         $self->{msg} =~ s/\n/<br \/>\n/;
         print
           qq|<body><h2 class="error">Error!</h2> <p><b>$self->{msg}</b></body>|;

Modified: trunk/dists/rpm/build.sh
===================================================================
--- trunk/dists/rpm/build.sh	2012-02-23 02:41:24 UTC (rev 4348)
+++ trunk/dists/rpm/build.sh	2012-02-23 02:50:35 UTC (rev 4349)
@@ -4,6 +4,9 @@
 
 cp ../release/ledgersm*.tar.gz /root/rpmbuild/SOURCES/
 
-rpmbuild -ba dists/rpm/ledgersmb.spec
+rpmbuild -ba   \
+               --define "_source_filedigest_algorithm 0" \
+               --define "_binary_filedigest_algorithm 0" \
+               dists/rpm/ledgersmb.spec
 
 mv /root/rpmbuild/SOURCES/ledgersmb* ../release

Modified: trunk/sql/Pg-database.sql
===================================================================
--- trunk/sql/Pg-database.sql	2012-02-23 02:41:24 UTC (rev 4348)
+++ trunk/sql/Pg-database.sql	2012-02-23 02:50:35 UTC (rev 4349)
@@ -2322,14 +2322,9 @@
 FOR EACH ROW EXECUTE PROCEDURE trigger_parts_short();
 -- end function
 
-CREATE OR REPLACE FUNCTION add_custom_field (VARCHAR, VARCHAR, VARCHAR) 
+CREATE OR REPLACE FUNCTION add_custom_field (table_name VARCHAR, new_field_name VARCHAR, field_datatype VARCHAR) 
 RETURNS BOOL AS
 '
-DECLARE
-table_name ALIAS FOR $1;
-new_field_name ALIAS FOR $2;
-field_datatype ALIAS FOR $3;
-
 BEGIN
 	perform TABLE_ID FROM custom_table_catalog 
 		WHERE extends = table_name;


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-4328
/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-4348
/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:[4348] branches/1.3
Next by Date: SF.net SVN: ledger-smb:[4350] trunk
Previous by thread: SF.net SVN: ledger-smb:[4348] branches/1.3
Next by thread: SF.net SVN: ledger-smb:[4350] trunk
Index(es):
- Date
- Thread