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

Subject: SF.net SVN: ledger-smb:[4467] trunk
From: ..hidden..
Date: Thu, 15 Mar 2012 08:07:13 +0000
Revision: 4467
          http://ledger-smb.svn.sourceforge.net/ledger-smb/?rev=4467&view=rev
Author:   einhverfr
Date:     2012-03-15 08:07:12 +0000 (Thu, 15 Mar 2012)
Log Message:
-----------
Merging from branches/1.3

Modified Paths:
--------------
    trunk/Changelog
    trunk/bin/aa.pl
    trunk/bin/ir.pl
    trunk/bin/is.pl
    trunk/dists/rpm/ledgersmb.spec
    trunk/dists/source/build.sh
    trunk/sql/coa/Sample-chart.sql
    trunk/sql/coa/no/chart/General.sql

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-4462
   + /branches/1.3:3711-4466

Modified: trunk/Changelog
===================================================================
--- trunk/Changelog	2012-03-15 08:00:16 UTC (rev 4466)
+++ trunk/Changelog	2012-03-15 08:07:12 UTC (rev 4467)
@@ -38,6 +38,7 @@
 
 Changelog for 1.3.14
 * Argentina (Spanish) translation and charts of accounts added. (Andres B)
+* Fixed errors saving when duedate is blank, bug 3503463 (Chris T)
 
 Andres B is Andres Basile
 


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


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


Property changes on: trunk/LedgerSMB/Scripts/taxform.pm
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/1.3/LedgerSMB/Scripts/taxform.pm:4193-4462
/branches/1.3/scripts/taxform.pl:3711-4192,4273-4287
   + /branches/1.3/LedgerSMB/Scripts/taxform.pm:4193-4466
/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-4462
/branches/1.3/scripts/vendor.pl:4273-4287
   + /branches/1.3/LedgerSMB/Scripts/vendor.pm:4288-4466
/branches/1.3/scripts/vendor.pl:4273-4287

Modified: trunk/bin/aa.pl
===================================================================
--- trunk/bin/aa.pl	2012-03-15 08:00:16 UTC (rev 4466)
+++ trunk/bin/aa.pl	2012-03-15 08:07:12 UTC (rev 4467)
@@ -1298,6 +1298,9 @@
        &update;
        $form->finalize_request();
     }
+    if (!$form->{duedate}){
+          $form->{duedate} = $form->{transdate};
+    }
     $label =
       ( $form->{vc} eq 'customer' )
       ? $locale->text('Customer missing!')

Modified: trunk/bin/ir.pl
===================================================================
--- trunk/bin/ir.pl	2012-03-15 08:00:16 UTC (rev 4466)
+++ trunk/bin/ir.pl	2012-03-15 08:07:12 UTC (rev 4467)
@@ -1252,6 +1252,9 @@
        &update;
        $form->finalize_request();
     }
+    if (!$form->{duedate}){
+          $form->{duedate} = $form->{transdate};
+    }
 
     $form->isblank( "transdate", $locale->text('Invoice Date missing!') );
     $form->isblank( "vendor",    $locale->text('Vendor missing!') );

Modified: trunk/bin/is.pl
===================================================================
--- trunk/bin/is.pl	2012-03-15 08:00:16 UTC (rev 4466)
+++ trunk/bin/is.pl	2012-03-15 08:07:12 UTC (rev 4467)
@@ -1292,6 +1292,9 @@
        &update;
        $form->finalize_request();
     }
+    if (!$form->{duedate}){
+          $form->{duedate} = $form->{transdate};
+    }
     $form->isblank( "transdate", $locale->text('Invoice Date missing!') );
     $form->isblank( "customer",  $locale->text('Customer missing!') );
 

Modified: trunk/dists/rpm/ledgersmb.spec
===================================================================
--- trunk/dists/rpm/ledgersmb.spec	2012-03-15 08:00:16 UTC (rev 4466)
+++ trunk/dists/rpm/ledgersmb.spec	2012-03-15 08:07:12 UTC (rev 4467)
@@ -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.999000
+Version: 1.3.9990104463
 Release: 1
 License: GPL
 URL: http://www.ledgersmb.org/

Modified: trunk/dists/source/build.sh
===================================================================
--- trunk/dists/source/build.sh	2012-03-15 08:00:16 UTC (rev 4466)
+++ trunk/dists/source/build.sh	2012-03-15 08:07:12 UTC (rev 4467)
@@ -2,7 +2,7 @@
 
 # Simple script to prepare for release
 
-version="1.4-snapshot20111026";
+version="1.3.9990104463";
 build_d="../release";
 
 if test -d $build_d/ledgersmb; then

Modified: trunk/sql/coa/Sample-chart.sql
===================================================================
--- trunk/sql/coa/Sample-chart.sql	2012-03-15 08:00:16 UTC (rev 4466)
+++ trunk/sql/coa/Sample-chart.sql	2012-03-15 08:07:12 UTC (rev 4467)
@@ -69,6 +69,10 @@
 SELECT account_save(NULL,'5795','Registrations','E','', NULL, false,string_to_array('AP_amount', ':'));
 SELECT account_save(NULL,'5800','Licenses','E','', NULL, false,string_to_array('AP_amount', ':'));
 SELECT account_save(NULL,'5810','Foreign Exchange Loss','E','', NULL, false,string_to_array('', ':'));
+ 
+SELECT cr_coa_to_account_save(accno, accno || '--' || description)
+FROM account WHERE id IN (select account_id FROM account_link
+                           WHERE description = 'AP_paid');
 --
 insert into tax (chart_id,rate) values ((select id from chart where accno = '2310'),0.1);
 insert into tax (chart_id,rate) values ((select id from chart where accno = '2320'),0.14);

Modified: trunk/sql/coa/no/chart/General.sql
===================================================================
--- trunk/sql/coa/no/chart/General.sql	2012-03-15 08:00:16 UTC (rev 4466)
+++ trunk/sql/coa/no/chart/General.sql	2012-03-15 08:07:12 UTC (rev 4467)
@@ -291,6 +291,10 @@
 SELECT account_save(NULL,'8960','OverfÃringer annen egenkapital','E','', NULL, false, false, string_to_array('', ':'));
 SELECT account_save(NULL,'8980','Avsatt til fri egenkapital','E','', NULL, false, false, string_to_array('', ':'));
 SELECT account_save(NULL,'8990','Udekket tap','E','', NULL, false, false, string_to_array('', ':'));
+ 
+SELECT cr_coa_to_account_save(accno, accno || '--' || description)
+FROM account WHERE id IN (select account_id FROM account_link
+                           WHERE description = 'AP_paid');
 --
 insert into tax (chart_id,rate) values ((select id from chart where accno = '2710'),0.25);
 insert into tax (chart_id,rate) values ((select id from chart where accno = '2720'),0.14);


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-4462
/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-4466
/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:[4466] branches/1.3/sql/coa/no/chart/General.sql
Next by Date: SF.net SVN: ledger-smb:[4468] branches/1.3
Previous by thread: SF.net SVN: ledger-smb:[4466] branches/1.3/sql/coa/no/chart/General.sql
Next by thread: SF.net SVN: ledger-smb:[4468] branches/1.3
Index(es):
- Date
- Thread