Merge lp:~vauxoo/addons-vauxoo/7.0-purchase_sale_test_data_imp_validations_dev_jorge into lp:addons-vauxoo/7.0

[Jorge Angel Naranjo Rogel - http://www.vauxoo.com]

Se realiza validación para cuando no se crea la factura ya sea de compra o venta, ademas, se buscan los productos que no tiene compañía. Se quitan los replace ya que la librería csv genera ese trabajo.

[lp:~vauxoo/addons-vauxoo/7.0-purchase_sale_test_data_imp_validations_dev_jorge]

875. By Jorge Angel Naranjo Rogel - http://www.vauxoo.com on 2013-10-16

[IMP][purchase_test_data_imp] When product is service the invoice_method is picking
[IMP][sale_test_data_imp] When product is service the order_policy is picking

876. By Jorge Angel Naranjo Rogel - http://www.vauxoo.com on 2013-10-17

[FIX][purchase_test_data_imp] Delete ) in update
[FIX][sale_test_data_imp] Delete ) in update

[Moisés López - http://www.vauxoo.com (moylop260)]

@Jorge,
Agrega en el description de este módulo los merges que se necesitan agregar, para que pueda funcionar el módulo, please!

review: Approve

[lp:~vauxoo/addons-vauxoo/7.0-purchase_sale_test_data_imp_validations_dev_jorge]

877. By Jorge Angel Naranjo Rogel - http://www.vauxoo.com on 2013-10-22

[ADD][purchase_test_data_imp] Added patch for server
[ADD][sale_test_data_imp] Added patch for server

[Jorge Angel Naranjo Rogel - http://www.vauxoo.com (jorge-nr)]

Listo moy se agrega el parche que va en el server y se comenta en el description.

review: Needs Resubmitting

[lp:~vauxoo/addons-vauxoo/7.0-purchase_sale_test_data_imp_validations_dev_jorge]

878. By Jorge Angel Naranjo Rogel - http://www.vauxoo.com on 2013-10-23

[FIX][purchase_test_data_imp]Fixed Error unicode
[FIX][sale_test_data_imp] Fixed Error unicode

[Jorge Angel Naranjo Rogel - http://www.vauxoo.com (jorge-nr)]

Queda corregido el detalle de unicode.

review: Needs Resubmitting

Unmerged revisions

878. By Jorge Angel Naranjo Rogel - http://www.vauxoo.com on 2013-10-23

[FIX][purchase_test_data_imp]Fixed Error unicode
[FIX][sale_test_data_imp] Fixed Error unicode

877. By Jorge Angel Naranjo Rogel - http://www.vauxoo.com on 2013-10-22

[ADD][purchase_test_data_imp] Added patch for server
[ADD][sale_test_data_imp] Added patch for server

876. By Jorge Angel Naranjo Rogel - http://www.vauxoo.com on 2013-10-17

[FIX][purchase_test_data_imp] Delete ) in update
[FIX][sale_test_data_imp] Delete ) in update

875. By Jorge Angel Naranjo Rogel - http://www.vauxoo.com on 2013-10-16

[IMP][purchase_test_data_imp] When product is service the invoice_method is picking
[IMP][sale_test_data_imp] When product is service the order_policy is picking

874. By Jorge Angel Naranjo Rogel - http://www.vauxoo.com on 2013-10-16

[MERGE] Merge from lp:addons-vauxoo/7.0

873. By Jorge Angel Naranjo Rogel - http://www.vauxoo.com on 2013-10-16

[IMP][purchase_test_data_imp] Validate products when company is False and not create invoice for purchase order
[IMP][psale_test_data_imp] Validate products when company is False and not create invoice for sale order

=== modified file 'ifrs_report/report/report_webkit_html.mako'
--- ifrs_report/report/report_webkit_html.mako	2013-08-15 23:11:39 +0000
+++ ifrs_report/report/report_webkit_html.mako	2013-10-23 23:20:26 +0000
@@ -15,7 +15,7 @@
                 <td>
                     <table style="width: 100%; text-align:center;">
                         <tr><td><div class="td_company_title">${ifrs.company_id.name or ''|entity}</div></td></tr>
-                        <tr><td><div class="td_company">${ifrs._get_period_print_info(data['period'],data['report_type']) }</div></td></tr>
+                        <tr><td><div class="td_company_date">${ifrs._get_period_print_info(data['period'],data['report_type']) }</div></td></tr>
                         <tr><td><div class="td_company">${ifrs.fiscalyear_id.name or ''|entity}</div></td></tr>
                     </table>
                 </td>

=== modified file 'purchase_test_data_imp/__openerp__.py'
--- purchase_test_data_imp/__openerp__.py	2013-10-09 14:47:35 +0000
+++ purchase_test_data_imp/__openerp__.py	2013-10-23 23:20:26 +0000
@@ -44,6 +44,12 @@
 
 This test yaml only works with user admin and the search of partner and 
 product is based in the company that have this user assigned.
+
+-You will need to apply the patch patch/uid_yaml_import.py.patch, 
+that is located in this module ( use:patch -b file.py  file.patch ) in 
+the server.
+
+This patch is momentary.
     """,
     "website": "http://vauxoo.com",
     "category": "Addons Vauxoo",

=== added directory 'purchase_test_data_imp/patch'
=== added file 'purchase_test_data_imp/patch/uid_yaml_import.py.patch'
--- purchase_test_data_imp/patch/uid_yaml_import.py.patch	1970-01-01 00:00:00 +0000
+++ purchase_test_data_imp/patch/uid_yaml_import.py.patch	2013-10-23 23:20:26 +0000
@@ -0,0 +1,40 @@
+=== modified file 'openerp/tools/yaml_import.py'
+--- openerp/tools/yaml_import.py	2012-12-01 11:35:24 +0000
++++ openerp/tools/yaml_import.py	2013-10-16 17:49:19 +0000
+@@ -101,7 +101,9 @@
+         return dict.__getitem__(self, key)
+ 
+ class YamlInterpreter(object):
+-    def __init__(self, cr, module, id_map, mode, filename, report=None, noupdate=False, loglevel=logging.DEBUG):
++    def __init__(self, cr, module, id_map, mode, filename, report=None, noupdate=False, loglevel=logging.DEBUG, context=None):
++        if context is None:
++            context = {}
+         self.cr = cr
+         self.module = module
+         self.id_map = id_map
+@@ -113,8 +115,8 @@
+         self.noupdate = noupdate
+         self.loglevel = loglevel
+         self.pool = pooler.get_pool(cr.dbname)
+-        self.uid = 1
+-        self.context = {} # opererp context
++        self.uid = context.get('uid', 1) #TODO: Use session user 
++        self.context = context # opererp context
+         self.eval_context = {'ref': self._ref(),
+                              '_ref': self._ref(), # added '_ref' so that record['ref'] is possible
+                              'time': time,
+@@ -919,12 +921,12 @@
+             is_preceded_by_comment = False
+         return is_preceded_by_comment
+ 
+-def yaml_import(cr, module, yamlfile, kind, idref=None, mode='init', noupdate=False, report=None):
++def yaml_import(cr, module, yamlfile, kind, idref=None, mode='init', noupdate=False, report=None, context=None):
+     if idref is None:
+         idref = {}
+     loglevel = logging.TEST if kind == 'test' else logging.DEBUG
+     yaml_string = yamlfile.read()
+-    yaml_interpreter = YamlInterpreter(cr, module, idref, mode, filename=yamlfile.name, report=report, noupdate=noupdate, loglevel=loglevel)
++    yaml_interpreter = YamlInterpreter(cr, module, idref, mode, filename=yamlfile.name, report=report, noupdate=noupdate, loglevel=loglevel, context=context)
+     yaml_interpreter.process(yaml_string)
+ 
+ # keeps convention of convert.py

=== modified file 'purchase_test_data_imp/test/purchase_order_product_can_be_purchased.yml'
--- purchase_test_data_imp/test/purchase_order_product_can_be_purchased.yml	2013-10-16 15:59:51 +0000
+++ purchase_test_data_imp/test/purchase_order_product_can_be_purchased.yml	2013-10-23 23:20:26 +0000
@@ -18,9 +18,10 @@
     account_invoice_obj = self.pool.get('account.invoice')
     account_invoice_line_obj = self.pool.get('account.invoice.line')
     stock_picking_in_object = self.pool.get('stock.picking.in')
-    product_ids = product_obj.search(cr, uid, [('purchase_ok','=','True'), 
+    product_ids = product_obj.search(cr, uid, [('purchase_ok','=','True'),
                                                ('active','=','True'), 
-                                               ('company_id','=',company_id)])
+                                               '|',('company_id','=',company_id),('company_id','=',False)])
+                                               
     invoice_id = None
     partner_id = None
     products_tax_not_fund = []
@@ -44,10 +45,10 @@
         fcsv_csv_Log.writerow({'error': 'error', 'localization':'localization' ,'product_id': 'product_id'})
         
     except Exception, e:
-        fcsv_csv_Log.writerow({'error' : tools.ustr(e).replace('\n', ''), 'localization':'Error create files'})
+        fcsv_csv_Log.writerow({'error' : tools.ustr(e), 'localization':'Error create files'})
     
     if not partner_id:
-        fcsv_csv_Log.writerow({'error' : 'Wrong, You can not generate a sale without a partner'})
+        fcsv_csv_Log.writerow({'error' : 'Wrong, You can not generate a purchase without a partner'})
 
     assert partner_id , 'Wrong, You can not generate a purchase without a partner'
     
@@ -60,6 +61,9 @@
                                         'partner_id': partner_id,
                                         'location_id': ref('stock_location_stock_purchase_test_data')})
                                         
+            if product_data[0].type == 'service' :
+                purchase_order_data.update({'invoice_method': 'picking'})
+                                        
             #~ Data of purchase order line
             purchase_order_line_data = purchase_order_line_obj.onchange_product_id(cr, uid, [], purchase_order_data.get('pricelist_id'), product_id, qty=1.0, uom_id=1,
                                                                 partner_id=partner_id, date_order=False, 
@@ -77,7 +81,7 @@
                 #~ Create purchase order with this product
                 purchase_order_id = self.create(cr, uid, purchase_order_data )
             except Exception, e:
-                fcsv_csv_Log.writerow({'error' : tools.ustr(e).replace('\n', ''), 'localization': 'Create Purchase', 'product_id' : repr(product_id)})
+                fcsv_csv_Log.writerow({'error' : tools.ustr(e), 'localization': 'Create Purchase', 'product_id' : repr(product_id)})
 
             #~ Click button Confirm
             if purchase_order_id:
@@ -85,15 +89,15 @@
                     wf_service = netsvc.LocalService("workflow")
                     wf_service.trg_validate(uid, 'purchase.order', purchase_order_id , 'purchase_confirm', cr)
                 except Exception, e:
-                    fcsv_csv_Log.writerow({'error' : tools.ustr(e).replace('\n', ''), 'localization': 'Confirm purchase', 'product_id' : repr(product_id)})
+                    fcsv_csv_Log.writerow({'error' : tools.ustr(e), 'localization': 'Confirm purchase', 'product_id' : repr(product_id)})
             
-            #~  Chech picking out by purchase order
+            #~ Check picking out by purchase order
             if not product_data[0].type == 'service' :
                 try:
                     stock_picking_in_ids = stock_picking_in_object.search(cr, uid, [('purchase_id','=',purchase_order_id)])
                     assert len(stock_picking_in_ids) > 0 ,  'Wrong. Stock picking in not fund'
                 except Exception, e:
-                    fcsv_csv_Log.writerow({'error' : tools.ustr(e).replace('\n', ''), 'localization': 'Check picking in', 'product_id' : repr(product_id)})
+                    fcsv_csv_Log.writerow({'error' : tools.ustr(e), 'localization': 'Check picking in', 'product_id' : repr(product_id)})
 
             #~ Create invoice for this purchase order
             try:
@@ -104,20 +108,24 @@
             except Exception, e:
                 #~ cr.execute("ROLLBACK TO SAVEPOINT purchase_order_savepoint")
                 fcsv_csv_ProductLog.writerow({'id':repr(product_data[0].id), 
-                                                'name': product_data[0].name.encode('utf8').replace(',','.'),
-                                                'name_category': product_data[0].categ_id.name.encode('utf8').replace(',','.'), 
-                                                'error': tools.ustr(e).replace('\n', '')})
+                                                'name': product_data[0].name.encode('utf8','strict'),
+                                                'name_category': product_data[0].categ_id.name.encode('utf8','strict'), 
+                                                'error': repr(tools.ustr(e))})
             
             #~ Validate invoice for this purchase order 
             if invoice_id:
                 if invoice_id.get('res_id', False):
                     cost_invoice = account_invoice_obj.browse(cr, uid, invoice_id.get('res_id'), context=context).amount_total or 0
                     account_invoice_obj.write(cr, uid, [invoice_id.get('res_id')], {'check_total' : cost_invoice}, context=context)
-                try:
-                    wf_service = netsvc.LocalService("workflow")
-                    wf_service.trg_validate(uid, 'account.invoice', invoice_id.get('res_id') , 'invoice_open', cr)
-                except Exception, e:
-                    fcsv_csv_Log.writerow({'error' : tools.ustr(e).replace('\n', ''), 'localization': 'Validate Invoice',  'product_id' : repr(product_id)})
-
-        assert len(products_tax_not_fund) == 0 , 'Wrong. Some products not have tax : %s' % (products_tax_not_fund)
-        
+                    try:
+                        wf_service = netsvc.LocalService("workflow")
+                        wf_service.trg_validate(uid, 'account.invoice', invoice_id.get('res_id') , 'invoice_open', cr)
+                    except Exception, e:
+                        fcsv_csv_Log.writerow({'error' : tools.ustr(e), 'localization': 'Validate Invoice',  'product_id' : repr(product_id)})
+            else:
+                fcsv_csv_Log.writerow({'error' : 'Not found invoice for this purchase order', 'localization': 'Validate Invoice', 'product_id' : repr(product_id)})
+
+        f_write_ProductLog_csv.close()
+        f_write_Log_csv.close()
+        #~ assert len(products_tax_not_fund) == 0 , 'Wrong. Some products not have tax : %s' % (products_tax_not_fund)
+

=== modified file 'sale_test_data_imp/__openerp__.py'
--- sale_test_data_imp/__openerp__.py	2013-10-09 14:47:35 +0000
+++ sale_test_data_imp/__openerp__.py	2013-10-23 23:20:26 +0000
@@ -43,6 +43,12 @@
 
 This test yaml only works with user admin and the search of partner and 
 product is based in the company that have this user assigned.
+
+-You will need to apply the patch patch/uid_yaml_import.py.patch, 
+that is located in this module ( use:patch -b file.py  file.patch ) in 
+the server.
+
+This patch is momentary.
     """,
     "website": "http://vauxoo.com",
     "category": "Addons Vauxoo",

=== added directory 'sale_test_data_imp/patch'
=== added file 'sale_test_data_imp/patch/uid_yaml_import.py.patch'
--- sale_test_data_imp/patch/uid_yaml_import.py.patch	1970-01-01 00:00:00 +0000
+++ sale_test_data_imp/patch/uid_yaml_import.py.patch	2013-10-23 23:20:26 +0000
@@ -0,0 +1,40 @@
+=== modified file 'openerp/tools/yaml_import.py'
+--- openerp/tools/yaml_import.py	2012-12-01 11:35:24 +0000
++++ openerp/tools/yaml_import.py	2013-10-16 17:49:19 +0000
+@@ -101,7 +101,9 @@
+         return dict.__getitem__(self, key)
+ 
+ class YamlInterpreter(object):
+-    def __init__(self, cr, module, id_map, mode, filename, report=None, noupdate=False, loglevel=logging.DEBUG):
++    def __init__(self, cr, module, id_map, mode, filename, report=None, noupdate=False, loglevel=logging.DEBUG, context=None):
++        if context is None:
++            context = {}
+         self.cr = cr
+         self.module = module
+         self.id_map = id_map
+@@ -113,8 +115,8 @@
+         self.noupdate = noupdate
+         self.loglevel = loglevel
+         self.pool = pooler.get_pool(cr.dbname)
+-        self.uid = 1
+-        self.context = {} # opererp context
++        self.uid = context.get('uid', 1) #TODO: Use session user 
++        self.context = context # opererp context
+         self.eval_context = {'ref': self._ref(),
+                              '_ref': self._ref(), # added '_ref' so that record['ref'] is possible
+                              'time': time,
+@@ -919,12 +921,12 @@
+             is_preceded_by_comment = False
+         return is_preceded_by_comment
+ 
+-def yaml_import(cr, module, yamlfile, kind, idref=None, mode='init', noupdate=False, report=None):
++def yaml_import(cr, module, yamlfile, kind, idref=None, mode='init', noupdate=False, report=None, context=None):
+     if idref is None:
+         idref = {}
+     loglevel = logging.TEST if kind == 'test' else logging.DEBUG
+     yaml_string = yamlfile.read()
+-    yaml_interpreter = YamlInterpreter(cr, module, idref, mode, filename=yamlfile.name, report=report, noupdate=noupdate, loglevel=loglevel)
++    yaml_interpreter = YamlInterpreter(cr, module, idref, mode, filename=yamlfile.name, report=report, noupdate=noupdate, loglevel=loglevel, context=context)
+     yaml_interpreter.process(yaml_string)
+ 
+ # keeps convention of convert.py

=== modified file 'sale_test_data_imp/test/sale_order_product_can_be_sold.yml'
--- sale_test_data_imp/test/sale_order_product_can_be_sold.yml	2013-10-11 19:13:51 +0000
+++ sale_test_data_imp/test/sale_order_product_can_be_sold.yml	2013-10-23 23:20:26 +0000
@@ -20,7 +20,7 @@
     stock_picking_out_object = self.pool.get('stock.picking.out')
     product_ids = product_obj.search(cr, uid, [('sale_ok','=','True'), 
                                                ('active','=','True'), 
-                                               ('company_id','=',company_id)])
+                                               '|',('company_id','=',company_id),('company_id','=',False)])
     invoice_id = None
     partner_id = None
     products_tax_not_fund = []
@@ -44,7 +44,7 @@
         fcsv_csv_Log.writerow({'error': 'error', 'localization':'localization' ,'product_id': 'product_id'})
         
     except Exception, e:
-        fcsv_csv_Log.writerow({'error' : tools.ustr(e).replace('\n', ''), 'localization':'Error create files'})
+        fcsv_csv_Log.writerow({'error' : tools.ustr(e), 'localization':'Error create files'})
     
     if not partner_id:
         fcsv_csv_Log.writerow({'error' : 'Wrong, You can not generate a sale without a partner'})
@@ -58,6 +58,9 @@
             sale_order_data = self.onchange_partner_id(cr, uid, [], partner_id, context=context)['value']
             sale_order_data.update({'picking_policy': 'direct','partner_id': partner_id,'order_policy': 'manual',})  
             
+            if product_data[0].type == 'service' :
+                sale_order_data.update({'order_policy': 'picking'})
+                
             #~ Data of sale order line
             sale_order_line_data = sale_order_line_obj.product_id_change(cr, uid, [], sale_order_data.get('pricelist_id'), product_id, qty=1,
                 uom=False, qty_uos=0, uos=False, name='', partner_id=partner_id,
@@ -74,14 +77,14 @@
                 #~ Create sale order with this product
                 sale_order_id = self.create(cr, uid, sale_order_data )
             except Exception, e:
-                fcsv_csv_Log.writerow({'error' : tools.ustr(e).replace('\n', ''), 'localization': 'Create sale order', 'product_id' : repr(product_id)})
+                fcsv_csv_Log.writerow({'error' : tools.ustr(e), 'localization': 'Create sale order', 'product_id' : repr(product_id)})
 
             #~ Click button Confirm
             if sale_order_id:
                 try:
                     self.action_button_confirm(cr, uid, [sale_order_id],context=context)
                 except Exception, e:
-                    fcsv_csv_Log.writerow({'error' : tools.ustr(e).replace('\n', ''), 'localization': 'Confirm sale order', 'product_id' : repr(product_id)})
+                    fcsv_csv_Log.writerow({'error' : tools.ustr(e), 'localization': 'Confirm sale order', 'product_id' : repr(product_id)})
 
             #~  Chech picking out by sale order
             if not product_data[0].type == 'service' :
@@ -89,7 +92,7 @@
                     stock_picking_out_ids = stock_picking_out_object.search(cr, uid, [('sale_id','=',sale_order_id)])
                     assert len(stock_picking_out_ids) > 0 ,  'Wrong. Stock picking out not fund'
                 except Exception, e:
-                    fcsv_csv_Log.writerow({'error' : tools.ustr(e).replace('\n', ''), 'localization': 'Check picking out', 'product_id' : repr(product_id)})
+                    fcsv_csv_Log.writerow({'error' : tools.ustr(e), 'localization': 'Check picking out', 'product_id' : repr(product_id)})
             
             #~ Create invoice for this sale order
             try:
@@ -103,18 +106,20 @@
             except Exception, e:
                 #~ cr.execute("ROLLBACK TO SAVEPOINT sale_order_savepoint")
                 fcsv_csv_ProductLog.writerow({'id':repr(product_data[0].id), 
-                                                'name': product_data[0].name.encode('utf8').replace(',','.'),
-                                                'name_category': product_data[0].categ_id.name.encode('utf8').replace(',','.'), 
-                                                'error': tools.ustr(e).replace('\n', '')})
+                                                'name': product_data[0].name.encode('utf8','strict'),
+                                                'name_category': product_data[0].categ_id.name.encode('utf8','strict'), 
+                                                'error': repr(tools.ustr(e))})
             #~ Validate invoice for this sale order 
             if invoice_id:
                 try:
                     wf_service = netsvc.LocalService("workflow")
                     wf_service.trg_validate(uid, 'account.invoice', invoice_id.get('res_id') , 'invoice_open', cr)
                 except Exception, e:
-                    fcsv_csv_Log.writerow({'error' : tools.ustr(e).replace('\n', ''), 'localization': 'Validate Invoice',  'product_id' : repr(product_id)})
-
+                    fcsv_csv_Log.writerow({'error' : tools.ustr(e), 'localization': 'Validate Invoice',  'product_id' : repr(product_id)})
+            else:
+                fcsv_csv_Log.writerow({'error' : 'Not found invoice for this sale order', 'localization': 'Validate Invoice', 'product_id' : repr(product_id)})
+                
         f_write_ProductLog_csv.close()
         f_write_Log_csv.close()
-        assert len(products_tax_not_fund) == 0 , 'Wrong. Some products not have tax : %s' % (products_tax_not_fund)
+        #~ assert len(products_tax_not_fund) == 0 , 'Wrong. Some products not have tax : %s' % (products_tax_not_fund)