Unifield Addons

Merge lp:~unifield-team/unifield-addons/UF_558_tests_fixes into lp:unifield-addons

  1. UF_558_tests_fixes
  2. Merge into trunk
Proposed by jftempo
Status: Merged
Merged at revision: 4512
Proposed branch: lp:~unifield-team/unifield-addons/UF_558_tests_fixes
Merge into: lp:unifield-addons
Diff against target: 253 lines (+55/-1)
11 files modified
account/invoice.py (+12/-1)
purchase/purchase_unit_test.xml (+6/-0)
purchase/test/procurement_buy.yml (+2/-0)
sale/test/advance_invoice.yml (+4/-0)
sale/test/invoice_on_ordered_qty.yml (+2/-0)
sale/test/invoice_on_shipped_qty.yml (+2/-0)
sale/test/manual_order_policy.yml (+6/-0)
sale/test/picking_order_policy.yml (+6/-0)
sale/test/postpaid_order_policy.yml (+5/-0)
sale/test/prepaid_order_policy.yml (+6/-0)
sale/test/so_make_line_invoice.yml (+4/-0)
To merge this branch: bzr merge lp:~unifield-team/unifield-addons/UF_558_tests_fixes
Reviewer Review Type Date Requested Status
UniField Dev Team Pending
Review via email: mp+87015@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'account/invoice.py'
2--- account/invoice.py 2011-10-05 14:55:12 +0000
3+++ account/invoice.py 2011-12-28 14:00:43 +0000
4@@ -783,6 +783,17 @@
5 line.append((0,0,val))
6 return line
7
8+ def _hook_period_id(self, cr, uid, inv, context={}):
9+ """
10+ Redefine period from invoice date
11+ """
12+ # Some verifications
13+ if not context:
14+ context = {}
15+ if not inv:
16+ return False
17+ return self.pool.get('account.period').search(cr, uid, [('date_start','<=',inv.date_invoice or time.strftime('%Y-%m-%d')),('date_stop','>=',inv.date_invoice or time.strftime('%Y-%m-%d')), ('company_id', '=', inv.company_id.id)])
18+
19 def action_move_create(self, cr, uid, ids, *args):
20 """Creates invoice related analytics and financial move lines"""
21 ait_obj = self.pool.get('account.invoice.tax')
22@@ -916,7 +927,7 @@
23 }
24 period_id = inv.period_id and inv.period_id.id or False
25 if not period_id:
26- period_ids = self.pool.get('account.period').search(cr, uid, [('date_start','<=',inv.date_invoice or time.strftime('%Y-%m-%d')),('date_stop','>=',inv.date_invoice or time.strftime('%Y-%m-%d')), ('company_id', '=', inv.company_id.id)])
27+ period_ids = self._hook_period_id(cr, uid, inv, context=context)
28 if period_ids:
29 period_id = period_ids[0]
30 if period_id:
31
32=== modified file 'purchase/purchase_unit_test.xml'
33--- purchase/purchase_unit_test.xml 2011-01-14 00:11:01 +0000
34+++ purchase/purchase_unit_test.xml 2011-12-28 14:00:43 +0000
35@@ -48,6 +48,12 @@
36 <test expr="invoice_ids[0].state">draft</test>
37 </assert>
38
39+ <!-- Disallow analytic distribution verification -->
40+ <function model="account.invoice" name="write">
41+ <value model="purchase.order" eval="[obj(ref('test_purchase_1')).invoice_ids[0].id]" />
42+ <value eval="{'from_yml_test': True}"/>
43+ </function>
44+
45 <workflow model="account.invoice" action="invoice_open">
46 <value model="purchase.order" eval="obj(ref('test_purchase_1')).invoice_ids[0].id" />
47 </workflow>
48
49=== modified file 'purchase/test/procurement_buy.yml'
50--- purchase/test/procurement_buy.yml 2011-10-17 11:57:34 +0000
51+++ purchase/test/procurement_buy.yml 2011-12-28 14:00:43 +0000
52@@ -73,6 +73,8 @@
53 !python {model: purchase.order}: |
54 procurement_obj = self.pool.get('procurement.order')
55 proc_ids = procurement_obj.browse(cr, uid, [ref('procurement_order_testcase0')])[0]
56+ # Avoir analytic distribution error
57+ self.write(cr, uid, [proc_ids.purchase_id.id], {'from_yml_test': True})
58 import netsvc
59 wf_service = netsvc.LocalService("workflow")
60 wf_service.trg_validate(uid, 'purchase.order',proc_ids.purchase_id.id,'purchase_confirm', cr)
61
62=== modified file 'sale/test/advance_invoice.yml'
63--- sale/test/advance_invoice.yml 2011-01-14 00:11:01 +0000
64+++ sale/test/advance_invoice.yml 2011-12-28 14:00:43 +0000
65@@ -53,6 +53,8 @@
66 import netsvc
67 wf_service = netsvc.LocalService("workflow")
68 invoice_ids = so.invoice_ids
69+ # Avoir analytic distribution error
70+ self.write(cr, uid, [x.id for x in invoice_ids], {'from_yml_test': True})
71 for invoice in invoice_ids:
72 wf_service.trg_validate(uid, 'account.invoice',invoice.id,'invoice_open', cr)
73 -
74@@ -112,6 +114,8 @@
75 import netsvc
76 wf_service = netsvc.LocalService("workflow")
77 invoice_ids = so.invoice_ids
78+ # Avoir analytic distribution error
79+ self.write(cr, uid, [x.id for x in invoice_ids], {'from_yml_test': True})
80 for invoice in invoice_ids:
81 wf_service.trg_validate(uid, 'account.invoice',invoice.id,'invoice_open', cr)
82 -
83
84=== modified file 'sale/test/invoice_on_ordered_qty.yml'
85--- sale/test/invoice_on_ordered_qty.yml 2011-01-14 00:11:01 +0000
86+++ sale/test/invoice_on_ordered_qty.yml 2011-12-28 14:00:43 +0000
87@@ -96,6 +96,8 @@
88 import netsvc
89 wf_service = netsvc.LocalService("workflow")
90 invoice_ids = so.invoice_ids
91+ # Avoid analytic distribution error
92+ self.write(cr, uid, [x.id for x in invoice_ids], {'from_yml_test': True})
93 for invoice in invoice_ids:
94 wf_service.trg_validate(uid, 'account.invoice',invoice.id,'invoice_open', cr)
95 -
96
97=== modified file 'sale/test/invoice_on_shipped_qty.yml'
98--- sale/test/invoice_on_shipped_qty.yml 2011-12-28 13:02:53 +0000
99+++ sale/test/invoice_on_shipped_qty.yml 2011-12-28 14:00:43 +0000
100@@ -111,6 +111,8 @@
101 import netsvc
102 wf_service = netsvc.LocalService("workflow")
103 invoice_ids = so.invoice_ids
104+ # Avoir analytic distribution error
105+ self.write(cr, uid, [x.id for x in invoice_ids], {'from_yml_test': True})
106 for invoice in invoice_ids:
107 wf_service.trg_validate(uid, 'account.invoice',invoice.id,'invoice_open', cr)
108 -
109
110=== modified file 'sale/test/manual_order_policy.yml'
111--- sale/test/manual_order_policy.yml 2011-09-21 09:54:22 +0000
112+++ sale/test/manual_order_policy.yml 2011-12-28 14:00:43 +0000
113@@ -48,6 +48,8 @@
114 import netsvc
115 wf_service = netsvc.LocalService("workflow")
116 invoice_ids = so.invoice_ids
117+ # Avoid analytic distribution error
118+ self.write(cr, uid, [x.id for x in invoice_ids], {'from_yml_test': True})
119 for invoice in invoice_ids:
120 wf_service.trg_validate(uid, 'account.invoice',invoice.id,'invoice_open', cr)
121 -
122@@ -173,6 +175,8 @@
123 import netsvc
124 wf_service = netsvc.LocalService("workflow")
125 pur_ids = pur_obj.search(cr, uid, [('origin','=',so.name)])
126+ # Avoid analytic distribution error
127+ pur_obj.write(cr, uid, pur_ids, {'from_yml_test': True})
128 for pur in pur_ids:
129 wf_service.trg_validate(uid, 'purchase.order',pur,'purchase_confirm', cr)
130 -
131@@ -189,6 +193,8 @@
132 import netsvc
133 wf_service = netsvc.LocalService("workflow")
134 pur_ids = pur_obj.search(cr, uid, [('origin','=',so.name)])
135+ # Avoid analytic distribution error
136+ pur_obj.write(cr, uid, pur_ids, {'from_yml_test': True})
137 for pur in pur_ids:
138 wf_service.trg_validate(uid, 'purchase.order',pur,'purchase_approve', cr)
139 -
140
141=== modified file 'sale/test/picking_order_policy.yml'
142--- sale/test/picking_order_policy.yml 2011-12-28 11:17:13 +0000
143+++ sale/test/picking_order_policy.yml 2011-12-28 14:00:43 +0000
144@@ -84,6 +84,8 @@
145 import netsvc
146 wf_service = netsvc.LocalService("workflow")
147 invoice_ids = so.invoice_ids
148+ # Avoid analytic distribution error
149+ self.write(cr, uid, [x.id for x in invoice_ids], {'from_yml_test': True})
150 for invoice in invoice_ids:
151 wf_service.trg_validate(uid, 'account.invoice',invoice.id,'invoice_open', cr)
152 -
153@@ -178,6 +180,8 @@
154 import netsvc
155 wf_service = netsvc.LocalService("workflow")
156 pur_ids = pur_obj.search(cr, uid, [('origin','=',so.name)])
157+ # Avoid analytic distribution error
158+ pur_obj.write(cr, uid, pur_ids, {'from_yml_test': True})
159 for pur in pur_ids:
160 wf_service.trg_validate(uid, 'purchase.order',pur,'purchase_confirm', cr)
161 -
162@@ -194,6 +198,8 @@
163 import netsvc
164 wf_service = netsvc.LocalService("workflow")
165 pur_ids = pur_obj.search(cr, uid, [('origin','=',so.name)])
166+ # Avoid analytic distribution error
167+ pur_obj.write(cr, uid, pur_ids, {'from_yml_test': True})
168 for pur in pur_ids:
169 wf_service.trg_validate(uid, 'purchase.order',pur,'purchase_approve', cr)
170 -
171
172=== modified file 'sale/test/postpaid_order_policy.yml'
173--- sale/test/postpaid_order_policy.yml 2011-09-21 09:54:22 +0000
174+++ sale/test/postpaid_order_policy.yml 2011-12-28 14:00:43 +0000
175@@ -172,6 +172,8 @@
176 import netsvc
177 wf_service = netsvc.LocalService("workflow")
178 pur_ids = pur_obj.search(cr, uid, [('origin','=',so.name)])
179+ # Avoid analytic distribution error
180+ pur_obj.write(cr, uid, pur_ids, {'from_yml_test': True})
181 for pur in pur_ids:
182 wf_service.trg_validate(uid, 'purchase.order',pur,'purchase_confirm', cr)
183 -
184@@ -188,6 +190,8 @@
185 import netsvc
186 wf_service = netsvc.LocalService("workflow")
187 pur_ids = pur_obj.search(cr, uid, [('origin','=',so.name)])
188+ # Avoid analytic distribution error
189+ pur_obj.write(cr, uid, pur_ids, {'from_yml_test': True})
190 for pur in pur_ids:
191 wf_service.trg_validate(uid, 'purchase.order',pur,'purchase_approve', cr)
192 -
193@@ -263,6 +267,7 @@
194 import netsvc
195 wf_service = netsvc.LocalService("workflow")
196 invoice_ids = so.invoice_ids
197+ self.write(cr, uid, [x.id for x in invoice_ids], {'from_yml_test': True})
198 for invoice in invoice_ids:
199 wf_service.trg_validate(uid, 'account.invoice',invoice.id,'invoice_open', cr)
200 -
201
202=== modified file 'sale/test/prepaid_order_policy.yml'
203--- sale/test/prepaid_order_policy.yml 2011-12-28 11:17:13 +0000
204+++ sale/test/prepaid_order_policy.yml 2011-12-28 14:00:43 +0000
205@@ -51,6 +51,8 @@
206 import netsvc
207 wf_service = netsvc.LocalService("workflow")
208 invoice_ids = so.invoice_ids
209+ # Avoid analytic distribution error
210+ self.write(cr, uid, [x.id for x in invoice_ids], {'from_yml_test': True})
211 for invoice in invoice_ids:
212 wf_service.trg_validate(uid, 'account.invoice',invoice.id,'invoice_open', cr)
213 -
214@@ -187,6 +189,8 @@
215 import netsvc
216 wf_service = netsvc.LocalService("workflow")
217 pur_ids = pur_obj.search(cr, uid, [('origin','=',so.name)])
218+ # Avoid analytic distribution error
219+ pur_obj.write(cr, uid, pur_ids, {'from_yml_test': True})
220 for pur in pur_ids:
221 wf_service.trg_validate(uid, 'purchase.order',pur,'purchase_confirm', cr)
222 -
223@@ -203,6 +207,8 @@
224 import netsvc
225 wf_service = netsvc.LocalService("workflow")
226 pur_ids = pur_obj.search(cr, uid, [('origin','=',so.name)])
227+ # Avoid analytic distribution error
228+ pur_obj.write(cr, uid, pur_ids, {'from_yml_test': True})
229 for pur in pur_ids:
230 wf_service.trg_validate(uid, 'purchase.order',pur,'purchase_approve', cr)
231 -
232
233=== modified file 'sale/test/so_make_line_invoice.yml'
234--- sale/test/so_make_line_invoice.yml 2011-01-14 00:11:01 +0000
235+++ sale/test/so_make_line_invoice.yml 2011-12-28 14:00:43 +0000
236@@ -78,6 +78,8 @@
237 import netsvc
238 wf_service = netsvc.LocalService("workflow")
239 invoice_ids = so.invoice_ids
240+ # Avoir analytic distribution error
241+ self.write(cr, uid, [x.id for x in invoice_ids], {'from_yml_test': True})
242 for invoice in invoice_ids:
243 wf_service.trg_validate(uid, 'account.invoice',invoice.id,'invoice_open', cr)
244 -
245@@ -163,6 +165,8 @@
246 import netsvc
247 wf_service = netsvc.LocalService("workflow")
248 invoice_ids = so.invoice_ids
249+ # Avoid analytic distribution error
250+ self.write(cr, uid, [x.id for x in invoice_ids], {'from_yml_test': True})
251 for invoice in invoice_ids:
252 wf_service.trg_validate(uid, 'account.invoice',invoice.id,'invoice_open', cr)
253 -

Subscribers

People subscribed via source and target branches

to all changes: