Email: Kosmetik

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

diff --git a/SL/Controller/DeliveryPlan.pm b/SL/Controller/DeliveryPlan.pm
index b740e26c445adbe56fd94b64691192ecf9d9f2ea..07581c428ed23623a03614b834cffa14b319069a 100644 (file)
--- a/SL/Controller/DeliveryPlan.pm
+++ b/SL/Controller/DeliveryPlan.pm
@@ -8,10 +8,11 @@ use SL::DB::OrderItem;
 use SL::Controller::Helper::GetModels;
 use SL::Controller::Helper::ReportGenerator;
 use SL::Locale::String;
 use SL::Controller::Helper::GetModels;
 use SL::Controller::Helper::ReportGenerator;
 use SL::Locale::String;

+use Carp;

 
 use Rose::Object::MakeMethods::Generic (
   scalar => [ qw(db_args flat_filter) ],
 
 use Rose::Object::MakeMethods::Generic (
   scalar => [ qw(db_args flat_filter) ],

-  'scalar --get_set_init' => [ qw(models all_edit_right) ],
+  'scalar --get_set_init' => [ qw(models all_edit_right vc) ],

 );
 
 __PACKAGE__->run_before(sub { $::auth->assert('delivery_plan'); });
 );
 
 __PACKAGE__->run_before(sub { $::auth->assert('delivery_plan'); });


@@ -22,16 +23,17 @@ my %sort_columns = (
   partnumber        => t8('Part Number'),
   qty               => t8('Qty'),
   shipped_qty       => t8('shipped'),
   partnumber        => t8('Part Number'),
   qty               => t8('Qty'),
   shipped_qty       => t8('shipped'),

-  delivered_qty     => t8('transferred out'),
+  delivered_qty     => t8('transferred in / out'),

   not_shipped_qty   => t8('not shipped'),
   ordnumber         => t8('Order'),
   customer          => t8('Customer'),
   not_shipped_qty   => t8('not shipped'),
   ordnumber         => t8('Order'),
   customer          => t8('Customer'),

-  value_of_goods    => t8('Value of goods'),
+  vendor            => t8('Vendor'),
+  value_of_goods    => t8('Value of transferred goods'),

 );
 
 );
 

+

 sub action_list {
   my ($self) = @_;
 sub action_list {
   my ($self) = @_;

-

   $self->make_filter_summary;
   $self->prepare_report;
 
   $self->make_filter_summary;
   $self->prepare_report;
 


@@ -45,11 +47,13 @@ sub action_list {
 sub prepare_report {
   my ($self)      = @_;
 
 sub prepare_report {
   my ($self)      = @_;
 

+  my $vc          = $self->vc;

   my $report      = SL::ReportGenerator->new(\%::myconfig, $::form);
   $self->{report} = $report;
 
   my $report      = SL::ReportGenerator->new(\%::myconfig, $::form);
   $self->{report} = $report;
 

-  my @columns     = qw(reqdate customer ordnumber partnumber description qty shipped_qty not_shipped_qty delivered_qty value_of_goods);
-  my @sortable    = qw(reqdate customer ordnumber partnumber description);
+  my @columns     = qw(reqdate customer vendor ordnumber partnumber description qty shipped_qty not_shipped_qty delivered_qty value_of_goods);
+
+  my @sortable    = qw(reqdate customer vendor ordnumber partnumber description);

 
   my %column_defs = (
     reqdate           => {      sub => sub { $_[0]->reqdate_as_date || $_[0]->order->reqdate_as_date                         } },
 
   my %column_defs = (
     reqdate           => {      sub => sub { $_[0]->reqdate_as_date || $_[0]->order->reqdate_as_date                         } },


@@ -63,40 +67,56 @@ sub prepare_report {
     delivered_qty     => {      sub => sub { $::form->format_amount(\%::myconfig, $_[0]->delivered_qty, 2) . ' ' . $_[0]->unit } },
     ordnumber         => {      sub => sub { $_[0]->order->ordnumber                                                         },
                            obj_link => sub { $self->link_to($_[0]->order)                                                    } },
     delivered_qty     => {      sub => sub { $::form->format_amount(\%::myconfig, $_[0]->delivered_qty, 2) . ' ' . $_[0]->unit } },
     ordnumber         => {      sub => sub { $_[0]->order->ordnumber                                                         },
                            obj_link => sub { $self->link_to($_[0]->order)                                                    } },

-    customer          => {      sub => sub { $_[0]->order->customer->name                                                    },
-                           obj_link => sub { $self->link_to($_[0]->order->customer)                                          } },
+    #vendor            => {      sub => sub { $_[0]->order->vendor->name                                                    },
+    #                       obj_link => sub { $self->link_to($_[0]->order->vendor)                                        } },
+    #customer          => {      sub => sub { $_[0]->order->customer->name                                                  },
+    #                       obj_link => sub { $self->link_to($_[0]->order->customer)                                      } },

   );
 
   # add value of goods in report
   if ($main::auth->assert('sales_order_edit') && $::instance_conf->get_delivery_plan_show_value_of_goods) {
     $column_defs{value_of_goods} = { sub =>  sub { $::form->format_amount(\%::myconfig, $_[0]->value_of_goods, 2) . ' ' . $_[0]->taxincluded } };
   }
   );
 
   # add value of goods in report
   if ($main::auth->assert('sales_order_edit') && $::instance_conf->get_delivery_plan_show_value_of_goods) {
     $column_defs{value_of_goods} = { sub =>  sub { $::form->format_amount(\%::myconfig, $_[0]->value_of_goods, 2) . ' ' . $_[0]->taxincluded } };
   }

+
+  # hotfix for today
+  # if visible is not working
+  if ($vc eq 'customer') {
+    $column_defs{customer} = {      sub => sub { $_[0]->order->customer->name                                                  },
+                           obj_link => sub { $self->link_to($_[0]->order->customer)                                      } };
+  }
+  if ($vc eq 'vendor') {
+    $column_defs{vendor}  = {      sub => sub { $_[0]->order->vendor->name                                                    },
+                           obj_link => sub { $self->link_to($_[0]->order->vendor)                                        } },
+  }
+

   $column_defs{$_}->{text} = $sort_columns{$_} for keys %column_defs;
 
   $report->set_options(
     std_column_visibility => 1,
     controller_class      => 'DeliveryPlan',
     output_format         => 'HTML',
   $column_defs{$_}->{text} = $sort_columns{$_} for keys %column_defs;
 
   $report->set_options(
     std_column_visibility => 1,
     controller_class      => 'DeliveryPlan',
     output_format         => 'HTML',

-    top_info_text         => $::locale->text('Delivery Plan for currently outstanding sales orders'),
+    top_info_text         => ($vc eq 'customer') ? $::locale->text('Delivery Plan for currently outstanding sales orders') :
+                                                   $::locale->text('Delivery Plan for currently outstanding purchase orders'),

     title                 => $::locale->text('Delivery Plan'),
     allow_pdf_export      => 1,
     allow_csv_export      => 1,
   );
   $report->set_columns(%column_defs);
   $report->set_column_order(@columns);
     title                 => $::locale->text('Delivery Plan'),
     allow_pdf_export      => 1,
     allow_csv_export      => 1,
   );
   $report->set_columns(%column_defs);
   $report->set_column_order(@columns);

-  $report->set_export_options(qw(list filter));
+  $report->set_export_options(qw(list filter vc));

   $report->set_options_from_form;
   $self->models->disable_plugin('paginated') if $report->{options}{output_format} =~ /^(pdf|csv)$/i;
   $self->models->finalize; # for filter laundering
   $self->models->set_report_generator_sort_options(report => $report, sortable_columns => \@sortable);
   $report->set_options(
   $report->set_options_from_form;
   $self->models->disable_plugin('paginated') if $report->{options}{output_format} =~ /^(pdf|csv)$/i;
   $self->models->finalize; # for filter laundering
   $self->models->set_report_generator_sort_options(report => $report, sortable_columns => \@sortable);
   $report->set_options(

-    raw_top_info_text     => $self->render('delivery_plan/report_top',    { output => 0 }),
+    raw_top_info_text     => $self->render('delivery_plan/report_top',    { output => 0 }, vc => $vc),

     raw_bottom_info_text  => $self->render('delivery_plan/report_bottom', { output => 0 }, models => $self->models),
   );
 }
 
 sub make_filter_summary {
   my ($self) = @_;
     raw_bottom_info_text  => $self->render('delivery_plan/report_bottom', { output => 0 }, models => $self->models),
   );
 }
 
 sub make_filter_summary {
   my ($self) = @_;

+  my $vc     = $self->vc;

 
   my $filter = $::form->{filter} || {};
   my @filter_strings;
 
   my $filter = $::form->{filter} || {};
   my @filter_strings;


@@ -108,6 +128,8 @@ sub make_filter_summary {
     [ $filter->{"reqdate:date::ge"},                              $::locale->text('Delivery Date') . " " . $::locale->text('From Date') ],
     [ $filter->{"reqdate:date::le"},                              $::locale->text('Delivery Date') . " " . $::locale->text('To Date')   ],
     [ $filter->{"qty:number"},                                    $::locale->text('Quantity')                                           ],
     [ $filter->{"reqdate:date::ge"},                              $::locale->text('Delivery Date') . " " . $::locale->text('From Date') ],
     [ $filter->{"reqdate:date::le"},                              $::locale->text('Delivery Date') . " " . $::locale->text('To Date')   ],
     [ $filter->{"qty:number"},                                    $::locale->text('Quantity')                                           ],

+    [ $filter->{order}{vendor}{"name:substr::ilike"},             $::locale->text('Vendor')                                             ],
+    [ $filter->{order}{vendor}{"vendornumber:substr::ilike"},     $::locale->text('Vendor Number')                                      ],

     [ $filter->{order}{customer}{"name:substr::ilike"},           $::locale->text('Customer')                                           ],
     [ $filter->{order}{customer}{"customernumber:substr::ilike"}, $::locale->text('Customer Number')                                    ],
   );
     [ $filter->{order}{customer}{"name:substr::ilike"},           $::locale->text('Customer')                                           ],
     [ $filter->{order}{customer}{"customernumber:substr::ilike"}, $::locale->text('Customer Number')                                    ],
   );


@@ -130,13 +152,15 @@ sub make_filter_summary {
 }
 
 sub delivery_plan_query {
 }
 
 sub delivery_plan_query {

+  my ($self) = @_;
+  my $vc     = $self->vc;

   my $employee_id = SL::DB::Manager::Employee->current->id;
   my $employee_id = SL::DB::Manager::Employee->current->id;

-  my $oe_owner = $_[0]->all_edit_right ? '' : " oe.eployee_id = $employee_id AND";
+  my $oe_owner = $_[0]->all_edit_right ? '' : " oe.employee_id = $employee_id AND";

   # check delivered state for delivery_orders (transferred out) if enabled
   my $filter_delivered = $::instance_conf->get_delivery_plan_calculate_transferred_do  ?
       "AND (SELECT delivered from delivery_orders where id = doi.delivery_order_id)" : '';
   [
   # check delivered state for delivery_orders (transferred out) if enabled
   my $filter_delivered = $::instance_conf->get_delivery_plan_calculate_transferred_do  ?
       "AND (SELECT delivered from delivery_orders where id = doi.delivery_order_id)" : '';
   [

-  'order.customer_id' => { gt => 0 },
+  "order.${vc}_id" => { gt => 0 },

   'order.closed' => 0,
   or => [ 'order.quotation' => 0, 'order.quotation' => undef ],
 
   'order.closed' => 0,
   or => [ 'order.quotation' => 0, 'order.quotation' => undef ],
 


@@ -152,7 +176,7 @@ sub delivery_plan_query {
         FROM orderitems oi, oe, record_links rl, delivery_order_items doi
         WHERE
           oe.id = oi.trans_id AND
         FROM orderitems oi, oe, record_links rl, delivery_order_items doi
         WHERE
           oe.id = oi.trans_id AND

-          oe.customer_id IS NOT NULL AND
+          oe.${vc}_id IS NOT NULL AND

           (oe.quotation = 'f' OR oe.quotation IS NULL) AND
           NOT oe.closed AND
           $oe_owner
           (oe.quotation = 'f' OR oe.quotation IS NULL) AND
           NOT oe.closed AND
           $oe_owner


@@ -176,7 +200,7 @@ sub delivery_plan_query {
     SELECT oi.id FROM orderitems oi, oe
     WHERE
       oe.id = oi.trans_id AND
     SELECT oi.id FROM orderitems oi, oe
     WHERE
       oe.id = oi.trans_id AND

-      oe.customer_id IS NOT NULL AND
+      oe.${vc}_id IS NOT NULL AND

       (oe.quotation = 'f' OR oe.quotation IS NULL) AND
       NOT oe.closed AND
       $oe_owner
       (oe.quotation = 'f' OR oe.quotation IS NULL) AND
       NOT oe.closed AND
       $oe_owner


@@ -211,7 +235,7 @@ sub delivery_plan_query {
           rl.from_table = 'oe' AND
           rl.to_table = 'delivery_orders' AND
 
           rl.from_table = 'oe' AND
           rl.to_table = 'delivery_orders' AND
 

-          oe.customer_id IS NOT NULL AND
+          oe.${vc}_id IS NOT NULL AND

           $oe_owner
           (oe.quotation = 'f' OR oe.quotation IS NULL) AND NOT oe.closed
       ) rl
           $oe_owner
           (oe.quotation = 'f' OR oe.quotation IS NULL) AND NOT oe.closed
       ) rl


@@ -228,7 +252,7 @@ sub delivery_plan_query {
         WHERE oi.trans_id = rl.from_id AND rl.from_table = 'oe' AND rl.to_table = 'delivery_orders'
       ) AND
       coalesce(sum, 0) < oi.qty AND
         WHERE oi.trans_id = rl.from_id AND rl.from_table = 'oe' AND rl.to_table = 'delivery_orders'
       ) AND
       coalesce(sum, 0) < oi.qty AND

-      oe.customer_id IS NOT NULL AND
+      oe.${vc}_id IS NOT NULL AND

       $oe_owner
       (oe.quotation = 'f' OR oe.quotation IS NULL) AND NOT oe.closed
   " ],
       $oe_owner
       (oe.quotation = 'f' OR oe.quotation IS NULL) AND NOT oe.closed
   " ],


@@ -237,6 +261,7 @@ sub delivery_plan_query {
 
 sub init_models {
   my ($self) = @_;
 
 sub init_models {
   my ($self) = @_;

+  my $vc     = $self->vc;

 
   SL::Controller::Helper::GetModels->new(
     controller   => $self,
 
   SL::Controller::Helper::GetModels->new(
     controller   => $self,


@@ -249,13 +274,16 @@ sub init_models {
       %sort_columns,
     },
     query        => $self->delivery_plan_query,
       %sort_columns,
     },
     query        => $self->delivery_plan_query,

-    with_objects => [ 'order', 'order.customer', 'part' ],
+    with_objects => [ 'order', "order.$vc", 'part' ],

   );
 }
 
 sub init_all_edit_right {
   $::auth->assert('sales_all_edit', 1)
 }
   );
 }
 
 sub init_all_edit_right {
   $::auth->assert('sales_all_edit', 1)
 }

+sub init_vc {
+  return $::form->{vc} if ($::form->{vc} eq 'customer' || $::form->{vc} eq 'vendor') || croak "self (DeliveryPlan) has no vc defined";
+}

 
 sub link_to {
   my ($self, $object, %params) = @_;
 
 sub link_to {
   my ($self, $object, %params) = @_;