Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision 9ebcbe54

Von Kivitendo Admin vor mehr als 7 Jahren hinzugefügt

  • ID 9ebcbe5435ba522400bdd033db69c4019897b100
  • Vorgänger 8666d075
  • Nachfolger 90dcf8dc

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
sub is_assortment { $_[0]->part_type eq 'assortment' }
sub type {
my ($self, $type) = @_;
if (@_ > 1) {
die 'invalid type' unless $type =~ /^(?:part|service|assembly)$/;
$self->assembly( $type eq 'assembly' ? 1 : 0);
$self->inventory_accno_id($type ne 'service' ? 1 : undef);
}
return 'assembly' if $self->assembly;
return 'part' if $self->inventory_accno_id;
return 'service';
return $_[0]->part_type;
# my ($self, $type) = @_;
# if (@_ > 1) {
# die 'invalid type' unless $type =~ /^(?:part|service|assembly)$/;
# $self->assembly( $type eq 'assembly' ? 1 : 0);
# $self->inventory_accno_id($type ne 'service' ? 1 : undef);
# }
# return 'assembly' if $self->assembly;
# return 'part' if $self->inventory_accno_id;
# return 'service';
}
sub new_part {
templates/webpages/ic/tabs/_shop.html
<div id="shop_images" border=1 >[% LxERP.t8('To upload images: Please create shoppart first') %]</div>
[%- END %]
</div>

Auch abrufbar als: Unified diff