# Based on SQL-Ledger Version 2.1.9
# Web http://www.lx-office.org
#############################################################################
-# Veraendert 2005-01-05 - Marco Welter <mawe@linux-studio.de> - Neue Optik #
+# Changelog: Wann - Wer - Was
+# Veraendert 2005-01-05 - Marco Welter <mawe@linux-studio.de> - Neue Optik
+# 08.11.2008 - information@richardson-bueren.de jb - Backport von Revision 7339 xplace - E-Mail-Vorlage automatisch auswählen
+# 02.02.2009 - information@richardson-bueren.de jb - Backport von Revision 8535 xplace - Erweiterung der Waren bei Lieferantenauftrag um den Eintrag Mindestlagerbestand. Offen: Auswahlliste auf Lieferantenaufträge einschränken -> Erledigt 2.2.09 Prüfung wie das Skript heisst (oe.pl) -> das ist nur die halbe Miete, nochmal mb fragen -> mb gefragt und es gibt die variable is_purchase
#############################################################################
# SQL-Ledger, Accounting
# Copyright (c) 1998-2002
$decimalplaces = max 2, length $1;
$price_factor = $price_factors{$form->{"price_factor_id_$i"}} || 1;
- $discount = $form->round_amount($form->{"sellprice_$i"} * $form->{"discount_$i"} / 100, $decimalplaces);
- $linetotal = $form->round_amount(($form->{"sellprice_$i"} - $discount) / $price_factor, $decimalplaces);
- $linetotal = $form->round_amount($linetotal * $form->{"qty_$i"}, 2);
+ $discount = $form->round_amount($form->{"qty_$i"} * $form->{"sellprice_$i"} * $form->{"discount_$i"} / 100 / $price_factor, 2);
+ $linetotal = $form->round_amount($form->{"qty_$i"} * $form->{"sellprice_$i"} * (100 - $form->{"discount_$i"}) / 100 / $price_factor, 2);
$column_data{runningnumber} = $cgi->textfield(-name => "runningnumber_$i", -size => 5, -value => $i); # HuT
$column_data{partnumber} = $cgi->textfield(-name => "partnumber_$i", -size => 12, -value => $form->{"partnumber_$i"});
$column_data{qty} .= $cgi->button(-onclick => "calculate_qty_selection_window('qty_$i','alu_$i', 'formel_$i', $i)", -value => $locale->text('*/'))
. $cgi->hidden(-name => "formel_$i", -value => $form->{"formel_$i"}) . $cgi->hidden("-name" => "alu_$i", "-value" => $form->{"alu_$i"})
if $form->{"formel_$i"};
- $column_data{ship} = !$form->{"id_$i"} ? '' : $form->format_amount_units('amount' => $form->{"ship_$i"} * 1,
- 'part_unit' => $form->{"partunit_$i"},
- 'max_places' => 2,);
+
+ $column_data{ship} = '';
+ if ($form->{"id_$i"}) {
+ my $ship_qty = $form->{"ship_$i"} * 1;
+ $ship_qty *= $all_units->{$form->{"partunit_$i"}}->{factor};
+ $ship_qty /= $all_units->{$form->{"unit_$i"}}->{factor};
+
+ $column_data{ship} = $form->format_amount(\%myconfig, $form->round_amount($ship_qty, 2) * 1) . ' ' . $form->{"unit_$i"};
+ }
# build in drop down list for pricesgroups
if ($form->{"prices_$i"}) {
sub select_item {
$lxdebug->enter_sub();
-
+# diese variable kommt schon in der methode display_row vor, kann man die besser wiederverwenden? @mb fragen. ich check das jetzt erstmal so ein
+ my $is_purchase = (first { $_ eq $form->{type} } qw(request_quotation purchase_order purchase_delivery_order)) || ($form->{script} eq 'ir.pl');
_check_io_auth();
- @column_index = qw(ndx partnumber description onhand unit sellprice);
+ @column_index = qw(ndx partnumber description rop onhand unit sellprice);
$column_data{ndx} = qq|<th> </th>|;
$column_data{partnumber} =
qq|<th class="listheading">| . $locale->text('Part Description') . qq|</th>|;
$column_data{sellprice} =
qq|<th class="listheading">| . $locale->text('Price') . qq|</th>|;
+ if ($is_purchase){
+ $column_data{rop} =
+ qq|<th class="listheading">| . $locale->text('ROP') . qq|</th>|;
+ }# ende if $is_purchase -> Überschrift Mindestlagerbestand - ähnliche Prüfung weiter unten
$column_data{onhand} =
qq|<th class="listheading">| . $locale->text('Qty') . qq|</th>|;
$column_data{unit} =
qq|<td align="right"><input name="new_onhand_$i" type="hidden" value="$ref->{onhand}">|
. $form->format_amount(\%myconfig, $ref->{onhand}, '', " ")
. qq|</td>|;
+ if ($is_purchase){
+ $column_data{rop} =
+ qq|<td align="right"><input name="new_rop$i" type="hidden" value="$ref->{rop}">|
+ . $form->format_amount(\%myconfig, $ref->{rop}, '', " ")
+ . qq|</td>|;
+ }# ende if $is_purchase -> Falls der Aufruf über eine Einkaufsmaske kam, handelt es sich um einen Lieferantenauftrag und uns interessiert auch die Mindestbestandsmenge
$column_data{unit} =
qq|<td>$ref->{unit}</td>|;
$j++;
@hidden_keys = sort grep { !$dont_hide_key{$_} } grep { !ref $form->{$_} } keys %$form;
print $form->parse_html_template('generic/edit_email',
- { title => $title,
- a_filename => $attachment_filename,
- subject => $subject,
- _print_options_ => print_options('inline' => 1),
- HIDDEN => [ map +{ name => $_, value => $form->{$_} }, @hidden_keys ],
- SHOW_BCC => $myconfig{role} eq 'admin' });
+ { title => $title,
+ a_filename => $attachment_filename,
+ subject => $subject,
+ print_options => print_options('inline' => 1),
+ HIDDEN => [ map +{ name => $_, value => $form->{$_} }, @hidden_keys ],
+ SHOW_BCC => $myconfig{role} eq 'admin' });
$lxdebug->leave_sub();
}
($form->{type} =~ /_delivery_order$/) ? (
opthash($form->{type}, $form->{PD}{$form->{type}}, $locale->text('Delivery Order')),
opthash('pick_list', $form->{PD}{pick_list}, $locale->text('Pick List')),
- ) : undef;
+ ) : undef,
($form->{type} eq 'credit_note') ?
opthash("credit_note", $form->{PD}{credit_note}, $locale->text('Credit Note')) : undef;
IS->invoice_details(\%myconfig, \%$form, $locale);
}
- $form->get_salesman(\%myconfig, $salesman_id_saved);
+ $form->get_employee_data('prefix' => 'employee', 'id' => $form->{employee_id});
+ $form->get_employee_data('prefix' => 'salesman', 'id' => $salesman_id_saved);
if ($form->{shipto_id}) {
$form->get_shipto(\%myconfig);
reformat_numbers($output_numberformat, $precision, @{ $field_list });
}
- $form->{IN} = "$form->{formname}$form->{language}${printer_code}.html";
+ my $extension = '';
if ($form->{format} eq 'postscript') {
- $form->{postscript} = 1;
- $form->{IN} =~ s/html$/tex/;
+ $form->{postscript} = 1;
+ $extension = 'tex';
+
} elsif ($form->{"format"} =~ /pdf/) {
- $form->{pdf} = 1;
- if ($form->{"format"} =~ /opendocument/) {
- $form->{IN} =~ s/html$/odt/;
- } else {
- $form->{IN} =~ s/html$/tex/;
- }
+ $form->{pdf} = 1;
+ $extension = $form->{'format'} =~ m/opendocument/i ? 'odt' : 'tex';
+
} elsif ($form->{"format"} =~ /opendocument/) {
- $form->{"opendocument"} = 1;
- $form->{"IN"} =~ s/html$/odt/;
+ $form->{opendocument} = 1;
+ $extension = 'odt';
}
+ my $email_extension = '_email' if (($form->{media} eq 'email') && (-f "$myconfig{templates}/$form->{formname}_email$form->{language}${printer_code}.${extension}"));
+
+ $form->{IN} = "$form->{formname}${email_extension}$form->{language}${printer_code}.${extension}";
+
delete $form->{OUT};
if ($form->{media} eq 'printer') {
$form->get_duedate(\%myconfig);
- print $cgi->header() . $form->{duedate};
+ print $form->ajax_response_header() . $form->{duedate};
$lxdebug->leave_sub();
}
sub _update_ship {
$lxdebug->enter_sub();
- if (!$form->{ordnumber}) {
+ if (!$form->{ordnumber} || !$form->{id}) {
map { $form->{"ship_$_"} = 0 } (1..$form->{rowcount});
$lxdebug->leave_sub();
return;
AM->retrieve_all_units();
- my %ship = DO->get_shipped_qty('type' => ($form->{type} eq 'purchase_order') ? 'purchase' : 'sales',
- 'ordnumber' => $form->{ordnumber},);
+ my %ship = DO->get_shipped_qty('type' => ($form->{type} eq 'purchase_order') ? 'purchase' : 'sales',
+ 'oe_id' => $form->{id},);
foreach my $i (1..$form->{rowcount}) {
next unless ($form->{"id_${i}"});
next if (!$ship_entry || ($ship_entry->{qty} <= 0));
my $rowqty =
- $form->parse_amount(\%myconfig, $form->{"qty_$i"})
+ ($form->{simple_save} ? $form->{"qty_$i"} : $form->parse_amount(\%myconfig, $form->{"qty_$i"}))
* $all_units->{$form->{"unit_$i"}}->{factor}
/ $all_units->{$form->{"partunit_$i"}}->{factor};
projects / kivitendo-erp.git / blobdiff