From 7d3e01bea30dbfa70c56b77b3e019a2074a53e38 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Fri, 18 Oct 2013 15:59:25 +0200
Subject: [PATCH] [FIX] account: go green test\!, also set the test to previous
 year

bzr revid: mat@openerp.com-20131018135925-x2n1yw96973srmk1
---
 addons/account/partner.py                     |  3 +-
 .../account/test/account_fiscalyear_close.yml | 36 +++++++++----------
 2 files changed, 18 insertions(+), 21 deletions(-)

diff --git a/addons/account/partner.py b/addons/account/partner.py
index 4914a17dd2b..64896338476 100644
--- a/addons/account/partner.py
+++ b/addons/account/partner.py
@@ -116,7 +116,8 @@ class res_partner(osv.osv):
                       LEFT JOIN account_account a ON (l.account_id=a.id)
                       WHERE a.type IN ('receivable','payable')
                       AND l.partner_id IN %s
-                      AND l.reconcile_id IS NULL
+                      AND (l.reconcile_id IS NULL OR 
+                           reconcile_id in (SELECT id FROM account_move_reconcile WHERE opening_reconciliation is TRUE))
                       AND """ + query + """
                       GROUP BY l.partner_id, a.type
                       """,
diff --git a/addons/account/test/account_fiscalyear_close.yml b/addons/account/test/account_fiscalyear_close.yml
index a9c989be65b..73e34f2cca8 100644
--- a/addons/account/test/account_fiscalyear_close.yml
+++ b/addons/account/test/account_fiscalyear_close.yml
@@ -4,31 +4,27 @@
   !record {model: account.fiscalyear, id: account_fiscalyear_fiscalyear0}:
     code: !eval "'FY%s'% (datetime.now().year+1)"
     company_id: base.main_company
-    date_start: !eval "'%s-01-01' %(datetime.now().year+1)"
-    date_stop: !eval "'%s-12-31' %(datetime.now().year+1)"
-    name: !eval "'Fiscal Year %s' %(datetime.now().year+1)"
+    date_start: !eval "'%s-01-01' %(datetime.now().year-1)"
+    date_stop: !eval "'%s-12-31' %(datetime.now().year-1)"
+    name: !eval "'Fiscal Year %s' %(datetime.now().year-1)"
 -
-  I create a period for the opening entries for the new fiscalyear
+  I generate periods for the new fiscalyear
 -
-  !record {model: account.period, id: account_period_jan11}:
-    company_id: base.main_company
-    date_start: !eval "'%s-01-01'% (datetime.now().year+1)"
-    date_stop: !eval "'%s-01-01'% (datetime.now().year+1)"
-    fiscalyear_id: account_fiscalyear_fiscalyear0
-    name: !eval "'OP %s' %(datetime.now().year+1)"
-    special: 1
+  !python {model: account.fiscalyear}: |
+    self.create_period(cr, uid, [ref("account_fiscalyear_fiscalyear0")])
 -
-  I create a new account invoice a the partner in current fiscalyear
+  I create a new account invoice in the created fiscalyear
 -
   !record {model: account.invoice, id: account_invoice_current1}:
     partner_id: base.res_partner_2
+    date_invoice: !eval "'%s-01-02' %(datetime.now().year-1)"
     invoice_line:
       - partner_id: base.res_partner_2
         quantity: 1.0
         price_unit: 15.00
         name: Bying stuff
 -
-  I validate it the invoice
+  I validate the invoice
 -
   !python {model: account.invoice}: |
     import netsvc
@@ -47,13 +43,13 @@
     company_id: base.main_company
     centralisation: 1
 -
-  I called the Generate Fiscalyear Opening Entries wizard
+  I call the Generate Fiscalyear Opening Entries wizard
 -
   !record {model: account.fiscalyear.close, id: account_fiscalyear_close_0}:
-    fy2_id: account_fiscalyear_fiscalyear0
-    fy_id: account.data_fiscalyear
+    fy2_id: account.data_fiscalyear
+    fy_id: account_fiscalyear_fiscalyear0
     journal_id: account.close_journal
-    period_id: account_period_jan11
+    period_id: account.period_1
     report_name: End of Fiscal Year Entry
 -
   I clicked on create Button
@@ -66,7 +62,7 @@
   I close the previous fiscalyear
 -
   !record {model: account.fiscalyear.close.state, id: account_fiscalyear_close_state_0}:
-    fy_id: data_fiscalyear
+    fy_id: account_fiscalyear_fiscalyear0
 -
   I clicked on Close States Button to close fiscalyear
 -
@@ -77,10 +73,10 @@
 -
   I check that the fiscalyear state is now "Done"
 -
-  !assert {model: account.fiscalyear, id: data_fiscalyear, string: Fiscal Year is in Done state}:
+  !assert {model: account.fiscalyear, id: account_fiscalyear_fiscalyear0, string: Fiscal Year is in Done state}:
     - state == 'done'
 -
   I check that the past accounts are taken into account in partner credit
 -
-  !assert {model: res.partner, id: base.res_partner_2, string: Total Receivable does not takes unreconciled previous moves}:
+  !assert {model: res.partner, id: base.res_partner_2, string: Total Receivable does not takes unreconciled moves of previous years}:
     - credit == 15.0