Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision bead93d9

Von Bernd Bleßmann vor etwa 5 Jahren hinzugefügt

  • ID bead93d9bf4fefcecb262c0af667b43b77f5dc9c
  • Vorgänger b476a3db
  • Nachfolger 25517b3d

Bericht Angebote/Aufträge: Abteilungen anzeigen können

Unterschiede anzeigen:

SL/OE.pm
116 116
    qq|  o.transaction_description, | .
117 117
    qq|  o.marge_total, o.marge_percent, | .
118 118
    qq|  o.itime::DATE AS insertdate, | .
119
    qq|  department.description as department, | .
119 120
    qq|  ex.$rate AS exchangerate, | .
120 121
    qq|  pt.description AS payment_terms, | .
121 122
    qq|  pr.projectnumber AS globalprojectnumber, | .
......
134 135
    qq|LEFT JOIN project pr ON (o.globalproject_id = pr.id) | .
135 136
    qq|LEFT JOIN payment_terms pt ON (pt.id = o.payment_id)| .
136 137
    qq|LEFT JOIN tax_zones tz ON (o.taxzone_id = tz.id) | .
138
    qq|LEFT JOIN department   ON (o.department_id = department.id) | .
137 139
    qq|$periodic_invoices_joins | .
138 140
    qq|WHERE (o.quotation = ?) |;
139 141
  push(@values, $quotation);
......
353 355
    "insertdate"              => "o.itime",
354 356
    "taxzone"                 => "tz.description",
355 357
    "payment_terms"           => "pt.description",
358
    "department"              => "department.description",
356 359
  );
357 360
  if ($form->{sort} && grep($form->{sort}, keys(%allowed_sort_columns))) {
358 361
    $sortorder = $allowed_sort_columns{$form->{sort}} . " ${sortdir}"  . ", o.itime ${sortdir}";
bin/mozilla/oe.pl
1026 1026
    "curr",                    "employee",
1027 1027
    "salesman",
1028 1028
    "shipvia",                 "globalprojectnumber",
1029
    "transaction_description", "open",
1029
    "transaction_description", "department",            "open",
1030 1030
    "delivered",               "periodic_invoices",
1031 1031
    "marge_total",             "marge_percent",
1032 1032
    "vcnumber",                "ustid",
......
1111 1111
    'shipvia'                 => { 'text' => $locale->text('Ship via'), },
1112 1112
    'globalprojectnumber'     => { 'text' => $locale->text('Project Number'), },
1113 1113
    'transaction_description' => { 'text' => $locale->text('Transaction description'), },
1114
    'department'              => { 'text' => $locale->text('Department'), },
1114 1115
    'open'                    => { 'text' => $locale->text('Open'), },
1115 1116
    'delivered'               => { 'text' => $locale->text('Delivery Order created'), },
1116 1117
    'marge_total'             => { 'text' => $locale->text('Ertrag'), },
......
1129 1130
    %column_defs_cvars,
1130 1131
  );
1131 1132

  
1132
  foreach my $name (qw(id transdate reqdate quonumber ordnumber cusordnumber name employee salesman shipvia transaction_description shippingpoint taxzone insertdate payment_terms)) {
1133
  foreach my $name (qw(id transdate reqdate quonumber ordnumber cusordnumber name employee salesman shipvia transaction_description shippingpoint taxzone insertdate payment_terms department)) {
1133 1134
    my $sortdir                 = $form->{sort} eq $name ? 1 - $form->{sortdir} : $form->{sortdir};
1134 1135
    $column_defs{$name}->{link} = $href . "&sort=$name&sortdir=$sortdir";
1135 1136
  }
templates/webpages/oe/search.html
257 257
         <input name="l_transaction_description" id="l_transaction_description" class="checkbox" type="checkbox" value="Y"[% IF INSTANCE_CONF.get_require_transaction_description_ps %] checked[% END %]>
258 258
         <label for="l_transaction_description">[% 'Transaction description' | $T8 %]</label>
259 259
        </td>
260
        <td>
261
         [%- L.checkbox_tag('l_department', label => LxERP.t8('Department')) %]</td>
262
        </td>
263

  
260 264
       </tr>
261 265
       <tr>
262 266
        <td>

Auch abrufbar als: Unified diff