From: G. Richardson <information@kivitendo-premium.de>
Date: Sun, 6 Aug 2017 13:04:45 +0000 (+0200)
Subject: t/controllers/financial_overview/sales_orders.t auf SL::Dev umgestellt
X-Git-Tag: release-3.5.4~910
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=25112bf209b20ce4d085acaa9cf208cfff42df3c;p=kivitendo-erp.git

t/controllers/financial_overview/sales_orders.t auf SL::Dev umgestellt
---

diff --git a/t/controllers/financial_overview/sales_orders.t b/t/controllers/financial_overview/sales_orders.t
index abfcf7e6c..2f90a2a2a 100644
--- a/t/controllers/financial_overview/sales_orders.t
+++ b/t/controllers/financial_overview/sales_orders.t
@@ -14,7 +14,7 @@ sub today_local {
 
 package main;
 
-use Test::More tests => 49;
+use Test::More tests => 43;
 
 use lib 't';
 use strict;
@@ -22,6 +22,7 @@ use utf8;
 
 use Carp;
 use Support::TestSetup;
+use SL::Dev::ALL;
 
 use_ok 'SL::BackgroundJob::CreatePeriodicInvoices';
 use_ok 'SL::Controller::FinancialOverview';
@@ -31,68 +32,48 @@ use_ok 'SL::DB::Default';
 use_ok 'SL::DB::Invoice';
 use_ok 'SL::DB::Order';
 use_ok 'SL::DB::Part';
-use_ok 'SL::DB::TaxZone';
 
 Support::TestSetup::login();
 
-our ($ar_chart, $buchungsgruppe, $ctrl, $currency_id, $customer, $employee, $order, $part, $tax_zone, $unit, @invoices);
+our ($ar_chart, $ctrl, $customer, $order, $part, $unit, @invoices);
 
 sub clear_up {
   "SL::DB::Manager::${_}"->delete_all(all => 1) for qw(InvoiceItem Invoice OrderItem Order Customer Part);
 };
 
 sub init_common_state {
-  $ar_chart       = SL::DB::Manager::Chart->find_by(accno => '1400')                        || croak "No AR chart";
-  $buchungsgruppe = SL::DB::Manager::Buchungsgruppe->find_by(description => 'Standard 19%') || croak "No accounting group";
-  $currency_id    = SL::DB::Default->get->currency_id;
-  $employee       = SL::DB::Manager::Employee->current                                      || croak "No employee";
-  $tax_zone       = SL::DB::Manager::TaxZone->find_by( description => 'Inland')             || croak "No taxzone";
-  $unit           = SL::DB::Manager::Unit->find_by(name => 'psch')                          || croak "No unit";
+  $ar_chart       = SL::DB::Manager::Chart->find_by(accno => '1400') || croak "No AR chart";
+  $unit           = SL::DB::Manager::Unit->find_by(name => 'psch')   || croak "No unit";
 }
 
 sub create_sales_order {
   my %params = @_;
 
-  $params{$_} ||= {} for qw(customer part tax order orderitem);
+  $params{$_} ||= {} for qw(customer part order orderitem);
 
   # Clean up: remove invoices, orders, parts and customers
   clear_up();
 
-  $customer     = SL::DB::Customer->new(
+  $customer     = SL::Dev::CustomerVendor::create_customer(
     name        => 'Test Customer',
-    currency_id => $currency_id,
-    taxzone_id  => $tax_zone->id,
     %{ $params{customer} }
   )->save;
 
-  $part = SL::DB::Part->new(
+  $part = SL::Dev::Part::create_part(
     partnumber         => 'T4254',
     description        => 'Fourty-two fifty-four',
     lastcost           => 222.22,
     sellprice          => 333.33,
-    part_type          => 'part',
-    buchungsgruppen_id => $buchungsgruppe->id,
-    unit               => $unit->name,
     %{ $params{part} }
   )->save;
   $part->load;
 
-  $order                     = SL::DB::Order->new(
-    customer_id              => $customer->id,
-    currency_id              => $currency_id,
-    taxzone_id               => $tax_zone->id,
+  $order                     = SL::Dev::Record::create_sales_order(
+    save                     => 1,
+    customer                 => $customer,
     transaction_description  => '<%period_start_date%>',
     transdate                => DateTime->from_kivitendo('01.03.2014'),
-    orderitems               => [
-      { parts_id             => $part->id,
-        description          => $part->description,
-        lastcost             => $part->lastcost,
-        sellprice            => $part->sellprice,
-        qty                  => 1,
-        unit                 => $unit->name,
-        %{ $params{orderitem} },
-      },
-    ],
+    orderitems => [ SL::Dev::Record::create_order_item(part => $part, qty =>  1, %{ $params{orderitem} }) ],
     periodic_invoices_config => $params{periodic_invoices_config} ? {
       active                 => 1,
       ar_chart_id            => $ar_chart->id,
@@ -101,10 +82,6 @@ sub create_sales_order {
     %{ $params{order} },
   );
 
-  $order->calculate_prices_and_taxes;
-
-  ok($order->save(cascade => 1));
-
   $::form         = Support::TestSetup->create_new_form;
   $::form->{year} = 2014;
   $ctrl           = SL::Controller::FinancialOverview->new;