projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of github.com:kivitendo/kivitendo-erp
[kivitendo-erp.git]
/
SL
/
DB
/
Order.pm
diff --git
a/SL/DB/Order.pm
b/SL/DB/Order.pm
index
2546c4f
..
f73e32c
100644
(file)
--- a/
SL/DB/Order.pm
+++ b/
SL/DB/Order.pm
@@
-9,6
+9,8
@@
use List::Util qw(max);
use SL::DB::MetaSetup::Order;
use SL::DB::Manager::Order;
use SL::DB::MetaSetup::Order;
use SL::DB::Manager::Order;
+use SL::DB::Helper::AttrHTML;
+use SL::DB::Helper::AttrSorted;
use SL::DB::Helper::FlattenToForm;
use SL::DB::Helper::LinkedRecords;
use SL::DB::Helper::PriceTaxCalculator;
use SL::DB::Helper::FlattenToForm;
use SL::DB::Helper::LinkedRecords;
use SL::DB::Helper::PriceTaxCalculator;
@@
-41,6
+43,9
@@
__PACKAGE__->meta->add_relationship(
__PACKAGE__->meta->initialize;
__PACKAGE__->meta->initialize;
+__PACKAGE__->attr_html('notes');
+__PACKAGE__->attr_sorted('items');
+
__PACKAGE__->before_save('_before_save_set_ord_quo_number');
# hooks
__PACKAGE__->before_save('_before_save_set_ord_quo_number');
# hooks
@@
-63,12
+68,6
@@
sub _before_save_set_ord_quo_number {
sub items { goto &orderitems; }
sub add_items { goto &add_orderitems; }
sub items { goto &orderitems; }
sub add_items { goto &add_orderitems; }
-sub items_sorted {
- my ($self) = @_;
-
- return [ sort {$a->id <=> $b->id } @{ $self->items } ];
-}
-
sub type {
my $self = shift;
sub type {
my $self = shift;
@@
-183,6
+182,10
@@
sub number {
return $self->${ \ $number_method{$self->type} }(@_);
}
return $self->${ \ $number_method{$self->type} }(@_);
}
+sub customervendor {
+ $_[0]->is_sales ? $_[0]->customer : $_[0]->vendor;
+}
+
sub date {
goto &transdate;
}
sub date {
goto &transdate;
}