Revision 411c4ff7
Von Tamino Steinert vor mehr als 1 Jahr hinzugefügt
SL/AP.pm | ||
---|---|---|
646 | 646 |
$where .= " AND a.taxzone_id = ?"; |
647 | 647 |
push(@values, $form->{taxzone_id}); |
648 | 648 |
} |
649 |
if ($form->{payment_id}) { |
|
650 |
$where .= " AND a.payment_id = ?"; |
|
651 |
push(@values, $form->{payment_id}); |
|
652 |
} |
|
649 | 653 |
if ($form->{transaction_description}) { |
650 | 654 |
$where .= " AND a.transaction_description ILIKE ?"; |
651 | 655 |
push(@values, like($form->{transaction_description})); |
SL/AR.pm | ||
---|---|---|
605 | 605 |
$where .= " AND a.taxzone_id = ?"; |
606 | 606 |
push(@values, $form->{taxzone_id}); |
607 | 607 |
} |
608 |
if ($form->{payment_id}) { |
|
609 |
$where .= " AND a.payment_id = ?"; |
|
610 |
push(@values, $form->{payment_id}); |
|
611 |
} |
|
608 | 612 |
foreach my $column (qw(invnumber ordnumber cusordnumber notes transaction_description shipvia shippingpoint)) { |
609 | 613 |
if ($form->{$column}) { |
610 | 614 |
$where .= " AND a.$column ILIKE ?"; |
bin/mozilla/ap.pl | ||
---|---|---|
999 | 999 |
|
1000 | 1000 |
$::form->{ALL_DEPARTMENTS} = SL::DB::Manager::Department->get_all_sorted; |
1001 | 1001 |
$::form->{ALL_TAXZONES} = SL::DB::Manager::TaxZone ->get_all_sorted; |
1002 |
$::form->{ALL_PAYMENT_TERMS} = SL::DB::Manager::PaymentTerm->get_all_sorted; |
|
1002 | 1003 |
|
1003 | 1004 |
# constants and subs for template |
1004 | 1005 |
$form->{vc_keys} = sub { "$_[0]->{name}--$_[0]->{id}" }; |
... | ... | |
1058 | 1059 |
my @hidden_variables = map { "l_${_}" } @columns; |
1059 | 1060 |
push @hidden_variables, "l_subtotal", qw(open closed vendor invnumber ordnumber transaction_description notes project_id |
1060 | 1061 |
transdatefrom transdateto duedatefrom duedateto datepaidfrom datepaidto |
1061 |
parts_partnumber parts_description department_id taxzone_id); |
|
1062 |
parts_partnumber parts_description department_id taxzone_id payment_id);
|
|
1062 | 1063 |
|
1063 | 1064 |
my $href = build_std_url('action=ap_transactions', grep { $form->{$_} } @hidden_variables); |
1064 | 1065 |
|
... | ... | |
1134 | 1135 |
push @options, $locale->text('Date Paid') . " " . $locale->text('to') . " " . $locale->date(\%myconfig, $form->{datepaidto}, 1) if ($form->{datepaidto}); |
1135 | 1136 |
push @options, $locale->text('Open') if ($form->{open}); |
1136 | 1137 |
push @options, $locale->text('Closed') if ($form->{closed}); |
1138 |
if ($form->{payment_id}) { |
|
1139 |
my $payment_term = SL::DB::Manager::PaymentTerm->find_by( id => $form->{payment_id} ); |
|
1140 |
push @options, $locale->text('Payment Term') . " : " . $payment_term->description; |
|
1141 |
} |
|
1137 | 1142 |
|
1138 | 1143 |
$report->set_options('top_info_text' => join("\n", @options), |
1139 | 1144 |
'output_format' => 'HTML', |
bin/mozilla/ar.pl | ||
---|---|---|
978 | 978 |
$form->{ALL_DEPARTMENTS} = SL::DB::Manager::Department->get_all_sorted; |
979 | 979 |
$form->{ALL_BUSINESS_TYPES} = SL::DB::Manager::Business ->get_all_sorted; |
980 | 980 |
$form->{ALL_TAXZONES} = SL::DB::Manager::TaxZone ->get_all_sorted; |
981 |
$form->{ALL_PAYMENT_TERMS} = SL::DB::Manager::PaymentTerm->get_all_sorted; |
|
981 | 982 |
|
982 | 983 |
$form->{CT_CUSTOM_VARIABLES} = CVar->get_configs('module' => 'CT'); |
983 | 984 |
($form->{CT_CUSTOM_VARIABLES_FILTER_CODE}, |
... | ... | |
1055 | 1056 |
push @hidden_variables, "l_subtotal", qw(open closed customer invnumber ordnumber cusordnumber transaction_description notes project_id |
1056 | 1057 |
transdatefrom transdateto duedatefrom duedateto datepaidfrom datepaidto |
1057 | 1058 |
employee_id salesman_id business_id parts_partnumber parts_description department_id show_marked_as_closed show_not_mailed |
1058 |
shippingpoint shipvia taxzone_id); |
|
1059 |
shippingpoint shipvia taxzone_id payment_id);
|
|
1059 | 1060 |
push @hidden_variables, map { "cvar_$_->{name}" } @ct_searchable_custom_variables; |
1060 | 1061 |
|
1061 | 1062 |
$href = $params{want_binary_pdf} ? '' : build_std_url('action=ar_transactions', grep { $form->{$_} } @hidden_variables); |
... | ... | |
1154 | 1155 |
if ($form->{transaction_description}) { |
1155 | 1156 |
push @options, $locale->text('Transaction description') . " : $form->{transaction_description}"; |
1156 | 1157 |
} |
1158 |
if ($form->{payment_id}) { |
|
1159 |
my $payment_term = SL::DB::Manager::PaymentTerm->find_by( id => $form->{payment_id} ); |
|
1160 |
push @options, $locale->text('Payment Term') . " : " . $payment_term->description; |
|
1161 |
} |
|
1157 | 1162 |
if ($form->{parts_partnumber}) { |
1158 | 1163 |
push @options, $locale->text('Part Number') . " : $form->{parts_partnumber}"; |
1159 | 1164 |
} |
locale/de/all | ||
---|---|---|
2679 | 2679 |
'Payment / Delivery Options' => 'Zahlungs- und Lieferoptionen', |
2680 | 2680 |
'Payment Date' => 'Leistungsdatum', |
2681 | 2681 |
'Payment Reminder' => 'Zahlungserinnerung', |
2682 |
'Payment Term' => 'Zahlungsbedingung', |
|
2682 | 2683 |
'Payment Terms' => 'Zahlungsbedingungen', |
2683 | 2684 |
'Payment Terms missing in row ' => 'Zahlungsfrist fehlt in Zeile ', |
2684 | 2685 |
'Payment bookings disallowed. After the booking this record may be suggested with the amount of \'#1\' or otherwise has to be choosen manually. No automatic payment booking will be done to chart \'#2\'.' => 'Zahlungsbuchungen nicht erlaubt. Nach der Verbuchung kann dieser Beleg in der Vorschlagsliste mit dem Zahlungs-Betrag von \'#1\' erscheinen, ansonsten muss dieser manuell verknüpft werden. Es wird nicht automatisch eine Zahlungsbuchung auf das Konto \'#2\' durchgeführt.', |
templates/design40_webpages/ap/search.html | ||
---|---|---|
78 | 78 |
<th>[% 'Steuersatz' | $T8 %]</th> |
79 | 79 |
<td>[% L.select_tag('taxzone_id', ALL_TAXZONES, with_empty=1, title_key='description', class="wi-normal") %]</td> |
80 | 80 |
</tr> |
81 |
<tr> |
|
82 |
<th>[% 'Payment Term' | $T8 %]</th> |
|
83 |
<td>[% L.select_tag('payment_id', ALL_PAYMENT_TERMS, with_empty=1, title_key='description', class="wi-normal") %]</td> |
|
84 |
</tr> |
|
81 | 85 |
</tbody> |
82 | 86 |
</table> |
83 | 87 |
|
templates/design40_webpages/ar/search.html | ||
---|---|---|
43 | 43 |
<th>[% 'Transaction description' | $T8 %]</th> |
44 | 44 |
<td>[% L.input_tag("transaction_description", "") %]</td> |
45 | 45 |
</tr> |
46 |
<tr> |
|
47 |
<th>[% 'Payment Term' | $T8 %]</th> |
|
48 |
<td>[% L.select_tag('payment_id', ALL_PAYMENT_TERMS, title_key = 'description', with_empty = 1) %]</td> |
|
49 |
</tr> |
|
46 | 50 |
<tr> |
47 | 51 |
<th>[% 'Notes' | $T8 %]</th> |
48 | 52 |
<td>[% L.input_tag("notes", "") %]</td> |
templates/webpages/ap/search.html | ||
---|---|---|
34 | 34 |
<th align="right">[% 'Steuersatz' | $T8 %]</th> |
35 | 35 |
<td>[% L.select_tag('taxzone_id', ALL_TAXZONES, with_empty=1, title_key='description', style=style) %]</td> |
36 | 36 |
</tr> |
37 |
<tr> |
|
38 |
<th align="right" nowrap>[% 'Payment Term' | $T8 %]</th> |
|
39 |
<td>[% L.select_tag('payment_id', ALL_PAYMENT_TERMS, with_empty=1, title_key='description', style=style) %]</td> |
|
40 |
</tr> |
|
37 | 41 |
<tr> |
38 | 42 |
<th align="right" nowrap>[% 'Transaction description' | $T8 %]</th> |
39 | 43 |
<td>[% L.input_tag("transaction_description", "", style=style) %]</td> |
templates/webpages/ar/search.html | ||
---|---|---|
65 | 65 |
<th align="right">[% 'Ship via' | $T8 %]</th> |
66 | 66 |
<td>[% L.input_tag("shipvia", "", style=style) %]</td> |
67 | 67 |
</tr> |
68 |
<tr> |
|
69 |
<th align="right" nowrap>[% 'Payment Term' | $T8 %]</th> |
|
70 |
<td>[% L.select_tag('payment_id', ALL_PAYMENT_TERMS, with_empty=1, title_key="description", style=style) %]</td> |
|
71 |
</tr> |
|
68 | 72 |
<tr> |
69 | 73 |
<th align="right">[% 'Project Number' | $T8 %]</th> |
70 | 74 |
<td>[% P.project.picker("project_id", project_id, active="both", valid="both", style=style) %]</td> |
Auch abrufbar als: Unified diff
Rechnungsbericht VK und EK nach Zahlungsbedingung filtern können