[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
SF.net SVN: ledger-smb:[5207] trunk
- Subject: SF.net SVN: ledger-smb:[5207] trunk
- From: ..hidden..
- Date: Mon, 19 Nov 2012 04:32:44 +0000
Revision: 5207
http://ledger-smb.svn.sourceforge.net/ledger-smb/?rev=5207&view=rev
Author: einhverfr
Date: 2012-11-19 04:32:43 +0000 (Mon, 19 Nov 2012)
Log Message:
-----------
Merging from branches/1.3
Modified Paths:
--------------
trunk/Changelog
trunk/LedgerSMB/Scripts/asset.pm
trunk/LedgerSMB/Scripts/file.pm
trunk/LedgerSMB/Scripts/recon.pm
trunk/LedgerSMB/Scripts/setup.pm
trunk/LedgerSMB/Template/HTML.pm
trunk/UI/Contact/contact.css
trunk/UI/Contact/contact.js
trunk/UI/ajax/helpers.js
trunk/UI/payments/payment1.html
trunk/UI/payments/search.html
trunk/UI/setup/confirm_operation.html
trunk/common.pl
trunk/ledgersmb.conf.default
trunk/old-handler.pl
trunk/sql/modules/Roles.sql
Property Changed:
----------------
trunk/
trunk/LedgerSMB/Scripts/asset.pm
trunk/LedgerSMB/Scripts/file.pm
trunk/LedgerSMB/Scripts/recon.pm
trunk/LedgerSMB/Scripts/setup.pm
trunk/UI/Reports/filters/contact_search.html
Property changes on: trunk
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/1.3:3711-5187
+ /branches/1.3:3711-5206
Modified: trunk/Changelog
===================================================================
--- trunk/Changelog 2012-11-19 04:09:13 UTC (rev 5206)
+++ trunk/Changelog 2012-11-19 04:32:43 UTC (rev 5207)
@@ -92,6 +92,14 @@
* Rebuild modules after upgrade, ensuring upgrade to latest version (Chris T)
* Fixed credit limit usage calculations (Chris T, h/t Erik H)
* Fixes to get LedgerSMB running clearly using FCGI (Chris T)
+* Fixed unapproved transactions showing up on aging reports (Chris T)
+* Fixed new window menu item not showing up (Erik H)
+* Fixed alignment issue on Contact screen on Chrome (Chris T)
+* Fixed cannot reconcile account with negative balance(Havard S, Erik H, h/t Nick P,3586757)
+* Documented cache_templates option in ledgersmb.conf (Chris T)
+* Fixed internal server error on plack with backups (Chris T)
+* Added add user button to setup.pl when LedgerSMB 1.3 db detected (Chris T)
+* Backup buttons do not show when no db found (Chris T)
Berend T is Berend Tober
Chris T is Chris Travers
@@ -100,6 +108,7 @@
Kevin B is Kevin Bailey
Neil S is Neil Smith
Robert C is Robert James Clay
+Nick P is Nick Prater
Changelog for 1.3.23
* Fixed query string/stdin handling where both stdin and query string are set
Modified: trunk/LedgerSMB/Scripts/asset.pm
===================================================================
--- trunk/LedgerSMB/Scripts/asset.pm 2012-11-19 04:09:13 UTC (rev 5206)
+++ trunk/LedgerSMB/Scripts/asset.pm 2012-11-19 04:32:43 UTC (rev 5207)
@@ -720,10 +720,10 @@
$report->get;
if ($report->{report_class} == 2) {
disposal_details($report);
- exit;
+ return;
} elsif ($report->{report_class} == 4) {
partial_disposal_details($report);
- exit;
+ return;
}
my @cols = qw(tag start_depreciation purchase_value method_short_name
usable_life basis prior_through prior_dep dep_this_time
Property changes on: trunk/LedgerSMB/Scripts/asset.pm
___________________________________________________________________
Added: svn:mergeinfo
+ /branches/1.3/LedgerSMB/Scripts/asset.pm:3711-5206
/branches/1.3/scripts/asset.pl:5189-5206
Modified: trunk/LedgerSMB/Scripts/file.pm
===================================================================
--- trunk/LedgerSMB/Scripts/file.pm 2012-11-19 04:09:13 UTC (rev 5206)
+++ trunk/LedgerSMB/Scripts/file.pm 2012-11-19 04:32:43 UTC (rev 5207)
@@ -62,7 +62,6 @@
);
print $file->content;
- exit;
}
=item show_attachment_screen
Property changes on: trunk/LedgerSMB/Scripts/file.pm
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/1.3/LedgerSMB/Scripts/file.pm:3711-4945
/branches/1.3/scripts/file.pl:3711-4880
+ /branches/1.3/LedgerSMB/Scripts/file.pm:3711-4945
/branches/1.3/scripts/file.pl:3711-4880,5189-5206
Modified: trunk/LedgerSMB/Scripts/recon.pm
===================================================================
--- trunk/LedgerSMB/Scripts/recon.pm 2012-11-19 04:09:13 UTC (rev 5206)
+++ trunk/LedgerSMB/Scripts/recon.pm 2012-11-19 04:32:43 UTC (rev 5207)
@@ -21,8 +21,6 @@
use LedgerSMB::Template;
use LedgerSMB::DBObject::Reconciliation;
use LedgerSMB::Setting;
-use Try::Tiny;
-
use Data::Dumper;
use strict;
@@ -405,11 +403,14 @@
=cut
sub new_report {
my ($request) = @_;
- if ($request->{total} && $request->{total} =~ m|[/-]|){
+
+ # Trap user error: dates accidentally entered in the amount field
+ if ($request->{total} && $request->{total} =~ m|\d[/-]|){
$request->error($request->{_locale}->text(
'Invalid statement balance. Hint: Try entering a number'
));
}
+
$request->{total} = $request->parse_amount(amount => $request->{total});
my $template;
my $return;
Property changes on: trunk/LedgerSMB/Scripts/recon.pm
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/1.3/LedgerSMB/Scripts/recon.pm:3711-4945
/branches/1.3/scripts/recon.pl:4194-4271,4273-4287,4393-4438,5079-5082
+ /branches/1.3/LedgerSMB/Scripts/recon.pm:3711-4945
/branches/1.3/scripts/recon.pl:4194-4271,4273-4287,4393-4438,5079-5082,5189-5206
Modified: trunk/LedgerSMB/Scripts/setup.pm
===================================================================
--- trunk/LedgerSMB/Scripts/setup.pm 2012-11-19 04:09:13 UTC (rev 5206)
+++ trunk/LedgerSMB/Scripts/setup.pm 2012-11-19 04:32:43 UTC (rev 5207)
@@ -255,7 +255,6 @@
print $data;
}
unlink $backupfile;
- exit;
} else {
$request->error($request->{_locale}->text("Don't know what to do with backup"));
}
@@ -738,7 +737,7 @@
format => 'HTML',
);
$template->render($request);
- exit;
+ return;
}
if ($request->{perms} == 1){
for my $role (
Property changes on: trunk/LedgerSMB/Scripts/setup.pm
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/1.3/LedgerSMB/Scripts/setup.pm:3712-4945
/branches/1.3/scripts/setup.pl:3711-5182
+ /branches/1.3/LedgerSMB/Scripts/setup.pm:3712-4945
/branches/1.3/scripts/setup.pl:3711-5182,5189-5206
Modified: trunk/LedgerSMB/Template/HTML.pm
===================================================================
--- trunk/LedgerSMB/Template/HTML.pm 2012-11-19 04:09:13 UTC (rev 5206)
+++ trunk/LedgerSMB/Template/HTML.pm 2012-11-19 04:32:43 UTC (rev 5207)
@@ -123,22 +123,24 @@
$source = get_template($parent->{template});
}
my $tempdir;
- if ($LedgerSMB::Sysconfig::cache_templates){
- $tempdir = $LedgerSMB::Sysconfig::cache_template_dir;
- } else {
- $tempdir = undef;
- }
- $template = Template->new({
+ my $arghash = {
INCLUDE_PATH => [$parent->{include_path_lang}, $parent->{include_path},'templates/demo','UI/lib'],
ENCODING => 'utf8',
START_TAG => quotemeta('<?lsmb'),
END_TAG => quotemeta('?>'),
DELIMITER => ';',
TRIM => 1,
- COMPILE_DIR=> $tempdir,
DEBUG => ($parent->{debug})? 'dirs': undef,
DEBUG_FORMAT => '',
- }) || throw Error::Simple Template->error();
+ };
+ if ($LedgerSMB::Sysconfig::cache_templates){
+ $arghash->{COMPILE_EXT} = '.lttc';
+ $arghash->{COMPILE_DIR} = $LedgerSMB::Sysconfig::cache_template_dir;
+ }
+
+ $template = Template->new(
+ $arghash
+ ) || throw Error::Simple Template->error();
if (not $template->process(
$source,
{%$cleanvars, %$LedgerSMB::Template::TTI18N::ttfuncs,
Modified: trunk/UI/Contact/contact.css
===================================================================
--- trunk/UI/Contact/contact.css 2012-11-19 04:09:13 UTC (rev 5206)
+++ trunk/UI/Contact/contact.css 2012-11-19 04:32:43 UTC (rev 5207)
@@ -72,6 +72,7 @@
}
#company_div div.input_group2 {
+ width: 40em;
}
#company_div label {
Modified: trunk/UI/Contact/contact.js
===================================================================
--- trunk/UI/Contact/contact.js 2012-11-19 04:09:13 UTC (rev 5206)
+++ trunk/UI/Contact/contact.js 2012-11-19 04:32:43 UTC (rev 5207)
@@ -5,14 +5,14 @@
if (e != e * 1){
continue;
}
- e = lis.item(e);
+ e = lis[e];
if (e.getAttribute('class') == "nav"){
e.addEventListener('click', function (e) {
for (var a in this.getElementsByTagName('a')){
if (a != a * 1){
continue;
}
- a = this.getElementsByTagName('a').item(a);
+ a = this.getElementsByTagName('a')[a];
var dest = a.getAttribute('href');
dest = dest.replace('#', '');
select_div(dest);
@@ -31,7 +31,7 @@
var divs = document.getElementsByTagName('div');
var i = 0;
for (i=0;i<=divs.length;i++){
- var e = divs.item(i);
+ var e = divs[i];
if (!e || !e.getAttribute || !e.getAttribute('class')){
continue;
}
Property changes on: trunk/UI/Reports/filters/contact_search.html
___________________________________________________________________
Added: svn:mergeinfo
+ /branches/1.3/UI/Contact/search.html:3711-5206
/branches/1.3/UI/Reports/filters/contact_search.html:3711-5206
Modified: trunk/UI/ajax/helpers.js
===================================================================
--- trunk/UI/ajax/helpers.js 2012-11-19 04:09:13 UTC (rev 5206)
+++ trunk/UI/ajax/helpers.js 2012-11-19 04:32:43 UTC (rev 5207)
@@ -3,4 +3,5 @@
hidden_field_to_update = text.id;
$(hidden_field_to_update).value = li.id;
text.blur();
+ $(hidden_field_to_update).focus();
}
Modified: trunk/UI/payments/payment1.html
===================================================================
--- trunk/UI/payments/payment1.html 2012-11-19 04:09:13 UTC (rev 5206)
+++ trunk/UI/payments/payment1.html 2012-11-19 04:32:43 UTC (rev 5207)
@@ -1,7 +1,7 @@
<?lsmb INCLUDE 'ui-header.html' ?>
<body id="payment-1-body">
-<form name="search" method="post" action="payment.pl">
+<form name="search" method="get" action="payment.pl">
<?lsmb PROCESS elements.html # Include form elements helper. -?>
<?lsmb login.type = 'hidden' ; INCLUDE input element_data=login -?>
<?lsmb accountclass.type = 'hidden'; INCLUDE input element_data=accountclass -?>
Modified: trunk/UI/payments/search.html
===================================================================
--- trunk/UI/payments/search.html 2012-11-19 04:09:13 UTC (rev 5206)
+++ trunk/UI/payments/search.html 2012-11-19 04:32:43 UTC (rev 5207)
@@ -16,7 +16,7 @@
<?lsmb text('Vendor Number') ?>
<?lsmb text('Unsupported Number') ?>
-->
-<form action="payment.pl" method="post" name="main_form"
+<form action="payment.pl" method="get" name="main_form"
id="payment_search_form">
<?lsmb INCLUDE input element_data = {
type = "hidden"
Modified: trunk/UI/setup/confirm_operation.html
===================================================================
--- trunk/UI/setup/confirm_operation.html 2012-11-19 04:09:13 UTC (rev 5206)
+++ trunk/UI/setup/confirm_operation.html 2012-11-19 04:32:43 UTC (rev 5207)
@@ -25,6 +25,19 @@
text = text('Yes')
} ?>
</div>
+<div id="sep" class="listheading"><?lsmb text('Other Actions') ?></div>
+<?lsmb IF next_action == 'rebuild_modules' ?>
+<div id="user">
+<?lsmb INCLUDE button element_data = {
+ name = 'action'
+ value = 'skip_coa'
+ type = 'submit'
+ class = 'submit'
+ text = text('Add User') #'
+}; ?>
+</div>
+<?lsmb END ?>
+<?lsmb IF next_action != 'create_db' ?>
<div id="others"><?lsmb text('Backup') ?></div>
<div class="inputrow">
<?lsmb INCLUDE button element_data = {
@@ -42,6 +55,7 @@
text = text('Backup Roles') #'
} ?>
</div>
+<?lsmb END ?>
</form>
</body>
</html>
Modified: trunk/common.pl
===================================================================
--- trunk/common.pl 2012-11-19 04:09:13 UTC (rev 5206)
+++ trunk/common.pl 2012-11-19 04:32:43 UTC (rev 5207)
@@ -34,12 +34,12 @@
if ( !$script ) { # http redirect to login.pl if called w/no args
print "Location: login.pl\n";
print "Content-type: text/html\n\n";
- exit;
+ return;
}
if (first { $_ eq $script } @{LedgerSMB::Sysconfig::newscripts}){
print "Location: $form->{callback}\n";
print "Content-type: text/html\n\n";
- exit;
+ return;
}
$form->error(
$locale->text(
Modified: trunk/ledgersmb.conf.default
===================================================================
--- trunk/ledgersmb.conf.default 2012-11-19 04:09:13 UTC (rev 5206)
+++ trunk/ledgersmb.conf.default 2012-11-19 04:32:43 UTC (rev 5207)
@@ -15,6 +15,11 @@
# and selection. An example might be /var/www/ledgersmb_css/
fs_cssdir = css/
+# If set to a true value this caches templates. Typically it will be set to 0
+# to disable or 1 to enable.
+
+cache_templates = 0
+
# Set language for login and admin pages
language =
Modified: trunk/old-handler.pl
===================================================================
--- trunk/old-handler.pl 2012-11-19 04:09:13 UTC (rev 5206)
+++ trunk/old-handler.pl 2012-11-19 04:32:43 UTC (rev 5207)
@@ -237,11 +237,11 @@
#check for valid session
if ( !LedgerSMB::Session::check( $cookie{${LedgerSMB::Sysconfig::cookie_name}}, $form ) ) {
&getpassword(1);
- exit;
+ return;
}
}
else {
- exit;
+ return;
}
}
Modified: trunk/sql/modules/Roles.sql
===================================================================
--- trunk/sql/modules/Roles.sql 2012-11-19 04:09:13 UTC (rev 5206)
+++ trunk/sql/modules/Roles.sql 2012-11-19 04:32:43 UTC (rev 5207)
@@ -1603,7 +1603,10 @@
INSERT INTO menu_acl (node_id, acl_type, role_name)
values (191, 'allow', 'public');
+-- "New Window" menu item
INSERT INTO menu_acl (node_id, acl_type, role_name)
+values (192, 'allow', 'public');
+INSERT INTO menu_acl (node_id, acl_type, role_name)
values (193, 'allow', 'public');
-- PERMISSIONS ENFORCEMENT PER ENTITY CLASS
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.