pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[IMP]sale : remove extra spaces

Browse Source 
bzr revid: dbr@tinyerp.com-20111130092833-l4yq3g1rou4slk72
This commit is contained in:
DBR (OpenERP)
2011-11-30 14:58:33 +05:30
parent d7ededc964
commit 2bee08352e
4 changed files with 41 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/sale/test/delete_order.yml
-1
View File
@@ -12,4 +12,3 @@
!python {model: sale.order}: |
id = self.copy(cr, uid, ref('order'))
self.unlink(cr, uid, [id])
addons/sale/test/edi_sale_order.yml
+30 -30
View File
@@ -57,52 +57,52 @@
"__id": "base:5af1272e-dd26-11e0-b65e-701a04e25543.some_address",
"__module": "base",
"__model": "res.partner.address",
"phone": "(+32).81.81.37.00",
"street": "Chaussee de Namur 40",
"city": "Gerompont",
"zip": "1367",
"phone": "(+32).81.81.37.00",
"street": "Chaussee de Namur 40",
"city": "Gerompont",
"zip": "1367",
"country_id": ["base:5af1272e-dd26-11e0-b65e-701a04e25543.be", "Belgium"],
"bank_ids": [
["base:5af1272e-dd26-11e0-b65e-701a04e25543.res_partner_bank-adaWadsadasdDJzGbp","Ladies bank: 032465789-156113"]
],
},
"partner_id": ["purchase:5af1272e-dd26-11e0-b65e-701a04e25543.res_partner_test20", "jones white"],
},
"partner_id": ["purchase:5af1272e-dd26-11e0-b65e-701a04e25543.res_partner_test20", "jones white"],
"partner_address": {
"__id": "base:5af1272e-dd26-11e0-b65e-701a04e25543.res_partner_address_7wdsjasdjh",
"__module": "base",
"__model": "res.partner.address",
"phone": "(+32).81.81.37.00",
"street": "Chaussee de Namur 40",
"city": "Gerompont",
"zip": "1367",
"country_id": ["base:5af1272e-dd26-11e0-b65e-701a04e25543.be", "Belgium"],
"phone": "(+32).81.81.37.00",
"street": "Chaussee de Namur 40",
"city": "Gerompont",
"zip": "1367",
"country_id": ["base:5af1272e-dd26-11e0-b65e-701a04e25543.be", "Belgium"],
},
"order_line": [{
"__id": "purchase:5af1272e-dd26-11e0-b65e-701a04e25543.purchase_order_line-AlhsVDZGoKvJ",
"__module": "purchase",
"__id": "purchase:5af1272e-dd26-11e0-b65e-701a04e25543.purchase_order_line-AlhsVDZGoKvJ",
"__module": "purchase",
"__model": "purchase.order.line",
"__import_module": "sale",
"__import_model": "sale.order.line",
"name": "Basic PC",
"date_planned": "2011-09-30",
"price_unit": 150.0,
"__import_module": "sale",
"__import_model": "sale.order.line",
"name": "Basic PC",
"date_planned": "2011-09-30",
"price_unit": 150.0,
"product_id": ["product:5af1272e-dd26-11e0-b65e-701a04e25543.product_product_pc1", "[PC1] Basic PC"],
"product_qty": 1.0,
"product_uom": ["product:5af1272e-dd26-11e0-b65e-701a04e25543.product_uom_unit", "PCE"],
"product_qty": 1.0,
"product_uom": ["product:5af1272e-dd26-11e0-b65e-701a04e25543.product_uom_unit", "PCE"],
},
{
"__id": "purchase:5af1272e-dd26-11e0-b65e-701a04e25543.purchase_order_line-Alsads33e",
"__module": "purchase",
"__id": "purchase:5af1272e-dd26-11e0-b65e-701a04e25543.purchase_order_line-Alsads33e",
"__module": "purchase",
"__model": "purchase.order.line",
"__import_module": "sale",
"__import_module": "sale",
"__import_model": "sale.order.line",
"name": "Medium PC",
"date_planned": "2011-09-15",
"price_unit": 100.0,
"name": "Medium PC",
"date_planned": "2011-09-15",
"price_unit": 100.0,
"product_id": ["product:5af1272e-dd26-11e0-b65e-701a04e25543.product_product_pc3", "[PC3] Medium PC"],
"product_qty": 2.0,
"product_uom": ["product:5af1272e-dd26-11e0-b65e-701a04e25543.product_uom_unit", "PCE"],
}],
"product_qty": 2.0,
"product_uom": ["product:5af1272e-dd26-11e0-b65e-701a04e25543.product_uom_unit", "PCE"],
}],
}
new_sale_order_id = sale_order_pool.edi_import(cr, uid, edi_document, context=context)
assert new_sale_order_id, 'Sale order import failed'
@@ -129,4 +129,4 @@
assert sale_line.price_unit == 100 , "unit price is not same, got %s, expected 100"%(sale_line.price_unit,)
assert sale_line.product_uom_qty == 2 , "product qty is not same"
else:
raise AssertionError('unknown order line: %s' % sale_line)
raise AssertionError('unknown order line: %s' % sale_line)
addons/sale/test/order_process.yml
+10 -13
View File
@@ -16,7 +16,7 @@
order = self.pool.get('sale.order').browse(cr, uid, ref("order"))
assert len(order.invoice_ids) == False, "Invoice should not created."
-
I check that procurement after confirmed quotation.
I check the details of procurement after confirmed quotation.
-
!python {model: sale.order}: |
from datetime import datetime, timedelta
@@ -37,7 +37,6 @@
-
!python {model: procurement.order}: |
self.run_scheduler(cr, uid)
-
I check the details of delivery order after confirmed quotation.
-
@@ -53,7 +52,7 @@
assert picking.type == 'out',"Shipment should be Outgoing."
assert picking.move_type == sale_order.picking_policy,"Delivery Method is not corresponding with delivery method of sale order."
assert picking.address_id.id == sale_order.partner_shipping_id.id,"Shipping Address is not correspond with sale order."
assert picking.note == sale_order.note,"Notes is not correspond with sale order."
assert picking.note == sale_order.note,"Note is not correspond with sale order."
assert picking.invoice_state == (sale_order.order_policy=='picking' and '2binvoiced') or 'none',"Invoice policy is not correspond with sale order."
assert len(picking.move_lines) == len(sale_order.order_line), "Total move of delivery order are not corresposning with total sale order lines."
location_id = sale_order.shop_id.warehouse_id.lot_stock_id.id
@@ -72,7 +71,7 @@
assert move.address_id.id == order_line.address_allotment_id.id or sale_order.partner_shipping_id.id,"Address is not correspond"
#assert move.location_id.id == location_id,"Source Location is not correspond."
#assert move.location_dest_id == output_id,"Destination Location is not correspond."
assert move.note == order_line.notes,"Notes is not correspond"
assert move.note == order_line.notes,"Note is not correspond"
assert move.price_unit == order_line.product_id.standard_price or 0.0,"Price Unit is not correspond"
-
Now, I dispatch delivery order.
@@ -93,7 +92,7 @@
assert order.picked_rate == 100, "Shipment progress is not 100%."
assert len(order.invoice_ids) == False, "Invoice should not created on dispatch delivery order."
-
I make Invoice from Delivery Order.
I create Invoice from Delivery Order.
-
!python {model: stock.invoice.onshipping}: |
sale = self.pool.get('sale.order')
@@ -102,9 +101,8 @@
wiz_id = self.create(cr, uid, {'journal_id': ref('account.sales_journal')},
{'active_ids': ship_ids, 'active_model': 'stock.picking'})
self.create_invoice(cr, uid, [wiz_id], {"active_ids": ship_ids, "active_id": ship_ids[0]})
-
I check that Invoice details after dispatched delivery.
I check the invoice details after dispatched delivery.
-
!python {model: sale.order}: |
order = self.browse(cr, uid, ref("order"))
@@ -120,7 +118,7 @@
assert invoice.partner_id.id == order.partner_id.id,"Customer is not correspond."
assert invoice.address_invoice_id.id == order.partner_invoice_id.id,"Invoice Address is not correspond."
assert invoice.currency_id.id == order.pricelist_id.currency_id.id, "Currency is not correspond."
#assert invoice.comment == order.note,"Notes is not correspond."
#assert invoice.comment == order.note,"Note is not correspond."
assert invoice.journal_id.id == journal_ids[0],"Sales Journal is not link on Invoice."
#assert invoice.payment_term.id == order.payment_term and order.payment_term.id or False, "Payment term is not correspond."
for so_line in order.order_line:
@@ -132,7 +130,6 @@
assert inv_line.price_unit == so_line.price_unit , "Price Unit is not correspond."
#assert inv_line.quantity == so_line.product_uom_qty , "Product qty is not correspond."
#assert inv_line.price_subtotal == so_line.price_subtotal, "Price sub total is not correspond."
-
Now I confirm the Quotation with "Invoice on order after delivery" policy.
-
@@ -171,7 +168,6 @@
sale_order = self.browse(cr, uid, ref("order3"))
assert len(sale_order.picking_ids) == False, "Delivery order should not created before invoice."
assert sale_order.invoice_ids, "Invoice should be created."
-
I confirm the Quotation with "Deliver & invoice on demand".
-
@@ -184,7 +180,7 @@
assert len(sale_order.invoice_ids) == False, "Invoice should not created."
assert sale_order.picking_ids, "Delivery order should be created."
-
I make advance invoice.
I create advance invoice.
-
!python {model: sale.advance.payment.inv}: |
ctx = context.copy()
@@ -199,7 +195,7 @@
order = self.browse(cr, uid, ref('order4'))
assert order.invoice_ids, "Invoice should be created after make advance invoice."
-
I make Invoice from sale order line.
I create Invoice from sale order line.
-
!python {model: sale.order.line.make.invoice}: |
ctx = context.copy()
@@ -212,7 +208,7 @@
line = self.browse(cr, uid, ref('line8'))
assert line.invoice_lines, "Invoice line should be created."
-
I make manual Invoice for order.
I create manual Invoice for order.
-
!record {model: sale.make.invoice, id: sale_make_invoice_1}:
invoice_date: !eval time.strftime('%Y-%m-%d')
@@ -254,3 +250,4 @@
(data, format) = netsvc.LocalService('report.sale.order').create(cr, uid, [ref('order')], {}, {})
if tools.config['test_report_directory']:
file(os.path.join(tools.config['test_report_directory'], 'sale-sale_order.'+format), 'wb+').write(data)
addons/sale/test/sale_order_demo.yml
+1 -1
View File
@@ -8,4 +8,4 @@
product_id: product.product_product_mb1
price_unit: 150.50
product_uom_qty: 8