From: Moritz Bunkus <m.bunkus@linet-services.de>
Date: Wed, 9 Nov 2011 09:35:17 +0000 (+0100)
Subject: Merge branch 'master' of vc.linet-services.de:public/lx-office-erp
X-Git-Tag: release-2.7.0beta1~182^2
X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/commitdiff_plain/9f39adffb216af4bbefa444674ea7be502fa78f6?hp=9280012969a290c0e31d1d8a109e68c09e3019f3

Merge branch 'master' of vc.linet-services.de:public/lx-office-erp
---

diff --git a/SL/AR.pm b/SL/AR.pm
index a39481b82..e1501b7f7 100644
--- a/SL/AR.pm
+++ b/SL/AR.pm
@@ -427,6 +427,7 @@ sub ar_transactions {
     qq|  a.transaction_description, | .
     qq|  pr.projectnumber AS globalprojectnumber, | .
     qq|  c.name, c.customernumber, c.country, c.ustid, b.description as customertype, | .
+    qq|  c.id as customer_id, | .
     qq|  e.name AS employee, | .
     qq|  e2.name AS salesman, | .
     qq|  tz.description AS taxzone, | .
diff --git a/bin/mozilla/cp.pl b/bin/mozilla/cp.pl
index ea7e43084..c6910ba85 100644
--- a/bin/mozilla/cp.pl
+++ b/bin/mozilla/cp.pl
@@ -245,8 +245,28 @@ sub update {
   $form->{open} ='Y'; # nur die offenen rechnungen
   if ($form->{ARAP} eq 'AR'){
     AR->ar_transactions(\%myconfig, \%$form);
-    # den ersten treffen nehmen und mit dem namen überschreiben
-    $form->{$form->{vc}} = $form->{AR}[0]{name};
+
+    # if you search for invoice '11' ar_transactions will also match invoices
+    # 112, 211, ... due to the LIKE
+
+    # so there is now an extra loop that tries to match the invoice number
+    # exactly among all returned results, and then passes the customer_id instead of the name
+    # because the name may not be unique
+
+    my $found_exact_invnumber_match = 0;
+    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};
+      $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);
@@ -254,9 +274,16 @@ sub update {
     }
   }
   # get customer and invoices
-  $updated = &check_name($form->{vc});
+  $updated = &check_name($form->{vc}) unless $form->{customer_id};
+
+  if ( $form->{customer_id} ) {
+    # we already know the exact customer_id, fill $form with customer data
+    IS->get_customer(\%myconfig, \%$form);
+    $updated = 1;
+  };
 
   if ($new_name_selected || $updated) {
+    # get open invoices from ar/ap using $form->{vc} and a.${vc}_id
     CP->get_openinvoices(\%myconfig, \%$form);
     ($newvc) = split /--/, $form->{ $form->{vc} };
     $form->{"old$form->{vc}"} = qq|$newvc--$form->{"$form->{vc}_id"}|;