From: Bernd Bleßmann Date: Wed, 16 Sep 2015 07:55:25 +0000 (+0200) Subject: Auftrags-Controller: Zahlungs- und Lieferbedingungen X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=c9d5cc7f38af8db81fcfd11fac6cda62935d41c3;p=kivitendo-erp.git Auftrags-Controller: Zahlungs- und Lieferbedingungen --- diff --git a/SL/Controller/Order.pm b/SL/Controller/Order.pm index 836351e4b..9d9624d1e 100644 --- a/SL/Controller/Order.pm +++ b/SL/Controller/Order.pm @@ -352,13 +352,15 @@ sub _save { sub _pre_render { my ($self) = @_; - $self->{all_taxzones} = SL::DB::Manager::TaxZone->get_all_sorted(); - $self->{all_employees} = SL::DB::Manager::Employee->get_all(where => [ or => [ id => $self->order->employee_id, - deleted => 0 ] ], - sort_by => 'name'); - $self->{all_projects} = SL::DB::Manager::Project->get_all(where => [ or => [ id => $self->order->globalproject_id, - active => 1 ] ], - sort_by => 'projectnumber'); + $self->{all_taxzones} = SL::DB::Manager::TaxZone->get_all_sorted(); + $self->{all_employees} = SL::DB::Manager::Employee->get_all(where => [ or => [ id => $self->order->employee_id, + deleted => 0 ] ], + sort_by => 'name'); + $self->{all_projects} = SL::DB::Manager::Project->get_all(where => [ or => [ id => $self->order->globalproject_id, + active => 1 ] ], + sort_by => 'projectnumber'); + $self->{all_payment_terms} = SL::DB::Manager::PaymentTerm->get_all_sorted(); + $self->{all_delivery_terms} = SL::DB::Manager::DeliveryTerm->get_all_sorted(); $self->{current_employee_id} = SL::DB::Manager::Employee->current->id; } diff --git a/templates/webpages/order/tabs/basic_data.html b/templates/webpages/order/tabs/basic_data.html index da1cbafc4..374b9d822 100644 --- a/templates/webpages/order/tabs/basic_data.html +++ b/templates/webpages/order/tabs/basic_data.html @@ -160,23 +160,53 @@ - - - [%- IF NOT taxincluded %] +
+ - - - - [%- END %] - [%- FOREACH tax = SELF.taxes %] - [%- PROCESS order/tabs/_tax_row.html TAX=tax %] - [%- END %] - - + +
[%- 'Subtotal' | $T8 %] - [%- L.div_tag(SELF.order.netamount_as_number, id='netamount_id') %] + + + + + + + + + + +
[% 'Payment Terms' | $T8 %][% L.select_tag('order.payment_id', + SELF.all_payment_terms, + default = SELF.order.payment_id, + with_empty = 1, + title_key = 'description', + style = 'width: 250px;') %]
[% 'Delivery Terms' | $T8 %][% L.select_tag('order.delivery_term_id', + SELF.all_delivery_terms, + default = SELF.order.delivery_term_id, + with_empty = 1, + title_key = 'description', + style = 'width: 250px;') %]
[%- 'Total' | $T8 %] - [%- L.div_tag(SELF.order.amount_as_number, id='amount_id') %] + + [%- IF NOT taxincluded %] + + + + + [%- END %] + [%- FOREACH tax = SELF.taxes %] + [%- PROCESS order/tabs/_tax_row.html TAX=tax %] + [%- END %] + + + +
[%- 'Subtotal' | $T8 %] + [%- L.div_tag(SELF.order.netamount_as_number, id='netamount_id') %] +
[%- 'Total' | $T8 %] + [%- L.div_tag(SELF.order.amount_as_number, id='amount_id') %] +
+