Merge branch 'von-opendynamic'

Conflicts:
	SL/DB/MetaSetup/InvoiceItem.pm

diff --cc SL/DB/MetaSetup/DeliveryOrderItem.pm
Simple merge

diff --cc SL/DB/MetaSetup/InvoiceItem.pm
index e788b5f,1d73b73..7cd853e
--- 1/SL/DB/MetaSetup/InvoiceItem.pm
--- 2/SL/DB/MetaSetup/InvoiceItem.pm
+++ b/SL/DB/MetaSetup/InvoiceItem.pm
@@@ -15,15 -15,16 +15,16 @@@ __PACKAGE__->meta->columns
    cusordnumber       => { type => 'text' },
    deliverydate       => { type => 'date' },
    description        => { type => 'text' },
 -  discount           => { type => 'float', precision => 4 },
 -  fxsellprice        => { type => 'numeric', precision => 5, scale => 15 },
 +  discount           => { type => 'float', scale => 4 },
+   donumber           => { type => 'text' },
 +  fxsellprice        => { type => 'numeric', precision => 15, scale => 5 },
    id                 => { type => 'integer', not_null => 1, sequence => 'invoiceid' },
    itime              => { type => 'timestamp', default => 'now()' },
 -  lastcost           => { type => 'numeric', precision => 5, scale => 15 },
 +  lastcost           => { type => 'numeric', precision => 15, scale => 5 },
    longdescription    => { type => 'text' },
 -  marge_percent      => { type => 'numeric', precision => 5, scale => 15 },
 -  marge_price_factor => { type => 'numeric', default => 1, precision => 5, scale => 15 },
 -  marge_total        => { type => 'numeric', precision => 5, scale => 15 },
 +  marge_percent      => { type => 'numeric', precision => 15, scale => 5 },
 +  marge_price_factor => { type => 'numeric', default => 1, precision => 15, scale => 5 },
 +  marge_total        => { type => 'numeric', precision => 15, scale => 5 },
    mtime              => { type => 'timestamp' },
    ordnumber          => { type => 'text' },
    parts_id           => { type => 'integer' },

diff --cc SL/DB/MetaSetup/OrderItem.pm
Simple merge

diff --cc doc/dokumentation.xml
Simple merge