/ - Diff - projekt kivitendo - wissen

« Zurück | Weiter »

Revision 55e68890

Von Sven Schöling vor fast 2 Jahren hinzugefügt

ID 55e6889044ba4cc97ebab7446bb00c4e30b70958
Vorgänger 3bc36d0d
Nachfolger 4b9b5285

DeliveryOrder: TypeData jetzt über proxy eingebunden

Macht den Controller proxy unnötig. reqdate default werden jetzt anders
behandelt

     use SL::DB::ValidityToken;
     use SL::DB::Warehouse;
     use SL::DB::Helper::RecordLink qw(set_record_link_conversions);
     use SL::DB::Helper::TypeDataProxy;
     use SL::DB::DeliveryOrder;
     use SL::DB::DeliveryOrder::TypeData qw(:types);
     use SL::Model::Record;
     use SL::Helper::CreatePDF qw(:all);
-...
     use SL::Helper::UserPreferences::UpdatePositions;
     use SL::Controller::Helper::GetModels;
     use SL::Controller::DeliveryOrder::TypeData qw(:types);
     use List::Util qw(first sum0);
     use List::UtilsBy qw(sort_by uniq_by);
-...
       # this interfers with init_order
       $self->{converted_from_oe_id} = delete $::form->{id};
       $self->type_data->validate($::form->{type});
       $self->type_data->validate;
       my $order = SL::DB::Order->new(id => $self->{converted_from_oe_id})->load;
-...
     sub action_delete {
       my ($self) = @_;
       my $number_type = $self->type_data;
       my %history = (snumbers => $self->type . '_' . $self->order->number);
       my %params = (history => \%history);
       SL::Model::Record->delete($self->order,%params);
-...
                                       email_form  => $email_form,
                                       show_bcc    => $::auth->assert('email_bcc', 'may fail'),
                                       FILES       => \%files,
                                       is_customer => $self->type_data->is_customer,
                                       is_customer => $self->type_data->properties("is_customer"),
                                       ALL_EMPLOYEES => $self->{all_employees},
       );
-...
                                          ITEM => $item,
                                          ID   => $item_id,
                                          SELF => $self,
                                          in_out => $self->type_data->transfer,
                                          in_out => $self->type_data->properties("transfer"),
       );
       if ($::form->{insert_before_item_id}) {
-...
                                            ITEM => $item,
                                            ID   => $item_id,
                                            SELF => $self,
                                            in_out => $self->type_data->transfer,
                                            in_out => $self->type_data->properties("transfer"),
         );
         if ($::form->{insert_before_item_id}) {
-...
       my $item_id = $::form->{item_id};
       my $qty     = _parse_number($::form->{qty_as_number});
       my $inout = $self->type_data->transfer;
       my $inout = $self->type_data->properties("transfer");
       my @contents   = DO->get_item_availability(parts_id => $part->id);
       my $stock_info = DO->unpack_stock_information(packed => $stock);
-...
     sub init_cv {
       my ($self) = @_;
       return $self->type_data->customervendor;
       return $self->type_data->properties("customervendor");
+    }
     sub init_search_cvpartnumber {
-...
     sub check_auth {
       my ($self) = @_;
       $::auth->assert($self->type_data->access('view') || 'DOES_NOT_EXIST');
       $::auth->assert($self->type_data->rights('view') || 'DOES_NOT_EXIST');
+    }
     sub check_auth_for_edit {
       my ($self) = @_;
       $::auth->assert($self->type_data->access('edit') || 'DOES_NOT_EXIST');
       $::auth->assert($self->type_data->rights('edit') || 'DOES_NOT_EXIST');
+    }
     # build the selection box for contacts
-...
       # order here solves this problem.
       my $order;
       $order   = SL::DB::DeliveryOrder->new(id => $::form->{id})->load(with => [ 'orderitems', 'orderitems.part' ]) if $::form->{id};
       $order ||= SL::DB::DeliveryOrder->new(orderitems  => [], currency_id => $::instance_conf->get_currency_id(), order_type => $self->type_data->validate($::form->{type}));
       $order ||= SL::DB::DeliveryOrder->new(orderitems  => [], currency_id => $::instance_conf->get_currency_id(), order_type => $self->type_data->validate);
       my $cv_id_method = $self->cv . '_id';
       if (!$::form->{id} && $::form->{$cv_id_method}) {
-...
         $item->active_discount_source($price_source->discount_from_source($item->active_discount_source));
+      }
       if ($self->order->${\ $self->type_data->nr_key } && $::instance_conf->get_webdav) {
       if ($self->order->${\ $self->type_data->properties("nr_key") } && $::instance_conf->get_webdav) {
         my $webdav = SL::Webdav->new(
           type     => $self->type,
           number   => $self->order->number,
-...
                                                     } } @all_objects;
+      }
       $self->{template_args}{in_out}                                 = $self->type_data->transfer;
       $self->{template_args}{in_out}                                 = $self->type_data->properties("transfer");
       $self->{template_args}{longdescription_dialog_size_percentage} = SL::Helper::UserPreferences::DisplayPreferences->new()->get_longdescription_dialog_size_percentage();
       $self->get_item_cvpartnumber($_) for @{$self->order->items_sorted};
-...
       my ($self, %params) = @_;
       my $deletion_allowed = $self->type_data->show_menu("delete");
       my $may_edit_create  = $::auth->assert($self->type_data->access('edit') || 'DOES_NOT_EXIST', 1);
       my $may_edit_create  = $::auth->assert($self->type_data->rights('edit') || 'DOES_NOT_EXIST', 1);
       for my $bar ($::request->layout->get('actionbar')) {
         $bar->add(
-...
+    }
     sub nr_key {
       return $_[0]->type_data->nr_key;
       return $_[0]->type_data->properties("nr_key");
+    }
     sub save_and_redirect_to {
-...
+    }
     sub init_type_data {
       SL::Controller::DeliveryOrder::TypeData->new($_[0]);
       SL::DB::Helper::TypeDataProxy->new('SL::DB::DeliveryOrder', $::form->{type});
+    }
     sub init_valid_types {

     package SL::Controller::DeliveryOrder::TypeData;
     use strict;
     use Exporter qw(import);
     use Scalar::Util qw(weaken);
     use SL::Locale::String qw(t8);
     use SL::DB::DeliveryOrder::TypeData qw(:types :subs);
     my @export_types = qw(SALES_DELIVERY_ORDER_TYPE PURCHASE_DELIVERY_ORDER_TYPE SUPPLIER_DELIVERY_ORDER_TYPE RMA_DELIVERY_ORDER_TYPE);
     our @EXPORT_OK = (@export_types);
     our %EXPORT_TAGS = (types => \@export_types);
     use Rose::Object::MakeMethods::Generic scalar => [ qw(c) ];
     sub new {
       my ($class, $controller) = @_;
       my $o = bless {}, $class;
       if ($controller) {
         $o->c($controller);
         weaken($o->{c});
+      }
       return $o;
+    }
     sub validate {
       my ($self, $string) = @_;
       validate_type($string);
+    }
     sub text {
       my ($self, $string) = @_;
       get3($self->c->type, "text", $string);
+    }
     sub show_menu {
       my ($self, $string) = @_;
       get3($self->c->type, "show_menu", $string);
+    }
     sub workflow {
       my ($self, $string) = @_;
       get3($self->c->type, "workflow", $string);
+    }
     sub properties {
       my ($self, $string) = @_;
       get3($self->c->type, "properties", $string);
+    }
     sub access {
       my ($self, $string) = @_;
       get3($_[0]->c->type, "rights", $string);
+    }
     sub is_quotation {
       get3($_[0]->c->type, "properties", "is_quotation");
+    }
     sub customervendor {
       get3($_[0]->c->type, "properties", "customervendor");
+    }
     sub is_customer {
       get3($_[0]->c->type, "properties", "is_customer");
+    }
     sub nr_key {
       get3($_[0]->c->type, "properties", "nr_key");
+    }
     sub transfer {
       get3($_[0]->c->type, "properties", "transfer");
+    }
     sub part_classification_query {
       my ($self, $string) = @_;
       get($self->c->type, "part_classification_query");
+    }
     sub set_reqdate_by_type {
       my ($self) = @_;
       if (!$self->c->order->reqdate) {
         $self->c->order->reqdate(DateTime->today_local->next_workday(extra_days => 1));
+      }
+    }
     sub get_reqdate_by_type {
       my ($self, $reqdate, $saved_reqdate) = @_;
       if ($reqdate == $saved_reqdate) {
         return DateTime->today_local->next_workday(extra_days => 1);
       } else {
         return $reqdate;
+      }
+    }
 ;

       _via("get3", [ "rights" ], @_);
+    }
     sub workflow {
       _via("get3", [ "workflow" ], @_);
+    }
     sub part_classification_query {
       _via("get", [ "part_classification_query" ], @_);
+    }
     sub _via {
       my $method = shift;
       my $additional_args = shift;

Auch abrufbar als: Unified diff

Projekt

Allgemein

Profil

projekt kivitendo

Revision 55e68890

Von Sven Schöling vor fast 2 Jahren hinzugefügt