[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
SF.net SVN: ledger-smb:[4879] trunk
- Subject: SF.net SVN: ledger-smb:[4879] trunk
- From: ..hidden..
- Date: Sun, 10 Jun 2012 03:41:32 +0000
Revision: 4879
http://ledger-smb.svn.sourceforge.net/ledger-smb/?rev=4879&view=rev
Author: einhverfr
Date: 2012-06-10 03:41:32 +0000 (Sun, 10 Jun 2012)
Log Message:
-----------
Merging from branches/1.3
Modified Paths:
--------------
trunk/Changelog
trunk/LedgerSMB/DBObject/Account.pm
trunk/UI/rp-search.html
trunk/UI/setup/upgrade_info.html
Property Changed:
----------------
trunk/
trunk/LedgerSMB/Scripts/account.pm
trunk/LedgerSMB/Scripts/admin.pm
trunk/LedgerSMB/Scripts/contact.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/sql/upgrade/1.2-1.3-manual.sql
Property changes on: trunk
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/1.3:3711-4874
+ /branches/1.3:3711-4878
Modified: trunk/Changelog
===================================================================
--- trunk/Changelog 2012-06-10 00:21:37 UTC (rev 4878)
+++ trunk/Changelog 2012-06-10 03:41:32 UTC (rev 4879)
@@ -65,6 +65,7 @@
* Fixed show/hide logic on nav bar on Contacts screen (Chris T)
* Fixed "Post as Shown" button not showing properly on AR/AP drafts (Chris T)
* Added fs_cssdir config option for easier packaging (Chris T, h/t Robert C)
+* Fixed discarded input/bad label on 1.2 upgrade screen (Chris T, h/t Robert C)
Changelog for 1.3.18
* Fixed missing template for CSV pricelists (Chris T)
Modified: trunk/LedgerSMB/DBObject/Account.pm
===================================================================
--- trunk/LedgerSMB/DBObject/Account.pm 2012-06-10 00:21:37 UTC (rev 4878)
+++ trunk/LedgerSMB/DBObject/Account.pm 2012-06-10 03:41:32 UTC (rev 4879)
@@ -103,6 +103,9 @@
for my $ref (@accounts){
bless $ref, 'LedgerSMB::DBObject::Account';
$ref->merge($self, keys => ['_user', '_locale', 'stylesheet', 'dbh', '_roles', '_request']);
+ if ($ref->{is_temp} and ($ref->{category} eq 'Q')){
+ $ref->{category} = 'Qt';
+ }
push (@{$self->{account_list}}, $ref);
}
return @{$self->{account_list}};
Property changes on: trunk/LedgerSMB/Scripts/account.pm
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/1.3/LedgerSMB/Scripts/account.pm:3712-4874
/branches/1.3/scripts/account.pl:3711-4368
+ /branches/1.3/LedgerSMB/Scripts/account.pm:3712-4878
/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:3712-4874
/branches/1.3/scripts/admin.pl:3711-4678
+ /branches/1.3/LedgerSMB/Scripts/admin.pm:3712-4878
/branches/1.3/scripts/admin.pl:3711-4678
Property changes on: trunk/LedgerSMB/Scripts/contact.pm
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/1.3/LedgerSMB/Scripts/contact.pm:4783-4874
/branches/1.3/LedgerSMB/Scripts/customer.pm:3712-4782
/branches/1.3/scripts/customer.pl:4273-4287
+ /branches/1.3/LedgerSMB/Scripts/contact.pm:4783-4878
/branches/1.3/LedgerSMB/Scripts/customer.pm:3712-4782
/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-4874
/branches/1.3/scripts/employee.pl:3842-3843,4273-4287,4289-4310
+ /branches/1.3/LedgerSMB/Scripts/employee.pm:3712-4878
/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-4874
/branches/1.3/scripts/file.pl:3711-4859
+ /branches/1.3/LedgerSMB/Scripts/file.pm:3711-4878
/branches/1.3/scripts/file.pl:3711-4859
Property changes on: trunk/LedgerSMB/Scripts/journal.pm
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/1.3/LedgerSMB/Scripts/journal.pm:3712-4874
/branches/1.3/scripts/journal.pl:3711-4328
+ /branches/1.3/LedgerSMB/Scripts/journal.pm:3712-4878
/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:3712-4874
/branches/1.3/scripts/login.pl:3711-4192
+ /branches/1.3/LedgerSMB/Scripts/login.pm:3712-4878
/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:3712-4874
/branches/1.3/scripts/menu.pl:3711-4192,4273-4287
+ /branches/1.3/LedgerSMB/Scripts/menu.pm:3712-4878
/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:3712-4874
/branches/1.3/scripts/payment.pl:3711-4680
+ /branches/1.3/LedgerSMB/Scripts/payment.pm:3712-4878
/branches/1.3/scripts/payment.pl:3711-4680
Property changes on: trunk/LedgerSMB/Scripts/recon.pm
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/1.3/LedgerSMB/Scripts/recon.pm:3711-4874
/branches/1.3/scripts/recon.pl:4194-4271,4273-4287,4393-4438
+ /branches/1.3/LedgerSMB/Scripts/recon.pm:3711-4878
/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:3712-4874
/branches/1.3/scripts/setup.pl:3711-4550
+ /branches/1.3/LedgerSMB/Scripts/setup.pm:3712-4878
/branches/1.3/scripts/setup.pl:3711-4550
Property changes on: trunk/LedgerSMB/Scripts/taxform.pm
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/1.3/LedgerSMB/Scripts/taxform.pm:3712-4874
/branches/1.3/scripts/taxform.pl:3711-4192,4273-4287
+ /branches/1.3/LedgerSMB/Scripts/taxform.pm:3712-4878
/branches/1.3/scripts/taxform.pl:3711-4192,4273-4287
Modified: trunk/UI/rp-search.html
===================================================================
--- trunk/UI/rp-search.html 2012-06-10 00:21:37 UTC (rev 4878)
+++ trunk/UI/rp-search.html 2012-06-10 03:41:32 UTC (rev 4879)
@@ -1,7 +1,7 @@
<?lsmb INCLUDE 'ui-header.html' ?>
<?lsmb PROCESS elements.html ?>
<body>
-<form method="post" action="<?lsmb form.script ?>">
+<form method="g.t" action="<?lsmb form.script ?>">
<table width="100%">
<tr><th class="listtop"><?lsmb form.title ?></th></tr>
<tr><td> </td></tr>
Modified: trunk/UI/setup/upgrade_info.html
===================================================================
--- trunk/UI/setup/upgrade_info.html 2012-06-10 00:21:37 UTC (rev 4878)
+++ trunk/UI/setup/upgrade_info.html 2012-06-10 03:41:32 UTC (rev 4879)
@@ -4,8 +4,8 @@
<?lsmb PROCESS elements.html ?>
<body>
<h2><?lsmb text('Database Management Console') ?></h2>
-<div class="listtop"><?lsmb text('Enter User') ?></div>
-<form action="setup.pl" method="POST" name="new_user">
+<div class="listtop"><?lsmb text('Upgrade Info') ?></div>
+<form action="setup.pl" method="POST" name="upgrade_info">
<?lsmb INCLUDE input element_data = {
name = 'database'
type = 'hidden'
@@ -14,14 +14,6 @@
<div class="form">
<div class="input_row">
<?lsmb INCLUDE input element_data = {
- name = 'contribdir'
- type = 'text'
- label = text('Contrib Dir') #'
- class = 'directory'
-} ?>
-</div>
-<div class="input_row">
-<?lsmb INCLUDE input element_data = {
name = 'default_country'
type = 'text'
label = text('Default Country') #'
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-4874
/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-4878
/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.