"all" => 0,
"old_id" => \@old_project_ids
},
- "employees" => "ALL_EMPLOYEES",
- "salesmen" => "ALL_SALESMEN",
- "taxzones" => "ALL_TAXZONES",
- "payments" => "ALL_PAYMENTS",
- "currencies" => "ALL_CURRENCIES",
- $vc => "ALL_" . uc($vc));
+ "employees" => "ALL_EMPLOYEES",
+ "salesmen" => "ALL_SALESMEN",
+ "taxzones" => "ALL_TAXZONES",
+ "payments" => "ALL_PAYMENTS",
+ "currencies" => "ALL_CURRENCIES",
+ $vc => "ALL_" . uc($vc),
+ "price_factors" => "ALL_PRICE_FACTORS");
my %labels;
my @values = (undef);
</td><input type=hidden name="select$form->{vc}" value="| .
Q($form->{"select$form->{vc}"}) . qq|">|;
+ if ($form->{vc} eq 'customer') {
+ $vc .= qq|<input type="hidden" name="customer_klass" value="$form->{customer_klass}">|;
+ }
+
%labels = ();
@values = ("");
foreach my $item (@{ $form->{"ALL_PAYMENTS"} }) {
</td>
</tr> | if $form->{selectdepartment};
- if ($form->{type} eq 'sales_order') {
- $employee .= qq|\n<input type="hidden" name="customer_klass" value="$form->{customer_klass}">| if $form->{selectemployee};
- } else {
- $employee .= qq|\n<input type="hidden" name="customer_klass" value="$form->{customer_klass}">|;
- }
-
$credittext = $locale->text('Credit Limit exceeded!!!');
$onload = ($form->{resubmit} && ($form->{format} eq "html")) ? "window.open('about:blank','Beleg'); document.oe.target = 'Beleg';document.oe.submit()"
map { $form->{"${_}_$i"} = $form->{item_list}[0]{$_} } keys %{ $form->{item_list}[0] };
$form->{payment_id} = $form->{"part_payment_id_$i"} if $form->{"part_payment_id_$i"} ne "";
+ $form->{"marge_price_factor_$i"} = $form->{item_list}->[0]->{price_factor};
+
($sellprice || $form->{"sellprice_$i"}) =~ /\.(\d+)/;
$decimalplaces = max 2, length $1;
my $vc = $form->{vc} eq "customer" ? "customers" : "vendors";
- $form->get_lists("projects" => { "key" => "ALL_PROJECTS",
- "all" => 1 },
+ $form->get_lists("projects" => { "key" => "ALL_PROJECTS",
+ "all" => 1 },
"employees" => "ALL_EMPLOYEES",
- $vc => "ALL_" . uc($vc));
+ "salesmen" => "ALL_SALESMEN",
+ $vc => "ALL_" . uc($vc)
+ );
my %labels = ();
my @values = ("");
push(@values, $item->{"id"});
$labels{$item->{"id"}} = $item->{"name"} ne "" ? $item->{"name"} : $item->{"login"};
}
+
+ #salesmen
+ my %labels_salesmen = ();
+ my @values_salesmen = ('');
+ foreach my $item (@{ $form->{"ALL_SALESMEN"} }) {
+ push(@values_salesmen, $item->{"id"});
+ $labels_salesmen{$item->{"id"}} = $item->{"name"} ne "" ? $item->{"name"} : $item->{"login"};
+ }
my $employee_block = qq|
<tr>
'-values' => \@values,
'-labels' => \%labels)) . qq|
</td>
+ </tr>
+ <tr>
+ <th align="right">| . $locale->text('Salesman') . qq|</th>
+ <td>| .
+ NTI($cgi->popup_menu('-name' => 'salesman_id',
+ '-values' => \@values_salesmen,
+ '-labels' => \%labels_salesmen)) . qq|
+ </td>
</tr>|;
%labels = ();
<tr>
<td><input name="l_name" class=checkbox type=checkbox value=Y checked> $vc_label</td>
<td><input name="l_employee" class=checkbox type=checkbox value=Y checked> $employee</td>
+
<td><input name="l_shipvia" class=checkbox type=checkbox value=Y> |
. $locale->text('Ship via') . qq|</td>
</tr>
<tr>
<td><input name="l_subtotal" class=checkbox type=checkbox value=Y> |
. $locale->text('Subtotal') . qq|</td>
+ <td><input name="l_salesman" class="checkbox" type="checkbox" value="Y"> |
+ . $locale->text('Salesman') . qq|</td>
</tr>
</table>
</td>
"name", "netamount",
"tax", "amount",
"curr", "employee",
+ "salesman",
"shipvia", "globalprojectnumber",
"transaction_description", "open",
"delivered", "marge_total", "marge_percent"
my @hidden_variables = map { "l_${_}" } @columns;
push @hidden_variables, "l_subtotal", $form->{vc}, qw(l_closed l_notdelivered open closed delivered notdelivered ordnumber quonumber
- transaction_description transdatefrom transdateto type vc employee_id);
+ transaction_description transdatefrom transdateto type vc employee_id salesman_id);
my $href = build_std_url('action=orders', grep { $form->{$_} } @hidden_variables);
'tax' => { 'text' => $locale->text('Tax'), },
'amount' => { 'text' => $locale->text('Total'), },
'curr' => { 'text' => $locale->text('Curr'), },
- 'employee' => { 'text' => $locale->text('Salesperson'), },
+ 'employee' => { 'text' => $locale->text('Employee'), },
+ 'salesman' => { 'text' => $locale->text('Salesman'), },
'shipvia' => { 'text' => $locale->text('Ship via'), },
'globalprojectnumber' => { 'text' => $locale->text('Project Number'), },
'transaction_description' => { 'text' => $locale->text('Transaction description'), },
'marge_percent' => { 'text' => $locale->text('Ertrag prozentual'), }
);
- foreach my $name (qw(id transdate reqdate quonumber ordnumber name employee shipvia)) {
+ foreach my $name (qw(id transdate reqdate quonumber ordnumber name employee salesman shipvia)) {
$column_defs{$name}->{link} = $href . "&sort=$name";
}