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
}
$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
<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);
quotation();
}
-sub e_mail {
+sub edit_e_mail {
$lxdebug->enter_sub();
if ($form->{second_run}) {
$form->{print_and_post} = 0;
}
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>
$lxdebug->leave_sub();
}
+# generate the printing options displayed at the bottom of oe and is forms.
+# this function will attempt to guess what type of form is displayed, and will generate according options
+#
+# about the coding:
+# this version builds the arrays of options pretty directly. if you have trouble understanding how,
+# the opthash function builds hashrefs which are then pieced together for the template arrays.
+# unneeded options are "undef"ed out, and then grepped out.
+#
+# the inline options is untested, but intended to be used later in metatemplating
sub print_options {
- $lxdebug->enter_sub();
- $form->{sendmode} = "attachment";
+ $lxdebug->enter_sub() and my ($inline) = @_;
- $form->{"format"} =
- $form->{"format"} ? $form->{"format"} :
- $myconfig{"template_format"} ? $myconfig{"template_format"} :
- "pdf";
+ # names 3 parameters and returns a hashref, for use in templates
+ sub opthash { +{ value => shift, selected => shift, oname => shift } }
+ (@FORMNAME, @FORMNAME, @LANGUAGE_ID, @FORMAT, @SENDMODE, @MEDIA, @PRINTER_ID, @SELECTS) = ();
- $form->{"copies"} =
- $form->{"copies"} ? $form->{"copies"} :
- $myconfig{"copies"} ? $myconfig{"copies"} :
- 3;
+ # note: "||"-selection is only correct for values where "0" is _not_ a correct entry
+ $form->{sendmode} = "attachment";
+ $form->{format} = $form->{format} || $myconfig{template_format} || "pdf";
+ $form->{copies} = $form->{copies} || $myconfig{copies} || 3;
+ $form->{media} = $form->{media} || $myconfig{default_media} || "screen";
+ $form->{printer_id} = $form->{printer_id} || $myconfig{default_printer_id} || "";
$form->{PD}{ $form->{formname} } = "selected";
$form->{DF}{ $form->{format} } = "selected";
$form->{OP}{ $form->{media} } = "selected";
- $form->{SM}{ $form->{sendmode} } = "selected";
-
- if ($form->{type} eq 'purchase_order') {
- $type = qq|<select name=formname>
- <option value=purchase_order $form->{PD}{purchase_order}>|
- . $locale->text('Purchase Order') . qq|
- <option value=bin_list $form->{PD}{bin_list}>|
- . $locale->text('Bin List');
- }
-
- if ($form->{type} eq 'credit_note') {
- $type = qq|<select name=formname>
- <option value=credit_note $form->{PD}{credit_note}>|
- . $locale->text('Credit Note');
- }
-
- if ($form->{type} eq 'sales_order') {
- $type = qq|<select name=formname>
- <option value=sales_order $form->{PD}{sales_order}>|
- . $locale->text('Confirmation') . qq|
- <option value=proforma $form->{PD}{proforma}>|
- . $locale->text('Proforma Invoice') . qq|
- <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} =~ /_quotation$/) {
- $type = qq|<select name=formname>
- <option value="$`_quotation" $form->{PD}{"$`_quotation"}>|
- . $locale->text('Quotation');
- }
-
- if ($form->{type} eq 'invoice') {
- $type = qq|<select name=formname>
- <option value=invoice $form->{PD}{invoice}>|
- . $locale->text('Invoice') . qq|
- <option value=proforma $form->{PD}{proforma}>|
- . $locale->text('Proforma Invoice') . qq|
- <option value=packing_list $form->{PD}{packing_list}>|
- . $locale->text('Packing List');
- }
-
- if ($form->{type} eq 'invoice' && $form->{storno}) {
- $type = qq|<select name=formname>
- <option value=storno_invoice $form->{PD}{storno_invoice}>|
- . $locale->text('Storno Invoice') . qq|
- <option value=storno_packing_list $form->{PD}{storno_packing_list}>|
- . $locale->text('Storno Packing List');
- }
-
- if ($form->{type} eq 'credit_note') {
- $type = qq|<select name=formname>
- <option value=credit_note $form->{PD}{credit_note}>|
- . $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');
- }
+ $form->{SM}{ $form->{formname} } = "selected";
+
+ push @FORMNAME, grep $_,
+ ($form->{type} eq 'purchase_order') ? (
+ opthash("purchase_order", $form->{PD}{purchase_order}, $locale->text('Purchase Order')),
+ opthash("bin_list", $form->{PD}{bin_list}, $locale->text('Bin List'))
+ ) : undef,
+ ($form->{type} eq 'credit_note') ?
+ opthash("credit_note", $form->{PD}{credit_note}, $locale->text('Credit Note')) : undef,
+ ($form->{type} eq 'sales_order') ? (
+ opthash("sales_order", $form->{PD}{sales_order}, $locale->text('Confirmation')),
+ opthash("proforma", $form->{PD}{proforma}, $locale->text('Proforma Invoice')),
+ opthash("pick_list", $form->{PD}{pick_list}, $locale->text('Pick List')),
+ opthash("packing_list", $form->{PD}{packing_list}, $locale->text('Packing List'))
+ ) : undef,
+ ($form->{type} =~ /_quotation$/) ?
+ opthash("$`_quotation", $form->{PD}{"$`_quotation"}, $locale->text('Quotation')) : undef,
+ ($form->{type} eq 'invoice') ? (
+ opthash("invoice", $form->{PD}{invoice}, $locale->text('Invoice')),
+ opthash("proforma", $form->{PD}{proforma}, $locale->text('Proforma Invoice')),
+ opthash("packing_list", $form->{PD}{packing_list}, $locale->text('Packing List'))
+ ) : undef,
+ ($form->{type} eq 'invoice' && $form->{storno}) ? (
+ opthash("storno_invoice", $form->{PD}{storno_invoice}, $locale->text('Storno Invoice')),
+ opthash("storno_packing_list", $form->{PD}{storno_packing_list}, $locale->text('Storno Packing List'))
+ ) : undef,
+ ($form->{type} eq 'credit_note') ?
+ opthash("credit_note", $form->{PD}{credit_note}, $locale->text('Credit Note')) : undef;
+
+ push @SENDMODE,
+ opthash("attachment", $form->{SM}{attachment}, $locale->text('Attachment')),
+ opthash("inline", $form->{SM}{inline}, $locale->text('In-line'))
+ if ($form->{media} eq 'email');
+
+ push @MEDIA, grep $_,
+ opthash("screen", $form->{OP}{screen}, $locale->text('Screen')),
+ (scalar keys %{ $form->{printers} } && $latex_templates) ?
+ opthash("printer", $form->{OP}{printer}, $locale->text('Printer')) : undef,
+ ($latex_templates) ?
+ opthash("queue", $form->{OP}{queue}, $locale->text('Queue')) : undef
+ if ($form->{media} ne 'email');
+
+ push @FORMAT, grep $_,
+ ($opendocument_templates && $openofficeorg_writer_bin && $xvfb_bin && (-x $openofficeorg_writer_bin) && (-x $xvfb_bin)) ?
+ opthash("opendocument_pdf", $form->{DF}{"opendocument_pdf"}, $locale->text("PDF (OpenDocument/OASIS)")) : undef,
+ ($latex_templates) ? (
+ opthash("pdf", $form->{DF}{pdf}, $locale->text('PDF')),
+ opthash("postscript", $form->{DF}{postscript}, $locale->text('Postscript'))
+ ) : undef,
+ opthash("html", $form->{DF}{html}, "HTML"),
+ ($opendocument_templates) ?
+ opthash("opendocument", $form->{DF}{opendocument}, $locale->text("OpenDocument/OASIS")) : undef;
+
+ push @LANGUAGE_ID,
+ map { opthash($_->{id}, ($_->{id} eq $form->{language} ? 'selected' : ''), $_->{description}) } +{}, @{ $form->{languages} }
+ if (ref $form->{languages} eq 'ARRAY');
+
+ push @PRINTER_ID,
+ map { opthash($_->{id}, ($_->{id} eq $form->{printer_id} ? 'selected' : ''), $_->{description}) } +{}, @{ $form->{printers} }
+ if (ref $form->{printers} eq 'ARRAY');
+
+ @SELECTS = map { sname => lc $_, DATA => \@$_, show => scalar @$_ }, qw(FORMNAME LANGUAGE_ID FORMAT SENDMODE MEDIA PRINTER_ID);
+
+ %template_vars = (
+ display_copies => scalar keys %{ $form->{printers} } && $latex_templates && $form->{media} ne 'email',
+ display_remove_draft => (!$form->{id} && $form->{draft_id}),
+ groupitems_checked => $form->{groupitems} ? "checked" : '',
+ remove_draft_checked => $form->{remove_draft} ? "checked" : ''
+ );
- if ($form->{type} eq 'receive_order') {
- $type = qq|<select name=formname>
- <option value=bin_list $form->{PD}{bin_list}>|
- . $locale->text('Bin List');
- }
+ my $print_options = $form->parse_html_template("generic/print_options", { SELECTS => \@SELECTS, %template_vars } );
- if ($form->{media} eq 'email') {
- $media = qq|<select name=sendmode>
- <option value=attachment $form->{SM}{attachment}>|
- . $locale->text('Attachment') . qq|
- <option value=inline $form->{SM}{inline}>| . $locale->text('In-line');
+ if ($inline) {
+ $lxdebug->leave_sub() and return $print_options;
} else {
- $media = qq|<select name=media>
- <option value=screen $form->{OP}{screen}>| . $locale->text('Screen');
- if (scalar(keys (%{ $form->{printers} })) !=0 && $latex_templates) {
- $media .= qq|
- <option value=printer $form->{OP}{printer}>|
- . $locale->text('Printer');
- }
- if ($latex_templates) {
- $media .= qq|
- <option value=queue $form->{OP}{queue}>| . $locale->text('Queue');
- }
+ print $print_options; $lxdebug->leave_sub();
}
-
- $format = qq|<select name=format>|;
- if ($opendocument_templates && $openofficeorg_writer_bin &&
- $xvfb_bin && (-x $openofficeorg_writer_bin) && (-x $xvfb_bin)) {
- $format .= qq|<option value=opendocument_pdf | .
- $form->{DF}{"opendocument_pdf"} . qq|>| .
- $locale->text("PDF (OpenDocument/OASIS)") . qq|</option>|;
- }
-
- if ($latex_templates) {
- $format .= qq|<option value=pdf $form->{DF}{pdf}>| .
- $locale->text('PDF') . qq|</option>|;
- }
-
- $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>|;
- }
-
- if ($opendocument_templates) {
- $format .= qq|<option value=opendocument $form->{DF}{opendocument}>| .
- $locale->text("OpenDocument/OASIS") . qq|</option>|;
- }
- $format .= qq|</select>|;
-
- if (scalar(keys (%{ $form->{languages} })) !=0) {
- $language_select = qq|<select name=language_id>
- <option value=""></option>}|;
- foreach $item (@{ $form->{languages} }) {
- if ($form->{language_id} eq $item->{id}) {
- $language_select .= qq|<option value="$item->{id}" selected>$item->{description}</option>|;
- } else {
- $language_select .= qq|<option value="$item->{id}">$item->{description}</option>|;
- }
- }
- }
-
- if (scalar(keys (%{ $form->{printers} })) !=0) {
-
- $printer_select = qq|<select name=printer_id>
- <option value=""></option>|;
- foreach $item (@{ $form->{printers} }) {
- $printer_select .= qq|<option value="$item->{id}">$item->{printer_description}</option>|;
- }
- }
-
-
-
- print qq|
-<table width=100% cellspacing=0 cellpadding=0>
- <tr>
- <td>
- <table>
- <tr>
- <td>$type</select></td>|;
- if (scalar(keys (%{ $form->{languages} })) !=0) {
- print qq|
- <td>${language_select}</select></td>|;
- }
- print qq|
- <td>$format</select></td>
- <td>$media</select></td>|;
- if (scalar(keys (%{ $form->{printers} })) !=0) {
- print qq|
- <td>$printer_select</select></td>
-|;
- }
-
- if (scalar(keys (%{ $form->{printers} })) !=0 && $latex_templates && $form->{media} ne 'email') {
- print qq|
- <td>| . $locale->text('Copies') . qq|
- <input name=copies size=2 value=$form->{copies}></td>
-|;
- }
-
- $form->{groupitems} = "checked" if $form->{groupitems};
-
- print qq|
- <td>| . $locale->text('Group Items') . qq|</td>
- <td><input name=groupitems type=checkbox class=checkbox $form->{groupitems}></td>
- </tr>
- </table>
- </td>
- <td align=right>
- <table>
- <tr>
-|;
-
- if ($form->{printed} =~ /$form->{formname}/) {
- print qq|
- <th>\|| . $locale->text('Printed') . qq|\|</th>
-|;
- }
-
- if ($form->{emailed} =~ /$form->{formname}/) {
- print qq|
- <th>\|| . $locale->text('E-mailed') . qq|\|</th>
-|;
- }
-
- if ($form->{queued} =~ /$form->{formname}/) {
- print qq|
- <th>\|| . $locale->text('Queued') . qq|\|</th>
-|;
- }
-
- print qq|
- </tr>
- </table>
- </td>
- </tr>
-</table>
-|;
-
- $lxdebug->leave_sub();
}
sub print {
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};
+ $salesman_id_saved = $form->{salesman_id};
&{"$form->{vc}_details"}();
}
($form->{employee}) = split /--/, $form->{employee};
- ($form->{warehouse}, $form->{warehouse_id}) = split /--/, $form->{warehouse};
# create the form variables
if ($order) {
IS->invoice_details(\%myconfig, \%$form, $locale);
}
+ $form->get_salesman(\%myconfig, $salesman_id_saved);
+
if ($form->{shipto_id}) {
$form->get_shipto(\%myconfig);
}
}
$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