my $colspan = $#column_index + 1;
$form->{invsubtotal} = 0;
- map { $form->{"${_}_base"} = 0 } (split / /, $form->{taxaccounts});
+ map { $form->{"${_}_base"} = 0 } (split(/ /, $form->{taxaccounts}));
########################################
# Eintrag fuer Version 2.2.0 geaendert #
qq|<th align=left nowrap width=30 class=listheading>|
. $locale->text('Part Description')
. qq|</th>|;
- $column_data{ship} =
+ if ($form->{"type"} eq "purchase_order") {
+ $column_data{ship} =
qq|<th align=left nowrap width=5 class=listheading>|
- . $locale->text('Ship')
- . qq|</th>|;
+ . $locale->text('Ship rcvd')
+ . qq|</th>|;
+ } else {
+ $column_data{ship} =
+ qq|<th align=left nowrap width=5 class=listheading>|
+ . $locale->text('Ship')
+ . qq|</th>|;
+ }
$column_data{qty} =
qq|<th align=left nowrap width=5 class=listheading>|
. $locale->text('Qty')
$delvar = 'reqdate';
}
+ my %projectnumber_labels = ();
+ my @projectnumber_values = ("");
+ foreach my $item (@{ $form->{"ALL_PROJECTS"} }) {
+ push(@projectnumber_values, $item->{"id"});
+ $projectnumber_labels{$item->{"id"}} = $item->{"projectnumber"};
+ }
+
for $i (1 .. $numrows) {
# undo formatting
if (($rows = $form->numtextrows($form->{"description_$i"}, 30, 6)) > 1) {
$column_data{description} =
- qq|<td><textarea name="description_$i" rows=$rows cols=30 wrap=soft>$form->{"description_$i"}</textarea><button type="button" onclick="set_longdescription_window('longdescription_$i')">| . $locale->text('L') . qq|</button></td>|;
+ qq|<td><textarea name="description_$i" rows=$rows cols=30 wrap=soft>| . H($form->{"description_$i"}) . qq|</textarea><button type="button" onclick="set_longdescription_window('longdescription_$i')">| . $locale->text('L') . qq|</button></td>|;
} else {
$column_data{description} =
- qq|<td><input name="description_$i" size=30 value="$form->{"description_$i"}"><button type="button" onclick="set_longdescription_window('longdescription_$i')">| . $locale->text('L') . qq|</button></td>|;
+ qq|<td><input name="description_$i" size=30 value="| . $form->quote($form->{"description_$i"}) . qq|"><button type="button" onclick="set_longdescription_window('longdescription_$i')">| . $locale->text('L') . qq|</button></td>|;
}
(my $qty_dec) = ($form->{"qty_$i"} =~ /\.(\d+)/);
}
$column_data{"unit"} = "<td>" .
- ($qty_readonly ? " " :
AM->unit_select_html($is_part ? $dimension_units :
$is_assigned ? $service_units : $all_units,
"unit_$i", $this_unit,
- $is_assigned ? $form->{"unit_$i"} : undef))
+ $is_assigned ? $form->{"unit_$i"} : undef)
. "</td>";
# build in drop down list for pricesgroups
<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="unit_old_$i" value="$form->{"selected_unit_$i"}">
+<input type=hidden name="unit_old_$i" value="| . $form->quote($form->{"selected_unit_$i"}) . qq|">
<input type=hidden name="price_new_$i" value=|
. $form->format_amount(\%myconfig, $form->{"price_new_$i"}) . qq|>
<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="partsgroup_$i" value="$form->{"partsgroup_$i"}">
-<input type=hidden name="partnotes_$i" value="$form->{"partnotes_$i"}">
+<input type=hidden name="partnotes_$i" value="| . $form->quote($form->{"partnotes_$i"}) . qq|">
<input type=hidden name="income_accno_$i" value=$form->{"income_accno_$i"}>
<input type=hidden name="expense_accno_$i" value=$form->{"expense_accno_$i"}>
<input type=hidden name="listprice_$i" value="$form->{"listprice_$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"}">
-<input type=hidden name="longdescription_$i" value="$form->{"longdescription_$i"}">
+<input type=hidden name="longdescription_$i" value="| . $form->quote($form->{"longdescription_$i"}) . qq|">
<input type=hidden name="basefactor_$i" value="$form->{"basefactor_$i"}">
|;
<b>$serialnumber</b> <input name="serialnumber_$i" size=15 value="$form->{"serialnumber_$i"}">|;
}
- print qq|
- <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"}">
-|;
+ print qq|<b>$projectnumber</b> | .
+ NTI($cgi->popup_menu('-name' => "project_id_$i",
+ '-values' => \@projectnumber_values,
+ '-labels' => \%projectnumber_labels,
+ '-default' => $form->{"project_id_$i"}));
+
if ($form->{type} eq 'invoice' or $form->{type} =~ /order/) {
my $reqdate_term =
($form->{type} eq 'invoice')
############## ENDE Neueintrag ##################
map { $form->{"${_}_base"} += $linetotal }
- (split / /, $form->{"taxaccounts_$i"});
+ (split(/ /, $form->{"taxaccounts_$i"}));
$form->{invsubtotal} += $linetotal;
}
<input name="new_taxaccounts_$i" type=hidden value="$ref->{taxaccounts}">
<input name="new_partsgroup_$i" type=hidden value="$ref->{partsgroup}">
<input name="new_formel_$i" type=hidden value="$ref->{formel}">
-<input name="new_longdescription_$i" type=hidden value="$ref->{longdescription}">
+<input name="new_longdescription_$i" type=hidden value="| . Q($ref->{longdescription}) . qq|">
<input name="new_not_discountable_$i" type=hidden value="$ref->{not_discountable}">
<input name="new_part_payment_id_$i" type=hidden value="$ref->{part_payment_id}">
+<input name="new_partnotes_$i" type="hidden" value="| . Q($ref->{"partnotes"}) . qq|">
<input name="new_id_$i" type=hidden value=$ref->{id}>
$sellprice = $form->parse_amount(\%myconfig, $form->{"sellprice_$i"});
map { $form->{"${_}_$i"} = $form->{"new_${_}_$j"} }
- qw(id partnumber description sellprice listprice inventory_accno income_accno expense_accno bin unit weight assembly taxaccounts partsgroup formel longdescription not_discountable);
+ qw(id partnumber description sellprice listprice inventory_accno
+ income_accno expense_accno bin unit weight assembly taxaccounts
+ partsgroup formel longdescription not_discountable partnotes);
if ($form->{"part_payment_id_$i"} ne "") {
$form->{payment_id} = $form->{"part_payment_id_$i"};
}
relink_accounts();
+ my $new_rowcount = $form->{"rowcount"} * 1 + 1;
+ $form->{"project_id_${new_rowcount}"} = $form->{"globalproject_id"};
+
$form->language_payment(\%myconfig);
# if we have a display_form
exit;
}
+ Common::webdav_folder($form) if ($webdav);
+
# if ( $form->{print_and_post}
# && $form->{second_run}
# && ($form->{action} eq "display_form")) {
$amount = $sellprice * (1 - $discount / 100) * $qty;
map { $form->{"${_}_base"} += $amount }
- (split / /, $form->{"taxaccounts_$i"});
+ (split (/ /, $form->{"taxaccounts_$i"}));
$form->{oldinvtotal} += $amount;
}
map { $form->{oldinvtotal} += ($form->{"${_}_base"} * $form->{"${_}_rate"}) }
- split / /, $form->{taxaccounts}
+ split(/ /, $form->{taxaccounts})
if !$form->{taxincluded};
$form->{oldtotalpaid} = 0;
$form->{cp_id} *= 1;
require "$form->{path}/$form->{script}";
+ my $script = $form->{"script"};
+ $script =~ s|.*/||;
+ $script =~ s|.pl$||;
+ $locale = new Locale($language, $script);
map { $form->{"select$_"} = "" } ($form->{vc}, currency);
}
if ($myconfig{role} eq 'admin') {
$bcc = qq|
- <th align=right nowrap=true>| . $locale->text('Bcc') . qq|</th>
- <td><input name=bcc size=30 value="$form->{bcc}"></td>
+ <tr>
+ <th align="right" nowrap="true">| . $locale->text('Bcc') . qq|</th>
+ <td><input name="bcc" size="30" value="| . Q($form->{bcc}) . qq|"></td>
+ </tr>
|;
}
$form->{oldmedia} = $form->{media};
$form->{media} = "email";
+ my %formname_translations =
+ (
+ "bin_list" => $locale->text('Bin List'),
+ "credit_note" => $locale->text('Credit Note'),
+ "invoice" => $locale->text('Invoice'),
+ "packing_list" => $locale->text('Packing List'),
+ "pick_list" => $locale->text('Pick List'),
+ "proforma" => $locale->text('Proforma Invoice'),
+ "purchase_order" => $locale->text('Purchase Order'),
+ "request_quotation" => $locale->text('RFQ'),
+ "sales_order" => $locale->text('Confirmation'),
+ "sales_quotation" => $locale->text('Quotation'),
+ "storno_invoice" => $locale->text('Storno Invoice'),
+ "storno_packing_list" => $locale->text('Storno Packing List'),
+ );
+
+ my $attachment_filename = $formname_translations{$form->{"formname"}};
+ my $prefix;
+
+ if (grep({ $form->{"type"} eq $_ } qw(invoice credit_note))) {
+ $prefix = "inv";
+ } elsif ($form->{"type"} =~ /_quotation$/) {
+ $prefix = "quo";
+ } else {
+ $prefix = "ord";
+ }
+
+ if ($attachment_filename && $form->{"${prefix}number"}) {
+ $attachment_filename .= "_" . $form->{"${prefix}number"} .
+ ($form->{"format"} =~ /pdf/i ? ".pdf" :
+ $form->{"format"} =~ /postscript/i ? ".ps" :
+ $form->{"format"} =~ /opendocument/i ? ".odt" :
+ $form->{"format"} =~ /html/i ? ".html" : "");
+ $attachment_filename =~ s/ /_/g;
+ my %umlaute =
+ (
+ "ä" => "ae", "ö" => "oe", "ü" => "ue",
+ "Ä" => "Ae", "Ö" => "Oe", "Ü" => "Ue",
+ "ß" => "ss"
+ );
+ map({ $attachment_filename =~ s/$_/$umlaute{$_}/g; } keys(%umlaute));
+ } else {
+ $attachment_filename = "";
+ }
+
+ if ($form->{"email"}) {
+ $form->{"fokus"} = "Form.subject";
+ } else {
+ $form->{"fokus"} = "Form.email";
+ }
$form->header;
print qq|
-<body>
+<body onload="fokus()">
-<form method=post action=$form->{script}>
+<form name="Form" method="post" action="$form->{script}">
-<table width=100%>
- <tr class=listtop>
- <th class=listtop>$title</th>
+<table width="100%">
+ <tr class="listtop">
+ <th class="listtop">$title</th>
</tr>
<tr height="5"></tr>
<tr>
<td>
- <table width=100%>
- <tr>
- <th align=right nowrap>| . $locale->text('To') . qq|</th>
- <td><input name=email size=30 value="$form->{email}"></td>
- <th align=right nowrap>| . $locale->text('Cc') . qq|</th>
- <td><input name=cc size=30 value="$form->{cc}"></td>
- </tr>
- <tr>
- <th align=right nowrap>| . $locale->text('Subject') . qq|</th>
- <td><input name=subject size=30 value="$form->{subject}"></td>
- $bcc
- </tr>
+ <table>
+ <tr>
+ <th align="right" nowrap>| . $locale->text('To') . qq|</th>
+ <td><input name="email" size="30" value="| .
+ Q($form->{"email"}) . qq|"></td>
+ </tr>
+ <tr>
+ <th align="right" nowrap>| . $locale->text('Cc') . qq|</th>
+ <td><input name="cc" size="30" value="| .
+ Q($form->{"cc"}) . qq|"></td>
+ </tr>
+ $bcc
+ <tr>
+ <th align="right" nowrap>| . $locale->text('Subject') . qq|</th>
+ <td><input name="subject" size="30" value="| .
+ Q($form->{"subject"}) . qq|"></td>
+ </tr>
+ <tr>
+ <th align="right" nowrap>| . $locale->text('Attachment name') .
+ qq|</th>
+ <td><input name="attachment_filename" size="30" value="| .
+ Q($attachment_filename) . qq|"></td>
</table>
</td>
</tr>
<tr>
<td>
- <table width=100%>
- <tr>
- <th align=left nowrap>| . $locale->text('Message') . qq|</th>
- </tr>
- <tr>
- <td><textarea name=message rows=15 cols=60 wrap=soft>$form->{message}</textarea></td>
- </tr>
+ <table>
+ <tr>
+ <th align="left" nowrap>| . $locale->text('Message') . qq|</th>
+ </tr>
+ <tr>
+ <td><textarea name="message" rows="15" cols="60" wrap="soft">| .
+ H($form->{"message"}) . qq|</textarea></td>
+ </tr>
</table>
</td>
</tr>
# save all other variables
foreach $key (keys %$form) {
$form->{$key} =~ s/\"/"/g;
- print qq|<input type=hidden name=$key value="$form->{$key}">\n|;
+ print qq|<input type="hidden" name="$key" value="| . Q($form->{$key}) . qq|">\n|;
}
print qq|
</td>
</tr>
<tr>
- <td><hr size=3 noshade></td>
+ <td><hr size="3" noshade></td>
</tr>
</table>
-<input type=hidden name=nextsub value=send_email>
+<input type="hidden" name="nextsub" value="send_email">
<br>
-<input name=action class=submit type=submit value="|
+<input name="action" class="submit" type="submit" value="|
. $locale->text('Continue') . qq|">
</form>
$myconfig{"copies"} ? $myconfig{"copies"} :
3;
+ $form->{"media"} =
+ $form->{"media"} ? $form->{"media"} :
+ $myconfig{"default_media"} ? $myconfig{"default_media"} :
+ "screen";
+
+ $form->{"printer_id"} =
+ defined($form->{"printer_id"}) ? $form->{"printer_id"} :
+ $myconfig{"default_printer_id"} ? $myconfig{"default_printer_id"} :
+ "";
+
$form->{PD}{ $form->{formname} } = "selected";
$form->{DF}{ $form->{format} } = "selected";
$form->{OP}{ $form->{media} } = "selected";
. $locale->text('Credit Note');
}
- if ($form->{type} eq 'ship_order') {
- $type = qq|<select name=formname>
- <option value=pick_list $form->{PD}{pick_list}>|
- . $locale->text('Pick List') . qq|
- <option value=packing_list $form->{PD}{packing_list}>|
- . $locale->text('Packing List');
- }
-
- if ($form->{type} eq 'receive_order') {
- $type = qq|<select name=formname>
- <option value=bin_list $form->{PD}{bin_list}>|
- . $locale->text('Bin List');
- }
-
if ($form->{media} eq 'email') {
$media = qq|<select name=sendmode>
<option value=attachment $form->{SM}{attachment}>|
}
if (scalar(keys (%{ $form->{printers} })) !=0) {
-
- $printer_select = qq|<select name=printer_id>
+ my $selected = !$form->{"printer_id"} ? "selected" : "";
+ $printer_select = qq|<select name=printer_id $selected>
<option value=""></option>|;
foreach $item (@{ $form->{printers} }) {
- $printer_select .= qq|<option value="$item->{id}">$item->{printer_description}</option>|;
+ $selected = $item->{"id"} == $form->{"printer_id"} ? "selected" : "";
+ $printer_select .= qq|<option value="$item->{id}" $selected>$item->{printer_description}</option>|;
}
}
}
$form->{groupitems} = "checked" if $form->{groupitems};
+ $form->{remove_draft} = "checked" if $form->{remove_draft};
print qq|
<td>| . $locale->text('Group Items') . qq|</td>
- <td><input name=groupitems type=checkbox class=checkbox $form->{groupitems}></td>
+ <td><input name=groupitems type=checkbox class=checkbox $form->{groupitems}></td>|;
+
+ print qq|
+ <td>| . $locale->text('Remove Draft') . qq|</td>
+ <td><input name=remove_draft type=checkbox class=checkbox $form->{remove_draft}></td>| if (!$form->{id} && $form->{draft_id});
+ print qq|
</tr>
</table>
</td>
if (($form->{type} eq 'invoice') && ($form->{formname} eq 'proforma') ) {
$inv = "inv";
$due = "due";
- $form->{"${inv}date"} = $form->{transdate};
- $form->{"invdate"} = $form->{transdate};
+ $form->{"${inv}date"} = $form->{invdate};
$form->{label} = $locale->text('Proforma Invoice');
$numberfld = "sonumber";
$order = 0;
$inv = "quo";
$due = "req";
$form->{"${inv}date"} = $form->{transdate};
- $form->{"invdate"} = $form->{transdate};
+ $form->{"invdate"} = $form->{transdate};
$form->{label} = $locale->text('Proforma Invoice');
$numberfld = "sqnumber";
$order = 1;
$form->isblank("email", $locale->text('E-mail address missing!'))
if ($form->{media} eq 'email');
$form->isblank("${inv}date",
- $locale->text($form->{label} . ' Date missing!'));
+ $locale->text($form->{label})
+ . ": "
+ . $locale->text(' Date missing!'));
# $locale->text('Invoice Number missing!')
# $locale->text('Invoice Date missing!')
# $locale->text('Quotation Date missing!')
# assign number
- if (!$form->{"${inv}number"} && !$form->{preview}) {
+ $form->{what_done} = $form->{formname};
+ if (!$form->{"${inv}number"} && !$form->{preview} && !$form->{id}) {
$form->{"${inv}number"} = $form->update_defaults(\%myconfig, $numberfld);
if ($form->{media} ne 'email') {
$form->{rowcount}--;
&{"$display_form"};
+ # saving the history
+ if(!exists $form->{addition}) {
+ $form->{addition} = "PRINTED";
+ $form->save_history($form->dbconnect(\%myconfig));
+ }
+ # /saving the history
exit;
}
}
$language_saved = $form->{language_id};
$payment_id_saved = $form->{payment_id};
- &{"$form->{vc}_details"};
+ &{"$form->{vc}_details"}();
$form->{language_id} = $language_saved;
$form->{payment_id} = $payment_id_saved;
}
($form->{employee}) = split /--/, $form->{employee};
- ($form->{warehouse}, $form->{warehouse_id}) = split /--/, $form->{warehouse};
# create the form variables
if ($order) {
}
$queued = $form->{queued};
+# saving the history
+ if(!exists $form->{addition}) {
+ if($form->{media} =~ /printer/) {
+ $form->{addition} = "PRINTED";
+ }
+ elsif($form->{media} =~ /email/) {
+ $form->{addition} = "MAILED";
+ }
+ elsif($form->{media} =~ /queue/) {
+ $form->{addition} = "QUEUED";
+ }
+ elsif($form->{media} =~ /screen/) {
+ $form->{addition} = "SCREENED";
+ }
+ $form->save_history($form->dbconnect(\%myconfig));
+ }
+ # /saving the history
+
$form->parse_template(\%myconfig, $userspath);
$form->{callback} = "";
$lxdebug->leave_sub();
}
-
sub set_duedate {
$lxdebug->enter_sub();
projects / kivitendo-erp.git / blobdiff