projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Vorschläge für Kontoauszüge verbessern, fall: remote_account_number
[kivitendo-erp.git]
/
SL
/
DB
/
ShopOrder.pm
diff --git
a/SL/DB/ShopOrder.pm
b/SL/DB/ShopOrder.pm
index
eef7b6c
..
0039902
100644
(file)
--- a/
SL/DB/ShopOrder.pm
+++ b/
SL/DB/ShopOrder.pm
@@
-48,7
+48,8
@@
sub convert_to_sales_order {
}else{
my $current_order_item = SL::DB::OrderItem->new(
parts_id => $part->id,
}else{
my $current_order_item = SL::DB::OrderItem->new(
parts_id => $part->id,
- description => $part->description,
+ description => $_->description, # description from the shop
+ longdescription => $part->notes, # longdescription from parts. TODO locales
qty => $_->quantity,
sellprice => $_->price,
unit => $part->unit,
qty => $_->quantity,
sellprice => $_->price,
unit => $part->unit,
@@
-188,7
+189,8
@@
sub get_customer{
my $customer_proposals = $self->check_for_existing_customers;
my $name = $self->billing_firstname . " " . $self->billing_lastname;
my $customer = 0;
my $customer_proposals = $self->check_for_existing_customers;
my $name = $self->billing_firstname . " " . $self->billing_lastname;
my $customer = 0;
- my $payment_id = SL::DB::Manager::PaymentTerm->get_first()->id || undef;
+ my $default_payment = SL::DB::Manager::PaymentTerm->get_first();
+ my $payment_id = $default_payment ? $default_payment->id : undef;
if(!scalar(@{$customer_proposals})){
my %address = ( 'name' => $name,
'department_1' => $self->billing_company,
if(!scalar(@{$customer_proposals})){
my %address = ( 'name' => $name,
'department_1' => $self->billing_company,