[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
SF.net SVN: ledger-smb:[4021] trunk
- Subject: SF.net SVN: ledger-smb:[4021] trunk
- From: ..hidden..
- Date: Mon, 21 Nov 2011 01:29:57 +0000
Revision: 4021
http://ledger-smb.svn.sourceforge.net/ledger-smb/?rev=4021&view=rev
Author: einhverfr
Date: 2011-11-21 01:29:57 +0000 (Mon, 21 Nov 2011)
Log Message:
-----------
Merging from branches/1.3
Modified Paths:
--------------
trunk/Changelog
trunk/LedgerSMB/IC.pm
trunk/LedgerSMB/ScriptLib/Company.pm
trunk/LedgerSMB/Sysconfig.pm
trunk/UI/Contact/contact.html
trunk/bin/aa.pl
trunk/bin/arap.pl
trunk/lsmb-request.pl
trunk/sql/modules/Roles.sql
Property Changed:
----------------
trunk/
trunk/LedgerSMB/Scripts/admin.pm
trunk/LedgerSMB/Scripts/employee.pm
trunk/LedgerSMB/Scripts/payment.pm
trunk/LedgerSMB/Scripts/setup.pm
trunk/sql/upgrade/1.2-1.3-manual.sql
Property changes on: trunk
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/1.3:3711-4009
+ /branches/1.3:3711-4020
Modified: trunk/Changelog
===================================================================
--- trunk/Changelog 2011-11-21 00:37:54 UTC (rev 4020)
+++ trunk/Changelog 2011-11-21 01:29:57 UTC (rev 4021)
@@ -12,9 +12,19 @@
Changelog for LedgerSMB 1.3.6
* Including xelatex templates under directory templates/xedemo (Chris T)
* Fix for company name in order entry (David B)
+* Corrected UI dropdown box issue on ar/ap transaction screen (Herman V)
+* Corrected minor workflow issues on AR/AP transactions (Herman V)
+* Corrected permissions for users creating employee records (Chris T)
+* Corrected error when trying to save employee location as new (Chris T)
+* Corrected save as new overwriting existing for vendors/customers (Chris T)
+* Logging improvements (Herman V)
+* Fixed SQL errors in Goods and Services/All Items report (David B)
+* Corrected issue saving country in contact.html (Pongracz I)
Chris T is Chris Travers
David B is David Bandel
+Herman V is Herman Vierendeels
+Pongracz I is Pongracz Istvan
Changelog for LedgerSMB 1.3.5
* Fixing Menu and Permissions bug 3430820 (Chris T)
Modified: trunk/LedgerSMB/IC.pm
===================================================================
--- trunk/LedgerSMB/IC.pm 2011-11-21 00:37:54 UTC (rev 4020)
+++ trunk/LedgerSMB/IC.pm 2011-11-21 01:29:57 UTC (rev 4021)
@@ -1230,8 +1230,8 @@
p.weight, p.avgcost, p.priceupdate, p.image,
p.drawing, p.microfiche, p.assembly,
pg.partsgroup, a.invnumber, a.ordnumber,
- a.quonumber, i.trans_id, ct.name,
- e.name AS employee, a.curr, a.till, p.notes
+ a.quonumber, i.trans_id, ct.employee_id,
+ CONCAT(e.first_name, ' ',e.last_name) AS employee, a.curr, a.till, p.notes
$makemodelfld|;
if ( $form->{bought} ) {
@@ -1256,8 +1256,8 @@
= ct.id)
LEFT JOIN partsgroup pg
ON (p.partsgroup_id = pg.id)
- LEFT JOIN employee e
- ON (a.employee_id = e.id)
+ LEFT JOIN employees e
+ ON (a.person_id = e.entity_id)
$makemodeljoin
WHERE $invwhere|;
$union = "
@@ -1280,11 +1280,11 @@
ON (p.id = i.parts_id)
JOIN ar a ON (a.id = i.trans_id)
JOIN entity_credit_account ct
- ON ar.entity_credit_account
+ ON a.entity_credit_account
= ct.id
LEFT JOIN partsgroup pg
ON (p.partsgroup_id = pg.id)
- LEFT JOIN employee e
+ LEFT JOIN employees e
ON (a.person_id = e.entity_id)
$makemodeljoin
WHERE $invwhere|;
@@ -1327,8 +1327,8 @@
p.weight, p.avgcost, p.priceupdate, p.image,
p.drawing, p.microfiche, p.assembly,
pg.partsgroup, '' AS invnumber, a.ordnumber,
- a.quonumber, i.trans_id, ct.name,
- e.name AS employee, a.curr, '0' AS till,
+ a.quonumber, i.trans_id, ct.employee_id,
+ CONCAT(e.first_name, ' ',e.last_name) AS employee, a.curr, '0' AS till,
p.notes
$makemodelfld|;
@@ -1351,11 +1351,11 @@
= ct.id
LEFT JOIN partsgroup pg
ON (p.partsgroup_id = pg.id)
- LEFT JOIN employee e
- ON (a.employee_id = e.id)
+ LEFT JOIN employees e
+ ON (a.person_id = e.entity_id)
$makemodeljoin
WHERE $ordwhere
- AND a.entity_credit_id
+ AND a.entity_credit_account
IS NOT NULL|;
$union = "
UNION ALL";
@@ -1371,7 +1371,8 @@
p.microfiche, p.assembly,
pg.partsgroup, '' AS invnumber,
a.ordnumber, a.quonumber,
- i.trans_id, ct.name,e.name AS employee,
+ i.trans_id, ct.employee_id,
+ CONCAT(e.first_name,' ',e.last_name) AS employee,
a.curr, '0' AS till, p.notes
$makemodelfld|;
@@ -1393,8 +1394,8 @@
= ct.id)
LEFT JOIN partsgroup pg
ON (p.partsgroup_id = pg.id)
- LEFT JOIN employee e
- ON (a.employee_id = e.id)
+ LEFT JOIN employees e
+ ON (a.person_id = e.entity_id)
$makemodeljoin
WHERE $ordwhere
AND a.entity_credit_account
@@ -1437,8 +1438,8 @@
p.weight, p.avgcost, p.priceupdate, p.image,
p.drawing, p.microfiche, p.assembly,
pg.partsgroup, '' AS invnumber, a.ordnumber,
- a.quonumber, i.trans_id, ct.name,
- e.name AS employee, a.curr, '0' AS till, p.notes
+ a.quonumber, i.trans_id, ct.employee_id,
+ CONCAT(e.first_name,' ',e.last_name) AS employee, a.curr, '0' AS till, p.notes
$makemodelfld|;
if ( $form->{quoted} ) {
@@ -1461,8 +1462,8 @@
= ct.id
LEFT JOIN partsgroup pg
ON (p.partsgroup_id = pg.id)
- LEFT JOIN employee e
- ON (a.employee_id = e.id)
+ LEFT JOIN employees e
+ ON (a.person_id = e.entity_id)
$makemodeljoin
WHERE $quowhere
AND a.entity_credit_account
@@ -1481,7 +1482,8 @@
p.microfiche, p.assembly,
pg.partsgroup, '' AS invnumber,
a.ordnumber, a.quonumber,
- i.trans_id, ct.name, e.name AS employee,
+ i.trans_id, ct.employee_id,
+ CONCAT(e.first_name,' ',e.last_name) AS employee,
a.curr, '0' AS till, p.notes
$makemodelfld|;
@@ -1503,8 +1505,8 @@
= ct.id)
LEFT JOIN partsgroup pg
ON (p.partsgroup_id = pg.id)
- LEFT JOIN employee e
- ON (a.employee_id = e.id)
+ LEFT JOIN employees e
+ ON (a.person_id = e.entity_id)
$makemodeljoin
WHERE $quowhere
AND a.entity_credit_account
Modified: trunk/LedgerSMB/ScriptLib/Company.pm
===================================================================
--- trunk/LedgerSMB/ScriptLib/Company.pm 2011-11-21 00:37:54 UTC (rev 4020)
+++ trunk/LedgerSMB/ScriptLib/Company.pm 2011-11-21 01:29:57 UTC (rev 4021)
@@ -267,7 +267,7 @@
sub save_new_location {
my ($request) = @_;
- delete $requet->{location_id};
+ delete $request->{location_id};
add_location($request);
}
Property changes on: trunk/LedgerSMB/Scripts/admin.pm
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/1.3/LedgerSMB/Scripts/admin.pm:3901-4009
/branches/1.3/scripts/admin.pl:3711-3903
+ /branches/1.3/LedgerSMB/Scripts/admin.pm:3901-4020
/branches/1.3/scripts/admin.pl:3711-3903
Property changes on: trunk/LedgerSMB/Scripts/employee.pm
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/1.3/LedgerSMB/Scripts/employee.pm:3712-4009
/branches/1.3/scripts/employee.pl:3842-3843
+ /branches/1.3/LedgerSMB/Scripts/employee.pm:3712-4020
/branches/1.3/scripts/employee.pl:3842-3843
Property changes on: trunk/LedgerSMB/Scripts/payment.pm
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/1.3/scripts/payment.pl:3711-4011
+ /branches/1.3/LedgerSMB/Scripts/payment.pm:4010-4020
/branches/1.3/scripts/payment.pl:3711-4011
Property changes on: trunk/LedgerSMB/Scripts/setup.pm
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/1.3/LedgerSMB/Scripts/setup.pm:3937-4009
/branches/1.3/scripts/setup.pl:3711-3967
+ /branches/1.3/LedgerSMB/Scripts/setup.pm:3937-4020
/branches/1.3/scripts/setup.pl:3711-3967
Modified: trunk/LedgerSMB/Sysconfig.pm
===================================================================
--- trunk/LedgerSMB/Sysconfig.pm 2011-11-21 00:37:54 UTC (rev 4020)
+++ trunk/LedgerSMB/Sysconfig.pm 2011-11-21 01:29:57 UTC (rev 4021)
@@ -145,7 +145,11 @@
# Log4perl configuration
our $log4perl_config = qq(
- log4perl.rootlogger = $log_level, Screen, Basic
+ log4perl.rootlogger = $log_level, Basic, Debug
+ #some examples of loglevel setting for modules
+ log4perl.logger.LedgerSMB.DBObject = INFO
+ log4perl.logger.LedgerSMB.Handler = DEBUG
+
log4perl.appender.Screen = Log::Log4perl::Appender::Screen
log4perl.appender.Screen.layout = SimpleLayout
# Filter for debug level
Modified: trunk/UI/Contact/contact.html
===================================================================
--- trunk/UI/Contact/contact.html 2011-11-21 00:37:54 UTC (rev 4020)
+++ trunk/UI/Contact/contact.html 2011-11-21 01:29:57 UTC (rev 4021)
@@ -325,7 +325,7 @@
value_attr = "id"
default_values = [country_id]
options = country_list
- name = "country_id_t"
+ name = "country_id"
label = text('Country')
} ?>
</div>
Modified: trunk/bin/aa.pl
===================================================================
--- trunk/bin/aa.pl 2011-11-21 00:37:54 UTC (rev 4020)
+++ trunk/bin/aa.pl 2011-11-21 01:29:57 UTC (rev 4021)
@@ -1015,7 +1015,7 @@
elsif (!$form->{id}) {
for ( "post_as_new","delete","save_info",
- "print", 'copy', 'new_screen') {
+ "print", 'copy_to_new', 'new_screen') {
delete $button{$_};
}
@@ -1210,7 +1210,7 @@
}
}
}
- }
+ }#!$display
@taxaccounts = split / /, $form->{taxaccounts};
for (@taxaccounts) {
@@ -1346,13 +1346,14 @@
{
$form->{callback}.= qq|&batch_id=$form->{batch_id}|;
}
- edit();
+ if($form->{separate_duties}){edit();}
+ else {$form->redirect( $locale->text('Transaction posted!') );}
}
else {
$form->error( $locale->text('Cannot post transaction!') );
}
-}
+}#post end
# New Function Body starts Here
@@ -1623,6 +1624,7 @@
}
$name = $locale->text('Customer');
+ my $msgid_vc_number="Customer Number";
$l_name =
qq|<input name="l_name" class=checkbox type=checkbox value=Y checked> $name|;
$l_till =
@@ -1631,6 +1633,7 @@
if ( $form->{vc} eq 'vendor' ) {
$name = $locale->text('Vendor');
+ $msgid_vc_number="Vendor Number";
$l_till = "";
$l_name =
qq|<input name="l_name" class=checkbox type=checkbox value=Y checked> $name|;
@@ -1710,7 +1713,7 @@
<th align=right>$name</th>
<td colspan=3>$selectname</td>
</tr>
- <tr><th align="right">|.$locale->text("[_1] Number", $name).qq|</th>
+ <tr><th align="right">|.$locale->text("$msgid_vc_number").qq|</th>
<td colspan="3"><input name="meta_number" size="36">
</tr>
$employee
Modified: trunk/bin/arap.pl
===================================================================
--- trunk/bin/arap.pl 2011-11-21 00:37:54 UTC (rev 4020)
+++ trunk/bin/arap.pl 2011-11-21 01:29:57 UTC (rev 4021)
@@ -53,8 +53,7 @@
# end of main
sub check_name {
- my ($name) = @_;
-
+ my ($name) = @_;#vendor|customer
my ( $new_name, $new_id ) = split /--/, $form->{$name};
my $rv = 0;
@@ -88,6 +87,8 @@
else {
# check name, combine name and id
+ #HV $form->{$name} , form->vendor or form->customer , should be at least ' ' for comparison 'ne' to work.('' ne undef) returns undef.(' ' ne undef) returns 1
+ if(! $form->{$name}){$form->{$name}=' ';}
if ( $form->{"old$name"} ne qq|$form->{$name}--$form->{"${name}_id"}| )
{
Modified: trunk/lsmb-request.pl
===================================================================
--- trunk/lsmb-request.pl 2011-11-21 00:37:54 UTC (rev 4020)
+++ trunk/lsmb-request.pl 2011-11-21 01:29:57 UTC (rev 4021)
@@ -36,7 +36,7 @@
use LedgerSMB::CancelFurtherProcessing;
use strict;
-my $logger = Log::Log4perl->get_logger('');
+my $logger = Log::Log4perl->get_logger('LedgerSMB::Handler');
$logger->debug("Begin lsmb-request.pl");
@@ -53,6 +53,7 @@
$ENV{SCRIPT_NAME} =~ m/([^\/\\]*.pl)\?*.*$/;
my $script = $1;
+$logger->debug("\$ENV{SCRIPT_NAME}=$ENV{SCRIPT_NAME} \$request->{action}=$request->{action} \$script=$script");
my $locale;
@@ -72,6 +73,7 @@
$logger->debug("calling $script");
&call_script( $script, $request );
+$logger->debug("after calling script=$script action=$request->{action}");
# Prevent flooding the error logs with undestroyed connection warnings
$request->{dbh}->disconnect()
@@ -102,6 +104,7 @@
}
catch CancelFurtherProcessing with {
my $ex = shift;
+ $logger->debug("CancelFurtherProcessing \$ex=$ex");
};
}
1;
Modified: trunk/sql/modules/Roles.sql
===================================================================
--- trunk/sql/modules/Roles.sql 2011-11-21 00:37:54 UTC (rev 4020)
+++ trunk/sql/modules/Roles.sql 2011-11-21 01:29:57 UTC (rev 4021)
@@ -169,7 +169,7 @@
GRANT UPDATE ON person_to_company TO "lsmb_<?lsmb dbname ?>__contact_edit";
GRANT UPDATE ON person_to_contact TO "lsmb_<?lsmb dbname ?>__contact_edit";
GRANT UPDATE ON person_to_contact TO "lsmb_<?lsmb dbname ?>__contact_edit";
-GRANT UPDATE ON person_to_location TO "lsmb_<?lsmb dbname ?>__contact_edit";
+GRANT UPDATE, DELETE ON person_to_location TO "lsmb_<?lsmb dbname ?>__contact_edit";
GRANT UPDATE ON eca_to_location TO "lsmb_<?lsmb dbname ?>__contact_edit";
GRANT DELETE, INSERT ON vendortax TO "lsmb_<?lsmb dbname ?>__contact_edit";
GRANT DELETE, INSERT ON entity_bank_account TO "lsmb_<?lsmb dbname ?>__contact_edit";
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-4009
/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-4020
/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.