Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision f89d1cc5

Von Kivitendo Admin vor mehr als 6 Jahren hinzugefügt

  • ID f89d1cc5159642ee83c0a7fc55b4854e0e3dbd0f
  • Vorgänger 0598db02
  • Nachfolger 23e5d59e

Shopmodul: Shop und ShopParts Mergefehler

Shop - Einführung von ShopParts

Erster Test mit einem Shop Reiter in Artikelmaske

Conflicts:
SL/IC.pm

Conflicts:
SL/DB/MetaSetup/ShopPart.pm
templates/webpages/ic/tabs/_shop.html

Shop - Rose shop_parts Verknüpfungen von Shop und Part

Conflicts:
SL/DB/Shop.pm

Shop - SL/Shop and Shop Controller for editing shop configs

Conflicts:
SL/DB/Shop.pm

Conflicts:
SL/DB/Helper/ALL.pm
SL/DB/Helper/Mappings.pm

Unterschiede anzeigen:

SL/DB/Part.pm
134 134
sub is_assortment { $_[0]->part_type eq 'assortment' }
135 135

  
136 136
sub type {
137
  my ($self, $type) = @_;
138
  if (@_ > 1) {
139
    die 'invalid type' unless $type =~ /^(?:part|service|assembly)$/;
140
    $self->assembly(          $type eq 'assembly' ? 1 : 0);
141
    $self->inventory_accno_id($type ne 'service'  ? 1 : undef);
142
  }
143

  
144
  return 'assembly' if $self->assembly;
145
  return 'part'     if $self->inventory_accno_id;
146
  return 'service';
137
  return $_[0]->part_type;
138
  # my ($self, $type) = @_;
139
  # if (@_ > 1) {
140
  #   die 'invalid type' unless $type =~ /^(?:part|service|assembly)$/;
141
  #   $self->assembly(          $type eq 'assembly' ? 1 : 0);
142
  #   $self->inventory_accno_id($type ne 'service'  ? 1 : undef);
143
  # }
144

  
145
  # return 'assembly' if $self->assembly;
146
  # return 'part'     if $self->inventory_accno_id;
147
  # return 'service';
147 148
}
148 149

  
149 150
sub new_part {
templates/webpages/ic/tabs/_shop.html
88 88
    <div id="shop_images" border=1 >[% LxERP.t8('To upload images: Please create shoppart first') %]</div>
89 89
  [%- END %]
90 90
</div>
91

  

Auch abrufbar als: Unified diff