Entwürfe: beim Buchen dazugehörigen Entwurf löschen

[mfinanz.git] / SL / Controller / PriceSource.pm

diff --git a/SL/Controller/PriceSource.pm b/SL/Controller/PriceSource.pm
index ab74da015a3397d99fe4455844dae16f26b57cb9..aea9f46454c7412939f287e963df35d25d5561b6 100644 (file)
--- a/SL/Controller/PriceSource.pm
+++ b/SL/Controller/PriceSource.pm
@@ -5,14 +5,13 @@ use strict;
 use parent qw(SL::Controller::Base);
 
 use List::MoreUtils qw(any uniq apply);
 use parent qw(SL::Controller::Base);
 
 use List::MoreUtils qw(any uniq apply);

-use SL::ClientJS;

 use SL::Locale::String qw(t8);
 use SL::PriceSource;
 
 use Rose::Object::MakeMethods::Generic
 (
  scalar => [ qw(record_item) ],
 use SL::Locale::String qw(t8);
 use SL::PriceSource;
 
 use Rose::Object::MakeMethods::Generic
 (
  scalar => [ qw(record_item) ],

- 'scalar --get_set_init' => [ qw(js record) ],
+ 'scalar --get_set_init' => [ qw(record) ],

 );
 
 __PACKAGE__->run_before('check_auth');
 );
 
 __PACKAGE__->run_before('check_auth');


@@ -25,6 +24,12 @@ sub action_price_popup {
   my ($self) = @_;
 
   my $record_item = _make_record_item($::form->{row});
   my ($self) = @_;
 
   my $record_item = _make_record_item($::form->{row});

+  my $old_unit;
+  if (($old_unit = $record_item->{__additional_form_attributes}{unit_old}) && $old_unit ne $record_item->unit) {
+    # reset unit changes. the way these interact on update breaks stuff
+    $record_item->unit_obj(SL::DB::Manager::Unit->find_by(name => $old_unit));
+    $self->js->val("select[name='unit_$::form->{row}']", $old_unit);
+  }

 
   $self->render_price_dialog($record_item);
 }
 
   $self->render_price_dialog($record_item);
 }


@@ -47,7 +52,7 @@ sub render_price_dialog {
 #     $self->js->show('#dialog_flash_error');
 #   }
 
 #     $self->js->show('#dialog_flash_error');
 #   }
 

-  $self->js->render($self);
+  $self->js->render;

 }
 
 
 }
 
 


@@ -59,10 +64,6 @@ sub check_auth {
   $::auth->assert('edit_prices');
 }
 
   $::auth->assert('edit_prices');
 }
 

-sub init_js {
-  SL::ClientJS->new
-}
-

 sub init_record {
   _make_record();
 }
 sub init_record {
   _make_record();
 }


@@ -77,6 +78,7 @@ sub _make_record_item {
     request_quotation       => 'OrderItem',
     invoice                 => 'InvoiceItem',
     purchase_invoice        => 'InvoiceItem',
     request_quotation       => 'OrderItem',
     invoice                 => 'InvoiceItem',
     purchase_invoice        => 'InvoiceItem',

+    credit_note             => 'InvoiceItem',

     purchase_delivery_order => 'DeliveryOrderItem',
     sales_delivery_order    => 'DeliveryOrderItem',
   }->{$::form->{type}};
     purchase_delivery_order => 'DeliveryOrderItem',
     sales_delivery_order    => 'DeliveryOrderItem',
   }->{$::form->{type}};


@@ -92,13 +94,18 @@ sub _make_record_item {
           : $class->new;
 
   for my $method (apply { s/_$row$// } grep { /_$row$/ } keys %$::form) {
           : $class->new;
 
   for my $method (apply { s/_$row$// } grep { /_$row$/ } keys %$::form) {

-    next unless $obj->meta->column($method);
-    if ($obj->meta->column($method)->isa('Rose::DB::Object::Metadata::Column::Date')) {
-      $obj->${\"$method\_as_date"}($::form->{"$method\_$row"});
-    } elsif ((ref $obj->meta->column($method)) =~ /^Rose::DB::Object::Metadata::Column::(?:Numeric|Float|DoublePrecsion)$/) {
-      $obj->${\"$method\_as_number"}($::form->{"$method\_$row"});
+    if ($obj->meta->column($method)) {
+      if ($obj->meta->column($method)->isa('Rose::DB::Object::Metadata::Column::Date')) {
+        $obj->${\"$method\_as_date"}($::form->{"$method\_$row"});
+      } elsif ((ref $obj->meta->column($method)) =~ /^Rose::DB::Object::Metadata::Column::(?:Numeric|Float|DoublePrecsion)$/) {
+        $obj->${\"$method\_as_number"}($::form->{"$method\_$row"});
+      } elsif ((ref $obj->meta->column($method)) =~ /^Rose::DB::Object::Metadata::Column::Boolean$/) {
+        $obj->$method(!!$::form->{$method});
+      } else {
+        $obj->$method($::form->{"$method\_$row"});
+      }

     } else {
     } else {

-      $obj->$method($::form->{"$method\_$row"});
+      $obj->{__additional_form_attributes}{$method} = $::form->{"$method\_$row"};

     }
   }
 
     }
   }
 


@@ -114,10 +121,9 @@ sub _make_record {
 
   my $class = {
     sales_order             => 'Order',
 
   my $class = {
     sales_order             => 'Order',

-    purchase_oder           => 'Order',
+    purchase_order          => 'Order',

     sales_quotation         => 'Order',
     request_quotation       => 'Order',
     sales_quotation         => 'Order',
     request_quotation       => 'Order',

-    invoice                 => 'Invoice',

     purchase_invoice        => 'PurchaseInvoice',
     purchase_delivery_order => 'DeliveryOrder',
     sales_delivery_order    => 'DeliveryOrder',
     purchase_invoice        => 'PurchaseInvoice',
     purchase_delivery_order => 'DeliveryOrder',
     sales_delivery_order    => 'DeliveryOrder',


@@ -147,6 +153,8 @@ sub _make_record {
       $obj->${\"$method\_as_date"}($::form->{$method});
     } elsif ((ref $obj->meta->column($method)) =~ /^Rose::DB::Object::Metadata::Column::(?:Numeric|Float|DoublePrecsion)$/) {
       $obj->${\"$method\_as\_number"}($::form->{$method});
       $obj->${\"$method\_as_date"}($::form->{$method});
     } elsif ((ref $obj->meta->column($method)) =~ /^Rose::DB::Object::Metadata::Column::(?:Numeric|Float|DoublePrecsion)$/) {
       $obj->${\"$method\_as\_number"}($::form->{$method});

+    } elsif ((ref $obj->meta->column($method)) =~ /^Rose::DB::Object::Metadata::Column::Boolean$/) {
+      $obj->$method(!!$::form->{$method});

     } else {
       $obj->$method($::form->{$method});
     }
     } else {
       $obj->$method($::form->{$method});
     }


@@ -161,6 +169,7 @@ sub _make_record {
 
     $obj->items(@items) if @items;
   }
 
     $obj->items(@items) if @items;
   }

+  $obj->is_sales(!!$obj->customer_id) if $class eq 'SL::DB::DeliveryOrder';

 
   return $obj;
 }
 
   return $obj;
 }