Revision 984f6322
Von Bernd Bleßmann vor etwa 6 Jahren hinzugefügt
SL/Controller/CustomerVendor.pm | ||
---|---|---|
281 | 281 |
my $db = $self->is_vendor() ? 'vendor' : 'customer'; |
282 | 282 |
my $action = 'add'; |
283 | 283 |
|
284 |
if ($::instance_conf->get_feature_experimental && 'oe.pl' eq $script) { |
|
284 |
if ($::instance_conf->get_feature_experimental_order && 'oe.pl' eq $script) {
|
|
285 | 285 |
$script = 'controller.pl'; |
286 | 286 |
$action = 'Order/' . $action; |
287 | 287 |
} |
SL/Controller/DeliveryPlan.pm | ||
---|---|---|
369 | 369 |
my $vc = $object->is_sales ? 'customer' : 'vendor'; |
370 | 370 |
my $id = $object->id; |
371 | 371 |
|
372 |
if ($::instance_conf->get_feature_experimental) { |
|
372 |
if ($::instance_conf->get_feature_experimental_order) {
|
|
373 | 373 |
return "controller.pl?action=Order/$action&type=$type&id=$id"; |
374 | 374 |
} else { |
375 | 375 |
return "oe.pl?action=$action&type=$type&vc=$vc&id=$id"; |
SL/Controller/DeliveryValueReport.pm | ||
---|---|---|
231 | 231 |
my $vc = $object->is_sales ? 'customer' : 'vendor'; |
232 | 232 |
my $id = $object->id; |
233 | 233 |
|
234 |
if ($::instance_conf->get_feature_experimental) { |
|
234 |
if ($::instance_conf->get_feature_experimental_order) {
|
|
235 | 235 |
return "controller.pl?action=Order/$action&type=$type&id=$id"; |
236 | 236 |
} else { |
237 | 237 |
return "oe.pl?action=$action&type=$type&vc=$vc&id=$id"; |
SL/Controller/FinancialControllingReport.pm | ||
---|---|---|
278 | 278 |
my $type = $object->type; |
279 | 279 |
my $id = $object->id; |
280 | 280 |
|
281 |
if ($::instance_conf->get_feature_experimental) { |
|
281 |
if ($::instance_conf->get_feature_experimental_order) {
|
|
282 | 282 |
return "controller.pl?action=Order/$action&type=$type&id=$id"; |
283 | 283 |
} else { |
284 | 284 |
return "oe.pl?action=$action&type=$type&vc=customer&id=$id"; |
SL/Controller/SellPriceInformation.pm | ||
---|---|---|
140 | 140 |
my $vc = $object->is_sales ? 'customer' : 'vendor'; |
141 | 141 |
my $id = $object->id; |
142 | 142 |
|
143 |
if ($::instance_conf->get_feature_experimental) { |
|
143 |
if ($::instance_conf->get_feature_experimental_order) {
|
|
144 | 144 |
return "controller.pl?action=Order/$action&type=$type&id=$id"; |
145 | 145 |
} else { |
146 | 146 |
return "oe.pl?action=$action&type=$type&vc=$vc&id=$id"; |
SL/Controller/ShopOrder.pm | ||
---|---|---|
156 | 156 |
$self->shop_order->save; |
157 | 157 |
$self->shop_order->link_to_record($order); |
158 | 158 |
}) || die $order->db->error; |
159 |
my $order_controller = $::instance_conf->get_feature_experimental ? 'Order' :'oe.pl'; |
|
159 |
my $order_controller = $::instance_conf->get_feature_experimental_order ? 'Order' :'oe.pl';
|
|
160 | 160 |
$self->redirect_to(controller => $order_controller, action => 'edit', type => 'sales_order', vc => 'customer', id => $order->id); |
161 | 161 |
} |
162 | 162 |
} |
SL/Controller/TopQuickSearch/OERecord.pm | ||
---|---|---|
64 | 64 |
} |
65 | 65 |
|
66 | 66 |
sub redirect_to_object { |
67 |
if ($::instance_conf->get_feature_experimental) { |
|
67 |
if ($::instance_conf->get_feature_experimental_order) {
|
|
68 | 68 |
SL::Controller::Base->new->url_for( |
69 | 69 |
controller => 'Order', |
70 | 70 |
action => 'edit', |
SL/DB/MetaSetup/Default.pm | ||
---|---|---|
73 | 73 |
feature_datev => { type => 'boolean', default => 'true', not_null => 1 }, |
74 | 74 |
feature_erfolgsrechnung => { type => 'boolean', default => 'false', not_null => 1 }, |
75 | 75 |
feature_eurechnung => { type => 'boolean', default => 'true', not_null => 1 }, |
76 |
feature_experimental => { type => 'boolean', default => 'true', not_null => 1 }, |
|
76 |
feature_experimental_assortment => { type => 'boolean', default => 'true', not_null => 1 }, |
|
77 |
feature_experimental_order => { type => 'boolean', default => 'true', not_null => 1 }, |
|
77 | 78 |
feature_ustva => { type => 'boolean', default => 'true', not_null => 1 }, |
78 | 79 |
fxgain_accno_id => { type => 'integer' }, |
79 | 80 |
fxloss_accno_id => { type => 'integer' }, |
SL/FU.pm | ||
---|---|---|
338 | 338 |
} elsif ($params{trans_type} eq 'sales_quotation') { |
339 | 339 |
my $script = 'oe.pl'; |
340 | 340 |
my $action = 'edit'; |
341 |
if ($::instance_conf->get_feature_experimental) { |
|
341 |
if ($::instance_conf->get_feature_experimental_order) {
|
|
342 | 342 |
$script = 'controller.pl'; |
343 | 343 |
$action = 'Order/edit'; |
344 | 344 |
} |
... | ... | |
364 | 364 |
} elsif ($params{trans_type} eq 'sales_order') { |
365 | 365 |
my $script = 'oe.pl'; |
366 | 366 |
my $action = 'edit'; |
367 |
if ($::instance_conf->get_feature_experimental) { |
|
367 |
if ($::instance_conf->get_feature_experimental_order) {
|
|
368 | 368 |
$script = 'controller.pl'; |
369 | 369 |
$action = 'Order/edit'; |
370 | 370 |
} |
... | ... | |
400 | 400 |
} elsif ($params{trans_type} eq 'request_quotation') { |
401 | 401 |
my $script = 'oe.pl'; |
402 | 402 |
my $action = 'edit'; |
403 |
if ($::instance_conf->get_feature_experimental) { |
|
403 |
if ($::instance_conf->get_feature_experimental_order) {
|
|
404 | 404 |
$script = 'controller.pl'; |
405 | 405 |
$action = 'Order/edit'; |
406 | 406 |
} |
... | ... | |
412 | 412 |
} elsif ($params{trans_type} eq 'purchase_order') { |
413 | 413 |
my $script = 'oe.pl'; |
414 | 414 |
my $action = 'edit'; |
415 |
if ($::instance_conf->get_feature_experimental) { |
|
415 |
if ($::instance_conf->get_feature_experimental_order) {
|
|
416 | 416 |
$script = 'controller.pl'; |
417 | 417 |
$action = 'Order/edit'; |
418 | 418 |
} |
SL/InstanceConfiguration.pm | ||
---|---|---|
234 | 234 |
|
235 | 235 |
Returns the configuration for "vertreter" |
236 | 236 |
|
237 |
=item C<get_feature_experimental> |
|
237 |
=item C<get_feature_experimental_assortment>
|
|
238 | 238 |
|
239 |
Returns the configuration for experimental features |
|
239 |
Returns the configuration for experimental feature "assortment" |
|
240 |
|
|
241 |
=item C<get_feature_experimental_order> |
|
242 |
|
|
243 |
Returns the configuration for experimental feature "order" |
|
240 | 244 |
|
241 | 245 |
=item C<get_parts_show_image> |
242 | 246 |
|
SL/Presenter/Order.pm | ||
---|---|---|
45 | 45 |
my $link_start = ''; |
46 | 46 |
my $link_end = ''; |
47 | 47 |
unless ($params{no_link}) { |
48 |
my $action = $::instance_conf->get_feature_experimental |
|
48 |
my $action = $::instance_conf->get_feature_experimental_order
|
|
49 | 49 |
? 'controller.pl?action=Order/edit' |
50 | 50 |
: 'oe.pl?action=edit'; |
51 | 51 |
$link_start = '<a href="' . $action . '&type=' . $type . '&id=' . escape($order->id) . '">'; |
bin/mozilla/ct.pl | ||
---|---|---|
286 | 286 |
} |
287 | 287 |
|
288 | 288 |
my $base_url = build_std_url("script=$ref->{module}.pl", 'action=edit', 'id=' . E($ref->{invid}), 'callback', @hidden_nondefault); |
289 |
if ($::instance_conf->get_feature_experimental) { |
|
289 |
if ($::instance_conf->get_feature_experimental_order) {
|
|
290 | 290 |
if ('oe' eq $ref->{module}) { |
291 | 291 |
$base_url = build_std_url("script=controller.pl", 'action=Order/edit', 'id=' . E($ref->{invid}), 'callback', @hidden_nondefault); |
292 | 292 |
} |
bin/mozilla/do.pl | ||
---|---|---|
840 | 840 |
my $callback = $form->escape($href); |
841 | 841 |
|
842 | 842 |
my $edit_url = build_std_url('action=edit', 'type', 'vc'); |
843 |
my $edit_order_url = ($::instance_conf->get_feature_experimental) |
|
843 |
my $edit_order_url = ($::instance_conf->get_feature_experimental_order)
|
|
844 | 844 |
? build_std_url('script=controller.pl', 'action=Order/edit', 'type=' . ($form->{type} eq 'sales_delivery_order' ? 'sales_order' : 'purchase_order')) |
845 | 845 |
: build_std_url('script=oe.pl', 'action=edit', 'type=' . ($form->{type} eq 'sales_delivery_order' ? 'sales_order' : 'purchase_order')); |
846 | 846 |
|
bin/mozilla/ic.pl | ||
---|---|---|
541 | 541 |
# | ist bestellt | Von Kunden bestellt | -> edit_oe_ord_link |
542 | 542 |
# | Anfrage | Angebot | -> edit_oe_quo_link |
543 | 543 |
|
544 |
my $edit_oe_ord_link = ($::instance_conf->get_feature_experimental) |
|
544 |
my $edit_oe_ord_link = ($::instance_conf->get_feature_experimental_order)
|
|
545 | 545 |
? build_std_url("script=controller.pl", 'action=Order/edit', |
546 | 546 |
'type=' . E($ref->{cv} eq 'vendor' ? 'purchase_order' : 'sales_order'), 'id=' . E($ref->{trans_id}), 'callback') |
547 | 547 |
: build_std_url("script=oe.pl", 'action=edit', |
548 | 548 |
'type=' . E($ref->{cv} eq 'vendor' ? 'purchase_order' : 'sales_order'), 'id=' . E($ref->{trans_id}), 'callback'); |
549 | 549 |
|
550 |
my $edit_oe_quo_link = ($::instance_conf->get_feature_experimental) |
|
550 |
my $edit_oe_quo_link = ($::instance_conf->get_feature_experimental_order)
|
|
551 | 551 |
? build_std_url("script=controller.pl", 'action=Order/edit', |
552 | 552 |
'type=' . E($ref->{cv} eq 'vendor' ? 'request_quotation' : 'sales_quotation'), 'id=' . E($ref->{trans_id}), 'callback') |
553 | 553 |
: build_std_url("script=oe.pl", 'action=edit', |
bin/mozilla/io.pl | ||
---|---|---|
910 | 910 |
|
911 | 911 |
_order(); |
912 | 912 |
|
913 |
if ($::instance_conf->get_feature_experimental) { |
|
913 |
if ($::instance_conf->get_feature_experimental_order) {
|
|
914 | 914 |
my $order = _make_record(); |
915 | 915 |
$order->globalproject_id(undef) if !$order->globalproject_id; |
916 | 916 |
$order->payment_id(undef) if !$order->payment_id; |
bin/mozilla/oe.pl | ||
---|---|---|
1228 | 1228 |
|
1229 | 1229 |
my $idx = 1; |
1230 | 1230 |
|
1231 |
my $edit_url = ($::instance_conf->get_feature_experimental) |
|
1231 |
my $edit_url = ($::instance_conf->get_feature_experimental_order)
|
|
1232 | 1232 |
? build_std_url('script=controller.pl', 'action=Order/edit', 'type') |
1233 | 1233 |
: build_std_url('action=edit', 'type', 'vc'); |
1234 | 1234 |
|
... | ... | |
2138 | 2138 |
my $content; |
2139 | 2139 |
|
2140 | 2140 |
if (@{ $quotations }) { |
2141 |
my $edit_url = ($::instance_conf->get_feature_experimental) |
|
2141 |
my $edit_url = ($::instance_conf->get_feature_experimental_order)
|
|
2142 | 2142 |
? build_std_url('script=controller.pl', 'action=Order/edit') |
2143 | 2143 |
: build_std_url('script=oe.pl', 'action=edit'); |
2144 | 2144 |
|
locale/de/all | ||
---|---|---|
1224 | 1224 |
'Employees' => 'Benutzer', |
1225 | 1225 |
'Empty selection for warehouse will not be added, even if the old bin is still visible (use back and forth to edit again).' => 'Leere Lager-Auswahl wird ignoriert, selbst wenn noch ein Lagerplatz ausgewählt ist. Alle Daten können durch zurück und vorwärts korrigiert werden.', |
1226 | 1226 |
'Empty transaction!' => 'Buchung ist leer!', |
1227 |
'Enable experimental features' => 'Experimentelle Features einschalten', |
|
1228 | 1227 |
'Enabled Quick Searched' => 'Aktivierte Schnellsuchen', |
1229 | 1228 |
'Enabled modules' => 'Aktivierte Module', |
1230 | 1229 |
'End date' => 'Enddatum', |
... | ... | |
1355 | 1354 |
'Expense Account' => 'Aufwandskonto', |
1356 | 1355 |
'Expense/Asset' => 'Aufwand/Anlagen', |
1357 | 1356 |
'Experimental Features' => 'Experimentelle Features', |
1358 |
'Experimental features are:' => 'Experimentelle Features sind:', |
|
1359 | 1357 |
'Export' => 'Export', |
1360 | 1358 |
'Export Buchungsdaten' => 'Export Buchungsdaten', |
1361 | 1359 |
'Export Number' => 'Exportnummer', |
locale/en/all | ||
---|---|---|
1223 | 1223 |
'Employees' => '', |
1224 | 1224 |
'Empty selection for warehouse will not be added, even if the old bin is still visible (use back and forth to edit again).' => '', |
1225 | 1225 |
'Empty transaction!' => '', |
1226 |
'Enable experimental features' => '', |
|
1227 | 1226 |
'Enabled Quick Searched' => '', |
1228 | 1227 |
'Enabled modules' => '', |
1229 | 1228 |
'End date' => '', |
... | ... | |
1354 | 1353 |
'Expense Account' => '', |
1355 | 1354 |
'Expense/Asset' => '', |
1356 | 1355 |
'Experimental Features' => '', |
1357 |
'Experimental features are:' => '', |
|
1358 | 1356 |
'Export' => '', |
1359 | 1357 |
'Export Buchungsdaten' => '', |
1360 | 1358 |
'Export Number' => '', |
menus/user/10-order-controller.yaml | ||
---|---|---|
1 | 1 |
- parent: ar |
2 | 2 |
id: ar_add_quotation |
3 |
access: sales_quotation_edit & (!client/feature_experimental) |
|
3 |
access: sales_quotation_edit & (!client/feature_experimental_order)
|
|
4 | 4 |
- parent: ar |
5 | 5 |
id: ar_add_sales_order |
6 |
access: sales_order_edit & (!client/feature_experimental) |
|
6 |
access: sales_order_edit & (!client/feature_experimental_order)
|
|
7 | 7 |
- parent: ap |
8 | 8 |
id: ap_add_rfq |
9 |
access: request_quotation_edit & (!client/feature_experimental) |
|
9 |
access: request_quotation_edit & (!client/feature_experimental_order)
|
|
10 | 10 |
- parent: ap |
11 | 11 |
id: ap_add_purchase_order |
12 |
access: purchase_order_edit & (!client/feature_experimental) |
|
12 |
access: purchase_order_edit & (!client/feature_experimental_order)
|
|
13 | 13 |
|
14 | 14 |
- parent: ar |
15 | 15 |
id: ar_add_quotation_experimental |
16 | 16 |
name: Add Quotation |
17 | 17 |
icon: quotation_add |
18 | 18 |
order: 250 |
19 |
access: sales_quotation_edit & client/feature_experimental |
|
19 |
access: sales_quotation_edit & client/feature_experimental_order
|
|
20 | 20 |
params: |
21 | 21 |
action: Order/add |
22 | 22 |
type: sales_quotation |
... | ... | |
25 | 25 |
name: Add Sales Order |
26 | 26 |
icon: sales_order_add |
27 | 27 |
order: 350 |
28 |
access: sales_order_edit & client/feature_experimental |
|
28 |
access: sales_order_edit & client/feature_experimental_order
|
|
29 | 29 |
params: |
30 | 30 |
action: Order/add |
31 | 31 |
type: sales_order |
... | ... | |
35 | 35 |
name: Add RFQ |
36 | 36 |
icon: rfq_add |
37 | 37 |
order: 150 |
38 |
access: request_quotation_edit & client/feature_experimental |
|
38 |
access: request_quotation_edit & client/feature_experimental_order
|
|
39 | 39 |
params: |
40 | 40 |
action: Order/add |
41 | 41 |
type: request_quotation |
... | ... | |
44 | 44 |
name: Add Purchase Order |
45 | 45 |
icon: purchase_order_add |
46 | 46 |
order: 250 |
47 |
access: purchase_order_edit & client/feature_experimental |
|
47 |
access: purchase_order_edit & client/feature_experimental_order
|
|
48 | 48 |
params: |
49 | 49 |
action: Order/add |
50 | 50 |
type: purchase_order |
sql/Pg-upgrade2/defaults_add_feature_experimental2.sql | ||
---|---|---|
1 |
-- @tag: defaults_add_feature_experimental2 |
|
2 |
-- @description: experimentelle Features mit einzelnen Optionen |
|
3 |
-- @depends: defaults_add_feature_experimental |
|
4 |
|
|
5 |
ALTER TABLE defaults RENAME COLUMN feature_experimental TO feature_experimental_order; |
|
6 |
ALTER TABLE defaults ADD COLUMN feature_experimental_assortment BOOLEAN NOT NULL DEFAULT TRUE; |
|
7 |
|
|
8 |
UPDATE defaults SET feature_experimental_assortment = feature_experimental_order; |
t/menu/parse_access_string.t | ||
---|---|---|
54 | 54 |
$node{access} = '(no_such_right & sales_order_edit | (no_such_right & sales_order_edit))'; |
55 | 55 |
ok(!$menu->parse_access_string(\%node), 'parenthesis 2'); |
56 | 56 |
|
57 |
$node{access} = 'sales_quotation_edit & client/feature_experimental'; |
|
57 |
$node{access} = 'sales_quotation_edit & client/feature_experimental_order';
|
|
58 | 58 |
ok($menu->parse_access_string(\%node), 'client'); |
59 | 59 |
|
60 | 60 |
$node{access} = '!no_such_right'; |
... | ... | |
72 | 72 |
$node{access} = '(no_such_right & sales_order_edit | (!no_such_right | !sales_order_edit))'; |
73 | 73 |
ok($menu->parse_access_string(\%node), 'parenthesis with negation 2'); |
74 | 74 |
|
75 |
$node{access} = 'sales_quotation_edit & !client/feature_experimental'; |
|
75 |
$node{access} = 'sales_quotation_edit & !client/feature_experimental_order';
|
|
76 | 76 |
ok(!$menu->parse_access_string(\%node), 'client negation'); |
77 | 77 |
|
78 | 78 |
done_testing; |
templates/webpages/client_config/_features.html | ||
---|---|---|
316 | 316 |
</tr> |
317 | 317 |
<tr><td class="listheading" colspan="4">[% LxERP.t8("Experimental Features") %]</td></tr> |
318 | 318 |
<tr> |
319 |
<td align="right">[% LxERP.t8('Enable experimental features') %]</td> |
|
320 |
<td>[% L.yes_no_tag('defaults.feature_experimental', SELF.defaults.feature_experimental) %]</td> |
|
321 |
<td>[% LxERP.t8('Experimental features are:') %] [% LxERP.t8('new order controller') %], [% LxERP.t8('Assortment') %]</td> |
|
319 |
<td align="right">[% LxERP.t8('new order controller') %]</td> |
|
320 |
<td>[% L.yes_no_tag('defaults.feature_experimental_order', SELF.defaults.feature_experimental_order) %]</td> |
|
321 |
</tr> |
|
322 |
<tr> |
|
323 |
<td align="right">[% LxERP.t8('Assortment') %]</td> |
|
324 |
<td>[% L.yes_no_tag('defaults.feature_experimental_assortment', SELF.defaults.feature_experimental_assortment) %]</td> |
|
322 | 325 |
</tr> |
323 | 326 |
|
324 | 327 |
<tr><td class="listheading" colspan="4">[% LxERP.t8("Shipped Quantity Algorithm") %]</td></tr> |
templates/webpages/client_config/_ranges_of_numbers.html | ||
---|---|---|
44 | 44 |
<tr> |
45 | 45 |
<td align="right" nowrap>[% LxERP.t8('Last Sales Delivery Order Number') %]</td> |
46 | 46 |
<td>[% L.input_tag("defaults.sdonumber", SELF.defaults.sdonumber, size="15") %]</td> |
47 |
[%- IF INSTANCE_CONF.get_feature_experimental %] |
|
47 |
[%- IF INSTANCE_CONF.get_feature_experimental_assortment %]
|
|
48 | 48 |
<td align="right" nowrap>[% LxERP.t8('Last Assortment Number') %]</td> |
49 | 49 |
<td>[% L.input_tag("defaults.assortmentnumber", SELF.defaults.assortmentnumber, size="15") %]</td> |
50 | 50 |
[%- END -%] |
templates/webpages/customer_vendor/get_delivery.html | ||
---|---|---|
27 | 27 |
<tr class="listrow[% loop.count % 2 %]"> |
28 | 28 |
<td>[% HTML.escape(row.shiptoname) UNLESS loop.prev.shiptoname == row.shiptoname %] </td> |
29 | 29 |
<td>[% IF row.id %]<a href='[% row.script %].pl?action=edit&id=[% HTML.escape(row.id) %]'>[% END %][% HTML.escape(row.invnumber) || ' ' %][% IF row.id %]</a>[% END %]</td> |
30 |
[%- IF INSTANCE_CONF.get_feature_experimental -%] |
|
30 |
[%- IF INSTANCE_CONF.get_feature_experimental_order -%]
|
|
31 | 31 |
<td>[% IF row.oe_id %]<a href='controller.pl?action=Order/edit&type=[% IF SELF.is_customer %]sales_order[% ELSE %]purchase_order[% END %]&id=[% HTML.escape(row.oe_id) %]'>[% END %][% HTML.escape(row.ordnumber) || ' ' %][% IF row.oe_id %]</a>[% END %]</td> |
32 | 32 |
[%- ELSE -%] |
33 | 33 |
<td>[% IF row.oe_id %]<a href='oe.pl?action=edit&type=[% IF SELF.is_customer %]sales_order[% ELSE %]purchase_order[% END %]&vc=customer&id=[% HTML.escape(row.oe_id) %]'>[% END %][% HTML.escape(row.ordnumber) || ' ' %][% IF row.oe_id %]</a>[% END %]</td> |
templates/webpages/customer_vendor_turnover/_list_open_orders.html | ||
---|---|---|
20 | 20 |
<tr class="listrow[% loop.count % 2 %]"> |
21 | 21 |
<td>[% IF row.quotation %] |
22 | 22 |
[% IF FORM.db == 'customer' %][% 'Sales quotation' | $T8 %][% ELSE %][% 'RFQ' | $T8 %][% END %]</td> |
23 |
[%- IF INSTANCE_CONF.get_feature_experimental -%] |
|
23 |
[%- IF INSTANCE_CONF.get_feature_experimental_order -%]
|
|
24 | 24 |
<td>[% IF row.id %]<a href='controller.pl?action=Order/edit&type=[% IF FORM.db == "customer" %]sales_quotation[% ELSE %]request_quotation[% END %]&id=[% HTML.escape(row.id) %]'> |
25 | 25 |
[% END %][% HTML.escape(row.quonumber) || ' ' %][% IF row.id %]</a>[% END %]</td> |
26 | 26 |
[%- ELSE -%] |
... | ... | |
29 | 29 |
[%- END -%] |
30 | 30 |
[% ELSE %] |
31 | 31 |
[% IF FORM.db == 'customer' %][% 'Sales Order' | $T8 %][% ELSE %][% 'Purchase Order' | $T8 %][% END %]</td> |
32 |
[%- IF INSTANCE_CONF.get_feature_experimental -%] |
|
32 |
[%- IF INSTANCE_CONF.get_feature_experimental_order -%]
|
|
33 | 33 |
<td>[% IF row.id %]<a href='controller.pl?action=Order/edit&type=[% IF FORM.db == "customer" %]sales_order[% ELSE %]purchase_order[% END %]&id=[% HTML.escape(row.id) %]'> |
34 | 34 |
[% END %][% HTML.escape(row.ordnumber) || ' ' %][% IF row.id %]</a>[% END %]</td> |
35 | 35 |
[%- ELSE -%] |
templates/webpages/customer_vendor_turnover/order_statistic.html | ||
---|---|---|
15 | 15 |
|
16 | 16 |
[%- FOREACH row = orders %] |
17 | 17 |
<tr class="listrow[% loop.count % 2 %]"> |
18 |
[%- IF INSTANCE_CONF.get_feature_experimental -%] |
|
18 |
[%- IF INSTANCE_CONF.get_feature_experimental_order -%]
|
|
19 | 19 |
<td>[% IF row.id %]<a href='controller.pl?action=Order/edit&type=[% IF FORM.db == "customer" %]sales_order[% ELSE %]purchase_order[% END %]&id=[% HTML.escape(row.id) %]'>[% END %][% HTML.escape(row.ordnumber) || ' ' %][% IF row.id %]</a>[% END %]</td> |
20 | 20 |
[%- ELSE -%] |
21 | 21 |
<td>[% IF row.id %]<a href='oe.pl?action=edit&type=[% IF FORM.db == "customer" %]sales_order[% ELSE %]purchase_order[% END %]&vc=[% FORM.db %]&id=[% HTML.escape(row.oe_id) %]'>[% END %][% HTML.escape(row.ordnumber) || ' ' %][% IF row.id %]</a>[% END %]</td> |
templates/webpages/customer_vendor_turnover/quotation_statistic.html | ||
---|---|---|
15 | 15 |
|
16 | 16 |
[%- FOREACH row = orders %] |
17 | 17 |
<tr class="listrow[% loop.count % 2 %]"> |
18 |
[%- IF INSTANCE_CONF.get_feature_experimental -%] |
|
18 |
[%- IF INSTANCE_CONF.get_feature_experimental_order -%]
|
|
19 | 19 |
<td>[% IF row.id %]<a href='controller.pl?action=Order/edit&type=[% IF FORM.db == "customer" %]sales_quotation[% ELSE %]request_quotation[% END %]&id=[% HTML.escape(row.id) %]'> |
20 | 20 |
[% END %][% HTML.escape(row.quonumber) || ' ' %][% IF row.id %]</a>[% END %]</td> |
21 | 21 |
[%- ELSE -%] |
templates/webpages/delivery_plan/_filter.html | ||
---|---|---|
92 | 92 |
[% L.checkbox_tag('filter.part.part_type[]', checked=filter.part.part_type_.part, value='part', label=LxERP.t8('Part')) %] |
93 | 93 |
[% L.checkbox_tag('filter.part.part_type[]', checked=filter.part.part_type_.service, value='service', label=LxERP.t8('Service')) %] |
94 | 94 |
[% L.checkbox_tag('filter.part.part_type[]', checked=filter.part.part_type_.assembly, value='assembly', label=LxERP.t8('Assembly')) %] |
95 |
[%- IF INSTANCE_CONF.get_feature_experimental %] |
|
95 |
[%- IF INSTANCE_CONF.get_feature_experimental_assortment %]
|
|
96 | 96 |
[% L.checkbox_tag('filter.part.part_type[]', checked=filter.part.part_type_.assortment, value='assortment', label=LxERP.t8('Assortment')) %] |
97 | 97 |
[% END %] |
98 | 98 |
</td> |
templates/webpages/delivery_value_report/_filter.html | ||
---|---|---|
84 | 84 |
[% L.checkbox_tag('filter.part.part_type[]', checked=filter.part.part_type_.part, value='part', label=LxERP.t8('Part')) %] |
85 | 85 |
[% L.checkbox_tag('filter.part.part_type[]', checked=filter.part.part_type_.service, value='service', label=LxERP.t8('Service')) %] |
86 | 86 |
[% L.checkbox_tag('filter.part.part_type[]', checked=filter.part.part_type_.assembly, value='assembly', label=LxERP.t8('Assembly')) %] |
87 |
[%- IF INSTANCE_CONF.get_feature_experimental %] |
|
87 |
[%- IF INSTANCE_CONF.get_feature_experimental_assortment %]
|
|
88 | 88 |
[% L.checkbox_tag('filter.part.part_type[]', checked=filter.part.part_type_.assortment, value='assortment', label=LxERP.t8('Assortment')) %] |
89 | 89 |
[% END %] |
90 | 90 |
</td> |
templates/webpages/ic/generate_report_bottom.html | ||
---|---|---|
23 | 23 |
<td>[%- 'Service (typeabbreviation)' | $T8 %]</td> |
24 | 24 |
<td>[%- 'Service' | $T8 %]</td> |
25 | 25 |
</tr> |
26 |
[%- IF INSTANCE_CONF.get_feature_experimental %] |
|
26 |
[%- IF INSTANCE_CONF.get_feature_experimental_assortment %]
|
|
27 | 27 |
<tr class="listrow1"> |
28 | 28 |
<td>[%- 'Assortment (typeabbreviation)' | $T8 %]</td> |
29 | 29 |
<td>[%- 'Assortment' | $T8 %]</td> |
templates/webpages/ic/search.html | ||
---|---|---|
38 | 38 |
<input name="l_assembly" id="l_assembly" class="checkbox" type="checkbox" value="Y" checked> |
39 | 39 |
<label for="l_assembly">[% 'Assembly' | $T8 %]</label> |
40 | 40 |
</td> |
41 |
[%- IF INSTANCE_CONF.get_feature_experimental %] |
|
41 |
[%- IF INSTANCE_CONF.get_feature_experimental_assortment %]
|
|
42 | 42 |
<td> |
43 | 43 |
<input name="l_assortment" id="l_assortment" class="checkbox" type="checkbox" value="Y" checked> |
44 | 44 |
<label for="l_assortment">[% 'Assortment' | $T8 %]</label> |
templates/webpages/mass_invoice_create_print_from_do/list_sales_delivery_orders.html | ||
---|---|---|
36 | 36 |
<td>[% L.checkbox_tag('id[]', value=sales_delivery_order.id, "data-checkall"=1) %]</td> |
37 | 37 |
<td>[% HTML.escape(sales_delivery_order.transdate_as_date) %]</td> |
38 | 38 |
<td>[% L.link(SELF.url_for(controller="do.pl", action="edit", type="sales_delivery_order", id=sales_delivery_order.id), sales_delivery_order.donumber) %]</td> |
39 |
[%- IF INSTANCE_CONF.get_feature_experimental -%] |
|
39 |
[%- IF INSTANCE_CONF.get_feature_experimental_order -%]
|
|
40 | 40 |
<td>[% L.link(SELF.url_for(controller="controller.pl", action="Order/edit", type="sales_order", id=sales_delivery_order.sales_order.id), sales_delivery_order.ordnumber) %]</td> |
41 | 41 |
[%- ELSE -%] |
42 | 42 |
<td>[% L.link(SELF.url_for(controller="oe.pl", action="edit", type="sales_order", id=sales_delivery_order.sales_order.id), sales_delivery_order.ordnumber) %]</td> |
templates/webpages/requirement_spec_order/list.html | ||
---|---|---|
79 | 79 |
[% END %] |
80 | 80 |
</td> |
81 | 81 |
<td> |
82 |
[%- IF INSTANCE_CONF.get_feature_experimental -%] |
|
82 |
[%- IF INSTANCE_CONF.get_feature_experimental_order -%]
|
|
83 | 83 |
<a href="controller.pl?action=Order/edit&id=[% HTML.url(rs_order.order_id) %]&type=[% HTML.url(rs_order.order.type) %]"> |
84 | 84 |
[%- ELSE -%] |
85 | 85 |
<a href="oe.pl?action=edit&id=[% HTML.url(rs_order.order_id) %]&type=[% HTML.url(rs_order.order.type) %]"> |
Auch abrufbar als: Unified diff
Mandantenkonfiguration: experimentelle Features einzeln an-/abschaltbar machen
es gibt nun "feature_experimental_order" und "feature_experimental_assortment"
angepasster cherry pick von odyn: bc94c40f2f64e7b40fbd90c49dbf41f86688c32d