projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
TransNumberGenerator: Unterstützung für Kunden-/Lieferantennummernkreise
[kivitendo-erp.git]
/
SL
/
DB
/
Invoice.pm
diff --git
a/SL/DB/Invoice.pm
b/SL/DB/Invoice.pm
index
302179c
..
72844b4
100644
(file)
--- a/
SL/DB/Invoice.pm
+++ b/
SL/DB/Invoice.pm
@@
-7,6
+7,7
@@
use strict;
use Carp;
use List::Util qw(first);
use Carp;
use List::Util qw(first);
+use List::MoreUtils qw(pairwise);
use SL::DB::MetaSetup::Invoice;
use SL::DB::Manager::Invoice;
use SL::DB::MetaSetup::Invoice;
use SL::DB::Manager::Invoice;
@@
-15,9
+16,7
@@
use SL::DB::Helper::LinkedRecords;
use SL::DB::Helper::PriceTaxCalculator;
use SL::DB::Helper::PriceUpdater;
use SL::DB::Helper::TransNumberGenerator;
use SL::DB::Helper::PriceTaxCalculator;
use SL::DB::Helper::PriceUpdater;
use SL::DB::Helper::TransNumberGenerator;
-use SL::DB::AccTransaction;
-use SL::DB::Chart;
-use SL::DB::Employee;
+use SL::DB::CustomVariable;
__PACKAGE__->meta->add_relationship(
invoiceitems => {
__PACKAGE__->meta->add_relationship(
invoiceitems => {
@@
-43,6
+42,18
@@
__PACKAGE__->meta->add_relationship(
__PACKAGE__->meta->initialize;
__PACKAGE__->meta->initialize;
+__PACKAGE__->before_save('_before_save_set_invnumber');
+
+# hooks
+
+sub _before_save_set_invnumber {
+ my ($self) = @_;
+
+ $self->create_trans_number if !$self->invnumber;
+
+ return 1;
+}
+
# methods
sub items { goto &invoiceitems; }
# methods
sub items { goto &invoiceitems; }
@@
-102,11
+113,13
@@
sub new_from {
croak("Unsupported source object type '" . ref($source) . "'") unless ref($source) =~ m/^ SL::DB:: (?: Order | DeliveryOrder ) $/x;
croak("Cannot create invoices for purchase records") unless $source->customer_id;
croak("Unsupported source object type '" . ref($source) . "'") unless ref($source) =~ m/^ SL::DB:: (?: Order | DeliveryOrder ) $/x;
croak("Cannot create invoices for purchase records") unless $source->customer_id;
+ require SL::DB::Employee;
+
my $terms = $source->can('payment_id') && $source->payment_id ? $source->payment_terms->terms_netto : 0;
my %args = ( map({ ( $_ => $source->$_ ) } qw(customer_id taxincluded shippingpoint shipvia notes intnotes salesman_id cusordnumber ordnumber quonumber
department_id cp_id language_id payment_id delivery_customer_id delivery_vendor_id taxzone_id shipto_id
my $terms = $source->can('payment_id') && $source->payment_id ? $source->payment_terms->terms_netto : 0;
my %args = ( map({ ( $_ => $source->$_ ) } qw(customer_id taxincluded shippingpoint shipvia notes intnotes salesman_id cusordnumber ordnumber quonumber
department_id cp_id language_id payment_id delivery_customer_id delivery_vendor_id taxzone_id shipto_id
- globalproject_id transaction_description currency_id)),
+ globalproject_id transaction_description currency_id
delivery_term_id
)),
transdate => DateTime->today_local,
gldate => DateTime->today_local,
duedate => DateTime->today_local->add(days => $terms * 1),
transdate => DateTime->today_local,
gldate => DateTime->today_local,
duedate => DateTime->today_local->add(days => $terms * 1),
@@
-136,6
+149,14
@@
sub new_from {
fxsellprice => $source_item->sellprice,);
} @{ $source->items_sorted };
fxsellprice => $source_item->sellprice,);
} @{ $source->items_sorted };
+ my $i = 0;
+ foreach my $item (@items) {
+ my $source_cvars = $source->items_sorted->[$i]->cvars_by_config;
+ my $target_cvars = $item->cvars_by_config;
+ pairwise { $a->value($b->value) } @{ $target_cvars }, @{ $source_cvars };
+ $i++;
+ }
+
$invoice->invoiceitems(\@items);
return $invoice;
$invoice->invoiceitems(\@items);
return $invoice;
@@
-144,6
+165,7
@@
sub new_from {
sub post {
my ($self, %params) = @_;
sub post {
my ($self, %params) = @_;
+ require SL::DB::Chart;
if (!$params{ar_id}) {
my $chart = SL::DB::Manager::Chart->get_all(query => [ SL::DB::Manager::Chart->link_filter('AR') ],
sort_by => 'id ASC',
if (!$params{ar_id}) {
my $chart = SL::DB::Manager::Chart->get_all(query => [ SL::DB::Manager::Chart->link_filter('AR') ],
sort_by => 'id ASC',
@@
-156,7
+178,6
@@
sub post {
my %data = $self->calculate_prices_and_taxes;
$self->_post_create_assemblyitem_entries($data{assembly_items});
my %data = $self->calculate_prices_and_taxes;
$self->_post_create_assemblyitem_entries($data{assembly_items});
- $self->create_trans_number;
$self->save;
$self->_post_add_acctrans($data{amounts_cogs});
$self->save;
$self->_post_add_acctrans($data{amounts_cogs});
@@
-184,6
+205,8
@@
sub _post_add_acctrans {
my $default_tax_id = SL::DB::Manager::Tax->find_by(taxkey => 0)->id;
my $chart_link;
my $default_tax_id = SL::DB::Manager::Tax->find_by(taxkey => 0)->id;
my $chart_link;
+ require SL::DB::AccTransaction;
+ require SL::DB::Chart;
while (my ($chart_id, $spec) = each %{ $entries }) {
$spec = { taxkey => 0, tax_id => $default_tax_id, amount => $spec } unless ref $spec;
$chart_link = SL::DB::Manager::Chart->find_by(id => $chart_id)->{'link'};
while (my ($chart_id, $spec) = each %{ $entries }) {
$spec = { taxkey => 0, tax_id => $default_tax_id, amount => $spec } unless ref $spec;
$chart_link = SL::DB::Manager::Chart->find_by(id => $chart_id)->{'link'};