Kunden-/Lieferantenbericht: Zahlungsbegingungen anzeigen können.

diff --git a/SL/CT.pm b/SL/CT.pm
index fa1f914773542ebdfcb41ad033a766f290300d1e..92011897c5e86ec04f5ee180e5e490bbb300d37e 100644 (file)
--- a/SL/CT.pm
+++ b/SL/CT.pm
@@ -76,7 +76,8 @@ sub search {
       "city"               => "ct.city",
       "country"            => "ct.country",
       "discount"           => "ct.discount",
       "city"               => "ct.city",
       "country"            => "ct.country",
       "discount"           => "ct.discount",

-      "salesman"           => "e.name"
+      "salesman"           => "e.name",
+      "payment"            => "pt.description"

     );
 
   $form->{sort} ||= "name";
     );
 
   $form->{sort} ||= "name";


@@ -197,11 +198,13 @@ sub search {
   }
 
   my $query =
   }
 
   my $query =

-    qq|SELECT ct.*, b.description AS business, e.name as salesman | .
+    qq|SELECT ct.*, b.description AS business, e.name as salesman, |.
+    qq|  pt.description as payment | .

     (qq|, NULL AS invnumber, NULL AS ordnumber, NULL AS quonumber, NULL AS invid, NULL AS module, NULL AS formtype, NULL AS closed | x!! $join_records) .
     qq|FROM $cv ct | .
     qq|LEFT JOIN business b ON (ct.business_id = b.id) | .
     qq|LEFT JOIN employee e ON (ct.salesman_id = e.id) | .
     (qq|, NULL AS invnumber, NULL AS ordnumber, NULL AS quonumber, NULL AS invid, NULL AS module, NULL AS formtype, NULL AS closed | x!! $join_records) .
     qq|FROM $cv ct | .
     qq|LEFT JOIN business b ON (ct.business_id = b.id) | .
     qq|LEFT JOIN employee e ON (ct.salesman_id = e.id) | .

+    qq|LEFT JOIN payment_terms pt ON (ct.payment_id = pt.id) | .

     qq|WHERE $where|;
 
   my @saved_values = @values;
     qq|WHERE $where|;
 
   my @saved_values = @values;


@@ -215,7 +218,8 @@ sub search {
       push(@values, @saved_values);
       $query .=
         qq| UNION | .
       push(@values, @saved_values);
       $query .=
         qq| UNION | .

-        qq|SELECT ct.*, b.description AS business, e.name as salesman, | .
+        qq|SELECT ct.*, b.description AS business, e.name as salesman, |.
+        qq|  pt.description as payment, | .

         qq|  a.invnumber, a.ordnumber, a.quonumber, a.id AS invid, | .
         qq|  '$module' AS module, 'invoice' AS formtype, | .
         qq|  (a.amount = a.paid) AS closed | .
         qq|  a.invnumber, a.ordnumber, a.quonumber, a.id AS invid, | .
         qq|  '$module' AS module, 'invoice' AS formtype, | .
         qq|  (a.amount = a.paid) AS closed | .


@@ -223,6 +227,7 @@ sub search {
         qq|JOIN $ar a ON (a.${cv}_id = ct.id) | .
         qq|LEFT JOIN business b ON (ct.business_id = b.id) | .
         qq|LEFT JOIN employee e ON (ct.salesman_id = e.id) | .
         qq|JOIN $ar a ON (a.${cv}_id = ct.id) | .
         qq|LEFT JOIN business b ON (ct.business_id = b.id) | .
         qq|LEFT JOIN employee e ON (ct.salesman_id = e.id) | .

+        qq|LEFT JOIN payment_terms pt ON (ct.payment_id = pt.id) | .

         qq|WHERE $where AND (a.invoice = '1')|;
     }
 
         qq|WHERE $where AND (a.invoice = '1')|;
     }
 


@@ -230,13 +235,15 @@ sub search {
       push(@values, @saved_values);
       $query .=
         qq| UNION | .
       push(@values, @saved_values);
       $query .=
         qq| UNION | .

-        qq|SELECT ct.*, b.description AS business, e.name as salesman, | .
+        qq|SELECT ct.*, b.description AS business, e.name as salesman, |.
+        qq|  pt.description as payment, | .

         qq|  ' ' AS invnumber, o.ordnumber, o.quonumber, o.id AS invid, | .
         qq|  'oe' AS module, 'order' AS formtype, o.closed | .
         qq|FROM $cv ct | .
         qq|JOIN oe o ON (o.${cv}_id = ct.id) | .
         qq|LEFT JOIN business b ON (ct.business_id = b.id) | .
         qq|LEFT JOIN employee e ON (ct.salesman_id = e.id) | .
         qq|  ' ' AS invnumber, o.ordnumber, o.quonumber, o.id AS invid, | .
         qq|  'oe' AS module, 'order' AS formtype, o.closed | .
         qq|FROM $cv ct | .
         qq|JOIN oe o ON (o.${cv}_id = ct.id) | .
         qq|LEFT JOIN business b ON (ct.business_id = b.id) | .
         qq|LEFT JOIN employee e ON (ct.salesman_id = e.id) | .

+        qq|LEFT JOIN payment_terms pt ON (ct.payment_id = pt.id) | .

         qq|WHERE $where AND (o.quotation = '0')|;
     }
 
         qq|WHERE $where AND (o.quotation = '0')|;
     }
 


@@ -245,12 +252,14 @@ sub search {
       $query .=
         qq| UNION | .
         qq|SELECT ct.*, b.description AS business, e.name as salesman, | .
       $query .=
         qq| UNION | .
         qq|SELECT ct.*, b.description AS business, e.name as salesman, | .

+        qq|  pt.description as payment, | .

         qq|  ' ' AS invnumber, o.ordnumber, o.quonumber, o.id AS invid, | .
         qq|  'oe' AS module, 'quotation' AS formtype, o.closed | .
         qq|FROM $cv ct | .
         qq|JOIN oe o ON (o.${cv}_id = ct.id) | .
         qq|LEFT JOIN business b ON (ct.business_id = b.id) | .
         qq|LEFT JOIN employee e ON (ct.salesman_id = e.id) | .
         qq|  ' ' AS invnumber, o.ordnumber, o.quonumber, o.id AS invid, | .
         qq|  'oe' AS module, 'quotation' AS formtype, o.closed | .
         qq|FROM $cv ct | .
         qq|JOIN oe o ON (o.${cv}_id = ct.id) | .
         qq|LEFT JOIN business b ON (ct.business_id = b.id) | .
         qq|LEFT JOIN employee e ON (ct.salesman_id = e.id) | .

+        qq|LEFT JOIN payment_terms pt ON (ct.payment_id = pt.id) | .

         qq|WHERE $where AND (o.quotation = '1')|;
     }
   }
         qq|WHERE $where AND (o.quotation = '1')|;
     }
   }

diff --git a/bin/mozilla/ct.pl b/bin/mozilla/ct.pl
index 845fc3ab4a0971e3a8683c27aaebeb9a90385671..0793a4459aac6627120b136d554db62dd4314e1a 100644 (file)
--- a/bin/mozilla/ct.pl
+++ b/bin/mozilla/ct.pl
@@ -153,9 +153,10 @@ sub list_names {
   }
 
   my @columns = (
   }
 
   my @columns = (

-    'id',        'name',      "$form->{db}number",   'contact',   'phone',    'discount',
-    'fax',       'email',     'taxnumber',           'street',    'zipcode' , 'city',
-    'business',  'invnumber', 'ordnumber',           'quonumber', 'salesman', 'country'
+    'id',        'name',    "$form->{db}number",   'contact',   'phone',    'discount',
+    'fax',       'email',   'taxnumber',           'street',    'zipcode' , 'city',
+    'business',  'payment', 'invnumber', 'ordnumber',           'quonumber', 'salesman',
+    'country'

   );
 
   my @includeable_custom_variables = grep { $_->{includeable} } @{ $cvar_configs };
   );
 
   my @includeable_custom_variables = grep { $_->{includeable} } @{ $cvar_configs };


@@ -184,6 +185,7 @@ sub list_names {
     'country'           => { 'text' => $locale->text('Country'), },
     'salesman'          => { 'text' => $locale->text('Salesman'), },
     'discount'          => { 'text' => $locale->text('Discount'), },
     'country'           => { 'text' => $locale->text('Country'), },
     'salesman'          => { 'text' => $locale->text('Salesman'), },
     'discount'          => { 'text' => $locale->text('Discount'), },

+    'payment'           => { 'text' => $locale->text('Payment Terms'), },

     %column_defs_cvars,
   );
 
     %column_defs_cvars,
   );
 

diff --git a/templates/webpages/ct/search.html b/templates/webpages/ct/search.html
index 2a7748c58678562b0332426ee45d719152715474..2d237264ab9e380f390aaa6277d5c17a104a3e4a 100644 (file)
--- a/templates/webpages/ct/search.html
+++ b/templates/webpages/ct/search.html
@@ -159,6 +159,10 @@
         <input name="l_discount" id="l_discount" type="checkbox" class="checkbox" value="Y">
         <label for="l_discount">[% 'Discount' | $T8 %]</label>
        </td>
         <input name="l_discount" id="l_discount" type="checkbox" class="checkbox" value="Y">
         <label for="l_discount">[% 'Discount' | $T8 %]</label>
        </td>

+       <td>
+        <input name="l_payment" id="l_payment" type="checkbox" class="checkbox" value="Y">
+        <label for="l_payment">[% 'Payment Terms' | $T8 %]</label>
+       </td>

       [% IF IS_CUSTOMER %]
       <td>
        <input name="l_salesman" id="l_salesman" type="checkbox" class="checkbox" value="Y">
       [% IF IS_CUSTOMER %]
       <td>
        <input name="l_salesman" id="l_salesman" type="checkbox" class="checkbox" value="Y">