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

diff --git a/SL/DB/AuditTrail.pm b/SL/DB/AuditTrail.pm
deleted file mode 100644 (file)
index 891d6f2..0000000
--- a/SL/DB/AuditTrail.pm
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file has been auto-generated only because it didn't exist.
-# Feel free to modify it at will; it will not be overwritten automatically.
-
-package SL::DB::AuditTrail;
-
-use strict;
-
-use SL::DB::MetaSetup::AuditTrail;
-
-__PACKAGE__->meta->initialize;
-
-# Creates get_all, get_all_count, get_all_iterator, delete_all and update_all.
-__PACKAGE__->meta->make_manager_class;
-
-1;

diff --git a/SL/DB/Helper/ALL.pm b/SL/DB/Helper/ALL.pm
index 498583f..6bdc368 100644 (file)
--- a/SL/DB/Helper/ALL.pm
+++ b/SL/DB/Helper/ALL.pm
@@ -4,7 +4,6 @@ use strict;
 
 use SL::DB::AccTransaction;
 use SL::DB::Assembly;
-use SL::DB::AuditTrail;
 use SL::DB::AuthClient;
 use SL::DB::AuthClientUser;
 use SL::DB::AuthClientGroup;

diff --git a/SL/DB/Helper/Mappings.pm b/SL/DB/Helper/Mappings.pm
index 633a067..022894c 100644 (file)
--- a/SL/DB/Helper/Mappings.pm
+++ b/SL/DB/Helper/Mappings.pm
@@ -84,7 +84,6 @@ my @kivitendo_blacklist = (@kivitendo_blacklist_permanent, @kivitendo_blacklist_
 my %kivitendo_package_names = (
   # TABLE                           # MODEL (given in C style)
   acc_trans                      => 'acc_transaction',
-  audittrail                     => 'audit_trail',
   'auth.clients'                 => 'auth_client',
   'auth.clients_users'           => 'auth_client_user',
   'auth.clients_groups'          => 'auth_client_group',

diff --git a/SL/DB/MetaSetup/AuditTrail.pm b/SL/DB/MetaSetup/AuditTrail.pm
deleted file mode 100644 (file)
index fd8add0..0000000
--- a/SL/DB/MetaSetup/AuditTrail.pm
+++ /dev/null
@@ -1,25 +0,0 @@
-# This file has been auto-generated. Do not modify it; it will be overwritten
-# by rose_auto_create_model.pl automatically.
-package SL::DB::AuditTrail;
-
-use strict;
-
-use base qw(SL::DB::Object);
-
-__PACKAGE__->meta->table('audittrail');
-
-__PACKAGE__->meta->columns(
-  action      => { type => 'text' },
-  employee_id => { type => 'integer' },
-  formname    => { type => 'text' },
-  id          => { type => 'serial', not_null => 1 },
-  reference   => { type => 'text' },
-  tablename   => { type => 'text' },
-  trans_id    => { type => 'integer' },
-  transdate   => { type => 'timestamp', default => 'now' },
-);
-
-__PACKAGE__->meta->primary_key_columns([ 'id' ]);
-
-1;
-;

diff --git a/SL/DB/MetaSetup/Default.pm b/SL/DB/MetaSetup/Default.pm
index 4855128..8c0319c 100644 (file)
--- a/SL/DB/MetaSetup/Default.pm
+++ b/SL/DB/MetaSetup/Default.pm
@@ -18,7 +18,6 @@ __PACKAGE__->meta->columns(
   ar_show_mark_as_paid                    => { type => 'boolean', default => 'true' },
   articlenumber                           => { type => 'text' },
   assemblynumber                          => { type => 'text' },
-  audittrail                              => { type => 'boolean', default => 'false' },
   bin_id                                  => { type => 'integer' },
   bin_id_ignore_onhand                    => { type => 'integer' },
   businessnumber                          => { type => 'text' },

diff --git a/SL/DB/MetaSetup/GLTransaction.pm b/SL/DB/MetaSetup/GLTransaction.pm
index 14f386a..db03441 100644 (file)
--- a/SL/DB/MetaSetup/GLTransaction.pm
+++ b/SL/DB/MetaSetup/GLTransaction.pm
@@ -42,6 +42,11 @@ __PACKAGE__->meta->foreign_keys(
     key_columns => { employee_id => 'id' },
   },
 
+  employee_obj => {
+    class       => 'SL::DB::Employee',
+    key_columns => { employee_id => 'id' },
+  },
+
   storno_obj => {
     class       => 'SL::DB::GLTransaction',
     key_columns => { storno_id => 'id' },

diff --git a/SL/InstallationCheck.pm b/SL/InstallationCheck.pm
index 947be97..5ac2bd8 100644 (file)
--- a/SL/InstallationCheck.pm
+++ b/SL/InstallationCheck.pm
@@ -17,7 +17,7 @@ BEGIN {
 #   dist_name: name of the package in cpan if it differs from name (ex.: LWP != libwww-perl)
 @required_modules = (
   { name => "parent",                              url => "http://search.cpan.org/~corion/",    debian => 'libparent-perl' },
-  { name => "Archive::Zip",    version => '1.16',  url => "http://search.cpan.org/~adamk/",     debian => 'libarchive-zip-perl' },
+  { name => "Archive::Zip",    version => '1.16',  url => "http://search.cpan.org/~phred/",     debian => 'libarchive-zip-perl' },
   { name => "Clone",                               url => "http://search.cpan.org/~rdf/",       debian => 'libclone-perl' },
   { name => "Config::Std",                         url => "http://search.cpan.org/~dconway/",   debian => 'libconfig-std-perl' },
   { name => "DateTime",                            url => "http://search.cpan.org/~drolsky/",   debian => 'libdatetime-perl' },

diff --git a/bin/mozilla/ap.pl b/bin/mozilla/ap.pl
index 0bb1a8b..7b16657 100644 (file)
--- a/bin/mozilla/ap.pl
+++ b/bin/mozilla/ap.pl
@@ -375,6 +375,10 @@ sub form_header {
   if ( $form->{'paid_'. $form->{paidaccounts}} ) {
     $form->{paidaccounts}++;
   }
+
+  # default account for current assets (i.e. 1801 - SKR04)
+  $form->{accno_arap} = IS->get_standard_accno_current_assets(\%myconfig, \%$form);
+
   for my $i (1 .. $form->{paidaccounts}) {
     $form->{totalpaid} += $form->{"paid_$i"};
 

diff --git a/bin/mozilla/ar.pl b/bin/mozilla/ar.pl
index cec9db7..480507b 100644 (file)
--- a/bin/mozilla/ar.pl
+++ b/bin/mozilla/ar.pl
@@ -409,12 +409,15 @@ sub form_header {
       gldate           => $form->{"gldate_$i"},
     };
 
+  # default account for current assets (i.e. 1801 - SKR04)
+  $form->{accno_arap} = IS->get_standard_accno_current_assets(\%myconfig, \%$form);
+
     $payment->{selectAR_paid} =
       NTI($cgi->popup_menu('-name' => "AR_paid_$i",
                            '-id' => "AR_paid_$i",
                            '-values' => \@AR_paid_values,
                            '-labels' => \%chart_labels,
-                           '-default' => $payment->{AR_paid}));
+                           '-default' => $form->{accno_arap}));
 
 
 

diff --git a/locale/de/all b/locale/de/all
index 14151a6..4568b02 100755 (executable)
--- a/locale/de/all
+++ b/locale/de/all
@@ -256,8 +256,8 @@ $self->{texts} = {
   'Authentification database creation' => 'Anlegen der Datenbank zur Benutzerauthentifizierung',
   'Authentification tables creation' => 'Anlegen der Tabellen zur Benutzerauthentifizierung',
   'Auto Send?'                  => 'Auto. Versand?',
-  'Automatic deletion of leading, trailing and excessive (repetitive) spaces in customer or vendor names' => 'Automatisches Löschen von voran-, mehrfach wiederholenten oder nachgestellten Leerzeichen im Kunden- oder Lieferantennamen (Bspw.: " Schmidt    & Söhne GmbH" -> "Schmidt & Söhne GmbH"',
-  'Automatic deletion of leading, trailing and excessive (repetitive) spaces in part description and part notes. Affects also the CSV-Import.' => '',
+  'Automatic deletion of leading, trailing and excessive (repetitive) spaces in customer or vendor names' => 'Automatisches Löschen von voran-/nachgestellten und aufeinanderfolgenden Leerzeichen im Kunden- oder Lieferantennamen',
+  'Automatic deletion of leading, trailing and excessive (repetitive) spaces in part description and part notes. Affects the CSV import as well.' => 'Automatisches Löschen von voran-/nachgestellten und aufeinanderfolgenden Leerzeichen in Artikelbeschreibungen und -bemerkungen. Betrifft auch den CSV-Import.',
   'Automatically created invoice for fee and interest for dunning %s' => 'Automatisch erzeugte Rechnung für Gebühren und Zinsen zu Mahnung %s',
   'Available'                   => 'Verfügbar',
   'Available qty'               => 'Lagerbestand',

diff --git a/scripts/find-use.pl b/scripts/find-use.pl
index 959ecbe..3df14f4 100755 (executable)
--- a/scripts/find-use.pl
+++ b/scripts/find-use.pl
@@ -21,6 +21,8 @@ my (%uselines, %modules, %supplied, %requires);
    'Rose::DB::Object::ConventionManager' => 1,
    'Rose::DB::Object::Manager'           => 1,
    'Rose::DB::Object::Metadata'          => 1,
+   'Rose::DB::Object::Helpers'           => 1,
+   'Rose::DB::Object::Util'              => 1,
   },
   'Rose::Object' => {
     'Rose::Object::MakeMethods::Generic' => 1,
@@ -32,6 +34,7 @@ my (%uselines, %modules, %supplied, %requires);
     'Template::Plugin'                   => 1,
     'Template::Plugin::Filter'           => 1,
     'Template::Plugin::HTML'             => 1,
+    'Template::Stash'                    => 1,
   },
   'Devel::REPL' => {
     'namespace::clean'                   => 1,
@@ -43,6 +46,9 @@ my (%uselines, %modules, %supplied, %requires);
     'TAP::Parser'                        => 1,
     'TAP::Parser::Aggregator'            => 1,
   },
+  'Archive::Zip' => {
+    'Archive::Zip::Member'               => 1,
+  }
 );
 
 GetOptions(

diff --git a/sql/Pg-upgrade2/drop_audittrail.sql b/sql/Pg-upgrade2/drop_audittrail.sql
new file mode 100644 (file)
index 0000000..b998dc6
--- /dev/null
+++ b/sql/Pg-upgrade2/drop_audittrail.sql
@@ -0,0 +1,6 @@
+-- @tag: drop_audittrail
+-- @description: Tabelle audittrail wird nicht mehr benutzt
+-- @depends: release_3_0_0
+-- @ignore: 0
+ALTER TABLE defaults DROP COLUMN audittrail;
+DROP TABLE audittrail;

diff --git a/templates/webpages/ap/form_header.html b/templates/webpages/ap/form_header.html
index 0bd5466..dde66f7 100644 (file)
--- a/templates/webpages/ap/form_header.html
+++ b/templates/webpages/ap/form_header.html
@@ -285,7 +285,7 @@
                 [% L.date_tag(temp, $temp) %]
               [% ELSE %]
                 [% $temp | html %]
-                <input type="hidden" name="[% temp %]" value="[% $temp | html %]">|;
+                <input type="hidden" name="[% temp %]" value="[% $temp | html %]">
               [% END %]
             </td>
 
@@ -338,7 +338,7 @@
             [% temp = "AP_paid_"_ i %]
             <td align="center">
               [% IF( changeable ) %]
-                [% L.select_tag(temp, ALL_CHARTS_AP_paid, value_title_sub = \AP_paid_value_title_sub, default = $temp) %]
+                [% L.select_tag(temp, ALL_CHARTS_AP_paid, value_title_sub = \AP_paid_value_title_sub, default = accno_arap)  %]
               [% ELSE %]
                 [% $temp | html %]
                 <input type="hidden" name="[% temp %]" value="[% $temp | html %]">

diff --git a/templates/webpages/client_config/_features.html b/templates/webpages/client_config/_features.html
index 28a00ec..c0ba2f0 100644 (file)
--- a/templates/webpages/client_config/_features.html
+++ b/templates/webpages/client_config/_features.html
@@ -47,7 +47,7 @@
  <tr>
    <td align="right">[% LxERP.t8('Normalize part description and part notes') %]</td>
    <td>   [% L.yes_no_tag('defaults.normalize_part_descriptions', SELF.defaults.normalize_part_descriptions) %]</td>
-   <td>[% LxERP.t8('Automatic deletion of leading, trailing and excessive (repetitive) spaces in part description and part notes. Affects also the CSV-Import.') %]</td>
+   <td>[% LxERP.t8('Automatic deletion of leading, trailing and excessive (repetitive) spaces in part description and part notes. Affects the CSV import as well.') %]</td>
   </tr>
 </tr>
  </table>