Revision a809ab0a
Von Bernd Bleßmann vor mehr als 9 Jahren hinzugefügt
SL/OE.pm | ||
---|---|---|
109 | 109 |
qq| o.closed, o.delivered, o.quonumber, o.cusordnumber, o.shippingpoint, o.shipvia, | . |
110 | 110 |
qq| o.transaction_description, | . |
111 | 111 |
qq| o.marge_total, o.marge_percent, | . |
112 |
qq| o.itime::DATE AS insertdate, | . |
|
112 | 113 |
qq| ex.$rate AS exchangerate, | . |
113 | 114 |
qq| pr.projectnumber AS globalprojectnumber, | . |
114 | 115 |
qq| e.name AS employee, s.name AS salesman, | . |
... | ... | |
230 | 231 |
push(@values, conv_date($form->{reqdateto})); |
231 | 232 |
} |
232 | 233 |
|
234 |
if($form->{insertdatefrom}) { |
|
235 |
$query .= qq| AND o.itime::DATE >= ?|; |
|
236 |
push(@values, conv_date($form->{insertdatefrom})); |
|
237 |
} |
|
238 |
|
|
239 |
if($form->{insertdateto}) { |
|
240 |
$query .= qq| AND o.itime::DATE <= ?|; |
|
241 |
push(@values, conv_date($form->{insertdateto})); |
|
242 |
} |
|
243 |
|
|
233 | 244 |
if ($form->{shippingpoint}) { |
234 | 245 |
$query .= qq| AND o.shippingpoint ILIKE ?|; |
235 | 246 |
push(@values, '%' . $form->{shippingpoint} . '%'); |
... | ... | |
285 | 296 |
"shipvia" => "o.shipvia", |
286 | 297 |
"transaction_description" => "o.transaction_description", |
287 | 298 |
"shippingpoint" => "o.shippingpoint", |
299 |
"insertdate" => "o.itime", |
|
288 | 300 |
"taxzone" => "tz.description", |
289 | 301 |
); |
290 | 302 |
if ($form->{sort} && grep($form->{sort}, keys(%allowed_sort_columns))) { |
... | ... | |
889 | 901 |
o.closed, o.reqdate, o.quonumber, o.department_id, o.cusordnumber, |
890 | 902 |
d.description AS department, o.payment_id, o.language_id, o.taxzone_id, |
891 | 903 |
o.delivery_customer_id, o.delivery_vendor_id, o.proforma, o.shipto_id, |
892 |
o.globalproject_id, o.delivered, o.transaction_description, o.delivery_term_id |
|
893 |
, o.order_probability, o.expected_billing_date |
|
904 |
o.globalproject_id, o.delivered, o.transaction_description, o.delivery_term_id,
|
|
905 |
o.itime::DATE AS insertdate, o.order_probability, o.expected_billing_date
|
|
894 | 906 |
FROM oe o |
895 | 907 |
JOIN ${vc} cv ON (o.${vc}_id = cv.id) |
896 | 908 |
LEFT JOIN employee e ON (o.employee_id = e.id) |
bin/mozilla/oe.pl | ||
---|---|---|
847 | 847 |
"marge_total", "marge_percent", |
848 | 848 |
"vcnumber", "ustid", |
849 | 849 |
"country", "shippingpoint", |
850 |
"taxzone", |
|
850 |
"taxzone", "insertdate",
|
|
851 | 851 |
"order_probability", "expected_billing_date", "expected_netamount", |
852 | 852 |
); |
853 | 853 |
|
... | ... | |
889 | 889 |
push @hidden_variables, "l_subtotal", $form->{vc}, qw(l_closed l_notdelivered open closed delivered notdelivered ordnumber quonumber cusordnumber |
890 | 890 |
transaction_description transdatefrom transdateto type vc employee_id salesman_id |
891 | 891 |
reqdatefrom reqdateto projectnumber project_id periodic_invoices_active periodic_invoices_inactive |
892 |
business_id shippingpoint taxzone_id reqdate_unset_or_old |
|
892 |
business_id shippingpoint taxzone_id reqdate_unset_or_old insertdatefrom insertdateto
|
|
893 | 893 |
order_probability_op order_probability_value expected_billing_date_from expected_billing_date_to); |
894 | 894 |
|
895 | 895 |
my @keys_for_url = grep { $form->{$_} } @hidden_variables; |
... | ... | |
928 | 928 |
'periodic_invoices' => { 'text' => $locale->text('Per. Inv.'), }, |
929 | 929 |
'shippingpoint' => { 'text' => $locale->text('Shipping Point'), }, |
930 | 930 |
'taxzone' => { 'text' => $locale->text('Steuersatz'), }, |
931 |
'insertdate' => { 'text' => $locale->text('Insert Date'), }, |
|
931 | 932 |
'order_probability' => { 'text' => $locale->text('Order probability'), }, |
932 | 933 |
'expected_billing_date' => { 'text' => $locale->text('Exp. bill. date'), }, |
933 | 934 |
'expected_netamount' => { 'text' => $locale->text('Exp. netamount'), }, |
934 | 935 |
); |
935 | 936 |
|
936 |
foreach my $name (qw(id transdate reqdate quonumber ordnumber cusordnumber name employee salesman shipvia transaction_description shippingpoint taxzone)) { |
|
937 |
foreach my $name (qw(id transdate reqdate quonumber ordnumber cusordnumber name employee salesman shipvia transaction_description shippingpoint taxzone insertdate)) {
|
|
937 | 938 |
my $sortdir = $form->{sort} eq $name ? 1 - $form->{sortdir} : $form->{sortdir}; |
938 | 939 |
$column_defs{$name}->{link} = $href . "&sort=$name&sortdir=$sortdir"; |
939 | 940 |
} |
... | ... | |
971 | 972 |
push @options, $locale->text('From') . " " . $locale->date(\%myconfig, $form->{reqdatefrom}, 1) if $form->{reqdatefrom}; |
972 | 973 |
push @options, $locale->text('Bis') . " " . $locale->date(\%myconfig, $form->{reqdateto}, 1) if $form->{reqdateto}; |
973 | 974 |
}; |
975 |
if ( $form->{insertdatefrom} or $form->{insertdateto} ) { |
|
976 |
push @options, $locale->text('Insert Date'); |
|
977 |
push @options, $locale->text('From') . " " . $locale->date(\%myconfig, $form->{insertdatefrom}, 1) if $form->{insertdatefrom}; |
|
978 |
push @options, $locale->text('Bis') . " " . $locale->date(\%myconfig, $form->{insertdateto}, 1) if $form->{insertdateto}; |
|
979 |
}; |
|
974 | 980 |
push @options, $locale->text('Open') if $form->{open}; |
975 | 981 |
push @options, $locale->text('Closed') if $form->{closed}; |
976 | 982 |
push @options, $locale->text('Delivery Order created') if $form->{delivered}; |
locale/de/all | ||
---|---|---|
1348 | 1348 |
'Information' => 'Information', |
1349 | 1349 |
'Initial version.' => 'Initiale Version.', |
1350 | 1350 |
'Insert' => 'Einfügen', |
1351 |
'Insert Date' => 'Erfassungsdatum', |
|
1351 | 1352 |
'Insert with new customer/vendor number' => 'Mit neuer Kunden-/Lieferantennummer anlegen', |
1352 | 1353 |
'Insert with new database ID' => 'Neu anlegen mit neuer Datenbank-ID', |
1353 | 1354 |
'Insert with new part number' => 'Mit neuer Artikelnummer einfügen', |
locale/en/all | ||
---|---|---|
1142 | 1142 |
'Increase' => '', |
1143 | 1143 |
'Individual Items' => '', |
1144 | 1144 |
'Information' => '', |
1145 |
'Insert Date' => '', |
|
1145 | 1146 |
'Insert with new customer/vendor number' => '', |
1146 | 1147 |
'Insert with new database ID' => '', |
1147 | 1148 |
'Insert with new part number' => '', |
templates/webpages/oe/form_header.html | ||
---|---|---|
233 | 233 |
[% L.date_tag('reqdate', reqdate, id='reqdate') %] |
234 | 234 |
</td> |
235 | 235 |
</tr> |
236 |
[%- IF is_sales_ord %] |
|
237 |
<tr> |
|
238 |
<th align="right" nowrap>[% 'Insert Date' | $T8 %]</th> |
|
239 |
<td>[% insertdate %]</td> |
|
240 |
</tr> |
|
241 |
[%- END %] |
|
236 | 242 |
<tr> |
237 | 243 |
<th width="70%" align="right" nowrap>[% 'Project Number' | $T8 %]</th> |
238 | 244 |
<td> |
templates/webpages/oe/search.html | ||
---|---|---|
126 | 126 |
[% L.date_tag('reqdateto') %] |
127 | 127 |
</td> |
128 | 128 |
</tr> |
129 |
|
|
130 |
[%- IF type == 'sales_order' %] |
|
131 |
<tr> |
|
132 |
<th align="right">[% 'Insert Date' | $T8 %] [% 'From' | $T8 %]</th> |
|
133 |
<td> |
|
134 |
[% L.date_tag('insertdatefrom') %] |
|
135 |
</td> |
|
136 |
<th align="right">[% 'Bis' | $T8 %]</th> |
|
137 |
<td> |
|
138 |
[% L.date_tag('insertdateto') %] |
|
139 |
</td> |
|
140 |
</tr> |
|
141 |
[%- END %] |
|
142 |
|
|
129 | 143 |
[%- IF type == 'sales_quotation' %] |
130 | 144 |
<tr> |
131 | 145 |
<th align="right">[% 'Expected billing date' | $T8 %] [% 'From' | $T8 %]</th> |
... | ... | |
206 | 220 |
<input name="l_reqdate" id="l_reqdate" class="checkbox" type="checkbox" value="Y" checked> |
207 | 221 |
<label for="l_reqdate">[% IF is_order %][% 'Required by' | $T8 %][% ELSE %][% 'Valid until' | $T8 %][% END %]</label> |
208 | 222 |
</td> |
223 |
[%- IF type == 'sales_order' %] |
|
224 |
<td> |
|
225 |
<input name="l_insertdate" id="l_insertdate" class="checkbox" type="checkbox" value="Y"> |
|
226 |
<label for="l_insertdate">[% 'Insert Date' | $T8 %]</label> |
|
227 |
</td> |
|
228 |
[%- END %] |
|
209 | 229 |
</tr> |
210 | 230 |
<tr> |
211 | 231 |
<td> |
Auch abrufbar als: Unified diff
Erfassungsdatum bei Auträgen.
In der Maske anzeigen; im Bericht anzeigen und danach filtern.
Conflicts:
Übernahme aus Kundenprojekt.