Merge lp:~altegra/pepess/pepess_dev-carlos_yaml_new into lp:pepess

[Carlos Blanco - http://www.grupoaltegra.com]

[IMP] yml are added

[Carlos Blanco - http://www.grupoaltegra.com (carlos-blanco)]

Se agregaron los archivos YAML

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

@Carlos,
Está excelente esta MP.
Buen trabajo.

Puedes mergear, por favor.

review: Approve

=== modified file 'base_vat_pepess/__openerp__.py'
--- base_vat_pepess/__openerp__.py	2014-08-25 15:22:49 +0000
+++ base_vat_pepess/__openerp__.py	2014-09-02 21:09:27 +0000
@@ -39,13 +39,14 @@
                 You can assign a partner vat without country code.
                     """,
     "init_xml" : [],
-    "depends" : ['base','base_vat','account'],
+    "depends" : ['base','base_vat','account','l10n_mx_partner_address'],
     "update_xml" : [
             #~ 'product_view.xml',
         ],
     "demo_xml" : [
     ],
     "test" : [
+        "test/base_vat_pepess_test.yml"
     ],
     "installable" : True,
     "images": [],
 
=== added directory 'base_vat_pepess/test'
=== added file 'base_vat_pepess/test/base_vat_pepess_test.yml'
--- base_vat_pepess/test/base_vat_pepess_test.yml	1970-01-01 00:00:00 +0000
+++ base_vat_pepess/test/base_vat_pepess_test.yml	2014-09-02 21:09:27 +0000
@@ -0,0 +1,20 @@
+-
+  Create new partner with RFC without country code
+-
+  !record {model: 'res.partner', id: res_partner_pepess_test1}:
+    name: Simon Sanchez
+    customer: True
+    parent_id: base.main_partner
+    use_parent_address: True
+    function: Administracion
+    email: [e-mail]
+    street: Nueva Calle
+    l10n_mx_street3: Nuevo Num Exterior
+    l10n_mx_street4: Nuevo Num Interior
+    zip: 42040
+    l10n_mx_city2: Pachuca
+    city: Pachuca
+    state_id: l10n_mx_states.res_country_state_mx_hgo
+    vat: XAXX010101000
+
+
 
=== modified file 'product_pepess/__openerp__.py'
--- product_pepess/__openerp__.py	2014-08-25 18:19:46 +0000
+++ product_pepess/__openerp__.py	2014-09-02 21:09:27 +0000
@@ -52,6 +52,7 @@
         'demo/product_pepess_demo.xml',
     ],
     "test" : [
+        "test/test_product_pepess.yml"
     ],
     "installable" : True,
     "images": [],
 
=== modified file 'product_pepess/demo/product_pepess_demo.xml'
--- product_pepess/demo/product_pepess_demo.xml	2014-08-25 18:19:46 +0000
+++ product_pepess/demo/product_pepess_demo.xml	2014-09-02 21:09:27 +0000
@@ -150,5 +150,12 @@
             <field name="type_price_product">commercial</field>
         </record>
         
+        <!-- sale.shop -->
+        <record id="sale.sale_shop_1" model="sale.shop">
+            <field name="commercial_percentage" >3</field>
+            <field name="nocommercial_percentage" >5</field>
+            <field name="base_percentage">12</field>
+        </record>
+        
     </data>
 </openerp>
 
=== modified file 'product_pepess/sale.py'
--- product_pepess/sale.py	2014-04-09 17:09:22 +0000
+++ product_pepess/sale.py	2014-09-02 21:09:27 +0000
@@ -129,6 +129,7 @@
             i=0
             query_total_update = ''
             query_total_list_price = ''
+            new_list_price = 0.0
             for product_id in product_ids:
                 product_id = product_id[0]
                 # Buscomos todos los tipos de precios por tienda del producto
@@ -140,6 +141,7 @@
                     # Calculamos el precio base
                     base_price = round(type_product_row.product_id.standard_price + (type_product_row.product_id.standard_price * (type_product_row.shop_id.base_percentage/100)),2)
                     base_price = round(base_price*1.16,2)
+                    new_list_price = base_price
                     # Validamos que tipo de precio tiene la tienda para calcular su precio de lista
                     if type_product_row.type_price_product == 'base':
                         new_list_price = base_price
 
=== added directory 'product_pepess/test'
=== added file 'product_pepess/test/test_product_pepess.yml'
--- product_pepess/test/test_product_pepess.yml	1970-01-01 00:00:00 +0000
+++ product_pepess/test/test_product_pepess.yml	2014-09-02 21:09:27 +0000
@@ -0,0 +1,15 @@
+-
+  I test list price by shop
+-
+  !python {model: sale.shop}: |
+    import netsvc, tools
+    import traceback
+    from openerp.osv.orm import except_orm
+    from tools.misc import mute_logger
+    wf_service = netsvc.LocalService("workflow")
+    log("Update product list price by shop")
+    self.update_price_shop(cr, uid, ref('product_pepess.sale_shop_2'), context=context)
+    log("End update product list price")
+    
+
+
 
=== modified file 'res_partner_pepess/__openerp__.py'
--- res_partner_pepess/__openerp__.py	2014-08-25 18:19:46 +0000
+++ res_partner_pepess/__openerp__.py	2014-09-02 21:09:27 +0000
@@ -47,6 +47,7 @@
         "demo/address_partners_company_demo.xml",
     ],
     "test" : [
+        "test/test_res_partner_pepess.yml"
     ],
     "installable" : True,
     "images": [],
 
=== added directory 'res_partner_pepess/test'
=== added file 'res_partner_pepess/test/test_res_partner_pepess.yml'
--- res_partner_pepess/test/test_res_partner_pepess.yml	1970-01-01 00:00:00 +0000
+++ res_partner_pepess/test/test_res_partner_pepess.yml	2014-09-02 21:09:27 +0000
@@ -0,0 +1,35 @@
+-
+  PARTNER NEW ZULY
+-
+  !record {model: 'res.partner', id: base.res_partner_main2}:
+    name: Zuly Adrina
+    customer: True
+    parent_id: base.main_partner
+    use_parent_address: True
+    function: Administracion
+    email: [e-mail]
+    street: Nueva Calle
+    l10n_mx_street3: Nuevo Num Exterior
+    l10n_mx_street4: Nuevo Num Interior
+    zip: 42040
+    l10n_mx_city2: Tulancingo
+    city: Tulancingo
+    state_id: l10n_mx_states.res_country_state_mx_hgo
+
+-
+
+  !python {model: res.partner}: |
+    import netsvc, tools
+    import traceback
+    from openerp.osv.orm import except_orm
+    import logging
+    from tools.misc import mute_logger
+    _logger = logging.getLogger("openerp.tools.yaml_import")
+    log("1 Duplicate partner demo")
+    try:
+        with mute_logger('openerp.sql_db'):
+            partner_id = self.copy(cr, uid, ref('base.res_partner_main2'), context=context)
+    except Exception, e:
+        _logger.error(tools.ustr(e))
+
+
 
=== modified file 'sale_prices_without_tax_pepess/__openerp__.py'
--- sale_prices_without_tax_pepess/__openerp__.py	2014-08-25 18:19:46 +0000
+++ sale_prices_without_tax_pepess/__openerp__.py	2014-09-02 21:09:27 +0000
@@ -37,7 +37,7 @@
     "website" : "http://www.grupoaltegra.com",
     "description" : """ fields are added to products equal mexytul """,
     "init_xml" : [],
-    "depends" : ['base','sale','product','account'],
+    "depends" : ['base','sale_stock','product','account'],
     "update_xml" : [
             'sale_view.xml',
             'invoice_view.xml',
@@ -46,6 +46,7 @@
          "demo/sale_prices_without_tax_pepess_demo.xml",
     ],
     "test" : [
+        "test/sale_order_pepess_demo.yml",
     ],
     "installable" : True,
     "images": [],
 
=== modified file 'sale_prices_without_tax_pepess/sale.py'
--- sale_prices_without_tax_pepess/sale.py	2014-04-02 23:56:33 +0000
+++ sale_prices_without_tax_pepess/sale.py	2014-09-02 21:09:27 +0000
@@ -37,6 +37,8 @@
     
     _inherit ="sale.order"
     
+    
+    
     def _amount_line_tax(self, cr, uid, line, context=None):
         val = 0.0
         for c in self.pool.get('account.tax').compute_all(cr, uid, line.tax_id, line.price_unit_without_tax * (1-(line.discount or 0.0)/100.0), line.product_uom_qty, line.product_id, line.order_id.partner_id,force_excluded=True)['taxes']:
@@ -108,7 +110,7 @@
         return res
     
     _columns= {
-        'price_unit_without_tax': fields.float('Precio Unitario sin IVA', required=True, digits_compute= dp.get_precision('Product Price'), readonly=True, states={'draft': [('readonly', False)]}),
+        'price_unit_without_tax': fields.float('Precio Unitario sin IVA', digits_compute= dp.get_precision('Product Price'), readonly=True, states={'draft': [('readonly', False)]}),
         'price_subtotal': fields.function(_amount_line, string='Subtotal', digits_compute= dp.get_precision('Account')),
     }
     
@@ -129,7 +131,7 @@
             # SE obtiene el precio del producto
             price = self.pool.get('product.pricelist').price_get(cr, uid, [pricelist],
                         product, qty or 1.0, partner_id, {
-                            'uom': uom or result.get('product_uom'),
+                            'uom': uom or results.get('product_uom'),
                             'date': date_order,
                             })[pricelist]
             # Se le quita el IVA
 
=== added directory 'sale_prices_without_tax_pepess/test'
=== added file 'sale_prices_without_tax_pepess/test/sale_order_pepess_demo.yml'
--- sale_prices_without_tax_pepess/test/sale_order_pepess_demo.yml	1970-01-01 00:00:00 +0000
+++ sale_prices_without_tax_pepess/test/sale_order_pepess_demo.yml	2014-09-02 21:09:27 +0000
@@ -0,0 +1,32 @@
+-
+  Create SO test 1
+-
+    !record {model: sale.order, id: sale_order_test1}:
+        partner_id: base.res_partner_2
+        note: Invoice after delivery
+        payment_term: account.account_payment_term
+        
+-
+  CREATE line
+-
+        
+    !record {model: sale.order.line, id: sale_order_line_test1}:
+            name: u'[CARD] Teclado'
+            product_id: product.product_product_11
+            product_uom_qty: 3
+            product_uom: product.product_uom_dozen
+            order_id: sale.sale_order_8
+            price_unit: 100.00
+            
+-
+  Onchange
+-
+  !assert {model: sale.order, id: sale.sale_order_8}:
+    - order_line[0].price_unit == 3645.0
+    - order_line[0].product_uom_qty == 2
+    - order_line[0].product_uom.id == ref('product.product_uom_unit')
+-
+  I confirm the sale order
+-
+  !workflow {model: sale.order, ref: sale.sale_order_8, action: order_confirm}
+