Merge pull request #2395 from ehuelsmann/1.4-mc

1.4 mc
ledgersmb · Dec 17, 2016 · f8cc017 · f8cc017
2 parents b856b78 + 87c2da9
commit f8cc017
Show file tree

Hide file tree

Showing 59 changed files with 11,366 additions and 11,323 deletions.
diff --git a/Changelog b/Changelog
@@ -4,6 +4,24 @@ Changelog for 1.4 Series
 Released 2014-09-15
 
 
+Changelog for 1.4.36
+* Overpayments incorrectly not reduced when applied (Erik H, #2346)
+* Fix number formatting/processing in batch payment/receipt (Erik H, #2350)
+
+Erik H is Erik Huelsmann
+
+
+Changelog for 1.4.35
+* Fixed release process; 1.4.32+ included '-dev' in tar version (Erik H)
+* Fix 'existing account' check when saving account configuration (Yves L)
+* Add 'make clean' Makefile target (Erik H, #1828)
+* Fix failing upgrades from 1.3 due to 'locked_by' not NULL (Erik H, #2241)
+* Fix inability to add new business unit class (Erik H, #1023)
+
+Erik H is Erik Huelsmann
+Yves L is Yves Lavoie
+
+
 Changelog for 1.4.34
 * Fixed PNL comparison periods selection resulting in error (Erik H, #2148)
 * Fixed PNL hierarchies both selected (Erik H, #2147)

diff --git a/LedgerSMB.pm b/LedgerSMB.pm
@@ -179,7 +179,7 @@ use Try::Tiny;
 use DBI;
 
 use base qw(LedgerSMB::Request);
-our $VERSION = '1.4.35-dev';
+our $VERSION = '1.4.37-dev';
 
 my $logger = Log::Log4perl->get_logger('LedgerSMB');
 

diff --git a/LedgerSMB/Form.pm b/LedgerSMB/Form.pm
@@ -174,8 +174,8 @@ sub new {
     #menubar will be deprecated, replaced with below
     $self->{lynx} = 1 if ( ( defined $self->{path} ) && ( $self->{path} =~ /lynx/i ) );
 
-    $self->{version}   = "1.4.35-dev";
-    $self->{dbversion} = "1.4.35-dev";
+    $self->{version}   = "1.4.37-dev";
+    $self->{dbversion} = "1.4.37-dev";
 
     bless $self, $type;
 

diff --git a/LedgerSMB/Scripts/payment.pm b/LedgerSMB/Scripts/payment.pm
@@ -19,7 +19,7 @@ Original copyright notice below.
 # Copyright (c) 2007
 #
 #  Author: David Mora R
-# 	   Christian Ceballos B
+#          Christian Ceballos B
 #
 #
 #
@@ -50,6 +50,7 @@ use LedgerSMB::Setting;
 use LedgerSMB::Sysconfig;
 use LedgerSMB::DBObject::Payment;
 use LedgerSMB::DBObject::Date;
+use LedgerSMB::PGNumber;
 use LedgerSMB::Scripts::reports;
 use LedgerSMB::Report::Invoices::Payments;
 use strict;
@@ -167,9 +168,9 @@ sub pre_bulk_post_report {
             for my $invrow (1 .. $request->{"invoice_count_$cid"}){
                 my $inv_id = $request->{"invoice_${cid}_$invrow"};
                 if ($request->{"paid_$cid"} eq 'all'){
-                    $ref->{amount} += $request->{"payment_$inv_id"};
+                    $ref->{amount} += LedgerSMB::PGNumber->from_input($request->{"payment_$inv_id"});
                 } else {
-                    $ref->{amount} += $request->{"net_$inv_id"};
+                    $ref->{amount} += LedgerSMB::PGNumber->from_input($request->{"net_$inv_id"});
                 }
              }
              # If vendor, this is debit-normal so multiply by -1
@@ -414,7 +415,7 @@ sub print {
         $template = LedgerSMB::Template->new(
             user => $payment->{_user}, template => 'check_multiple',
             format => uc $payment->{'format'},
-	    no_auto_output => 1,
+            no_auto_output => 1,
             output_args => $payment,
         );
             $template->render($payment);
@@ -502,8 +503,8 @@ sub display_payments {
                                                   money  => 1);
     }
     $payment->{grand_total} = $payment->format_amount(
-			amount =>  $payment->{grand_total},
-			money  => 1);
+                        amount =>  $payment->{grand_total},
+                        money  => 1);
     @{$payment->{media_options}} = (
             {text  => $request->{_locale}->text('Screen'),
              value => 'screen'});
@@ -579,7 +580,7 @@ sub payment {
         interval_radios => $date->{radioOptions},
         amountfrom => {
             name => 'amountfrom',
-	},
+        },
         amountto => {
             name => 'amountto',
         },
@@ -836,7 +837,7 @@ sub payment2 {
                 value => "$exchangerate", #THERE IS A STRANGE BEHAVIOUR WITH THIS,
                 text =>  "$exchangerate"  #IF I DONT USE THE DOUBLE QUOTES, IT WILL PRINT THE ADDRESS
                                           #THERE MUST BE A REASON FOR THIS, I MUST RETURN TO IT LATER
-	    };
+            };
         } else {
             @currency_options = {
                 name => 'exrate'
@@ -1326,7 +1327,7 @@ sub print_payment {
     my $header = @{$Payment->{header_info}}[0];
     my @rows   = @{$Payment->{line_info}};
     ###############################################################################
-    # 			    FIRST CODE SECTION
+    #                       FIRST CODE SECTION
     #
     # THE FOLLOWING LINES OF CODE ADD SOME EXTRA PROCESSING TO THE DATA THAT
     # WILL BE  AVAILIBLE ON THE UI,
@@ -1501,15 +1502,15 @@ sub use_overpayment2 {
         $exchangerate = $Payment->{exrate};
         if ($exchangerate) {
             $ui_exchangerate = {
-	        id => 'exrate',
+                id => 'exrate',
                 name => 'exrate',
                 value => "$exchangerate", #THERE IS A STRANGE BEHAVIOUR WITH THIS,
                 text =>  "$exchangerate"  #IF I DONT USE THE DOUBLE QUOTES, IT WILL PRINT THE ADDRESS
                                           #THERE MUST BE A REASON FOR THIS, I MUST RETURN TO IT LATER
             };
         } else {
             $ui_exchangerate = {
-	        id => 'exrate',
+                id => 'exrate',
                 name => 'exrate'
             };
         }
@@ -1590,7 +1591,7 @@ sub use_overpayment2 {
             $uri .= '.pl?action=edit&id='.$Payment->{"invoice_id_$count"}.'&path=bin/mozilla&login='.$request->{login};
 
             push @ui_selected_inv, {
-                invoice	=> {
+                invoice => {
                     number => $Payment->{"invnumber_$count"},
                     id     => $Payment->{"invoice_id_$count"},
                     href   => $uri
@@ -1697,7 +1698,7 @@ sub use_overpayment2 {
     # We start with our data selection called ui
     my $ui = {
         exrate => $ui_exchangerate,
-	datepaid => {
+        datepaid => {
             name => 'datepaid',
             value => $Payment->{"datepaid"}? $Payment->{"datepaid"} : $Payment->{"current_date"},
             size => '10'

diff --git a/Makefile b/Makefile
@@ -2,3 +2,7 @@
 dist:
 	test -d $(DIST_DIR) || mkdir -p $(DIST_DIR)
 	find . | grep -vE '^.$$|/\.git|^\./UI/js-src/(dojo|dijit|util)/|\.uncompressed\.js$$|.js.map$$' | tar czf $(DIST_DIR)/ledgersmb-$(DIST_VER).tar.gz --transform 's,^./,ledgersmb/,' --no-recursion --files-from -
+
+clean:
+	rm -rf inc META.yml MYMETA.yml MYMETA.json blib pm_to_blib
+
diff --git a/dists/rpm/build.sh b/dists/rpm/build.sh
@@ -2,7 +2,7 @@
 
 # One must run the source file build first.
 
-VERSION="1.4.35-dev"
+VERSION="1.4.37-dev"
 hg archive -ttgz ~/ledgersmb.tar.gz
 
 # Remove Dojo

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.4.35-dev
+Version: 1.4.37-dev
 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.4.35-dev";
+version="1.4.37-dev";
 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.4
 
-Latest Revision:  1.4.35-dev
+Latest Revision:  1.4.37-dev
 
 1:  Welcome to LedgerSMB