/ - Diff - projekt kivitendo - wissen

« Zurück | Weiter »

Revision 5eadc966

Von Moritz Bunkus vor mehr als 14 Jahren hinzugefügt

ID 5eadc96699ee3f70f3a0bb3f473f3cfea7e8ea68
Vorgänger d8d827c9
Nachfolger d0b3cf0b

Vertretermodus: Immer bisherigen Vertreter anzeigen & nur wahlweise ändern

Neues Verhalten in der Kundenmaske: Wird ein Kunde neu angelegt, so
muss ein Vertreter ausgewählt werden.

Wird ein bestehender Kunde bearbeitet, so wird der Name des bisher für
ihn ausgewählten Vertreters immer angezeigt. Zusätzlich hat der
Bearbeiter die Möglichkeit, den Vertreter über die Drop-Down-Box der
aktuell gültigen Kunden zu ändern. Wird hier kein Vertreter
ausgewählt, so bleibt der bisherige Vertreter bestehen.

                        taxzones  => "ALL_TAXZONES");
       $form->get_pricegroup(\%myconfig, { all => 1 });
       $form->get_lists(customers => { key => "ALL_SALESMAN_CUSTOMERS", business_is_salesman => 1, with_obsolete => 1 }) if $::vertreter;
       $form->get_lists(customers => { key => "ALL_SALESMAN_CUSTOMERS", business_is_salesman => 1 }) if $::vertreter;
       $form->{ALL_SALESMEN}   = $form->{ALL_EMPLOYEES};
       $form->{taxincluded}    = ($form->{taxincluded}) ? "checked" : "";
-...
       $main::lxdebug->leave_sub();
+    }
     sub _do_save {
       $main::auth->assert('customer_vendor_edit & ' .
                           '(general_ledger         | invoice_edit         | vendor_invoice_edit | ' .
                           ' request_quotation_edit | sales_quotation_edit | sales_order_edit    | purchase_order_edit)');
       $::form->isblank("name", $::locale->text("Name missing!"));
       if ($::form->{new_salesman_id} && $::vertreter) {
         $::form->{salesman_id} = $::form->{new_salesman_id};
         delete $::form->{new_salesman_id};
+      }
       my $res = $::form->{db} eq 'customer' ? CT->save_customer(\%::myconfig, $::form) : CT->save_vendor(\%::myconfig, $::form);
       if (3 == $res) {
         if ($::form->{"db"} eq "customer") {
           $::form->error($::locale->text('This customer number is already in use.'));
         } else {
           $::form->error($::locale->text('This vendor number is already in use.'));
+        }
+      }
+    }
     sub add_transaction {
       $main::lxdebug->enter_sub();
-...
     #  }
     #  # /saving the history
       $form->isblank("name", $locale->text("Name missing!"));
       if ($form->{"db"} eq "customer") {
         CT->save_customer(\%myconfig, \%$form);
       } else {
         CT->save_vendor(\%myconfig, \%$form);
+      }
       _do_save();
       $form->{callback} = $form->escape($form->{callback}, 1);
       my $name = $form->escape("$form->{name}", 1);
-...
       my $msg = ucfirst $form->{db};
       $msg .= " saved!";
       $form->isblank("name", $locale->text("Name missing!"));
       my $rc;
       if ($form->{"db"} eq "customer") {
         $rc = CT->save_customer(\%myconfig, \%$form);
       } else {
         $rc = CT->save_vendor(\%myconfig, \%$form);
+      }
       if ($rc == 3) {
         $form->error($locale->text('customernumber not unique!'));
+      }
       _do_save();
       # saving the history
       if(!exists $form->{addition}) {
         $form->{snumbers} = ($form->{"db"} eq "customer" ? qq|customernumber_| . $form->{customernumber} : qq|vendornumber_| . $form->{vendornumber});
-...
       my $msg = ucfirst $form->{db};
       $msg .= " saved!";
       $form->isblank("name", $locale->text("Name missing!"));
       my $res;
       if ($form->{"db"} eq "customer") {
         $res = CT->save_customer(\%myconfig, \%$form);
       } else {
         $res = CT->save_vendor(\%myconfig, \%$form);
+      }
       _do_save();
       if (3 == $res) {
         if ($form->{"db"} eq "customer") {
           $form->error($locale->text('This customer number is already in use.'));
         } else {
           $form->error($locale->text('This vendor number is already in use.'));
+        }
+      }
       # saving the history
       if(!exists $form->{addition}) {
         $form->{snumbers} = ($form->{"db"} eq "customer" ? qq|customernumber_| . $form->{customernumber} : qq|vendornumber_| . $form->{vendornumber});

       'Cash'                        => 'Zahlungsverkehr',
       'Cc'                          => 'Cc',
       'Change Lx-Office installation settings (all menu entries beneath \'System\')' => 'Ver&auml;ndern der Lx-Office-Installationseinstellungen (Men&uuml;punkte unterhalb von \'System\')',
       'Change representative to'    => 'Vertreter ?ndern in',
       'Charge Number'               => 'Chargennummer',
       'Charge number'               => 'Chargennummer',
       'Chart'                       => 'Buchungskonto',
-...
       'cp_greeting to cp_gender migration' => 'Datenumwandlung von Titel nach Geschlecht (cp_greeting to cp_gender)',
       'customer'                    => 'Kunde',
       'customer_list'               => 'kundenliste',
       'customernumber not unique!'  => 'Die Kundennummer ist schon vergeben',
       'debug'                       => 'Debug',
       'delete'                      => 'L?schen',
       'deliverydate'                => 'Lieferdatum',

             -%]
            </td>
           </tr>
           [%- IF id %]
           <tr>
            <th align="right">[% 'Representative' | $T8 %]</th>
            <td>
             <input type="hidden" name="salesman_id" value="[%- HTML.escape(salesman_id) %]"%>
             [%- HTML.escape(salesman) %]
            </td>
           </tr>
           [%- END %]
           <tr>
            <th align="right">
             [%- IF !id %]
              [% 'Representative' | $T8 %]
             [%- ELSE %]
              [% 'Change representative to' | $T8 %]
             [%- END %]
            </th>
            <td>
             [%- INCLUDE generic/multibox.html
                   name      = 'salesman_id',
                   DATA      = ALL_SALESMAN_CUSTOMERS,
                   id_key    = 'id',
                   label_key = 'name',
                   name       = 'new_salesman_id',
                   DATA       = ALL_SALESMAN_CUSTOMERS,
                   id_key     = 'id',
                   label_key  = 'name',
                   show_empty = id,
             -%]
            </td>
           </tr>

Auch abrufbar als: Unified diff

Projekt

Allgemein

Profil

projekt kivitendo

Revision 5eadc966

Von Moritz Bunkus vor mehr als 14 Jahren hinzugefügt