diff --git a/addons/sale/test/advance_invoice.yml b/addons/sale/test/advance_invoice.yml index 5a8d06c354c..f926548046f 100644 --- a/addons/sale/test/advance_invoice.yml +++ b/addons/sale/test/advance_invoice.yml @@ -66,7 +66,7 @@ !python {model: account.invoice}: | sale_order_obj = self.pool.get('sale.order') so = sale_order_obj.browse(cr, uid, ref("sale_order_so5")) - invoice_id = self.search(cr, uid, [('origin','=',so.name) and ('state','=','open')]) + invoice_id = self.search(cr, uid, [('origin','=',so.name),('state','=','open')]) assert invoice_id, "Invoice is not in the open state" - Creating a account invoice pay entry. @@ -100,7 +100,7 @@ !python {model: account.invoice}: | sale_order_obj = self.pool.get('sale.order') so = sale_order_obj.browse(cr, uid, ref("sale_order_so5")) - invoice_id = self.search(cr, uid, [('origin','=',so.name) and ('state','=','paid')]) + invoice_id = self.search(cr, uid, [('origin','=',so.name),('state','=','paid')]) assert invoice_id, "Invoice for SO is not in done state." - I verify that Paid has been set to true. @@ -135,7 +135,7 @@ !python {model: account.invoice}: | sale_order_obj = self.pool.get('sale.order') so = sale_order_obj.browse(cr, uid, ref("sale_order_so5")) - invoice_id = self.search(cr, uid, [('origin','=',so.name) and ('state','=','open')]) + invoice_id = self.search(cr, uid, [('origin','=',so.name),('state','=','open')]) assert invoice_id, "Invoice is not in the open state" - Creating a account invoice pay entry. @@ -178,7 +178,7 @@ !python {model: account.invoice}: | sale_order_obj = self.pool.get('sale.order') so = sale_order_obj.browse(cr, uid, ref("sale_order_so5")) - invoice_id = self.search(cr, uid, [('origin','=',so.name) and ('state','=','paid')]) + invoice_id = self.search(cr, uid, [('origin','=',so.name),('state','=','paid')]) assert invoice_id, "Invoice for SO is not in done state." - I verify that Paid has been set to true. diff --git a/addons/sale/test/invoice_on_ordered_qty.yml b/addons/sale/test/invoice_on_ordered_qty.yml index 9056e4cbb83..c845a4cb741 100644 --- a/addons/sale/test/invoice_on_ordered_qty.yml +++ b/addons/sale/test/invoice_on_ordered_qty.yml @@ -3,7 +3,7 @@ I create a Sale Order for Slider Mobile for 500 quantity having Shipping Policy 'Shipping & Manual Invoice' and Invoice on 'Ordered quantities' in order to create an invoice based on the ordered quantity - - !record {model: sale.order, id: sale_order_so8}: + !record {model: sale.order, id: sale_order_so9}: date_order: '2010-07-17' invoice_quantity: order name: Test_SO006 @@ -29,13 +29,13 @@ - I confirm the Sale Order. - - !workflow {model: sale.order, action: order_confirm, ref: sale_order_so8} + !workflow {model: sale.order, action: order_confirm, ref: sale_order_so9} - I verify that the picking has been generated for the sale order - !python {model: sale.order}: | - so = self.browse(cr, uid, ref("sale_order_so8")) - assert so.picking_ids,"Picking has not been generated for sale_order_so8" + so = self.browse(cr, uid, ref("sale_order_so9")) + assert so.picking_ids,"Picking has not been generated for sale_order_so9" - Then I click on the "Products Received" button of Incoming Shipments - @@ -47,7 +47,7 @@ !python {model: stock.picking }: | import time sale_order_obj = self.pool.get('sale.order') - so = sale_order_obj.browse(cr, uid, ref("sale_order_so8")) + so = sale_order_obj.browse(cr, uid, ref("sale_order_so9")) picking_id = self.search(cr, uid, [('origin','=',so.name),('type','=','out')]) if picking_id: pick=self.browse(cr,uid,picking_id[0]) @@ -67,33 +67,32 @@ - I click on Create Invoice button to create the invoice. - - !workflow {model: sale.order, action: manual_invoice, ref: sale_order_so8} + !workflow {model: sale.order, action: manual_invoice, ref: sale_order_so9} - I verify whether the invoice has been generated for SO - !python {model: sale.order}: | - so = self.browse(cr, uid, ref("sale_order_so8")) - assert so.invoice_ids, "Invoices has not been generated for sale_order_so8" + so = self.browse(cr, uid, ref("sale_order_so9")) + assert so.invoice_ids, "Invoices has not been generated for sale_order_so9" - I verify that an invoice is created on the basis of ordered quantity - !python {model: account.invoice}: | sale_order_obj = self.pool.get('sale.order') - so = sale_order_obj.browse(cr, uid, ref("sale_order_so8")) + so = sale_order_obj.browse(cr, uid, ref("sale_order_so9")) for so_lines in so.order_line: - qty=so_lines.product_uom_qty - ids = self.search(cr, uid, [('origin', '=', so.name)]) + qty = so_lines.product_uom_qty + ids = self.search(cr, uid, [('origin','=',so.name)]) inv_brw = self.browse(cr,uid,ids)[0] for inv_lines in inv_brw.invoice_line: - qty1=inv_lines.quantity - invoice_id = self.search(cr, uid, [('qty1','=', 'qty') and ('origin', '=', so.name)]) - assert invoice_id, "Quantities are not same" + qty1 = inv_lines.quantity + assert ('qty1','=','qty'), "Quantities are not same" - I open the Invoice for the SO. - !python {model: account.invoice}: | sale_order_obj = self.pool.get('sale.order') - so = sale_order_obj.browse(cr, uid, ref("sale_order_so8")) + so = sale_order_obj.browse(cr, uid, ref("sale_order_so9")) import netsvc wf_service = netsvc.LocalService("workflow") invoice_ids = so.invoice_ids @@ -113,7 +112,7 @@ - !python {model: account.invoice.pay}: | sale_order_obj = self.pool.get('sale.order') - so = sale_order_obj.browse(cr, uid, ref("sale_order_so8")) + so = sale_order_obj.browse(cr, uid, ref("sale_order_so9")) self.wo_check(cr, uid, [ref("account_invoice_pay_tst1")], {"lang": "en_US", "tz": False, "active_model": 'account.invoice', "active_ids": [so.invoice_ids[0].id], "type": "out_invoice", "active_id": so.invoice_ids[0].id, }) @@ -130,7 +129,7 @@ - !python {model: account.invoice.pay.writeoff}: | sale_order_obj = self.pool.get('sale.order') - so = sale_order_obj.browse(cr, uid, ref("sale_order_so8")) + so = sale_order_obj.browse(cr, uid, ref("sale_order_so9")) self.pay_and_reconcile_writeoff(cr, uid, [ref("account_invoice_pay_writeoff_0")], {"lang": 'en_US', "tz": False, "active_model": 'account.invoice', "active_ids": [so.invoice_ids[0].id], "type": "out_invoice", "active_id": so.invoice_ids[0].id }) @@ -139,7 +138,7 @@ - !python {model: account.invoice}: | sale_order_obj = self.pool.get('sale.order') - so = sale_order_obj.browse(cr, uid, ref("sale_order_so8")) + so = sale_order_obj.browse(cr, uid, ref("sale_order_so9")) invoice_ids = so.invoice_ids for invoice in invoice_ids: assert (invoice.state) =='paid', "Invoice for SO is not in done state." @@ -147,5 +146,5 @@ I check that Paid has been set to true. - !python {model: sale.order}: | - sale_id=self.browse(cr, uid, ref("sale_order_so8")) + sale_id=self.browse(cr, uid, ref("sale_order_so9")) assert(sale_id.invoiced == True), "Paid has not been set to true" \ No newline at end of file diff --git a/addons/sale/test/invoice_on_shipped_qty.yml b/addons/sale/test/invoice_on_shipped_qty.yml index 06e90cb9c4b..c399948c004 100644 --- a/addons/sale/test/invoice_on_shipped_qty.yml +++ b/addons/sale/test/invoice_on_shipped_qty.yml @@ -103,8 +103,7 @@ inv_brw = self.browse(cr,uid,inv_id)[0] for inv_lines in inv_brw.invoice_line: qty1=inv_lines.quantity - invoice_id = self.search(cr, uid, [('qty1','=', 'qty') and ('origin', '=', so.name)]) - assert invoice_id, "Quantities are not same" + assert ('qty1','=','qty'), "Quantities are not same" - I open the Invoice for the SO. - diff --git a/addons/sale/test/manual_order_policy.yml b/addons/sale/test/manual_order_policy.yml index 3d7abdcf549..9dd12ed375c 100644 --- a/addons/sale/test/manual_order_policy.yml +++ b/addons/sale/test/manual_order_policy.yml @@ -56,7 +56,7 @@ !python {model: account.invoice}: | sale_order_obj = self.pool.get('sale.order') so = sale_order_obj.browse(cr, uid, ref("sale_order_so0")) - invoice_id = self.search(cr, uid, [('origin','=',so.name) and ('state','=','open')]) + invoice_id = self.search(cr, uid, [('origin','=',so.name),('state','=','open')]) assert invoice_id, "Invoice is not in the open state" - I verify that its Journal Entries has been created @@ -64,7 +64,7 @@ !python {model: account.invoice}: | sale_order_obj = self.pool.get('sale.order') so = sale_order_obj.browse(cr, uid, ref("sale_order_so0")) - invoice_id = self.search(cr, uid, [('origin','=',so.name) and ('state','=','open')]) + invoice_id = self.search(cr, uid, [('origin','=',so.name),('state','=','open')]) inv_brw = self.browse(cr, uid, invoice_id)[0] assert inv_brw.move_id, "Journal Entries has not been created" - @@ -108,7 +108,7 @@ !python {model: account.invoice}: | sale_order_obj = self.pool.get('sale.order') so = sale_order_obj.browse(cr, uid, ref("sale_order_so0")) - invoice_id = self.search(cr, uid, [('origin','=',so.name) and ('state','=','paid')]) + invoice_id = self.search(cr, uid, [('origin','=',so.name),('state','=','paid')]) assert invoice_id, "Invoice for SO is not in done state." - I verify that Paid has been set to true. @@ -161,7 +161,7 @@ if (mod_brw.state == 'installed'): sale_order_obj = self.pool.get('sale.order') so = sale_order_obj.browse(cr, uid, ref("sale_order_so0")) - proc_ids = self.search(cr, uid, [('origin','=',so.name) and ('state','=','running')]) + proc_ids = self.search(cr, uid, [('origin','=',so.name),('state','=','running')]) assert proc_ids, _('Procurement is not in the running state!') - I verify that a purchase order has been generated @@ -259,7 +259,7 @@ pur_id = pur_obj.search(cr, uid, [('origin','=',so.name)]) po = pur_obj.browse(cr, uid, pur_id)[0] picking_obj = self.pool.get('stock.picking') - ids = picking_obj.search(cr, uid, [('purchase_id', '=', po.id ) and ('state', '=', 'done')]) + ids = picking_obj.search(cr, uid, [('purchase_id', '=', po.id ),('state', '=', 'done')]) assert ids, _('Picking is not in the done state!') - Then I done the picking diff --git a/addons/sale/test/picking_order_policy.yml b/addons/sale/test/picking_order_policy.yml index d973f31d1f3..d9b2500d432 100644 --- a/addons/sale/test/picking_order_policy.yml +++ b/addons/sale/test/picking_order_policy.yml @@ -174,7 +174,7 @@ if (mod_brw.state == 'installed'): sale_order_obj = self.pool.get('sale.order') so = sale_order_obj.browse(cr, uid, ref("sale_order_so7")) - proc_ids = self.search(cr, uid, [('origin','=',so.name) and ('state','=','running')]) + proc_ids = self.search(cr, uid, [('origin','=',so.name),('state','=','running')]) assert proc_ids, _('Procurement is not in the running state!') - I verify that a purchase order has been generated @@ -271,7 +271,7 @@ pur_id = pur_obj.search(cr, uid, [('origin','=',so.name)]) po = pur_obj.browse(cr, uid, pur_id)[0] picking_obj = self.pool.get('stock.picking') - ids = picking_obj.search(cr, uid, [('purchase_id', '=', po.id ) and ('state', '=', 'done')]) + ids = picking_obj.search(cr, uid, [('purchase_id', '=', po.id ),('state', '=', 'done')]) assert ids, _('Picking is not in the done state!') - I verify that delivery order has been generated for sale order diff --git a/addons/sale/test/postpaid_order_policy.yml b/addons/sale/test/postpaid_order_policy.yml index 056a8327435..c4cf24eb419 100644 --- a/addons/sale/test/postpaid_order_policy.yml +++ b/addons/sale/test/postpaid_order_policy.yml @@ -139,7 +139,8 @@ if (mod_brw.state == 'installed'): sale_order_obj = self.pool.get('sale.order') so = sale_order_obj.browse(cr, uid, ref("sale_order_so8")) - proc_ids = self.search(cr, uid, [('origin','=',so.name) and ('state','=','running')]) + proc_ids = self.search(cr, uid, [('origin','=',so.name),('state','=','running')]) + assert proc_ids, _('Procurement is not in the running state!') - I verify that a purchase order has been generated - @@ -235,7 +236,7 @@ pur_id = pur_obj.search(cr, uid, [('origin','=',so.name)]) po = pur_obj.browse(cr, uid, pur_id)[0] picking_obj = self.pool.get('stock.picking') - ids = picking_obj.search(cr, uid, [('purchase_id', '=', po.id ) and ('state', '=', 'done')]) + ids = picking_obj.search(cr, uid, [('purchase_id', '=', po.id ),('state', '=', 'done')]) assert ids, _('Picking is not in the done state!') - I verify that a "Picked" has been set to true diff --git a/addons/sale/test/prepaid_order_policy.yml b/addons/sale/test/prepaid_order_policy.yml index fd7f04bede0..f5329f1540a 100644 --- a/addons/sale/test/prepaid_order_policy.yml +++ b/addons/sale/test/prepaid_order_policy.yml @@ -94,7 +94,7 @@ !python {model: account.invoice}: | sale_order_obj = self.pool.get('sale.order') so = sale_order_obj.browse(cr, uid, ref("sale_order_so1")) - invoice_id = self.search(cr, uid, [('origin','=',so.name) and ('state','=','paid')]) + invoice_id = self.search(cr, uid, [('origin','=',so.name),('state','=','paid')]) assert invoice_id, "Invoice for SO is not in done state." - I check that Paid has been set to true. @@ -171,7 +171,7 @@ if(mod_brw.state == 'installed'): sale_order_obj = self.pool.get('sale.order') so = sale_order_obj.browse(cr, uid, ref("sale_order_so1")) - proc_ids = self.search(cr, uid, [('origin','=',so.name) and ('state','=','running')]) + proc_ids = self.search(cr, uid, [('origin','=',so.name),('state','=','running')]) assert proc_ids, _('Procurement is not in the running state!') - I verify that a purchase order has been generated @@ -268,7 +268,7 @@ pur_id = pur_obj.search(cr, uid, [('origin','=',so.name)]) po = pur_obj.browse(cr, uid, pur_id)[0] picking_obj = self.pool.get('stock.picking') - ids = picking_obj.search(cr, uid, [('purchase_id', '=', po.id ) and ('state', '=', 'done')]) + ids = picking_obj.search(cr, uid, [('purchase_id', '=', po.id ),('state', '=', 'done')]) assert ids, _('Picking is not in the done state!') - I verify that a "Picked" has been set to true diff --git a/addons/sale/test/sale_procurement.yml b/addons/sale/test/sale_procurement.yml index 4e7d2162421..f7753948339 100644 --- a/addons/sale/test/sale_procurement.yml +++ b/addons/sale/test/sale_procurement.yml @@ -68,11 +68,13 @@ - !workflow {model: sale.order, action: order_confirm, ref: sale_order_so3} - - I check that one procurement is generated. + I check that procurement is generated. - !python {model: procurement.order}: | from tools.translate import _ - proc_ids = self.search(cr, uid, [('state','=','confirmed')]) + sale_order_obj = self.pool.get('sale.order') + so = sale_order_obj.browse(cr, uid, ref("sale_order_so3")) + proc_ids = self.search(cr, uid, [('origin','=',so.name)]) assert proc_ids, _('No Procurements!') - I run the scheduler. diff --git a/addons/sale/test/so_make_line_invoice.yml b/addons/sale/test/so_make_line_invoice.yml index 6a5ea58f6da..07c45bec996 100644 --- a/addons/sale/test/so_make_line_invoice.yml +++ b/addons/sale/test/so_make_line_invoice.yml @@ -79,7 +79,7 @@ !python {model: account.invoice}: | sale_order_obj = self.pool.get('sale.order') so = sale_order_obj.browse(cr, uid, ref("sale_order_so3")) - invoice_id = self.search(cr, uid, [('origin','=',so.name) and ('state','=','open')]) + invoice_id = self.search(cr, uid, [('origin','=',so.name),('state','=','open')]) assert invoice_id, "Invoice is not in the open state" - Creating an account invoice pay entry. @@ -122,7 +122,7 @@ !python {model: account.invoice}: | sale_order_obj = self.pool.get('sale.order') so = sale_order_obj.browse(cr, uid, ref("sale_order_so3")) - invoice_id = self.search(cr, uid, [('origin','=',so.name) and ('state','=','paid')]) + invoice_id = self.search(cr, uid, [('origin','=',so.name),('state','=','paid')]) assert invoice_id, "Invoice for SO is not in done state." - I verify that Paid has been set to true. @@ -189,7 +189,7 @@ !python {model: account.invoice}: | sale_order_obj = self.pool.get('sale.order') so = sale_order_obj.browse(cr, uid, ref("sale_order_so3")) - invoice_id = self.search(cr, uid, [('origin','=',so.name) and ('state','=','open')]) + invoice_id = self.search(cr, uid, [('origin','=',so.name),('state','=','open')]) assert invoice_id, "Invoice is not in the open state" - Creating a account invoice pay entry. @@ -232,7 +232,7 @@ !python {model: account.invoice}: | sale_order_obj = self.pool.get('sale.order') so = sale_order_obj.browse(cr, uid, ref("sale_order_so3")) - invoice_id = self.search(cr, uid, [('origin','=',so.name) and ('state','=','paid')]) + invoice_id = self.search(cr, uid, [('origin','=',so.name),('state','=','paid')]) assert invoice_id, "Invoice for SO is not in done state." - I verify that Paid has been set to true.