Merge lp:~camptocamp/account-financial-tools/7.0-fix-credit-control-scenarios-nbi into lp:~account-core-editors/account-financial-tools/7.0
- 7.0-fix-credit-control-scenarios-nbi
- Merge into 7.0
Proposed by
Nicolas Bessi - Camptocamp
Status: | Merged |
---|---|
Merged at revision: | 171 |
Proposed branch: | lp:~camptocamp/account-financial-tools/7.0-fix-credit-control-scenarios-nbi |
Merge into: | lp:~account-core-editors/account-financial-tools/7.0 |
Diff against target: |
487 lines (+109/-99) 9 files modified
account_credit_control/scenarios/features/00_credit_control_param.feature (+9/-6) account_credit_control/scenarios/features/02_credit_control_invoices.feature (+21/-21) account_credit_control/scenarios/features/03_credit_control_run_jan.feature (+4/-4) account_credit_control/scenarios/features/04_credit_control_run_feb.feature (+4/-4) account_credit_control/scenarios/features/05_credit_control_run_mar.feature (+14/-13) account_credit_control/scenarios/features/06_credit_control_run_apr.feature (+15/-15) account_credit_control/scenarios/features/07_credit_control_run_may.feature (+25/-19) account_credit_control/scenarios/features/08_credit_control_run_jun.feature (+10/-10) account_credit_control/scenarios/features/09_credit_control_run_jul.feature (+7/-7) |
To merge this branch: | bzr merge lp:~camptocamp/account-financial-tools/7.0-fix-credit-control-scenarios-nbi |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Guewen Baconnier @ Camptocamp | code review | Approve | |
Alexandre Fayolle - camptocamp | code review, no test | Approve | |
Review via email: mp+209050@code.launchpad.net |
Commit message
Description of the change
Fix credit control scenario:
Force scenarios to be done on exercice 2013 as they are based on base finance setup porvided by OERPScenario project.
Fx rouding issues, as OpenERP as improve precision in currency computation.
Depends on https:/
To post a comment you must log in.
Revision history for this message
Alexandre Fayolle - camptocamp (alexandre-fayolle-c2c) wrote : | # |
review:
Approve
(code review, no test)
Revision history for this message
Guewen Baconnier @ Camptocamp (gbaconnier-c2c) wrote : | # |
Thanks
review:
Approve
(code review)
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === modified file 'account_credit_control/scenarios/features/00_credit_control_param.feature' |
2 | --- account_credit_control/scenarios/features/00_credit_control_param.feature 2013-06-06 10:04:27 +0000 |
3 | +++ account_credit_control/scenarios/features/00_credit_control_param.feature 2014-03-03 12:08:47 +0000 |
4 | @@ -10,12 +10,7 @@ |
5 | |
6 | Feature: General parameters in order to test the credit control module |
7 | |
8 | - @deactivate_journal_control |
9 | - Scenario: Journal setup to vaoid unfixed voucher bug |
10 | - Given I execute the SQL commands |
11 | - """ |
12 | - UPDATE account_journal SET allow_date = false; |
13 | - """ |
14 | + |
15 | @account_credit_control_setup_install_modules |
16 | Scenario: MODULES INSTALLATION |
17 | |
18 | @@ -26,6 +21,14 @@ |
19 | |
20 | Then my modules should have been installed and models reloaded |
21 | |
22 | + |
23 | + @deactivate_journal_control |
24 | + Scenario: Journal setup to avoid unfixed voucher bug |
25 | + Given I execute the SQL commands |
26 | + """ |
27 | + UPDATE account_journal SET allow_date = false; |
28 | + """ |
29 | + |
30 | @email_params_mailtrap |
31 | Scenario: E-MAIL PARAMS WITH EMAIL EATER (http://mailtrap.railsware.com/) |
32 | Given I need a "ir.mail_server" with name: mailstrap_testings |
33 | |
34 | === modified file 'account_credit_control/scenarios/features/02_credit_control_invoices.feature' |
35 | --- account_credit_control/scenarios/features/02_credit_control_invoices.feature 2013-03-25 14:17:45 +0000 |
36 | +++ account_credit_control/scenarios/features/02_credit_control_invoices.feature 2014-03-03 12:08:47 +0000 |
37 | @@ -19,7 +19,7 @@ |
38 | And having: |
39 | | name | value | |
40 | | name | SI_1 | |
41 | - | date_invoice | %Y-01-15 | |
42 | + | date_invoice | 2013-01-15 | |
43 | | partner_id | by oid: scen.partner_1 | |
44 | | account_id | by name: Debtors | |
45 | | journal_id | by name: Sales | |
46 | @@ -55,7 +55,7 @@ |
47 | And having: |
48 | | name | value | |
49 | | name | SI_2 | |
50 | - | date_invoice | %Y-02-15 | |
51 | + | date_invoice | 2013-02-15 | |
52 | | partner_id | by oid: scen.partner_1 | |
53 | | account_id | by name: Debtors | |
54 | | journal_id | by name: Sales | |
55 | @@ -82,7 +82,7 @@ |
56 | And having: |
57 | | name | value | |
58 | | name | SI_3 | |
59 | - | date_invoice | %Y-03-15 | |
60 | + | date_invoice | 2013-03-15 | |
61 | | partner_id | by oid: scen.partner_1 | |
62 | | account_id | by name: Debtors | |
63 | | journal_id | by name: Sales | |
64 | @@ -111,7 +111,7 @@ |
65 | And having: |
66 | | name | value | |
67 | | name | SI_4 | |
68 | - | date_invoice | %Y-01-18 | |
69 | + | date_invoice | 2013-01-18 | |
70 | | partner_id | by oid: scen.customer_2 | |
71 | | account_id | by name: Debtors | |
72 | | journal_id | by name: Sales | |
73 | @@ -139,7 +139,7 @@ |
74 | And having: |
75 | | name | value | |
76 | | name | SI_5 | |
77 | - | date_invoice | %Y-02-15 | |
78 | + | date_invoice | 2013-02-15 | |
79 | | partner_id | by oid: scen.customer_2 | |
80 | | account_id | by name: Debtors | |
81 | | journal_id | by name: Sales | |
82 | @@ -166,7 +166,7 @@ |
83 | And having: |
84 | | name | value | |
85 | | name | SI_6 | |
86 | - | date_invoice | %Y-03-15 | |
87 | + | date_invoice | 2013-03-15 | |
88 | | partner_id | by oid: scen.customer_2 | |
89 | | account_id | by name: Debtors | |
90 | | journal_id | by name: Sales | |
91 | @@ -195,7 +195,7 @@ |
92 | And having: |
93 | | name | value | |
94 | | name | SI_7 | |
95 | - | date_invoice | %Y-01-18 | |
96 | + | date_invoice | 2013-01-18 | |
97 | | partner_id | by oid: scen.customer_3 | |
98 | | account_id | by name: Debtors | |
99 | | journal_id | by name: Sales | |
100 | @@ -223,7 +223,7 @@ |
101 | And having: |
102 | | name | value | |
103 | | name | SI_8 | |
104 | - | date_invoice | %Y-02-15 | |
105 | + | date_invoice | 2013-02-15 | |
106 | | partner_id | by oid: scen.customer_3 | |
107 | | account_id | by name: Debtors | |
108 | | journal_id | by name: Sales | |
109 | @@ -250,7 +250,7 @@ |
110 | And having: |
111 | | name | value | |
112 | | name | SI_9 | |
113 | - | date_invoice | %Y-03-15 | |
114 | + | date_invoice | 2013-03-15 | |
115 | | partner_id | by oid: scen.customer_3 | |
116 | | account_id | by name: Debtors | |
117 | | journal_id | by name: Sales | |
118 | @@ -279,7 +279,7 @@ |
119 | And having: |
120 | | name | value | |
121 | | name | SI_10 | |
122 | - | date_invoice | %Y-01-18 | |
123 | + | date_invoice | 2013-01-18 | |
124 | | partner_id | by oid: scen.customer_4 | |
125 | | account_id | by name: Debtors | |
126 | | journal_id | by name: Sales | |
127 | @@ -307,7 +307,7 @@ |
128 | And having: |
129 | | name | value | |
130 | | name | SI_11 | |
131 | - | date_invoice | %Y-02-15 | |
132 | + | date_invoice | 2013-02-15 | |
133 | | partner_id | by oid: scen.customer_4 | |
134 | | account_id | by name: Debtors | |
135 | | journal_id | by name: Sales | |
136 | @@ -334,7 +334,7 @@ |
137 | And having: |
138 | | name | value | |
139 | | name | SI_12 | |
140 | - | date_invoice | %Y-03-15 | |
141 | + | date_invoice | 2013-03-15 | |
142 | | partner_id | by oid: scen.customer_4 | |
143 | | account_id | by name: Debtors | |
144 | | journal_id | by name: Sales | |
145 | @@ -363,7 +363,7 @@ |
146 | And having: |
147 | | name | value | |
148 | | name | SI_13 | |
149 | - | date_invoice | %Y-01-18 | |
150 | + | date_invoice | 2013-01-18 | |
151 | | partner_id | by oid: scen.customer_5 | |
152 | | account_id | by name: Debtors USD | |
153 | | journal_id | by name: Sales | |
154 | @@ -391,7 +391,7 @@ |
155 | And having: |
156 | | name | value | |
157 | | name | SI_14 | |
158 | - | date_invoice | %Y-02-15 | |
159 | + | date_invoice | 2013-02-15 | |
160 | | partner_id | by oid: scen.customer_5 | |
161 | | account_id | by name: Debtors USD | |
162 | | journal_id | by name: Sales | |
163 | @@ -418,7 +418,7 @@ |
164 | And having: |
165 | | name | value | |
166 | | name | SI_15 | |
167 | - | date_invoice | %Y-03-15 | |
168 | + | date_invoice | 2013-03-15 | |
169 | | partner_id | by oid: scen.customer_5 | |
170 | | account_id | by name: Debtors USD | |
171 | | journal_id | by name: Sales | |
172 | @@ -444,7 +444,7 @@ |
173 | And having: |
174 | | name | value | |
175 | | name | SI_16 | |
176 | - | date_invoice | %Y-03-15 | |
177 | + | date_invoice | 2013-03-15 | |
178 | | partner_id | by oid: scen.customer_4 | |
179 | | account_id | by name: Debtors | |
180 | | journal_id | by name: Sales | |
181 | @@ -469,7 +469,7 @@ |
182 | And having: |
183 | | name | value | |
184 | | name | SI_17 | |
185 | - | date_invoice | %Y-03-15 | |
186 | + | date_invoice | 2013-03-15 | |
187 | | partner_id | by oid: scen.customer_partial_pay | |
188 | | account_id | by name: Debtors | |
189 | | journal_id | by name: Sales | |
190 | @@ -494,7 +494,7 @@ |
191 | And having: |
192 | | name | value | |
193 | | name | SI_18 | |
194 | - | date_invoice | %Y-03-15 | |
195 | + | date_invoice | 2013-03-15 | |
196 | | partner_id | by oid: scen.customer_multiple_payterm | |
197 | | account_id | by name: Debtors | |
198 | | journal_id | by name: Sales | |
199 | @@ -519,7 +519,7 @@ |
200 | And having: |
201 | | name | value | |
202 | | name | SI_19 | |
203 | - | date_invoice | %Y-03-15 | |
204 | + | date_invoice | 2013-03-15 | |
205 | | partner_id | by oid: scen.customer_multiple_payterm2 | |
206 | | account_id | by name: Debtors | |
207 | | journal_id | by name: Sales | |
208 | @@ -543,7 +543,7 @@ |
209 | And having: |
210 | | name | value | |
211 | | name | SI_20_test_tolerance | |
212 | - | date_invoice | %Y-03-23 | |
213 | + | date_invoice | 2013-03-23 | |
214 | | partner_id | by oid: scen.customer_6 | |
215 | | account_id | by name: Debtors | |
216 | | journal_id | by name: Sales | |
217 | @@ -568,7 +568,7 @@ |
218 | And having: |
219 | | name | value | |
220 | | name | SI_21_test_receivable_account_excluded | |
221 | - | date_invoice | %Y-03-25 | |
222 | + | date_invoice | 2013-03-25 | |
223 | | partner_id | by oid: scen.customer_6 | |
224 | | account_id | by name: Debtors GBP | |
225 | | journal_id | by name: Sales | |
226 | |
227 | === modified file 'account_credit_control/scenarios/features/03_credit_control_run_jan.feature' |
228 | --- account_credit_control/scenarios/features/03_credit_control_run_jan.feature 2013-03-25 14:17:45 +0000 |
229 | +++ account_credit_control/scenarios/features/03_credit_control_run_jan.feature 2014-03-03 12:08:47 +0000 |
230 | @@ -20,10 +20,10 @@ |
231 | Scenario: Create run |
232 | Given I need a "credit.control.run" with oid: credit_control.run1 |
233 | And having: |
234 | - | name | value | |
235 | - | date | %Y-01-31 | |
236 | + | name | value | |
237 | + | date | 2013-01-31 | |
238 | When I launch the credit run |
239 | Then my credit run should be in state "done" |
240 | And the generated credit lines should have the following values: |
241 | - | balance | date due | account | policy | date | partner | channel | level | move line | policy level | state | amount due | currency | |
242 | - | 300 | %Y-01-18 | Debtors | 3 time policy | %Y-01-31 | customer_4 | email | 1 | SI_10 | 10 days net | draft | 300 | | |
243 | + | balance | date due | account | policy | date | partner | channel | level | move line | policy level | state | amount due | currency | |
244 | + | 300 | 2013-01-18 | Debtors | 3 time policy | 2013-01-31 | customer_4 | email | 1 | SI_10 | 10 days net | draft | 300 | | |
245 | |
246 | === modified file 'account_credit_control/scenarios/features/04_credit_control_run_feb.feature' |
247 | --- account_credit_control/scenarios/features/04_credit_control_run_feb.feature 2013-03-28 13:17:04 +0000 |
248 | +++ account_credit_control/scenarios/features/04_credit_control_run_feb.feature 2014-03-03 12:08:47 +0000 |
249 | @@ -23,11 +23,11 @@ |
250 | Given I need a "credit.control.run" with oid: credit_control.run2 |
251 | And having: |
252 | | name | value | |
253 | - | date | %Y-02-28 | |
254 | + | date | 2013-02-28 | |
255 | When I launch the credit run |
256 | Then my credit run should be in state "done" |
257 | And the generated credit lines should have the following values: |
258 | | balance | date due | account | policy | date | partner | channel | level | move line | policy level | state | amount due | currency | |
259 | - | 360 | %Y-02-15 | Debtors | 3 time policy | %Y-02-28 | customer_4 | email | 1 | SI_11 | 10 days net | draft | 360 | USD | |
260 | - | 1000 | %Y-02-17 | Debtors USD | 3 time policy | %Y-02-28 | customer_5_usd | email | 1 | SI_13 | 10 days net | draft | 1000 | USD | |
261 | - | 300 | %Y-01-18 | Debtors | 3 time policy | %Y-02-28 | customer_4 | email | 2 | SI_10 | 30 days end of month | draft | 300 | | |
262 | + | 360 | 2013-02-15 | Debtors | 3 time policy | 2013-02-28 | customer_4 | email | 1 | SI_11 | 10 days net | draft | 360 | USD | |
263 | + | 1000 | 2013-02-17 | Debtors USD | 3 time policy | 2013-02-28 | customer_5_usd | email | 1 | SI_13 | 10 days net | draft | 1000 | USD | |
264 | + | 300 | 2013-01-18 | Debtors | 3 time policy | 2013-02-28 | customer_4 | email | 2 | SI_10 | 30 days end of month | draft | 300 | | |
265 | |
266 | === modified file 'account_credit_control/scenarios/features/05_credit_control_run_mar.feature' |
267 | --- account_credit_control/scenarios/features/05_credit_control_run_mar.feature 2013-03-28 13:17:04 +0000 |
268 | +++ account_credit_control/scenarios/features/05_credit_control_run_mar.feature 2014-03-03 12:08:47 +0000 |
269 | @@ -24,8 +24,9 @@ |
270 | And having: |
271 | | name | value | |
272 | | name | Bk.St.si_19_part1 | |
273 | - | date | %Y-03-31 | |
274 | + | date | 2013-03-31 | |
275 | | journal_id | by oid: scen.eur_journal | |
276 | + | period_id | by name: 03/2013 | |
277 | |
278 | And I import invoice "SI_19" using import invoice button |
279 | And I should have a "account.bank.statement.line" with name: "SI_19" and amount: "450" |
280 | @@ -45,18 +46,18 @@ |
281 | Given I need a "credit.control.run" with oid: credit_control.run3 |
282 | And having: |
283 | | name | value | |
284 | - | date | %Y-03-31 | |
285 | + | date | 2013-03-31 | |
286 | When I launch the credit run |
287 | Then my credit run should be in state "done" |
288 | And the generated credit lines should have the following values: |
289 | - | balance | date due | account | policy | date | partner | channel | level | move line | policy level | state | amount due | currency | |
290 | - | 1000 | %Y-02-28 | Debtors | 2 time policy | %Y-03-31 | customer_2 | email | 1 | SI_4 | 30 days end of month | draft | 1000 | | |
291 | - | 1000 | %Y-02-17 | Debtors | 2 time policy | %Y-03-31 | customer_3 | email | 1 | SI_7 | 30 days end of month | draft | 1000 | | |
292 | - | 700 | %Y-02-28 | Debtors | 3 time policy | %Y-03-31 | customer_4 | email | 1 | SI_10 | 10 days net | draft | 700 | | |
293 | - | 450 | %Y-03-15 | Debtors | 3 time policy | %Y-03-31 | customer_4 | email | 1 | SI_12 | 10 days net | draft | 450 | | |
294 | - | 1200 | %Y-03-17 | Debtors USD | 3 time policy | %Y-03-31 | customer_5_usd | email | 1 | SI_14 | 10 days net | draft | 1200 | USD | |
295 | - | 360 | %Y-02-15 | Debtors | 3 time policy | %Y-03-31 | customer_4 | email | 2 | SI_11 | 30 days end of month | draft | 360 | USD | |
296 | - | 1000 | %Y-02-17 | Debtors USD | 3 time policy | %Y-03-31 | customer_5_usd | email | 2 | SI_13 | 30 days end of month | draft | 1000 | USD | |
297 | - | 300 | %Y-01-18 | Debtors | 3 time policy | %Y-03-31 | customer_4 | letter | 3 | SI_10 | 10 days last reminder | draft | 300 | | |
298 | - | 450 | %Y-03-15 | Debtors | 3 time policy | %Y-03-31 | Donald Duck | email | 1 | SI_18 | 10 days net | draft | 450 | | |
299 | - | 150 | %Y-03-15 | Debtors | 3 time policy | %Y-03-31 | Gus Goose | email | 1 | SI_19 | 10 days net | draft | 450 | | |
300 | + | balance | date due | account | policy | date | partner | channel | level | move line | policy level | state | amount due | currency | |
301 | + | 1000 | 2013-02-28 | Debtors | 2 time policy | 2013-03-31 | customer_2 | email | 1 | SI_4 | 30 days end of month | draft | 1000 | | |
302 | + | 1000 | 2013-02-17 | Debtors | 2 time policy | 2013-03-31 | customer_3 | email | 1 | SI_7 | 30 days end of month | draft | 1000 | | |
303 | + | 700 | 2013-02-28 | Debtors | 3 time policy | 2013-03-31 | customer_4 | email | 1 | SI_10 | 10 days net | draft | 700 | | |
304 | + | 449.99 | 2013-03-15 | Debtors | 3 time policy | 2013-03-31 | customer_4 | email | 1 | SI_12 | 10 days net | draft | 449.99 | USD | |
305 | + | 1200 | 2013-03-17 | Debtors USD | 3 time policy | 2013-03-31 | customer_5_usd | email | 1 | SI_14 | 10 days net | draft | 1200 | USD | |
306 | + | 360 | 2013-02-15 | Debtors | 3 time policy | 2013-03-31 | customer_4 | email | 2 | SI_11 | 30 days end of month | draft | 360 | USD | |
307 | + | 1000 | 2013-02-17 | Debtors USD | 3 time policy | 2013-03-31 | customer_5_usd | email | 2 | SI_13 | 30 days end of month | draft | 1000 | USD | |
308 | + | 300 | 2013-01-18 | Debtors | 3 time policy | 2013-03-31 | customer_4 | letter | 3 | SI_10 | 10 days last reminder | draft | 300 | | |
309 | + | 450 | 2013-03-15 | Debtors | 3 time policy | 2013-03-31 | Donald Duck | email | 1 | SI_18 | 10 days net | draft | 450 | | |
310 | + | 150 | 2013-03-15 | Debtors | 3 time policy | 2013-03-31 | Gus Goose | email | 1 | SI_19 | 10 days net | draft | 450 | | |
311 | |
312 | === modified file 'account_credit_control/scenarios/features/06_credit_control_run_apr.feature' |
313 | --- account_credit_control/scenarios/features/06_credit_control_run_apr.feature 2013-06-06 10:04:27 +0000 |
314 | +++ account_credit_control/scenarios/features/06_credit_control_run_apr.feature 2014-03-03 12:08:47 +0000 |
315 | @@ -23,22 +23,22 @@ |
316 | Given I need a "credit.control.run" with oid: credit_control.run4 |
317 | And having: |
318 | | name | value | |
319 | - | date | %Y-04-30 | |
320 | + | date | 2013-04-30 | |
321 | |
322 | When I launch the credit run |
323 | Then my credit run should be in state "done" |
324 | And the generated credit lines should have the following values: |
325 | - | balance | date due | account | policy | date | partner | channel | level | move line | policy level | state | amount due | currency | |
326 | - | 360 | %Y-02-15 | Debtors | 3 time policy | %Y-04-30 | customer_4 | letter | 3 | SI_11 | 10 days last reminder | draft | 360 | USD | |
327 | - | 1200 | %Y-03-31 | Debtors | 2 time policy | %Y-04-30 | customer_2 | email | 1 | SI_5 | 30 days end of month | draft | 1200 | USD | |
328 | - | 1200 | %Y-03-17 | Debtors | 2 time policy | %Y-04-30 | customer_3 | email | 1 | SI_8 | 30 days end of month | draft | 1200 | USD | |
329 | - | 700 | %Y-02-28 | Debtors | 3 time policy | %Y-04-30 | customer_4 | email | 2 | SI_10 | 30 days end of month | draft | 700 | | |
330 | - | 840 | %Y-03-31 | Debtors | 3 time policy | %Y-04-30 | customer_4 | email | 1 | SI_11 | 10 days net | draft | 840 | USD | |
331 | - | 450 | %Y-03-15 | Debtors | 3 time policy | %Y-04-30 | customer_4 | email | 2 | SI_12 | 30 days end of month | draft | 450 | USD | |
332 | - | 1500 | %Y-04-14 | Debtors USD | 3 time policy | %Y-04-30 | customer_5_usd | email | 1 | SI_15 | 10 days net | draft | 1500 | USD | |
333 | - | 1200 | %Y-03-17 | Debtors USD | 3 time policy | %Y-04-30 | customer_5_usd | email | 2 | SI_14 | 30 days end of month | draft | 1200 | USD | |
334 | - | 1500 | %Y-04-14 | Debtors USD | 3 time policy | %Y-04-30 | customer_5_usd | email | 1 | SI_15 | 10 days net | draft | 1500 | USD | |
335 | - | 1500 | %Y-04-14 | Debtors | 3 time policy | %Y-04-30 | customer_4 | email | 1 | SI_16 | 10 days net | draft | 1500 | | |
336 | - | 1500 | %Y-04-14 | Debtors | 3 time policy | %Y-04-30 | Scrooge McDuck | email | 1 | SI_17 | 10 days net | draft | 1500 | | |
337 | - | 450 | %Y-03-15 | Debtors | 3 time policy | %Y-04-30 | Donald Duck | email | 2 | SI_18 | 30 days end of month | draft | 450 | | |
338 | - | 150 | %Y-03-15 | Debtors | 3 time policy | %Y-04-30 | Gus Goose | email | 2 | SI_19 | 30 days end of month | draft | 450 | | |
339 | + | balance | date due | account | policy | date | partner | channel | level | move line | policy level | state | amount due | currency | |
340 | + | 360 | 2013-02-15 | Debtors | 3 time policy | 2013-04-30 | customer_4 | letter | 3 | SI_11 | 10 days last reminder | draft | 360 | USD | |
341 | + | 1200 | 2013-03-31 | Debtors | 2 time policy | 2013-04-30 | customer_2 | email | 1 | SI_5 | 30 days end of month | draft | 1200 | USD | |
342 | + | 1200 | 2013-03-17 | Debtors | 2 time policy | 2013-04-30 | customer_3 | email | 1 | SI_8 | 30 days end of month | draft | 1200 | USD | |
343 | + | 700 | 2013-02-28 | Debtors | 3 time policy | 2013-04-30 | customer_4 | email | 2 | SI_10 | 30 days end of month | draft | 700 | | |
344 | + | 840 | 2013-03-31 | Debtors | 3 time policy | 2013-04-30 | customer_4 | email | 1 | SI_11 | 10 days net | draft | 840 | USD | |
345 | + | 449.99 | 2013-03-15 | Debtors | 3 time policy | 2013-04-30 | customer_4 | email | 2 | SI_12 | 30 days end of month | draft | 449.99 | USD | |
346 | + | 1500 | 2013-04-14 | Debtors USD | 3 time policy | 2013-04-30 | customer_5_usd | email | 1 | SI_15 | 10 days net | draft | 1500 | USD | |
347 | + | 1200 | 2013-03-17 | Debtors USD | 3 time policy | 2013-04-30 | customer_5_usd | email | 2 | SI_14 | 30 days end of month | draft | 1200 | USD | |
348 | + | 1500 | 2013-04-14 | Debtors USD | 3 time policy | 2013-04-30 | customer_5_usd | email | 1 | SI_15 | 10 days net | draft | 1500 | USD | |
349 | + | 1500 | 2013-04-14 | Debtors | 3 time policy | 2013-04-30 | customer_4 | email | 1 | SI_16 | 10 days net | draft | 1500 | | |
350 | + | 1500 | 2013-04-14 | Debtors | 3 time policy | 2013-04-30 | Scrooge McDuck | email | 1 | SI_17 | 10 days net | draft | 1500 | | |
351 | + | 450 | 2013-03-15 | Debtors | 3 time policy | 2013-04-30 | Donald Duck | email | 2 | SI_18 | 30 days end of month | draft | 450 | | |
352 | + | 150 | 2013-03-15 | Debtors | 3 time policy | 2013-04-30 | Gus Goose | email | 2 | SI_19 | 30 days end of month | draft | 450 | | |
353 | |
354 | === modified file 'account_credit_control/scenarios/features/07_credit_control_run_may.feature' |
355 | --- account_credit_control/scenarios/features/07_credit_control_run_may.feature 2013-06-06 10:04:27 +0000 |
356 | +++ account_credit_control/scenarios/features/07_credit_control_run_may.feature 2014-03-03 12:08:47 +0000 |
357 | @@ -24,8 +24,10 @@ |
358 | And having: |
359 | | name | value | |
360 | | name | Bk.St.si_16 | |
361 | - | date | %Y-05-30 | |
362 | + | date | 2013-05-30 | |
363 | | journal_id | by oid: scen.eur_journal | |
364 | + | period_id | by name: 05/2013 | |
365 | + |
366 | And I import invoice "SI_16" using import invoice button |
367 | And I set bank statement end-balance |
368 | When I confirm bank statement |
369 | @@ -37,8 +39,10 @@ |
370 | And having: |
371 | | name | value | |
372 | | name | Bk.St.si_17 | |
373 | - | date | %Y-05-30 | |
374 | + | date | 2013-05-30 | |
375 | | journal_id | by oid: scen.eur_journal | |
376 | + | period_id | by name: 05/2013 | |
377 | + |
378 | And I import invoice "SI_17" using import invoice button |
379 | And I should have a "account.bank.statement.line" with name: "SI_17" and amount: "1500" |
380 | And I set the voucher paid amount to "1000" |
381 | @@ -55,8 +59,10 @@ |
382 | And having: |
383 | | name | value | |
384 | | name | Bk.St.si_18_part1 | |
385 | - | date | %Y-05-30 | |
386 | + | date | 2013-05-30 | |
387 | | journal_id | by oid: scen.eur_journal | |
388 | + | period_id | by name: 05/2013 | |
389 | + |
390 | And I import invoice "SI_18" using import invoice button |
391 | And I should have a "account.bank.statement.line" with name: "SI_18" and amount: "450" |
392 | And I set the voucher paid amount to "450" |
393 | @@ -76,22 +82,22 @@ |
394 | Given I need a "credit.control.run" with oid: credit_control.run5 |
395 | And having: |
396 | | name | value | |
397 | - | date | %Y-05-31 | |
398 | + | date | 2013-05-31 | |
399 | When I launch the credit run |
400 | Then my credit run should be in state "done" |
401 | And the generated credit lines should have the following values: |
402 | - | balance | date due | account | policy | date | partner | channel | level | move line | policy level | state | amount due | currency | |
403 | - | 1500 | %Y-04-30 | Debtors | 2 time policy | %Y-05-31 | customer_2 | email | 1 | SI_6 | 30 days end of month | draft | 1500 | USD | |
404 | - | 1000 | %Y-02-28 | Debtors | 2 time policy | %Y-05-31 | customer_2 | letter | 2 | SI_4 | 60 days last reminder | draft | 1000 | | |
405 | - | 1000 | %Y-02-17 | Debtors | 2 time policy | %Y-05-31 | customer_3 | letter | 2 | SI_7 | 60 days last reminder | draft | 1000 | | |
406 | - | 1500 | %Y-04-14 | Debtors | 2 time policy | %Y-05-31 | customer_3 | email | 1 | SI_9 | 30 days end of month | draft | 1500 | | |
407 | - | 840 | %Y-03-31 | Debtors | 3 time policy | %Y-05-31 | customer_4 | email | 2 | SI_11 | 30 days end of month | draft | 840 | USD | |
408 | - | 1500 | %Y-04-14 | Debtors USD | 3 time policy | %Y-05-31 | customer_5_usd | email | 2 | SI_15 | 30 days end of month | draft | 1500 | USD | |
409 | - | 700 | %Y-02-28 | Debtors | 3 time policy | %Y-05-31 | customer_4 | letter | 3 | SI_10 | 10 days last reminder | draft | 700 | | |
410 | - | 450 | %Y-03-15 | Debtors | 3 time policy | %Y-05-31 | customer_4 | letter | 3 | SI_12 | 10 days last reminder | draft | 450 | USD | |
411 | - | 1050 | %Y-04-30 | Debtors | 3 time policy | %Y-05-31 | customer_4 | email | 1 | SI_12 | 10 days net | draft | 1050 | USD | |
412 | - | 1200 | %Y-03-17 | Debtors USD | 3 time policy | %Y-05-31 | customer_5_usd | letter | 3 | SI_14 | 10 days last reminder | draft | 1200 | USD | |
413 | - | 500 | %Y-04-14 | Debtors | 3 time policy | %Y-05-31 | Scrooge McDuck | email | 2 | SI_17 | 30 days end of month | draft | 1500 | | |
414 | - | 1050 | %Y-04-30 | Debtors | 3 time policy | %Y-05-31 | Donald Duck | email | 1 | SI_18 | 10 days net | draft | 1050 | | |
415 | - | 150 | %Y-03-15 | Debtors | 3 time policy | %Y-05-31 | Gus Goose | letter | 3 | SI_19 | 10 days last reminder | draft | 450 | | |
416 | - | 1050 | %Y-04-30 | Debtors | 3 time policy | %Y-05-31 | Gus Goose | email | 1 | SI_19 | 10 days net | draft | 1050 | | |
417 | + | balance | date due | account | policy | date | partner | channel | level | move line | policy level | state | amount due | currency | |
418 | + | 1500 | 2013-04-30 | Debtors | 2 time policy | 2013-05-31 | customer_2 | email | 1 | SI_6 | 30 days end of month | draft | 1500 | USD | |
419 | + | 1000 | 2013-02-28 | Debtors | 2 time policy | 2013-05-31 | customer_2 | letter | 2 | SI_4 | 60 days last reminder | draft | 1000 | | |
420 | + | 1000 | 2013-02-17 | Debtors | 2 time policy | 2013-05-31 | customer_3 | letter | 2 | SI_7 | 60 days last reminder | draft | 1000 | | |
421 | + | 1500 | 2013-04-14 | Debtors | 2 time policy | 2013-05-31 | customer_3 | email | 1 | SI_9 | 30 days end of month | draft | 1500 | | |
422 | + | 840 | 2013-03-31 | Debtors | 3 time policy | 2013-05-31 | customer_4 | email | 2 | SI_11 | 30 days end of month | draft | 840 | USD | |
423 | + | 1500 | 2013-04-14 | Debtors USD | 3 time policy | 2013-05-31 | customer_5_usd | email | 2 | SI_15 | 30 days end of month | draft | 1500 | USD | |
424 | + | 700 | 2013-02-28 | Debtors | 3 time policy | 2013-05-31 | customer_4 | letter | 3 | SI_10 | 10 days last reminder | draft | 700 | | |
425 | + | 449.99 | 2013-03-15 | Debtors | 3 time policy | 2013-05-31 | customer_4 | letter | 3 | SI_12 | 10 days last reminder | draft | 449.99 | USD | |
426 | + | 1050.01 | 2013-04-30 | Debtors | 3 time policy | 2013-05-31 | customer_4 | email | 1 | SI_12 | 10 days net | draft | 1050.01 | USD | |
427 | + | 1200 | 2013-03-17 | Debtors USD | 3 time policy | 2013-05-31 | customer_5_usd | letter | 3 | SI_14 | 10 days last reminder | draft | 1200 | USD | |
428 | + | 500 | 2013-04-14 | Debtors | 3 time policy | 2013-05-31 | Scrooge McDuck | email | 2 | SI_17 | 30 days end of month | draft | 1500 | | |
429 | + | 1050 | 2013-04-30 | Debtors | 3 time policy | 2013-05-31 | Donald Duck | email | 1 | SI_18 | 10 days net | draft | 1050 | | |
430 | + | 150 | 2013-03-15 | Debtors | 3 time policy | 2013-05-31 | Gus Goose | letter | 3 | SI_19 | 10 days last reminder | draft | 450 | | |
431 | + | 1050 | 2013-04-30 | Debtors | 3 time policy | 2013-05-31 | Gus Goose | email | 1 | SI_19 | 10 days net | draft | 1050 | | |
432 | |
433 | === modified file 'account_credit_control/scenarios/features/08_credit_control_run_jun.feature' |
434 | --- account_credit_control/scenarios/features/08_credit_control_run_jun.feature 2013-06-06 10:04:27 +0000 |
435 | +++ account_credit_control/scenarios/features/08_credit_control_run_jun.feature 2014-03-03 12:08:47 +0000 |
436 | @@ -23,16 +23,16 @@ |
437 | Given I need a "credit.control.run" with oid: credit_control.run6 |
438 | And having: |
439 | | name | value | |
440 | - | date | %Y-06-30 | |
441 | + | date | 2013-06-30 | |
442 | When I launch the credit run |
443 | Then my credit run should be in state "done" |
444 | And the generated credit lines should have the following values: |
445 | - | balance | date due | account | policy | date | partner | channel | level | move line | policy level | state | amount due | currency | |
446 | - | 1200 | %Y-03-31 | Debtors | 2 time policy | %Y-06-30 | customer_2 | letter | 2 | SI_5 | 60 days last reminder | draft | 1200 | USD | |
447 | - | 1200 | %Y-03-17 | Debtors | 2 time policy | %Y-06-30 | customer_3 | letter | 2 | SI_8 | 60 days last reminder | draft | 1200 | USD | |
448 | - | 1050 | %Y-04-30 | Debtors | 3 time policy | %Y-06-30 | customer_4 | email | 2 | SI_12 | 30 days end of month | draft | 1050 | USD | |
449 | - | 840 | %Y-03-31 | Debtors | 3 time policy | %Y-06-30 | customer_4 | letter | 3 | SI_11 | 10 days last reminder | draft | 840 | USD | |
450 | - | 1500 | %Y-04-14 | Debtors USD | 3 time policy | %Y-06-30 | customer_5_usd | letter | 3 | SI_15 | 10 days last reminder | draft | 1500 | USD | |
451 | - | 500 | %Y-04-14 | Debtors | 3 time policy | %Y-06-30 | Scrooge McDuck | letter | 3 | SI_17 | 10 days last reminder | draft | 1500 | | |
452 | - | 1050 | %Y-04-30 | Debtors | 3 time policy | %Y-06-30 | Donald Duck | email | 2 | SI_18 | 30 days end of month | draft | 1050 | | |
453 | - | 1050 | %Y-04-30 | Debtors | 3 time policy | %Y-06-30 | Gus Goose | email | 2 | SI_19 | 30 days end of month | draft | 1050 | | |
454 | + | balance | date due | account | policy | date | partner | channel | level | move line | policy level | state | amount due | currency | |
455 | + | 1200 | 2013-03-31 | Debtors | 2 time policy | 2013-06-30 | customer_2 | letter | 2 | SI_5 | 60 days last reminder | draft | 1200 | USD | |
456 | + | 1200 | 2013-03-17 | Debtors | 2 time policy | 2013-06-30 | customer_3 | letter | 2 | SI_8 | 60 days last reminder | draft | 1200 | USD | |
457 | + | 1050.01 | 2013-04-30 | Debtors | 3 time policy | 2013-06-30 | customer_4 | email | 2 | SI_12 | 30 days end of month | draft | 1050.01 | USD | |
458 | + | 840 | 2013-03-31 | Debtors | 3 time policy | 2013-06-30 | customer_4 | letter | 3 | SI_11 | 10 days last reminder | draft | 840 | USD | |
459 | + | 1500 | 2013-04-14 | Debtors USD | 3 time policy | 2013-06-30 | customer_5_usd | letter | 3 | SI_15 | 10 days last reminder | draft | 1500 | USD | |
460 | + | 500 | 2013-04-14 | Debtors | 3 time policy | 2013-06-30 | Scrooge McDuck | letter | 3 | SI_17 | 10 days last reminder | draft | 1500 | | |
461 | + | 1050 | 2013-04-30 | Debtors | 3 time policy | 2013-06-30 | Donald Duck | email | 2 | SI_18 | 30 days end of month | draft | 1050 | | |
462 | + | 1050 | 2013-04-30 | Debtors | 3 time policy | 2013-06-30 | Gus Goose | email | 2 | SI_19 | 30 days end of month | draft | 1050 | | |
463 | |
464 | === modified file 'account_credit_control/scenarios/features/09_credit_control_run_jul.feature' |
465 | --- account_credit_control/scenarios/features/09_credit_control_run_jul.feature 2013-03-28 14:23:02 +0000 |
466 | +++ account_credit_control/scenarios/features/09_credit_control_run_jul.feature 2014-03-03 12:08:47 +0000 |
467 | @@ -23,13 +23,13 @@ |
468 | Given I need a "credit.control.run" with oid: credit_control.run7 |
469 | And having: |
470 | | name | value | |
471 | - | date | %Y-07-31 | |
472 | + | date | 2013-07-31 | |
473 | When I launch the credit run |
474 | Then my credit run should be in state "done" |
475 | And the generated credit lines should have the following values: |
476 | - | balance | date due | account | policy | date | partner | channel | level | move line | policy level | state | amount due | currency | |
477 | - | 1500 | %Y-04-30 | Debtors | 2 time policy | %Y-07-31 | customer_2 | letter | 2 | SI_6 | 60 days last reminder | draft | 1500 | USD | |
478 | - | 1500 | %Y-04-14 | Debtors | 2 time policy | %Y-07-31 | customer_3 | letter | 2 | SI_9 | 60 days last reminder | draft | 1500 | USD | |
479 | - | 1050 | %Y-04-30 | Debtors | 3 time policy | %Y-07-31 | customer_4 | letter | 3 | SI_12 | 10 days last reminder | draft | 1050 | USD | |
480 | - | 1050 | %Y-04-30 | Debtors | 3 time policy | %Y-07-31 | Donald Duck | letter | 3 | SI_18 | 10 days last reminder | draft | 1050 | | |
481 | - | 1050 | %Y-04-30 | Debtors | 3 time policy | %Y-07-31 | Gus Goose | letter | 3 | SI_19 | 10 days last reminder | draft | 1050 | | |
482 | + | balance | date due | account | policy | date | partner | channel | level | move line | policy level | state | amount due | currency | |
483 | + | 1500 | 2013-04-30 | Debtors | 2 time policy | 2013-07-31 | customer_2 | letter | 2 | SI_6 | 60 days last reminder | draft | 1500 | USD | |
484 | + | 1500 | 2013-04-14 | Debtors | 2 time policy | 2013-07-31 | customer_3 | letter | 2 | SI_9 | 60 days last reminder | draft | 1500 | USD | |
485 | + | 1050.01 | 2013-04-30 | Debtors | 3 time policy | 2013-07-31 | customer_4 | letter | 3 | SI_12 | 10 days last reminder | draft | 1050.01 | USD | |
486 | + | 1050 | 2013-04-30 | Debtors | 3 time policy | 2013-07-31 | Donald Duck | letter | 3 | SI_18 | 10 days last reminder | draft | 1050 | | |
487 | + | 1050 | 2013-04-30 | Debtors | 3 time policy | 2013-07-31 | Gus Goose | letter | 3 | SI_19 | 10 days last reminder | draft | 1050 | | |
LGTM