[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
SF.net SVN: ledger-smb:[4539] trunk
- Subject: SF.net SVN: ledger-smb:[4539] trunk
- From: ..hidden..
- Date: Sat, 24 Mar 2012 05:08:31 +0000
Revision: 4539
http://ledger-smb.svn.sourceforge.net/ledger-smb/?rev=4539&view=rev
Author: einhverfr
Date: 2012-03-24 05:08:30 +0000 (Sat, 24 Mar 2012)
Log Message:
-----------
merging from branches/1.3
Modified Paths:
--------------
trunk/LedgerSMB/ScriptLib/Common_Search/Part.pm
trunk/LedgerSMB/ScriptLib/Common_Search.pm
trunk/LedgerSMB/ScriptLib/Company.pm
trunk/UI/lib/dynatable.html
trunk/UI/search_results.html
trunk/UPGRADE
trunk/css/ledgersmb.css
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-4535
+ /branches/1.3:3711-4538
Modified: trunk/LedgerSMB/ScriptLib/Common_Search/Part.pm
===================================================================
--- trunk/LedgerSMB/ScriptLib/Common_Search/Part.pm 2012-03-24 01:41:14 UTC (rev 4538)
+++ trunk/LedgerSMB/ScriptLib/Common_Search/Part.pm 2012-03-24 05:08:30 UTC (rev 4539)
@@ -47,6 +47,17 @@
return $COLUMNS;
}
+
+=item row_id
+
+Returns the column_id to use as the row id.
+
+=cut
+
+sub row_id {
+ return 'id';
+}
+
=item results
Returns a list of results as an array of hashrefs.
Modified: trunk/LedgerSMB/ScriptLib/Common_Search.pm
===================================================================
--- trunk/LedgerSMB/ScriptLib/Common_Search.pm 2012-03-24 01:41:14 UTC (rev 4538)
+++ trunk/LedgerSMB/ScriptLib/Common_Search.pm 2012-03-24 05:08:30 UTC (rev 4539)
@@ -82,8 +82,13 @@
sub render {
my ($self, $request) = @_;
- $request->{columns} = $self->columns;
- $request->{rows} = $self->results;
+ delete $request->{action};
+ my $datahash = { request => $request };
+ $datahash->{columns} = $self->columns;
+ $datahash->{rows} = $self->results;
+ for my $ref(@{$datahash->{rows}}){
+ $ref->{row_id} = $ref->{$self->row_id};
+ }
my $template = LedgerSMB::Template->new(
user => $request->{_user},
locale => $request->{_locale},
@@ -91,7 +96,7 @@
template => 'search_results',
format => 'HTML',
);
- $template->render($request);
+ $template->render($datahash);
}
@@ -109,6 +114,10 @@
Returns a list of results, becomes the rows for the table.
+=item row_id
+
+Returns the column name (col_id) to use for the row_id.
+
=back
=head1 COPYRIGHT
Modified: trunk/LedgerSMB/ScriptLib/Company.pm
===================================================================
--- trunk/LedgerSMB/ScriptLib/Company.pm 2012-03-24 01:41:14 UTC (rev 4538)
+++ trunk/LedgerSMB/ScriptLib/Company.pm 2012-03-24 05:08:30 UTC (rev 4539)
@@ -1062,17 +1062,18 @@
my ($request) = @_;
use LedgerSMB::ScriptLib::Common_Search::Part;
use LedgerSMB::DBObject::Pricelist;
+ my $count = $request->{rowcount_pricematrix};
- my $count = $request->{rowcount_pricematrix};
my $pricelist = LedgerSMB::DBObject::Pricelist->new({base => $request});
my @lines;
my $redirect_to_selection = 0;
+ my $psearch;
# Search and populate
if (defined $request->{"int_partnumber_tfoot_$count"}
or defined $request->{"description_tfoot_$count"})
{
- my $psearch = LedgerSMB::ScriptLib::Common_Search::Part->new($request);
+ $psearch = LedgerSMB::ScriptLib::Common_Search::Part->new($request);
my @parts = $psearch->search(
{ partnumber => $request->{"int_partnumber_tfoot_$count"},
description => $request->{"description_tfoot_$count"}, }
@@ -1115,10 +1116,39 @@
pricelist($request) unless $redirect_to_selection;
- $psearch->render;
+ $request->{search_redirect} = 'pricelist_search_handle';
+ $psearch->render($request);
}
+=item pricelist_search_handle
+
+Handles the return from the parts search from the pricelist screen.
+
+=cut
+
+sub pricelist_search_handle {
+ my ($request) = @_;
+ use LedgerSMB::ScriptLib::Common_Search::Part;
+ use LedgerSMB::DBObject::Pricelist;
+
+ my $psearch = LedgerSMB::ScriptLib::Common_Search::Part->new($request);
+ my $part = $psearch->extract;
+
+ my $plist = LedgerSMB::DBObject::Pricelist->new({base => $request });
+ my $row = $request->{rowcount_pricematrix};
+
+ $plist->save([{parts_id => $part->{id},
+ validfrom => $request->{"validfrom_tfoot_$row"},
+ validto => $request->{"validto_tfoot_$row"},
+ price => $request->{"lastcost_tfoot_$row"} ||
+ $request->{"sellprice_tfoot_$row"},
+ leadtime => $request->{"leadtime_tfoot_$row"},
+ }]);
+ pricelist($request);
+}
+
+
=back
=head1 COPYRIGHT
Property changes on: trunk/LedgerSMB/Scripts/account.pm
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/1.3/LedgerSMB/Scripts/account.pm:4369-4535
/branches/1.3/scripts/account.pl:3711-4368
+ /branches/1.3/LedgerSMB/Scripts/account.pm:4369-4538
/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-4535
/branches/1.3/scripts/admin.pl:3711-3903,4273-4287
+ /branches/1.3/LedgerSMB/Scripts/admin.pm:3901-4538
/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-4535
/branches/1.3/scripts/customer.pl:4273-4287
+ /branches/1.3/LedgerSMB/Scripts/customer.pm:4288-4538
/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-4535
/branches/1.3/scripts/employee.pl:3842-3843,4273-4287,4289-4310
+ /branches/1.3/LedgerSMB/Scripts/employee.pm:3712-4538
/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-4535
/branches/1.3/scripts/file.pl:3711-4138
+ /branches/1.3/LedgerSMB/Scripts/file.pm:3711-4538
/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-4535
/branches/1.3/scripts/journal.pl:3711-4328
+ /branches/1.3/LedgerSMB/Scripts/journal.pm:4288-4538
/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-4535
/branches/1.3/scripts/login.pl:3711-4192
+ /branches/1.3/LedgerSMB/Scripts/login.pm:4193-4538
/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-4535
/branches/1.3/scripts/menu.pl:3711-4192,4273-4287
+ /branches/1.3/LedgerSMB/Scripts/menu.pm:4155-4538
/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-4535
/branches/1.3/scripts/payment.pl:3711-4310
+ /branches/1.3/LedgerSMB/Scripts/payment.pm:4010-4538
/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-4535
/branches/1.3/scripts/recon.pl:4194-4271,4273-4287,4393-4438
+ /branches/1.3/LedgerSMB/Scripts/recon.pm:3711-4538
/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-4535
/branches/1.3/scripts/setup.pl:3711-4525
+ /branches/1.3/LedgerSMB/Scripts/setup.pm:3937-4538
/branches/1.3/scripts/setup.pl:3711-4525
Property changes on: trunk/LedgerSMB/Scripts/taxform.pm
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/1.3/LedgerSMB/Scripts/taxform.pm:4193-4535
/branches/1.3/scripts/taxform.pl:3711-4192,4273-4287
+ /branches/1.3/LedgerSMB/Scripts/taxform.pm:4193-4538
/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-4535
/branches/1.3/scripts/vendor.pl:4273-4287
+ /branches/1.3/LedgerSMB/Scripts/vendor.pm:4288-4538
/branches/1.3/scripts/vendor.pl:4273-4287
Modified: trunk/UI/lib/dynatable.html
===================================================================
--- trunk/UI/lib/dynatable.html 2012-03-24 01:41:14 UTC (rev 4538)
+++ trunk/UI/lib/dynatable.html 2012-03-24 05:08:30 UTC (rev 4539)
@@ -1,5 +1,5 @@
<?lsmb BLOCK dynatable ?>
-<table id="<?lsmb attributes.id ?>" class="<?lsmb attributes.class ?>">
+<table id="<?lsmb attributes.id ?>" class="dynatable <?lsmb attributes.class ?>">
<?lsmb- IF !hide_header -?>
<thead>
<tr>
@@ -64,7 +64,7 @@
END
?><a href="<?lsmb HREF ?>"><?lsmb ROW.${COL.col_id} ?></a>
<?lsmb ELSIF COL.type == 'mirrored';
- NAME = PFX _ COL.col_id _ '_' _ $ROW.row_id;
+ NAME = PFX _ COL.col_id _ '_' _ ROW.row_id;
ROW.${COL.col_id} ?>
<input type="hidden"
name="<?lsmb NAME ?>"
@@ -80,6 +80,7 @@
<?lsmb- IF tfoot -?>
<tfoot>
<?lsmb- FOREACH ROW IN tfoot.rows;
+ SPACECOUNT = 0;
ROWCOUNT = ROWCOUNT + 1; -?>
<tr>
<?lsmb- FOREACH COL IN columns;
Modified: trunk/UI/search_results.html
===================================================================
--- trunk/UI/search_results.html 2012-03-24 01:41:14 UTC (rev 4538)
+++ trunk/UI/search_results.html 2012-03-24 05:08:30 UTC (rev 4539)
@@ -1,5 +1,5 @@
<?lsmb-
-INCLUDE 'ui-header.html';
+INCLUDE 'ui-header.html' stylesheet = request.stylesheet;
PROCESS 'elements.html';
PROCESS 'dynatable.html';
@@ -33,8 +33,19 @@
text = text('Continue')
class = 'submit'
type = 'submit'
-}
+ value = request.search_redirect
+};
+FOREACH RKEY IN request.keys();
+
+ PROCESS input element_data = {
+ name = RKEY
+ type = "hidden"
+ value = request.$RKEY
+ };
+
+END;
+
-?>
</form>
</body>
Modified: trunk/UPGRADE
===================================================================
--- trunk/UPGRADE 2012-03-24 01:41:14 UTC (rev 4538)
+++ trunk/UPGRADE 2012-03-24 05:08:30 UTC (rev 4539)
@@ -2,16 +2,10 @@
From LedgerSMB 1.3:
-Untar over the top and then:
+Untar over the top and then select step 1 or 2:
-1) Shell script process (UNIX/Linux only):
+1) Automated process (all platforms):
-* cd to the sql/modules directory of the ledgersmb installation.
-* sh reload_modules.sh [dbname]
-* repeat the shell script for each database for each database
-
-2) Automated process (all platforms):
-
* direct browser to the setup.pl file in the directory you are in.
* provide PostgreSQL superuser credentials and the name of your data base.
* Click continue.
@@ -19,6 +13,14 @@
* Click 'Yes', answering "LedgerSMB 1.3 found. Rebuild/Upgrade?"
* Repeat for each database.
+2) Shell script process (UNIX/Linux only):
+
+* cd to the sql/modules directory of the ledgersmb installation.
+* sh reload_modules.sh [dbname]
+* repeat the shell script for each database.
+
+
+
From LedgerSMB 1.1 and earlier:
For versions prior to 1.2, please upgrade to LedgerSMB 1.2 before upgrading to
@@ -35,9 +37,13 @@
* make test
But run 'make test' under an english locale, because some tests check for english error messages.
* run the install.sh script.
+* fix ledgersmb.conf with new config
+ copy ledgersmb.conf to ledgersmb.conf.old
+ copy ledgersmb.conf.default to ledgersmb.conf and reconfigure.
* direct your browser to the setup.pl script in your ledgersmb directory (via
http) and follow the prompts:
* Provide Pg superuser and database information for your existing database
+ (the database created for your company)
* Click continue when asked to upgrade
* When asking for upgrade info:
* contrib_dir is the directory where either tablefunc.control or
@@ -51,6 +57,10 @@
selection among multiple AR/AP accounts, and for purposes of payment
reversals. Enter account numbers here, like 1200 for AR and 2100 for
AP
- * Provide user information.
+ * Provide user information.
+ Note: users are recreated as PostreSQL db users with application acess instead
+ of just imported from your 1.2.x install. New users created by the administrative
+ functions have their password auth timing out after a day, unless they change their
+ passwords after logging into LedgerSMB.
* log into the application and create additional users under System/User
Management
Modified: trunk/css/ledgersmb.css
===================================================================
--- trunk/css/ledgersmb.css 2012-03-24 01:41:14 UTC (rev 4538)
+++ trunk/css/ledgersmb.css 2012-03-24 05:08:30 UTC (rev 4539)
@@ -159,8 +159,8 @@
.listheading, thead th { font-size: 10pt; background-color: #004a80; color: white; }
A.listheading:link, A.listheading:active, A.listheading:visited {
text-decoration: none; }
-.listrow1 { font-size: 10pt; background-color: #e6e6fa; color: black; vertical-align: top; }
-.listrow0 { font-size: 10pt; background-color: #ffe4e1; color: black; vertical-align: top; }
+.listrow1, table.dynatable tr:nth-child(odd) { font-size: 10pt; background-color: #e6e6fa; color: black; vertical-align: top; }
+.listrow0, table.dynatable tr:nth-child(even) { font-size: 10pt; background-color: #ffe4e1; color: black; vertical-align: top; }
.listsubtotal { font-size: 10pt; background-color: #5a7d9b; color: white; }
.listtotal { font-size: 10pt; background-color: #004d99; color: white; }
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-4535
/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-4538
/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.