X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=bin%2Fmozilla%2Fic.pl;h=daddf6a0c2dde444cf7a7a5f115aa554648f1216;hb=4d73998317d83187d5307f686f30c695ecc68c73;hp=6d49eab28470e98fb81eb0a15f6a0610b2c1cdc6;hpb=69c4afb76eaafbbe668a66775e6072df5ce5bd49;p=kivitendo-erp.git
diff --git a/bin/mozilla/ic.pl b/bin/mozilla/ic.pl
index 6d49eab28..daddf6a0c 100644
--- a/bin/mozilla/ic.pl
+++ b/bin/mozilla/ic.pl
@@ -32,6 +32,7 @@
#======================================================================
use SL::IC;
+#use SL::PE;
require "$form->{path}/io.pl";
@@ -50,7 +51,7 @@ sub add {
$form->{unit} =
($form->{item} eq 'service') ? $locale->text('hr') : $locale->text('ea');
-
+ IC->get_pricegroups(\%myconfig, \%$form);
&link_part;
&display_form;
@@ -84,14 +85,12 @@ sub search {
$button1 = qq|
|
text('button')
- . qq|> |
+ . $locale->text('button') . qq|>
|;
$button2 = qq|
|
text('button')
- . qq|> |
+ . $locale->text('button') . qq|>
|;
#write Trigger
@@ -132,8 +131,7 @@ sub search {
$l_serialnumber = qq|
|
- . $locale->text('Serial Number')
- . qq| |
+ . $locale->text('Serial Number') . qq|
|;
}
@@ -272,8 +270,7 @@ sub search {
|
- . $locale->text('Part Description')
- . qq| |
+ . $locale->text('Part Description') . qq|
|
@@ -310,71 +307,53 @@ sub search {
|
- . $locale->text('Include in Report')
- . qq| |
+ . $locale->text('Include in Report') . qq|
|
@@ -433,11 +412,9 @@ sub choice {
|
- . $locale->text('Part Number')
- . qq| |
+ . $locale->text('Part Number') . qq|
|
- . $locale->text('Part Description')
- . qq| |
+ . $locale->text('Part Description') . qq|
|
@@ -858,10 +835,9 @@ sub addtop100 {
$option .= $locale->text('soldtotal') . qq| : $form->{soldtotal}
|;
}
- @columns =
- $form->sort_columns(
+ @columns = $form->sort_columns(
qw(number partnumber description partsgroup bin onhand rop unit listprice linetotallistprice sellprice linetotalsellprice lastcost linetotallastcost priceupdate weight image drawing microfiche invnumber ordnumber quonumber name serialnumber soldtotal)
- );
+ );
if ($form->{l_linetotal}) {
$form->{l_onhand} = "Y";
@@ -1441,10 +1417,9 @@ sub generate_report {
$option .= $locale->text('soldtotal') . qq| : $form->{soldtotal}
|;
}
- @columns =
- $form->sort_columns(
+ @columns = $form->sort_columns(
qw(partnumber description partsgroup bin onhand rop unit listprice linetotallistprice sellprice linetotalsellprice lastcost linetotallastcost priceupdate weight image drawing microfiche invnumber ordnumber quonumber name serialnumber soldtotal)
- );
+ );
if ($form->{l_linetotal}) {
$form->{l_onhand} = "Y";
@@ -1921,7 +1896,9 @@ sub link_part {
delete $form->{amount};
$form->get_partsgroup(\%myconfig, { all => 1 });
+
$form->{partsgroup} = "$form->{partsgroup}--$form->{partsgroup_id}";
+
if (@{ $form->{all_partsgroup} }) {
$form->{selectpartsgroup} = qq|