Merge lp:~acysos-team/openerp-spain/openerp-spain-fix-odoo into lp:~openerp-spain-team/openerp-spain/7.0

[Ignacio Ibeas (www.acysos.com)]

Adaptación de Mod340 y Payment_Order para hacerlos compatibles con Odoo.

[Alejandro Santana (alejandrosantana)]

review: Approve (code review, no test)

[Pedro Manuel Baeza (pedro.baeza)]

LGTM.

Hay algunas cosas que corregir para cumplir con PEP8 y con las convenciones de comunidad, pero eso se puede hacer en otro momento.

Un saludo.

review: Approve (code review)

=== removed file '.directory'
--- .directory	2012-11-15 16:14:59 +0000
+++ .directory	1970-01-01 00:00:00 +0000
@@ -1,5 +0,0 @@
-[Dolphin]
-Timestamp=2012,9,6,18,38,0
-
-[Settings]
-HiddenFilesShown=true

=== modified file 'l10n_es_aeat_mod340/account.py'
--- l10n_es_aeat_mod340/account.py	2014-02-09 16:33:45 +0000
+++ l10n_es_aeat_mod340/account.py	2014-06-25 13:31:44 +0000
@@ -41,50 +41,50 @@
 class wizard_update_charts_accounts(orm.TransientModel):
     _inherit = 'wizard.update.charts.accounts'
     
-    def _find_tax_codes(self, cr, uid, wizard, context=None):
+    def _find_tax_codes(self, cr, uid, wizard, chart_template_ids,
+                        context=None):
         """
         Search for, and load, tax code templates to create/update.
+        
+        @param chart_template_ids: IDs of the chart templates to look on,
+            calculated once in the calling method.
         """
+        if not wizard.chart_template_id:
+            return {}
         new_tax_codes = 0
         updated_tax_codes = 0
         tax_code_template_mapping = {}
-        
-        tax_code_templ_obj = self.pool.get('account.tax.code.template')
-        tax_code_obj = self.pool.get('account.tax.code')
-        wiz_tax_code_obj = self.pool.get('wizard.update.charts.accounts.tax.code')
-        
+        tax_code_templ_obj = self.pool['account.tax.code.template']
+        tax_code_obj = self.pool['account.tax.code']
+        wiz_tax_code_obj = self.pool['wizard.update.charts.accounts.tax.code']
         # Remove previous tax codes
         wiz_tax_code_obj.unlink(cr, uid, wiz_tax_code_obj.search(cr, uid, []))
-        
-        #
         # Search for new / updated tax codes
-        #
         root_tax_code_id = wizard.chart_template_id.tax_code_root_id.id
-        children_tax_code_template = tax_code_templ_obj.search(cr, uid, 
-                   [('parent_id', 'child_of', [root_tax_code_id])], order='id')
-        for tax_code_template in tax_code_templ_obj.browse(cr, uid, 
-                                                   children_tax_code_template):
-            # Ensure the tax code template is on the map (search for the mapped tax code id).
-            self._map_tax_code_template(cr, uid, wizard, 
-                                        tax_code_template_mapping, 
-                                        tax_code_template, context)
-
-            tax_code_id = tax_code_template_mapping.get(tax_code_template.id)
+        children_tax_code_template = tax_code_templ_obj.search(cr, uid, [(
+            'parent_id', 'child_of', [root_tax_code_id])], order='id',
+            context=context)
+        for tax_code_template in tax_code_templ_obj.browse(cr, uid,
+                                children_tax_code_template, context=context):
+            # Ensure the tax code template is on the map (search for the mapped
+            # tax code id).
+            tax_code_id = self._map_tax_code_template(cr, uid, wizard,
+                                            tax_code_template_mapping,
+                                            tax_code_template, context=context)
             if not tax_code_id:
                 new_tax_codes += 1
                 wiz_tax_code_obj.create(cr, uid, {
-                        'tax_code_id': tax_code_template.id,
-                        'update_chart_wizard_id': wizard.id,
-                        'type': 'new',
-                    }, context)
+                    'tax_code_id': tax_code_template.id,
+                    'update_chart_wizard_id': wizard.id,
+                    'type': 'new',
+                    'notes': _('Name or code not found.'),
+                }, context)
             elif wizard.update_tax_code:
-                #
                 # Check the tax code for changes.
-                #
                 modified = False
                 notes = ""
-                tax_code = tax_code_obj.browse(cr, uid, tax_code_id, context=context)
-
+                tax_code = tax_code_obj.browse(
+                    cr, uid, tax_code_id, context=context)
                 if tax_code.code != tax_code_template.code:
                     notes += _("The code field is different.\n")
                     modified = True
@@ -97,49 +97,41 @@
                 if tax_code.mod340 != tax_code_template.mod340:
                     notes += _("The Mod 340 field is different.\n")
                     modified = True
-
                 # TODO: We could check other account fields for changes...
-
                 if modified:
-                    #
                     # Tax code to update.
-                    #
                     updated_tax_codes += 1
                     wiz_tax_code_obj.create(cr, uid, {
-                            'tax_code_id': tax_code_template.id,
-                            'update_chart_wizard_id': wizard.id,
-                            'type': 'updated',
-                            'update_tax_code_id': tax_code_id,
-                            'notes': notes,
-                        }, context)
-
-        return { 'new': new_tax_codes, 'updated': updated_tax_codes, 
-                'mapping': tax_code_template_mapping }
+                        'tax_code_id': tax_code_template.id,
+                        'update_chart_wizard_id': wizard.id,
+                        'type': 'updated',
+                        'update_tax_code_id': tax_code_id,
+                        'notes': notes,
+                    }, context)
+        return {
+            'new': new_tax_codes,
+            'updated': updated_tax_codes,
+            'mapping': tax_code_template_mapping
+        }
                 
     def _update_tax_codes(self, cr, uid, wizard, log, context=None):
         """
         Search for, and load, tax code templates to create/update.
         """
-        tax_code_obj = self.pool.get('account.tax.code')
-
+        taxcodes = self.pool.get('account.tax.code')
         root_tax_code_id = wizard.chart_template_id.tax_code_root_id.id
-
         new_tax_codes = 0
         updated_tax_codes = 0
         tax_code_template_mapping = {}
-
         for wiz_tax_code in wizard.tax_code_ids:
             tax_code_template = wiz_tax_code.tax_code_id
             tax_code_name = (root_tax_code_id == tax_code_template.id) and wizard.company_id.name or tax_code_template.name
-
             # Ensure the parent tax code template is on the map.
-            self._map_tax_code_template(cr, uid, wizard, 
-                                        tax_code_template_mapping, 
-                                        tax_code_template.parent_id, context)
-
-            #
+            self._map_tax_code_template(cr, uid, wizard,
+                                        tax_code_template_mapping,
+                                        tax_code_template.parent_id,
+                                        context=context)
             # Values
-            #
             vals = {
                 'name': tax_code_name,
                 'code': tax_code_template.code,
@@ -152,40 +144,31 @@
 
             tax_code_id = None
             modified = False
-
             if wiz_tax_code.type == 'new':
-                #
                 # Create the tax code
-                #
-                tax_code_id = tax_code_obj.create(cr, uid, vals)
+                tax_code_id = taxcodes.create(cr, uid, vals)
                 log.add(_("Created tax code %s.\n") % tax_code_name)
                 new_tax_codes += 1
                 modified = True
             elif wizard.update_tax_code and wiz_tax_code.update_tax_code_id:
-                #
                 # Update the tax code
-                #
                 tax_code_id = wiz_tax_code.update_tax_code_id.id
-                tax_code_obj.write(cr, uid, [tax_code_id], vals)
+                taxcodes.write(cr, uid, [tax_code_id], vals)
                 log.add(_("Updated tax code %s.\n") % tax_code_name)
                 updated_tax_codes += 1
                 modified = True
             else:
                 tax_code_id = wiz_tax_code.update_tax_code_id and wiz_tax_code.update_tax_code_id.id
                 modified = False
-
             # Store the tax codes on the map
             tax_code_template_mapping[tax_code_template.id] = tax_code_id
-
             if modified:
-                #
                 # Detect errors
-                #
                 if tax_code_template.parent_id and not tax_code_template_mapping.get(tax_code_template.parent_id.id):
                     log.add(_("Tax code %s: The parent tax code %s can not be set.\n") % (tax_code_name, tax_code_template.parent_id.name), True)
-
         return {
             'new': new_tax_codes,
             'updated': updated_tax_codes,
             'mapping': tax_code_template_mapping
         }
+

=== modified file 'l10n_es_payment_order/report/remesas_report.py'
--- l10n_es_payment_order/report/remesas_report.py	2011-08-29 15:11:11 +0000
+++ l10n_es_payment_order/report/remesas_report.py	2014-06-25 13:31:44 +0000
@@ -22,7 +22,7 @@
 ##############################################################################
 
 import time
-from report import report_sxw
+from openerp.report import report_sxw
 
 class remesas_report(report_sxw.rml_parse):