Merge branch '1.3' of https://github.com/ledgersmb/LedgerSMB into led…

…gersmb-1.3
pongraczi · Oct 17, 2014 · 69a08e6 · 69a08e6
2 parents 5afa9f6 + 1134fe8
commit 69a08e6
Show file tree

Hide file tree

Showing 11 changed files with 18 additions and 13 deletions.
diff --git 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)
@@ -13,8 +13,12 @@ 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)
+* 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
 
 Changelog for 1.3.44
 * Allow blank salutations, bug 1204. (Chris T)

diff --git 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/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|;
 

diff --git 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
@@ -1 +1 @@
-1.3.44
+1.3.45
diff --git 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,15 +744,15 @@ sub form_footer {
                 <th align=right>$form->{"${taccno}_description"}</th>
                 <td><input type="text" name="mt_amount_$item"
                         id="mt-amount-$item" value="|
-                        .$form->format_amount(\%myconfig, $form->{"mt_amount_$item"}) 
+                        .$form->format_amount(\%myconfig, $form->{"mt_amount_$item"}, 2) 
                         .qq|" size="10"/></td>
                 <td><input type="text" name="mt_rate_$item"
                          id="mt-rate-$item" value="|
                         .$form->format_amount(\%myconfig, $form->{"mt_rate_$item"}) 
                         .qq|" size="4"/></td>
                 <td><input type="text" name="mt_basis_$item"
                          id="mt-basis-$item" value="|
-                        .$form->format_amount(\%myconfig, $form->{"mt_basis_$item"}) 
+                        .$form->format_amount(\%myconfig, $form->{"mt_basis_$item"}, 2) 
                         .qq|" size="10"/></td>
                 <td><input type="text" name="mt_ref_$item"
                          id="mt-ref-$item" value="|

diff --git a/bin/oe.pl b/bin/oe.pl
@@ -608,7 +608,7 @@ sub form_header {
     if ($form->{notice}){
          print qq|$form->{notice}<br/>|;
     }
-    $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)

diff --git 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
@@ -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
@@ -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
@@ -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