vesr 0.2.0 → 0.2.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- data/app/models/esr_record.rb +3 -2
- data/config/locales/de.yml +21 -0
- data/lib/vesr/version.rb +1 -1
- metadata +4 -3
data/app/models/esr_record.rb
CHANGED
|
@@ -104,7 +104,7 @@ class EsrRecord < ActiveRecord::Base
|
|
|
104
104
|
else
|
|
105
105
|
self.state = "valid"
|
|
106
106
|
end
|
|
107
|
-
elsif imported_invoice = Invoice.find(:first, :conditions => ["imported_esr_reference LIKE concat(?, '%')", reference])
|
|
107
|
+
elsif Invoice.column_names.include?(:imported_esr_reference) && imported_invoice = Invoice.find(:first, :conditions => ["imported_esr_reference LIKE concat(?, '%')", reference])
|
|
108
108
|
self.invoice = imported_invoice
|
|
109
109
|
self.remarks += "Referenz #{reference}"
|
|
110
110
|
if invoice.due_amount.currency_round != self.amount.currency_round
|
|
@@ -133,7 +133,8 @@ class EsrRecord < ActiveRecord::Base
|
|
|
133
133
|
esr_booking.update_attributes(
|
|
134
134
|
:amount => amount,
|
|
135
135
|
:credit_account => vesr_account,
|
|
136
|
-
:debit_account => Invoice::DEBIT_ACCOUNT,
|
|
136
|
+
# :debit_account => Invoice::DEBIT_ACCOUNT,
|
|
137
|
+
:debit_account => DebitInvoice.first.profit_account,
|
|
137
138
|
:value_date => value_date,
|
|
138
139
|
:title => "VESR Zahlung",
|
|
139
140
|
:comments => remarks)
|
|
@@ -0,0 +1,21 @@
|
|
|
1
|
+
# German locale
|
|
2
|
+
de:
|
|
3
|
+
activerecord:
|
|
4
|
+
models:
|
|
5
|
+
esr_file: ESR-Datei
|
|
6
|
+
esr_record: ESR-Eintrag
|
|
7
|
+
attributes:
|
|
8
|
+
esr_file:
|
|
9
|
+
remarks: Bemerkungen
|
|
10
|
+
file: Dateiname
|
|
11
|
+
esr_record:
|
|
12
|
+
bank_pc_id: Teilnehmer-Nr.
|
|
13
|
+
reference: Referenz
|
|
14
|
+
amount: Betrag
|
|
15
|
+
transaction_date: Transaktionsdatum
|
|
16
|
+
payment_date: Zahldatum
|
|
17
|
+
value_date: Valuta Datum
|
|
18
|
+
invoice: Rechnung
|
|
19
|
+
booking: Buchung
|
|
20
|
+
state: Status
|
|
21
|
+
remarks: Bemerkungen
|
data/lib/vesr/version.rb
CHANGED
metadata
CHANGED
|
@@ -1,13 +1,13 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: vesr
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
hash:
|
|
4
|
+
hash: 21
|
|
5
5
|
prerelease: false
|
|
6
6
|
segments:
|
|
7
7
|
- 0
|
|
8
8
|
- 2
|
|
9
|
-
-
|
|
10
|
-
version: 0.2.
|
|
9
|
+
- 1
|
|
10
|
+
version: 0.2.1
|
|
11
11
|
platform: ruby
|
|
12
12
|
authors:
|
|
13
13
|
- Roman Simecek
|
|
@@ -45,6 +45,7 @@ files:
|
|
|
45
45
|
- app/views/esr_bookings/_sidebar.html.erb
|
|
46
46
|
- app/views/esr_bookings/list.html.erb
|
|
47
47
|
- app/views/esr_bookings/show.html.erb
|
|
48
|
+
- config/locales/de.yml
|
|
48
49
|
- config/routes.rb
|
|
49
50
|
- db/migrate/1_create_vesr_tables.rb
|
|
50
51
|
- db/migrate/2_port_to_carrierwave.rb
|