Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision be8c4415

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

  • ID be8c4415c90cb11cbf45132b63482f420b41070b
  • Vorgänger 7464fcbd
  • Nachfolger 89b0d175

Lagerstandsbericht: Listenpreis als Basis f. Bestandswert auswählbar

Unterschiede anzeigen:

SL/WH.pm
807 807
     "chargeid"             => "c.id",
808 808
     "warehousedescription" => "w.description",
809 809
     "partunit"             => "p.unit",
810
     "stock_value"          => "p.lastcost / COALESCE(pfac.factor, 1)",
810
     "stock_value"          => $form->{stock_value_basis} eq 'list_price' ? "p.listprice / COALESCE(pfac.factor, 1)" : "p.lastcost / COALESCE(pfac.factor, 1)",
811 811
     "purchase_price"       => "p.lastcost",
812 812
     "list_price"           => "p.listprice",
813 813
  );
bin/mozilla/wh.pl
864 864
  my @hidden_variables = map { "l_${_}" } @columns;
865 865
  push @hidden_variables, qw(warehouse_id bin_id partnumber partstypes_id description chargenumber bestbefore qty_op qty qty_unit partunit l_warehousedescription l_bindescription);
866 866
  push @hidden_variables, qw(include_empty_bins subtotal include_invalid_warehouses date);
867
  push @hidden_variables, qw(classification_id);
867
  push @hidden_variables, qw(classification_id stock_value_basis);
868 868

  
869 869
  my %column_defs = (
870 870
    'warehousedescription' => { 'text' => $locale->text('Warehouse'), },
locale/de/all
3991 3991
  'bank_collection_payment_list_#1' => 'bankeinzugszahlungsliste_#1',
3992 3992
  'bank_transfer_payment_list_#1' => 'ueberweisungszahlungsliste_#1',
3993 3993
  'banktransfers'               => 'ueberweisungen',
3994
  'basis for stock value'       => 'Grundlage für Bestandswert',
3994 3995
  'bestbefore #1'               => 'Mindesthaltbarkeit #1',
3995 3996
  'bin_list'                    => 'Lagerliste',
3996 3997
  'bis'                         => 'bis',
locale/en/all
3988 3988
  'bank_collection_payment_list_#1' => '',
3989 3989
  'bank_transfer_payment_list_#1' => '',
3990 3990
  'banktransfers'               => '',
3991
  'basis for stock value'       => '',
3991 3992
  'bestbefore #1'               => '',
3992 3993
  'bin_list'                    => '',
3993 3994
  'bis'                         => '',
templates/webpages/wh/report_filter.html
1 1
[%- USE T8 %]
2 2
[%- USE L %]
3 3
[%- USE P %]
4
[%- USE LxERP %]
4 5
[%- USE HTML %][%- USE JavaScript %]
5 6
<h1>[% 'Report about warehouse contents' | $T8 %]</h1>
6 7

  
......
190 191
        <td nowrap><label for="l_list_price">[% 'List Price' | $T8 %]</label></td>
191 192
       </tr>
192 193

  
194
       <tr>
195
        <td colspan="2" align="right">
196
         [% L.radio_button_tag("stock_value_basis", value='purchase_price', checked=1, label=LxERP.t8('Purchase price')) %]
197
         [% L.radio_button_tag("stock_value_basis", value='list_price',     checked=0, label=LxERP.t8('List Price')) %]
198
        </td>
199
        <td align="right">
200
          [% "basis for stock value" | $T8 %]
201
        </td>
202
       </tr>
203

  
193 204
      </table>
194 205
     </td>
195 206
    </tr>

Auch abrufbar als: Unified diff