projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
cp.pl: vc select richtig escapen
[kivitendo-erp.git]
/
bin
/
mozilla
/
ic.pl
diff --git
a/bin/mozilla/ic.pl
b/bin/mozilla/ic.pl
index
9b23800
..
3042403
100644
(file)
--- a/
bin/mozilla/ic.pl
+++ b/
bin/mozilla/ic.pl
@@
-42,11
+42,11
@@
use SL::ReportGenerator;
#use SL::PE;
#use SL::PE;
-
#
use strict;
+use strict;
#use warnings;
# global imports
#use warnings;
# global imports
-our ($form, $locale, %myconfig, $lxdebug);
+our ($form, $locale, %myconfig, $lxdebug
, $auth
);
require "bin/mozilla/io.pl";
require "bin/mozilla/invoice_io.pl";
require "bin/mozilla/io.pl";
require "bin/mozilla/invoice_io.pl";
@@
-140,7
+140,7
@@
sub confirm_price_update {
$auth->assert('part_service_assembly_edit');
my @errors = ();
$auth->assert('part_service_assembly_edit');
my @errors = ();
- my $value_found =
false
;
+ my $value_found =
undef
;
foreach my $idx (qw(sellprice listprice), (1..$form->{price_rows})) {
my $name = $idx =~ m/\d/ ? $form->{"pricegroup_${idx}"} : $idx eq 'sellprice' ? $locale->text('Sell Price') : $locale->text('List Price');
foreach my $idx (qw(sellprice listprice), (1..$form->{price_rows})) {
my $name = $idx =~ m/\d/ ? $form->{"pricegroup_${idx}"} : $idx eq 'sellprice' ? $locale->text('Sell Price') : $locale->text('List Price');
@@
-1023,8
+1023,8
@@
sub generate_report {
$form->{title} =~ s/ys$/ies/;
$form->{title} = $locale->text($form->{title});
$form->{title} =~ s/ys$/ies/;
$form->{title} = $locale->text($form->{title});
-
my
$revers = $form->{revers};
-
my
$lastsort = $form->{lastsort};
+ $revers = $form->{revers};
+ $lastsort = $form->{lastsort};
# sorting and direction of sorting
# ToDO: change this to the simpler field+direction method
# sorting and direction of sorting
# ToDO: change this to the simpler field+direction method
@@
-1241,6
+1241,13
@@
sub generate_report {
'column_defs' => \%column_defs,
'data' => $form->{parts});
'column_defs' => \%column_defs,
'data' => $form->{parts});
+ CVar->add_custom_variables_to_report('module' => 'IC',
+ 'sub_module' => sub { $_[0]->{ioi} },
+ 'trans_id_field' => 'ioi_id',
+ 'configs' => $cvar_configs,
+ 'column_defs' => \%column_defs,
+ 'data' => $form->{parts});
+
my @subtotal_columns = qw(sellprice listprice lastcost);
my %subtotals = map { $_ => 0 } ('onhand', @subtotal_columns);
my %totals = map { $_ => 0 } @subtotal_columns;
my @subtotal_columns = qw(sellprice listprice lastcost);
my %subtotals = map { $_ => 0 } ('onhand', @subtotal_columns);
my %totals = map { $_ => 0 } @subtotal_columns;
@@
-1294,7
+1301,7
@@
sub generate_report {
# set module stuff
if ($ref->{module} eq 'oe') {
# set module stuff
if ($ref->{module} eq 'oe') {
- my $edit_oe_link = build_std_url("script=oe.pl", 'action=edit', 'type=' . E($ref->{c
ustomer_id} ne '' ? 'sales_order' : 'purchase
_order'), 'id=' . E($ref->{trans_id}), 'callback');
+ my $edit_oe_link = build_std_url("script=oe.pl", 'action=edit', 'type=' . E($ref->{c
v} eq 'vendor' ? 'purchase_order' : 'sales
_order'), 'id=' . E($ref->{trans_id}), 'callback');
$row->{ordnumber}{link} = $edit_oe_link;
$row->{quonumber}{link} = $edit_oe_link if (!$ref->{ordnumber});
$row->{ordnumber}{link} = $edit_oe_link;
$row->{quonumber}{link} = $edit_oe_link if (!$ref->{ordnumber});
@@
-1510,7
+1517,7
@@
sub form_header {
$auth->assert('part_service_assembly_edit');
$auth->assert('part_service_assembly_edit');
- $form->{eur} = $eur; # config dumps into namespace - yuck
+ $form->{eur} = $
main::
eur; # config dumps into namespace - yuck
$form->{pg_keys} = sub { "$_[0]->{partsgroup}--$_[0]->{id}" };
$form->{description_area} = ($form->{rows} = $form->numtextrows($form->{description}, 40)) > 1;
$form->{notes_rows} = max 4, $form->numtextrows($form->{notes}, 40), $form->numtextrows($form->{formel}, 40);
$form->{pg_keys} = sub { "$_[0]->{partsgroup}--$_[0]->{id}" };
$form->{description_area} = ($form->{rows} = $form->numtextrows($form->{description}, 40)) > 1;
$form->{notes_rows} = max 4, $form->numtextrows($form->{notes}, 40), $form->numtextrows($form->{formel}, 40);
@@
-1529,7
+1536,7
@@
sub form_header {
# use JavaScript Calendar or not (yes!)
$form->{jsscript} = 1;
# use JavaScript Calendar or not (yes!)
$form->{jsscript} = 1;
- $units = AM->retrieve_units(\%myconfig, $form);
+
my
$units = AM->retrieve_units(\%myconfig, $form);
$form->{ALL_UNITS} = [ map +{ name => $_ }, sort { $units->{$a}{sortkey} <=> $units->{$b}{sortkey} } keys %$units ];
$form->{defaults} = AM->get_defaults();
$form->{ALL_UNITS} = [ map +{ name => $_ }, sort { $units->{$a}{sortkey} <=> $units->{$b}{sortkey} } keys %$units ];
$form->{defaults} = AM->get_defaults();
@@
-1538,7
+1545,8
@@
sub form_header {
$form->{CUSTOM_VARIABLES} = CVar->get_custom_variables('module' => 'IC', 'trans_id' => $form->{id});
$form->{CUSTOM_VARIABLES} = CVar->get_custom_variables('module' => 'IC', 'trans_id' => $form->{id});
- CVar->render_inputs('variables' => $form->{CUSTOM_VARIABLES}) if (scalar @{ $form->{CUSTOM_VARIABLES} });
+ CVar->render_inputs('variables' => $form->{CUSTOM_VARIABLES}, show_disabled_message => 1)
+ if (scalar @{ $form->{CUSTOM_VARIABLES} });
$form->header;
#print $form->parse_html_template('ic/form_header', { ALL_PRICE_FACTORS => $form->{ALL_PRICE_FACTORS},
$form->header;
#print $form->parse_html_template('ic/form_header', { ALL_PRICE_FACTORS => $form->{ALL_PRICE_FACTORS},
@@
-1577,7
+1585,7
@@
sub assembly_row {
my (@column_index);
my ($nochange, $callback, $previousform, $linetotal, $line_purchase_price, $href);
my (@column_index);
my ($nochange, $callback, $previousform, $linetotal, $line_purchase_price, $href);
- our ($deliverydate); # ToDO: c
j
eck if this indeed comes from global context
+ our ($deliverydate); # ToDO: c
h
eck if this indeed comes from global context
@column_index = qw(runningnumber qty unit bom partnumber description partsgroup lastcost total);
@column_index = qw(runningnumber qty unit bom partnumber description partsgroup lastcost total);
@@
-1596,7
+1604,7
@@
sub assembly_row {
# save form variables in a previousform variable
$previousform = $form->escape($form->escape(join '&', map {
# save form variables in a previousform variable
$previousform = $form->escape($form->escape(join '&', map {
- sprintf "%s=%s", Q($_), /^listprice|lastcost|sellprice$/ ? $form->format_amount(\%myconfig, $form->{$
key}) : $form->{$key
}
+ sprintf "%s=%s", Q($_), /^listprice|lastcost|sellprice$/ ? $form->format_amount(\%myconfig, $form->{$
_}) : $form->{$_
}
} grep { ref $form->{$_} eq '' && $form->{$_} } grep { !/^select/ } sort keys %$form ));
$form->{callback} = $callback;
} grep { ref $form->{$_} eq '' && $form->{$_} } grep { !/^select/ } sort keys %$form ));
$form->{callback} = $callback;
@@
-1753,13
+1761,8
@@
sub save {
# check if there is a description
$form->isblank("description", $locale->text("Part Description missing!"));
# check if there is a description
$form->isblank("description", $locale->text("Part Description missing!"));
- if ($form->{obsolete}) {
- $form->error(
- $locale->text(
- "Inventory quantity must be zero before you can set this $form->{item} obsolete!"
- ))
- if ($form->{onhand} * 1);
- }
+ $form->error($locale->text("Inventory quantity must be zero before you can set this $form->{item} obsolete!"))
+ if $form->{obsolete} && $form->{onhand} * 1 && $form->{item} ne 'service';
if (!$form->{buchungsgruppen_id}) {
$form->error($locale->text("Parts must have an entry type.") . " " .
if (!$form->{buchungsgruppen_id}) {
$form->error($locale->text("Parts must have an entry type.") . " " .
@@
-1968,12
+1971,12
@@
sub parts_language_selection {
$auth->assert('part_service_assembly_edit');
$auth->assert('part_service_assembly_edit');
- our ($onload);
+ our ($onload
, $callback
);
my $languages = IC->retrieve_languages(\%myconfig, $form);
if ($form->{language_values} ne "") {
my $languages = IC->retrieve_languages(\%myconfig, $form);
if ($form->{language_values} ne "") {
- foreach $item (split(/---\+\+\+---/, $form->{language_values})) {
+ foreach
my
$item (split(/---\+\+\+---/, $form->{language_values})) {
my ($language_id, $translation, $longdescription) = split(/--\+\+--/, $item);
foreach my $language (@{ $languages }) {
my ($language_id, $translation, $longdescription) = split(/--\+\+--/, $item);
foreach my $language (@{ $languages }) {