1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
|
# -*- coding: utf-8 -*-
# Part of Odoo. See LICENSE file for full copyright and licensing details.
from odoo.addons.stock_account.tests.test_anglo_saxon_valuation_reconciliation_common import ValuationReconciliationTestCommon
from odoo.tests import Form, tagged
@tagged('post_install', '-at_install')
class TestStockValuation(ValuationReconciliationTestCommon):
@classmethod
def setUpClass(cls, chart_template_ref=None):
super().setUpClass(chart_template_ref=chart_template_ref)
cls.supplier_location = cls.env.ref('stock.stock_location_suppliers')
cls.stock_location = cls.company_data['default_warehouse'].lot_stock_id
cls.partner_id = cls.env['res.partner'].create({'name': 'My Test Partner'})
cls.product1 = cls.env['product.product'].create({
'name': 'Large Desk',
'type': 'product',
'categ_id': cls.stock_account_product_categ.id,
'taxes_id': [(6, 0, [])],
})
def _dropship_product1(self):
# enable the dropship and MTO route on the product
dropshipping_route = self.env.ref('stock_dropshipping.route_drop_shipping')
mto_route = self.env.ref('stock.route_warehouse0_mto')
self.product1.write({'route_ids': [(6, 0, [dropshipping_route.id, mto_route.id])]})
# add a vendor
vendor1 = self.env['res.partner'].create({'name': 'vendor1'})
seller1 = self.env['product.supplierinfo'].create({
'name': vendor1.id,
'price': 8,
})
self.product1.write({'seller_ids': [(6, 0, [seller1.id])]})
# sell one unit of this product
customer1 = self.env['res.partner'].create({'name': 'customer1'})
self.sale_order1 = self.env['sale.order'].create({
'partner_id': customer1.id,
'partner_invoice_id': customer1.id,
'partner_shipping_id': customer1.id,
'order_line': [(0, 0, {
'name': self.product1.name,
'product_id': self.product1.id,
'product_uom_qty': 1,
'product_uom': self.product1.uom_id.id,
'price_unit': 12,
'tax_id': [(6, 0, [])],
})],
'pricelist_id': self.env.ref('product.list0').id,
'picking_policy': 'direct',
})
self.sale_order1.action_confirm()
# confirm the purchase order
self.purchase_order1 = self.env['purchase.order'].search([('group_id', '=', self.sale_order1.procurement_group_id.id)])
self.purchase_order1.button_confirm()
# validate the dropshipping picking
self.assertEqual(len(self.sale_order1.picking_ids), 1)
wizard = self.sale_order1.picking_ids.button_validate()
immediate_transfer = Form(self.env[wizard['res_model']].with_context(wizard['context'])).save()
immediate_transfer.process()
self.assertEqual(self.sale_order1.picking_ids.state, 'done')
# create the vendor bill
move_form = Form(self.env['account.move'].with_context(default_move_type='in_invoice'))
move_form.partner_id = vendor1
move_form.purchase_id = self.purchase_order1
move_form.invoice_date = move_form.date
for i in range(len(self.purchase_order1.order_line)):
with move_form.invoice_line_ids.edit(i) as line_form:
line_form.tax_ids.clear()
self.vendor_bill1 = move_form.save()
self.vendor_bill1.action_post()
# create the customer invoice
self.customer_invoice1 = self.sale_order1._create_invoices()
self.customer_invoice1.action_post()
all_amls = self.vendor_bill1.line_ids + self.customer_invoice1.line_ids
if self.sale_order1.picking_ids.move_lines.account_move_ids:
all_amls |= self.sale_order1.picking_ids.move_lines.account_move_ids.line_ids
return all_amls
def _check_results(self, expected_aml, expected_aml_count, all_amls):
# Construct a dict similar to `expected_aml` with `all_amls` in order to
# compare them.
result_aml = {}
for aml in all_amls:
account_id = aml.account_id.id
if result_aml.get(account_id):
debit = result_aml[account_id][0]
credit = result_aml[account_id][1]
result_aml[account_id] = (debit + aml.debit, credit + aml.credit)
else:
result_aml[account_id] = (aml.debit, aml.credit)
self.assertEqual(len(all_amls), expected_aml_count)
for k, v in expected_aml.items():
self.assertEqual(result_aml[k], v)
# -------------------------------------------------------------------------
# Continental
# -------------------------------------------------------------------------
def test_dropship_standard_perpetual_continental_ordered(self):
self.env.company.anglo_saxon_accounting = False
self.product1.product_tmpl_id.categ_id.property_cost_method = 'standard'
self.product1.product_tmpl_id.standard_price = 10
self.product1.product_tmpl_id.categ_id.property_valuation = 'real_time'
self.product1.product_tmpl_id.invoice_policy = 'order'
all_amls = self._dropship_product1()
expected_aml = {
self.company_data['default_account_payable'].id: (0.0, 8.0),
self.company_data['default_account_expense'].id: (8.0, 0.0),
self.company_data['default_account_receivable'].id: (12.0, 0.0),
self.company_data['default_account_revenue'].id: (0.0, 12.0),
}
self._check_results(expected_aml, 4, all_amls)
def test_dropship_standard_perpetual_continental_delivered(self):
self.env.company.anglo_saxon_accounting = False
self.product1.product_tmpl_id.categ_id.property_cost_method = 'standard'
self.product1.product_tmpl_id.standard_price = 10
self.product1.product_tmpl_id.categ_id.property_valuation = 'real_time'
self.product1.product_tmpl_id.invoice_policy = 'delivery'
all_amls = self._dropship_product1()
expected_aml = {
self.company_data['default_account_payable'].id: (0.0, 8.0),
self.company_data['default_account_expense'].id: (8.0, 0.0),
self.company_data['default_account_receivable'].id: (12.0, 0.0),
self.company_data['default_account_revenue'].id: (0.0, 12.0),
}
self._check_results(expected_aml, 4, all_amls)
def test_dropship_fifo_perpetual_continental_ordered(self):
self.env.company.anglo_saxon_accounting = False
self.product1.product_tmpl_id.categ_id.property_cost_method = 'fifo'
self.product1.product_tmpl_id.standard_price = 10
self.product1.product_tmpl_id.categ_id.property_valuation = 'real_time'
self.product1.product_tmpl_id.invoice_policy = 'order'
all_amls = self._dropship_product1()
expected_aml = {
self.company_data['default_account_payable'].id: (0.0, 8.0),
self.company_data['default_account_expense'].id: (8.0, 0.0),
self.company_data['default_account_receivable'].id: (12.0, 0.0),
self.company_data['default_account_revenue'].id: (0.0, 12.0),
}
self._check_results(expected_aml, 4, all_amls)
def test_dropship_fifo_perpetual_continental_delivered(self):
self.env.company.anglo_saxon_accounting = False
self.product1.product_tmpl_id.categ_id.property_cost_method = 'fifo'
self.product1.product_tmpl_id.standard_price = 10
self.product1.product_tmpl_id.categ_id.property_valuation = 'real_time'
self.product1.product_tmpl_id.invoice_policy = 'delivery'
all_amls = self._dropship_product1()
expected_aml = {
self.company_data['default_account_payable'].id: (0.0, 8.0),
self.company_data['default_account_expense'].id: (8.0, 0.0),
self.company_data['default_account_receivable'].id: (12.0, 0.0),
self.company_data['default_account_revenue'].id: (0.0, 12.0),
}
self._check_results(expected_aml, 4, all_amls)
# -------------------------------------------------------------------------
# Anglosaxon
# -------------------------------------------------------------------------
def test_dropship_standard_perpetual_anglosaxon_ordered(self):
self.env.company.anglo_saxon_accounting = True
self.product1.product_tmpl_id.categ_id.property_cost_method = 'standard'
self.product1.product_tmpl_id.standard_price = 10
self.product1.product_tmpl_id.categ_id.property_valuation = 'real_time'
self.product1.product_tmpl_id.invoice_policy = 'order'
all_amls = self._dropship_product1()
expected_aml = {
self.company_data['default_account_payable'].id: (0.0, 8.0),
self.company_data['default_account_expense'].id: (10.0, 0.0),
self.company_data['default_account_receivable'].id: (12.0, 0.0),
self.company_data['default_account_revenue'].id: (0.0, 12.0),
self.company_data['default_account_stock_in'].id: (8.0, 10.0),
self.company_data['default_account_stock_out'].id: (10.0, 10.0),
}
# Interim IN is not balanced because because there's a difference between the po line
# price unit and the standard price. We could set a price difference account on the
# category to compensate.
self._check_results(expected_aml, 10, all_amls)
def test_dropship_standard_perpetual_anglosaxon_delivered(self):
self.env.company.anglo_saxon_accounting = True
self.product1.product_tmpl_id.categ_id.property_cost_method = 'standard'
self.product1.product_tmpl_id.standard_price = 10
self.product1.product_tmpl_id.categ_id.property_valuation = 'real_time'
self.product1.product_tmpl_id.invoice_policy = 'delivery'
all_amls = self._dropship_product1()
expected_aml = {
self.company_data['default_account_payable'].id: (0.0, 8.0),
self.company_data['default_account_expense'].id: (10.0, 0.0),
self.company_data['default_account_receivable'].id: (12.0, 0.0),
self.company_data['default_account_revenue'].id: (0.0, 12.0),
self.company_data['default_account_stock_in'].id: (8.0, 10.0),
self.company_data['default_account_stock_out'].id: (10.0, 10.0),
}
# Interim IN is not balanced because because there's a difference between the po line
# price unit and the standard price. We could set a price difference account on the
# category to compensate.
self._check_results(expected_aml, 10, all_amls)
def test_dropship_fifo_perpetual_anglosaxon_ordered(self):
self.env.company.anglo_saxon_accounting = True
self.product1.product_tmpl_id.categ_id.property_cost_method = 'fifo'
self.product1.product_tmpl_id.standard_price = 10
self.product1.product_tmpl_id.categ_id.property_valuation = 'real_time'
self.product1.product_tmpl_id.invoice_policy = 'order'
all_amls = self._dropship_product1()
expected_aml = {
self.company_data['default_account_payable'].id: (0.0, 8.0),
self.company_data['default_account_expense'].id: (8.0, 0.0),
self.company_data['default_account_receivable'].id: (12.0, 0.0),
self.company_data['default_account_revenue'].id: (0.0, 12.0),
self.company_data['default_account_stock_in'].id: (8.0, 8.0),
self.company_data['default_account_stock_out'].id: (8.0, 8.0),
}
self._check_results(expected_aml, 10, all_amls)
def test_dropship_fifo_perpetual_anglosaxon_delivered(self):
self.env.company.anglo_saxon_accounting = True
self.product1.product_tmpl_id.categ_id.property_cost_method = 'fifo'
self.product1.product_tmpl_id.standard_price = 10
self.product1.product_tmpl_id.categ_id.property_valuation = 'real_time'
self.product1.product_tmpl_id.invoice_policy = 'delivery'
all_amls = self._dropship_product1()
expected_aml = {
self.company_data['default_account_payable'].id: (0.0, 8.0),
self.company_data['default_account_expense'].id: (8.0, 0.0),
self.company_data['default_account_receivable'].id: (12.0, 0.0),
self.company_data['default_account_revenue'].id: (0.0, 12.0),
self.company_data['default_account_stock_in'].id: (8.0, 8.0),
self.company_data['default_account_stock_out'].id: (8.0, 8.0),
}
self._check_results(expected_aml, 10, all_amls)
def test_dropship_standard_perpetual_anglosaxon_ordered_return(self):
self.env.company.anglo_saxon_accounting = True
self.product1.product_tmpl_id.categ_id.property_cost_method = 'standard'
self.product1.product_tmpl_id.standard_price = 10
self.product1.product_tmpl_id.categ_id.property_valuation = 'real_time'
self.product1.product_tmpl_id.invoice_policy = 'order'
all_amls = self._dropship_product1()
# return what we've done
stock_return_picking_form = Form(self.env['stock.return.picking']
.with_context(active_ids=self.sale_order1.picking_ids.ids, active_id=self.sale_order1.picking_ids.ids[0],
active_model='stock.picking'))
stock_return_picking = stock_return_picking_form.save()
stock_return_picking_action = stock_return_picking.create_returns()
return_pick = self.env['stock.picking'].browse(stock_return_picking_action['res_id'])
return_pick.move_lines[0].move_line_ids[0].qty_done = 1.0
return_pick._action_done()
self.assertEqual(return_pick.move_lines._is_dropshipped_returned(), True)
all_amls_return = self.vendor_bill1.line_ids + self.customer_invoice1.line_ids
if self.sale_order1.picking_ids.mapped('move_lines.account_move_ids'):
all_amls_return |= self.sale_order1.picking_ids.mapped('move_lines.account_move_ids.line_ids')
# Two extra AML should have been created for the return
expected_aml = {
self.company_data['default_account_stock_in'].id: (10.0, 0.0),
self.company_data['default_account_stock_out'].id: (0.0, 10.0),
}
self._check_results(expected_aml, 4, all_amls_return - all_amls)
|
