X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fic.pl;h=68e947706d3797e3435b93153d85261f42b93872;hb=1b3fe156b5ddfd588c1e55af5e21a36e84d9caf8;hp=db5a84c083d8f6338b2ac9eac0e05393bbb82240;hpb=232ccb5f2622a7ecc4cfa40031aba17d7717957a;p=kivitendo-erp.git diff --git a/bin/mozilla/ic.pl b/bin/mozilla/ic.pl index db5a84c08..68e947706 100644 --- a/bin/mozilla/ic.pl +++ b/bin/mozilla/ic.pl @@ -185,7 +185,7 @@ sub search {   | . $locale->text('From') . qq| $button1 - | . $locale->text('To') . qq| + | . $locale->text('To (time)') . qq| $button2 @@ -235,7 +235,7 @@ sub search { | . $locale->text('From') . qq| $button1 - | . $locale->text('To') . qq| + | . $locale->text('To (time)') . qq| $button2 @@ -269,6 +269,8 @@ sub search { | . $locale->text('Part Number') . qq| + | . $locale->text('EAN') . qq| + | @@ -313,7 +315,7 @@ sub search { - @@ -395,7 +397,6 @@ $jsscript $lxdebug->leave_sub(); } #end search() - sub search_update_prices { $lxdebug->enter_sub(); @@ -1028,6 +1029,10 @@ sub addtop100 { $callback .= "&partnumber=$form->{partnumber}"; $option .= $locale->text('Part Number') . qq| : $form->{partnumber}
|; } + if ($form->{ean}) { + $callback .= "&partnumber=$form->{ean}"; + $option .= $locale->text('EAN') . qq| : $form->{ean}
|; + } if ($form->{partsgroup}) { $callback .= "&partsgroup=$form->{partsgroup}"; $option .= $locale->text('Group') . qq| : $form->{partsgroup}
|; @@ -1067,7 +1072,7 @@ sub addtop100 { } @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) + qw(number partnumber ean 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}) { @@ -1303,7 +1308,7 @@ sub addtop100 { $column_data{number} = ""; $column_data{partnumber} = ""; @@ -1312,32 +1317,29 @@ sub addtop100 { $column_data{onhand} = ""; $column_data{sellprice} = ""; $column_data{listprice} = ""; $column_data{lastcost} = ""; $column_data{linetotalsellprice} = ""; $column_data{linetotallastcost} = ""; $column_data{linetotallistprice} = ""; if (!$ref->{assemblyitem}) { @@ -1353,10 +1355,10 @@ sub addtop100 { $column_data{rop} = ""; + . $form->format_amount(\%myconfig, $ref->{rop}) . ""; $column_data{weight} = ""; $column_data{unit} = ""; $column_data{bin} = ""; @@ -1413,15 +1415,15 @@ sub addtop100 { map { $column_data{$_} = "" } @column_index; $column_data{linetotalsellprice} = ""; $column_data{linetotallastcost} = ""; $column_data{linetotallistprice} = ""; print ""; @@ -1471,14 +1473,8 @@ sub addtop100 { |; - - if ($form->{menubar}) { - require "$form->{path}/menu.pl"; - &menubar; - } + . $locale->text('choice') . qq|"> - print qq| @@ -1596,7 +1592,7 @@ sub generate_report { if ($form->{transdateto}) { $callback .= "&transdateto=$form->{transdateto}"; $option .= "\n
" - . $locale->text('To') + . $locale->text('To (time)') . " " . $locale->date(\%myconfig, $form->{transdateto}, 1); } @@ -1861,32 +1857,29 @@ sub generate_report { $column_data{onhand} = ""; $column_data{sellprice} = ""; $column_data{listprice} = ""; $column_data{lastcost} = ""; $column_data{linetotalsellprice} = ""; $column_data{linetotallastcost} = ""; $column_data{linetotallistprice} = ""; if (!$ref->{assemblyitem}) { @@ -1902,10 +1895,10 @@ sub generate_report { $column_data{rop} = ""; + . $form->format_amount(\%myconfig, $ref->{rop}) . ""; $column_data{weight} = ""; $column_data{unit} = ""; $column_data{bin} = ""; @@ -1943,7 +1936,7 @@ sub generate_report { $column_data{soldtotal} = ""; $column_data{deliverydate} = ""; @@ -1968,15 +1961,15 @@ sub generate_report { map { $column_data{$_} = "" } @column_index; $column_data{linetotalsellprice} = ""; $column_data{linetotallastcost} = ""; $column_data{linetotallistprice} = ""; print ""; @@ -2009,14 +2002,8 @@ sub generate_report { print qq| |; + . $locale->text('Add') . qq|"> - if ($form->{menubar}) { - require "$form->{path}/menu.pl"; - &menubar; - } - - print qq| @@ -2034,20 +2021,20 @@ sub parts_subtotal { $column_data{onhand} = ""; $column_data{linetotalsellprice} = ""; $column_data{linetotallistprice} = ""; $column_data{linetotallastcost} = ""; $subtotalonhand = 0; @@ -2068,9 +2055,13 @@ sub parts_subtotal { sub edit { $lxdebug->enter_sub(); - + # show history button + $form->{javascript} = qq||; + #/show hhistory button IC->get_part(\%myconfig, \%$form); + $form->{"original_partnumber"} = $form->{"partnumber"}; + $form->{title} = $locale->text('Edit ' . ucfirst $form->{item}); &link_part; @@ -2085,8 +2076,8 @@ sub link_part { IC->create_links("IC", \%myconfig, \%$form); # currencies - map { $form->{selectcurrency} .= "|; - $form->{selectadr} = ""; - if (@{ $form->{ADR} }) { - foreach $item (@{ $form->{ADR} }) { - if ($item->{id} == $form->{adr_id}) { - $form->{selectadr} .= - " - - - |; - - # set option foreach $item (qw(IC IC_income IC_expense)) { if ($form->{$item}) { @@ -2353,11 +2302,6 @@ sub form_header { -
 | +  | . $locale->text('Part Number') . qq|  | . $locale->text('Part Description') . qq|" - . $form->format_amount(\%myconfig, $ref->{number}, '', " ") + . $form->format_amount(\%myconfig, $ref->{number}) . "$ref->{partnumber} " - . $form->format_amount(\%myconfig, $ref->{onhand}, '', " ") + . $form->format_amount(\%myconfig, $ref->{onhand}) . "" - . $form->format_amount(\%myconfig, $ref->{sellprice}, 2, " ") + . $form->format_amount(\%myconfig, $ref->{sellprice}) . "" - . $form->format_amount(\%myconfig, $ref->{listprice}, 2, " ") + . $form->format_amount(\%myconfig, $ref->{listprice}) . "" - . $form->format_amount(\%myconfig, $ref->{lastcost}, 2, " ") + . $form->format_amount(\%myconfig, $ref->{lastcost}) . "" - . $form->format_amount(\%myconfig, $ref->{onhand} * $ref->{sellprice}, - 2, " ") + . $form->format_amount(\%myconfig, $ref->{onhand} * $ref->{sellprice}, 2) . "" - . $form->format_amount(\%myconfig, $ref->{onhand} * $ref->{lastcost}, - 2, " ") + . $form->format_amount(\%myconfig, $ref->{onhand} * $ref->{lastcost}, 2) . "" - . $form->format_amount(\%myconfig, $ref->{onhand} * $ref->{listprice}, - 2, " ") + . $form->format_amount(\%myconfig, $ref->{onhand} * $ref->{listprice}, 2) . "" - . $form->format_amount(\%myconfig, $ref->{rop}, '', " ") . "" - . $form->format_amount(\%myconfig, $ref->{weight}, '', " ") + . $form->format_amount(\%myconfig, $ref->{weight}) . "$ref->{unit} $ref->{bin}  " - . $form->format_amount(\%myconfig, $totalsellprice, 2, " ") + . $form->format_amount(\%myconfig, $totalsellprice, 2) . "" - . $form->format_amount(\%myconfig, $totallastcost, 2, " ") + . $form->format_amount(\%myconfig, $totallastcost, 2) . "" - . $form->format_amount(\%myconfig, $totallistprice, 2, " ") + . $form->format_amount(\%myconfig, $totallistprice, 2) . "
" - . $form->format_amount(\%myconfig, $ref->{onhand}, '', " ") + . $form->format_amount(\%myconfig, $ref->{onhand}) . "" - . $form->format_amount(\%myconfig, $ref->{sellprice}, 2, " ") + . $form->format_amount(\%myconfig, $ref->{sellprice}, -2) . "" - . $form->format_amount(\%myconfig, $ref->{listprice}, 2, " ") + . $form->format_amount(\%myconfig, $ref->{listprice}, -2) . "" - . $form->format_amount(\%myconfig, $ref->{lastcost}, 2, " ") + . $form->format_amount(\%myconfig, $ref->{lastcost}, -2) . "" - . $form->format_amount(\%myconfig, $ref->{onhand} * $ref->{sellprice}, - 2, " ") + . $form->format_amount(\%myconfig, $ref->{onhand} * $ref->{sellprice}, 2) . "" - . $form->format_amount(\%myconfig, $ref->{onhand} * $ref->{lastcost}, - 2, " ") + . $form->format_amount(\%myconfig, $ref->{onhand} * $ref->{lastcost}, 2) . "" - . $form->format_amount(\%myconfig, $ref->{onhand} * $ref->{listprice}, - 2, " ") + . $form->format_amount(\%myconfig, $ref->{onhand} * $ref->{listprice}, 2) . "" - . $form->format_amount(\%myconfig, $ref->{rop}, '', " ") . "" - . $form->format_amount(\%myconfig, $ref->{weight}, '', " ") + . $form->format_amount(\%myconfig, $ref->{weight}) . "$ref->{unit} $ref->{bin} " - . $form->format_amount(\%myconfig, $ref->{soldtotal}, '', " ") + . $form->format_amount(\%myconfig, $ref->{soldtotal}) . "$ref->{deliverydate} " - . $form->format_amount(\%myconfig, $totalsellprice, 2, " ") + . $form->format_amount(\%myconfig, $totalsellprice, 2) . "" - . $form->format_amount(\%myconfig, $totallastcost, 2, " ") + . $form->format_amount(\%myconfig, $totallastcost, 2) . "" - . $form->format_amount(\%myconfig, $totallistprice, 2, " ") + . $form->format_amount(\%myconfig, $totallistprice, 2) . "
" - . $form->format_amount(\%myconfig, $subtotalonhand, '', " ") + . $form->format_amount(\%myconfig, $subtotalonhand) . "" - . $form->format_amount(\%myconfig, $subtotalsellprice, 2, " ") + . $form->format_amount(\%myconfig, $subtotalsellprice, 2) . "" - . $form->format_amount(\%myconfig, $subtotallistprice, 2, " ") + . $form->format_amount(\%myconfig, $subtotallistprice, 2) . "" - . $form->format_amount(\%myconfig, $subtotallastcost, 2, " ") + . $form->format_amount(\%myconfig, $subtotallastcost, 2) . "
| . $locale->text('ADR') . qq|
{weight}> -   - $form->{weightunit} - {weightunit}> -
@@ -2388,11 +2332,6 @@ sub form_header {  $form->{weight} {weight}> - -   - $form->{weightunit} - {weightunit}> - @@ -2474,15 +2413,6 @@ sub form_header { {gv}> |; - $aluok = $form->{alu} == 1 ? "checked" : ""; - - $alu .= qq| - - | - . $locale->text('Aluartikel') . qq| - - |; - $notdiscountableok = ($form->{not_discountable}) == 1 ? "checked" : ""; $notdiscountable .= qq| @@ -2493,7 +2423,7 @@ sub form_header { |; $formel = - qq||; + qq||; $imagelinks = qq| @@ -2591,6 +2521,7 @@ sub form_header { {rowcount}> + @@ -2628,7 +2559,6 @@ sub form_header {
$buchungsgruppe $linkaccounts - $adr
@@ -2644,9 +2574,16 @@ sub form_header { - + + | . $locale->text('EAN-Code') . qq| + + + + + $ean + @@ -2686,7 +2623,6 @@ sub form_header { $notdiscountable $vegv $shop - $alu $obsolete @@ -2785,10 +2721,20 @@ sub form_footer { &menubar; } } - +# button for saving history + if($form->{id} ne "") { + print qq| + {id} + . qq|); name=history id=history value=| + . $locale->text('history') + . qq|>|; + } +# /button for saving history print qq| + @@ -3078,7 +3024,7 @@ sub save { $locale->text( "Inventory quantity must be zero before you can set this $form->{item} obsolete!" )) - if ($form->{onhand}); + if ($form->{onhand} * 1); } if (!$form->{buchungsgruppen_id}) { @@ -3104,6 +3050,12 @@ sub save { if ($rc == 3) { $form->error($locale->text('Partnumber not unique!')); } + # saving the history + if(!exists $form->{addition}) { + $form->{addition} = "SAVED"; + $form->save_history($form->dbconnect(\%myconfig)); + } + # /saving the history $parts_id = $form->{id}; # load previous variables @@ -3220,15 +3172,29 @@ sub save { sub save_as_new { $lxdebug->enter_sub(); + # saving the history + if(!exists $form->{addition}) { + $form->{addition} = "SAVED AS NEW"; + $form->save_history($form->dbconnect(\%myconfig)); + } + # /saving the history $form->{id} = 0; + if ($form->{"original_partnumber"} && + ($form->{"partnumber"} eq $form->{"original_partnumber"})) { + $form->{partnumber} = ""; + } &save; - $lxdebug->leave_sub(); } sub delete { $lxdebug->enter_sub(); - + # saving the history + if(!exists $form->{addition}) { + $form->{addition} = "DELETED"; + $form->save_history($form->dbconnect(\%myconfig)); + } + # /saving the history $rc = IC->delete(\%myconfig, \%$form); # redirect @@ -3238,181 +3204,6 @@ sub delete { $lxdebug->leave_sub(); } -sub stock_assembly { - $lxdebug->enter_sub(); - - $form->{title} = $locale->text('Stock Assembly'); - - $form->header; - - print qq| - - -
{script}> - - - - - - - - - - -
$form->{title}
- - - - - - - - - - -
| - . $locale->text('Part Number') . qq| 
| - . $locale->text('Part Description') . qq|
-

- -{path}> -{login}> -{password}> - - - -
- -
- - - -|; - - $lxdebug->leave_sub(); -} - -sub list_assemblies { - $lxdebug->enter_sub(); - - IC->retrieve_assemblies(\%myconfig, \%$form); - - $column_header{partnumber} = - qq|| . $locale->text('Part Number') . qq||; - $column_header{description} = - qq|| . $locale->text('Part Description') . qq||; - $column_header{bin} = - qq|| . $locale->text('Bin') . qq||; - $column_header{onhand} = - qq|| . $locale->text('Qty') . qq||; - $column_header{rop} = - qq|| . $locale->text('ROP') . qq||; - $column_header{stock} = - qq|| . $locale->text('Add') . qq||; - - @column_index = (qw(partnumber description bin onhand rop stock)); - - $form->{title} = $locale->text('Stock Assembly'); - - $form->{callback} = - "$form->{script}?action=stock_assembly&path=$form->{path}&login=$form->{login}&password=$form->{password}"; - - $form->header; - - $colspan = $#column_index + 1; - - print qq| - - -
{script}> - - - - - - - |; - - map { print "\n$column_header{$_}" } @column_index; - - print qq| - -|; - - $i = 1; - foreach $ref (@{ $form->{assembly_items} }) { - - map { $ref->{$_} =~ s/\"/"/g } qw(partnumber description); - - $column_data{partnumber} = qq||; - $column_data{description} = - qq||; - $column_data{bin} = qq||; - $column_data{onhand} = - qq||; - $column_data{rop} = - qq||; - $column_data{stock} = qq||; - - $j++; - $j %= 2; - print - qq|{id}>\n|; - - map { print "\n$column_data{$_}" } @column_index; - - print qq| - -|; - - $i++; - - } - - $i--; - print qq| - - -
$form->{title}
$ref->{partnumber}$ref->{description} $ref->{bin} | - . $form->format_amount(\%myconfig, $ref->{onhand}, '', " ") - . qq|| - . $form->format_amount(\%myconfig, $ref->{rop}, '', " ") - . qq|

-
- - -{path}> -{login}> -{password}> - - - - - -
- - -
- - - -|; - - $lxdebug->leave_sub(); -} - -sub restock_assemblies { - $lxdebug->enter_sub(); - - $form->redirect($locale->text('Assemblies restocked!')) - if (IC->restock_assemblies(\%myconfig, \%$form)); - $form->error($locale->text('Cannot stock assemblies!')); - - $lxdebug->leave_sub(); -} - sub price_row { $lxdebug->enter_sub(); @@ -3446,7 +3237,6 @@ sub price_row { $lxdebug->leave_sub(); } - sub parts_language_selection { $lxdebug->enter_sub();