From 0d43ddfed2eb9081743972052d362f4a70a61d93 Mon Sep 17 00:00:00 2001 From: "qdp-launchpad@tinyerp.com" <> Date: Mon, 12 Jul 2010 14:30:23 +0530 Subject: [PATCH] [IMP] sale: typo + assert in yaml test corrected bzr revid: qdp-launchpad@tinyerp.com-20100712090023-9npeu6277nqhmsan --- addons/sale/sale.py | 4 ++-- addons/sale/test/sale_procurement.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/addons/sale/sale.py b/addons/sale/sale.py index 2cef2799fae..e93bcdd34ad 100644 --- a/addons/sale/sale.py +++ b/addons/sale/sale.py @@ -251,7 +251,7 @@ class sale_order(osv.osv): 'order_line': fields.one2many('sale.order.line', 'order_id', 'Order Lines', readonly=True, states={'draft': [('readonly', False)]}), 'invoice_ids': fields.many2many('account.invoice', 'sale_order_invoice_rel', 'order_id', 'invoice_id', 'Invoices', help="This is the list of invoices that have been generated for this sale order. The same sale order may have been invoiced in several times (by line for example)."), 'picking_ids': fields.one2many('stock.picking', 'sale_id', 'Related Picking', readonly=True, help="This is the list of picking list that have been generated for this invoice"), - 'shipped': fields.boolean('Picked', readonly=True, help="It indicates that a picking has been done.It will set to True if the ordered quantities are available and the picking is done.If the ordered quantities are not available it generates a Purchase/Manufacturing order.Unless its Picking and Purchase/Manufacturing order are not in the done state it wont be set to True"), + 'shipped': fields.boolean('Picked', readonly=True, help="It indicates that a picking has been done. It will be set to True if the ordered quantities are available and the picking is done. If the ordered quantities are not available it generates a Purchase/Manufacturing order. Unless its Picking and Purchase/Manufacturing order are not in the done state it wont be set to True"), 'picked_rate': fields.function(_picked_rate, method=True, string='Picked', type='float'), 'invoiced_rate': fields.function(_invoiced_rate, method=True, string='Invoiced', type='float'), 'invoiced': fields.function(_invoiced, method=True, string='Paid', @@ -1198,4 +1198,4 @@ class sale_config_picking_policy(osv.osv_memory): self.pool.get('stock.location').write(cr, uid, [location_id], {'chained_auto_packing': 'transparent'}) sale_config_picking_policy() -# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: \ No newline at end of file +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/sale/test/sale_procurement.yml b/addons/sale/test/sale_procurement.yml index 2475c7bdceb..4e7d2162421 100644 --- a/addons/sale/test/sale_procurement.yml +++ b/addons/sale/test/sale_procurement.yml @@ -87,4 +87,4 @@ !python {model: procurement.order}: | from tools.translate import _ proc_ids = self.search(cr, uid, [('state','=','exception'),('product_id','=',ref('sale.product_product_table0'))]) - assert proc_ids, _('No Procurements are in exception state for the table!') + assert not proc_ids, _('There is no procurement in exception state!')