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/gitweb/gitweb.cgi/mfinanz.git/commitdiff_plain/fb03d191f53516cbf1022e755665556e7f1acb82?ds=inline;hp=-c

Merge branch 'von-opendynamic'

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

fb03d191f53516cbf1022e755665556e7f1acb82
diff --combined SL/DB/MetaSetup/DeliveryOrderItem.pm
index 00bce8886,54f261f28..76c890abc
--- a/SL/DB/MetaSetup/DeliveryOrderItem.pm
+++ b/SL/DB/MetaSetup/DeliveryOrderItem.pm
@@@ -9,26 -9,26 +9,26 @@@ use base qw(SL::DB::Object)
  __PACKAGE__->meta->table('delivery_order_items');
  
  __PACKAGE__->meta->columns(
 -  base_qty           => { type => 'float', precision => 4 },
 +  base_qty           => { type => 'float', scale => 4 },
    cusordnumber       => { type => 'text' },
    delivery_order_id  => { type => 'integer', not_null => 1 },
    description        => { type => 'text' },
 -  discount           => { type => 'float', precision => 4 },
 +  discount           => { type => 'float', scale => 4 },
    id                 => { type => 'integer', not_null => 1, sequence => 'delivery_order_items_id' },
    itime              => { type => 'timestamp', default => 'now()' },
 -  lastcost           => { type => 'numeric', precision => 5, scale => 15 },
 +  lastcost           => { type => 'numeric', precision => 15, scale => 5 },
    longdescription    => { type => 'text' },
 -  marge_price_factor => { type => 'numeric', default => 1, precision => 5, scale => 15 },
 +  marge_price_factor => { type => 'numeric', default => 1, precision => 15, scale => 5 },
    mtime              => { type => 'timestamp' },
    ordnumber          => { type => 'text' },
    parts_id           => { type => 'integer', not_null => 1 },
 -  price_factor       => { type => 'numeric', default => 1, precision => 5, scale => 15 },
 +  price_factor       => { type => 'numeric', default => 1, precision => 15, scale => 5 },
    price_factor_id    => { type => 'integer' },
    pricegroup_id      => { type => 'integer' },
    project_id         => { type => 'integer' },
 -  qty                => { type => 'numeric', precision => 5, scale => 25 },
 +  qty                => { type => 'numeric', precision => 25, scale => 5 },
    reqdate            => { type => 'date' },
 -  sellprice          => { type => 'numeric', precision => 5, scale => 15 },
 +  sellprice          => { type => 'numeric', precision => 15, scale => 5 },
    serialnumber       => { type => 'text' },
    transdate          => { type => 'text' },
    unit               => { type => 'varchar', length => 20 },
@@@ -63,6 -63,11 +63,11 @@@ __PACKAGE__->meta->foreign_keys
      class       => 'SL::DB::Project',
      key_columns => { project_id => 'id' },
    },
+ 
+   unit_obj => {
+     class       => 'SL::DB::Unit',
+     key_columns => { unit => 'name' },
+   },
  );
  
  1;
diff --combined SL/DB/MetaSetup/InvoiceItem.pm
index e788b5f6c,1d73b7357..7cd853ec2
--- a/SL/DB/MetaSetup/InvoiceItem.pm
+++ b/SL/DB/MetaSetup/InvoiceItem.pm
@@@ -9,30 -9,31 +9,31 @@@ use base qw(SL::DB::Object)
  __PACKAGE__->meta->table('invoice');
  
  __PACKAGE__->meta->columns(
 -  allocated          => { type => 'float', precision => 4 },
 +  allocated          => { type => 'float', scale => 4 },
    assemblyitem       => { type => 'boolean', default => 'false' },
 -  base_qty           => { type => 'float', precision => 4 },
 +  base_qty           => { type => 'float', scale => 4 },
    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' },
 -  price_factor       => { type => 'numeric', default => 1, precision => 5, scale => 15 },
 +  price_factor       => { type => 'numeric', default => 1, precision => 15, scale => 5 },
    price_factor_id    => { type => 'integer' },
    pricegroup_id      => { type => 'integer' },
    project_id         => { type => 'integer' },
 -  qty                => { type => 'float', precision => 4 },
 -  sellprice          => { type => 'numeric', precision => 5, scale => 15 },
 +  qty                => { type => 'float', scale => 4 },
 +  sellprice          => { type => 'numeric', precision => 15, scale => 5 },
    serialnumber       => { type => 'text' },
    subtotal           => { type => 'boolean', default => 'false' },
    trans_id           => { type => 'integer' },
@@@ -64,6 -65,11 +65,11 @@@ __PACKAGE__->meta->foreign_keys
      class       => 'SL::DB::Project',
      key_columns => { project_id => 'id' },
    },
+ 
+   unit_obj => {
+     class       => 'SL::DB::Unit',
+     key_columns => { unit => 'name' },
+   },
  );
  
  1;
diff --combined SL/DB/MetaSetup/OrderItem.pm
index 7a30dc8ee,e3a66d531..85bf5bee6
--- a/SL/DB/MetaSetup/OrderItem.pm
+++ b/SL/DB/MetaSetup/OrderItem.pm
@@@ -9,29 -9,29 +9,29 @@@ use base qw(SL::DB::Object)
  __PACKAGE__->meta->table('orderitems');
  
  __PACKAGE__->meta->columns(
 -  base_qty           => { type => 'float', precision => 4 },
 +  base_qty           => { type => 'float', scale => 4 },
    cusordnumber       => { type => 'text' },
    description        => { type => 'text' },
 -  discount           => { type => 'float', precision => 4 },
 +  discount           => { type => 'float', scale => 4 },
    id                 => { type => 'integer', not_null => 1, sequence => 'orderitemsid' },
    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' },
 -  price_factor       => { type => 'numeric', default => 1, precision => 5, scale => 15 },
 +  price_factor       => { type => 'numeric', default => 1, precision => 15, scale => 5 },
    price_factor_id    => { type => 'integer' },
    pricegroup_id      => { type => 'integer' },
    project_id         => { type => 'integer' },
 -  qty                => { type => 'float', precision => 4 },
 +  qty                => { type => 'float', scale => 4 },
    reqdate            => { type => 'date' },
 -  sellprice          => { type => 'numeric', precision => 5, scale => 15 },
 +  sellprice          => { type => 'numeric', precision => 15, scale => 5 },
    serialnumber       => { type => 'text' },
 -  ship               => { type => 'float', precision => 4 },
 +  ship               => { type => 'float', scale => 4 },
    subtotal           => { type => 'boolean', default => 'false' },
    trans_id           => { type => 'integer' },
    transdate          => { type => 'text' },
@@@ -67,6 -67,11 +67,11 @@@ __PACKAGE__->meta->foreign_keys
      class       => 'SL::DB::Project',
      key_columns => { project_id => 'id' },
    },
+ 
+   unit_obj => {
+     class       => 'SL::DB::Unit',
+     key_columns => { unit => 'name' },
+   },
  );
  
  1;
diff --combined doc/dokumentation.xml
index 0f6fca557,96a8de2d3..aeeb56fce
--- a/doc/dokumentation.xml
+++ b/doc/dokumentation.xml
@@@ -286,10 -286,6 +286,10 @@@ tar xvzf kivitendo-erp-3.1.0.tgz</progr
        Webserverkonfiguration benutzen, um auf das tatsächliche
        Installationsverzeichnis zu verweisen.</para>
  
 +      <para>Bei einer Neuinstallation der Version 3.1.0 muß das WebDAV Verzeichnis derzeit manuell angelegt werden:</para>
 +
 +      <programlisting>mkdir webdav</programlisting>
 +
        <para>Die Verzeichnisse <filename>users</filename>, <filename>spool</filename> und <filename>webdav</filename> müssen für den Benutzer
        beschreibbar sein, unter dem der Webserver läuft. Die restlichen Dateien müssen für diesen Benutzer lesbar sein. Die Benutzer- und
        Gruppennamen sind bei verschiedenen Distributionen unterschiedlich (z.B. bei Debian/Ubuntu <constant>www-data</constant>, bei Fedora
@@@ -1616,12 -1612,12 +1616,12 @@@ ln -s $(pwd)/kivitendo-task-server.serv
        </sect2>
  
        <sect2 id="Vorlagen-RB">
 -        <title>RB</title>
 +        <title>Der Druckvorlagensatz RB</title>
  
 -        <para>Vollständiger Dokumentensatz mit alternativem Design</para>
 -        <para>Die konzeptionelle Idee wird <ulink
 +        <para>Hierbei handelt es sich um einen vollständigen Dokumentensatz mit alternativem Design.</para>
 +        <para>Die konzeptionelle Idee der Vorlagen wird <ulink
            url="http://www.kivitendo-support.de/vortraege/Lx-Office%20Anwendertreffen%20LaTeX-Druckvorlagen-Teil3-finale.pdf">hier</ulink>
 -          auf Folie 5 bis 10 vorgestellt, Detaileinstellungen dann im Readme.tex im Vorlagenverzeichnis.</para>
 +          auf Folie 5 bis 10 vorgestellt. Informationen zur Anpassung an die eigenen Firmendaten finden sich in der Datei Readme.tex im Vorlagenverzeichnis.</para>
  
        </sect2>
  
@@@ -3777,6 -3773,15 +3777,15 @@@
                </listitem>
              </varlistentry>
  
+             <varlistentry>
+               <term><varname>donumber_do</varname></term>
+ 
+               <listitem>
+                 <para>Lieferscheinnummer desjenigen Lieferscheins, aus dem die Position stammt, sofern die Rechnung aus einem oder
+                 mehreren Lieferscheinen erstellt wurde</para>
+               </listitem>
+             </varlistentry>
+ 
              <varlistentry>
                <term><varname>p_discount</varname></term>