From: Holger Lindemann Date: Wed, 27 Oct 2010 05:30:12 +0000 (+0200) Subject: Merge branch 'master' of ssh://lx-office/~/lx-office-erp X-Git-Tag: release-2.6.2beta1~89^2~6 X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=6f2893dcf199d5e5147cc2020c2ab6984f4274dc;hp=f1775ca0fea68a43a23d04fa3bd88108024a0728;p=kivitendo-erp.git Merge branch 'master' of ssh://lx-office/~/lx-office-erp --- diff --git a/SL/DB/Buchungsgruppe.pm b/SL/DB/Buchungsgruppe.pm index 2dffaa5a9..26f446b33 100644 --- a/SL/DB/Buchungsgruppe.pm +++ b/SL/DB/Buchungsgruppe.pm @@ -10,4 +10,20 @@ use SL::DB::MetaSetup::Buchungsgruppe; # Creates get_all, get_all_count, get_all_iterator, delete_all and update_all. __PACKAGE__->meta->make_manager_class; +sub income_accno_id { + my ($self, $taxzone) = @_; + my $taxzone_id = ref $taxzone && $taxzone->isa('SL::DB::TaxZone') ? $taxzone->id : $taxzone; + my $method = 'income_accno_id_' . $taxzone_id; + + return $self->$method; +} + +sub expense_accno_id { + my ($self, $taxzone) = @_; + my $taxzone_id = ref $taxzone && $taxzone->isa('SL::DB::TaxZone') ? $taxzone->id : $taxzone; + my $method = 'expense_accno_id_' . $taxzone_id; + + return $self->$method; +} + 1; diff --git a/SL/DB/Helpers/Metadata.pm b/SL/DB/Helpers/Metadata.pm index 30c59f428..e6020a287 100644 --- a/SL/DB/Helpers/Metadata.pm +++ b/SL/DB/Helpers/Metadata.pm @@ -17,7 +17,7 @@ sub default_manager_base_class { sub initialize { my $self = shift; - $self->make_attr_auto_helpers; + $self->make_attr_auto_helpers unless $self->is_initialized; $self->SUPER::initialize(@_); } diff --git a/SL/DB/Part.pm b/SL/DB/Part.pm index 52b7520fa..ce9738f32 100644 --- a/SL/DB/Part.pm +++ b/SL/DB/Part.pm @@ -18,6 +18,11 @@ __PACKAGE__->meta->add_relationships( class => 'SL::DB::Assembly', column_map => { id => 'id' }, }, + partsgroup => { + type => 'one to one', + class => 'SL::DB::PartsGroup', + column_map => { partsgroup_id => 'id' }, + }, ); __PACKAGE__->meta->initialize; @@ -25,19 +30,59 @@ __PACKAGE__->meta->initialize; sub is_type { my $self = shift; my $type = lc(shift || ''); + die 'invalid type' unless $type =~ /^(?:part|service|assembly)$/; - if ($type =~ m/^part/) { - return !$self->assembly && $self->inventory_accno_id ? 1 : 0; - - } elsif ($type =~ m/^service/) { - return !$self->inventory_accno_id && !$self->assembly ? 1 : 0; + return $self->type eq $type ? 1 : 0; +} - } elsif ($type =~ m/^assembl/) { - return $self->assembly ? 1 : 0; +sub is_part { $_[0]->is_type('part') } +sub is_assembly { $_[0]->is_type('assembly') } +sub is_service { $_[0]->is_type('service') } +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); } - confess "Unknown type parameter '$type'"; + return 'assembly' if $self->assembly; + return 'part' if $self->inventory_accno_id; + return 'service'; +} + +sub new_part { + my ($class, %params) = @_; + $class->new(%params, type => 'part'); +} + +sub new_assembly { + my ($class, %params) = @_; + $class->new(%params, type => 'assembly'); +} + +sub new_service { + my ($class, %params) = @_; + $class->new(%params, type => 'service'); +} + +sub orphaned { + my ($self) = @_; + die 'not an accessor' if @_ > 1; + + my @relations = qw( + SL::DB::InvoiceItem + SL::DB::OrderItem + SL::DB::Inventory + SL::DB::RMAItem + ); + + for my $class (@relations) { + eval "require $class"; + return 0 if $class->_get_manager_class->get_all_count(query => [ parts_id => $self->id ]); + } + return 1; } sub get_sellprice_info { @@ -63,6 +108,11 @@ sub available_units { shift->unit_obj->convertible_units; } +# autogenerated accessor is slightly off... +sub buchungsgruppe { + shift->buchungsgruppen(@_); +} + 1; __END__ @@ -77,11 +127,47 @@ SL::DB::Part: Model for the 'parts' table This is a standard Rose::DB::Object based model and can be used as one. -=head1 FUNCTIONS +=head1 TYPES + +Although the base class is called C we usually talk about C if +we mean instances of this class. This is because articles come in three +flavours called: =over 4 -=item is_type $type +=item Part - a single part + +=item Service - a part without onhand, and without inventory accounting + +=item Assembly - a collection of both parts and services + +=back + +These types are sadly represented by data inside the class and cannot be +migrated into a flag. To work around this, each C object knows what type +it currently is. Since the type ist data driven, there ist no explicit setting +method for it, but you can construct them explicitly with C, +C, and C. A Buchungsgruppe should be supplied in this +case, but it will use the default Buchungsgruppe if you don't. + +Matching these there are assorted helper methods dealing with type: + +=head2 new_part PARAMS + +=head2 new_service PARAMS + +=head2 new_assembly PARAMS + +Will set the appropriate data fields so that the resulting instance will be of +tthe requested type. Since part of the distinction are accounting targets, +providing a C is recommended. If none is given the constructor +will load a default one and set the accounting targets from it. + +=head2 type + +Returns the type as a string. Can be one of C, C, C. + +=head2 is_type TYPE Tests if the current object is a part, a service or an assembly. C<$type> must be one of the words 'part', 'service' or @@ -90,7 +176,17 @@ assembly. C<$type> must be one of the words 'part', 'service' or Returns 1 if the requested type matches, 0 if it doesn't and Ces if an unknown C<$type> parameter is encountered. -=item get_sellprice_info %params +=head2 is_part + +=head2 is_service + +=head2 is_assembly + +Shorthand for is_type('part') etc. + +=head1 FUNCTIONS + +=head2 get_sellprice_info %params Retrieves the C and C for a part under different conditions and returns a hash reference with those two keys. @@ -104,17 +200,21 @@ entry without a country set will be used. If none of the above conditions is met then the information from C<$self> is used. -=item get_ordered_qty %params +=head2 get_ordered_qty %params Retrieves the quantity that has been ordered from a vendor but that has not been delivered yet. Only open purchase orders are considered. -=item get_uncommissioned_qty %params +=head2 orphaned -Retrieves the quantity that has been ordered by a customer but that -has not been commissioned yet. Only open sales orders are considered. +Checks if this articke is used in orders, invoices, delivery orders or +assemblies. -=back +=head2 buchungsgruppe BUCHUNGSGRUPPE + +Used to set the accounting informations from a L object. +Please note, that this is a write only accessor, the original Buchungsgruppe can +not be retrieved from an article once set. =head1 AUTHOR diff --git a/SL/Form.pm b/SL/Form.pm index 56e46f798..f3fe6e5d9 100644 --- a/SL/Form.pm +++ b/SL/Form.pm @@ -56,7 +56,7 @@ use SL::User; use Template; use URI; use List::Util qw(first max min sum); -use List::MoreUtils qw(any); +use List::MoreUtils qw(any apply); use strict; @@ -828,13 +828,13 @@ sub _prepare_html_template { } if (%main::myconfig) { - map({ $additional_params->{"myconfig_${_}"} = $main::myconfig{$_}; } keys(%main::myconfig)); - my $jsc_dateformat = $main::myconfig{"dateformat"}; - $jsc_dateformat =~ s/d+/\%d/gi; - $jsc_dateformat =~ s/m+/\%m/gi; - $jsc_dateformat =~ s/y+/\%Y/gi; - $additional_params->{"myconfig_jsc_dateformat"} = $jsc_dateformat; + $::myconfig{jsc_dateformat} = apply { + s/d+/\%d/gi; + s/m+/\%m/gi; + s/y+/\%Y/gi; + } $::myconfig{"dateformat"}; $additional_params->{"myconfig"} ||= \%::myconfig; + map { $additional_params->{"myconfig_${_}"} = $main::myconfig{$_}; } keys %::myconfig; } $additional_params->{"conf_dbcharset"} = $main::dbcharset; @@ -2018,7 +2018,7 @@ sub add_shipto { my @values; foreach my $item (qw(name department_1 department_2 street zipcode city country - contact phone fax email)) { + contact cp_gender phone fax email)) { if ($self->{"shipto$item"}) { $shipto = 1 if ($self->{$item} ne $self->{"shipto$item"}); } @@ -2036,6 +2036,7 @@ sub add_shipto { shiptocity = ?, shiptocountry = ?, shiptocontact = ?, + shiptocp_gender = ?, shiptophone = ?, shiptofax = ?, shiptoemail = ? @@ -2051,6 +2052,7 @@ sub add_shipto { shiptocity = ? AND shiptocountry = ? AND shiptocontact = ? AND + shiptocp_gender = ? AND shiptophone = ? AND shiptofax = ? AND shiptoemail = ? AND @@ -2061,8 +2063,8 @@ sub add_shipto { $query = qq|INSERT INTO shipto (trans_id, shiptoname, shiptodepartment_1, shiptodepartment_2, shiptostreet, shiptozipcode, shiptocity, shiptocountry, - shiptocontact, shiptophone, shiptofax, shiptoemail, module) - VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)|; + shiptocontact, shiptocp_gender, shiptophone, shiptofax, shiptoemail, module) + VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)|; do_query($self, $dbh, $query, $id, @values, $module); } } diff --git a/SL/Mailer.pm b/SL/Mailer.pm index 9ef0b085b..17981331d 100644 --- a/SL/Mailer.pm +++ b/SL/Mailer.pm @@ -31,6 +31,7 @@ package Mailer; use Email::Address; +use Encode; use SL::Common; use SL::MIME; @@ -103,14 +104,14 @@ sub send { $num_sent++; my $boundary = time() . "-$$-${num_sent}"; $boundary = "LxOffice-$self->{version}-$boundary"; - my $domain = $self->{from}; + my $domain = $self->recode($self->{from}); $domain =~ s/(.*?\@|>)//g; my $msgid = "$boundary\@$domain"; my $form = $main::form; my $myconfig = \%main::myconfig; - my $email = $myconfig->{email}; + my $email = $self->recode($myconfig->{email}); $email =~ s/[^\w\.\-\+=@]//ig; my %temp_form = ( %{ $form }, 'myconfig_email' => $email ); @@ -127,12 +128,15 @@ sub send { foreach my $item (qw(to cc bcc)) { next unless ($self->{$item}); + $self->{$item} = $self->recode($self->{$item}); $self->{$item} =~ s/\</{$item} =~ s/\$<\$/{$item} =~ s/\>/>/g; $self->{$item} =~ s/\$>\$/>/g; } + $self->{from} = $self->recode($self->{from}); + my $headers = ''; foreach my $item (qw(from to cc bcc)) { next unless ($self->{$item}); @@ -151,7 +155,7 @@ sub send { } } - $headers .= sprintf("Subject: %s\n", $self->mime_quote_text($self->{subject}, 60)); + $headers .= sprintf("Subject: %s\n", $self->mime_quote_text($self->recode($self->{subject}), 60)); print OUT qq|${headers}Message-ID: <$msgid> X-Mailer: Lx-Office $self->{version} @@ -166,7 +170,7 @@ MIME-Version: 1.0 print OUT qq|--${boundary} Content-Type: $self->{contenttype}; charset="$self->{charset}" -$self->{message} +| . $self->recode($self->{message}) . qq| |; } @@ -223,7 +227,7 @@ Content-Disposition: attachment; filename="$filename"\n\n|; } else { print OUT qq|Content-Type: $self->{contenttype}; charset="$self->{charset}" -$self->{message} +| . $self->recode($self->{message}) . qq| |; } @@ -262,5 +266,12 @@ sub encode_base64 ($;$) { return $res; } +sub recode { + my $self = shift; + my $text = shift; + + return $::locale->is_utf8 ? Encode::encode('utf-8-strict', $text) : $text; +} + 1; diff --git a/SL/Template/LaTeX.pm b/SL/Template/LaTeX.pm index c515187ce..8aac39dbb 100644 --- a/SL/Template/LaTeX.pm +++ b/SL/Template/LaTeX.pm @@ -55,7 +55,7 @@ sub parse_foreach { for (my $i = 0; $i < scalar(@{$ary}); $i++) { # do magic markers - $form->{"__first__"} = $i == 1; + $form->{"__first__"} = $i == 0; $form->{"__last__"} = ($i + 1) == scalar(@{$ary}); $form->{"__odd__"} = (($i + 1) % 2) == 1; $form->{"__counter__"} = $i + 1; diff --git a/SL/Template/Plugin/L.pm b/SL/Template/Plugin/L.pm index 692c39663..d1ecdbd8c 100644 --- a/SL/Template/Plugin/L.pm +++ b/SL/Template/Plugin/L.pm @@ -5,6 +5,15 @@ use Template::Plugin; use strict; +{ # This will give you an id for identifying html tags and such. + # It's guaranteed to be unique unless you exceed 10 mio calls per request. + # Do not use these id's to store information across requests. +my $_id_sequence = int rand 1e7; +sub _tag_id { + return $_id_sequence = ($_id_sequence + 1) % 1e7; +} +} + sub _H { my $string = shift; return $::locale->quote_special_chars('HTML', $string); @@ -132,6 +141,36 @@ sub options_for_select { return $code; } +sub javascript { + my ($self, $data) = @_; + return $self->html_tag('script', $data, type => 'text/javascript'); +} + +sub date_tag { + my ($self, $name, $value, @slurp) = @_; + my %params = _hashify(@slurp); + my $name_e = _H($name); + my $seq = _tag_id(); + + $params{cal_align} ||= 'BR'; + + $self->input_tag($name, $value, + size => 11, + title => _H($::myconfig{dateformat}), + onBlur => 'check_right_date_format(this)', + %params, + ) . ((!$params{no_cal}) ? + $self->html_tag('img', undef, + src => 'image/calendar.png', + id => "trigger$seq", + title => _H($::myconfig{dateformat}), + %params, + ) . + $self->javascript( + "Calendar.setup({ inputField: '$name_e', ifFormat: '$::myconfig{jsc_dateformat}', align: '$params{cal_align}', button: 'trigger$seq' });" + ) : ''); +} + 1; __END__ @@ -213,6 +252,16 @@ If C<%attributes> contains a key C