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

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



Revision: 4778
          http://ledger-smb.svn.sourceforge.net/ledger-smb/?rev=4778&view=rev
Author:   einhverfr
Date:     2012-05-25 07:58:46 +0000 (Fri, 25 May 2012)
Log Message:
-----------

Merging from branches/1.3

Modified Paths:
--------------
    trunk/Changelog
    trunk/LedgerSMB/Locale.pm
    trunk/LedgerSMB/Template/ODS.pm
    trunk/UI/payments/payment2.html
    trunk/bin/am.pl
    trunk/bin/ic.pl
    trunk/bin/rp.pl
    trunk/sql/Pg-database.sql
    trunk/sql/modules/Roles.sql

Modified: trunk/Changelog
===================================================================
--- trunk/Changelog	2012-05-25 06:27:17 UTC (rev 4777)
+++ trunk/Changelog	2012-05-25 07:58:46 UTC (rev 4778)
@@ -57,7 +57,13 @@
 * Fixed customer email not showing emailing statements (Chris T and Erik H)
 * Approved recon reports no longer show invalid balance info (Chris T,3518283)
 * CSS directory is now configurable (Chris T, 3516730, h/t Robert C)
+* Corrected cannot delete accounts (Chris T, 3529383, h/t David M)
+* Fixed ODS output broken due to missing export (Chris T)
+* Fixed button disable inverted (Chris T)
+* Fixed internal server error on requirements report (Chris T, h/t Nigel T)
 
+David M is David Mora
+Nigel T is Nigel Titley
 Robert C is Robert James Clay
 
 

Modified: trunk/LedgerSMB/Locale.pm
===================================================================
--- trunk/LedgerSMB/Locale.pm	2012-05-25 06:27:17 UTC (rev 4777)
+++ trunk/LedgerSMB/Locale.pm	2012-05-25 07:58:46 UTC (rev 4778)
@@ -78,6 +78,7 @@
 use Locale::Maketext::Lexicon;
 use Encode;
 
+
 Locale::Maketext::Lexicon->import(
     {
         '*'     => [ Gettext => "${LedgerSMB::Sysconfig::localepath}/*.po", ],

Modified: trunk/LedgerSMB/Template/ODS.pm
===================================================================
--- trunk/LedgerSMB/Template/ODS.pm	2012-05-25 06:27:17 UTC (rev 4777)
+++ trunk/LedgerSMB/Template/ODS.pm	2012-05-25 07:58:46 UTC (rev 4778)
@@ -53,6 +53,7 @@
 use Template;
 use XML::Twig;
 use OpenOffice::OODoc;
+use OpenOffice::OODoc::Styles;
 use LedgerSMB::Template::TTI18N;
 use LedgerSMB::Sysconfig;
 

Modified: trunk/UI/payments/payment2.html
===================================================================
--- trunk/UI/payments/payment2.html	2012-05-25 06:27:17 UTC (rev 4777)
+++ trunk/UI/payments/payment2.html	2012-05-25 07:58:46 UTC (rev 4778)
@@ -1,4 +1,5 @@
-<?lsmb INCLUDE "ui-header.html" ?>
+<?lsmb INCLUDE "ui-header.html" 
+    include_script = [ 'UI/payments/javascript/maximize_minimize.js' ] ?>
 <body id="payment_2_body"
 onLoad="maximize_minimize_on_load('div_topay_state', 'UI/payments/img/down.gif','UI/payments/img/up.gif') ">
  <form name="pay_single_dues" method="post" action="payment.pl">

Modified: trunk/bin/am.pl
===================================================================
--- trunk/bin/am.pl	2012-05-25 06:27:17 UTC (rev 4777)
+++ trunk/bin/am.pl	2012-05-25 07:58:46 UTC (rev 4778)
@@ -189,15 +189,16 @@
 "$form->{script}?action=list_account&path=$form->{path}&login=$form->{login}&sessionid=$form->{sessionid}";
 
     $form->{callback} = $callback;
-    @column_index = qw(accno gifi_accno description debit credit link);
+    @column_index = qw(accno gifi_accno description debit credit link delete);
 
     my $column_names = {
-        accno => 'Account',
-        gifi_accno => 'GIFI',
-        description => 'Description',
-        debit => 'Debit',
-        credit => 'Credit',
-        link => 'Link'
+        accno => $locale->text('Account'),
+        gifi_accno => $locale->text('GIFI'),
+        description => $locale->text('Description'),
+        debit => $locale->text('Debit'),
+        credit => $locale->text('Credit'),
+        link => $locale->text('Link'),
+        delete => $locale->text('Delete')
     };
 
     # escape callback
@@ -250,6 +251,14 @@
             $column_data{description} = $ca->{description};
             $column_data{debit}       = $ca->{debit};
             $column_data{credit} = $ca->{credit};
+	    if (($ca->{debit} =~ /\d/ )or ($ca->{credit} =~ /\d/)){
+               # Note, this is just a stub in case we want to put a 
+               # message here --CT
+            } else {
+                $column_data{delete} ={text => '['.$locale->text('Delete').']',
+                                      href => 'am.pl?action=delete_account&'.
+                                              'id='.$ca->{id} };
+            }
 	    $column_data{link}   = {text => $ca->{link}, delimiter => ':'};
 
         }
@@ -258,8 +267,8 @@
 
     my %can_load;
     $can_load{CSV} = 1;
-    $can_load{XLS} = ! eval { require Excel::Template::Plus };
-    $can_load{ODS} = ! eval { require OpenOffice::OODoc };
+    $can_load{XLS} = eval { require Excel::Template::Plus };
+    $can_load{ODS} = eval { require OpenOffice::OODoc };
 
     my @buttons;
     for my $type (qw(CSV XLS ODS)) {

Modified: trunk/bin/ic.pl
===================================================================
--- trunk/bin/ic.pl	2012-05-25 06:27:17 UTC (rev 4777)
+++ trunk/bin/ic.pl	2012-05-25 07:58:46 UTC (rev 4778)
@@ -2589,10 +2589,13 @@
       qq|<th class=listheading nowrap>| . $locale->text('Order') . qq|</th>|;
     $column_header{year} = qq|<th class=listheading nowrap>$form->{year}</th>|;
 
+    $SHORTMONTH = ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 
+                   'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'];
+                   
     for ( sort { $a <=> $b } keys %month ) {
         $column_header{$_} =
             qq|<th class=listheading nowrap>|
-          . $locale->text( $locale->{SHORT_MONTH}[ $_ - 1 ] )
+          . $locale->text( $SHORTMONTH->[ $_ - 1 ] )
           . qq|</th>|;
     }
 

Modified: trunk/bin/rp.pl
===================================================================
--- trunk/bin/rp.pl	2012-05-25 06:27:17 UTC (rev 4777)
+++ trunk/bin/rp.pl	2012-05-25 07:58:46 UTC (rev 4778)
@@ -827,8 +827,8 @@
 
     my %can_load;
     $can_load{CSV} = 1;
-    $can_load{XLS} = ! eval { require Excel::Template::Plus };
-    $can_load{ODS} = ! eval { require OpenOffice::OODoc };
+    $can_load{XLS} =  eval { require Excel::Template::Plus };
+    $can_load{ODS} =  eval { require OpenOffice::OODoc };
 
     my @buttons;
     for my $type (qw(CSV XLS ODS)) {

Modified: trunk/sql/Pg-database.sql
===================================================================
--- trunk/sql/Pg-database.sql	2012-05-25 06:27:17 UTC (rev 4777)
+++ trunk/sql/Pg-database.sql	2012-05-25 07:58:46 UTC (rev 4778)
@@ -1410,6 +1410,7 @@
   inventory_accno_id int references account(id),
   income_accno_id int references account(id),
   expense_accno_id int references account(id),
+  returns_accno_id int references account(id),
   bin text,
   obsolete bool DEFAULT 'f',
   bom bool DEFAULT 'f',
@@ -1574,6 +1575,7 @@
   entity_credit_account int references entity_credit_account(id) not null,
   force_closed bool,
   description text,
+  is_return bool default false,
   unique(invnumber) -- probably a good idea as per Erik's request --CT
 );
 

Modified: trunk/sql/modules/Roles.sql
===================================================================
--- trunk/sql/modules/Roles.sql	2012-05-25 06:27:17 UTC (rev 4777)
+++ trunk/sql/modules/Roles.sql	2012-05-25 07:58:46 UTC (rev 4778)
@@ -297,7 +297,8 @@
 IN ROLE "lsmb_<?lsmb dbname ?>__ar_transaction_create";
 
 --### oldcode: UPDATE granted because old code wants it
-GRANT SELECT, INSERT, UPDATE ON invoice, new_shipto,  business_unit_inv
+GRANT SELECT, INSERT, UPDATE ON invoice, new_shipto,  business_unit_inv,
+new_shipto_id_seq
 TO "lsmb_<?lsmb dbname ?>__ar_invoice_create";
 GRANT ALL ON invoice_id_seq TO "lsmb_<?lsmb dbname ?>__ar_invoice_create";
 GRANT INSERT ON inventory TO "lsmb_<?lsmb dbname ?>__ar_invoice_create";

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