[merge] edi sale order with yml

bzr revid: han@tinyerp.com-20110829102127-nkr1muz2e1jsu6xh

diff --git a/addons/purchase/__init__.py b/addons/purchase/__init__.py
index 301e32e..87e1384 100644 (file)
--- a/addons/purchase/__init__.py
+++ b/addons/purchase/__init__.py
@@ -26,6 +26,7 @@ import wizard
 import report
 import stock
 import company
+import edi_purchase_order
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 

diff --git a/addons/sale/__openerp__.py b/addons/sale/__openerp__.py
index 4dccadc..0e3ec9e 100644 (file)
--- a/addons/sale/__openerp__.py
+++ b/addons/sale/__openerp__.py
@@ -100,6 +100,7 @@ Dashboard for Sales Manager that includes:
         'test/invoice_on_ordered_qty.yml',
         'test/invoice_on_shipped_qty.yml',
         'test/sale_report.yml',
+        'test/edi_sale_order.yml',
     ],
     'installable': True,
     'active': False,

diff --git a/addons/sale/edi_sale_order.py b/addons/sale/edi_sale_order.py
index 266727c..ea1a56b 100644 (file)
--- a/addons/sale/edi_sale_order.py
+++ b/addons/sale/edi_sale_order.py
@@ -38,8 +38,6 @@ class sale_order(osv.osv, ir_edi.edi):
                 'date_confirm': True,
                 'partner_id': True,
                 'partner_invoice_id': True,
-                'partner_order_id': True,
-                'partner_shipping_id': True,
                 'incoterm': True,
                 'picking_policy': True,
                 'order_policy': True,
@@ -163,7 +161,7 @@ class sale_order(osv.osv, ir_edi.edi):
         address_value.update({'partner_id': partner_id})
         address_id = partner_address_pool.create(cr, uid, address_value, context=context)
         partner_address = partner_address_pool.browse(cr, uid, [address_id], context=context)
-        partner_address_id = self.edi_o2m(cr, uid, partner_address, context=context)
+        partner_address_id = self.edi_o2m(cr, uid, [partner_address], context=context)
         partner = partner_pool.browse(cr, uid, partner_id, context=context)
         edi_document['partner_id'] = self.edi_m2o(cr, uid, partner, context=context)
         edi_document.update({

diff --git a/addons/sale/test/edi_sale_order.yml b/addons/sale/test/edi_sale_order.yml
new file mode 100644 (file)
index 0000000..dba200f
--- /dev/null
+++ b/addons/sale/test/edi_sale_order.yml
@@ -0,0 +1,51 @@
+-
+  I create a partner which is a my customer
+-
+  !record {model: res.partner, id: res_partner_test22}:
+    name: Junjun wala
+    supplier: False
+    customer: True
+    opt_out: False
+-
+  I create one Sale Order
+-
+  !record {model: sale.order, id: sale_order_test}:
+    partner_id: res_partner_test22
+    partner_invoice_id: base.res_partner_address_11
+    partner_order_id: base.res_partner_address_11
+    partner_shipping_id: base.res_partner_address_11
+    pricelist_id: 1
+    order_line:
+      - product_id: product.product_product_pc1
+        product_uom_qty: 1.0
+        product_uom: 1
+        price_unit: 150.0
+        name: 'basic pc'
+-
+  I Open the sale order
+-
+  !python {model: sale.order}: |
+    
+    orders = self.browse(cr, uid, ref("sale_order_test"))
+    import netsvc
+    wf_service = netsvc.LocalService("workflow")
+    wf_service.trg_validate(uid, 'sale.order',orders.id,'order_confirm', cr)
+
+-
+  I Tesing of EDI functionality. First I export Sale Order from my company than import that Order into customer company
+-
+  !python {model: ir.edi.document}: |
+    import json
+    invoice_pool = self.pool.get('sale.order')
+    orders = invoice_pool.browse(cr, uid, ref("sale_order_test"))
+
+    tokens = self.export_edi(cr, uid, [orders])
+    assert tokens, 'Token is not generated'
+    document = self.get_document(cr, uid, tokens[0])
+    document = json.loads(document)
+    document[0]["__model"] = "purchase.order"
+    document = json.dumps(document)
+    a = self.import_edi(cr, uid, edi_document = document)
+    assert a, 'Invoice is not imported'
+
+