Revision a462dc9c
Von Rolf Fluehmann vor mehr als 6 Jahren hinzugefügt
| SL/Controller/Batch.pm | ||
|---|---|---|
| 6 | 6 |
use SL::DB::Batch; |
| 7 | 7 |
use SL::Helper::Flash; |
| 8 | 8 |
|
| 9 |
use Rose::DateTime::Util qw(:all); |
|
| 9 | 10 |
use Rose::Object::MakeMethods::Generic ( |
| 10 | 11 |
'scalar --get_set_init' => [ qw( batch employee part vendor ) ], |
| 11 | 12 |
); |
| 12 | 13 |
|
| 13 | 14 |
my $may_edit = 1; |
| 15 |
Rose::DateTime::Util->european_dates( 1 ); |
|
| 14 | 16 |
|
| 15 | 17 |
__PACKAGE__->run_before( '_create', except => [ 'search', 'list' ] ); |
| 16 | 18 |
__PACKAGE__->run_before( '_load', only => [ 'delete', 'edit', 'save', 'save_and_close' ] ); |
| ... | ... | |
| 38 | 40 |
sub action_delete {
|
| 39 | 41 |
my( $self, $form, $locale ) = ( shift, $::form, $::locale ); |
| 40 | 42 |
my( $action, @errors ) = ( '', () ); |
| 41 |
@errors = $self->batch->has_children
|
|
| 42 |
or $self->batch->delete || push( @errors, $self->batch->db->error );
|
|
| 43 |
$self->batch->has_children && push( @errors, 'This object has already been used.' )
|
|
| 44 |
|| $self->batch->delete || push( @errors, $self->batch->db->error );
|
|
| 43 | 45 |
if( scalar @errors ) {
|
| 44 | 46 |
flash_later( 'error', @errors ); |
| 45 | 47 |
$action = 'edit'; |
| ... | ... | |
| 83 | 85 |
$self->{ filter } = join( '&',
|
| 84 | 86 |
map {'filter_columns.' . $_ . '=' . $self->{ filter_columns }->{ $_ } } keys %{ $self->{ filter_columns } }
|
| 85 | 87 |
); |
| 86 |
my @filter = $self->_filter; |
|
| 88 |
my @filter = map { $_ = 'itime' if $_ eq 'insertdate'; $_ = 'mtime' if $_ eq 'changedate'; $_ } $self->_filter;
|
|
| 87 | 89 |
@{ $self->{ all_batches } } = @{ SL::DB::Manager::Batch->get_all( where => \@filter ) }
|
| 88 | 90 |
and $self->_sort( $self->{ sort_column } );
|
| 89 | 91 |
|
| ... | ... | |
| 98 | 100 |
sub action_save {
|
| 99 | 101 |
my $self = shift; |
| 100 | 102 |
$self->_save; |
| 101 |
$self->_redirect_to( $self->{ callback } ne 'add' ? 'edit' : 'add' );
|
|
| 103 |
$self->_redirect_to( 'edit' );
|
|
| 102 | 104 |
} |
| 103 | 105 |
|
| 104 | 106 |
# saves a new or edited batch and closes the frame |
| ... | ... | |
| 142 | 144 |
sub _filter {
|
| 143 | 145 |
my( $self, $form ) = ( shift, $::form ); |
| 144 | 146 |
my @filter = ( deleted => 'false' ); |
| 147 |
my $filter_row = ''; |
|
| 145 | 148 |
foreach( keys %{ $self->{ filter_rows } } ) {
|
| 146 |
if( $self->{ filter_rows }->{ $_ } ) {
|
|
| 147 |
$_ =~ m/^.*?_from$/ and $_ =~ s/^(.*?)_from$/$1/ |
|
| 148 |
and push( @filter, ( $_ => { ge => $self->{ filter_rows }->{ $_ . '_from' } } ) )
|
|
| 149 |
and $self->{ filter } .= '&filter_rows.' . $_ . '_from' . '=' . $form->escape( $self->{ filter_rows }->{ $_ . '_from' } )
|
|
| 150 |
or $_ =~ m/^.*?_to$/ and $_ =~ s/^(.*?)_to$/$1/ |
|
| 151 |
and push( @filter, ( $_ => { le => $self->{ filter_rows }->{ $_ . '_to' } } ) )
|
|
| 149 |
$filter_row = $self->{ filter_rows }->{ $_ };
|
|
| 150 |
if( $filter_row ) {
|
|
| 151 |
$_ =~ /^.*?_from$/ and $_ =~ s/^(.*?)_from$/$1/ |
|
| 152 |
and ( $_ =~ /^.*?date$/ and $filter_row = parse_date( $filter_row ) or 1 ) |
|
| 153 |
and push( @filter, ( $_ => { ge => $filter_row } ) )
|
|
| 154 |
and $self->{ filter } .= '&filter_rows.' . $_ . '_from' . '=' . $form->escape( $self->{ filter_rows }->{ $_ . '_from' } )
|
|
| 155 |
or $_ =~ /^.*?_to$/ and $_ =~ s/^(.*?)_to$/$1/ |
|
| 156 |
and ( $_ =~ /^.*?date$/ and $filter_row = parse_date( $filter_row )->add( days => 1 )->subtract( seconds => 1 ) or 1 ) |
|
| 157 |
and push( @filter, ( $_ => { le => $filter_row } ) )
|
|
| 152 | 158 |
and $self->{ filter } .= '&filter_rows.' . $_ . '_to' . '=' . $form->escape( $self->{ filter_rows }->{ $_ . '_to' } )
|
| 153 |
or $_ =~ m/^.*?_id$/
|
|
| 154 |
and push( @filter, ( $_ => $self->{ filter_rows }->{ $_ } ) )
|
|
| 155 |
and $self->{ filter } .= '&filter_rows.' . $_ . '=' . $form->escape( $self->{ filter_rows }->{ $_ } )
|
|
| 156 |
or push( @filter, ( $_ => { like => $self->{ filter_rows }->{ $_ } } ) )
|
|
| 157 |
and $self->{ filter } .= '&filter_rows.' . $_ . '=' . $form->escape( $self->{ filter_rows }->{ $_ } )
|
|
| 159 |
or $_ =~ /^.*?_id$/ |
|
| 160 |
and push( @filter, ( $_ => $filter_row ) )
|
|
| 161 |
and $self->{ filter } .= '&filter_rows.' . $_ . '=' . $form->escape( $filter_row )
|
|
| 162 |
or push( @filter, ( $_ => { like => $filter_row } ) )
|
|
| 163 |
and $self->{ filter } .= '&filter_rows.' . $_ . '=' . $form->escape( $filter_row )
|
|
| 158 | 164 |
; |
| 159 | 165 |
} |
| 160 | 166 |
} |
| ... | ... | |
| 191 | 197 |
] ], |
| 192 | 198 |
sort_by => 'name' |
| 193 | 199 |
); |
| 200 |
$self->{current_employee_id} = SL::DB::Manager::Employee->current->id;
|
|
| 194 | 201 |
} |
| 195 | 202 |
|
| 196 | 203 |
sub _redirect_to {
|
| SL/Controller/Piece.pm | ||
|---|---|---|
| 7 | 7 |
use SL::DB::Piece; |
| 8 | 8 |
use SL::Helper::Flash; |
| 9 | 9 |
|
| 10 |
use Rose::DateTime::Util qw(:all); |
|
| 10 | 11 |
use Rose::Object::MakeMethods::Generic ( |
| 11 | 12 |
'scalar --get_set_init' => [ qw( batch bin delivery_orders employee part piece vendor ) ], |
| 12 | 13 |
); |
| 13 | 14 |
|
| 14 | 15 |
my $may_edit = 1; |
| 16 |
Rose::DateTime::Util->european_dates( 1 ); |
|
| 15 | 17 |
|
| 16 | 18 |
__PACKAGE__->run_before( '_create', except => [ 'search', 'list' ] ); |
| 17 | 19 |
__PACKAGE__->run_before( '_load', only => [ 'delete', 'edit', 'save', 'save_and_close' ] ); |
| ... | ... | |
| 38 | 40 |
sub action_delete {
|
| 39 | 41 |
my( $self, $form, $locale ) = ( shift, $::form, $::locale ); |
| 40 | 42 |
my( $action, @errors ) = ( '', () ); |
| 41 |
@errors = $self->piece->delete || push( @errors, $self->piece->db->error );
|
|
| 43 |
$self->piece->delete || push( @errors, $self->piece->db->error ); |
|
| 42 | 44 |
if( scalar @errors ) {
|
| 43 | 45 |
flash_later( 'error', @errors ); |
| 44 | 46 |
$action = 'edit'; |
| ... | ... | |
| 66 | 68 |
$form->{ filter_rows }->{ producer_id } && $self->vendor( SL::DB::Vendor->new( id => $form->{ filter_rows }->{ producer_id } )->load );
|
| 67 | 69 |
$form->{ filter_rows }->{ part_id } && $self->part( SL::DB::Part->new( id => $form->{ filter_rows }->{ part_id } )->load );
|
| 68 | 70 |
$form->{ filter_rows }->{ batch_id } && $self->batch( SL::DB::Batch->new( id => $form->{ filter_rows }->{ batch_id } )->load );
|
| 69 |
$form->{ filter_rows }->{ employee_id_id } && $self->employee( SL::DB::Employee->new( id => $form->{ filter_rows }->{ employee_in_id } )->load );
|
|
| 70 |
$form->{ filter_rows }->{ employee_out_id } && $self->employee( SL::DB::Employee->new( id => $form->{ filter_rows }->{ employee_out_id } )->load );
|
|
| 71 |
$form->{ filter_rows }->{ delivery_in_id } && $self->delivery_orders( SL::DB::DeliveryOrder->new( id => $form->{ filter_rows }->{ delivery_in_id } )->load );
|
|
| 72 |
$form->{ filter_rows }->{ delivery_out_id } && $self->delivery_orders( SL::DB::DeliveryOrder->new( id => $form->{ filter_rows }->{ delivery_out_id } )->load );
|
|
| 73 |
$form->{ filter_rows }->{ employee_id } && $self->employee( SL::DB::Employee->new( id => $form->{ filter_rows }->{ employee_id } )->load );
|
|
| 71 | 74 |
|
| 72 | 75 |
$self->{ columns } = [
|
| 73 | 76 |
{ key => 'producer' , label => 'Producer' },
|
| ... | ... | |
| 86 | 89 |
$self->{ filter } = join( '&',
|
| 87 | 90 |
map {'filter_columns.' . $_ . '=' . $self->{ filter_columns }->{ $_ } } keys %{ $self->{ filter_columns } }
|
| 88 | 91 |
); |
| 89 |
my @filter = $self->_filter; |
|
| 92 |
my @filter = map { $_ = 'itime' if $_ eq 'insertdate'; $_ = 'mtime' if $_ eq 'changedate'; $_ } $self->_filter;
|
|
| 90 | 93 |
@{ $self->{ all_pieces } } = @{ SL::DB::Manager::Piece->get_all( where => \@filter ) }
|
| 91 | 94 |
and $self->_sort( $self->{ sort_column } );
|
| 92 | 95 |
|
| ... | ... | |
| 101 | 104 |
sub action_save {
|
| 102 | 105 |
my $self = shift; |
| 103 | 106 |
$self->_save; |
| 104 |
$self->_redirect_to( $self->{ callback } ne 'add' ? 'edit' : 'add' );
|
|
| 107 |
$self->_redirect_to( 'edit' );
|
|
| 105 | 108 |
} |
| 106 | 109 |
|
| 107 | 110 |
# save a new or edited piece and close the frame |
| ... | ... | |
| 119 | 122 |
%{ $self->{ filter_columns } } = ();
|
| 120 | 123 |
%{ $self->{ filter_rows } } = ();
|
| 121 | 124 |
$self->{ all_employees } = SL::DB::Manager::Employee->get_all( sort_by => 'name' );
|
| 125 |
$self->{ all_batches } = SL::DB::Manager::Batch->get_all( sort_by => 'batchnumber' );
|
|
| 126 |
$self->{ all_bins } = SL::DB::Manager::Bin->get_all( sort_by => 'description' );
|
|
| 127 |
$self->{ all_deliveries_in } = SL::DB::Manager::DeliveryOrder->get_all( where => [ vendor_id => { ne => 0 } ], sort_by => 'donumber' );
|
|
| 128 |
$self->{ all_deliveries_out } = SL::DB::Manager::DeliveryOrder->get_all( where => [ customer_id => { ne => 0 } ], sort_by => 'donumber' );
|
|
| 122 | 129 |
$self->_setup_search_action_bar; |
| 123 | 130 |
$self->render( |
| 124 | 131 |
'piece/search', |
| ... | ... | |
| 145 | 152 |
sub _filter {
|
| 146 | 153 |
my( $self, $form ) = ( shift, $::form ); |
| 147 | 154 |
my @filter = ( deleted => 'false' ); |
| 155 |
my $filter_row = ''; |
|
| 148 | 156 |
foreach( keys %{ $self->{ filter_rows } } ) {
|
| 149 |
if( $self->{ filter_rows }->{ $_ } ) {
|
|
| 150 |
$_ =~ m/^.*?_from$/ and $_ =~ s/^(.*?)_from$/$1/ |
|
| 151 |
and push( @filter, ( $_ => { ge => $self->{ filter_rows }->{ $_ . '_from' } } ) )
|
|
| 152 |
and $self->{ filter } .= '&filter_rows.' . $_ . '_from' . '=' . $form->escape( $self->{ filter_rows }->{ $_ . '_from' } )
|
|
| 153 |
or $_ =~ m/^.*?_to$/ and $_ =~ s/^(.*?)_to$/$1/ |
|
| 154 |
and push( @filter, ( $_ => { le => $self->{ filter_rows }->{ $_ . '_to' } } ) )
|
|
| 157 |
$filter_row = $self->{ filter_rows }->{ $_ };
|
|
| 158 |
if( $filter_row ) {
|
|
| 159 |
$_ =~ /^.*?_from$/ and $_ =~ s/^(.*?)_from$/$1/ |
|
| 160 |
and ( $_ =~ /^.*?date$/ and $filter_row = parse_date( $filter_row ) or 1 ) |
|
| 161 |
and push( @filter, ( $_ => { ge => $filter_row } ) )
|
|
| 162 |
and $self->{ filter } .= '&filter_rows.' . $_ . '_from' . '=' . $form->escape( $self->{ filter_rows }->{ $_ . '_from' } )
|
|
| 163 |
or $_ =~ /^.*?_to$/ and $_ =~ s/^(.*?)_to$/$1/ |
|
| 164 |
and ( $_ =~ /^.*?date$/ and $filter_row = parse_date( $filter_row )->add( days => 1 )->subtract( seconds => 1 ) or 1 ) |
|
| 165 |
and push( @filter, ( $_ => { le => $filter_row } ) )
|
|
| 155 | 166 |
and $self->{ filter } .= '&filter_rows.' . $_ . '_to' . '=' . $form->escape( $self->{ filter_rows }->{ $_ . '_to' } )
|
| 156 |
or $_ =~ m/^.*?_id$/
|
|
| 157 |
and push( @filter, ( $_ => $self->{ filter_rows }->{ $_ } ) )
|
|
| 158 |
and $self->{ filter } .= '&filter_rows.' . $_ . '=' . $form->escape( $self->{ filter_rows }->{ $_ } )
|
|
| 159 |
or push( @filter, ( $_ => { like => $self->{ filter_rows }->{ $_ } } ) )
|
|
| 160 |
and $self->{ filter } .= '&filter_rows.' . $_ . '=' . $form->escape( $self->{ filter_rows }->{ $_ } )
|
|
| 167 |
or $_ =~ /^.*?_id$/ |
|
| 168 |
and push( @filter, ( $_ => $filter_row ) )
|
|
| 169 |
and $self->{ filter } .= '&filter_rows.' . $_ . '=' . $form->escape( $filter_row )
|
|
| 170 |
or push( @filter, ( $_ => { like => $filter_row } ) )
|
|
| 171 |
and $self->{ filter } .= '&filter_rows.' . $_ . '=' . $form->escape( $filter_row )
|
|
| 161 | 172 |
; |
| 162 | 173 |
} |
| 163 | 174 |
} |
| ... | ... | |
| 194 | 205 |
] ], |
| 195 | 206 |
sort_by => 'batchnumber' |
| 196 | 207 |
); |
| 197 |
unshift( $self->{ all_batches }, undef );
|
|
| 208 |
@{ $self->{ all_batches } } = sort {
|
|
| 209 |
$a->producer->name cmp $b->producer->name |
|
| 210 |
|| $a->part->partnumber cmp $b->part->partnumber |
|
| 211 |
|| $a->batchnumber cmp $b->batchnumber |
|
| 212 |
} @{ $self->{ all_batches } };
|
|
| 213 |
unshift( @{ $self->{ all_batches } }, undef );
|
|
| 198 | 214 |
$self->{ all_bins } = SL::DB::Manager::Bin->get_all( sort_by => 'description' );
|
| 199 |
unshift( $self->{ all_bins }, undef );
|
|
| 200 |
$self->{ all_deliveries } = SL::DB::Manager::DeliveryOrder->get_all( sort_by => 'donumber' );
|
|
| 215 |
unshift( @{ $self->{ all_bins } }, undef );
|
|
| 216 |
$self->{ all_deliveries_in } = SL::DB::Manager::DeliveryOrder->get_all(where => [ vendor_id => { ne => 0 } ], sort_by => 'donumber' );
|
|
| 217 |
unshift( @{ $self->{ all_deliveries_in } }, undef );
|
|
| 218 |
$self->{ all_deliveries_out } = SL::DB::Manager::DeliveryOrder->get_all(where => [ customer_id => { ne => 0 } ], sort_by => 'donumber' );
|
|
| 219 |
unshift( @{ $self->{ all_deliveries_out } }, undef );
|
|
| 201 | 220 |
$self->{ all_employees } = SL::DB::Manager::Employee->get_all(
|
| 202 | 221 |
where => [ or => [ |
| 203 | 222 |
id => $self->piece->employee_id, |
| ... | ... | |
| 205 | 224 |
] ], |
| 206 | 225 |
sort_by => 'name' |
| 207 | 226 |
); |
| 227 |
$self->{current_employee_id} = SL::DB::Manager::Employee->current->id;
|
|
| 208 | 228 |
} |
| 209 | 229 |
|
| 210 | 230 |
sub _redirect_to {
|
| ... | ... | |
| 258 | 278 |
$a->weight cmp $b->weight |
| 259 | 279 |
} @{ $self->{ all_pieces } }
|
| 260 | 280 |
or $column eq 'delivery_in' and @{ $self->{ all_pieces } } = sort {
|
| 261 |
$a->delivery->donumber cmp $b->delivery_orders->donumber
|
|
| 281 |
$a->delivery_in->donumber cmp $b->delivery_in->donumber
|
|
| 262 | 282 |
} @{ $self->{ all_pieces } }
|
| 263 | 283 |
or $column eq 'bin' and @{ $self->{ all_pieces } } = sort {
|
| 264 | 284 |
$a->bin->description cmp $b->bin->description |
| 265 | 285 |
} @{ $self->{ all_pieces } }
|
| 286 |
or $column eq 'delivery_out' and @{ $self->{ all_pieces } } = sort {
|
|
| 287 |
$a->delivery_out->donumber cmp $b->delivery_out->donumber |
|
| 288 |
} @{ $self->{ all_pieces } }
|
|
| 266 | 289 |
or $column eq 'insertdate' and @{ $self->{ all_pieces } } = sort {
|
| 267 | 290 |
$a->itime cmp $b->itime |
| 268 | 291 |
|| $a->mtime cmp $b->mtime |
| templates/webpages/batch/list.html | ||
|---|---|---|
| 23 | 23 |
[% IF SELF.filter_rows.batchdate_from %][% 'Batch Date' | $T8 %]: [% 'From' | $T8 %] [% SELF.filter_rows.batchdate_from %] |
| 24 | 24 |
[% IF SELF.filter_rows.batchdate_to %] [% 'Until' | $T8 %] [% SELF.filter_rows.batchdate_to %][% END %]<br> |
| 25 | 25 |
[% ELSE %] |
| 26 |
[% IF SELF.filter_rows.batchdate_to %] [% 'Until' | $T8 %] [% SELF.filter_rows.batchdate_to %]<br>[% END %] |
|
| 26 |
[% IF SELF.filter_rows.batchdate_to %][% 'Batch Date' | $T8 %]: [% 'Until' | $T8 %] [% SELF.filter_rows.batchdate_to %]<br>[% END %]
|
|
| 27 | 27 |
[% END %] |
| 28 | 28 |
[% IF SELF.filter_rows.location %] [% 'Batch Location' | $T8 %]: [% SELF.filter_rows.location %]<br>[% END %] |
| 29 | 29 |
[% IF SELF.filter_rows.process %] [% 'Batch Process' | $T8 %]: [% SELF.filter_rows.process %]<br>[% END %] |
| 30 | 30 |
[% IF SELF.filter_rows.insertdate_from %][% 'Insert Date' | $T8 %]: [% 'From' | $T8 %] [% SELF.filter_rows.insertdate_from %] |
| 31 | 31 |
[% IF SELF.filter_rows.insertdate_to %] [% 'Until' | $T8 %] [% SELF.filter_rows.insertdate_to %][% END %]<br> |
| 32 | 32 |
[% ELSE %] |
| 33 |
[% IF SELF.filter_rows.insertdate_to %] [% 'Until' | $T8 %] [% SELF.filter_rows.insertdate_to %]<br>[% END %] |
|
| 33 |
[% IF SELF.filter_rows.insertdate_to %][% 'Insert Date' | $T8 %]: [% 'Until' | $T8 %] [% SELF.filter_rows.insertdate_to %]<br>[% END %]
|
|
| 34 | 34 |
[% END %] |
| 35 |
[% IF SELF.filter_rows.changedate_from %][% 'Update' | $T8 %]: [% 'From' | $T8 %] [% SELF.filter_rows.changedate_from %] |
|
| 35 |
[% IF SELF.filter_rows.changedate_from %][% 'Updated' | $T8 %]: [% 'From' | $T8 %] [% SELF.filter_rows.changedate_from %]
|
|
| 36 | 36 |
[% IF SELF.filter_rows.changedate_to %] [% 'Until' | $T8 %] [% SELF.filter_rows.changedate_to %][% END %]<br> |
| 37 | 37 |
[% ELSE %] |
| 38 |
[% IF SELF.filter_rows.changedate_to %] [% 'Until' | $T8 %] [% SELF.filter_rows.changedate_to %]<br>[% END %] |
|
| 38 |
[% IF SELF.filter_rows.changedate_to %][% 'Updated' | $T8 %]: [% 'Until' | $T8 %] [% SELF.filter_rows.changedate_to %]<br>[% END %]
|
|
| 39 | 39 |
[% END %] |
| 40 | 40 |
[% IF SELF.filter_rows.employee_id %] [% 'Employee' | $T8 %]: [% SELF.employee.safe_name %]<br>[% END %] |
| 41 | 41 |
</p> |
| templates/webpages/piece/_basic_data.html | ||
|---|---|---|
| 31 | 31 |
</tr> |
| 32 | 32 |
<tr> |
| 33 | 33 |
<th align="left">[% 'Incoming Delivery Order' | $T8 %]</th> |
| 34 |
<td>[% L.select_tag('piece.delivery_in_id', SELF.all_deliveries, default=SELF.piece.delivery_in_id, title_key='donumber', style='width: 300px') %]</td>
|
|
| 34 |
<td>[% L.select_tag('piece.delivery_in_id', SELF.all_deliveries_in, default=SELF.piece.delivery_in_id, title_key='donumber', style='width: 300px') %]</td>
|
|
| 35 | 35 |
</tr> |
| 36 | 36 |
<tr> |
| 37 | 37 |
<th align="left">[% 'Bin' | $T8 %]</th> |
| ... | ... | |
| 39 | 39 |
</tr> |
| 40 | 40 |
<tr> |
| 41 | 41 |
<th align="left">[% 'Outgoing Delivery Order' | $T8 %]</th> |
| 42 |
<td>[% L.select_tag('piece.delivery_out_id', SELF.all_deliveries, default=SELF.piece.delivery_out_id, title_key='donumber', style='width: 300px') %]</td>
|
|
| 42 |
<td>[% L.select_tag('piece.delivery_out_id', SELF.all_deliveries_out, default=SELF.piece.delivery_out_id, title_key='donumber', style='width: 300px') %]</td>
|
|
| 43 | 43 |
</tr> |
| 44 | 44 |
<tr> |
| 45 | 45 |
<th align="left" valign="top">[% 'Notes' | $T8 %]</th> |
| templates/webpages/piece/list.html | ||
|---|---|---|
| 21 | 21 |
[% IF SELF.filter_rows.part_id %][% 'Part' | $T8 %]: [% SELF.part.displayable_name %]<br>[% END %] |
| 22 | 22 |
[% IF SELF.filter_rows.batch_id %][% 'Batch' | $T8 %]: [% SELF.batch.batchnumber %]<br>[% END %] |
| 23 | 23 |
[% IF SELF.filter_rows.serialnumber %][% 'Serial Number' | $T8 %]: [% SELF.filter_rows.serialnumber %]<br>[% END %] |
| 24 |
[% IF SELF.filter_rows.weight_from %][% 'Weight' | $T8 %]: [% 'From' | $T8 %] SELF.filter_rows.weight_from %]<br>
|
|
| 24 |
[% IF SELF.filter_rows.weight_from %][% 'Weight' | $T8 %]: [% 'From' | $T8 %] [% SELF.filter_rows.weight_from %]
|
|
| 25 | 25 |
[% IF SELF.filter_rows.weight_to %] [% 'Until' | $T8 %] [% SELF.filter_rows.weight_to %][% END %]<br> |
| 26 | 26 |
[% ELSE %] |
| 27 |
[% IF SELF.filter_rows.weight_to %] [% 'Until' | $T8 %] [% SELF.filter_rows.weight_to %]<br>[% END %] |
|
| 27 |
[% IF SELF.filter_rows.weight_to %][% 'Weight' | $T8 %]: [% 'Until' | $T8 %] [% SELF.filter_rows.weight_to %]<br>[% END %]
|
|
| 28 | 28 |
[% END %] |
| 29 | 29 |
[% IF SELF.filter_rows.delivery_in_id %][% 'Incoming Delivery Order' | $T8 %]: [% SELF.delivery_in.donumber %]<br>[% END %] |
| 30 | 30 |
[% IF SELF.filter_rows.bin_id %][% 'Bin' | $T8 %]: [% SELF.bin.full_description %]<br>[% END %] |
| ... | ... | |
| 32 | 32 |
[% IF SELF.filter_rows.insertdate_from %][% 'Insert Date' | $T8 %]: [% 'From' | $T8 %] [% SELF.filter_rows.insertdate_from %] |
| 33 | 33 |
[% IF SELF.filter_rows.insertdate_to %] [% 'Until' | $T8 %] [% SELF.filter_rows.insertdate_to %][% END %]<br> |
| 34 | 34 |
[% ELSE %] |
| 35 |
[% IF SELF.filter_rows.insertdate_to %] [% 'Until' | $T8 %] [% SELF.filter_rows.insertdate_to %]<br>[% END %] |
|
| 35 |
[% IF SELF.filter_rows.insertdate_to %][% 'Insert Date' | $T8 %]: [% 'Until' | $T8 %] [% SELF.filter_rows.insertdate_to %]<br>[% END %]
|
|
| 36 | 36 |
[% END %] |
| 37 |
[% IF SELF.filter_rows.changedate_from %][% 'Update' | $T8 %]: [% 'From' | $T8 %] [% SELF.filter_rows.changedate_from %] |
|
| 37 |
[% IF SELF.filter_rows.changedate_from %][% 'Updated' | $T8 %]: [% 'From' | $T8 %] [% SELF.filter_rows.changedate_from %]
|
|
| 38 | 38 |
[% IF SELF.filter_rows.changedate_to %] [% 'Until' | $T8 %] [% SELF.filter_rows.changedate_to %][% END %]<br> |
| 39 | 39 |
[% ELSE %] |
| 40 |
[% IF SELF.filter_rows.changedate_to %] [% 'Until' | $T8 %] [% SELF.filter_rows.changedate_to %]<br>[% END %] |
|
| 40 |
[% IF SELF.filter_rows.changedate_to %][% 'Updated' | $T8 %]: [% 'Until' | $T8 %] [% SELF.filter_rows.changedate_to %]<br>[% END %]
|
|
| 41 | 41 |
[% END %] |
| 42 | 42 |
[% IF SELF.filter_rows.employee_id %] [% 'Employee' | $T8 %]: [% SELF.employee.safe_name %]<br>[% END %] |
| 43 | 43 |
|
| ... | ... | |
| 71 | 71 |
[% IF SELF.filter_columns.weight %] |
| 72 | 72 |
[% IF piece.weight %]<td align="left">[% LxERP.format_amount(piece.weight, 3) %] kg</td>[% END %] |
| 73 | 73 |
[% END %] |
| 74 |
[% IF SELF.filter_columns.delivery_in %]<td align="left">[% piece.delivery.donumber %]</td>[% END %] |
|
| 74 |
[% IF SELF.filter_columns.delivery_in %]<td align="left">[% piece.delivery_in.donumber %]</td>[% END %]
|
|
| 75 | 75 |
[% IF SELF.filter_columns.bin %]<td align="left">[% piece.bin.full_description %]</td>[% END %] |
| 76 |
[% IF SELF.filter_columns.delivery_out %]<td align="left">[% piece.delivery.donumber %]</td>[% END %] |
|
| 76 |
[% IF SELF.filter_columns.delivery_out %]<td align="left">[% piece.delivery_out.donumber %]</td>[% END %]
|
|
| 77 | 77 |
[% IF SELF.filter_columns.insertdate %]<td align="left">[% piece.itime_as_date %]</td>[% END %] |
| 78 | 78 |
[% IF SELF.filter_columns.changedate %]<td align="left">[% piece.mtime_as_date %]</td>[% END %] |
| 79 | 79 |
[% IF SELF.filter_columns.employee %]<td align="left">[% piece.employee.safe_name %]</td>[% END %] |
| templates/webpages/piece/search.html | ||
|---|---|---|
| 44 | 44 |
<tr> |
| 45 | 45 |
<td align="right"><input id="filter_columns.delivery_in" name="filter_columns.delivery_in" class="checkbox" type="checkbox" value="1" checked></td> |
| 46 | 46 |
<th align="left">[% 'Incoming Delivery Order' | $T8 %]</th> |
| 47 |
<td>[% L.select_tag('filter_rows.delivery_in_id', SELF.all_deliveries, title_key='donumber', with_empty=1, style=style) %]</td>
|
|
| 47 |
<td>[% L.select_tag('filter_rows.delivery_in_id', SELF.all_deliveries_in, title_key='donumber', with_empty=1, style=style) %]</td>
|
|
| 48 | 48 |
</tr> |
| 49 | 49 |
<tr> |
| 50 | 50 |
<td align="right"><input id="filter_columns.bin" name="filter_columns.bin" class="checkbox" type="checkbox" value="1" checked></td> |
| ... | ... | |
| 53 | 53 |
</tr> |
| 54 | 54 |
<tr> |
| 55 | 55 |
<td align="right"><input id="filter_columns.delivery_out" name="filter_columns.delivery_out" class="checkbox" type="checkbox" value="1" checked></td> |
| 56 |
<th align="left">[% 'Delivery Order' | $T8 %]</th> |
|
| 57 |
<td>[% L.select_tag('filter_rows.delivery_out_id', SELF.all_deliveries, title_key='donumber', with_empty=1, style=style) %]</td>
|
|
| 56 |
<th align="left">[% 'Outgoing Delivery Order' | $T8 %]</th>
|
|
| 57 |
<td>[% L.select_tag('filter_rows.delivery_out_id', SELF.all_deliveries_out, title_key='donumber', with_empty=1, style=style) %]</td>
|
|
| 58 | 58 |
</tr> |
| 59 | 59 |
<tr> |
| 60 | 60 |
<td align="right"><input id="filter_columns.insertdate" name="filter_columns.insertdate" class="checkbox" type="checkbox" value="1"></td> |
Auch abrufbar als: Unified diff
Anpassungen Datumsformat, Unterscheidung eingehende und ausgehende Lieferscheine, kleinere Anpassungen fuer die Chargen- und Exemplarverwaltung