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

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

diff --git a/SL/Controller/CustomerVendor.pm b/SL/Controller/CustomerVendor.pm
index 5985e94d7cebb987b425c673336a229a3f8781cd..b64c121afe499137d4e4b834bb710e32f0e8410f 100644 (file)
--- a/SL/Controller/CustomerVendor.pm
+++ b/SL/Controller/CustomerVendor.pm
@@ -18,6 +18,8 @@ use SL::DB::PaymentTerm;
 use SL::DB::Pricegroup;
 use SL::DB::Contact;
 use SL::DB::FollowUp;
 use SL::DB::Pricegroup;
 use SL::DB::Contact;
 use SL::DB::FollowUp;

+use SL::DB::History;
+use SL::DB::Currency;

 
 # safety
 __PACKAGE__->run_before(
 
 # safety
 __PACKAGE__->run_before(


@@ -37,6 +39,7 @@ __PACKAGE__->run_before(
     'save_and_order',
     'save_and_quotation',
     'save_and_rfq',
     'save_and_order',
     'save_and_quotation',
     'save_and_rfq',

+    'delete',

     'delete_contact',
     'delete_shipto',
   ]
     'delete_contact',
     'delete_shipto',
   ]


@@ -83,49 +86,59 @@ sub action_edit {
 sub _save {
   my ($self) = @_;
 
 sub _save {
   my ($self) = @_;
 

-  my $cvs_by_nr;
-  if ( $self->is_vendor() ) {
-    if ( $self->{cv}->vendornumber ) {
-      $cvs_by_nr = SL::DB::Manager::Vendor->get_all(query => [vendornumber => $self->{cv}->vendornumber]);
-    }
-  }
-  else {
-    if ( $self->{cv}->customernumber ) {
-      $cvs_by_nr = SL::DB::Manager::Customer->get_all(query => [customernumber => $self->{cv}->customernumber]);
+  my $db = $self->{cv}->db;
+
+  $db->do_transaction(sub {
+    my $cvs_by_nr;
+    if ( $self->is_vendor() ) {
+      if ( $self->{cv}->vendornumber ) {
+        $cvs_by_nr = SL::DB::Manager::Vendor->get_all(query => [vendornumber => $self->{cv}->vendornumber]);
+      }
+    } else {
+      if ( $self->{cv}->customernumber ) {
+        $cvs_by_nr = SL::DB::Manager::Customer->get_all(query => [customernumber => $self->{cv}->customernumber]);
+      }

     }
     }

-  }

 
 

-  foreach my $entry (@{$cvs_by_nr}) {
-    if( $entry->id != $self->{cv}->id ) {
-      my $msg =
-        $self->is_vendor() ? $::locale->text('This vendor number is already in use.') : $::locale->text('This customer number is already in use.');
+    foreach my $entry (@{$cvs_by_nr}) {
+      if( $entry->id != $self->{cv}->id ) {
+        my $msg =
+          $self->is_vendor() ? $::locale->text('This vendor number is already in use.') : $::locale->text('This customer number is already in use.');

 
 

-      $::form->error($msg);
+        $::form->error($msg);
+      }

     }
     }

-  }

 
 

-  $self->{cv}->save(cascade => 1);
+    $self->{cv}->save(cascade => 1);

 
 

-  $self->{contact}->cp_cv_id($self->{cv}->id);
-  if( $self->{contact}->cp_name ne '' || $self->{contact}->cp_givenname ne '' ) {
-    $self->{contact}->save();
-  }
+    $self->{contact}->cp_cv_id($self->{cv}->id);
+    if( $self->{contact}->cp_name ne '' || $self->{contact}->cp_givenname ne '' ) {
+      $self->{contact}->save();
+    }

 
 

-  if( $self->{note}->subject ne '' && $self->{note}->body ne '' ) {
-    $self->{note}->trans_id($self->{cv}->id);
-    $self->{note}->save();
-    $self->{note_followup}->save();
+    if( $self->{note}->subject ne '' && $self->{note}->body ne '' ) {
+      $self->{note}->trans_id($self->{cv}->id);
+      $self->{note}->save();
+      $self->{note_followup}->save();

 
 

-    $self->{note} = SL::DB::Note->new();
-    $self->{note_followup} = SL::DB::FollowUp->new();
-  }
+      $self->{note} = SL::DB::Note->new();
+      $self->{note_followup} = SL::DB::FollowUp->new();
+    }

 
 

-  $self->{shipto}->trans_id($self->{cv}->id);
-  if( $self->{shipto}->shiptoname ne '' ) {
-    $self->{shipto}->save();
-  }
+    $self->{shipto}->trans_id($self->{cv}->id);
+    if( $self->{shipto}->shiptoname ne '' ) {
+      $self->{shipto}->save();
+    }
+
+    my $snumbers = $self->is_vendor() ? 'vendornumber_'. $self->{cv}->vendornumber : 'customernumber_'. $self->{cv}->customernumber;
+    SL::DB::History->new(
+      trans_id => $self->{cv}->id,
+      snumbers => $snumbers,
+      employee_id => SL::DB::Manager::Employee->current->id,
+      addition => 'SAVED',
+    )->save();
+  }) || die($db->error);

 
 

-  #TODO: history

 }
 
 sub action_save {
 }
 
 sub action_save {


@@ -133,7 +146,7 @@ sub action_save {
 
   $self->_save();
 
 
   $self->_save();
 

-  $self->action_edit();
+  $self->redirect_to(action => 'edit', id => $self->{cv}->id, db => $self->is_vendor() ? 'vendor' : 'customer');

 }
 
 sub action_save_and_close {
 }
 
 sub action_save_and_close {


@@ -157,14 +170,15 @@ sub _transaction {
   my $name = $::form->escape($self->{cv}->name, 1);
   my $db = $self->is_vendor() ? 'vendor' : 'customer';
 
   my $name = $::form->escape($self->{cv}->name, 1);
   my $db = $self->is_vendor() ? 'vendor' : 'customer';
 

-  my $url =
-    $script .'?'.
-    'action=add&'.
-    'vc='. $db .'&'.
-    $db .'_id=' . $self->{cv}->id .'&'.
-    $db .'='. $name .'&'.
-    'type='. $::form->{type} .'&'.
-    'callback='. $callback;
+  my $url = $self->url_for(
+    controller => $script,
+    action     => 'add',
+    vc         => $db,
+    $db .'_id' => $self->{cv}->id,
+    $db        => $name,
+    type       => $::form->{type},
+    callback   => $callback,
+  );

 
   print $::form->redirect_header($url);
 }
 
   print $::form->redirect_header($url);
 }


@@ -232,15 +246,23 @@ sub action_save_and_quotation {
 sub action_delete {
   my ($self) = @_;
 
 sub action_delete {
   my ($self) = @_;
 

-  if( !$self->is_orphaned() ) {
-    SL::Helper::Flash::flash('error', $::locale->text('blaabla'));
+  my $db = $self->{cv}->db;

 
 

+  if( !$self->is_orphaned() ) {

     $self->action_edit();
     $self->action_edit();

-  }
-  else {
-    $self->{cv}->delete();
+  } else {
+
+    $db->do_transaction(sub {
+      $self->{cv}->delete(cascade => 1);

 
 

-    #TODO: history
+      my $snumbers = $self->is_vendor() ? 'vendornumber_'. $self->{cv}->vendornumber : 'customernumber_'. $self->{cv}->customernumber;
+      SL::DB::History->new(
+        trans_id => $self->{cv}->id,
+        snumbers => $snumbers,
+        employee_id => SL::DB::Manager::Employee->current->id,
+        addition => 'DELETED',
+      )->save();
+    }) || die($db->error);

 
     my $msg = $self->is_vendor() ? $::locale->text('Vendor deleted!') : $::locale->text('Customer deleted!');
     $::form->redirect($msg);
 
     my $msg = $self->is_vendor() ? $::locale->text('Vendor deleted!') : $::locale->text('Customer deleted!');
     $::form->redirect($msg);


@@ -252,17 +274,22 @@ sub action_delete {
 sub action_delete_contact {
   my ($self) = @_;
 
 sub action_delete_contact {
   my ($self) = @_;
 

+  my $db = $self->{contact}->db;
+

   if ( !$self->{contact}->cp_id ) {
     SL::Helper::Flash::flash('error', $::locale->text('No contact selected to delete'));
   } else {
   if ( !$self->{contact}->cp_id ) {
     SL::Helper::Flash::flash('error', $::locale->text('No contact selected to delete'));
   } else {

-    if ( $self->{contact}->used ) {
-      $self->{contact}->detach();
-      $self->{contact}->save();
-      SL::Helper::Flash::flash('info', $::locale->text('Contact is in use and was flagged invalid.'));
-    } else {
-      $self->{contact}->delete();
-      SL::Helper::Flash::flash('info', $::locale->text('Contact deleted.'));
-    }
+
+    $db->do_transaction(sub {
+      if ( $self->{contact}->used ) {
+        $self->{contact}->detach();
+        $self->{contact}->save();
+        SL::Helper::Flash::flash('info', $::locale->text('Contact is in use and was flagged invalid.'));
+      } else {
+        $self->{contact}->delete(cascade => 1);
+        SL::Helper::Flash::flash('info', $::locale->text('Contact deleted.'));
+      }
+    }) || die($db->error);

 
     $self->{contact} = SL::DB::Contact->new();
   }
 
     $self->{contact} = SL::DB::Contact->new();
   }


@@ -273,17 +300,22 @@ sub action_delete_contact {
 sub action_delete_shipto {
   my ($self) = @_;
 
 sub action_delete_shipto {
   my ($self) = @_;
 

+  my $db = $self->{shipto}->db;
+

   if ( !$self->{shipto}->shipto_id ) {
     SL::Helper::Flash::flash('error', $::locale->text('No shipto selected to delete'));
   } else {
   if ( !$self->{shipto}->shipto_id ) {
     SL::Helper::Flash::flash('error', $::locale->text('No shipto selected to delete'));
   } else {

-    if ( $self->{shipto}->used ) {
-      $self->{shipto}->detach();
-      $self->{shipto}->save();
-      SL::Helper::Flash::flash('info', $::locale->text('Shipto is in use and was flagged invalid.'));
-    } else {
-      $self->{shipto}->delete();
-      SL::Helper::Flash::flash('info', $::locale->text('Shipto deleted.'));
-    }
+
+    $db->do_transaction(sub {
+      if ( $self->{shipto}->used ) {
+        $self->{shipto}->detach();
+        $self->{shipto}->save(cascade => 1);
+        SL::Helper::Flash::flash('info', $::locale->text('Shipto is in use and was flagged invalid.'));
+      } else {
+        $self->{shipto}->delete(cascade => 1);
+        SL::Helper::Flash::flash('info', $::locale->text('Shipto deleted.'));
+      }
+    }) || die($db->error);

 
     $self->{shipto} = SL::DB::Shipto->new();
   }
 
     $self->{shipto} = SL::DB::Shipto->new();
   }


@@ -328,8 +360,7 @@ sub action_get_delivery {
     $arap = 'ap';
     $db = 'vendor';
     $qty_sign = ' * -1 AS qty';
     $arap = 'ap';
     $db = 'vendor';
     $qty_sign = ' * -1 AS qty';

-  }
-  else {
+  } else {

     $arap = 'ar';
     $db = 'customer';
     $qty_sign = '';
     $arap = 'ar';
     $db = 'customer';
     $qty_sign = '';


@@ -416,8 +447,7 @@ sub action_ajaj_get_contact {
 
         if ( $_ eq 'birthday' && $self->{contact}->$name ) {
           $name => $self->{contact}->$name->to_lxoffice;
 
         if ( $_ eq 'birthday' && $self->{contact}->$name ) {
           $name => $self->{contact}->$name->to_lxoffice;

-        }
-        else {
+        } else {

           $name => $self->{contact}->$name;
         }
       }
           $name => $self->{contact}->$name;
         }
       }


@@ -433,8 +463,7 @@ sub action_ajaj_get_contact {
       {
         if ( $_->config->type eq 'number' ) {
           $_->config->name => $::form->format_amount(\%::myconfig, $_->value, -2);
       {
         if ( $_->config->type eq 'number' ) {
           $_->config->name => $::form->format_amount(\%::myconfig, $_->value, -2);

-        }
-        else {
+        } else {

           $_->config->name => $_->value;
         }
       }
           $_->config->name => $_->value;
         }
       }


@@ -536,21 +565,23 @@ sub _instantiate_args {
   if ( $::form->{cv}->{id} ) {
     if ( $self->is_vendor() ) {
       $self->{cv} = SL::DB::Vendor->new(id => $::form->{cv}->{id})->load();
   if ( $::form->{cv}->{id} ) {
     if ( $self->is_vendor() ) {
       $self->{cv} = SL::DB::Vendor->new(id => $::form->{cv}->{id})->load();

-    }
-    else {
+    } else {

       $self->{cv} = SL::DB::Customer->new(id => $::form->{cv}->{id})->load();
     }
       $self->{cv} = SL::DB::Customer->new(id => $::form->{cv}->{id})->load();
     }

-  }
-  else {
+  } else {

     if ( $self->is_vendor() ) {
       $self->{cv} = SL::DB::Vendor->new();
     if ( $self->is_vendor() ) {
       $self->{cv} = SL::DB::Vendor->new();

-    }
-    else {
+    } else {

       $self->{cv} = SL::DB::Customer->new();
     }
   }
   $self->{cv}->assign_attributes(%{$::form->{cv}});
 
       $self->{cv} = SL::DB::Customer->new();
     }
   }
   $self->{cv}->assign_attributes(%{$::form->{cv}});
 

+  if ( $self->is_customer() && $::form->{cv}->{taxincluded_checked} eq '' ) {
+    $self->{cv}->taxincluded_checked(undef);
+  }
+
+

   foreach my $cvar (@{$self->{cv}->cvars_by_config()}) {
     my $value = $::form->{cv_cvars}->{$cvar->config->name};
 
   foreach my $cvar (@{$self->{cv}->cvars_by_config()}) {
     my $value = $::form->{cv_cvars}->{$cvar->config->name};
 


@@ -561,25 +592,14 @@ sub _instantiate_args {
     $cvar->value($value);
   }
 
     $cvar->value($value);
   }
 

-#  foreach my $cvar_key (keys(%{$::form->{cv_cvars}})) {
-#    my $cvar_value = $::form->{cv_cvars}->{$cvar_key};
-#    my $cvar = $self->{cv}->cvar_by_name($cvar_key);
-#    $cvar->value($cvar_value);
-#  }
-

   if ( $::form->{note}->{id} ) {
     $self->{note} = SL::DB::Note->new(id => $::form->{note}->{id})->load();
   if ( $::form->{note}->{id} ) {
     $self->{note} = SL::DB::Note->new(id => $::form->{note}->{id})->load();

-  }
-  else {
+  } else {

     $self->{note} = SL::DB::Note->new();
   }
   $self->{note}->assign_attributes(%{$::form->{note}});
   $self->{note}->created_by($curr_employee->id);
   $self->{note}->trans_module('ct');
     $self->{note} = SL::DB::Note->new();
   }
   $self->{note}->assign_attributes(%{$::form->{note}});
   $self->{note}->created_by($curr_employee->id);
   $self->{note}->trans_module('ct');

-  #  if ( $self->{note}->trans_id != $self->{cv}->id ) {
-  #    die($::locale->text('Error'));
-  #  }
-

 
   $self->{note_followup} = SL::DB::FollowUp->new();
   $self->{note_followup}->assign_attributes(%{$::form->{note_followup}});
 
   $self->{note_followup} = SL::DB::FollowUp->new();
   $self->{note_followup}->assign_attributes(%{$::form->{note_followup}});


@@ -588,26 +608,18 @@ sub _instantiate_args {
 
   if ( $::form->{shipto}->{shipto_id} ) {
     $self->{shipto} = SL::DB::Shipto->new(shipto_id => $::form->{shipto}->{shipto_id})->load();
 
   if ( $::form->{shipto}->{shipto_id} ) {
     $self->{shipto} = SL::DB::Shipto->new(shipto_id => $::form->{shipto}->{shipto_id})->load();

-  }
-  else {
+  } else {

     $self->{shipto} = SL::DB::Shipto->new();
   }
   $self->{shipto}->assign_attributes(%{$::form->{shipto}});
   $self->{shipto}->module('CT');
     $self->{shipto} = SL::DB::Shipto->new();
   }
   $self->{shipto}->assign_attributes(%{$::form->{shipto}});
   $self->{shipto}->module('CT');

-#  if ( $self->{shipto}->trans_id != $self->{cv}->id ) {
-#    die($::locale->text('Error'));
-#  }

 
   if ( $::form->{contact}->{cp_id} ) {
     $self->{contact} = SL::DB::Contact->new(cp_id => $::form->{contact}->{cp_id})->load();
 
   if ( $::form->{contact}->{cp_id} ) {
     $self->{contact} = SL::DB::Contact->new(cp_id => $::form->{contact}->{cp_id})->load();

-  }
-  else {
+  } else {

     $self->{contact} = SL::DB::Contact->new();
   }
   $self->{contact}->assign_attributes(%{$::form->{contact}});
     $self->{contact} = SL::DB::Contact->new();
   }
   $self->{contact}->assign_attributes(%{$::form->{contact}});

-#  if ( $self->{contact}->cp_cv_id != $self->{cv}->id ) {
-#    die($::locale->text('Error'));
-#  }

 
   foreach my $cvar (@{$self->{contact}->cvars_by_config()}) {
     my $value = $::form->{contact_cvars}->{$cvar->config->name};
 
   foreach my $cvar (@{$self->{contact}->cvars_by_config()}) {
     my $value = $::form->{contact_cvars}->{$cvar->config->name};


@@ -625,8 +637,7 @@ sub _load_customer_vendor {
 
   if ( $self->is_vendor() ) {
     $self->{cv} = SL::DB::Vendor->new(id => $::form->{id})->load();
 
   if ( $self->is_vendor() ) {
     $self->{cv} = SL::DB::Vendor->new(id => $::form->{id})->load();

-  }
-  else {
+  } else {

     $self->{cv} = SL::DB::Customer->new(id => $::form->{id})->load();
   }
 
     $self->{cv} = SL::DB::Customer->new(id => $::form->{id})->load();
   }
 


@@ -639,8 +650,7 @@ sub _load_customer_vendor {
     if ( $self->{shipto}->trans_id != $self->{cv}->id ) {
       die($::locale->text('Error'));
     }
     if ( $self->{shipto}->trans_id != $self->{cv}->id ) {
       die($::locale->text('Error'));
     }

-  }
-  else {
+  } else {

     $self->{shipto} = SL::DB::Shipto->new();
   }
 
     $self->{shipto} = SL::DB::Shipto->new();
   }
 


@@ -650,8 +660,7 @@ sub _load_customer_vendor {
     if ( $self->{contact}->cp_cv_id != $self->{cv}->id ) {
       die($::locale->text('Error'));
     }
     if ( $self->{contact}->cp_cv_id != $self->{cv}->id ) {
       die($::locale->text('Error'));
     }

-  }
-  else {
+  } else {

     $self->{contact} = SL::DB::Contact->new();
   }
 }
     $self->{contact} = SL::DB::Contact->new();
   }
 }


@@ -661,10 +670,10 @@ sub _create_customer_vendor {
 
   if ( $self->is_vendor() ) {
     $self->{cv} = SL::DB::Vendor->new();
 
   if ( $self->is_vendor() ) {
     $self->{cv} = SL::DB::Vendor->new();

-  }
-  else {
+  } else {

     $self->{cv} = SL::DB::Customer->new();
   }
     $self->{cv} = SL::DB::Customer->new();
   }

+  $self->{cv}->currency_id($::instance_conf->get_currency_id());

 
   $self->{note} = SL::DB::Note->new();
 
 
   $self->{note} = SL::DB::Note->new();
 


@@ -684,7 +693,7 @@ sub _pre_render {
 
   $self->{all_business} = SL::DB::Manager::Business->get_all();
 
 
   $self->{all_business} = SL::DB::Manager::Business->get_all();
 

-  $self->{all_employees} = SL::DB::Manager::Employee->get_all();
+  $self->{all_employees} = SL::DB::Manager::Employee->get_all(query => [ deleted => 0 ]);

 
   $query =
     'SELECT DISTINCT(greeting)
 
   $query =
     'SELECT DISTINCT(greeting)


@@ -714,26 +723,32 @@ sub _pre_render {
     )
   ];
 
     )
   ];
 

-  $query =
-    'SELECT curr
-     FROM defaults';
-  my $curr = selectall_hashref_query($::form, $dbh, $query)->[0]->{curr};
-  my @currencies = grep(
-    { $_; }
-    map(
-      { s/\s//g; $_; }
-      split(m/:/, $curr)
-    )
-  );
-  $self->{all_currencies} = \@currencies;
+  $self->{all_currencies} = SL::DB::Manager::Currency->get_all();

 
   $self->{all_languages} = SL::DB::Manager::Language->get_all();
 
   $self->{all_taxzones} = SL::DB::Manager::TaxZone->get_all();
 
 
   $self->{all_languages} = SL::DB::Manager::Language->get_all();
 
   $self->{all_taxzones} = SL::DB::Manager::TaxZone->get_all();
 

-  #Employee:
-  #TODO: ALL_SALESMAN
-  #TODO: ALL_SALESMAN_CUSTOMERS
+  if ( $::instance_conf->get_vertreter() ) {
+    $query =
+      'SELECT id
+       FROM business
+       WHERE salesman';
+    my $business_ids = [
+      map(
+        { $_->{id}; }
+        selectall_hashref_query($::form, $dbh, $query)
+      )
+    ];
+
+    if ( $business_ids->[0] ) {
+      $self->{all_salesman_customers} = SL::DB::Manager::Customer->get_all(query => [business_id => $business_ids]);
+    } else {
+      $self->{all_salesman_customers} = [];
+    }
+  } else {
+    $self->{all_salesmen} = SL::DB::Manager::Employee->get_all(query => [ or => [ id => $self->{cv}->salesman_id,  deleted => 0 ] ]);
+  }

 
   $self->{all_payment_terms} = SL::DB::Manager::PaymentTerm->get_all();
 
 
   $self->{all_payment_terms} = SL::DB::Manager::PaymentTerm->get_all();
 


@@ -757,9 +772,10 @@ sub _pre_render {
   $self->{shiptos} = $self->{cv}->shipto;
   $self->{shiptos} ||= [];
 
   $self->{shiptos} = $self->{cv}->shipto;
   $self->{shiptos} ||= [];
 

-  $self->{template_args} = {};
+  $self->{template_args} ||= {};

 
   $::request->{layout}->add_javascripts('autocomplete_customer.js');
 
   $::request->{layout}->add_javascripts('autocomplete_customer.js');

+  $::request->{layout}->add_javascripts('kivi.CustomerVendor.js');

 }
 
 1;
 }
 
 1;