Stammdaten-Kunden: Neues Feld Amtsgericht. Weitere Export-Möglichkeiten

Ust-ID, Kreditlimit, Amtsgericht (benötigt bspw. für Factoring)

diff --git a/SL/DB/MetaSetup/Customer.pm b/SL/DB/MetaSetup/Customer.pm
index 01b2b63..ee99956 100644 (file)
--- a/SL/DB/MetaSetup/Customer.pm
+++ b/SL/DB/MetaSetup/Customer.pm
@@ -18,6 +18,7 @@ __PACKAGE__->meta->columns(
   c_vendor_id               => { type => 'text' },
   cc                        => { type => 'text' },
   city                      => { type => 'text' },
+  commercial_court          => { type => 'text' },
   contact                   => { type => 'text' },
   country                   => { type => 'text' },
   creditlimit               => { type => 'numeric', default => '0', precision => 15, scale => 5 },

diff --git a/bin/mozilla/ct.pl b/bin/mozilla/ct.pl
index c9d6539..fcc5b90 100644 (file)
--- a/bin/mozilla/ct.pl
+++ b/bin/mozilla/ct.pl
@@ -177,7 +177,8 @@ sub list_names {
     'id',        'name',    "$form->{db}number",   'contact',   'phone',    'discount',
     'fax',       'email',   'taxnumber',           'street',    'zipcode' , 'city',
     'business',  'payment', 'invnumber', 'ordnumber',           'quonumber', 'salesman',
-    'country',   'gln',     'insertdate',           'pricegroup', 'contact_origin', 'invoice_mail'
+    'country',   'gln',     'insertdate',           'pricegroup', 'contact_origin', 'invoice_mail',
+    'creditlimit', 'ustid', 'commercial_court'
   );
 
   my @includeable_custom_variables = grep { $_->{includeable} } @{ $cvar_configs };
@@ -212,6 +213,9 @@ sub list_names {
     'pricegroup'        => { 'text' => $locale->text('Pricegroup'), },
     'invoice_mail'      => { 'text' => $locale->text('Email of the invoice recipient'), },
     'contact_origin'    => { 'text' => $locale->text('Origin of personal data'), },
+    'creditlimit'       => { 'text' => $locale->text('Credit Limit'), },
+    'ustid'             => { 'text' => $locale->text('VAT ID'), },
+    'commercial_court'  => { 'text' => $locale->text('Commercial court'), },
     %column_defs_cvars,
   );
 
@@ -281,6 +285,7 @@ sub list_names {
     if ($ref->{id} ne $previous_id) {
       $previous_id = $ref->{id};
       $ref->{discount} = $form->format_amount(\%myconfig, $ref->{discount} * 100.0, 2);
+      $ref->{creditlimit} = $form->format_amount(\%myconfig, $ref->{creditlimit}, 2);
       map { $row->{$_}->{data} = $ref->{$_} } @columns;
 
       $row->{name}->{link}  = build_std_url('script=controller.pl', 'action=CustomerVendor/edit', 'id=' . E($ref->{id}), 'callback', @hidden_nondefault);

diff --git a/doc/changelog b/doc/changelog
index bc9e69d..73180d4 100644 (file)
--- a/doc/changelog
+++ b/doc/changelog
@@ -18,6 +18,9 @@ Kleinere neue Features und Detailverbesserungen:
   Wert beim E-Mail Versand der Rechnung Priorität. Für die wiederkehrende Rechnung wird die
   Mail-Adresse zusätzlich bedient. In den entsprechenden vorgelagerten Masken, wird dies auch
   visuell angezeigt.
+- Kundenstammdaten um Feld Amtsgericht erweitert
+  Falls das Feld Steuernummer mit dem Wert der Hr-Nr gefüllt wurde, wird auch das zuständige
+  Registierungs-Gericht benötigt.
 
 
 2019-01-03 - Release 3.5.3

diff --git a/locale/de/all b/locale/de/all
index 618ce5b..5e8ec32 100755 (executable)
--- a/locale/de/all
+++ b/locale/de/all
@@ -634,6 +634,7 @@ $self->{texts} = {
   'Column name'                 => 'Spaltenname',
   'Comma'                       => 'Komma',
   'Comment'                     => 'Kommentar',
+  'Commercial court'            => 'Amtsgericht',
   'Company'                     => 'Firma',
   'Company Name'                => 'Firmenname',
   'Company name'                => 'Firmenname',

diff --git a/sql/Pg-upgrade2/customer_add_commercial_court.sql b/sql/Pg-upgrade2/customer_add_commercial_court.sql
new file mode 100644 (file)
index 0000000..a896ffb
--- /dev/null
+++ b/sql/Pg-upgrade2/customer_add_commercial_court.sql
@@ -0,0 +1,4 @@
+-- @tag: customer_add_commercial_court
+-- @description: Amtsgericht/Handelsgericht für Körperschaften bei den Stammdaten hinterlegen
+-- @depends: release_3_5_3
+ALTER TABLE customer ADD COLUMN commercial_court text;

diff --git a/templates/webpages/ct/search.html b/templates/webpages/ct/search.html
index 81f402d..a8dc689 100644 (file)
--- a/templates/webpages/ct/search.html
+++ b/templates/webpages/ct/search.html
@@ -215,6 +215,23 @@
         <label for="l_invoice_mail">[% 'Email of the invoice recipient' | $T8 %]</label>
        </td>
       </tr>
+      <tr>
+       <td>
+        <input name="l_ustid" id="l_ustid" type="checkbox" class="checkbox" value="Y">
+        <label for="l_ustid">[% 'VAT ID' | $T8 %]</label>
+       </td>
+       <td>
+        <input name="l_creditlimit" id="l_creditlimit" type="checkbox" class="checkbox" value="Y">
+        <label for="l_creditlimit">[% 'Credit Limit' | $T8 %]</label>
+       </td>
+       <td>
+        <input name="l_commercial_court" id="l_commercial_court" type="checkbox" class="checkbox" value="Y">
+        <label for="l_commercial_court">[% 'Commercial court' | $T8 %]</label>
+       </td>
+
+       <td>
+      </tr>
+
       [% END %]
 
       [% CUSTOM_VARIABLES_INCLUSION_CODE %]

diff --git a/templates/webpages/customer_vendor/tabs/billing.html b/templates/webpages/customer_vendor/tabs/billing.html
index 6981c59..de3ef89 100644 (file)
--- a/templates/webpages/customer_vendor/tabs/billing.html
+++ b/templates/webpages/customer_vendor/tabs/billing.html
@@ -260,16 +260,20 @@
       [%- END %]
     </tr>
 
-  [% IF ( SELF.all_currencies.size ) %]
     <tr>
+      [% IF ( SELF.is_customer() ) %]
+        <th align="right">[% 'Commercial court' | $T8 %]</th>
+        <td>
+          [% L.input_tag('cv.commercial_court', SELF.cv.commercial_court, size = 20) %]
+        </td>
+      [% END %]
+      [% IF ( SELF.all_currencies.size ) %]
         <th align="right">[% 'Currency' | $T8 %]</th>
-
         <td>
           [% L.select_tag('cv.currency_id', SELF.all_currencies, title_key = 'name', value_key = 'id', default = SELF.cv.currency_id) %]
         </td>
+      [% END %]
     </tr>
-  [% END %]
-
     <tr>
       [% IF ( !INSTANCE_CONF.get_vertreter ) %]
         <th align="right">