From: G. Richardson <information@kivitendo-premium.de>
Date: Mon, 29 Feb 2016 10:55:43 +0000 (+0100)
Subject: Standardforderungskonto und Verbindlichkeitskonto in Mandantenkonfiguration
X-Git-Tag: release-3.4.1~384
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=8917f20a9741fe87460d1f9158a73807ec3c228c;p=kivitendo-erp.git

Standardforderungskonto und Verbindlichkeitskonto in Mandantenkonfiguration

Dort kann man in Zukunft angeben, welche Konten vorausgewählt sein
sollen.
Wird allerdings noch nicht in den Masken benutzt.
---

diff --git a/SL/DB/MetaSetup/Default.pm b/SL/DB/MetaSetup/Default.pm
index 20610fd3b..4be812b38 100644
--- a/SL/DB/MetaSetup/Default.pm
+++ b/SL/DB/MetaSetup/Default.pm
@@ -16,8 +16,10 @@ __PACKAGE__->meta->columns(
   allow_sales_invoice_from_sales_order      => { type => 'boolean', default => 'true', not_null => 1 },
   allow_sales_invoice_from_sales_quotation  => { type => 'boolean', default => 'true', not_null => 1 },
   ap_changeable                             => { type => 'integer', default => 2, not_null => 1 },
+  ap_chart_id                               => { type => 'integer' },
   ap_show_mark_as_paid                      => { type => 'boolean', default => 'true' },
   ar_changeable                             => { type => 'integer', default => 2, not_null => 1 },
+  ar_chart_id                               => { type => 'integer' },
   ar_paid_accno_id                          => { type => 'integer' },
   ar_show_mark_as_paid                      => { type => 'boolean', default => 'true' },
   articlenumber                             => { type => 'text' },
@@ -124,6 +126,15 @@ __PACKAGE__->meta->primary_key_columns([ 'id' ]);
 __PACKAGE__->meta->allow_inline_column_values(1);
 
 __PACKAGE__->meta->foreign_keys(
+  ap_chart => {
+    class       => 'SL::DB::Chart',
+    key_columns => { ap_chart_id => 'id' },
+  },
+
+  ar_chart => {
+    class       => 'SL::DB::Chart',
+    key_columns => { ar_chart_id => 'id' },
+  },
   bin => {
     class       => 'SL::DB::Bin',
     key_columns => { bin_id => 'id' },
diff --git a/locale/de/all b/locale/de/all
index c97e2d289..fea9c4b25 100755
--- a/locale/de/all
+++ b/locale/de/all
@@ -1928,6 +1928,7 @@ $self->{texts} = {
   'Password'                    => 'Passwort',
   'Paste'                       => 'Einfügen',
   'Paste template'              => 'Vorlage einfügen',
+  'Payable account'             => 'Verbindlichkeitskonto',
   'Payables'                    => 'Verbindlichkeiten',
   'Payment'                     => 'Zahlungsausgang',
   'Payment / Delivery Options'  => 'Zahlungs- und Lieferoptionen',
@@ -2170,6 +2171,7 @@ $self->{texts} = {
   'Receipt posted!'             => 'Beleg gebucht!',
   'Receipt, payment, reconciliation' => 'Zahlungseingang, Zahlungsausgang, Kontenabgleich',
   'Receipts'                    => 'Zahlungseingänge',
+  'Receivable account'          => 'Forderungskonto',
   'Receivables'                 => 'Forderungen',
   'Recipients'                  => 'EmpfängerInnen',
   'Reconcile'                   => 'Abgleichen',
diff --git a/sql/Pg-upgrade2/receivable_payable_default_accounts.sql b/sql/Pg-upgrade2/receivable_payable_default_accounts.sql
new file mode 100644
index 000000000..b1346ac3f
--- /dev/null
+++ b/sql/Pg-upgrade2/receivable_payable_default_accounts.sql
@@ -0,0 +1,7 @@
+-- @tag: ar_ap_default
+-- @description: Standardkonten für Forderungen und Verbindlichkeiten
+-- @depends: release_3_2_0
+ALTER TABLE defaults ADD COLUMN ap_chart_id integer;
+ALTER TABLE defaults ADD FOREIGN KEY (ap_chart_id) REFERENCES chart (id);
+ALTER TABLE defaults ADD COLUMN ar_chart_id integer;
+ALTER TABLE defaults ADD FOREIGN KEY (ar_chart_id) REFERENCES chart (id);
diff --git a/templates/webpages/client_config/_default_accounts.html b/templates/webpages/client_config/_default_accounts.html
index 4727799cf..bb92517f2 100644
--- a/templates/webpages/client_config/_default_accounts.html
+++ b/templates/webpages/client_config/_default_accounts.html
@@ -44,5 +44,16 @@
    <td align="right">[% LxERP.t8("Current assets account") %]</td>
    <td>[% L.chart_picker('defaults.ar_paid_accno_id', SELF.defaults.ar_paid_accno_id, type='AR_paid', choose=1, style=style) %]<td>
   </tr>
+
+  <tr>
+   <td align="right">[% LxERP.t8("Payable account") %]</td>
+   <td>[% L.chart_picker('defaults.ap_chart_id', SELF.defaults.ap_chart_id, type='AP', choose=1, style=style) %]<td>
+  </tr>
+
+  <tr>
+   <td align="right">[% LxERP.t8("Receivable account") %]</td>
+   <td>[% L.chart_picker('defaults.ar_chart_id', SELF.defaults.ar_chart_id, type='AR', choose=1, style=style) %]<td>
+  </tr>
+
  </table>
 </div>