From: Moritz Bunkus <m.bunkus@linet-services.de>
Date: Tue, 4 Mar 2014 12:18:38 +0000 (+0100)
Subject: Merge branch 'von-opendynamic'
X-Git-Tag: release-3.2.0beta~491
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=fb03d191f53516cbf1022e755665556e7f1acb82;p=kivitendo-erp.git

Merge branch 'von-opendynamic'

Conflicts:
	SL/DB/MetaSetup/InvoiceItem.pm
---

fb03d191f53516cbf1022e755665556e7f1acb82
diff --cc SL/DB/MetaSetup/InvoiceItem.pm
index e788b5f6c,1d73b7357..7cd853ec2
--- a/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' },