projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Telefonnotizen Angebot/Auftrag
[kivitendo-erp.git]
/
SL
/
DB
/
Order.pm
diff --git
a/SL/DB/Order.pm
b/SL/DB/Order.pm
index
cfe8af4
..
fdaa1e8
100644
(file)
--- a/
SL/DB/Order.pm
+++ b/
SL/DB/Order.pm
@@
-47,6
+47,16
@@
__PACKAGE__->meta->add_relationship(
class => 'SL::DB::Exchangerate',
column_map => { currency_id => 'currency_id', transdate => 'transdate' },
},
class => 'SL::DB::Exchangerate',
column_map => { currency_id => 'currency_id', transdate => 'transdate' },
},
+ phone_notes => {
+ type => 'one to many',
+ class => 'SL::DB::Note',
+ column_map => { id => 'trans_id' },
+ query_args => [ trans_module => 'oe' ],
+ manager_args => {
+ with_objects => [ 'employee' ],
+ sort_by => 'notes.itime',
+ }
+ },
);
SL::DB::Helper::Attr::make(__PACKAGE__, daily_exchangerate => 'numeric');
);
SL::DB::Helper::Attr::make(__PACKAGE__, daily_exchangerate => 'numeric');
@@
-238,7
+248,7
@@
sub convert_to_invoice {
my $invoice;
if (!$self->db->with_transaction(sub {
require SL::DB::Invoice;
my $invoice;
if (!$self->db->with_transaction(sub {
require SL::DB::Invoice;
- $invoice = SL::DB::Invoice->new_from($self
)->post(%params)
|| die;
+ $invoice = SL::DB::Invoice->new_from($self
, %params)->post
|| die;
$self->link_to_record($invoice);
# TODO extend link_to_record for items, otherwise long-term no d.r.y.
foreach my $item (@{ $invoice->items }) {
$self->link_to_record($invoice);
# TODO extend link_to_record for items, otherwise long-term no d.r.y.
foreach my $item (@{ $invoice->items }) {
@@
-345,7
+355,7
@@
sub new_from {
my %args = ( map({ ( $_ => $source->$_ ) } qw(amount cp_id currency_id cusordnumber customer_id delivery_customer_id delivery_term_id delivery_vendor_id
department_id exchangerate globalproject_id intnotes marge_percent marge_total language_id netamount notes
ordnumber payment_id quonumber reqdate salesman_id shippingpoint shipvia taxincluded tax_point taxzone_id
my %args = ( map({ ( $_ => $source->$_ ) } qw(amount cp_id currency_id cusordnumber customer_id delivery_customer_id delivery_term_id delivery_vendor_id
department_id exchangerate globalproject_id intnotes marge_percent marge_total language_id netamount notes
ordnumber payment_id quonumber reqdate salesman_id shippingpoint shipvia taxincluded tax_point taxzone_id
- transaction_description vendor_id
+ transaction_description vendor_id
billing_address_id
)),
quotation => !!($destination_type =~ m{quotation$}),
closed => 0,
)),
quotation => !!($destination_type =~ m{quotation$}),
closed => 0,
@@
-616,7
+626,7
@@
L<SL::DB::Invoice::new_from>. That invoice is posted, and C<$self> is
linked to the new invoice via L<SL::DB::RecordLink>. C<$self>'s
C<closed> attribute is set to C<true>, and C<$self> is saved.
linked to the new invoice via L<SL::DB::RecordLink>. C<$self>'s
C<closed> attribute is set to C<true>, and C<$self> is saved.
-The arguments in C<%params> are passed to L<SL::DB::Invoice::
post
>.
+The arguments in C<%params> are passed to L<SL::DB::Invoice::
new_from
>.
Returns the new invoice instance on success and C<undef> on
failure. The whole process is run inside a transaction. On failure
Returns the new invoice instance on success and C<undef> on
failure. The whole process is run inside a transaction. On failure