X-Git-Url: http://wagnertech.de/git?p=kivitendo-erp.git;a=blobdiff_plain;f=bin%2Fmozilla%2Fcp.pl;fp=bin%2Fmozilla%2Fcp.pl;h=9b77e5766b1a7b8f273429fbb7bcb36d65c67dbf;hp=888bf8a9f5669de2fdec483f375780eeb5c071d7;hb=53593baa211863fbf66540cf1bcc36c8fb37257f;hpb=deb4d2dbb676d7d6f69dfe7815d6e0cb09bd4a44

diff --git a/bin/mozilla/cp.pl b/bin/mozilla/cp.pl
index 888bf8a9f..9b77e5766 100644
--- a/bin/mozilla/cp.pl
+++ b/bin/mozilla/cp.pl
@@ -24,7 +24,8 @@
 # GNU General Public License for more details.
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+# MA 02110-1335, USA.
 #======================================================================
 #
 # Payment module
@@ -37,10 +38,10 @@ use SL::IR;
 use SL::AR;
 use SL::AP;
 use Data::Dumper;
+use SL::Locale::String qw(t8);
 use strict;
 #use warnings;
 
-require "bin/mozilla/arap.pl";
 require "bin/mozilla/common.pl";
 
 our ($form, %myconfig, $lxdebug, $locale, $auth);
@@ -59,27 +60,6 @@ sub payment {
   $form->{ARAP} = ($form->{type} eq 'receipt') ? "AR" : "AP";
   $form->{arap} = lc $form->{ARAP};
 
-  # setup customer/vendor selection for open invoices
-  if ($form->{all_vc}) {
-    # Dieser Zweig funktioniert derzeit NIE. Ggf. ganz raus oder
-    # alle offenen Zahlungen wieder korrekt anzeigen. jb 12.10.2010
-    $form->all_vc(\%myconfig, $form->{vc}, $form->{ARAP});
-  } else {
-    CP->get_openvc(\%myconfig, \%$form);
-  }
-  # Auswahlliste für vc zusammenbauen
-  # Erweiterung für schliessende option und erweiterung um value
-  # für bugfix 1771 (doppelte Leerzeichen werden nicht 'gepostet')
-  $form->{"select$form->{vc}"} = "";
-
-  if ($form->{"all_$form->{vc}"}) {
-    $form->{"select$form->{vc}"} .= "<option value=\"\"></option>\n";
-    # s.o. jb 12.10.2010
-    $form->{"$form->{vc}_id"} = $form->{"all_$form->{vc}"}->[0]->{id};
-    # hotfix for 2450. TODO remove legacy code and use L
-    map { $form->{"select$form->{vc}"} .= "<option value=\"" . H($_->{name}) . "--$_->{id}\">" . H($_->{name}) . "--$_->{id}</option>\n" }
-      @{ $form->{"all_$form->{vc}"} };
-  }
   CP->paymentaccounts(\%myconfig, \%$form);
 
   # Standard Konto für Umlaufvermögen
@@ -94,13 +74,6 @@ sub payment {
   map { $form->{selectaccount} .= "<option value=\"$_->{accno}--$_->{description}\">$_->{accno}--$_->{description}</option>\n";
         $form->{account}        = "$_->{accno}--$_->{description}" if ($_->{accno} eq $accno_arap) } @{ $form->{PR}{"$form->{ARAP}_paid"} };
 
-  # Braucht man das hier überhaupt? Erstmal auskommentieren .. jan 18.12.2010
-  #  map {
-  #    $form->{"select$form->{ARAP}"} .=
-  #      "<option>$_->{accno}--$_->{description}\n"
-  #  } @{ $form->{PR}{ $form->{ARAP} } };
-  # ENDE LOESCHMICH in 2012
-
   # currencies
   # oldcurrency ist zwar noch hier als fragment enthalten, wird aber bei
   # der aktualisierung der form auch nicht mitübernommen. das konzept
@@ -130,39 +103,32 @@ sub form_header {
 
   $auth->assert('cash');
 
-  my ($vc, $arap, $exchangerate);
+  $::request->layout->add_javascripts("kivi.CustomerVendor.js");
 
-  if ($form->{ $form->{vc} } eq "") {
+  my ($arap, $exchangerate);
+
+  if (!$form->{ $form->{vc} . '_id' }) {
     map { $form->{"addr$_"} = "" } (1 .. 4);
   }
 
-  # sometimes it happens that values in customer arrive without the signs '--'
-  # but in order to select the right option field we need values with '--'
-  if ($form->{vc} eq "customer" && $form->{"all_$form->{vc}"}){
-    my ($customername) = split /--/, $form->{ $form->{vc} };
-    $form->{ $form->{vc} } = $customername . "--" . $form->{customer_id};
-  }
   # bugfix 1771
   # geändert von <option>asdf--2929
   # nach:
   #              <option value="asdf--2929">asdf--2929</option>
   # offen: $form->{ARAP} kann raus?
-  for my $item ($form->{vc}, "account", "currency", $form->{ARAP}) {
+  for my $item ("account", "currency", $form->{ARAP}) {
     $form->{$item} = H($form->{$item});
     $form->{"select$item"} =~ s/ selected//;
     $form->{"select$item"} =~ s/option value="\Q$form->{$item}\E">\Q$form->{$item}\E/option selected value="$form->{$item}">$form->{$item}/;
   }
 
-  $vc =
-    ($form->{"select$form->{vc}"})
-    ? qq|<select name=$form->{vc}>$form->{"select$form->{vc}"}\n</select>|
-    : qq|<input name=$form->{vc} size=35 value="$form->{$form->{vc}}">|;
-
-  $form->{openinvoices} = $form->{all_vc} ? "" : 1;
+  $form->{openinvoices} = 1;
 
   # $locale->text('AR')
   # $locale->text('AP')
 
+  setup_cp_form_action_bar(can_post => !!$form->{rowcount});
+
   $form->header;
 
   $arap = lc $form->{ARAP};
@@ -171,7 +137,6 @@ sub form_header {
     is_customer => $form->{vc}   eq 'customer',
     is_receipt  => $form->{type} eq 'receipt',
     arap        => $arap,
-    vccontent   => $vc,
   });
 
   $lxdebug->leave_sub;
@@ -210,9 +175,7 @@ sub update {
 
   $auth->assert('cash');
 
-  my ($new_name_selected) = @_;
-
-  my ($buysell, $newvc, $updated, $exchangerate, $amount);
+  my ($buysell, $updated, $exchangerate, $amount);
 
   if ($form->{vc} eq 'customer') {
     $buysell = "buy";
@@ -220,59 +183,6 @@ sub update {
     $buysell = "sell";
   }
 
-  # if we switched to all_vc
-  # funktioniert derzeit nicht 12.10.2010 jb
-  if ($form->{all_vc} ne $form->{oldall_vc}) {
-
-    $form->{openinvoices} = ($form->{all_vc}) ? 0 : 1;
-
-    $form->{"select$form->{vc}"} = "";
-
-    if ($form->{all_vc}) {
-      $form->all_vc(\%myconfig, $form->{vc}, $form->{ARAP});
-
-      if ($form->{"all_$form->{vc}"}) {
-        map {
-          $form->{"select$form->{vc}"} .=
-            "<option>$_->{name}--$_->{id}\n"
-        } @{ $form->{"all_$form->{vc}"} };
-      }
-    } else {  # ab hier wieder ausgeführter code (s.o.):
-      CP->get_openvc(\%myconfig, \%$form);
-
-      if ($form->{"all_$form->{vc}"}) {
-        $newvc =
-          qq|$form->{"all_$form->{vc}"}[0]->{name}--$form->{"all_$form->{vc}"}[0]->{id}|;
-        map {
-          $form->{"select$form->{vc}"} .=
-            "<option>$_->{name}--$_->{id}\n"
-        } @{ $form->{"all_$form->{vc}"} };
-      }
-
-      # if the name is not the same
-      if ($form->{"select$form->{vc}"} !~ /$form->{$form->{vc}}/) {
-        $form->{ $form->{vc} } = $newvc;
-      }
-    }
-  }
-
-  # search by customernumber
-  # the customernumber has to be correct otherwise nothing is found
-  if ($form->{vc} eq 'customer' and $form->{customernumber} and $form->{ARAP} eq 'AR') {
-    $form->{open} ='Y'; # only open invoices
-    # ar_transactions automatically searches by $form->{customer_id} or else
-    # $form->{customer} if available, and these variables will always be set
-    # so we have to empty these values first
-    $form->{customer_id} = '';
-    $form->{customer} = '';
-    AR->ar_transactions(\%myconfig, \%$form);
-
-    # Here we just take the first returned value even if the custumernumber
-    # may not be unique
-    $form->{customer} = $form->{AR}[0]{name};
-    $form->{customer_id} = $form->{AR}[0]{customer_id};
-  }
-
   # search by invoicenumber,
   if ($form->{invnumber}) {
     $form->{open} ='Y'; # only open invoices
@@ -295,51 +205,32 @@ sub update {
       foreach my $i ( @{ $form->{AR} } ) {
         next unless $i->{invnumber} eq $form->{invnumber};
         # found exactly matching invnumber
-        $form->{$form->{vc}} = $i->{name};
         $form->{customer_id} = $i->{customer_id};
-        #$form->{"old${form->{vc}"} = $i->{customer_id};
         $found_exact_invnumber_match = 1;
       };
 
       unless ( $found_exact_invnumber_match ) {
         # use first returned entry, may not be the correct one if invnumber doesn't
         # match uniquely
-        $form->{$form->{vc}} = $form->{AR}[0]{name};
         $form->{customer_id} = $form->{AR}[0]{customer_id};
       };
     } else {
       # s.o. nur für zahlungsausgang
       AP->ap_transactions(\%myconfig, \%$form);
-      $form->{$form->{vc}} = $form->{AP}[0]{name};
+      $form->{vendor_id} = $form->{AP}[0]{vendor_id};
     }
   }
 
   # determine customer/vendor
-  if ( $form->{customer_id} and ($form->{invnumber} or $form->{customernumber}) ) {
-    # we already know the exact customer_id, so fill $form with customer data
+  my $vc = $form->{vc};
+  if (($form->{"previous_${vc}_id"} || $form->{"${vc}_id"}) != $form->{"${vc}_id"}) {
     IS->get_customer(\%myconfig, \%$form);
-    $updated = 1;
-  } else {
-    # check_name is called with "customer" or "vendor" and otherwise uses contents of $form
-    # check_name also runs get_customer/get_vendor
-    $updated = &check_name($form->{vc});
-  };
-
-  if ($new_name_selected || $updated) {
-    # get open invoices from ar/ap using $form->{vc} and a.${vc}_id, i.e. customer_id
-    CP->get_openinvoices(\%myconfig, \%$form);
-    ($newvc) = split /--/, $form->{ $form->{vc} };
-    $form->{"old$form->{vc}"} = qq|$newvc--$form->{"$form->{vc}_id"}|;
-    $updated = 1;
   }
 
-  if ($form->{currency} ne $form->{oldcurrency}) {
-    $form->{oldcurrency} = $form->{currency};
-    if (!$updated) {
-      CP->get_openinvoices(\%myconfig, \%$form);
-      $updated = 1;
-    }
-  }
+  $form->{oldcurrency} = $form->{currency};
+
+  # get open invoices from ar/ap using a.${vc}_id, i.e. customer_id
+  CP->get_openinvoices(\%myconfig, \%$form) if $form->{"${vc}_id"};
 
   if (!$form->{forex}) {        # read exchangerate from input field (not hidden)
     $form->{exchangerate} = $form->parse_amount(\%myconfig, $form->{exchangerate});
@@ -349,7 +240,7 @@ sub update {
 
   $amount = $form->{amount} = $form->parse_amount(\%myconfig, $form->{amount});
 
-  if ($updated) {
+  if ($form->{"${vc}_id"}) {
     $form->{rowcount} = 0;
 
     $form->{queued} = "";
@@ -364,8 +255,6 @@ sub update {
       $form->{"amount_$i"} = $ref->{amount} / $ref->{exchangerate};
       $form->{"due_$i"}    =
         ($ref->{amount} - $ref->{paid}) / $ref->{exchangerate};
-      $form->{"checked_$i"} = "";
-      $form->{"paid_$i"}    = "";
 
       # need to format
       map {
@@ -414,7 +303,7 @@ sub update {
   $form->{amount}=$amount;
 
   &form_header;
-  &list_invoices;
+  list_invoices() if $form->{"${vc}_id"};
   &form_footer;
 
   $lxdebug->leave_sub();
@@ -455,11 +344,15 @@ sub check_form {
 
   my ($closedto, $datepaid, $amount);
 
-  &check_name($form->{vc});
+  my $vc = $form->{vc};
+  if (($form->{"previous_${vc}_id"} || $form->{"${vc}_id"}) != $form->{"${vc}_id"}) {
+    IS->get_customer(\%myconfig, $form) if $vc eq 'customer';
+    IR->get_vendor(\%myconfig, $form)   if $vc eq 'vendor';
+  }
 
   if ($form->{currency} ne $form->{oldcurrency}) {
     &update;
-    ::end_of_request();
+    $::dispatcher->end_request;
   }
   $form->error($locale->text('Date missing!')) unless $form->{datepaid};
   my $selected_check = 1;
@@ -504,3 +397,21 @@ sub check_form {
 
   $lxdebug->leave_sub();
 }
+
+sub setup_cp_form_action_bar {
+  my (%params) = @_;
+
+  for my $bar ($::request->layout->get('actionbar')) {
+    $bar->add(
+      action => [
+        t8('Update'),
+        submit    => [ '#form', { action => "update" } ],
+        accesskey => 'enter',
+      ],
+      action => [
+        t8('Post'),
+        submit => [ '#form', { action => "post" } ],
+      ],
+    );
+  }
+}