# $locale->text('Oct')
# $locale->text('Nov')
# $locale->text('Dec')
+use SL::IS;
+use SL::PE;
use Data::Dumper;
########################################
# Eintrag fuer Version 2.2.0 geaendert #
sub display_row {
$lxdebug->enter_sub();
my $numrows = shift;
-
if ($lizenzen && $form->{vc} eq "customer") {
if ($form->{type} =~ /sales_order/) {
@column_index = (runningnumber, partnumber, description, ship, qty);
}
############## ENDE Neueintrag ##################
- push @column_index, qw(unit sellprice);
+ push @column_index, qw(unit);
+
+ #for pricegroups column
+ if ( $form->{type} =~ (/sales_quotation/)
+ or (($form->{level} =~ /Sales/) and ($form->{type} =~ /invoice/))
+ or (($form->{level} eq undef) and ($form->{type} =~ /invoice/))
+ or ($form->{type} =~ /sales_order/)) {
+ push @column_index, qw(sellprice_drag);
+ }
+
+ push @column_index, qw(sellprice);
if ($form->{vc} eq 'customer') {
push @column_index, qw(discount);
. $locale->text('Project')
. qq|</th>|;
$column_data{sellprice} =
- qq|<th align=left nowrap width=10 class=listheading>|
+ qq|<th align=left nowrap width=15 class=listheading>|
. $locale->text('Price')
. qq|</th>|;
+ $column_data{sellprice_drag} =
+ qq|<th align=left nowrap width=15 class=listheading>|
+ . $locale->text('Pricegroup')
+ . qq|</th>|;
$column_data{discount} =
qq|<th align=left class=listheading>|
. $locale->text('Discount')
$serialnumber = $locale->text('Serial No.');
$projectnumber = $locale->text('Project');
$partsgroup = $locale->text('Group');
+ $reqdate = $locale->text('Reqdate');
$delvar = 'deliverydate';
# undo formatting
map {
- $form->{"${_}_$i"} = $form->parse_amount(\%myconfig, $form->{"${_}_$i"})
- } qw(qty ship discount sellprice);
+ $form->{"${_}_$i"} =
+ $form->parse_amount(\%myconfig, $form->{"${_}_$i"})
+ } qw(qty ship discount sellprice price_new price_old);
($dec) = ($form->{"sellprice_$i"} =~ /\.(\d+)/);
$dec = length $dec;
$form->round_amount(
$form->{"sellprice_$i"} * $form->{"discount_$i"} / 100,
$decimalplaces);
+
$linetotal =
$form->round_amount($form->{"sellprice_$i"} - $discount, $decimalplaces);
$linetotal = $form->round_amount($linetotal * $form->{"qty_$i"}, 2);
qq|<td><input name="description_$i" size=30 value="$form->{"description_$i"}"></td>|;
}
+ (my $qty_dec) = ($form->{"qty_$i"} =~ /\.(\d+)/);
+ $qty_dec = length $qty_dec;
+
$column_data{qty} =
qq|<td align=right><input name="qty_$i" size=5 value=|
- . $form->format_amount(\%myconfig, $form->{"qty_$i"})
+ . $form->format_amount(\%myconfig, $form->{"qty_$i"}, $qty_dec)
. qq|></td>|;
$column_data{ship} =
qq|<td align=right><input name="ship_$i" size=5 value=|
. qq|></td>|;
$column_data{unit} =
qq|<td><input name="unit_$i" size=5 value="$form->{"unit_$i"}"></td>|;
- $column_data{sellprice} =
- qq|<td align=right><input name="sellprice_$i" size=9 value=|
- . $form->format_amount(\%myconfig, $form->{"sellprice_$i"},
- $decimalplaces)
- . qq|></td>|;
+
+ # build in dragdrop for pricesgroups
+ if ($form->{"prices_$i"}) {
+ $price_tmp =
+ $form->format_amount(\%myconfig, $form->{"price_new_$i"}, 2);
+
+ $column_data{sellprice_drag} =
+ qq|<td align=right><select name="sellprice_drag_$i">$form->{"prices_$i"}</select></td>|;
+ $column_data{sellprice} =
+ qq|<td><input name="sellprice_$i" size=5 value=$price_tmp></td>|;
+ } else {
+
+ # for last row and report
+ # set pricegroup dragdrop from report menu
+ if ($form->{"sellprice_$i"} != 0) {
+ $prices =
+ qq|<option value="$form->{"sellprice_$i"}--$form->{"pricegroup_id_$i"}" selected>$form->{"pricegroup_$i"}</option>\n|;
+
+ $form->{"pricegroup_old_$i"} = $form->{"pricegroup_id_$i"};
+
+ $column_data{sellprice_drag} =
+ qq|<td align=right><select name="sellprice_drag_$i">$prices</select></td>|;
+
+ } else {
+
+ # for last row
+ $column_data{sellprice_drag} =
+ qq|<td align=right><input name="sellprice_$i" size=9 value=|
+ . $form->format_amount(\%myconfig, $form->{"prices_$i"},
+ $decimalplaces)
+ . qq|></td>|;
+ }
+
+ $column_data{sellprice} =
+ qq|<td><input name="sellprice_$i" size=5 value=|
+ . $form->format_amount(\%myconfig, $form->{"sellprice_$i"},
+ $decimalplaces)
+ . qq|></td>|;
+ }
$column_data{discount} =
qq|<td align=right><input name="discount_$i" size=3 value=|
. $form->format_amount(\%myconfig, $form->{"discount_$i"})
<input type=hidden name="orderitems_id_$i" value=$form->{"orderitems_id_$i"}>
<input type=hidden name="bo_$i" value=$form->{"bo_$i"}>
+<input type=hidden name="pricegroup_old_$i" value=$form->{"pricegroup_old_$i"}>
+<input type=hidden name="price_old_$i" value=$form->{"price_old_$i"}>
+<input type=hidden name="price_new_$i" value=|
+ . $form->format_amount(\%myconfig, $form->{"price_new_$i"}) . qq|>
+
<input type=hidden name="id_$i" value=$form->{"id_$i"}>
<input type=hidden name="inventory_accno_$i" value=$form->{"inventory_accno_$i"}>
<input type=hidden name="bin_$i" value="$form->{"bin_$i"}">
<input type=hidden name="listprice_$i" value="$form->{"listprice_$i"}">
<input type=hidden name="assembly_$i" value="$form->{"assembly_$i"}">
<input type=hidden name="taxaccounts_$i" value="$form->{"taxaccounts_$i"}">
+<input type=hidden name="ordnumber_$i" value="$form->{"ordnumber_$i"}">
+<input type=hidden name="transdate_$i" value="$form->{"transdate_$i"}">
+<input type=hidden name="cusordnumber_$i" value="$form->{"cusordnumber_$i"}">
|;
<b>$projectnumber</b> <input name="projectnumber_$i" size=10 value="$form->{"projectnumber_$i"}">
<input type=hidden name="oldprojectnumber_$i" value="$form->{"oldprojectnumber_$i"}">
<input type=hidden name="project_id_$i" value="$form->{"project_id_$i"}">
+|;
+ if ($form->{type} eq 'invoice' or $form->{type} =~ /order/) {
+ my $reqdate_term =
+ ($form->{type} eq 'invoice')
+ ? 'deliverydate'
+ : 'reqdate'; # invoice uses a different term for the same thing.
+ print qq|
+ <b>${$reqdate_term}</b> <input name="${reqdate_term}_$i" size=11 value="$form->{"${reqdate_term}_$i"}">
+|;
+ }
+
+ print qq|
</td>
</tr>
$lxdebug->leave_sub();
}
-sub select_item {
+##################################################
+# build html-code for pricegroups in variable $form->{prices_$j}
+
+sub set_pricegroup {
+ my $rowcount = shift;
$lxdebug->enter_sub();
+ for $j (1 .. $rowcount) {
+ my $pricegroup_old = $form->{"pricegroup_old_$i"};
+ if ($form->{PRICES}{$j}) {
+ $len = 0;
+ $prices = '';
+ $price = 0;
+ foreach $item (@{ $form->{PRICES}{$j} }) {
+
+ #$price = $form->round_amount($myconfig, $item->{price}, 5);
+ #$price = $form->format_amount($myconfig, $item->{price}, 2);
+ $price = $item->{price};
+ $pricegroup_id = $item->{pricegroup_id};
+ $pricegroup = $item->{pricegroup};
+
+ # build dragdrop for pricegroups
+ $prices .=
+ qq|<option value="$price--$pricegroup_id"$item->{selected}>$pricegroup</option>\n|;
+
+ $len += 1;
+
+ # map {
+ # $form->{"${_}_$j"} =
+ # $form->format_amount(\%myconfig, $form->{"${_}_$j"})
+ # } qw(sellprice price_new price_old);
+
+ # set new selectedpricegroup_id and prices for "Preis"
+ if ($item->{selected} && ($pricegroup_id != 0)) {
+ $form->{"pricegroup_old_$j"} = $pricegroup_id;
+ $form->{"price_new_$j"} = $price;
+ $form->{"sellprice_$j"} = $price;
+ }
+ if ($pricegroup_id == 0) {
+ $form->{"price_new_$j"} = $form->{"sellprice_$j"};
+ }
+ if ($len > 1) {
+ $form->{"prices_$j"} = $prices;
+ }
+ }
+ }
+ }
+ $lxdebug->leave_sub();
+}
+sub select_item {
+ $lxdebug->enter_sub();
@column_index = qw(ndx partnumber description onhand sellprice);
$column_data{ndx} = qq|<th> </th>|;
map { $ref->{$_} =~ s/\"/"/g } qw(partnumber description unit);
+ #sk tradediscount
$ref->{sellprice} =
$form->round_amount($ref->{sellprice} * (1 - $form->{tradediscount}), 2);
-
$column_data{ndx} =
qq|<td><input name=ndx class=radio type=radio value=$i $checked></td>|;
$column_data{partnumber} =
# index for new item
$j = $form->{ndx};
+ #sk
+ #($form->{"sellprice_$i"},$form->{"$pricegroup_old_$i"}) = split /--/, $form->{"sellprice_$i"};
+ #$form->{"sellprice_$i"} = $form->{"sellprice_$i"};
+
# if there was a price entered, override it
$sellprice = $form->parse_amount(\%myconfig, $form->{"sellprice_$i"});
$form->format_amount(\%myconfig, $form->{"${_}_$i"}, $decimalplaces)
} qw(sellprice listprice) if $form->{item} ne 'assembly';
+ # get pricegroups for parts
+ IS->get_pricegroups_for_parts(\%myconfig, \%$form);
+
+ # build up html code for prices_$i
+ set_pricegroup($form->{rowcount});
+
&display_form;
$lxdebug->leave_sub();
exit;
}
+ # if ( $form->{print_and_post}
+ # && $form->{second_run}
+ # && ($form->{action} eq "display_form")) {
+ # for (keys %$form) { $old_form->{$_} = $form->{$_} }
+ # $old_form->{rowcount}++;
+ #
+ # #$form->{rowcount}--;
+ # #$form->{rowcount}--;
+ #
+ # $form->{print_and_post} = 0;
+ #
+ # &print_form($old_form);
+ # exit;
+ # }
+ #
+ # $form->{action} = "";
+ # $form->{resubmit} = 0;
+ #
+ # if ($form->{print_and_post} && !$form->{second_run}) {
+ # $form->{second_run} = 1;
+ # $form->{action} = "display_form";
+ # $form->{rowcount}--;
+ # my $rowcount = $form->{rowcount};
+ #
+ # # get pricegroups for parts
+ # IS->get_pricegroups_for_parts(\%myconfig, \%$form);
+ #
+ # # build up html code for prices_$i
+ # set_pricegroup($rowcount);
+ #
+ # $form->{resubmit} = 1;
+ #
+ # }
&form_header;
$numrows = ++$form->{rowcount};
$subroutine = "display_row";
if ($form->{item} eq 'part') {
+
+ #set preisgruppenanzahl
+ $numrows = $form->{price_rows};
+ $subroutine = "price_row";
+
+ &{$subroutine}($numrows);
+
$numrows = ++$form->{makemodel_rows};
$subroutine = "makemodel_row";
}
if ($form->{item} eq 'assembly') {
+ $numrows = ++$form->{price_rows};
+ $subroutine = "price_row";
+
+ &{$subroutine}($numrows);
+
$numrows = ++$form->{makemodel_rows};
$subroutine = "makemodel_row";
$subroutine = "assembly_row";
}
if ($form->{item} eq 'service') {
+ $numrows = $form->{price_rows};
+ $subroutine = "price_row";
+
+ &{$subroutine}($numrows);
+
$numrows = 0;
}
sub check_form {
$lxdebug->enter_sub();
-
my @a = ();
my $count = 0;
- my @flds = (
+ my @flds = (
qw(id partnumber description qty ship sellprice unit discount inventory_accno income_accno expense_accno listprice taxaccounts bin assembly weight projectnumber project_id oldprojectnumber runningnumber serialnumber partsgroup)
);
map { $a[$j]->{$_} = $form->{"${_}_$i"} } @flds;
+ #($form->{"sellprice_$i"},$form->{"$pricegroup_old_$i"}) = split /--/, $form->{"sellprice_$i"};
+
$form->{sellprice} += ($form->{"qty_$i"} * $form->{"sellprice_$i"});
$form->{weight} += ($form->{"qty_$i"} * $form->{"weight_$i"});
$count++;
}
}
+ #sk
+ # if pricegroups
+ if ( $form->{type} =~ (/sales_quotation/)
+ or (($form->{level} =~ /Sales/) and ($form->{type} =~ /invoice/))
+ or (($form->{level} eq undef) and ($form->{type} =~ /invoice/))
+ or ($form->{type} =~ /sales_order/)) {
+
+ # get pricegroups for parts
+ IS->get_pricegroups_for_parts(\%myconfig, \%$form);
+
+ # build up html code for prices_$i
+ set_pricegroup($form->{rowcount});
+
+ }
+
&display_form;
$lxdebug->leave_sub();
$discount = $form->parse_amount(\%myconfig, $form->{"discount_$i"});
$qty = $form->parse_amount(\%myconfig, $form->{"qty_$i"});
+ #($form->{"sellprice_$i"}, $form->{"$pricegroup_old_$i"}) = split /--/, $form->{"sellprice_$i"};
+
$amount = $sellprice * (1 - $discount / 100) * $qty;
map { $form->{"${_}_base"} += $amount }
(split / /, $form->{"taxaccounts_$i"});
sub order {
$lxdebug->enter_sub();
-
+ if ($form->{second_run}) {
+ $form->{print_and_post} = 0;
+ }
$form->{ordnumber} = $form->{invnumber};
map { delete $form->{$_} } qw(id printed emailed queued);
-
if ($form->{script} eq 'ir.pl' || $form->{type} eq 'request_quotation') {
$form->{title} = $locale->text('Add Purchase Order');
$form->{vc} = 'vendor';
sub quotation {
$lxdebug->enter_sub();
-
+ if ($form->{second_run}) {
+ $form->{print_and_post} = 0;
+ }
map { delete $form->{$_} } qw(id printed emailed queued);
if ($form->{script} eq 'ir.pl' || $form->{type} eq 'purchase_order') {
sub e_mail {
$lxdebug->enter_sub();
-
+ if ($form->{second_run}) {
+ $form->{print_and_post} = 0;
+ $form->{resubmit} = 0;
+ }
if ($myconfig{role} eq 'admin') {
$bcc = qq|
<th align=right nowrap=true>| . $locale->text('Bcc') . qq|</th>
sub print_options {
$lxdebug->enter_sub();
-
$form->{sendmode} = "attachment";
$form->{copies} = 3 unless $form->{copies};
$form->{PD}{ $form->{formname} } = "selected";
- $form->{DF}{ $form->{format} } = "";
+ $form->{DF}{ $form->{format} } = "selected";
$form->{OP}{ $form->{media} } = "selected";
$form->{SM}{ $form->{sendmode} } = "selected";
if ($form->{type} eq 'invoice') {
$type = qq|<select name=formname>
- <option value=invoice $form->{PD}{invoice}>| . $locale->text('Invoice');
+ <option value=invoice $form->{PD}{invoice}>|
+ . $locale->text('Invoice') . qq|
+ <option value=packing_list $form->{PD}{packing_list}>|
+ . $locale->text('Packing List');
}
if ($form->{type} eq 'ship_order') {
} else {
$media = qq|<select name=media>
<option value=screen $form->{OP}{screen}>| . $locale->text('Screen');
- if ($myconfig{printer} && $latex) {
+ if ($myconfig{printer} && $latex_templates) {
$media .= qq|
<option value=printer $form->{OP}{printer}>|
. $locale->text('Printer');
}
- if ($latex) {
+ if ($latex_templates) {
$media .= qq|
<option value=queue $form->{OP}{queue}>| . $locale->text('Queue');
}
$format = qq|<select name=format>
<option value=html $form->{DF}{html}>html|;
- if ($latex) {
+ if ($latex_templates) {
$format = qq|<select name=format>
<option value=pdf $form->{DF}{pdf}>| . $locale->text('PDF') . qq|
<option value=html $form->{DF}{html}>html
. $locale->text('Postscript');
}
- $language = qq|<select name=language>
+ $format .= qq|<option value=html $form->{DF}{html}>HTML</option>|;
+
+ if ($latex_templates) {
+ $format .= qq|<option value=postscript $form->{DF}{postscript}>| .
+ $locale->text('Postscript') . qq|</option>|;
+ }
+
+ $language_select = qq|<select name=language>
<option value=""></option>|;
%lang = (de => "deutsch", en => "englisch", fr => "französisch");
foreach $item (keys %lang) {
if ($form->{language} eq $item) {
- $language .= qq|<option value="$item" selected>$lang{$item}</option>|;
+ $language_select .= qq|<option value="$item" selected>$lang{$item}</option>|;
} else {
- $language .= qq|<option value="$item">$lang{$item}</option>|;
+ $language_select .= qq|<option value="$item">$lang{$item}</option>|;
}
}
<table>
<tr>
<td>$type</select></td>
- <td>$language</select</td>
+ <td>${language_select}</select></td>
<td>$format</select></td>
<td>$media</select></td>
|;
- if ($myconfig{printer} && $latex && $form->{media} ne 'email') {
+ if ($myconfig{printer} && $latex_templates && $form->{media} ne 'email') {
print qq|
<td>| . $locale->text('Copies') . qq|
<input name=copies size=2 value=$form->{copies}></td>
$lxdebug->enter_sub();
my ($old_form) = @_;
- $inv = "inv";
- $due = "due";
-
+ $inv = "inv";
+ $due = "due";
$numberfld = "invnumber";
$display_form =
# $locale->text('Quotation Date missing!')
# assign number
- if (!$form->{"${inv}number"}) {
+ if (!$form->{"${inv}number"} && !$form->{preview}) {
$form->{"${inv}number"} = $form->update_defaults(\%myconfig, $numberfld);
if ($form->{media} ne 'email') {
+
+ # get pricegroups for parts
+ IS->get_pricegroups_for_parts(\%myconfig, \%$form);
+
+ # build up html code for prices_$i
+ set_pricegroup($form->{rowcount});
+
$form->{rowcount}--;
+
&{"$display_form"};
exit;
}
my ($saved_email, $saved_cc, $saved_bcc) =
($form->{"email"}, $form->{"cc"}, $form->{"bcc"});
- $language = $form->{language};
+ $language_saved = $form->{language};
&{"$form->{vc}_details"};
- $form->{language} = $language;
+ $form->{language} = $language_saved;
$form->{"email"} = $saved_email if ($saved_email);
$form->{"cc"} = $saved_cc if ($saved_cc);
push @a,
("partnumber_$i", "description_$i",
"partsgroup_$i", "serialnumber_$i",
- "bin_$i", "unit_$i");
+ "bin_$i", "unit_$i",
+ "transdate_$i", "ordnumber_$i");
}
map { push @a, "${_}_description" } split / /, $form->{taxaccounts};
IS->invoice_details(\%myconfig, \%$form, $locale);
}
+ # format global dates
map { $form->{$_} = $locale->date(\%myconfig, $form->{$_}, 1) }
- ("${inv}date", "${due}date", "shippingdate");
+ ("${inv}date", "${due}date", "shippingdate", "deliverydate");
+
+ # format item dates
+ for my $field (qw(transdate_oe deliverydate_oe)) {
+ map {
+ $form->{$field}[$_] = $locale->date(\%myconfig, $form->{$field}[$_], 1);
+ } 0 .. $#{ $form->{$field} };
+ }
@a = qw(name street zipcode city country);
# some of the stuff could have umlauts so we translate them
push @a,
- qw(shiptoname shiptostreet shiptozipcode shiptocity shiptocountry shiptoemail shippingpoint shipvia company address signature employee contact);
+ qw(shiptoname shiptostreet shiptozipcode shiptocity shiptocountry shiptoemail shippingpoint shipvia company address signature employee contact department_1 department_2);
- push @a, ("${inv}date", "${due}date", email, cc, bcc);
+ push @a, ("${inv}date", "${due}date", "deliverydate", email, cc, bcc);
$form->format_string(@a);
sub customer_details {
$lxdebug->enter_sub();
-
IS->customer_details(\%myconfig, \%$form);
$lxdebug->leave_sub();
}
sub ship_to {
$lxdebug->enter_sub();
+ if ($form->{second_run}) {
+ $form->{print_and_post} = 0;
+ }
$title = $form->{title};
$form->{title} = $locale->text('Ship to');
? $locale->text('Customer Number')
: $locale->text('Vendor Number');
+ # get pricegroups for parts
+ IS->get_pricegroups_for_parts(\%myconfig, \%$form);
+
+ # build up html code for prices_$i
+ set_pricegroup($form->{rowcount});
+
$nextsub = ($form->{display_form}) ? $form->{display_form} : "display_form";
$form->{rowcount}--;
<table>
<tr class=listheading>
<th class=listheading colspan=2 width=50%>|
- . $locale->text('Billing Address')
- . qq|</th>
+ . $locale->text('Billing Address') . qq|</th>
<th class=listheading width=50%>|
- . $locale->text('Shipping Address')
- . qq|</th>
+ . $locale->text('Shipping Address') . qq|</th>
</tr>
<tr height="5"></tr>
<tr>
projects / kivitendo-erp.git / blobdiff