projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
POD Syntaxfehler
[kivitendo-erp.git]
/
SL
/
DB
/
Order.pm
diff --git
a/SL/DB/Order.pm
b/SL/DB/Order.pm
index
8909b7e
..
a605a36
100644
(file)
--- a/
SL/DB/Order.pm
+++ b/
SL/DB/Order.pm
@@
-30,6
+30,12
@@
__PACKAGE__->meta->add_relationship(
class => 'SL::DB::PeriodicInvoicesConfig',
column_map => { id => 'oe_id' },
},
class => 'SL::DB::PeriodicInvoicesConfig',
column_map => { id => 'oe_id' },
},
+ custom_shipto => {
+ type => 'one to one',
+ class => 'SL::DB::Shipto',
+ column_map => { id => 'trans_id' },
+ query_args => [ module => 'OE' ],
+ },
);
__PACKAGE__->meta->initialize;
);
__PACKAGE__->meta->initialize;
@@
-144,15
+150,16
@@
sub convert_to_invoice {
}
sub convert_to_delivery_order {
}
sub convert_to_delivery_order {
- my ($self,
%param
s) = @_;
+ my ($self,
@arg
s) = @_;
my ($delivery_order, $custom_shipto);
if (!$self->db->with_transaction(sub {
require SL::DB::DeliveryOrder;
my ($delivery_order, $custom_shipto);
if (!$self->db->with_transaction(sub {
require SL::DB::DeliveryOrder;
- ($delivery_order, $custom_shipto) = SL::DB::DeliveryOrder->new_from($self);
+ ($delivery_order, $custom_shipto) = SL::DB::DeliveryOrder->new_from($self
, @args
);
$delivery_order->save;
$custom_shipto->save if $custom_shipto;
$self->link_to_record($delivery_order);
$delivery_order->save;
$custom_shipto->save if $custom_shipto;
$self->link_to_record($delivery_order);
+ $self->update_attributes(delivered => 1);
1;
})) {
return wantarray ? () : undef;
1;
})) {
return wantarray ? () : undef;
@@
-212,7
+219,9
@@
Returns true if the order is of the given type.
Creates a new delivery order with C<$self> as the basis by calling
L<SL::DB::DeliveryOrder::new_from>. That delivery order is saved, and
Creates a new delivery order with C<$self> as the basis by calling
L<SL::DB::DeliveryOrder::new_from>. That delivery order is saved, and
-C<$self> is linked to the new invoice via L<SL::DB::RecordLink>.
+C<$self> is linked to the new invoice via
+L<SL::DB::RecordLink>. C<$self>'s C<delivered> attribute is set to
+C<true>, and C<$self> is saved.
The arguments in C<%params> are passed to
L<SL::DB::DeliveryOrder::new_from>.
The arguments in C<%params> are passed to
L<SL::DB::DeliveryOrder::new_from>.