Revision c2ba1d2c
Von Kivitendo Admin vor mehr als 8 Jahren hinzugefügt
bin/mozilla/ar.pl | ||
---|---|---|
950 | 950 |
@columns = |
951 | 951 |
qw(ids transdate id type invnumber ordnumber cusordnumber name netamount tax amount paid |
952 | 952 |
datepaid due duedate transaction_description notes salesman employee shippingpoint shipvia |
953 |
marge_total marge_percent globalprojectnumber customernumber country ustid taxzone payment_terms charts customertype direct_debit dunning_description); |
|
953 |
marge_total marge_percent globalprojectnumber customernumber country ustid taxzone |
|
954 |
payment_terms charts customertype direct_debit dunning_description department); |
|
954 | 955 |
|
955 | 956 |
my $ct_cvar_configs = CVar->get_configs('module' => 'CT'); |
956 | 957 |
my @ct_includeable_custom_variables = grep { $_->{includeable} } @{ $ct_cvar_configs }; |
... | ... | |
999 | 1000 |
'charts' => { 'text' => $locale->text('Buchungskonto'), }, |
1000 | 1001 |
'customertype' => { 'text' => $locale->text('Customer type'), }, |
1001 | 1002 |
'direct_debit' => { 'text' => $locale->text('direct debit'), }, |
1003 |
'department' => { 'text' => $locale->text('Department'), }, |
|
1002 | 1004 |
dunning_description => { 'text' => $locale->text('Dunning level'), }, |
1003 | 1005 |
%column_defs_cvars, |
1004 | 1006 |
); |
... | ... | |
1035 | 1037 |
if ($form->{cp_name}) { |
1036 | 1038 |
push @options, $locale->text('Contact Person') . " : $form->{cp_name}"; |
1037 | 1039 |
} |
1040 |
|
|
1041 |
# $form->{department} seems to never be filled, and showing the department_id |
|
1042 |
# at the top of the report doesn't make much sense. |
|
1043 |
# So determine the department name from the id whenever we have a filter for |
|
1044 |
# department |
|
1038 | 1045 |
if ($form->{department}) { |
1039 | 1046 |
my ($department) = split /--/, $form->{department}; |
1040 | 1047 |
push @options, $locale->text('Department') . " : $department"; |
1041 | 1048 |
} |
1042 | 1049 |
if ($form->{department_id}) { |
1043 |
push @options, $locale->text('Department Id') . " : $form->{department_id}"; |
|
1050 |
# push @options, $locale->text('Department Id') . " : $form->{department_id}"; |
|
1051 |
unless ($form->{department}) { |
|
1052 |
require SL::DB::Department; |
|
1053 |
my $department = SL::DB::Manager::Department->find_by(id => $::form->{department_id}); |
|
1054 |
push @options, $locale->text('Department') . " : " . $department->description if $department; |
|
1055 |
} |
|
1044 | 1056 |
} |
1045 | 1057 |
if ($form->{invnumber}) { |
1046 | 1058 |
push @options, $locale->text('Invoice Number') . " : $form->{invnumber}"; |
Auch abrufbar als: Unified diff
Verkauf->Berichte->Rechnungen: Abteilung im Bericht
wenn nach Abteilung gefiltert wird den Namen der Abteilung oben angeben
statt der id.