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

diff --git a/SL/DB/Helper/ALL.pm b/SL/DB/Helper/ALL.pm
index 83161c5..ed78255 100644 (file)
--- a/SL/DB/Helper/ALL.pm
+++ b/SL/DB/Helper/ALL.pm
@@ -65,8 +65,6 @@ use SL::DB::Price;
 use SL::DB::Printer;
 use SL::DB::Project;
 use SL::DB::PurchaseInvoice;
-use SL::DB::RMA;
-use SL::DB::RMAItem;
 use SL::DB::RecordLink;
 use SL::DB::SchemaInfo;
 use SL::DB::SepaExport;

diff --git a/SL/DB/Helper/Mappings.pm b/SL/DB/Helper/Mappings.pm
index 5267449..e77d027 100644 (file)
--- a/SL/DB/Helper/Mappings.pm
+++ b/SL/DB/Helper/Mappings.pm
@@ -92,8 +92,6 @@ my %lxoffice_package_names = (
   pricegroup                     => 'pricegroup',
   printers                       => 'Printer',
   record_links                   => 'record_link',
-  rma                            => 'RMA',
-  rmaitems                       => 'RMA_item',
   sepa_export                    => 'sepa_export',
   sepa_export_items              => 'sepa_export_item',
   schema_info                    => 'schema_info',

diff --git a/SL/DB/Manager/Project.pm b/SL/DB/Manager/Project.pm
index 130e35c..388c359 100644 (file)
--- a/SL/DB/Manager/Project.pm
+++ b/SL/DB/Manager/Project.pm
@@ -18,7 +18,7 @@ our %project_id_column_prefixes = (
   delivery_orders => 'global',
 );
 
-our @tables_with_project_id_cols = qw(acc_trans ap ar delivery_order_items delivery_orders invoice oe orderitems rmaitems);
+our @tables_with_project_id_cols = qw(acc_trans ap ar delivery_order_items delivery_orders invoice oe orderitems);
 
 sub _sort_spec {
   return (

diff --git a/SL/DB/MetaSetup/RMA.pm b/SL/DB/MetaSetup/RMA.pm
deleted file mode 100644 (file)
index beae232..0000000
--- a/SL/DB/MetaSetup/RMA.pm
+++ /dev/null
@@ -1,48 +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::RMA;
-
-use strict;
-
-use base qw(SL::DB::Object);
-
-__PACKAGE__->meta->setup(
-  table   => 'rma',
-
-  columns => [
-    id                   => { type => 'integer', not_null => 1, sequence => 'id' },
-    rmanumber            => { type => 'text', not_null => 1 },
-    transdate            => { type => 'date', default => 'now' },
-    vendor_id            => { type => 'integer' },
-    customer_id          => { type => 'integer' },
-    amount               => { type => 'numeric', precision => 5, scale => 15 },
-    netamount            => { type => 'numeric', precision => 5, scale => 15 },
-    reqdate              => { type => 'date' },
-    taxincluded          => { type => 'boolean' },
-    shippingpoint        => { type => 'text' },
-    notes                => { type => 'text' },
-    curr                 => { type => 'text' },
-    employee_id          => { type => 'integer' },
-    closed               => { type => 'boolean', default => 'false' },
-    quotation            => { type => 'boolean', default => 'false' },
-    quonumber            => { type => 'text' },
-    cusrmanumber         => { type => 'text' },
-    intnotes             => { type => 'text' },
-    delivery_customer_id => { type => 'integer' },
-    delivery_vendor_id   => { type => 'integer' },
-    language_id          => { type => 'integer' },
-    payment_id           => { type => 'integer' },
-    department_id        => { type => 'integer', default => '0' },
-    itime                => { type => 'timestamp', default => 'now()' },
-    mtime                => { type => 'timestamp' },
-    shipvia              => { type => 'text' },
-    cp_id                => { type => 'integer' },
-  ],
-
-  primary_key_columns => [ 'id' ],
-
-  allow_inline_column_values => 1,
-);
-
-1;
-;

diff --git a/SL/DB/MetaSetup/RMAItem.pm b/SL/DB/MetaSetup/RMAItem.pm
deleted file mode 100644 (file)
index dd32700..0000000
--- a/SL/DB/MetaSetup/RMAItem.pm
+++ /dev/null
@@ -1,47 +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::RMAItem;
-
-use strict;
-
-use base qw(SL::DB::Object);
-
-__PACKAGE__->meta->setup(
-  table   => 'rmaitems',
-
-  columns => [
-    trans_id      => { type => 'integer' },
-    parts_id      => { type => 'integer' },
-    description   => { type => 'text' },
-    qty           => { type => 'float', precision => 4 },
-    base_qty      => { type => 'float', precision => 4 },
-    sellprice     => { type => 'numeric', precision => 5, scale => 15 },
-    discount      => { type => 'float', precision => 4 },
-    project_id    => { type => 'integer' },
-    reqdate       => { type => 'date' },
-    ship          => { type => 'float', precision => 4 },
-    serialnumber  => { type => 'text' },
-    id            => { type => 'integer', not_null => 1, sequence => 'orderitemsid' },
-    itime         => { type => 'timestamp', default => 'now()' },
-    mtime         => { type => 'timestamp' },
-    pricegroup_id => { type => 'integer' },
-    rmanumber     => { type => 'text' },
-    transdate     => { type => 'text' },
-    cusrmanumber  => { type => 'text' },
-    unit          => { type => 'varchar', length => 20 },
-  ],
-
-  primary_key_columns => [ 'id' ],
-
-  allow_inline_column_values => 1,
-
-  foreign_keys => [
-    parts => {
-      class       => 'SL::DB::Part',
-      key_columns => { parts_id => 'id' },
-    },
-  ],
-);
-
-1;
-;

diff --git a/SL/DB/Part.pm b/SL/DB/Part.pm
index 5c795f1..3fb34ba 100644 (file)
--- a/SL/DB/Part.pm
+++ b/SL/DB/Part.pm
@@ -97,7 +97,6 @@ sub orphaned {
     SL::DB::InvoiceItem
     SL::DB::OrderItem
     SL::DB::Inventory
-    SL::DB::RMAItem
   );
 
   for my $class (@relations) {

diff --git a/SL/DB/RMA.pm b/SL/DB/RMA.pm
deleted file mode 100644 (file)
index 49c8d71..0000000
--- a/SL/DB/RMA.pm
+++ /dev/null
@@ -1,13 +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::RMA;
-
-use strict;
-
-use SL::DB::MetaSetup::RMA;
-
-# 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/RMAItem.pm b/SL/DB/RMAItem.pm
deleted file mode 100644 (file)
index c62e807..0000000
--- a/SL/DB/RMAItem.pm
+++ /dev/null
@@ -1,13 +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::RMAItem;
-
-use strict;
-
-use SL::DB::MetaSetup::RMAItem;
-
-# Creates get_all, get_all_count, get_all_iterator, delete_all and update_all.
-__PACKAGE__->meta->make_manager_class;
-
-1;

diff --git a/SL/OE.pm b/SL/OE.pm
index 93848b9..94b97e9 100644 (file)
--- a/SL/OE.pm
+++ b/SL/OE.pm
@@ -691,11 +691,6 @@ sub delete {
            qq|WHERE trans_id = ?|;
   do_query($form, $dbh, $query, @values);
 
-  # delete OE record
-  $query = qq|DELETE FROM oe | .
-           qq|WHERE id = ?|;
-  do_query($form, $dbh, $query, @values);
-
   # delete individual entries
   $query = qq|DELETE FROM orderitems | .
            qq|WHERE trans_id = ?|;
@@ -705,6 +700,11 @@ sub delete {
            qq|WHERE trans_id = ? AND module = 'OE'|;
   do_query($form, $dbh, $query, @values);
 
+  # delete OE record
+  $query = qq|DELETE FROM oe | .
+           qq|WHERE id = ?|;
+  do_query($form, $dbh, $query, @values);
+
   my $rc = $dbh->commit;
 
   if ($rc) {

diff --git a/SL/Presenter/Tag.pm b/SL/Presenter/Tag.pm
index 6fefd12..29b57ad 100644 (file)
--- a/SL/Presenter/Tag.pm
+++ b/SL/Presenter/Tag.pm
@@ -108,10 +108,6 @@ sub select_tag {
 
   delete($attributes{default});
 
-
-  my @all_options;
-  push @all_options, [undef, $empty_title || ''] if $with_empty;
-
   my $normalize_entry = sub {
     my ($type, $entry, $sub, $key) = @_;
 
@@ -161,13 +157,14 @@ sub select_tag {
     return join '', map { $self->html_tag('option', $self->escape($_->[1]), value => $_->[0], selected => $_->[2]) } @options;
   };
 
-  my $code;
+  my $code  = '';
+  $code    .= $self->html_tag('option', $self->escape($empty_title || '')) if $with_empty;
 
   if (!$with_optgroups) {
-    $code = $list_to_code->($collection);
+    $code .= $list_to_code->($collection);
 
   } else {
-    $code = join '', map {
+    $code .= join '', map {
       my ($optgroup_title, $sub_collection) = @{ $_ };
       $self->html_tag('optgroup', $list_to_code->($sub_collection), label => $optgroup_title)
     } @{ $collection };

diff --git a/templates/webpages/project/form.html b/templates/webpages/project/form.html
index 7162e11..5b2594c 100644 (file)
--- a/templates/webpages/project/form.html
+++ b/templates/webpages/project/form.html
@@ -48,7 +48,7 @@
 
      <tr>
       <th align="right">[% 'Customer' | $T8 %]</th>
-      <td>[% L.select_tag('project.customer_id', ALL_CUSTOMERS, default=SELF.project.customer_id, title_key='name', style='width: 300px') %]</td>
+      <td>[% L.select_tag('project.customer_id', ALL_CUSTOMERS, default=SELF.project.customer_id, title_key='name', with_empty=1, style='width: 300px') %]</td>
      </tr>
 
      <tr>