[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
SF.net SVN: ledger-smb:[4751] trunk
- Subject: SF.net SVN: ledger-smb:[4751] trunk
- From: ..hidden..
- Date: Tue, 22 May 2012 10:24:01 +0000
Revision: 4751
http://ledger-smb.svn.sourceforge.net/ledger-smb/?rev=4751&view=rev
Author: einhverfr
Date: 2012-05-22 10:24:00 +0000 (Tue, 22 May 2012)
Log Message:
-----------
Merging branches/1.3
Also some efforts to correct errors in PGNumber
Modified Paths:
--------------
trunk/Changelog
trunk/LedgerSMB/DBObject/Entity/Credit_Account.pm
trunk/LedgerSMB/PGNumber.pm
trunk/LedgerSMB/ScriptLib/Company.pm
trunk/UI/Contact/divs/credit.html
trunk/t/02-number-handling.t
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-4725
+ /branches/1.3:3711-4750
Modified: trunk/Changelog
===================================================================
--- trunk/Changelog 2012-05-22 08:36:49 UTC (rev 4750)
+++ trunk/Changelog 2012-05-22 10:24:00 UTC (rev 4751)
@@ -54,6 +54,7 @@
* Added ODS pricelists (Chris T)
* Better CSV escaping (Chris T, h/t Erik H)
* Fixed menu errors preventing quote/rfq template editing (Chris T, 3524793)
+* Fixed customer email not showing emailing statements (Chris T and Erik H)
Changelog for 1.3.17
Modified: trunk/LedgerSMB/DBObject/Entity/Credit_Account.pm
===================================================================
--- trunk/LedgerSMB/DBObject/Entity/Credit_Account.pm 2012-05-22 08:36:49 UTC (rev 4750)
+++ trunk/LedgerSMB/DBObject/Entity/Credit_Account.pm 2012-05-22 10:24:00 UTC (rev 4751)
@@ -372,6 +372,7 @@
sub save {
my ($self) = @_;
+ warn $self->{entity_class};
my ($ref) = $self->exec_method({funcname => 'eca__save'});
if (@{$self->{tax_ids}}){
$self->exec_method(funcname => 'eca__set_taxes');
Modified: trunk/LedgerSMB/PGNumber.pm
===================================================================
--- trunk/LedgerSMB/PGNumber.pm 2012-05-22 08:36:49 UTC (rev 4750)
+++ trunk/LedgerSMB/PGNumber.pm 2012-05-22 10:24:00 UTC (rev 4751)
@@ -194,14 +194,17 @@
$places = 0 unless defined $places and ($places > 0);
my $zfill = ($places > 0) ? 1 : 0;
$dplaces = 10 unless defined $dplaces;
- my $formatter = new Number::Format(
- -thousands_sep => $lsmb_formats->{$format}->{thousands_sep},
+ my $ts = $lsmb_formats->{$format}->{thousands_sep};
+ my $formatter = Number::Format::new(
+ -thousands_sep => $ts,
-decimal_point => $lsmb_formats->{$format}->{decimal_sep},
- -decimal_fill => $zfill,
- -neg_format => 'x');
+ -decimal_fill => $zfill,
+ -neg_format => 'x'
+ );
$str = $formatter->format_number($str, $dplaces);
- my $neg_format = ($args{neg_format}) ? $args{neg_format} : 'def';
+ my $neg_format = (defined $args{neg_format}) ? $args{neg_format} : 'def';
+ $neg_format = 'def' unless $neg_format eq 'paren' or $neg_format eq 'DRCR';
my $fmt = ($is_neg) ? $lsmb_neg_formats->{$neg_format}->{neg}
: $lsmb_neg_formats->{$neg_format}->{pos};
Modified: trunk/LedgerSMB/ScriptLib/Company.pm
===================================================================
--- trunk/LedgerSMB/ScriptLib/Company.pm 2012-05-22 08:36:49 UTC (rev 4750)
+++ trunk/LedgerSMB/ScriptLib/Company.pm 2012-05-22 10:24:00 UTC (rev 4751)
@@ -662,7 +662,6 @@
my ($request) = @_;
my $company;
my @taxes;
- $request->{entity_class} = $request->{account_class};
if (!$request->{ar_ap_account_id}){
$request->error(
@@ -679,7 +678,7 @@
}
if (_close_form($request)){
LedgerSMB::DBObject::Entity::Credit_Account->prepare_input($request);
- $credit = LedgerSMB::DBObject::Entity::Credit_Account->new(%$request);
+ $credit = LedgerSMB::DBObject::Entity::Credit_Account->new(%$request);
$credit->save();
}
get($request);
Property changes on: trunk/LedgerSMB/Scripts/account.pm
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/1.3/LedgerSMB/Scripts/account.pm:4369-4725
/branches/1.3/scripts/account.pl:3711-4368
+ /branches/1.3/LedgerSMB/Scripts/account.pm:4369-4750
/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-4725
/branches/1.3/scripts/admin.pl:3711-4678
+ /branches/1.3/LedgerSMB/Scripts/admin.pm:3901-4750
/branches/1.3/scripts/admin.pl:3711-4678
Property changes on: trunk/LedgerSMB/Scripts/customer.pm
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/1.3/LedgerSMB/Scripts/customer.pm:4288-4725
/branches/1.3/scripts/customer.pl:4273-4287
+ /branches/1.3/LedgerSMB/Scripts/customer.pm:4288-4750
/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-4725
/branches/1.3/scripts/employee.pl:3842-3843,4273-4287,4289-4310
+ /branches/1.3/LedgerSMB/Scripts/employee.pm:3712-4750
/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-4725
/branches/1.3/scripts/file.pl:3711-4138
+ /branches/1.3/LedgerSMB/Scripts/file.pm:3711-4750
/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-4725
/branches/1.3/scripts/journal.pl:3711-4328
+ /branches/1.3/LedgerSMB/Scripts/journal.pm:4288-4750
/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-4725
/branches/1.3/scripts/login.pl:3711-4192
+ /branches/1.3/LedgerSMB/Scripts/login.pm:4193-4750
/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-4725
/branches/1.3/scripts/menu.pl:3711-4192,4273-4287
+ /branches/1.3/LedgerSMB/Scripts/menu.pm:4155-4750
/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-4725
/branches/1.3/scripts/payment.pl:3711-4680
+ /branches/1.3/LedgerSMB/Scripts/payment.pm:4010-4750
/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-4725
/branches/1.3/scripts/recon.pl:4194-4271,4273-4287,4393-4438
+ /branches/1.3/LedgerSMB/Scripts/recon.pm:3711-4750
/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-4725
/branches/1.3/scripts/setup.pl:3711-4550
+ /branches/1.3/LedgerSMB/Scripts/setup.pm:3937-4750
/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:4193-4725
/branches/1.3/scripts/taxform.pl:3711-4192,4273-4287
+ /branches/1.3/LedgerSMB/Scripts/taxform.pm:4193-4750
/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-4725
/branches/1.3/scripts/vendor.pl:4273-4287
+ /branches/1.3/LedgerSMB/Scripts/vendor.pm:4288-4750
/branches/1.3/scripts/vendor.pl:4273-4287
Modified: trunk/UI/Contact/divs/credit.html
===================================================================
--- trunk/UI/Contact/divs/credit.html 2012-05-22 08:36:49 UTC (rev 4750)
+++ trunk/UI/Contact/divs/credit.html 2012-05-22 10:24:00 UTC (rev 4751)
@@ -35,17 +35,21 @@
<?lsmb PROCESS input element_data = {
type = "hidden"
name = "entity_id"
- value = credit_act.entity_id
+ value = entity_id
} ?>
<?lsmb PROCESS input element_data = {
type = "hidden"
name = "id"
value = credit_act.id
} ?>
- <?lsmb PROCESS input element_data = {
+ <?lsmb ec = credit_act.entity_class;
+ IF !ec;
+ ec=account_class;
+ END;
+ PROCESS input element_data = {
type = "hidden"
- name = "account_class"
- value = credit_act.entity_class
+ name = "entity_class"
+ value = ec
} ?>
<table>
<tr class="eca_row">
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-4725
/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-4750
/branches/1.3/sql/upgrade/1.2-1.3.sql:3711-3851
/trunk/sql/upgrade/1.2-1.3.sql:858-3710
Modified: trunk/t/02-number-handling.t
===================================================================
--- trunk/t/02-number-handling.t 2012-05-22 08:36:49 UTC (rev 4750)
+++ trunk/t/02-number-handling.t 2012-05-22 10:24:00 UTC (rev 4751)
@@ -74,6 +74,7 @@
};
foreach my $format (0 .. $#formats) {
%myconfig = (numberformat => $formats[$format][0]);
+ $LedgerSMB::App_State::User = \%myconfig;
$test_args->{format} = $formats[$format][0];
my $thou = $formats[$format][1];
my $dec = $formats[$format][2];
@@ -100,6 +101,7 @@
}
foreach my $format (0 .. $#formats) {
%myconfig = (numberformat => $formats[$format][0]);
+ $LedgerSMB::App_State::User = \%myconfig;
my $thou = $formats[$format][1];
my $dec = $formats[$format][2];
foreach my $rawValue ('10t000d00', '9t999d99', '333d33',
@@ -128,6 +130,7 @@
foreach my $format (0 .. $#formats) {
%myconfig = (numberformat => $formats[$format][0]);
+ $LedgerSMB::App_State::User = \%myconfig;
my $thou = $formats[$format][1];
my $dec = $formats[$format][2];
foreach my $rawValue ('10t000d00', '9t999d99', '333d33',
@@ -153,6 +156,7 @@
foreach my $format (0 .. $#formats) {
%myconfig = (numberformat => $formats[$format][0]);
+ $LedgerSMB::App_State::User = \%myconfig;
my $thou = $formats[$format][1];
my $dec = $formats[$format][2];
my $rawValue = '6d00';
@@ -267,6 +271,7 @@
foreach my $format (0 .. $#formats) {
%myconfig = (numberformat => $formats[$format][0]);
+ $LedgerSMB::App_State::User = \%myconfig;
my $thou = $formats[$format][1];
my $dec = $formats[$format][2];
foreach my $rawValue ('10t000d00', '9t999d99', '333d33',
@@ -296,6 +301,7 @@
foreach my $format (0 .. $#formats) {
%myconfig = ('numberformat' => $formats[$format][0]);
+ $LedgerSMB::App_State::User = \%myconfig;
my $thou = $formats[$format][1];
my $dec = $formats[$format][2];
foreach my $rawValue ('10t000d00', '9t999d99', '333d33',
@@ -341,6 +347,7 @@
foreach my $format (0 .. $#formats) {
%myconfig = ('numberformat' => $formats[$format][0]);
+ $LedgerSMB::App_State::User = \%myconfig;
my $thou = $formats[$format][1];
my $dec = $formats[$format][2];
foreach my $rawValue ('10t000d00', '9t999d99', '333d33',
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.