Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision 606e7e25

Von Moritz Bunkus vor fast 14 Jahren hinzugefügt

Konfigurationsort für viele Flags ist Abschnitt 'features', nicht 'system'

Hoffentlich Fix für Bug 1624.

Unterschiede anzeigen:

SL/Common.pm
my ($form) = @_;
return $main::lxdebug->leave_sub()
unless ($::lx_office_conf{system}->{webdav} && $form->{id});
unless ($::lx_office_conf{features}->{webdav} && $form->{id});
my ($path, $number);
SL/Form.pm
}
$additional_params->{"conf_dbcharset"} = $::lx_office_conf{system}->{dbcharset};
$additional_params->{"conf_webdav"} = $::lx_office_conf{system}->{webdav};
$additional_params->{"conf_lizenzen"} = $::lx_office_conf{system}->{lizenzen};
$additional_params->{"conf_webdav"} = $::lx_office_conf{features}->{webdav};
$additional_params->{"conf_lizenzen"} = $::lx_office_conf{features}->{lizenzen};
$additional_params->{"conf_latex_templates"} = $::lx_office_conf{print_templates}->{latex};
$additional_params->{"conf_opendocument_templates"} = $::lx_office_conf{print_templates}->{opendocument};
$additional_params->{"conf_vertreter"} = $::lx_office_conf{system}->{vertreter};
$additional_params->{"conf_vertreter"} = $::lx_office_conf{features}->{vertreter};
$additional_params->{"conf_show_best_before"} = $::lx_office_conf{features}->{show_best_before};
$additional_params->{"conf_parts_image_css"} = $::lx_office_conf{features}->{parts_image_css};
$additional_params->{"conf_parts_listing_images"} = $::lx_office_conf{features}->{parts_listing_images};
bin/mozilla/am.pl
$form->{title} = $locale->text('Type of Business');
my @column_index = qw(description discount customernumberinit);
push @column_index, 'salesman' if $::lx_office_conf{system}->{vertreter};
push @column_index, 'salesman' if $::lx_office_conf{features}->{vertreter};
my %column_header;
$column_header{description} =
qq|<th class=listheading width=60%>|
......
$form->format_amount(\%myconfig, $form->{discount} * 100);
my $salesman_code;
if ($::lx_office_conf{system}->{vertreter}) {
if ($::lx_office_conf{features}->{vertreter}) {
$salesman_code = qq|
<tr>
<th align="right">| . $locale->text('Representative') . qq|</th>
bin/mozilla/ct.pl
taxzones => "ALL_TAXZONES");
$form->get_pricegroup(\%myconfig, { all => 1 });
$form->get_lists(customers => { key => "ALL_SALESMAN_CUSTOMERS", business_is_salesman => 1 }) if $::lx_office_conf{system}->{vertreter};
$form->get_lists(customers => { key => "ALL_SALESMAN_CUSTOMERS", business_is_salesman => 1 }) if $::lx_office_conf{features}->{vertreter};
$form->{ALL_SALESMEN} = $form->{ALL_EMPLOYEES};
$form->{taxincluded} = ($form->{taxincluded}) ? "checked" : "";
......
$::form->isblank("name", $::locale->text("Name missing!"));
if ($::form->{new_salesman_id} && $::lx_office_conf{system}->{vertreter}) {
if ($::form->{new_salesman_id} && $::lx_office_conf{features}->{vertreter}) {
$::form->{salesman_id} = $::form->{new_salesman_id};
delete $::form->{new_salesman_id};
}
bin/mozilla/do.pl
$form->all_vc(\%myconfig, $form->{vc}, ($form->{vc} eq 'customer') ? "AR" : "AP");
# retrieve order/quotation
$form->{webdav} = $::lx_office_conf{system}->{webdav};
$form->{webdav} = $::lx_office_conf{features}->{webdav};
$form->{jsscript} = 1;
my $editing = $form->{id};
bin/mozilla/io.pl
qw(bin listprice inventory_accno income_accno expense_accno unit weight
assembly taxaccounts partsgroup formel longdescription not_discountable
part_payment_id partnotes id lastcost price_factor_id price_factor);
push @new_fields, "lizenzen" if $::lx_office_conf{system}->{lizenzen};
push @new_fields, "lizenzen" if $::lx_office_conf{features}->{lizenzen};
push @new_fields, grep { m/^ic_cvar_/ } keys %{ $form->{item_list}->[0] };
my $i = 0;
......
foreach my $ref (@{ $form->{item_list} }) {
my $checked = ($i++) ? "" : "checked";
if ($::lx_office_conf{system}->{lizenzen}) {
if ($::lx_office_conf{features}->{lizenzen}) {
if ($ref->{inventory_accno} > 0) {
$ref->{"lizenzen"} = qq|<option></option>|;
foreach my $item (@{ $form->{LIZENZEN}{ $ref->{"id"} } }) {
......
$form->{payment_id} = $form->{"part_payment_id_$i"};
}
if ($::lx_office_conf{system}->{lizenzen}) {
if ($::lx_office_conf{features}->{lizenzen}) {
map { $form->{"${_}_$i"} = $form->{"new_${_}_$j"} } qw(lizenzen);
}
bin/mozilla/ir.pl
$form->{vc} = 'vendor';
# create links
$form->{webdav} = $::lx_office_conf{system}->{webdav};
$form->{webdav} = $::lx_office_conf{features}->{webdav};
$form->{jsscript} = 1;
$form->create_links("AP", \%myconfig, "vendor");
bin/mozilla/is.pl
$form->{vc} = 'customer';
# create links
$form->{webdav} = $::lx_office_conf{system}->{webdav};
$form->{lizenzen} = $::lx_office_conf{system}->{lizenzen};
$form->{webdav} = $::lx_office_conf{features}->{webdav};
$form->{lizenzen} = $::lx_office_conf{features}->{lizenzen};
$form->create_links("AR", \%myconfig, "customer");
......
$form->{"qty_$i"} = $form->format_amount(\%myconfig, $form->{"qty_$i"});
if ($::lx_office_conf{system}->{lizenzen}) {
if ($::lx_office_conf{features}->{lizenzen}) {
if ($form->{"inventory_accno_$i"} ne "") {
$form->{"lizenzen_$i"} = qq|<option></option>|;
foreach my $item (@{ $form->{LIZENZEN}{ $form->{"id_$i"} } }) {
bin/mozilla/oe.pl
$form->all_vc(\%myconfig, $form->{vc}, ($form->{vc} eq 'customer') ? "AR" : "AP");
# retrieve order/quotation
$form->{webdav} = $::lx_office_conf{system}->{webdav};
$form->{webdav} = $::lx_office_conf{features}->{webdav};
$form->{jsscript} = 1;
my $editing = $form->{id};
......
print $form->parse_html_template("oe/form_footer", {
%TMPL_VAR,
webdav => $::lx_office_conf{system}->{webdav},
webdav => $::lx_office_conf{features}->{webdav},
print_options => print_options(inline => 1),
label_edit => $locale->text("Edit the $form->{type}"),
label_workflow => $locale->text("Workflow $form->{type}"),

Auch abrufbar als: Unified diff