[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
SF.net SVN: ledger-smb:[4392] trunk
- Subject: SF.net SVN: ledger-smb:[4392] trunk
- From: ..hidden..
- Date: Wed, 07 Mar 2012 02:06:30 +0000
Revision: 4392
http://ledger-smb.svn.sourceforge.net/ledger-smb/?rev=4392&view=rev
Author: einhverfr
Date: 2012-03-07 02:06:29 +0000 (Wed, 07 Mar 2012)
Log Message:
-----------
Merging in branches/1.3
Modified Paths:
--------------
trunk/Changelog
trunk/LedgerSMB/JC.pm
trunk/LedgerSMB/Scripts/setup.pm
trunk/UI/payments/payment1_5.html
trunk/doc/release_notes
trunk/sql/Pg-database.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-4384
+ /branches/1.3:3711-4391
Modified: trunk/Changelog
===================================================================
--- trunk/Changelog 2012-03-07 00:52:41 UTC (rev 4391)
+++ trunk/Changelog 2012-03-07 02:06:29 UTC (rev 4392)
@@ -35,6 +35,9 @@
* Reduced log messages when upgrading/creating db, for some log levels (Chris T)
* Changed db setup not to use createdb for simple admin of pg_hba.conf (Chris T)
* Corrected type = 'password' not handled properly in elements.html (Chris T)
+* Non-billable information now retained in db for timecards (Chris T)
+* Corrected character encoding issue with backup scripts (Chris T)
+* Changes in the single payment UI to minimize mouse movements (Erik H)
Changelog for 1.3.12
* Corrected processing of <?lsmb tags in order/invoice numbers (Chris T)
Modified: trunk/LedgerSMB/JC.pm
===================================================================
--- trunk/LedgerSMB/JC.pm 2012-03-07 00:52:41 UTC (rev 4391)
+++ trunk/LedgerSMB/JC.pm 2012-03-07 02:06:29 UTC (rev 4392)
@@ -61,7 +61,8 @@
to_char(j.checkedout, 'HH24:MI:SS')
AS checkedouta,
to_char(j.checkedin, ?) AS transdate,
- e.name AS employee, p.partnumber,
+ e.name AS employee, e.id as employee_id,
+ p.partnumber,
pr.control_code,
pr.description AS projectdescription,
FROM jcitems j
@@ -84,6 +85,8 @@
delete $form->{"${_}a"};
}
+ $form->{noncharge} = $form->{non_billable};
+
$query = qq|
SELECT s.printed, s.spoolfile, s.formname
FROM status s
@@ -446,7 +449,14 @@
my $sth;
my ( $null, $project_id ) = split /--/, $form->{projectnumber};
+ for (qw(qty sellprice allocated noncharge)) {
+ $form->{$_} = $form->parse_amount( $myconfig, $form->{$_} );
+ }
+ my ($total, $nonbillable);
+ $nonbillable = $form->{noncharge} || 0;
+ $total = $form->{qty} + $nonbillable;
+
if ( $form->{id} ) {
# check if it was a job
@@ -485,10 +495,12 @@
my $uid = localtime;
$uid .= "$$";
- $query = qq|INSERT INTO jcitems (description, person_id)
- SELECT '$uid', id
+ $query = qq|INSERT INTO jcitems
+ (description, person_id, total, non_billable)
+ SELECT ?, id, ?, ?
FROM person WHERE entity_id = person__get_my_entity_id()|;
- $dbh->do($query) || $form->dberror($query);
+ my $isth = $dbh->prepare($query) || $form->dberror($query);
+ $isth->execute($uid, $total, $nonbillable)|| $form->dberror($query);
$query = qq|SELECT id FROM jcitems WHERE description = '$uid'|;
( $form->{id} ) = $dbh->selectrow_array($query);
@@ -531,7 +543,9 @@
checkedout = ?::timestamp,
person_id = (SELECT id FROM person
WHERE entity_id = ?),
- notes = ?
+ notes = ?,
+ total = ?,
+ non_billable = ?
WHERE id = ?|;
$sth = $dbh->prepare($query);
$sth->execute(
@@ -547,6 +561,8 @@
"$outdate $form->{outhour}:$form->{outmin}:$form->{outsec}",
$form->{employee_id},
$form->{notes},
+ $total,
+ $nonbillable,
$form->{id}
) || $form->dberror($query);
Property changes on: trunk/LedgerSMB/Scripts/account.pm
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/1.3/LedgerSMB/Scripts/account.pm:4369-4384
/branches/1.3/scripts/account.pl:3711-4368
+ /branches/1.3/LedgerSMB/Scripts/account.pm:4369-4391
/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-4384
/branches/1.3/scripts/admin.pl:3711-3903,4273-4287
+ /branches/1.3/LedgerSMB/Scripts/admin.pm:3901-4391
/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-4384
/branches/1.3/scripts/customer.pl:4273-4287
+ /branches/1.3/LedgerSMB/Scripts/customer.pm:4288-4391
/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-4384
/branches/1.3/scripts/employee.pl:3842-3843,4273-4287,4289-4310
+ /branches/1.3/LedgerSMB/Scripts/employee.pm:3712-4391
/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-4384
/branches/1.3/scripts/file.pl:3711-4138
+ /branches/1.3/LedgerSMB/Scripts/file.pm:3711-4391
/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-4384
/branches/1.3/scripts/journal.pl:3711-4328
+ /branches/1.3/LedgerSMB/Scripts/journal.pm:4288-4391
/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-4384
/branches/1.3/scripts/login.pl:3711-4192
+ /branches/1.3/LedgerSMB/Scripts/login.pm:4193-4391
/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-4384
/branches/1.3/scripts/menu.pl:3711-4192,4273-4287
+ /branches/1.3/LedgerSMB/Scripts/menu.pm:4155-4391
/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-4384
/branches/1.3/scripts/payment.pl:3711-4310
+ /branches/1.3/LedgerSMB/Scripts/payment.pm:4010-4391
/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-4384
/branches/1.3/scripts/recon.pl:4194-4271,4273-4287
+ /branches/1.3/LedgerSMB/Scripts/recon.pm:3711-4391
/branches/1.3/scripts/recon.pl:4194-4271,4273-4287
Modified: trunk/LedgerSMB/Scripts/setup.pm
===================================================================
--- trunk/LedgerSMB/Scripts/setup.pm 2012-03-07 00:52:41 UTC (rev 4391)
+++ trunk/LedgerSMB/Scripts/setup.pm 2012-03-07 02:06:29 UTC (rev 4392)
@@ -59,6 +59,24 @@
company_name => $request->{database},
password => $creds->{password}}
);
+ my $server_info = $database->server_version;
+ my @sv_info = split(/\./, $server_info);
+ if (($sv_info[0] > 9)or ($sv_info[0] == 9 and $sv_info[1] >= 1)){
+ if (! -f "$ENV{PG_CONTRIB_DIR}/tablefunc.control"){
+ $request->error($request->{_locale}->text(
+ 'Cannot find Contrib scripts in [_1].',
+ $ENV{PG_CONTRIB_DIR}
+ ));
+ }
+ } else {
+ if (! -f "$ENV{PG_CONTRIB_DIR}/tablefunc.sql"){
+ $request->error($request->{_locale}->text(
+ 'Cannot find Contrib scripts in [_1].',
+ $ENV{PG_CONTRIB_DIR}
+ ));
+
+ }
+ }
my $version_info = $database->get_info();
if(!$request->{dbh}){$request->{dbh}=$database->{dbh};}#allow upper stack to disconnect dbh when leaving
@@ -215,7 +233,14 @@
file => $backupfile,
);
$mail->send;
+ my $template = LedgerSMB::Template->new(
+ path => 'UI/setup',
+ template => 'complete',
+ format => 'HTML',
+ );
+ $template->render($request);
} elsif ($request->{backup_type} eq 'browser'){
+ binmode(STDOUT, ':bytes');
open BAK, '<', $backupfile;
my $cgi = CGI::Simple->new();
$backupfile =~ s/$LedgerSMB::Sysconfig::backuppath(\/)?//;
@@ -233,12 +258,6 @@
} else {
$request->error($request->{_locale}->text("Don't know what to do with backup"));
}
- my $template = LedgerSMB::Template->new(
- path => 'UI/setup',
- template => 'complete',
- format => 'HTML',
- );
- $template->render($request);
}
Property changes on: trunk/LedgerSMB/Scripts/setup.pm
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/1.3/LedgerSMB/Scripts/setup.pm:3937-4384
/branches/1.3/scripts/setup.pl:3711-4216,4273-4287
+ /branches/1.3/LedgerSMB/Scripts/setup.pm:3937-4391
/branches/1.3/scripts/setup.pl:3711-4391
Property changes on: trunk/LedgerSMB/Scripts/taxform.pm
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/1.3/LedgerSMB/Scripts/taxform.pm:4193-4384
/branches/1.3/scripts/taxform.pl:3711-4192,4273-4287
+ /branches/1.3/LedgerSMB/Scripts/taxform.pm:4193-4391
/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-4384
/branches/1.3/scripts/vendor.pl:4273-4287
+ /branches/1.3/LedgerSMB/Scripts/vendor.pm:4288-4391
/branches/1.3/scripts/vendor.pl:4273-4287
Modified: trunk/UI/payments/payment1_5.html
===================================================================
--- trunk/UI/payments/payment1_5.html 2012-03-07 00:52:41 UTC (rev 4391)
+++ trunk/UI/payments/payment1_5.html 2012-03-07 02:06:29 UTC (rev 4392)
@@ -42,11 +42,10 @@
<?lsmb i = i + 1; j = i % 2; alterning_style = "listrow$j" ?>
<tr class="<?lsmb alterning_style -?>">
- <td align="center"><?lsmb i -?> </td>
- <td align="center"><?lsmb item.name -?> </td>
<td align="center">
<input type="radio" name="vendor-customer" id="vendor-customer_id" value="<?lsmb item.id -?>--<?lsmb item.name -?>" />
</td>
+ <td align="center"><?lsmb item.name -?> </td>
<?lsmb END -?>
</table>
Modified: trunk/doc/release_notes
===================================================================
--- trunk/doc/release_notes 2012-03-07 00:52:41 UTC (rev 4391)
+++ trunk/doc/release_notes 2012-03-07 02:06:29 UTC (rev 4392)
@@ -1,7 +1,7 @@
RELEASE NOTES
LedgerSMB 1.3
-Latest Revision: 1.3.11, February 15, 2012.
+Latest Revision: 1.3.13, March 6, 2012.
1: Welcome to LedgerSMB
@@ -48,12 +48,20 @@
though it is expected that further improvements will occur in the move from 1.3
to 1.4.
+With this we hope to make LedgerSMB into a stable platform for more agile business
+application development. With an ERP system it is often about the platform, not about
+the out-of-the-box functionality.
+
2.2: Security
Prior to 1.3, security was not pervasively enforced in any real way through the
database. In 1.3, all user permissions are orchestrated via ROLES in the
underlying database, and permissions are rigorously enforced in this way.
+Role-based security provides a far better approach to security than the previous methods
+and since the permissions are now rigorously enforced, the overall security of the
+application is much better.
+
2.3: New Features
LedgerSMB 1.3 now supports separation of duties for transaction entry and bank
@@ -78,7 +86,30 @@
The contact management and reconciliation portions of the database have been
fully redesigned to provide more flexibility for customization.
+2.5: Multicompany operations
+
+LedgerSMB 1.3 continues to use multiple physical databases for separate companies as
+did 1.2. The major difference is that now users are database users, and since database
+users are global to the database cluster, they can now be shared (or not) between
+companies.
+
+Global users can be imported into new companies (though first and last name,
+and employee number need not be shared between the accounts). Permissions can be
+assigned separately on different databases.
+
+2.6: Fixed Asset Handling
+
+LedgerSMB 1.3 comes with a fixed asset module, meaning you can now define your assets,
+depreciate them, and dispose of them either entirely or partially.
+
+The fixed asset system is designed to be extensible. Currently only time-based,
+straight-line depreciations are included. However the system is designed to allow the
+creation of new depreciation methods including time-based and production-based methods.
+
3: Known Issues
+
+3.1: Reposting Invoices
+
Reposting invoices is known to cause inaccuracies cost of goods sold and
inventory accounts. This problem has been confirmed to affect SQL-Ledger 2.6.x
as well and is caused by problems involving the de-allocation and trasaction
@@ -86,11 +117,51 @@
repost invoices) in an upcoming version as we continue to re-engineer the
application.
-Also the current design of foreign exchange handling means that if you reverse a
-payment, the foreing exchange gains and losses will not be exactly reversed
-unless you are able to reverse on the same day. If reversed on different days the gain/loss will be realized per the time when the payment was in effect and
+3.2: Foreign exchange and payment reversals
+
+The current design of foreign exchange handling means that if you reverse a
+payment, the foreign exchange gains and losses will not be exactly reversed
+unless you are able to reverse on the same day. If reversed on different days the
+gain/loss will be realized per the time when the payment was in effect and
not reversed.
+
+3.3: Default CoA files miss Reconciliation assignment
+
+Currently reconciliation mappings are not set up when a new chart of accounts is loaded
+
+To work around this issue, go to the System/Chart of Accounts/List Accounts select each
+account you wish to be subject to the reconciliation workflow, check the recon box,
+click save. We are planning on fixing this in a future release.
+
+3.4: Password not set properly for new users with . in username
+
+Currently when you set up a user with a . in the username, the password is not properly
+set. The reason for this is unknown and we intend to fix in a future version.
+
+You can set the user's password in psql using ALTER USER ... WITH PASSWORD '...'; to
+work around this issue.
+
+3.5: XLS and ODS download buttons show even if prereqs missing
+
+Currently the XLS and ODS (Excel and OpenOffice) spreadsheet download buttons show even
+if the prerequisites are not available. We intend to fix this in a future version.
+
+3.6: POS ignores pd_proto
+
+Currently in point of sales environments, in some cases, the connections back to the
+terminal in order to control pole displays seems tied to TCP even when one sets it to
+UDP. This can have significant issues regarding performance if this port is not open.
+
+The cause is unknown. It is believed to affect 1.2 as well. We expect to fix this
+in a future release.
+
+3.7: Can't add prices to pricelist from customer screen
+
+Currently the 1.3 pricelist functionality is defective and while new customers and
+vendors can be added to a part, one cannot add new parts to the customer. This is being
+actively worked on and we expect to finish it in the near future.
+
4: Differences between LedgerSMB and SQL-Ledger(TM)
4.1: Login name restrictions
@@ -139,11 +210,11 @@
(1.4.0). There is no guarantee we will reach these targets but we have them
anyway. These include:
-* Integrated budgetting module
+* Integrated budgetting module (included already)
* Rewritten reports
-* Rewritten project/department handling to include nested departments
-* Funds accounting
-* Rewritten Sales Orders
+* Rewritten project/department handling to include nested departments (largely included)
+* Funds accounting (largely included)
+* Rewritten Sales Orders (may be deferred)
* A framework for implementing payroll solutions
6: Get Involved
Modified: trunk/sql/Pg-database.sql
===================================================================
--- trunk/sql/Pg-database.sql 2012-03-07 00:52:41 UTC (rev 4391)
+++ trunk/sql/Pg-database.sql 2012-03-07 02:06:29 UTC (rev 4392)
@@ -2121,7 +2121,9 @@
checkedin timestamp with time zone,
checkedout timestamp with time zone,
person_id integer references person(id) not null,
- notes text
+ notes text,
+ total numeric not null,
+ non_billable numeric not null default 0
);
COMMENT ON TABLE jcitems IS $$ Time and materials cards.
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-4384
/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-4391
/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.