Skip to content

Commit 281547e

Browse files
committed
Merge pull request #45 from systopia/master
CiviBanking 0.3.5
2 parents 1a6060f + 60c0d31 commit 281547e

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+2527
-367
lines changed

doc/civibanking/.~lock.P60 CiviBanking data model 100.odt#

-1
This file was deleted.

doc/plugins/configurations/importer/csv_importer/GLS.cfg

+8-3
Original file line numberDiff line numberDiff line change
@@ -77,16 +77,16 @@
7777
},
7878
{
7979
"from": "Auftraggeber Bank",
80-
"to": "_party_bank_id",
81-
"type": "set"
80+
"to": "_party_ba_BLZ",
81+
"type": "trim"
8282
},
8383
{
8484
"from": "Auftraggeberkonto",
8585
"to": "_party_ba_id",
8686
"type": "format:%010d"
8787
},
8888
{
89-
"from": "Auftraggeberkonto",
89+
"from": "_party_ba_BLZ",
9090
"to": "_party_NBAN_DE",
9191
"type": "set"
9292
},
@@ -95,6 +95,11 @@
9595
"to": "_party_NBAN_DE",
9696
"type": "append:/"
9797
},
98+
{
99+
"from": "_party_NBAN_DE",
100+
"to": "party_ba_reference",
101+
"type": "set"
102+
},
98103
{
99104
"from": "Auftraggeber IBAN",
100105
"to": "_party_IBAN",
Original file line numberDiff line numberDiff line change
@@ -1,165 +1,182 @@
11
{
2-
"delimiter": ";",
3-
"encoding": "CP1252",
4-
"header": 1,
5-
"title": "DB {starting_date} - {ending_date} [{md5}]",
6-
"bank_reference": "DB-StarMoney-{txn_id}",
7-
"defaults": {},
8-
"rules": [
9-
{
10-
"from": "Kontonummer",
11-
"to": "_ba_id",
12-
"type": "format:%010d"
13-
},
14-
{
15-
"from": "Bankleitzahl",
16-
"to": "_bank_id",
17-
"type": "set"
18-
},
19-
{
20-
"from": "_bank_id",
21-
"to": "_NBAN_DE",
22-
"type": "set"
23-
},
24-
{
25-
"from": "_ba_id",
26-
"to": "_NBAN_DE",
27-
"type": "append:/"
28-
},
29-
{
30-
"from": "Betrag",
31-
"to": "amount",
32-
"type": "amount"
33-
},
34-
{
35-
"from": "Betrag - Währung",
36-
"to": "currency",
37-
"type": "set"
38-
},
39-
{
40-
"from": "Buchungstext",
41-
"to": "transaction_class",
42-
"type": "set"
43-
},
44-
{
45-
"from": "Buchungstag",
46-
"to": "booking_date",
47-
"type": "strtotime:d.m.Y"
48-
},
49-
{
50-
"from": "Begünstigter/Absender - Bankleitzahl",
51-
"to": "_party_bank_id",
52-
"type": "set"
53-
},
54-
{
55-
"from": "Begünstigter/Absender - Kontonummer",
56-
"to": "_party_ba_id",
57-
"type": "format:%010d"
58-
},
59-
{
60-
"from": "Begünstigter/Absender - Bankleitzahl",
61-
"to": "_party_NBAN_DE",
62-
"type": "set"
63-
},
64-
{
65-
"from": "_party_ba_id",
66-
"to": "_party_NBAN_DE",
67-
"type": "append:/"
68-
},
69-
{
70-
"from": "Begünstigter/Absender - Name",
71-
"to": "name",
72-
"type": "set"
73-
},
74-
{
75-
"from": "Laufende Nummer",
76-
"to": "txn_id",
77-
"type": "set"
78-
},
79-
{
80-
"from": "Primanota",
81-
"to": "primanota",
82-
"type": "set"
83-
},
84-
{
85-
"from": "Wertstellungstag",
86-
"to": "value_date",
87-
"type": "strtotime:d.m.Y"
88-
},
89-
{
90-
"from": "Verwendungszweckzeile 1",
91-
"to": "purpose",
92-
"type": "append:"
93-
},
94-
{
95-
"from": "Verwendungszweckzeile 2",
96-
"to": "purpose",
97-
"type": "append:"
98-
},
99-
{
100-
"from": "Verwendungszweckzeile 3",
101-
"to": "purpose",
102-
"type": "append:"
103-
},
104-
{
105-
"from": "Verwendungszweckzeile 4",
106-
"to": "purpose",
107-
"type": "append:"
108-
},
109-
{
110-
"from": "Verwendungszweckzeile 5",
111-
"to": "purpose",
112-
"type": "append:"
113-
},
114-
{
115-
"from": "Verwendungszweckzeile 6",
116-
"to": "purpose",
117-
"type": "append:"
118-
},
119-
{
120-
"from": "Verwendungszweckzeile 7",
121-
"to": "purpose",
122-
"type": "append:"
123-
},
124-
{
125-
"from": "Verwendungszweckzeile 8",
126-
"to": "purpose",
127-
"type": "append:"
128-
},
129-
{
130-
"from": "Verwendungszweckzeile 9",
131-
"to": "purpose",
132-
"type": "append:"
133-
},
134-
{
135-
"from": "Verwendungszweckzeile 10",
136-
"to": "purpose",
137-
"type": "append:"
138-
},
139-
{
140-
"from": "Verwendungszweckzeile 11",
141-
"to": "purpose",
142-
"type": "append:"
143-
},
144-
{
145-
"from": "Verwendungszweckzeile 12",
146-
"to": "purpose",
147-
"type": "append:"
148-
},
149-
{
150-
"from": "Verwendungszweckzeile 13",
151-
"to": "purpose",
152-
"type": "append:"
153-
},
154-
{
155-
"from": "Verwendungszweckzeile 14",
156-
"to": "purpose",
157-
"type": "append:"
158-
},
159-
{
160-
"from": "purpose",
161-
"to": "purpose",
162-
"type": "trim"
163-
}
164-
]
165-
}
2+
"delimiter":";",
3+
"encoding":"CP1252",
4+
"header":1,
5+
"title":"DB {starting_date} - {ending_date} [{md5}]",
6+
"bank_reference":"DB-StarMoney-{txn_id}",
7+
"defaults":{
8+
9+
},
10+
"rules":[
11+
{
12+
"from":"Kontonummer",
13+
"to":"_ba_id",
14+
"type":"format:%010d"
15+
},
16+
{
17+
"from":"Bankleitzahl",
18+
"to":"_bank_id",
19+
"type":"set"
20+
},
21+
{
22+
"from":"_bank_id",
23+
"to":"_NBAN_DE",
24+
"type":"set"
25+
},
26+
{
27+
"from":"_ba_id",
28+
"to":"_NBAN_DE",
29+
"type":"append:/"
30+
},
31+
{
32+
"from":"Betrag",
33+
"to":"amount",
34+
"type":"amount"
35+
},
36+
{
37+
"from":"Betrag - Währung",
38+
"to":"currency",
39+
"type":"set"
40+
},
41+
{
42+
"from":"Buchungstext",
43+
"to":"transaction_class",
44+
"type":"set"
45+
},
46+
{
47+
"from":"Buchungstag",
48+
"to":"booking_date",
49+
"type":"strtotime:d.m.Y"
50+
},
51+
{
52+
"from":"Begünstigter/Absender - Kontonummer",
53+
"to":"_party_ba_id",
54+
"type":"set"
55+
},
56+
57+
{ "comment": "deutsche NBAN (BLZ/Kontonummer) erstellen",
58+
"from":"Begünstigter/Absender - Kontonummer",
59+
"to":"_party_ba_id",
60+
"type":"format:%010d",
61+
"if": "matches:/^[0-9]{4,10}$/"
62+
}, {
63+
"from":"Begünstigter/Absender - Bankleitzahl",
64+
"to":"_party_NBAN_DE",
65+
"type":"set",
66+
"if": "matches:/^[0-9]{8}$/"
67+
}, {
68+
"from":"Begünstigter/Absender - Kontonummer",
69+
"to":"_party_NBAN_DE",
70+
"type":"append:/",
71+
"if": "matches:/^[0-9]{10}$/"
72+
},
73+
74+
{ "comment": "IBAN und BIC setzen",
75+
"from":"Begünstigter/Absender - Bankleitzahl",
76+
"to":"_party_BIC",
77+
"type":"set",
78+
"if": "matches:/^[A-Z]{6,6}[A-Z2-9][A-NP-Z0-9]([A-Z0-9]{3,3}){0,1}$/"
79+
}, {
80+
"from":"Begünstigter/Absender - Kontonummer",
81+
"to":"_party_IBAN",
82+
"type":"set",
83+
"if": "matches:/^[a-zA-Z]{2}[0-9]{2}[a-zA-Z0-9]{4}[0-9]{7}([a-zA-Z0-9]?){0,16}$/"
84+
},
85+
86+
{
87+
"from":"Begünstigter/Absender - Name",
88+
"to":"name",
89+
"type":"set"
90+
},
91+
{
92+
"from":"Laufende Nummer",
93+
"to":"txn_id",
94+
"type":"set"
95+
},
96+
{
97+
"from":"Primanota",
98+
"to":"primanota",
99+
"type":"set"
100+
},
101+
{
102+
"from":"Wertstellungstag",
103+
"to":"value_date",
104+
"type":"strtotime:d.m.Y"
105+
},
106+
{
107+
"from":"Verwendungszweckzeile 1",
108+
"to":"purpose",
109+
"type":"append:"
110+
},
111+
{
112+
"from":"Verwendungszweckzeile 2",
113+
"to":"purpose",
114+
"type":"append:"
115+
},
116+
{
117+
"from":"Verwendungszweckzeile 3",
118+
"to":"purpose",
119+
"type":"append:"
120+
},
121+
{
122+
"from":"Verwendungszweckzeile 4",
123+
"to":"purpose",
124+
"type":"append:"
125+
},
126+
{
127+
"from":"Verwendungszweckzeile 5",
128+
"to":"purpose",
129+
"type":"append:"
130+
},
131+
{
132+
"from":"Verwendungszweckzeile 6",
133+
"to":"purpose",
134+
"type":"append:"
135+
},
136+
{
137+
"from":"Verwendungszweckzeile 7",
138+
"to":"purpose",
139+
"type":"append:"
140+
},
141+
{
142+
"from":"Verwendungszweckzeile 8",
143+
"to":"purpose",
144+
"type":"append:"
145+
},
146+
{
147+
"from":"Verwendungszweckzeile 9",
148+
"to":"purpose",
149+
"type":"append:"
150+
},
151+
{
152+
"from":"Verwendungszweckzeile 10",
153+
"to":"purpose",
154+
"type":"append:"
155+
},
156+
{
157+
"from":"Verwendungszweckzeile 11",
158+
"to":"purpose",
159+
"type":"append:"
160+
},
161+
{
162+
"from":"Verwendungszweckzeile 12",
163+
"to":"purpose",
164+
"type":"append:"
165+
},
166+
{
167+
"from":"Verwendungszweckzeile 13",
168+
"to":"purpose",
169+
"type":"append:"
170+
},
171+
{
172+
"from":"Verwendungszweckzeile 14",
173+
"to":"purpose",
174+
"type":"append:"
175+
},
176+
{
177+
"from":"purpose",
178+
"to":"purpose",
179+
"type":"trim"
180+
}
181+
]
182+
}

0 commit comments

Comments
 (0)