Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision a5bebed4

Von Jan Büren vor mehr als 14 Jahren hinzugefügt

  • ID a5bebed4cd880e6f6fc5497f7b183f25586342ba
  • Vorgänger 19db5b90
  • Nachfolger 2e8ce008

Fix für Bug 1290. Verkaufspreis wird anstelle von Einkaufspreis in der Übersichtsmaske angezeigt

Unterschiede anzeigen:

bin/mozilla/ic.pl
1023 1023
  $form->{title} =~ s/ys$/ies/;
1024 1024
  $form->{title} = $locale->text($form->{title});
1025 1025

  
1026
  my %column_defs = (
1027
    'bin'                => { 'text' => $locale->text('Bin'), },
1028
    'deliverydate'       => { 'text' => $locale->text('deliverydate'), },
1029
    'description'        => { 'text' => $locale->text('Part Description'), },
1030
    'drawing'            => { 'text' => $locale->text('Drawing'), },
1031
    'image'              => { 'text' => $locale->text('Image'), },
1032
    'invnumber'          => { 'text' => $locale->text('Invoice Number'), },
1033
    'lastcost'           => { 'text' => $locale->text('Last Cost'), },
1034
    'linetotallastcost'  => { 'text' => $locale->text('Extended'), },
1035
    'linetotallistprice' => { 'text' => $locale->text('Extended'), },
1036
    'linetotalsellprice' => { 'text' => $locale->text('Extended'), },
1037
    'listprice'          => { 'text' => $locale->text('List Price'), },
1038
    'microfiche'         => { 'text' => $locale->text('Microfiche'), },
1039
    'name'               => { 'text' => $locale->text('Name'), },
1040
    'onhand'             => { 'text' => $locale->text('Qty'), },
1041
    'ordnumber'          => { 'text' => $locale->text('Order Number'), },
1042
    'partnumber'         => { 'text' => $locale->text('Part Number'), },
1043
    'partsgroup'         => { 'text' => $locale->text('Group'), },
1044
    'priceupdate'        => { 'text' => $locale->text('Updated'), },
1045
    'quonumber'          => { 'text' => $locale->text('Quotation'), },
1046
    'rop'                => { 'text' => $locale->text('ROP'), },
1047
    'sellprice'          => { 'text' => $locale->text('Sell Price'), },
1048
    'serialnumber'       => { 'text' => $locale->text('Serial Number'), },
1049
    'soldtotal'          => { 'text' => $locale->text('soldtotal'), },
1050
    'transdate'          => { 'text' => $locale->text('Transdate'), },
1051
    'unit'               => { 'text' => $locale->text('Unit'), },
1052
    'weight'             => { 'text' => $locale->text('Weight'), },
1053
  );
1054

  
1026 1055
  $revers     = $form->{revers};
1027 1056
  $lastsort   = $form->{lastsort};
1028 1057

  
......
1114 1143
  }
1115 1144

  
1116 1145
  # special case for lastcost
1117
  $form->{l_lastcost} = "" if $form->{ledgerchecks};
1146
  if ($form->{ledgerchecks}){
1147
    # zumindestens für den haken 'gekauft' muss das verhalten
1148
    # so sein, das der Verkaufspreis nicht angezeigt
1149
    # wird. In der Backend-Funktion all_parts wird nur mit
1150
    # price gearbeitet
1151
    $column_defs{sellprice}{text} = $locale->text('Price');
1152
    $form->{l_lastcost} = "" 
1153
  }
1118 1154

  
1119 1155
  if ($form->{description}) {
1120 1156
    $description = $form->{description};
......
1164 1200

  
1165 1201
  push @columns, map { "cvar_$_->{name}" } @includeable_custom_variables;
1166 1202

  
1167
  my %column_defs = (
1168
    'bin'                => { 'text' => $locale->text('Bin'), },
1169
    'deliverydate'       => { 'text' => $locale->text('deliverydate'), },
1170
    'description'        => { 'text' => $locale->text('Part Description'), },
1171
    'drawing'            => { 'text' => $locale->text('Drawing'), },
1172
    'image'              => { 'text' => $locale->text('Image'), },
1173
    'invnumber'          => { 'text' => $locale->text('Invoice Number'), },
1174
    'lastcost'           => { 'text' => $locale->text('Last Cost'), },
1175
    'linetotallastcost'  => { 'text' => $locale->text('Extended'), },
1176
    'linetotallistprice' => { 'text' => $locale->text('Extended'), },
1177
    'linetotalsellprice' => { 'text' => $locale->text('Extended'), },
1178
    'listprice'          => { 'text' => $locale->text('List Price'), },
1179
    'microfiche'         => { 'text' => $locale->text('Microfiche'), },
1180
    'name'               => { 'text' => $locale->text('Name'), },
1181
    'onhand'             => { 'text' => $locale->text('Qty'), },
1182
    'ordnumber'          => { 'text' => $locale->text('Order Number'), },
1183
    'partnumber'         => { 'text' => $locale->text('Part Number'), },
1184
    'partsgroup'         => { 'text' => $locale->text('Group'), },
1185
    'priceupdate'        => { 'text' => $locale->text('Updated'), },
1186
    'quonumber'          => { 'text' => $locale->text('Quotation'), },
1187
    'rop'                => { 'text' => $locale->text('ROP'), },
1188
    'sellprice'          => { 'text' => $locale->text('Sell Price'), },
1189
    'serialnumber'       => { 'text' => $locale->text('Serial Number'), },
1190
    'soldtotal'          => { 'text' => $locale->text('soldtotal'), },
1191
    'transdate'          => { 'text' => $locale->text('Transdate'), },
1192
    'unit'               => { 'text' => $locale->text('Unit'), },
1193
    'weight'             => { 'text' => $locale->text('Weight'), },
1194
    %column_defs_cvars,
1195
  );
1203
  %column_defs = (%column_defs,%column_defs_cvars); # nochmal die cvars als überschrift hinzufügen
1196 1204

  
1197 1205
  map { $column_defs{$_}->{visible} = $form->{"l_$_"} ? 1 : 0 } @columns;
1198 1206
  map { $column_defs{$_}->{align}   = 'right' } qw(onhand sellprice listprice lastcost linetotalsellprice linetotallastcost linetotallistprice rop weight soldtotal);

Auch abrufbar als: Unified diff