Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision e059f9cf

Von Tamino Steinert vor mehr als 1 Jahr hinzugefügt

  • ID e059f9cf786f9c2a8a04d5e589e86775d6185f4d
  • Vorgänger 65f7a07e

Angebots-/Auftragsbericht: Lieferadresse anzeigen und filtern

Unterschiede anzeigen:

SL/OE.pm
qq| e.name AS employee, s.name AS salesman, | .
qq| ct.${vc}number AS vcnumber, ct.country, ct.ustid, ct.business_id, | .
qq| tz.description AS taxzone, | .
qq| shipto.shiptoname, shipto.shiptodepartment_1, shipto.shiptodepartment_2, | .
qq| shipto.shiptostreet, shipto.shiptozipcode, shipto.shiptocity, shipto.shiptocountry, | .
qq| order_statuses.name AS order_status | .
$periodic_invoices_columns .
$phone_notes_columns .
......
qq|LEFT JOIN tax_zones tz ON (o.taxzone_id = tz.id) | .
qq|LEFT JOIN department ON (o.department_id = department.id) | .
qq|LEFT JOIN order_statuses ON (o.order_status_id = order_statuses.id) | .
qq|LEFT JOIN shipto ON (
(o.shipto_id = shipto.shipto_id) or
(o.id = shipto.trans_id and shipto.module = 'OE')
)| .
qq|$periodic_invoices_joins | .
$phone_notes_join .
qq|WHERE (o.quotation = ?) | .
......
push @values, like($form->{parts_description});
}
if ($form->{shiptoname}) {
$query .= " AND shipto.shiptoname ILIKE ?";
push(@values, like($form->{shiptoname}));
}
if ($form->{shiptodepartment_1}) {
$query .= " AND shipto.shiptodepartment_1 ILIKE ?";
push(@values, like($form->{shiptodepartment_1}));
}
if ($form->{shiptodepartment_2}) {
$query .= " AND shipto.shiptodepartment_2 ILIKE ?";
push(@values, like($form->{shiptodepartment_2}));
}
if ($form->{shiptostreet}) {
$query .= " AND shipto.shiptostreet ILIKE ?";
push(@values, like($form->{shiptostreet}));
}
if ($form->{shiptozipcode}) {
$query .= " AND shipto.shiptozipcode ILIKE ?";
push(@values, like($form->{shiptozipcode}));
}
if ($form->{shiptocity}) {
$query .= " AND shipto.shiptocity ILIKE ?";
push(@values, like($form->{shiptocity}));
}
if ($form->{shiptocountry}) {
$query .= " AND shipto.shiptocountry ILIKE ?";
push(@values, like($form->{shiptocountry}));
}
if ($form->{all}) {
my @tokens = parse_line('\s+', 0, $form->{all});
# ordnumber quonumber customer.name vendor.name transaction_description
bin/mozilla/oe.pl
"order_probability", "expected_billing_date", "expected_netamount",
"payment_terms", "intnotes", "order_status",
"items",
"shiptoname", "shiptodepartment_1", "shiptodepartment_2", "shiptostreet",
"shiptozipcode", "shiptocity", "shiptocountry",
);
# only show checkboxes if gotten here via sales_order form.
......
push @columns, map { "cvar_$_->{name}" } @ct_includeable_custom_variables;
my @hidden_variables = map { "l_${_}" } @columns;
push @hidden_variables, "l_subtotal", $form->{vc}, qw(l_closed l_notdelivered open closed delivered notdelivered ordnumber quonumber cusordnumber
transaction_description transdatefrom transdateto type vc employee_id salesman_id
reqdatefrom reqdateto projectnumber project_id periodic_invoices_active periodic_invoices_inactive
business_id shippingpoint taxzone_id reqdate_unset_or_old insertdatefrom insertdateto
order_probability_op order_probability_value expected_billing_date_from expected_billing_date_to
parts_partnumber parts_description all department_id intnotes phone_notes fulltext order_status_id);
push @hidden_variables, "l_subtotal", $form->{vc}, qw(
l_closed l_notdelivered open closed delivered notdelivered ordnumber
quonumber cusordnumber transaction_description transdatefrom transdateto
type vc employee_id salesman_id reqdatefrom reqdateto projectnumber
project_id periodic_invoices_active periodic_invoices_inactive
business_id shippingpoint taxzone_id reqdate_unset_or_old insertdatefrom
insertdateto order_probability_op order_probability_value
expected_billing_date_from expected_billing_date_to parts_partnumber
parts_description all department_id intnotes phone_notes fulltext
order_status_id shiptoname shiptodepartment_1 shiptodepartment_2
shiptostreet shiptozipcode shiptocity shiptocountry
);
push @hidden_variables, map { "cvar_$_->{name}" } @ct_searchable_custom_variables;
my @keys_for_url = grep { $form->{$_} } @hidden_variables;
......
'intnotes' => { 'text' => $locale->text('Internal Notes'), },
'order_status' => { 'text' => $locale->text('Status'), },
'items' => { 'text' => $locale->text('Positions'), },
shiptoname => { 'text' => $locale->text('Name (Shipping)'), },
shiptodepartment_1 => { 'text' => $locale->text('Department 1 (Shipping)'), },
shiptodepartment_2 => { 'text' => $locale->text('Department 2 (Shipping)'), },
shiptostreet => { 'text' => $locale->text('Street (Shipping)'), },
shiptozipcode => { 'text' => $locale->text('Zipcode (Shipping)'), },
shiptocity => { 'text' => $locale->text('City (Shipping)'), },
shiptocountry => { 'text' => $locale->text('Country (Shipping)'), },
%column_defs_cvars,
);
......
push @options, $locale->text('Transaction description') . " : $form->{transaction_description}" if $form->{transaction_description};
push @options, $locale->text('Quick Search') . " : $form->{all}" if $form->{all};
push @options, $locale->text('Shipping Point') . " : $form->{shippingpoint}" if $form->{shippingpoint};
push @options, $locale->text('Name (Shipping)') . " : $form->{shiptoname}"
if $form->{shiptoname};
push @options, $locale->text('Department 1 (Shipping)') . " : $form->{shiptodepartment_1}"
if $form->{shiptodepartment_1};
push @options, $locale->text('Department 2 (Shipping)') . " : $form->{shiptodepartment_2}"
if $form->{shiptodepartment_2};
push @options, $locale->text('Street (Shipping)') . " : $form->{shiptostreet}"
if $form->{shiptostreet};
push @options, $locale->text('Zipcode (Shipping)') . " : $form->{shiptozipcode}"
if $form->{shiptozipcode};
push @options, $locale->text('City (Shipping)') . " : $form->{shiptocity}"
if $form->{shiptocity};
push @options, $locale->text('Country (Shipping)') . " : $form->{shiptocountry}"
if $form->{shiptocountry};
push @options, $locale->text('Part Description') . " : $form->{parts_description}" if $form->{parts_description};
push @options, $locale->text('Part Number') . " : $form->{parts_partnumber}" if $form->{parts_partnumber};
push @options, $locale->text('Phone Notes') . " : $form->{phone_notes}" if $form->{phone_notes};
templates/design40_webpages/oe/search.html
</tbody>
</table>
<table class="tbl-horizontal">
<caption>[% 'Shipping Address' | $T8 %]</caption>
<colgroup> <col class="wi-small"><col class="wi-wide"> </colgroup>
<tbody>
<tr>
<th>[% 'Name' | $T8 %]</th>
<td>[% L.input_tag("shiptoname", "", class="wi-normal") %]</td>
</tr>
<tr>
<th>[% 'Department 1' | $T8 %]</th>
<td>[% L.input_tag("shiptodepartment_1", "", class="wi-normal") %]</td>
</tr>
<tr>
<th>[% 'Department 2' | $T8 %]</th>
<td>[% L.input_tag("shiptodepartment_2", "", class="wi-normal") %]</td>
</tr>
<tr>
<th>[% 'Street' | $T8 %]</th>
<td>[% L.input_tag("shiptostreet", "", class="wi-normal") %]</td>
</tr>
<tr>
<th>[% 'Zipcode' | $T8 %]</th>
<td>[% L.input_tag("shiptozipcode", "", class="wi-normal") %]</td>
</tr>
<tr>
<th>[% 'City' | $T8 %]</th>
<td>[% L.input_tag("shiptocity", "", class="wi-normal") %]</td>
</tr>
<tr>
<th>[% 'Country' | $T8 %]</th>
<td>[% L.input_tag("shiptocountry", "", class="wi-normal") %]</td>
</tr>
</tbody>
</table>
<table class="tbl-horizontal">
<caption>[% 'Status' | $T8 %]</caption>
<tbody>
......
<label for="l_ustid">[% 'USt-IdNr.' | $T8 %]</label>
</div>
</div>
<div class="list col">
<h4>[% 'Shipping Address' | $T8 %]</h4>
<div>
<input name="l_shiptoname" id="l_shiptoname" type="checkbox"><label for="l_shiptoname">[% 'Name' | $T8 %]</label>
</div>
<div>
<input name="l_shiptodepartment_1" id="l_shiptodepartment_1" type="checkbox"><label for="l_shiptodepartment_1">[% 'Department 1' | $T8 %]</label>
</div>
<div>
<input name="l_shiptodepartment_2" id="l_shiptodepartment_2" type="checkbox"><label for="l_shiptodepartment_2">[% 'Department 2' | $T8 %]</label>
</div>
<div>
<input name="l_shiptostreet" id="l_shiptostreet" type="checkbox"><label for="l_shiptostreet">[% 'Street' | $T8 %]</label>
</div>
<div>
<input name="l_shiptozipcode" id="l_shiptozipcode" type="checkbox"><label for="l_shiptozipcode">[% 'Zipcode' | $T8 %]</label>
</div>
<div>
<input name="l_shiptocity" id="l_shiptocity" type="checkbox"><label for="l_shiptocity">[% 'City' | $T8 %]</label>
</div>
<div>
<input name="l_shiptocountry" id="l_shiptocountry" type="checkbox"><label for="l_shiptocountry">[% 'Country' | $T8 %]</label>
</div>
</div>
<div class="list col">
<h4>[% 'Taxes' | $T8 %]</h4>
<div>
templates/webpages/oe/search.html
<th align="right">[% 'Shipping Point' | $T8 %]</th>
<td>[% L.input_tag('shippingpoint', '', style=style) %]</td>
</tr>
<tr>
<th align=right nowarp>[% 'Name (Shipping)' | $T8 %]</th>
<td>[% L.input_tag("shiptoname", "", style=style) %]</td>
</tr>
<tr>
<th align=right nowarp>[% 'Department 1 (Shipping)' | $T8 %]</th>
<td>[% L.input_tag("shiptodepartment_1", "", style=style) %]</td>
</tr>
<tr>
<th align=right nowarp>[% 'Department 2 (Shipping)' | $T8 %]</th>
<td>[% L.input_tag("shiptodepartment_2", "", style=style) %]</td>
</tr>
<tr>
<th align=right nowarp>[% 'Street (Shipping)' | $T8 %]</th>
<td>[% L.input_tag("shiptostreet", "", style=style) %]</td>
</tr>
<tr>
<th align=right nowarp>[% 'Zipcode (Shipping)' | $T8 %]</th>
<td>[% L.input_tag("shiptozipcode", "", style=style) %]</td>
</tr>
<tr>
<th align=right nowarp>[% 'City (Shipping)' | $T8 %]</th>
<td>[% L.input_tag("shiptocity", "", style=style) %]</td>
</tr>
<tr>
<th align=right nowarp>[% 'Country (Shipping)' | $T8 %]</th>
<td>[% L.input_tag("shiptocountry", "", style=style) %]</td>
</tr>
<tr>
<th align="right">[% 'Transaction description' | $T8 %]</th>
<td>[% L.input_tag("transaction_description", "", style=style) %]</td>
......
<label for="l_ustid">[% 'USt-IdNr.' | $T8 %]</label>
</td>
</tr>
<tr>
<td colspan=4 align=left><b>[% 'Shipping Address' | $T8 %]</b></td>
</tr>
<tr>
<td>
<input name="l_shiptoname" id="l_shiptoname" type="checkbox" value="Y">
<label for="l_shiptoname">[% 'Name' | $T8 %]</label>
</td>
<td>
<input name="l_shiptodepartment_1" id="l_shiptodepartment_1" type="checkbox" value="Y">
<label for="l_shiptodepartment_1">[% 'Department 1' | $T8 %]</label>
</td>
<td>
<input name="l_shiptodepartment_2" id="l_shiptodepartment_2" type="checkbox" value="Y">
<label for="l_shiptodepartment_2">[% 'Department 2' | $T8 %]</label>
</td>
</tr>
<tr>
<td>
<input name="l_shiptostreet" id="l_shiptostreet" type="checkbox" value="Y">
<label for="l_shiptostreet">[% 'Street' | $T8 %]</label>
</td>
<td>
<input name="l_shiptozipcode" id="l_shiptozipcode" type="checkbox" value="Y">
<label for="l_shiptozipcode">[% 'Zipcode' | $T8 %]</label>
</td>
<td>
<input name="l_shiptocity" id="l_shiptocity" type="checkbox" value="Y">
<label for="l_shiptocity">[% 'City' | $T8 %]</label>
</td>
</tr>
<tr>
<td>
<input name="l_shiptocountry" id="l_shiptocountry" type="checkbox" value="Y">
<label for="l_shiptocountry">[% 'Country' | $T8 %]</label>
</td>
</tr>
[% CT_CUSTOM_VARIABLES_INCLUSION_CODE %]

Auch abrufbar als: Unified diff