From: Moritz Bunkus Date: Fri, 6 Jan 2017 09:30:25 +0000 (+0100) Subject: ActionBar: nicht mehr benötigte Lieferadressenmaske entfernt X-Git-Tag: release-3.5.4~1344 X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=5fdf1ffda5ef2d463208c38f96a2f97b07711c91;p=kivitendo-erp.git ActionBar: nicht mehr benötigte Lieferadressenmaske entfernt --- diff --git a/bin/mozilla/io.pl b/bin/mozilla/io.pl index 86813c941..a716f16d0 100644 --- a/bin/mozilla/io.pl +++ b/bin/mozilla/io.pl @@ -1702,45 +1702,6 @@ sub post_as_new { $main::lxdebug->leave_sub(); } -sub ship_to { - $main::lxdebug->enter_sub(); - - _check_io_auth(); - - $::form->{print_and_post} = 0 if $::form->{second_run}; - - map { $::form->{$_} = $::form->parse_amount(\%::myconfig, $::form->{$_}) } qw(exchangerate creditlimit creditremaining); - - # get details for customer/vendor - call_sub($::form->{vc} . "_details", qw(name department_1 department_2 street zipcode city country gln contact email phone fax), $::form->{vc} . "number"); - $::form->{rowcount}--; - - my $cvars = SL::DB::Shipto->new->cvars_by_config; - my @shipto_vars = qw(shiptoname shiptostreet shiptozipcode shiptocity shiptocountry shiptogln - shiptocontact shiptocp_gender shiptophone shiptofax shiptoemail - shiptodepartment_1 shiptodepartment_2); - my $previous_form = $::auth->save_form_in_session(skip_keys => [ @shipto_vars, qw(header shipto_id), map { "shiptocvar_" . $_->config->name } @{ $cvars } ]); - $::form->{title} = $::locale->text('Ship to'); - $::form->header; - - my $vc_obj = ($::form->{vc} eq 'customer' ? "SL::DB::Customer" : "SL::DB::Vendor")->new(id => $::form->{$::form->{vc} . "_id"})->load; - - $_->value($::form->{"shiptocvar_" . $_->config->name}) for @{ $cvars }; - - print $::form->parse_html_template('io/ship_to', { previousform => $previous_form, - nextsub => $::form->{display_form} || 'display_form', - vc_obj => $vc_obj, - cvars => $cvars, - }); - - $main::lxdebug->leave_sub(); -} - -sub ship_to_entered { - $::auth->restore_form_from_session(delete $::form->{previousform}); - call_sub($::form->{nextsub}); -} - sub relink_accounts { $main::lxdebug->enter_sub(); diff --git a/locale/de/all b/locale/de/all index 9c9041829..49c08b959 100755 --- a/locale/de/all +++ b/locale/de/all @@ -2615,7 +2615,6 @@ $self->{texts} = { 'Set to paid missing' => 'Fehlbetrag setzen', 'Settings' => 'Einstellungen', 'Setup Menu' => 'Menü-Variante', - 'Ship to' => 'Lieferadresse', 'Ship to (database ID)' => 'Lieferadresse (Datenbank-ID)', 'Ship via' => 'Transportmittel', 'Shipping Address' => 'Lieferadresse', diff --git a/templates/webpages/io/ship_to.html b/templates/webpages/io/ship_to.html deleted file mode 100644 index e3e6500ba..000000000 --- a/templates/webpages/io/ship_to.html +++ /dev/null @@ -1,181 +0,0 @@ -[% USE HTML %][% USE L %][% USE LxERP %][%- USE JavaScript -%] - - - -[% select_options = [ [ 0, LxERP.t8("Billing Address") ] ] ; - FOREACH shipto = vc_obj.shipto ; - tmpcity = shipto.shiptozipcode _ ' ' _ shipto.shiptocity ; - tmptitle = [ shipto.shiptoname, shipto.shiptostreet, tmpcity ] ; - CALL select_options.import([ [ loop.count, tmptitle.grep('\S').join("; ") ] ]) ; - END ; - '' %] - -
- [% L.hidden_tag("shipto_id", shipto_id) %] - -

- [% LxERP.t8("Copy address from master data") %]: - [% L.select_tag("", select_options, id="shipto_to_copy", style="width: 400px") %] - [% L.button_tag("copy_address()", LxERP.t8("Copy")) %] - [% L.button_tag("clear_fields()", LxERP.t8("Clear fields")) %] -

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -[% FOREACH var = cvars %] - - - - - -[% END %] -
[% LxERP.t8('Billing Address') %][% LxERP.t8('Shipping Address') %]
[%- IF vc == "customer" %][%- LxERP.t8('Customer Number') %][%- ELSE %][%- LxERP.t8('Vendor Number') %][%- END %][%- IF vc == "customer" %][%- HTML.escape(customernumber) %][%- ELSE %][%- HTML.escape(vendornumber) %][%- END %]
[% LxERP.t8('Company Name') %][% HTML.escape(name) %][% L.input_tag("shiptoname", shiptoname, "size", "35") %]
[% LxERP.t8('Department') %][% HTML.escape(department_1) %][% L.input_tag("shiptodepartment_1", shiptodepartment_1, "size", "35") %]
 [% HTML.escape(department_2) %][% L.input_tag("shiptodepartment_2", shiptodepartment_2, "size", "35") %]
[% LxERP.t8('Street') %][% HTML.escape(street) %][% L.input_tag("shiptostreet", shiptostreet, "size", "35") %]
[% LxERP.t8('Zipcode') %][% HTML.escape(zipcode) %][% L.input_tag("shiptozipcode", shiptozipcode, "size", "35") %]
[% LxERP.t8('City') %][% HTML.escape(city) %][% L.input_tag("shiptocity", shiptocity, "size", "35") %]
[% LxERP.t8('Country') %][% HTML.escape(country) %][% L.input_tag("shiptocountry", shiptocountry, "size", "35") %]
[% LxERP.t8('GLN') %][% HTML.escape(gln) %][% L.input_tag("shiptogln", shiptogln, "size", "35") %]
[% LxERP.t8('Contact') %][% HTML.escape(contact) %][% L.input_tag("shiptocontact", shiptocontact, "size", "35") %]
[% LxERP.t8('Gender') %] - [% L.select_tag('shiptocp_gender', [ [ 'm', LxERP.t8('male') ], [ 'f', LxERP.t8('female') ] ], 'default' = shiptocp_gender) %] -
[% LxERP.t8('Phone') %][% HTML.escape(phone) %][% L.input_tag("shiptophone", shiptophone, "size", "35") %]
[% LxERP.t8('Fax') %][% HTML.escape(fax) %][% L.input_tag("shiptofax", shiptofax, "size", "35") %]
[% LxERP.t8('E-mail') %][% HTML.escape(email) %][% L.input_tag("shiptoemail", shiptoemail, "size", "35") %]
[% HTML.escape(var.config.description) %][% INCLUDE 'common/render_cvar_input.html' cvar_name_prefix='shiptocvar_' %]
- -
- - [% L.hidden_tag("action", "ship_to_entered") %] - [% L.hidden_tag("nextsub", nextsub) %] - [% L.hidden_tag("previousform", previousform) %] - - [% L.button_tag("clear_shipto_id_before_submit()", LxERP.t8("Continue")) %] -