From 9ee05c2406f82b313e399781ddc655f5c72f4937 Mon Sep 17 00:00:00 2001 From: Chris Travers Date: Thu, 16 Oct 2014 00:44:08 -0700 Subject: [PATCH 1/5] Fixing bug 1240, false alarms of credit exceeded. --- Changelog | 1 + LedgerSMB/AA.pm | 1 + 2 files changed, 2 insertions(+) diff --git a/Changelog b/Changelog index 3b1d7d5357..f8a4cb3149 100644 --- a/Changelog +++ b/Changelog @@ -13,6 +13,7 @@ Changelog for 1.3.45 * Fixed bug 1251, some backports failing due to misplacing db cnx (Chris T) * Fixed bug 1241, join projection, amounts in invoice details report (Chris T) * Fixed internal server error on single payment interface (Chris T) +* Fixed bug 1240, false alarms of customer credit usage exceeded (Chris T) Chris T is Chris Travers diff --git a/LedgerSMB/AA.pm b/LedgerSMB/AA.pm index 7a48b6c011..2e8d7832b3 100755 --- a/LedgerSMB/AA.pm +++ b/LedgerSMB/AA.pm @@ -1427,6 +1427,7 @@ sub get_name { SELECT sum(o.amount * coalesce(e.$buysell, 1)) as used FROM oe o LEFT JOIN exchangerate e ON o.transdate = e.transdate + AND o.curr = e.curr WHERE not closed and oe_class_id in (1, 2) and entity_credit_account = ?) s|; From 5157b00d683498633c424ecbc4625fc500c8626d Mon Sep 17 00:00:00 2001 From: Istvan Pongracz Date: Thu, 16 Oct 2014 10:30:51 +0200 Subject: [PATCH 2/5] Adding tax_id hidden field to order and offer forms to be able to include it on tex templates --- Changelog | 2 ++ bin/oe.pl | 54 +++++++++++++++++++++++++++--------------------------- 2 files changed, 29 insertions(+), 27 deletions(-) diff --git a/Changelog b/Changelog index 3b1d7d5357..8b5799334a 100644 --- a/Changelog +++ b/Changelog @@ -13,8 +13,10 @@ Changelog for 1.3.45 * Fixed bug 1251, some backports failing due to misplacing db cnx (Chris T) * Fixed bug 1241, join projection, amounts in invoice details report (Chris T) * Fixed internal server error on single payment interface (Chris T) +* Adding tax_id hidden field to order and offer forms to be able to include it on tex templates (Pongracz I) Chris T is Chris Travers +Pongracz I is Pongracz Istvan Changelog for 1.3.44 * Allow blank salutations, bug 1204. (Chris T) diff --git a/bin/oe.pl b/bin/oe.pl index 55f832ba26..8899c699b7 100644 --- a/bin/oe.pl +++ b/bin/oe.pl @@ -608,7 +608,7 @@ sub form_header { if ($form->{notice}){ print qq|$form->{notice}
|; } - $form->hide_form(qw(entity_control_code meta_number address city)); + $form->hide_form(qw(entity_control_code meta_number tax_id address city)); $form->hide_form( qw(id type formname media format printed emailed queued vc title discount creditlimit creditremaining tradediscount business recurring form_id nextsub lock_description) @@ -2967,15 +2967,15 @@ sub display_ship_receive { qq|$description|; $column_data{qty} = qq|| - . $form->format_amount( \%myconfig, $form->{"qty_$i"} ) - . qq||; - $column_data{ship} = - qq||; - $column_data{unit} = -qq|$form->{"unit_$i"}|; - $column_data{bin} = + . $form->format_amount( \%myconfig, $form->{"qty_$i"} ) + . qq||; + $column_data{ship} = + qq||; + $column_data{unit} = +qq|$form->{"unit_$i"}|; + $column_data{bin} = qq|$form->{"bin_$i"}|; $column_data{serialnumber} = @@ -3303,16 +3303,16 @@ sub list_transfer { $column_data{partnumber} = qq|{id}>$ref->{partnumber}|; - $column_data{description} = "$ref->{description} "; - $column_data{partsgroup} = "$ref->{partsgroup} "; - $column_data{fromwarehouse} = -qq|$ref->{warehouse} |; - $column_data{towarehouse} = qq|$warehouse |; - $column_data{qty} = - qq|| - . $form->format_amount( \%myconfig, $ref->{qty} ) - . qq||; - $column_data{transfer} = qq||; + $column_data{description} = "$ref->{description} "; + $column_data{partsgroup} = "$ref->{partsgroup} "; + $column_data{fromwarehouse} = +qq|$ref->{warehouse} |; + $column_data{towarehouse} = qq|$warehouse |; + $column_data{qty} = + qq|| + . $form->format_amount( \%myconfig, $ref->{qty} ) + . qq||; + $column_data{transfer} = qq||; $j++; $j %= 2; @@ -3548,13 +3548,13 @@ sub po_orderitems { for (qw(required leadtime lastcost fx)) { $column_data{$_} = qq|$form->{"${_}_$i"}|; - } - - $column_data{qty} = -qq||; - - if ( $form->{"$form->{vc}_id_$i"} ) { - $name = $form->{"$form->{vc}_$i"}; + } + + $column_data{qty} = +qq||; + + if ( $form->{"$form->{vc}_id_$i"} ) { + $name = $form->{"$form->{vc}_$i"}; $name =~ s/--.*//; $column_data{name} = qq|$name|; $form->hide_form( "$form->{vc}_id_$i", "$form->{vc}_$i" ); From be172d4d52aa1c616e81ce81cad488813a925584 Mon Sep 17 00:00:00 2001 From: Chris Travers Date: Thu, 16 Oct 2014 07:14:15 -0700 Subject: [PATCH 3/5] Updating version numbers for 1.3.45 --- LedgerSMB.pm | 2 +- LedgerSMB/Form.pm | 4 ++-- VERSION | 2 +- dists/rpm/ledgersmb.spec | 2 +- dists/source/build.sh | 2 +- doc/release_notes | 2 +- sql/Pg-database.sql | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/LedgerSMB.pm b/LedgerSMB.pm index e9a2d2bbb2..ccc4710309 100755 --- a/LedgerSMB.pm +++ b/LedgerSMB.pm @@ -223,7 +223,7 @@ $CGI::Simple::POST_MAX = -1; package LedgerSMB; use base 'LedgerSMB::Request'; -our $VERSION = '1.3.44'; +our $VERSION = '1.3.45'; my $logger = Log::Log4perl->get_logger('LedgerSMB'); diff --git a/LedgerSMB/Form.pm b/LedgerSMB/Form.pm index baa7026915..07354f110c 100644 --- a/LedgerSMB/Form.pm +++ b/LedgerSMB/Form.pm @@ -166,8 +166,8 @@ sub new { #menubar will be deprecated, replaced with below $self->{lynx} = 1 if ( ( defined $self->{path} ) && ( $self->{path} =~ /lynx/i ) ); - $self->{version} = "1.3.44"; - $self->{dbversion} = "1.3.44"; + $self->{version} = "1.3.45"; + $self->{dbversion} = "1.3.45"; bless $self, $type; diff --git a/VERSION b/VERSION index 155d478ccd..38670bbf46 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.3.44 +1.3.45 diff --git a/dists/rpm/ledgersmb.spec b/dists/rpm/ledgersmb.spec index 29a88224a9..7983c84536 100644 --- a/dists/rpm/ledgersmb.spec +++ b/dists/rpm/ledgersmb.spec @@ -1,7 +1,7 @@ # RPM spec written for and tested on CentOS 4 and CentOS 5 Summary: LedgerSMB - Open Source accounting software Name: ledgersmb -Version: 1.3.44 +Version: 1.3.45 Release: 1 License: GPL URL: http://www.ledgersmb.org/ diff --git a/dists/source/build.sh b/dists/source/build.sh index eaee2000e7..c3bae9ca74 100644 --- a/dists/source/build.sh +++ b/dists/source/build.sh @@ -2,7 +2,7 @@ # Simple script to prepare for release -version="1.3.44"; +version="1.3.45"; build_d="../release"; if test -d $build_d/ledgersmb; then diff --git a/doc/release_notes b/doc/release_notes index 6f946fbd92..0734e08ca5 100644 --- a/doc/release_notes +++ b/doc/release_notes @@ -1,7 +1,7 @@ RELEASE NOTES LedgerSMB 1.3 -Latest Revision: 1.3.44, September 2014 +Latest Revision: 1.3.45, September 2014 1: Welcome to LedgerSMB diff --git a/sql/Pg-database.sql b/sql/Pg-database.sql index a3467f8e1f..48aad855c6 100644 --- a/sql/Pg-database.sql +++ b/sql/Pg-database.sql @@ -1027,7 +1027,7 @@ sinumber|1 sonumber|1 yearend|1 businessnumber|1 -version|1.3.44 +version|1.3.45 closedto|\N revtrans|1 ponumber|1 From 0b7fca949af49dd937456c78502a3779528c75d8 Mon Sep 17 00:00:00 2001 From: Chris Travers Date: Thu, 16 Oct 2014 18:20:25 -0700 Subject: [PATCH 4/5] Fixing changelog --- Changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Changelog b/Changelog index d126b7d759..650ea82eaa 100644 --- a/Changelog +++ b/Changelog @@ -3,7 +3,7 @@ Initial Release: Monday, Oct 12 2011 Supported Presently Changelog for 1.3.45 -* Cleaned up sql files so App::LedgerSMB::Admin (Chris T) +* Cleaned up sql files so App::LedgerSMB::Admin works (Chris T) * Fixed pricematrix prices not respected for vendors (Chris T, bug 1230) * Added tests for Sysconfig (Chris T, bug 1232) * Added first-rate starman/plack support (Chris T) From 1134fe8a52b88c29cfd208301cc50eef01c36489 Mon Sep 17 00:00:00 2001 From: Istvan Pongracz Date: Fri, 17 Oct 2014 22:59:30 +0200 Subject: [PATCH 5/5] Fix for bug 1258, manual tax on invoice screen did not respect number formats --- Changelog | 1 + bin/is.pl | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Changelog b/Changelog index 650ea82eaa..6b1b3079af 100644 --- a/Changelog +++ b/Changelog @@ -15,6 +15,7 @@ Changelog for 1.3.45 * Fixed internal server error on single payment interface (Chris T) * Fixed bug 1240, false alarms of customer credit usage exceeded (Chris T) * Adding tax_id hidden field to order and offer forms to be able to include it on tex templates (Pongracz I) +* Fixed bug 1258, manual tax number entries do not respect number formats (Pongracz I) Chris T is Chris Travers Pongracz I is Pongracz Istvan diff --git a/bin/is.pl b/bin/is.pl index 526075fbd4..f89498fc57 100644 --- a/bin/is.pl +++ b/bin/is.pl @@ -735,7 +735,7 @@ sub form_footer { * $form->{"mt_basis_$item"}; } $form->{invtotal} += $form->round_amount( - $form->{"mt_amount_$item"}, 2); + $form->parse_amount( \%myconfig, $form->{"mt_amount_$item"}), 2); # Setting this up as a table # Note that the screens may be not wide enough to display # this in the normal way so we have to change the layout of the @@ -744,7 +744,7 @@ sub form_footer { $form->{"${taccno}_description"} format_amount(\%myconfig, $form->{"mt_amount_$item"}, 2) .qq|" size="10"/> format_amount(\%myconfig, $form->{"mt_basis_$item"}, 2) .qq|" size="10"/>