openerp-l10n-ar-localization team mailing list archive

[Darío De Giacomo <dariokdg@xxxxxxxxx>]

Darío De Giacomo has proposed merging lp:~dariokdg/openerp-l10n-ar-localization/7.0_prop into lp:openerp-l10n-ar-localization.

Requested reviews:
  OpenERP - Team de Localización Argentina (openerp-l10n-ar-localization)

For more details, see:
https://code.launchpad.net/~dariokdg/openerp-l10n-ar-localization/7.0_prop/+merge/195644

[FIX] Added Concept Type: 'product' (stockable products from inventory).
(falta añadir esto al wizard de configuracion que arma el menu Concept Type en AFIP Configuration en Settings.
-- 
https://code.launchpad.net/~dariokdg/openerp-l10n-ar-localization/7.0_prop/+merge/195644
Your team OpenERP - Team de Localización Argentina is requested to review the proposed merge of lp:~dariokdg/openerp-l10n-ar-localization/7.0_prop into lp:openerp-l10n-ar-localization.

=== modified file 'l10n_ar_invoice/afip.py' (properties changed: +x to -x)
--- l10n_ar_invoice/afip.py	2013-11-04 16:53:48 +0000
+++ l10n_ar_invoice/afip.py	2013-11-18 17:51:16 +0000
@@ -95,14 +95,14 @@
         'active': fields.boolean('Active'),
         'product_types': fields.char('Product types',
                                      help='Only use products with this product types in this journals. '
-                                     'Types must be a subset of adjust, consu and service separated by commas.'),
+                                     'Types must be a subset of adjust, product, consu and service separated by commas.'),
     }
 
     def _check_product_types(self, cr, uid, ids, context=None):
         for jc in self.browse(cr, uid, ids, context=context):
             if jc.product_types:
                 types = set(jc.product_types.split(','))
-                res = types.issubset(['adjust','consu','service'])
+                res = types.issubset(['adjust','consu','service','product'])
             else:
                 res = True
         return res
@@ -132,14 +132,14 @@
         'active': fields.boolean('Active'),
         'product_types': fields.char('Product types',
                                      help='Translate this product types to this AFIP concept. '
-                                     'Types must be a subset of adjust, consu and service separated by commas.',required=True),
+                                     'Types must be a subset of adjust, product, consu and service separated by commas.',required=True),
     }
 
     def _check_product_types(self, cr, uid, ids, context=None):
         for ct in self.browse(cr, uid, ids, context=context):
             if ct.product_types:
                 types = set(ct.product_types.split(','))
-                res = types.issubset(['adjust','consu','service'])
+                res = types.issubset(['adjust','consu','service','product'])
             else:
                 res = True
         return res

=== modified file 'l10n_ar_wsafip_fe/invoice.py'
--- l10n_ar_wsafip_fe/invoice.py	2013-11-14 19:10:07 +0000
+++ l10n_ar_wsafip_fe/invoice.py	2013-11-18 17:51:16 +0000
@@ -24,6 +24,7 @@
 import logging
 
 _logger = logging.getLogger(__name__)
+
 # Number Filter
 re_number = re.compile(r'\d{8}')
 
@@ -37,13 +38,24 @@
 def _calc_concept(product_types):
     if product_types == set(['consu']):
         concept = '1'
+    elif product_types == set(['product']):
+        concept = '1'
     elif product_types == set(['service']):
         concept = '2'
     elif product_types == set(['consu','service']):
         concept = '3'
+    elif product_types == set(['product','service']):
+        concept = '3'        
     else:
         concept = False
     return concept
+    
+    ####### MOD DARIO DE GIACOMO 18/11/2013 14:45hs.
+    ####### ------------------------------------------------------------------
+    ####### NO FUERON CONSIDERADOS LOS PRODUCTOS STOCKEABLES DE TYPE "product"
+    ####### PARA SER CONSIDERADOS COMO PRODUCTO DE 'afip_concept'
+    ####### FALTA AÑADIRLOS AL WIZARD DE CONFIGURACION PARA QUE SE AÑADAN
+    ####### EN EL 'Concept Type' del menu 'AFIP Configuration' en Settings.
 
 class invoice(osv.osv):
     def _get_concept(self, cr, uid, ids, name, args, context=None):