projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Type in Übersetzung
[kivitendo-erp.git]
/
SL
/
IS.pm
diff --git
a/SL/IS.pm
b/SL/IS.pm
index
7ff8500
..
e9bd54d
100644
(file)
--- a/
SL/IS.pm
+++ b/
SL/IS.pm
@@
-57,6
+57,7
@@
use SL::DB::Tax;
use SL::DB::TaxZone;
use SL::TransNumber;
use SL::DB;
use SL::DB::TaxZone;
use SL::TransNumber;
use SL::DB;
+use SL::Presenter::Part qw(type_abbreviation classification_abbreviation);
use Data::Dumper;
use strict;
use Data::Dumper;
use strict;
@@
-434,7
+435,7
@@
sub invoice_details {
}
my $tax_rate = $taxrate * 100;
push(@{ $form->{TEMPLATE_ARRAYS}->{tax_rate} }, qq|$tax_rate|);
}
my $tax_rate = $taxrate * 100;
push(@{ $form->{TEMPLATE_ARRAYS}->{tax_rate} }, qq|$tax_rate|);
- if ($form->{"
assembly_$i"}
) {
+ if ($form->{"
part_type_$i"} eq 'assembly'
) {
$sameitem = "";
# get parts and push them onto the stack
$sameitem = "";
# get parts and push them onto the stack
@@
-865,9
+866,9
@@
sub _post_invoice {
next if $payments_only;
next if $payments_only;
- if ($form->{"inventory_accno_$i"} || $form->{"
assembly_$i"}
) {
+ if ($form->{"inventory_accno_$i"} || $form->{"
part_type_$i"} eq 'assembly'
) {
- if ($form->{"
assembly_$i"}
) {
+ if ($form->{"
part_type_$i"} eq 'assembly'
) {
# record assembly item as allocated
&process_assembly($dbh, $myconfig, $form, $position, $form->{"id_$i"}, $baseqty);
# record assembly item as allocated
&process_assembly($dbh, $myconfig, $form, $position, $form->{"id_$i"}, $baseqty);
@@
-2353,8
+2354,8
@@
sub retrieve_item {
push @{ $ref->{matches} ||= [] }, $::locale->text('EAN') . ': ' . $ref->{ean};
}
push @{ $ref->{matches} ||= [] }, $::locale->text('EAN') . ': ' . $ref->{ean};
}
- $ref->{type_and_classific} =
$::request->presenter->type_abbreviation($ref->{part_type})
.
-
$::request->presenter->
classification_abbreviation($ref->{classification_id});
+ $ref->{type_and_classific} =
type_abbreviation($ref->{part_type})
.
+ classification_abbreviation($ref->{classification_id});
if (! $ref->{used_for_sale} ) {
$has_wrong_pclass = PCLASS_NOTFORSALE ;
next;
if (! $ref->{used_for_sale} ) {
$has_wrong_pclass = PCLASS_NOTFORSALE ;
next;
@@
-2436,7
+2437,6
@@
sub retrieve_item {
}
$ref->{onhand} *= 1;
}
$ref->{onhand} *= 1;
-
push @{ $form->{item_list} }, $ref;
}
$sth->finish;
push @{ $form->{item_list} }, $ref;
}
$sth->finish;