X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=inline;f=bin%2Fmozilla%2Foe.pl;h=8c88f5337e881c480a3b9acb50935da960330bbc;hb=d28f85eab4f83acd76a5d7980d1a1d29640b34e4;hp=b5f3eb6b6e28b0f608197142d1ef439ba03e4e77;hpb=65b2387a54494a8cbc1d011602ae3f8d7208ea4d;p=kivitendo-erp.git diff --git a/bin/mozilla/oe.pl b/bin/mozilla/oe.pl index b5f3eb6b6..8c88f5337 100644 --- a/bin/mozilla/oe.pl +++ b/bin/mozilla/oe.pl @@ -331,7 +331,6 @@ sub setup_oe_action_bar { t8('Update'), submit => [ '#form', { action => "update" } ], id => 'update_button', - checks => [ 'kivi.validate_form' ], accesskey => 'enter', ], @@ -681,13 +680,8 @@ sub form_footer { $form->{invtotal} = $form->{invsubtotal}; - my $introws = max 5, $form->numtextrows($form->{intnotes}, 35, 8); - my $TMPL_VAR = $::request->cache('tmpl_var', {}); - $TMPL_VAR->{notes} = qq||; - $TMPL_VAR->{intnotes} = qq||; - if( $form->{customer_id} && !$form->{taxincluded_changed_by_user} ) { my $customer = SL::DB::Customer->new(id => $form->{customer_id})->load(); $form->{taxincluded} = defined($customer->taxincluded_checked) ? $customer->taxincluded_checked : $myconfig{taxincluded_checked}; @@ -1032,7 +1026,7 @@ sub orders { "curr", "employee", "salesman", "shipvia", "globalprojectnumber", - "transaction_description", "open", + "transaction_description", "department", "open", "delivered", "periodic_invoices", "marge_total", "marge_percent", "vcnumber", "ustid", @@ -1117,6 +1111,7 @@ sub orders { 'shipvia' => { 'text' => $locale->text('Ship via'), }, 'globalprojectnumber' => { 'text' => $locale->text('Project Number'), }, 'transaction_description' => { 'text' => $locale->text('Transaction description'), }, + 'department' => { 'text' => $locale->text('Department'), }, 'open' => { 'text' => $locale->text('Open'), }, 'delivered' => { 'text' => $locale->text('Delivery Order created'), }, 'marge_total' => { 'text' => $locale->text('Ertrag'), }, @@ -1135,7 +1130,7 @@ sub orders { %column_defs_cvars, ); - foreach my $name (qw(id transdate reqdate quonumber ordnumber cusordnumber name employee salesman shipvia transaction_description shippingpoint taxzone insertdate payment_terms)) { + foreach my $name (qw(id transdate reqdate quonumber ordnumber cusordnumber name employee salesman shipvia transaction_description shippingpoint taxzone insertdate payment_terms department)) { my $sortdir = $form->{sort} eq $name ? 1 - $form->{sortdir} : $form->{sortdir}; $column_defs{$name}->{link} = $href . "&sort=$name&sortdir=$sortdir"; }