Merge lp:~unifield-team/unifield-addons/UF_558_tests_fixes into lp:unifield-addons

[jftempo]

=== modified file 'account/invoice.py'
--- account/invoice.py	2011-10-05 14:55:12 +0000
+++ account/invoice.py	2011-12-28 14:00:43 +0000
@@ -783,6 +783,17 @@
                 line.append((0,0,val))
         return line
 
+    def _hook_period_id(self, cr, uid, inv, context={}):
+        """
+        Redefine period from invoice date
+        """
+        # Some verifications
+        if not context:
+            context = {}
+        if not inv:
+            return False
+        return self.pool.get('account.period').search(cr, uid, [('date_start','<=',inv.date_invoice or time.strftime('%Y-%m-%d')),('date_stop','>=',inv.date_invoice or time.strftime('%Y-%m-%d')), ('company_id', '=', inv.company_id.id)])
+
     def action_move_create(self, cr, uid, ids, *args):
         """Creates invoice related analytics and financial move lines"""
         ait_obj = self.pool.get('account.invoice.tax')
@@ -916,7 +927,7 @@
             }
             period_id = inv.period_id and inv.period_id.id or False
             if not period_id:
-                period_ids = self.pool.get('account.period').search(cr, uid, [('date_start','<=',inv.date_invoice or time.strftime('%Y-%m-%d')),('date_stop','>=',inv.date_invoice or time.strftime('%Y-%m-%d')), ('company_id', '=', inv.company_id.id)])
+                period_ids = self._hook_period_id(cr, uid, inv, context=context)
                 if period_ids:
                     period_id = period_ids[0]
             if period_id:
 
=== modified file 'purchase/purchase_unit_test.xml'
--- purchase/purchase_unit_test.xml	2011-01-14 00:11:01 +0000
+++ purchase/purchase_unit_test.xml	2011-12-28 14:00:43 +0000
@@ -48,6 +48,12 @@
             <test expr="invoice_ids[0].state">draft</test>
         </assert>
 
+        <!-- Disallow analytic distribution verification -->
+        <function model="account.invoice" name="write">
+            <value model="purchase.order" eval="[obj(ref('test_purchase_1')).invoice_ids[0].id]" />
+            <value eval="{'from_yml_test': True}"/>
+        </function>
+
         <workflow model="account.invoice" action="invoice_open">
             <value model="purchase.order" eval="obj(ref('test_purchase_1')).invoice_ids[0].id" />
         </workflow>
 
=== modified file 'purchase/test/procurement_buy.yml'
--- purchase/test/procurement_buy.yml	2011-10-17 11:57:34 +0000
+++ purchase/test/procurement_buy.yml	2011-12-28 14:00:43 +0000
@@ -73,6 +73,8 @@
   !python {model: purchase.order}: |
     procurement_obj = self.pool.get('procurement.order')
     proc_ids = procurement_obj.browse(cr, uid, [ref('procurement_order_testcase0')])[0]
+    # Avoir analytic distribution error
+    self.write(cr, uid, [proc_ids.purchase_id.id], {'from_yml_test': True})
     import netsvc
     wf_service = netsvc.LocalService("workflow")
     wf_service.trg_validate(uid, 'purchase.order',proc_ids.purchase_id.id,'purchase_confirm', cr)
 
=== modified file 'sale/test/advance_invoice.yml'
--- sale/test/advance_invoice.yml	2011-01-14 00:11:01 +0000
+++ sale/test/advance_invoice.yml	2011-12-28 14:00:43 +0000
@@ -53,6 +53,8 @@
     import netsvc
     wf_service = netsvc.LocalService("workflow")
     invoice_ids = so.invoice_ids
+    # Avoir analytic distribution error
+    self.write(cr, uid, [x.id for x in invoice_ids], {'from_yml_test': True})
     for invoice in invoice_ids:
       wf_service.trg_validate(uid, 'account.invoice',invoice.id,'invoice_open', cr)
 -
@@ -112,6 +114,8 @@
     import netsvc
     wf_service = netsvc.LocalService("workflow")
     invoice_ids = so.invoice_ids
+    # Avoir analytic distribution error
+    self.write(cr, uid, [x.id for x in invoice_ids], {'from_yml_test': True})
     for invoice in invoice_ids:
       wf_service.trg_validate(uid, 'account.invoice',invoice.id,'invoice_open', cr)
 -
 
=== modified file 'sale/test/invoice_on_ordered_qty.yml'
--- sale/test/invoice_on_ordered_qty.yml	2011-01-14 00:11:01 +0000
+++ sale/test/invoice_on_ordered_qty.yml	2011-12-28 14:00:43 +0000
@@ -96,6 +96,8 @@
     import netsvc
     wf_service = netsvc.LocalService("workflow")
     invoice_ids = so.invoice_ids
+    # Avoid analytic distribution error
+    self.write(cr, uid, [x.id for x in invoice_ids], {'from_yml_test': True})
     for invoice in invoice_ids:
       wf_service.trg_validate(uid, 'account.invoice',invoice.id,'invoice_open', cr)
 -
 
=== modified file 'sale/test/invoice_on_shipped_qty.yml'
--- sale/test/invoice_on_shipped_qty.yml	2011-12-28 13:02:53 +0000
+++ sale/test/invoice_on_shipped_qty.yml	2011-12-28 14:00:43 +0000
@@ -111,6 +111,8 @@
     import netsvc
     wf_service = netsvc.LocalService("workflow")
     invoice_ids = so.invoice_ids
+    # Avoir analytic distribution error
+    self.write(cr, uid, [x.id for x in invoice_ids], {'from_yml_test': True})
     for invoice in invoice_ids:
       wf_service.trg_validate(uid, 'account.invoice',invoice.id,'invoice_open', cr)
 -
 
=== modified file 'sale/test/manual_order_policy.yml'
--- sale/test/manual_order_policy.yml	2011-09-21 09:54:22 +0000
+++ sale/test/manual_order_policy.yml	2011-12-28 14:00:43 +0000
@@ -48,6 +48,8 @@
     import netsvc
     wf_service = netsvc.LocalService("workflow")
     invoice_ids = so.invoice_ids
+    # Avoid analytic distribution error
+    self.write(cr, uid, [x.id for x in invoice_ids], {'from_yml_test': True})
     for invoice in invoice_ids:
       wf_service.trg_validate(uid, 'account.invoice',invoice.id,'invoice_open', cr)
 -
@@ -173,6 +175,8 @@
         import netsvc
         wf_service = netsvc.LocalService("workflow")
         pur_ids = pur_obj.search(cr, uid, [('origin','=',so.name)])
+        # Avoid analytic distribution error
+        pur_obj.write(cr, uid, pur_ids, {'from_yml_test': True})
         for pur in pur_ids:
           wf_service.trg_validate(uid, 'purchase.order',pur,'purchase_confirm', cr)
 -
@@ -189,6 +193,8 @@
         import netsvc
         wf_service = netsvc.LocalService("workflow")
         pur_ids = pur_obj.search(cr, uid, [('origin','=',so.name)])
+        # Avoid analytic distribution error
+        pur_obj.write(cr, uid, pur_ids, {'from_yml_test': True})
         for pur in pur_ids:
           wf_service.trg_validate(uid, 'purchase.order',pur,'purchase_approve', cr)
 -
 
=== modified file 'sale/test/picking_order_policy.yml'
--- sale/test/picking_order_policy.yml	2011-12-28 11:17:13 +0000
+++ sale/test/picking_order_policy.yml	2011-12-28 14:00:43 +0000
@@ -84,6 +84,8 @@
     import netsvc
     wf_service = netsvc.LocalService("workflow")
     invoice_ids = so.invoice_ids
+    # Avoid analytic distribution error
+    self.write(cr, uid, [x.id for x in invoice_ids], {'from_yml_test': True})
     for invoice in invoice_ids:
         wf_service.trg_validate(uid, 'account.invoice',invoice.id,'invoice_open', cr)
 -
@@ -178,6 +180,8 @@
         import netsvc
         wf_service = netsvc.LocalService("workflow")
         pur_ids = pur_obj.search(cr, uid, [('origin','=',so.name)])
+        # Avoid analytic distribution error
+        pur_obj.write(cr, uid, pur_ids, {'from_yml_test': True})
         for pur in pur_ids:
           wf_service.trg_validate(uid, 'purchase.order',pur,'purchase_confirm', cr)
 -
@@ -194,6 +198,8 @@
         import netsvc
         wf_service = netsvc.LocalService("workflow")
         pur_ids = pur_obj.search(cr, uid, [('origin','=',so.name)])
+        # Avoid analytic distribution error
+        pur_obj.write(cr, uid, pur_ids, {'from_yml_test': True})
         for pur in pur_ids:
           wf_service.trg_validate(uid, 'purchase.order',pur,'purchase_approve', cr)
 -
 
=== modified file 'sale/test/postpaid_order_policy.yml'
--- sale/test/postpaid_order_policy.yml	2011-09-21 09:54:22 +0000
+++ sale/test/postpaid_order_policy.yml	2011-12-28 14:00:43 +0000
@@ -172,6 +172,8 @@
         import netsvc
         wf_service = netsvc.LocalService("workflow")
         pur_ids = pur_obj.search(cr, uid, [('origin','=',so.name)])
+        # Avoid analytic distribution error
+        pur_obj.write(cr, uid, pur_ids, {'from_yml_test': True})
         for pur in pur_ids:
           wf_service.trg_validate(uid, 'purchase.order',pur,'purchase_confirm', cr)
 -
@@ -188,6 +190,8 @@
         import netsvc
         wf_service = netsvc.LocalService("workflow")
         pur_ids = pur_obj.search(cr, uid, [('origin','=',so.name)])
+        # Avoid analytic distribution error
+        pur_obj.write(cr, uid, pur_ids, {'from_yml_test': True})
         for pur in pur_ids:
           wf_service.trg_validate(uid, 'purchase.order',pur,'purchase_approve', cr)
 -
@@ -263,6 +267,7 @@
     import netsvc
     wf_service = netsvc.LocalService("workflow")
     invoice_ids = so.invoice_ids
+    self.write(cr, uid, [x.id for x in invoice_ids], {'from_yml_test': True})
     for invoice in invoice_ids:
       wf_service.trg_validate(uid, 'account.invoice',invoice.id,'invoice_open', cr)
 -
 
=== modified file 'sale/test/prepaid_order_policy.yml'
--- sale/test/prepaid_order_policy.yml	2011-12-28 11:17:13 +0000
+++ sale/test/prepaid_order_policy.yml	2011-12-28 14:00:43 +0000
@@ -51,6 +51,8 @@
     import netsvc
     wf_service = netsvc.LocalService("workflow")
     invoice_ids = so.invoice_ids
+    # Avoid analytic distribution error
+    self.write(cr, uid, [x.id for x in invoice_ids], {'from_yml_test': True})
     for invoice in invoice_ids:
       wf_service.trg_validate(uid, 'account.invoice',invoice.id,'invoice_open', cr)
 -
@@ -187,6 +189,8 @@
         import netsvc
         wf_service = netsvc.LocalService("workflow")
         pur_ids = pur_obj.search(cr, uid, [('origin','=',so.name)])
+        # Avoid analytic distribution error
+        pur_obj.write(cr, uid, pur_ids, {'from_yml_test': True})
         for pur in pur_ids:
           wf_service.trg_validate(uid, 'purchase.order',pur,'purchase_confirm', cr)
 -
@@ -203,6 +207,8 @@
         import netsvc
         wf_service = netsvc.LocalService("workflow")
         pur_ids = pur_obj.search(cr, uid, [('origin','=',so.name)])
+        # Avoid analytic distribution error
+        pur_obj.write(cr, uid, pur_ids, {'from_yml_test': True})
         for pur in pur_ids:
           wf_service.trg_validate(uid, 'purchase.order',pur,'purchase_approve', cr)
 -
 
=== modified file 'sale/test/so_make_line_invoice.yml'
--- sale/test/so_make_line_invoice.yml	2011-01-14 00:11:01 +0000
+++ sale/test/so_make_line_invoice.yml	2011-12-28 14:00:43 +0000
@@ -78,6 +78,8 @@
     import netsvc
     wf_service = netsvc.LocalService("workflow")
     invoice_ids = so.invoice_ids
+    # Avoir analytic distribution error
+    self.write(cr, uid, [x.id for x in invoice_ids], {'from_yml_test': True})
     for invoice in invoice_ids:
       wf_service.trg_validate(uid, 'account.invoice',invoice.id,'invoice_open', cr)
 -
@@ -163,6 +165,8 @@
     import netsvc
     wf_service = netsvc.LocalService("workflow")
     invoice_ids = so.invoice_ids
+    # Avoid analytic distribution error
+    self.write(cr, uid, [x.id for x in invoice_ids], {'from_yml_test': True})
     for invoice in invoice_ids:
       wf_service.trg_validate(uid, 'account.invoice',invoice.id,'invoice_open', cr)
 -