Merge branch 'master' of github.com:kivitendo/kivitendo-erp

diff --git a/SL/BackgroundJob/SelfTest/Transactions.pm b/SL/BackgroundJob/SelfTest/Transactions.pm
index f4f13d01ad806422099ffb033786c9e6cd6c10f1..6307ea99fed24d352b49829bf4e1c0eb7d5c2552 100644 (file)
--- a/SL/BackgroundJob/SelfTest/Transactions.pm
+++ b/SL/BackgroundJob/SelfTest/Transactions.pm
@@ -15,13 +15,14 @@ sub run {
 
   $self->_setup;
 
-  $self->tester->plan(tests => 17);
+  $self->tester->plan(tests => 18);
 
   $self->check_konten_mit_saldo_nicht_in_guv;
   $self->check_bilanzkonten_mit_pos_eur;
   $self->check_balanced_individual_transactions;
   $self->check_verwaiste_acc_trans_eintraege;
   $self->check_verwaiste_invoice_eintraege;
+  $self->check_ar_acc_trans_amount;
   $self->check_netamount_laut_invoice_ar;
   $self->check_invnumbers_unique;
   $self->check_summe_stornobuchungen;
@@ -428,6 +429,28 @@ sub check_every_account_with_taxkey {
   }
 }
 
+sub check_ar_acc_trans_amount {
+  my ($self) = @_;
+
+  my $query = qq|
+          select ar.invnumber, ar.netamount, ac.amount
+           from ar left join acc_trans ac on (ac.trans_id = ar.id) where ac.chart_link like 'AR_amount%' AND ac.amount <> ar.netamount|;
+
+  my $ar_amount_not_ac_amount = selectall_hashref_query($::form, $self->dbh, $query);
+
+  if ( scalar @{ $ar_amount_not_ac_amount } > 0 ) {
+    $self->tester->ok(0, "Folgende Ausgangsrechnungen haben einen falschen Netto-Wert im Nebenbuch:");
+
+    for my $ar_ac_amount_nok (@{ $ar_amount_not_ac_amount } ) {
+      $self->tester->diag("Rechnungsnummer: $ar_ac_amount_nok->{invnumber} Hauptbuch-Wert: $ar_ac_amount_nok->{amount}
+                            Nebenbuch-Wert: $ar_ac_amount_nok->{netamount}");
+    }
+  } else {
+    $self->tester->ok(1, "Hauptbuch-Nettowert und Nebenbuch-Nettowert stimmen überein.");
+  }
+
+}
+
 1;
 
 __END__

diff --git a/SL/Controller/DeliveryValueReport.pm b/SL/Controller/DeliveryValueReport.pm
index 64207cadee6b1b61e34cd9a79477af7cbcf6c2e8..858472b2f26b52cab90d821670383918207d718f 100644 (file)
--- a/SL/Controller/DeliveryValueReport.pm
+++ b/SL/Controller/DeliveryValueReport.pm
@@ -62,7 +62,6 @@ sub prepare_report {
   my ($self)      = @_;
 
   my $vc          = $self->vc;
-  my $mode        = 'delivery_value_report';
   my $report      = SL::ReportGenerator->new(\%::myconfig, $::form);
   my $csv_option  = $::form->{report_generator_output_format};
   $self->{report} = $report;

diff --git a/doc/changelog b/doc/changelog
index 2c4645dce3b93f349b412f618b519b369e8aed08..cb62a04a769fc3ffe989cdee6c43bcc2f5a3792d 100644 (file)
--- a/doc/changelog
+++ b/doc/changelog
@@ -44,6 +44,9 @@ Kleinere neue Features und Detailverbesserungen:
 
   - Konkurrierende Schreibprozesse beim Speichern von Belegen verhindern.
 
+  - SelfTest um einen Test erweitert. Hauptbuch-Nettowert weicht vom Nebenbuch-Netto-Wert ab
+    (acc_trans.amount != ar.netamount).
+
 2015-08-20 - Release 3.3
 
 Größere neue Features:

diff --git a/sql/Pg-upgrade2-auth/details_and_report_of_parts.pl b/sql/Pg-upgrade2-auth/details_and_report_of_parts.pl
index 762d98f99a4131d860c8d7ff67d8ef2b6e0bd574..90fc16acd551fcc0b2bc97d8ae6add2474af6829 100644 (file)
--- a/sql/Pg-upgrade2-auth/details_and_report_of_parts.pl
+++ b/sql/Pg-upgrade2-auth/details_and_report_of_parts.pl
@@ -1,6 +1,6 @@
 # @tag: details_and_report_of_parts
 # @description: Setzt das Recht zur Anzeige von Details und Berichten von Waren, Dienstleistungen und Erzeugnissen
-# @depends: release_3_0_0
+# @depends: release_3_2_0 add_master_rights
 package SL::DBUpgrade2::details_and_report_of_parts;
 
 use strict;

diff --git a/sql/Pg-upgrade2-auth/productivity_rights.pl b/sql/Pg-upgrade2-auth/productivity_rights.pl
index 4c97c265b70db355eed76ebf40558eabec6bbbaa..7f287119f5734bd7b8643f63c47d295604fbcf9d 100644 (file)
--- a/sql/Pg-upgrade2-auth/productivity_rights.pl
+++ b/sql/Pg-upgrade2-auth/productivity_rights.pl
@@ -1,6 +1,6 @@
 # @tag: productivity_rights
 # @description: Setzt das Recht die Produktivität einzusehen und das Recht den Link zum Admin-Menü anzuzeigen wieder wie vorher
-# @depends: release_3_0_0
+# @depends: release_3_2_0 add_master_rights
 package SL::DBUpgrade2::productivity_rights;
 
 use strict;

diff --git a/sql/Pg-upgrade2-auth/release_3_2_0.sql b/sql/Pg-upgrade2-auth/release_3_2_0.sql
index 9e9c50ea858b3afd1f00e8595b671b8866c1986f..852ec011ddc8c8277979686696a129b6a5a5b608 100644 (file)
--- a/sql/Pg-upgrade2-auth/release_3_2_0.sql
+++ b/sql/Pg-upgrade2-auth/release_3_2_0.sql
@@ -1,5 +1,5 @@
 -- @tag: release_3_2_0
 -- @description: Abhängigkeitsscript für Release 3.2.0, bzw. vergessene 3.1.0
--- @depends: release_3_0_0 clients_webdav foreign_key_constraints_on_delete rights_for_showing_ar_and_ap_transactions productivity_rights clients details_and_report_of_parts
+-- @depends: release_3_0_0 clients_webdav foreign_key_constraints_on_delete  clients
 -- @charset: utf-8
 

diff --git a/sql/Pg-upgrade2-auth/release_3_3_0.sql b/sql/Pg-upgrade2-auth/release_3_3_0.sql
index 37484a2b68918e3d1e425cc5a4d1821d3dd2bccc..efcfa17525d2747c093e45d6ff1b0bd3bbc863b0 100644 (file)
--- a/sql/Pg-upgrade2-auth/release_3_3_0.sql
+++ b/sql/Pg-upgrade2-auth/release_3_3_0.sql
@@ -1,4 +1,4 @@
 -- @tag: release_3_3_0
--- @description: Abhängigkeitsscript für Release 3.2.0, bzw. vergessene 3.1.0
--- @depends: release_3_2_0 sales_letter_rights delivery_plan_rights requirement_spec_rights delivery_process_value bank_transaction_rights
+-- @description: Abhängigkeitsscript für Release 3.3.0
+-- @depends: release_3_2_0 sales_letter_rights delivery_plan_rights requirement_spec_rights delivery_process_value bank_transaction_rights details_and_report_of_parts productivity_rights rights_for_showing_ar_and_ap_transactions
 -- @charset: utf-8

diff --git a/sql/Pg-upgrade2-auth/rights_for_showing_ar_and_ap_transactions.pl b/sql/Pg-upgrade2-auth/rights_for_showing_ar_and_ap_transactions.pl
index 9eaab726b8452a225bd9293aedbca578e26d39ec..523975ecf8c1297678a3ff7287d121031e65caee 100644 (file)
--- a/sql/Pg-upgrade2-auth/rights_for_showing_ar_and_ap_transactions.pl
+++ b/sql/Pg-upgrade2-auth/rights_for_showing_ar_and_ap_transactions.pl
@@ -1,6 +1,6 @@
 # @tag: rights_for_showing_ar_and_ap_transactions
 # @description: Setzt das Recht zur Anzeige von Debitoren- und Kreditorenbuchungen im Rechnungsbericht
-# @depends: release_3_0_0
+# @depends: release_3_2_0 add_master_rights
 package SL::DBUpgrade2::rights_for_showing_ar_and_ap_transactions;
 
 use strict;

diff --git a/sql/Pg-upgrade2-auth/sales_letter_rights.pl b/sql/Pg-upgrade2-auth/sales_letter_rights.pl
index 22c97875c7f6f22ff8ca8946b5ab36f69736f34e..f018317da81cd67cd48f92af67490d412ef946f9 100644 (file)
--- a/sql/Pg-upgrade2-auth/sales_letter_rights.pl
+++ b/sql/Pg-upgrade2-auth/sales_letter_rights.pl
@@ -1,6 +1,6 @@
 # @tag: sales_letter_rights
-# @description: Setzt das neue Recht den Lieferplan anzuzeigen
-# @depends: release_3_2_0
+# @description: Setzt das neue Recht die Brieffunktion anzuzeigen
+# @depends: release_3_2_0 add_master_rights
 package SL::DBUpgrade2::sales_letter_rights;
 
 use strict;

diff --git a/templates/webpages/am/edit_templates.html b/templates/webpages/am/edit_templates.html
index 86bf828991b35c5ffa30b14b682fa07058d59de9..ff6ece22ba918824924f7e80aa212108febe8b63 100644 (file)
--- a/templates/webpages/am/edit_templates.html
+++ b/templates/webpages/am/edit_templates.html
@@ -4,7 +4,7 @@
  <h1>[% title %]</h1>
 
   [% IF type == 'templates' %]
-   <p style="text-align: right;">[<a href="doc/html/ch03s02.html" target="_blank" title="[% 'Open in new window' | $T8 %]">[% 'Help Template Variables' | $T8 %]</a>]</p>
+   <p style="text-align: right;">[<a href="doc/html/ch03s03.html" target="_blank" title="[% 'Open in new window' | $T8 %]">[% 'Help Template Variables' | $T8 %]</a>]</p>
   [% END %]
 
  <form method="post" name="Form" action="amtemplates.pl">