From aebad6a8ee1afaf23dcc2777e93aee7c5e6996df Mon Sep 17 00:00:00 2001 From: eLBati Date: Tue, 30 Aug 2011 10:55:33 +0200 Subject: [PATCH 01/41] [FIX] http://wiki.openerp-italia.org/doku.php/moduli/l10n_it_iva_indetraibile [FIX] https://bugs.launchpad.net/openobject-italia/+bug/836847 bzr revid: lorenzo.battistini@agilebg.com-20110830085533-3tmpd2ai12exc9ai --- addons/l10n_it/__init__.py | 11 +- addons/l10n_it/__openerp__.py | 9 +- addons/l10n_it/account.py | 56 ++ addons/l10n_it/data/account.tax.template.csv | 86 +-- addons/l10n_it/i18n/it.po | 179 +---- addons/l10n_it/i18n/l10n_it.pot | 137 +--- addons/l10n_it/libroIVA.py | 54 -- addons/l10n_it/libroIVA_menu.xml | 16 - addons/l10n_it/libroIVA_view.xml | 47 -- addons/l10n_it/report.xml | 24 - addons/l10n_it/report/__init__.py | 2 - addons/l10n_it/report/libroIVA_credito.py | 79 --- addons/l10n_it/report/libroIVA_credito.rml | 203 ------ addons/l10n_it/report/libroIVA_debito.py | 80 --- addons/l10n_it/report/libroIVA_debito.rml | 195 ------ addons/l10n_it/report/normalized_oo2rml.xsl | 696 ------------------- addons/l10n_it/security/ir.model.access.csv | 3 - 17 files changed, 147 insertions(+), 1730 deletions(-) create mode 100644 addons/l10n_it/account.py delete mode 100644 addons/l10n_it/libroIVA.py delete mode 100644 addons/l10n_it/libroIVA_menu.xml delete mode 100644 addons/l10n_it/libroIVA_view.xml delete mode 100644 addons/l10n_it/report.xml delete mode 100644 addons/l10n_it/report/__init__.py delete mode 100644 addons/l10n_it/report/libroIVA_credito.py delete mode 100644 addons/l10n_it/report/libroIVA_credito.rml delete mode 100644 addons/l10n_it/report/libroIVA_debito.py delete mode 100644 addons/l10n_it/report/libroIVA_debito.rml delete mode 100644 addons/l10n_it/report/normalized_oo2rml.xsl delete mode 100644 addons/l10n_it/security/ir.model.access.csv diff --git a/addons/l10n_it/__init__.py b/addons/l10n_it/__init__.py index 026004bfa0f..f9126cd880e 100644 --- a/addons/l10n_it/__init__.py +++ b/addons/l10n_it/__init__.py @@ -1,13 +1,15 @@ -# -*- encoding: utf-8 -*- ############################################################################## # # OpenERP, Open Source Management Solution # Copyright (C) 2010 -# Italian OpenERP Community () +# OpenERP Italian Community () # Servabit srl # Agile Business Group sagl # Domsense srl -# Albatos srl +# Albatos srl +# +# Copyright (C) 2011 +# Associazione OpenERP Italia () # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -24,5 +26,4 @@ # ############################################################################## -import libroIVA -import report +import account diff --git a/addons/l10n_it/__openerp__.py b/addons/l10n_it/__openerp__.py index 41161f67a70..0be022a6a80 100644 --- a/addons/l10n_it/__openerp__.py +++ b/addons/l10n_it/__openerp__.py @@ -3,12 +3,15 @@ # # OpenERP, Open Source Management Solution # Copyright (C) 2010 -# Italian OpenERP Community () +# OpenERP Italian Community () # Servabit srl # Agile Business Group sagl # Domsense srl # Albatos srl # +# Copyright (C) 2011 +# Associazione OpenERP Italia () +# # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the @@ -39,9 +42,6 @@ Italian accounting chart and localization. "category" : "Finance", 'website': 'http://www.openerp-italia.org/', 'init_xml': [ - 'report.xml', - 'libroIVA_view.xml', - 'libroIVA_menu.xml', ], 'update_xml': [ 'data/account.account.type.csv', @@ -51,7 +51,6 @@ Italian accounting chart and localization. 'data/account.tax.template.csv', 'data/account.fiscal.position.template.csv', 'l10n_chart_it_generic.xml', - 'security/ir.model.access.csv', ], 'demo_xml': [ ], diff --git a/addons/l10n_it/account.py b/addons/l10n_it/account.py new file mode 100644 index 00000000000..98e4d5ae68b --- /dev/null +++ b/addons/l10n_it/account.py @@ -0,0 +1,56 @@ +# -*- encoding: utf-8 -*- +############################################################################## +# +# OpenERP, Open Source Management Solution +# Copyright (C) 2011 +# Associazione OpenERP Italia () +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . +# +############################################################################## + +from osv import fields, osv +import decimal_precision as dp +from decimal import * + +class account_tax(osv.osv): + + _inherit = 'account.tax' + + def compute_all(self, cr, uid, taxes, price_unit, quantity, address_id=None, product=None, partner=None): + res = super(account_tax, self).compute_all(cr, uid, taxes, price_unit, quantity, address_id, product, partner) + + precision = self.pool.get('decimal.precision').precision_get(cr, uid, 'Account') + tax_list = res['taxes'] + totalex = res['total'] + if len(tax_list) == 2: + for tax in tax_list: + if tax.get('balance',False): # Calcolo di imponibili e imposte per l'IVA parzialmente detraibile + deductible_base = totalex + ind_tax = tax_list[abs(tax_list.index(tax)-1)] + ind_tax_obj = self.browse(cr, uid, ind_tax['id']) + ded_tax_obj = self.browse(cr, uid, tax['id']) + base_ind = float(Decimal(str(totalex * ind_tax_obj.amount)).quantize(Decimal('1.'+precision*'0'), rounding=ROUND_HALF_UP)) + base_ded = float(Decimal(str(totalex - base_ind)).quantize(Decimal('1.'+precision*'0'), rounding=ROUND_HALF_UP)) + tax_total = float(Decimal(str(tax['balance'])).quantize(Decimal('1.'+precision*'0'), rounding=ROUND_HALF_UP)) + tax_ind = float(Decimal(str(tax_total * ind_tax_obj.amount)).quantize(Decimal('1.'+precision*'0'), rounding=ROUND_HALF_UP)) + tax_ded = tax_total - tax_ind + ind_tax['price_unit'] = base_ind + tax['price_unit'] = base_ded + ind_tax['amount'] = tax_ind + tax['amount'] = tax_ded + + return res + +account_tax() diff --git a/addons/l10n_it/data/account.tax.template.csv b/addons/l10n_it/data/account.tax.template.csv index cf9caeeb0d4..5be051ed009 100644 --- a/addons/l10n_it/data/account.tax.template.csv +++ b/addons/l10n_it/data/account.tax.template.csv @@ -1,40 +1,46 @@ -"id","description","chart_template_id:id","name","amount","parent_id:id","child_depend","type","account_collected_id:id","account_paid_id:id","type_tax_use","base_code_id:id","tax_code_id:id","ref_base_code_id:id","ref_tax_code_id:id" -"20a","20a","l10n_it_chart_template_generic","Iva al 20% (debito)","0.2",,"False","percent","2601","2601","sale","template_impcode_riscossa_20","template_ivacode_riscossa_20","template_impcode_riscossa_20","template_ivacode_riscossa_20" -"20b","20b","l10n_it_chart_template_generic","Iva al 20% (credito)","0.2",,"False","percent","1601","1601","purchase","template_impcode_pagata_20","template_ivacode_pagata_20","template_impcode_pagata_20","template_ivacode_pagata_20" -"10a","10a","l10n_it_chart_template_generic","Iva al 10% (debito)","0.1",,"False","percent","2601","2601","sale","template_impcode_riscossa_10","template_ivacode_riscossa_10","template_impcode_riscossa_10","template_ivacode_riscossa_10" -"10b","10b","l10n_it_chart_template_generic","Iva al 10% (credito)","0.1",,"False","percent","1601","1601","purchase","template_impcode_pagata_10","template_ivacode_pagata_10","template_impcode_pagata_10","template_ivacode_pagata_10" -"10AO","10AO","l10n_it_chart_template_generic","Iva al 10% indetraibile","1",,"True","percent",,,"purchase",,,, -"10AOa","10AOa","l10n_it_chart_template_generic","Iva al 10% indetraibile (1)","0","10AO","False","percent","1601","1601","purchase","template_impcode_pagata_10ind","template_ivacode_pagata_10ind","template_impcode_pagata_10ind","template_ivacode_pagata_10ind" -"10AOb","10AOb","l10n_it_chart_template_generic","Iva al 10% indetraibile (2)","0.1","10AO","False","percent",,,"purchase",,,, -"12a","12a","l10n_it_chart_template_generic","Iva 12% (debito)","0.12",,"False","percent","2601","2601","sale","template_impcode_riscossa_12","template_ivacode_riscossa_12","template_impcode_riscossa_12","template_ivacode_riscossa_12" -"12b","12b","l10n_it_chart_template_generic","Iva 12% (credito)","0.12",,"False","percent","1601","1601","purchase","template_impcode_pagata_12","template_ivacode_pagata_12","template_impcode_pagata_12","template_ivacode_pagata_12" -"2010","2010","l10n_it_chart_template_generic","Iva al 20% detraibile 10%","1",,"True","percent",,,"purchase",,,, -"2010a","2010a","l10n_it_chart_template_generic","Iva al 20% detraibile 10% (1)","0.02","2010","False","percent","1601","1601","purchase","template_impcode_pagata_20det10","template_ivacode_pagata_20det10","template_impcode_pagata_20det10","template_ivacode_pagata_20det10" -"2010b","2010b","l10n_it_chart_template_generic","Iva al 20% detraibile 10% (2)","0.18","2010","False","percent",,,"purchase",,,, -"2015","2015","l10n_it_chart_template_generic","Iva al 20% detraibile 15%","1",,"True","percent",,,"purchase",,,, -"2015a","2015a","l10n_it_chart_template_generic","Iva al 20% detraibile 15% (1)","0.03","2015","False","percent","1601","1601","purchase","template_impcode_pagata_20det15","template_ivacode_pagata_20det15","template_impcode_pagata_20det15","template_ivacode_pagata_20det15" -"2015b","2015b","l10n_it_chart_template_generic","Iva al 20% detraibile 15% (2)","0.17","2015","False","percent",,,"purchase",,,, -"2040","2040","l10n_it_chart_template_generic","Iva al 20% detraibile 40%","1",,"True","percent",,,"purchase",,,, -"2040a","2040a","l10n_it_chart_template_generic","Iva al 20% detraibile 40% (1)","0.08","2040","False","percent","1601","1601","purchase","template_impcode_pagata_20det40","template_ivacode_pagata_20det40","template_impcode_pagata_20det40","template_ivacode_pagata_20det40" -"2040b","2040b","l10n_it_chart_template_generic","Iva al 20% detraibile 40% (2)","0.12","2040","False","percent",,,"purchase",,,, -"20AO","20AO","l10n_it_chart_template_generic","Iva al 20% indetraibile","1",,"True","percent",,,"purchase",,,, -"20AOa","20AOa","l10n_it_chart_template_generic","Iva al 20% indetraibile (1)","0","20AO","False","percent","1601","1601","purchase","template_impcode_pagata_20ind","template_ivacode_pagata_20ind","template_impcode_pagata_20ind","template_ivacode_pagata_20ind" -"20AOb","20AOb","l10n_it_chart_template_generic","Iva al 20% indetraibile (2)","0.2","20AO","False","percent",,,"purchase",,,, -"20I5","20I5","l10n_it_chart_template_generic","IVA al 20% detraibile al 50%","1",,"True","percent",,,"purchase",,,, -"20I5a","20I5a","l10n_it_chart_template_generic","IVA al 20% detraibile al 50% (1)","0.1","20I5","False","percent","1601","1601","purchase","template_impcode_pagata_20det50","template_ivacode_pagata_20det50","template_impcode_pagata_20det50","template_ivacode_pagata_20det50" -"20I5b","20I5b","l10n_it_chart_template_generic","IVA al 20% detraibile al 50% (2)","0.1","20I5","False","percent",,,"purchase",,,, -"22a","22a","l10n_it_chart_template_generic","Iva 2% (debito)","0.02",,"False","percent","2601","2601","sale","template_impcode_riscossa_2","template_ivacode_riscossa_2","template_impcode_riscossa_2","template_ivacode_riscossa_2" -"22b","22b","l10n_it_chart_template_generic","Iva 2% (credito)","0.02",,"False","percent","1601","1601","purchase","template_impcode_pagata_2","template_ivacode_pagata_2","template_impcode_pagata_2","template_ivacode_pagata_2" -"4a","4a","l10n_it_chart_template_generic","Iva 4% (debito)","0.04",,"False","percent","2601","2601","sale","template_impcode_riscossa_4","template_ivacode_riscossa_4","template_impcode_riscossa_4","template_ivacode_riscossa_4" -"4b","4b","l10n_it_chart_template_generic","Iva 4% (credito)","0.04",,"False","percent","1601","1601","purchase","template_impcode_pagata_4","template_ivacode_pagata_4","template_impcode_pagata_4","template_ivacode_pagata_4" -"4AO","4AO","l10n_it_chart_template_generic","Iva al 4% indetraibile","1",,"True","percent",,,"purchase",,,, -"4AOa","4AOa","l10n_it_chart_template_generic","Iva al 4% indetraibile (1)","0","4AO","False","percent","1601","1601","purchase","template_impcode_pagata_4ind","template_ivacode_pagata_4ind","template_impcode_pagata_4ind","template_ivacode_pagata_4ind" -"4AOb","4AOb","l10n_it_chart_template_generic","Iva al 4% indetraibile (2)","0.04","4AO","False","percent",,,"purchase",,,, -"10I5","10I5","l10n_it_chart_template_generic","IVA al 10% detraibile al 50%","1",,"True","percent",,,"purchase",,,, -"10I5a","10I5a","l10n_it_chart_template_generic","IVA al 10% detraibile al 50% (1)","0.05","10I5","False","percent","1601","1601","purchase","template_impcode_pagata_10det50","template_ivacode_pagata_10det50","template_impcode_pagata_10det50","template_ivacode_pagata_10det50" -"10I5b","10I5b","l10n_it_chart_template_generic","IVA al 10% detraibile al 50% (2)","0.05","10I5","False","percent",,,"purchase",,,, -"4I5","4I5","l10n_it_chart_template_generic","IVA al 4% detraibile al 50%","1",,"True","percent",,,"purchase",,,, -"4I5a","4I5a","l10n_it_chart_template_generic","IVA al 4% detraibile al 50% (1)","0.02","4I5","False","percent","1601","1601","purchase","template_impcode_pagata_4det50","template_ivacode_pagata_4det50","template_impcode_pagata_4det50","template_ivacode_pagata_4det50" -"4I5b","4I5b","l10n_it_chart_template_generic","IVA al 4% detraibile al 50% (2)","0.02","4I5","False","percent",,,"purchase",,,, -"00a","00a","l10n_it_chart_template_generic","Esente IVA (debito)","0",,"False","percent","2601","2601","sale","template_impcode_riscossa_0","template_ivacode_riscossa_0","template_impcode_riscossa_0","template_ivacode_riscossa_0" -"00b","00b","l10n_it_chart_template_generic","Esente IVA (credito)","0",,"False","percent","1601","1601","purchase","template_impcode_pagata_0","template_ivacode_pagata_0","template_impcode_pagata_0","template_ivacode_pagata_0" +"id","description","chart_template_id:id","name","sequence","amount","parent_id:id","child_depend","type","account_collected_id:id","account_paid_id:id","type_tax_use","base_code_id:id","tax_code_id:id","ref_base_code_id:id","ref_tax_code_id:id","ref_base_sign","ref_tax_sign","price_include" +"20a","20a","l10n_it_chart_template_generic","Iva al 20% (debito)",,"0.2",,"False","percent","2601","2601","sale","template_impcode_riscossa_20","template_ivacode_riscossa_20","template_impcode_riscossa_20","template_ivacode_riscossa_20",-1,-1,"False" +"20b","20b","l10n_it_chart_template_generic","Iva al 20% (credito)",,"0.2",,"False","percent","1601","1601","purchase","template_impcode_pagata_20","template_ivacode_pagata_20","template_impcode_pagata_20","template_ivacode_pagata_20",-1,-1,"False" +"10a","10a","l10n_it_chart_template_generic","Iva al 10% (debito)",,"0.1",,"False","percent","2601","2601","sale","template_impcode_riscossa_10","template_ivacode_riscossa_10","template_impcode_riscossa_10","template_ivacode_riscossa_10",-1,-1,"False" +"10b","10b","l10n_it_chart_template_generic","Iva al 10% (credito)",,"0.1",,"False","percent","1601","1601","purchase","template_impcode_pagata_10","template_ivacode_pagata_10","template_impcode_pagata_10","template_ivacode_pagata_10",-1,-1,"False" +"10AO","10AO","l10n_it_chart_template_generic","Iva al 10% indetraibile",,"0.1",,"True","percent",,,"purchase","template_impcode_pagata_10ind",,"template_impcode_pagata_10ind",,-1,,"False" +"10AOa","10AOa","l10n_it_chart_template_generic","Iva al 10% indetraibile (D)","2","0","10AO","False","balance","1601","1601","purchase",,"template_ivacode_pagata_10ind",,"template_ivacode_pagata_10ind",,-1,"False" +"10AOb","10AOb","l10n_it_chart_template_generic","Iva al 10% indetraibile (I)","1","1","10AO","False","percent",,,"purchase",,,,,,,"False" +"12a","12a","l10n_it_chart_template_generic","Iva 12% (debito)",,"0.12",,"False","percent","2601","2601","sale","template_impcode_riscossa_12","template_ivacode_riscossa_12","template_impcode_riscossa_12","template_ivacode_riscossa_12",-1,-1,"False" +"12b","12b","l10n_it_chart_template_generic","Iva 12% (credito)",,"0.12",,"False","percent","1601","1601","purchase","template_impcode_pagata_12","template_ivacode_pagata_12","template_impcode_pagata_12","template_ivacode_pagata_12",-1,-1,"False" +"2010","2010","l10n_it_chart_template_generic","Iva al 20% detraibile 10%",,"0.2",,"True","percent",,,"purchase","template_impcode_pagata_20det10",,"template_impcode_pagata_20det10",,-1,,"False" +"2010a","2010a","l10n_it_chart_template_generic","Iva al 20% detraibile 10% (D)","2","0","2010","False","balance","1601","1601","purchase",,"template_ivacode_pagata_20det10",,"template_ivacode_pagata_20det10",,-1,"False" +"2010b","2010b","l10n_it_chart_template_generic","Iva al 20% detraibile 10% (I)","1","0.9","2010","False","percent",,,"purchase",,,,,,,"False" +"2015","2015","l10n_it_chart_template_generic","Iva al 20% detraibile 15%",,"0.2",,"True","percent",,,"purchase","template_impcode_pagata_20det15",,"template_impcode_pagata_20det15",,-1,,"False" +"2015a","2015a","l10n_it_chart_template_generic","Iva al 20% detraibile 15% (D)","2","0","2015","False","balance","1601","1601","purchase",,"template_ivacode_pagata_20det15",,"template_ivacode_pagata_20det15",,-1,"False" +"2015b","2015b","l10n_it_chart_template_generic","Iva al 20% detraibile 15% (I)","1","0.85","2015","False","percent",,,"purchase",,,,,,,"False" +"2040","2040","l10n_it_chart_template_generic","Iva al 20% detraibile 40%",,"0.2",,"True","percent",,,"purchase","template_impcode_pagata_20det40",,"template_impcode_pagata_20det40",,-1,,"False" +"2040a","2040a","l10n_it_chart_template_generic","Iva al 20% detraibile 40% (D)","2","0","2040","False","balance","1601","1601","purchase",,"template_ivacode_pagata_20det40",,"template_ivacode_pagata_20det40",,-1,"False" +"2040b","2040b","l10n_it_chart_template_generic","Iva al 20% detraibile 40% (I)","1","0.6","2040","False","percent",,,"purchase",,,,,,,"False" +"20AO","20AO","l10n_it_chart_template_generic","Iva al 20% indetraibile",,"0.2",,"True","percent",,,"purchase","template_impcode_pagata_20ind",,"template_impcode_pagata_20ind",,-1,,"False" +"20AOa","20AOa","l10n_it_chart_template_generic","Iva al 20% indetraibile (D)","2","0","20AO","False","balance","1601","1601","purchase",,"template_ivacode_pagata_20ind",,"template_ivacode_pagata_20ind",,-1,"False" +"20AOb","20AOb","l10n_it_chart_template_generic","Iva al 20% indetraibile (I)","1","1","20AO","False","percent",,,"purchase",,,,,,,"False" +"20I5","20I5","l10n_it_chart_template_generic","IVA al 20% detraibile al 50%",,"0.2",,"True","percent",,,"purchase","template_impcode_pagata_20det50",,"template_impcode_pagata_20det50",,-1,,"False" +"20I5b","20I5b","l10n_it_chart_template_generic","IVA al 20% detraibile al 50% (I)","1","0.5","20I5","False","percent",,,"purchase",,,,,,,"False" +"20I5a","20I5a","l10n_it_chart_template_generic","IVA al 20% detraibile al 50% (D)","2","0","20I5","False","balance","1601","1601","purchase",,"template_ivacode_pagata_20det50",,"template_ivacode_pagata_20det50",,-1,"False" +"22a","22a","l10n_it_chart_template_generic","Iva 2% (debito)",,"0.02",,"False","percent","2601","2601","sale","template_impcode_riscossa_2","template_ivacode_riscossa_2","template_impcode_riscossa_2","template_ivacode_riscossa_2",-1,-1,"False" +"22b","22b","l10n_it_chart_template_generic","Iva 2% (credito)",,"0.02",,"False","percent","1601","1601","purchase","template_impcode_pagata_2","template_ivacode_pagata_2","template_impcode_pagata_2","template_ivacode_pagata_2",-1,-1,"False" +"4a","4a","l10n_it_chart_template_generic","Iva 4% (debito)",,"0.04",,"False","percent","2601","2601","sale","template_impcode_riscossa_4","template_ivacode_riscossa_4","template_impcode_riscossa_4","template_ivacode_riscossa_4",-1,-1,"False" +"4b","4b","l10n_it_chart_template_generic","Iva 4% (credito)",,"0.04",,"False","percent","1601","1601","purchase","template_impcode_pagata_4","template_ivacode_pagata_4","template_impcode_pagata_4","template_ivacode_pagata_4",-1,-1,"False" +"4AO","4AO","l10n_it_chart_template_generic","Iva al 4% indetraibile",,"0.04",,"True","percent",,,"purchase","template_impcode_pagata_4ind",,"template_impcode_pagata_4ind",,-1,,"False" +"4AOa","4AOa","l10n_it_chart_template_generic","Iva al 4% indetraibile (D)","2","0","4AO","False","balance","1601","1601","purchase",,"template_ivacode_pagata_4ind",,"template_ivacode_pagata_4ind",,-1,"False" +"4AOb","4AOb","l10n_it_chart_template_generic","Iva al 4% indetraibile (I)","1","1","4AO","False","percent",,,"purchase",,,,,,,"False" +"10I5","10I5","l10n_it_chart_template_generic","IVA al 10% detraibile al 50%",,"0.1",,"True","percent",,,"purchase","template_impcode_pagata_10det50",,"template_impcode_pagata_10det50",,-1,,"False" +"10I5a","10I5a","l10n_it_chart_template_generic","IVA al 10% detraibile al 50% (D)","2","0","10I5","False","balance","1601","1601","purchase",,"template_ivacode_pagata_10det50",,"template_ivacode_pagata_10det50",,-1,"False" +"10I5b","10I5b","l10n_it_chart_template_generic","IVA al 10% detraibile al 50% (I)","1","0.5","10I5","False","percent",,,"purchase",,,,,,,"False" +"4I5","4I5","l10n_it_chart_template_generic","IVA al 4% detraibile al 50%",,"0.04",,"True","percent",,,"purchase","template_impcode_pagata_4det50",,"template_impcode_pagata_4det50",,-1,,"False" +"4I5a","4I5a","l10n_it_chart_template_generic","IVA al 4% detraibile al 50% (D)","2","0","4I5","False","balance","1601","1601","purchase",,"template_ivacode_pagata_4det50",,"template_ivacode_pagata_4det50",,-1,"False" +"4I5b","4I5b","l10n_it_chart_template_generic","IVA al 4% detraibile al 50% (I)","1","0.5","4I5","False","percent",,,"purchase",,,,,,,"False" +"00a","00a","l10n_it_chart_template_generic","Esente IVA (debito)",,"0",,"False","percent","2601","2601","sale","template_impcode_riscossa_0","template_ivacode_riscossa_0","template_impcode_riscossa_0","template_ivacode_riscossa_0",-1,-1,"False" +"00b","00b","l10n_it_chart_template_generic","Esente IVA (credito)",,"0",,"False","percent","1601","1601","purchase","template_impcode_pagata_0","template_ivacode_pagata_0","template_impcode_pagata_0","template_ivacode_pagata_0",-1,-1,"False" +"20a INC","20a INC","l10n_it_chart_template_generic","Iva al 20% (debito) INC",,"0.2",,"False","percent","l10n_it.2601","l10n_it.2601","sale","l10n_it.template_impcode_riscossa_20","l10n_it.template_ivacode_riscossa_20","l10n_it.template_impcode_riscossa_20","l10n_it.template_ivacode_riscossa_20",-1,-1,"True" +"10a INC","10a INC","l10n_it_chart_template_generic","Iva al 10% (debito) INC",,"0.1",,"False","percent","l10n_it.2601","l10n_it.2601","sale","l10n_it.template_impcode_riscossa_10","l10n_it.template_ivacode_riscossa_10","l10n_it.template_impcode_riscossa_10","l10n_it.template_ivacode_riscossa_10",-1,-1,"True" +"12a INC","12a INC","l10n_it_chart_template_generic","Iva 12% (debito) INC",,"0.12",,"False","percent","l10n_it.2601","l10n_it.2601","sale","l10n_it.template_impcode_riscossa_12","l10n_it.template_ivacode_riscossa_12","l10n_it.template_impcode_riscossa_12","l10n_it.template_ivacode_riscossa_12",-1,-1,"True" +"22a INC","22a INC","l10n_it_chart_template_generic","Iva 2% (debito) INC",,"0.02",,"False","percent","l10n_it.2601","l10n_it.2601","sale","l10n_it.template_impcode_riscossa_2","l10n_it.template_ivacode_riscossa_2","l10n_it.template_impcode_riscossa_2","l10n_it.template_ivacode_riscossa_2",-1,-1,"True" +"4a INC","4a INC","l10n_it_chart_template_generic","Iva 4% (debito) INC",,"0.04",,"False","percent","l10n_it.2601","l10n_it.2601","sale","l10n_it.template_impcode_riscossa_4","l10n_it.template_ivacode_riscossa_4","l10n_it.template_impcode_riscossa_4","l10n_it.template_ivacode_riscossa_4",-1,-1,"True" +"00a INC","00a INC","l10n_it_chart_template_generic","Esente IVA (debito) INC",,"0",,"False","percent","l10n_it.2601","l10n_it.2601","sale","l10n_it.template_impcode_riscossa_0","l10n_it.template_ivacode_riscossa_0","l10n_it.template_impcode_riscossa_0","l10n_it.template_ivacode_riscossa_0",-1,-1,"True" diff --git a/addons/l10n_it/i18n/it.po b/addons/l10n_it/i18n/it.po index 817a7e64b77..de209ab08fc 100644 --- a/addons/l10n_it/i18n/it.po +++ b/addons/l10n_it/i18n/it.po @@ -1,174 +1,43 @@ -# Italian translation for openobject-addons -# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011 -# This file is distributed under the same license as the openobject-addons package. -# FIRST AUTHOR , 2011. +# Translation of OpenERP Server. +# This file contains the translation of the following modules: +# * l10n_it # msgid "" msgstr "" -"Project-Id-Version: openobject-addons\n" -"Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2011-01-07 06:04+0000\n" -"PO-Revision-Date: 2011-02-15 15:37+0000\n" -"Last-Translator: FULL NAME \n" -"Language-Team: Italian \n" +"Project-Id-Version: OpenERP Server 6.0.2\n" +"Report-Msgid-Bugs-To: support@openerp.com\n" +"POT-Creation-Date: 2011-08-11 20:06+0000\n" +"PO-Revision-Date: 2011-08-11 20:06+0000\n" +"Last-Translator: <>\n" +"Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-04-29 05:56+0000\n" -"X-Generator: Launchpad (build 12758)\n" - -#. module: l10n_it -#: model:ir.actions.report.xml,name:l10n_it.account_ita_libroIVA_debit -msgid "Registro acquisti" -msgstr "Registro acquisti" - -#. module: l10n_it -#: model:ir.actions.todo,note:l10n_it.config_call_account_template_generic -msgid "" -"Generate Chart of Accounts from a Chart Template. You will be asked to pass " -"the name of the company, the chart template to follow, the no. of digits to " -"generate the code for your accounts and Bank account, currency to create " -"Journals. Thus,the pure copy of chart Template is generated.\n" -"\tThis is the same wizard that runs from Financial " -"Management/Configuration/Financial Accounting/Financial Accounts/Generate " -"Chart of Accounts from a Chart Template." -msgstr "" -"Genera il Piano dei Conti da un Modello. Vi verrà richiesto di passare il " -"nome dell'azienda, il modello da seguire, il numero di decimali per generare " -"il codice dei tuoi conti e, per il conto della Banca, la valuta per creare " -"il Libro Giornale. Così una copia vergine del Piano dei Conti, derivatante " -"dal modello, viene generata.\n" -"\tQuesto è la stessa procedura automatica che viene lanciata da: Gestione " -"Finanziaria / Configurazione / Contabilità / Conti finanziari / Genera il " -"Piano dei conti da un modello." - -#. module: l10n_it -#: view:account.report_libroiva:0 -msgid "Anno Fiscale" -msgstr "Anno Fiscale" - -#. module: l10n_it -#: model:account.fiscal.position.template,name:l10n_it.it -msgid "Italia" -msgstr "Italia" - -#. module: l10n_it -#: report:l10n_it.report.libroIVA_credito:0 -#: report:l10n_it.report.libroIVA_debito:0 -msgid "REGISTRO IVA" -msgstr "REGISTRO IVA" - -#. module: l10n_it -#: report:l10n_it.report.libroIVA_credito:0 -#: report:l10n_it.report.libroIVA_debito:0 -msgid "Protocollo" -msgstr "Protocollo" - -#. module: l10n_it -#: model:account.fiscal.position.template,name:l10n_it.extra -msgid "Regime Extra comunitario" -msgstr "Regime Extra comunitario" - -#. module: l10n_it -#: report:l10n_it.report.libroIVA_credito:0 -msgid "VENDITE" -msgstr "VENDITE" - -#. module: l10n_it -#: report:l10n_it.report.libroIVA_credito:0 -#: report:l10n_it.report.libroIVA_debito:0 -msgid "Aliquota" -msgstr "Aliquota" - -#. module: l10n_it -#: field:account.report_libroiva,company_id:0 -msgid "Company" -msgstr "Azienda" - -#. module: l10n_it -#: field:account.report_libroiva,name:0 -msgid "Fiscal year" -msgstr "Anno fiscale" - -#. module: l10n_it -#: report:l10n_it.report.libroIVA_credito:0 -#: report:l10n_it.report.libroIVA_debito:0 -msgid "Numero" -msgstr "Numero" - -#. module: l10n_it -#: report:l10n_it.report.libroIVA_debito:0 -msgid "Fornitore" -msgstr "Fornitore" - -#. module: l10n_it -#: report:l10n_it.report.libroIVA_debito:0 -msgid "ACQUISTI" -msgstr "ACQUISTI" +"Content-Transfer-Encoding: \n" +"Plural-Forms: \n" #. module: l10n_it #: model:ir.module.module,description:l10n_it.module_meta_information -msgid "" -"\n" +msgid "\n" " Piano dei conti italiano di un'impresa generica\n" " " -msgstr "" -"\n" +msgstr "\n" " Piano dei conti italiano di un'impresa generica\n" " " -#. module: l10n_it -#: report:l10n_it.report.libroIVA_credito:0 -msgid "Cliente" -msgstr "Cliente" - -#. module: l10n_it -#: model:ir.actions.report.xml,name:l10n_it.account_ita_libroIVA_credit -msgid "Registro vendite" -msgstr "Registro vendite" - -#. module: l10n_it -#: report:l10n_it.report.libroIVA_credito:0 -#: report:l10n_it.report.libroIVA_debito:0 -msgid "Periodo" -msgstr "Periodo" - -#. module: l10n_it -#: view:account.report_libroiva:0 -#: model:ir.actions.act_window,name:l10n_it.l10n_chart_it_report_libroIVA_action -#: model:ir.ui.menu,name:l10n_it.menu_report_l10n_chart_it_libroIVA -msgid "Registri IVA" -msgstr "Registri IVA" - -#. module: l10n_it -#: report:l10n_it.report.libroIVA_credito:0 -#: report:l10n_it.report.libroIVA_debito:0 -msgid "Imposta" -msgstr "Imposta" - -#. module: l10n_it -#: model:account.fiscal.position.template,name:l10n_it.intra -msgid "Regime Intra comunitario" -msgstr "Regime Intra comunitario" - -#. module: l10n_it -#: report:l10n_it.report.libroIVA_credito:0 -#: report:l10n_it.report.libroIVA_debito:0 -msgid "Data fattura" -msgstr "Data fattura" - -#. module: l10n_it -#: report:l10n_it.report.libroIVA_credito:0 -#: report:l10n_it.report.libroIVA_debito:0 -msgid "Imponibile" -msgstr "Imponibile" - #. module: l10n_it #: model:ir.module.module,shortdesc:l10n_it.module_meta_information msgid "Italy - Generic Chart of Accounts" msgstr "Italia - Piano dei conti generico" #. module: l10n_it -#: model:ir.model,name:l10n_it.model_account_report_libroiva -msgid "SQL view for libro IVA" -msgstr "Vista SQL per registro IVA" +#: model:ir.actions.todo,note:l10n_it.config_call_account_template_generic +msgid "Generate Chart of Accounts from a Chart Template. You will be asked to pass the name of the company, the chart template to follow, the no. of digits to generate the code for your accounts and Bank account, currency to create Journals. Thus,the pure copy of chart Template is generated.\n" +" This is the same wizard that runs from Financial Management/Configuration/Financial Accounting/Financial Accounts/Generate Chart of Accounts from a Chart Template." +msgstr "Genera il piano dei conti da un template. Verrà chiesto di indicare il nome dell'azienda, il piano dei conti da seguire, il numero di cifre per generare il codice dei conti, la valuta per creare i sezionali. Quindi, una semplice copia del template verrà generata.\n" +" Questo è lo stesso wizard che viene eseguito da Contabilità/Configurazione/Contabilità Generale/Assetto finanziario della nuova azienda" + +#. module: l10n_it +#: model:ir.model,name:l10n_it.model_account_tax +msgid "account.tax" +msgstr "account.tax" + diff --git a/addons/l10n_it/i18n/l10n_it.pot b/addons/l10n_it/i18n/l10n_it.pot index 7f210e4cd75..1c46674bb28 100644 --- a/addons/l10n_it/i18n/l10n_it.pot +++ b/addons/l10n_it/i18n/l10n_it.pot @@ -4,10 +4,10 @@ # msgid "" msgstr "" -"Project-Id-Version: OpenERP Server 6.0.0-rc2\n" +"Project-Id-Version: OpenERP Server 6.0.2\n" "Report-Msgid-Bugs-To: support@openerp.com\n" -"POT-Creation-Date: 2011-01-07 06:04:30+0000\n" -"PO-Revision-Date: 2011-01-07 06:04:30+0000\n" +"POT-Creation-Date: 2011-08-11 20:06+0000\n" +"PO-Revision-Date: 2011-08-11 20:06+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -15,81 +15,6 @@ msgstr "" "Content-Transfer-Encoding: \n" "Plural-Forms: \n" -#. module: l10n_it -#: model:ir.actions.report.xml,name:l10n_it.account_ita_libroIVA_debit -msgid "Registro acquisti" -msgstr "" - -#. module: l10n_it -#: model:ir.actions.todo,note:l10n_it.config_call_account_template_generic -msgid "Generate Chart of Accounts from a Chart Template. You will be asked to pass the name of the company, the chart template to follow, the no. of digits to generate the code for your accounts and Bank account, currency to create Journals. Thus,the pure copy of chart Template is generated.\n" -" This is the same wizard that runs from Financial Management/Configuration/Financial Accounting/Financial Accounts/Generate Chart of Accounts from a Chart Template." -msgstr "" - -#. module: l10n_it -#: view:account.report_libroiva:0 -msgid "Anno Fiscale" -msgstr "" - -#. module: l10n_it -#: model:account.fiscal.position.template,name:l10n_it.it -msgid "Italia" -msgstr "" - -#. module: l10n_it -#: report:l10n_it.report.libroIVA_credito:0 -#: report:l10n_it.report.libroIVA_debito:0 -msgid "REGISTRO IVA" -msgstr "" - -#. module: l10n_it -#: report:l10n_it.report.libroIVA_credito:0 -#: report:l10n_it.report.libroIVA_debito:0 -msgid "Protocollo" -msgstr "" - -#. module: l10n_it -#: model:account.fiscal.position.template,name:l10n_it.extra -msgid "Regime Extra comunitario" -msgstr "" - -#. module: l10n_it -#: report:l10n_it.report.libroIVA_credito:0 -msgid "VENDITE" -msgstr "" - -#. module: l10n_it -#: report:l10n_it.report.libroIVA_credito:0 -#: report:l10n_it.report.libroIVA_debito:0 -msgid "Aliquota" -msgstr "" - -#. module: l10n_it -#: field:account.report_libroiva,company_id:0 -msgid "Company" -msgstr "" - -#. module: l10n_it -#: field:account.report_libroiva,name:0 -msgid "Fiscal year" -msgstr "" - -#. module: l10n_it -#: report:l10n_it.report.libroIVA_credito:0 -#: report:l10n_it.report.libroIVA_debito:0 -msgid "Numero" -msgstr "" - -#. module: l10n_it -#: report:l10n_it.report.libroIVA_debito:0 -msgid "Fornitore" -msgstr "" - -#. module: l10n_it -#: report:l10n_it.report.libroIVA_debito:0 -msgid "ACQUISTI" -msgstr "" - #. module: l10n_it #: model:ir.module.module,description:l10n_it.module_meta_information msgid "\n" @@ -97,59 +22,19 @@ msgid "\n" " " msgstr "" -#. module: l10n_it -#: report:l10n_it.report.libroIVA_credito:0 -msgid "Cliente" -msgstr "" - -#. module: l10n_it -#: model:ir.actions.report.xml,name:l10n_it.account_ita_libroIVA_credit -msgid "Registro vendite" -msgstr "" - -#. module: l10n_it -#: report:l10n_it.report.libroIVA_credito:0 -#: report:l10n_it.report.libroIVA_debito:0 -msgid "Periodo" -msgstr "" - -#. module: l10n_it -#: view:account.report_libroiva:0 -#: model:ir.actions.act_window,name:l10n_it.l10n_chart_it_report_libroIVA_action -#: model:ir.ui.menu,name:l10n_it.menu_report_l10n_chart_it_libroIVA -msgid "Registri IVA" -msgstr "" - -#. module: l10n_it -#: report:l10n_it.report.libroIVA_credito:0 -#: report:l10n_it.report.libroIVA_debito:0 -msgid "Imposta" -msgstr "" - -#. module: l10n_it -#: model:account.fiscal.position.template,name:l10n_it.intra -msgid "Regime Intra comunitario" -msgstr "" - -#. module: l10n_it -#: report:l10n_it.report.libroIVA_credito:0 -#: report:l10n_it.report.libroIVA_debito:0 -msgid "Data fattura" -msgstr "" - -#. module: l10n_it -#: report:l10n_it.report.libroIVA_credito:0 -#: report:l10n_it.report.libroIVA_debito:0 -msgid "Imponibile" -msgstr "" - #. module: l10n_it #: model:ir.module.module,shortdesc:l10n_it.module_meta_information msgid "Italy - Generic Chart of Accounts" msgstr "" #. module: l10n_it -#: model:ir.model,name:l10n_it.model_account_report_libroiva -msgid "SQL view for libro IVA" +#: model:ir.actions.todo,note:l10n_it.config_call_account_template_generic +msgid "Generate Chart of Accounts from a Chart Template. You will be asked to pass the name of the company, the chart template to follow, the no. of digits to generate the code for your accounts and Bank account, currency to create Journals. Thus,the pure copy of chart Template is generated.\n" +" This is the same wizard that runs from Financial Management/Configuration/Financial Accounting/Financial Accounts/Generate Chart of Accounts from a Chart Template." +msgstr "" + +#. module: l10n_it +#: model:ir.model,name:l10n_it.model_account_tax +msgid "account.tax" msgstr "" diff --git a/addons/l10n_it/libroIVA.py b/addons/l10n_it/libroIVA.py deleted file mode 100644 index a78c81ffdb3..00000000000 --- a/addons/l10n_it/libroIVA.py +++ /dev/null @@ -1,54 +0,0 @@ -# -*- encoding: utf-8 -*- -############################################################################## -# -# OpenERP, Open Source Management Solution -# Copyright (C) 2010 -# Italian OpenERP Community () -# Servabit srl -# Agile Business Group sagl -# Domsense srl -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as -# published by the Free Software Foundation, either version 3 of the -# License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see . -# -############################################################################## - - -# ################################################################################## -# Questa vista SQL viene usata solo per far scegliere l'anno di pianificazione all'utente -# Viene infatti costruita una vista XML di tipo tree che contiene solo i diversi anni per i quali stata fatta almeno una pianificazione -# ################################################################################## - -from osv import fields, osv - -class l10n_chart_it_report_libroIVA (osv.osv): - _name = "account.report_libroiva" - _description = "SQL view for libro IVA" - _auto = False - _rec_name = "name" - #_order = "fiscal_year"; - - _columns = { - 'name': fields.char('Fiscal year',size=64), - 'company_id': fields.many2one('res.company', 'Company'), - } - - def init (self, cr) : - cr.execute("""DROP VIEW IF EXISTS account_report_libroiva""") - cr.execute(""" - CREATE VIEW account_report_libroiva AS ( - SELECT id, name, company_id FROM account_fiscalyear - )""") -l10n_chart_it_report_libroIVA() - - diff --git a/addons/l10n_it/libroIVA_menu.xml b/addons/l10n_it/libroIVA_menu.xml deleted file mode 100644 index 51e581ac11c..00000000000 --- a/addons/l10n_it/libroIVA_menu.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - diff --git a/addons/l10n_it/libroIVA_view.xml b/addons/l10n_it/libroIVA_view.xml deleted file mode 100644 index bbc905e6da0..00000000000 --- a/addons/l10n_it/libroIVA_view.xml +++ /dev/null @@ -1,47 +0,0 @@ - - - - - - - l10n_chart_it_report_libroIVA_tree - account.report_libroiva - tree - - - - - - - - - - - l10n_chart_it_report_libroIVA_form - account.report_libroiva - form - -
- - -
-
- - - - Registri IVA - account.report_libroiva - - form - tree,form - - - -
-
diff --git a/addons/l10n_it/report.xml b/addons/l10n_it/report.xml deleted file mode 100644 index e0ba4a33daf..00000000000 --- a/addons/l10n_it/report.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - - diff --git a/addons/l10n_it/report/__init__.py b/addons/l10n_it/report/__init__.py deleted file mode 100644 index be32155c675..00000000000 --- a/addons/l10n_it/report/__init__.py +++ /dev/null @@ -1,2 +0,0 @@ -import libroIVA_credito -import libroIVA_debito \ No newline at end of file diff --git a/addons/l10n_it/report/libroIVA_credito.py b/addons/l10n_it/report/libroIVA_credito.py deleted file mode 100644 index b48c81d2475..00000000000 --- a/addons/l10n_it/report/libroIVA_credito.py +++ /dev/null @@ -1,79 +0,0 @@ -import datetime -import time -from report import report_sxw -from osv import osv -import pooler - - -class l10n_chart_it_report_libroIVA_credito(report_sxw.rml_parse): - - def __init__(self, cr, uid, name, context): - super(l10n_chart_it_report_libroIVA_credito,self).__init__(cr,uid,name,context) - self.localcontext.update({ - 'time' : time, - 'get_company' : self.get_company, - 'get_periods' : self.get_periods, - 'get_lines' : self.get_lines, - }) - - - def get_company(self,fiscal_year): - #print 'COMP = ',fiscal_year - return "" - - def get_periods(self,fiscal_year): - #print 'Fiscal year id:',fiscal_year.id - obj=pooler.get_pool(self.cr.dbname).get('account.fiscalyear') - fy=obj.browse(self.cr,self.uid,fiscal_year.id) - #print 'Periods = ',fy.period_ids - res=[rec for rec in fy.period_ids] - #return fy.periods => non funziona?!? bool object !?!? - return res - - def get_invoices(self,period): - #print 'PERIOD = ',period.name - obj=pooler.get_pool(self.cr.dbname).get('account.invoice') - # Selezione tutte le fatture emesse nel periodo - self.cr.execute( """ - SELECT id FROM account_invoice - WHERE (state='open' OR state='paid') AND - period_id="""+str(period.id)+""" - AND (type='out_invoice' OR type='out_refund') - """) - ids=self.cr.fetchall() - #print 'IDS = ', - if ids: - ids=[id[0] for id in ids ] - invoices=obj.browse(self.cr,self.uid,ids) - #print 'INVOICES = ',invoices - return invoices - - def get_lines(self,fiscal_year): - res=[] - obj_fy=pooler.get_pool(self.cr.dbname).get('account.fiscalyear') - fy=obj_fy.browse(self.cr,self.uid,fiscal_year.id) - for period in fy.period_ids: - invoices=self.get_invoices(period) - for invoice in invoices: - d={'periodo': period.name} - d['protocollo']=invoice.number - #print 'PARTNER ',invoice.partner_id.name - causale=invoice.partner_id.name - #print 'CAUSALE = ',causale - d['causale']=causale - d['numero']=invoice.reference - d['data_doc']=invoice.date_invoice - for tax in invoice.tax_line: - #print '\tTAX: ',tax - d['aliquota']=tax.tax_code_id.name - d['imponibile']=tax.base - d['imposta']=tax.amount - res.append(d) - d={'periodo':'', 'protocollo':'', 'causale':'', 'numero':'', 'data_doc':'', } - return res - - - -report_sxw.report_sxw('report.l10n_it.report.libroIVA_credito','account.report_libroiva', - 'l10n_it/report/libroIVA_credito.rml', - parser=l10n_chart_it_report_libroIVA_credito,header=False) diff --git a/addons/l10n_it/report/libroIVA_credito.rml b/addons/l10n_it/report/libroIVA_credito.rml deleted file mode 100644 index 2b282f760b4..00000000000 --- a/addons/l10n_it/report/libroIVA_credito.rml +++ /dev/null @@ -1,203 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - [[ repeatIn(objects, 'o') ]] - - - - - [[ get_company(o) ]] - - - - - REGISTRO IVA - - - VENDITE - - - - - - - - [[ o.name ]] - - - - - - - Periodo - - - Protocollo - - - Cliente - - - Numero - - - Data fattura - - - Aliquota - - - Imponibile - - - Imposta - - - - - [[ repeatIn(get_lines(o), 'line') ]] - [[ line['periodo'] ]] - - - [[ line['protocollo'] ]] - - - [[ line['causale'] ]] - - - [[ line['numero'] ]] - - - [[ line['data_doc'] ]] - - - [[ line['aliquota'] ]] - - - [[ line['imponibile'] ]] - - - [[ line['imposta'] ]] - - - - - - - - - - - - - - - diff --git a/addons/l10n_it/report/libroIVA_debito.py b/addons/l10n_it/report/libroIVA_debito.py deleted file mode 100644 index c7720ab69a1..00000000000 --- a/addons/l10n_it/report/libroIVA_debito.py +++ /dev/null @@ -1,80 +0,0 @@ -import datetime -import time -from report import report_sxw -from osv import osv -import pooler - - -class l10n_chart_it_report_libroIVA_debito(report_sxw.rml_parse): - - def __init__(self, cr, uid, name, context): - super(l10n_chart_it_report_libroIVA_debito,self).__init__(cr,uid,name,context) - self.localcontext.update({ - 'time' : time, - 'get_company' : self.get_company, - 'get_periods' : self.get_periods, - 'get_lines' : self.get_lines, - }) - - - def get_company(self,fiscal_year): - #print 'COMP = ',fiscal_year - return "" - - - def get_periods(self,fiscal_year): - #print 'Fiscal year id:',fiscal_year.id - obj=pooler.get_pool(self.cr.dbname).get('account.fiscalyear') - fy=obj.browse(self.cr,self.uid,fiscal_year.id) - #print 'Periods = ',fy.period_ids - res=[rec for rec in fy.period_ids] - #return fy.periods => non funziona?!? bool object !?!? - return res - - def get_invoices(self,period): - #print 'PERIOD = ',period.name - obj=pooler.get_pool(self.cr.dbname).get('account.invoice') - # Selezione tutte le fatture emesse nel periodo - self.cr.execute( """ - SELECT id FROM account_invoice - WHERE (state='open' OR state='paid') AND - period_id="""+str(period.id)+""" - AND (type='in_invoice' OR type='in_refund') - """) - ids=self.cr.fetchall() - #print 'IDS = ', - if ids: - ids=[id[0] for id in ids ] - invoices=obj.browse(self.cr,self.uid,ids) - #print 'INVOICES = ',invoices - return invoices - - def get_lines(self,fiscal_year): - res=[] - obj_fy=pooler.get_pool(self.cr.dbname).get('account.fiscalyear') - fy=obj_fy.browse(self.cr,self.uid,fiscal_year.id) - for period in fy.period_ids: - invoices=self.get_invoices(period) - for invoice in invoices: - d={'periodo': period.name} - d['protocollo']=invoice.number - #print 'PARTNER ',invoice.partner_id.name - causale=invoice.partner_id.name - #print 'CAUSALE = ',causale - d['causale']=causale - d['numero']=invoice.reference - d['data_doc']=invoice.date_invoice - for tax in invoice.tax_line: - #print '\tTAX: ',tax - d['aliquota']=tax.tax_code_id.name - d['imponibile']=tax.base - d['imposta']=tax.amount - res.append(d) - d={'periodo':'', 'protocollo':'', 'causale':'', 'numero':'', 'data_doc':'', } - return res - - - -report_sxw.report_sxw('report.l10n_it.report.libroIVA_debito','account.report_libroiva', - 'l10n_it/report/libroIVA_debito.rml', - parser=l10n_chart_it_report_libroIVA_debito,header=False) diff --git a/addons/l10n_it/report/libroIVA_debito.rml b/addons/l10n_it/report/libroIVA_debito.rml deleted file mode 100644 index ced847722af..00000000000 --- a/addons/l10n_it/report/libroIVA_debito.rml +++ /dev/null @@ -1,195 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - [[ repeatIn(objects, 'o') ]] - - - - - [[ get_company(o) ]] - - - - - REGISTRO IVA - - - ACQUISTI - - - - - - - - [[ o.name ]] - - - - - - - Periodo - - - Protocollo - - - Fornitore - - - Numero - - - Data fattura - - - Aliquota - - - Imponibile - - - Imposta - - - - - [[ repeatIn(get_lines(o), 'line') ]] - [[ line['periodo'] ]] - - - [[ line['protocollo'] ]] - - - [[ line['causale'] ]] - - - [[ line['numero'] ]] - - - [[ line['data_doc'] ]] - - - [[ line['aliquota'] ]] - - - [[ line['imponibile'] ]] - - - [[ line['imposta'] ]] - - - - - - - - - - - - diff --git a/addons/l10n_it/report/normalized_oo2rml.xsl b/addons/l10n_it/report/normalized_oo2rml.xsl deleted file mode 100644 index 14fcf598e54..00000000000 --- a/addons/l10n_it/report/normalized_oo2rml.xsl +++ /dev/null @@ -1,696 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - ( - - , - - ) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1 - - - - - - - - - - - - - - - - - - - - - - - - - , - - - - - - - - - - - - - - - - - - - -
- -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - white - - - - - - - - - - - ......... - - - - - - - - - - - - - 15 - 0 - - - - - - - - - - 6 - - - - - - ZapfDingbats - l - - - - - - - - - - - - - - - . - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - yes - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - LEFT - - - CENTER - - - RIGHT - - - JUSTIFY - - - - - - - - - - - - - - - - - - - - - - - - - - - Courier-BoldOblique - - - Courier-Bold - - - Courier-Oblique - - - Courier - - - - - - - Helvetica-BoldOblique - - - Helvetica-Bold - - - Helvetica-Oblique - - - Helvetica - - - - - - - Times-BoldItalic - - - Times-Bold - - - Times-Italic - - - Times-Roman - - - - - - - - Times-Roman - - - - - - - - - - - - - - - - -
- - diff --git a/addons/l10n_it/security/ir.model.access.csv b/addons/l10n_it/security/ir.model.access.csv deleted file mode 100644 index 8a8908511db..00000000000 --- a/addons/l10n_it/security/ir.model.access.csv +++ /dev/null @@ -1,3 +0,0 @@ -"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink" -"access_l10n_it_report_manager","l10n_it.report account manager","model_account_report_libroiva","account.group_account_manager",1,1,1,1 -"access_l10n_it_report_user","l10n_it_report account user","model_account_report_libroiva","account.group_account_user",1,1,1,1 From 9a4bc3fe0d51d1b45fc83035fee8409642f0fd9b Mon Sep 17 00:00:00 2001 From: eLBati Date: Sat, 3 Sep 2011 13:01:35 +0200 Subject: [PATCH 02/41] [FIX] internal type of tax authority account bzr revid: lorenzo.battistini@agilebg.com-20110903110135-93slbgpt17cf2f5l --- .../l10n_it/data/account.account.template.csv | 466 +++++++++--------- 1 file changed, 233 insertions(+), 233 deletions(-) diff --git a/addons/l10n_it/data/account.account.template.csv b/addons/l10n_it/data/account.account.template.csv index ff91ccba79a..d31d42180d0 100644 --- a/addons/l10n_it/data/account.account.template.csv +++ b/addons/l10n_it/data/account.account.template.csv @@ -1,234 +1,234 @@ "id","code","name","parent_id:id","user_type:id","type","reconcile" -0,0,"Azienda",,"account_type_view","view",FALSE -1,1,"ATTIVO ",0,"account_type_view","view",TRUE -11,11,"IMMOBILIZZAZIONI IMMATERIALI ",1,"account_type_view","view",TRUE -1101,1101,"costi di impianto ",11,"account_type_view","other",TRUE -1106,1106,"software ",11,"account_type_view","other",TRUE -1108,1108,"avviamento ",11,"account_type_view","other",TRUE -1111,1111,"fondo ammortamento costi di impianto ",11,"account_type_view","other",TRUE -1116,1116,"fondo ammortamento software ",11,"account_type_view","other",TRUE -1118,1118,"fondo ammortamento avviamento ",11,"account_type_view","other",TRUE -12,12,"IMMOBILIZZAZIONI MATERIALI ",1,"account_type_view","view",TRUE -1201,1201,"fabbricati ",12,"account_type_view","other",TRUE -1202,1202,"impianti e macchinari ",12,"account_type_view","other",TRUE -1204,1204,"attrezzature commerciali ",12,"account_type_view","other",TRUE -1205,1205,"macchine d'ufficio ",12,"account_type_view","other",TRUE -1206,1206,"arredamento ",12,"account_type_view","other",TRUE -1207,1207,"automezzi ",12,"account_type_view","other",TRUE -1208,1208,"imballaggi durevoli ",12,"account_type_view","other",TRUE -1211,1211,"fondo ammortamento fabbricati ",12,"account_type_view","other",TRUE -1212,1212,"fondo ammortamento impianti e macchinari ",12,"account_type_view","other",TRUE -1214,1214,"fondo ammortamento attrezzature commerciali ",12,"account_type_view","other",TRUE -1215,1215,"fondo ammortamento macchine d'ufficio ",12,"account_type_view","other",TRUE -1216,1216,"fondo ammortamento arredamento ",12,"account_type_view","other",TRUE -1217,1217,"fondo ammortamento automezzi ",12,"account_type_view","other",TRUE -1218,1218,"fondo ammortamento imballaggi durevoli ",12,"account_type_view","other",TRUE -1220,1220,"fornitori immobilizzazioni c/acconti ",12,"account_type_view","other",TRUE -13,13,"IMMOBILIZZAZIONI FINANZIARIE ",1,"account_type_view","view",TRUE -1301,1301,"mutui attivi ",13,"account_type_view","other",TRUE -14,14,"RIMANENZE ",1,"account_type_view","view",TRUE -1401,1401,"materie di consumo ",14,"account_type_view","other",TRUE -1404,1404,"merci ",14,"account_type_view","other",TRUE -1410,1410,"fornitori c/acconti ",14,"account_type_view","other",TRUE -15,15,"CREDITI COMMERCIALI ",1,"account_type_view","view",TRUE -1501,1501,"crediti v/clienti ",15,"account_type_receivable","receivable",TRUE -1502,1502,"crediti commerciali diversi ",15,"account_type_receivable","other",TRUE -1503,1503,"clienti c/spese anticipate ",15,"account_type_receivable","receivable",TRUE -1505,1505,"cambiali attive ",15,"account_type_receivable","other",TRUE -1506,1506,"cambiali allo sconto ",15,"account_type_receivable","other",TRUE -1507,1507,"cambiali all'incasso ",15,"account_type_receivable","other",TRUE -1509,1509,"fatture da emettere ",15,"account_type_receivable","other",TRUE -1510,1510,"crediti insoluti ",15,"account_type_receivable","other",TRUE -1511,1511,"cambiali insolute ",15,"account_type_receivable","other",TRUE -1531,1531,"crediti da liquidare ",15,"account_type_receivable","other",TRUE -1540,1540,"fondo svalutazione crediti ",15,"account_type_receivable","other",TRUE -1541,1541,"fondo rischi su crediti ",15,"account_type_receivable","other",TRUE -16,16,"CREDITI DIVERSI ",1,"account_type_view","view",TRUE -1601,1601,"IVA n/credito ",16,"account_type_receivable","other",TRUE -1602,1602,"IVA c/acconto ",16,"account_type_receivable","other",TRUE -1605,1605,"crediti per IVA ",16,"account_type_receivable","other",TRUE -1607,1607,"imposte c/acconto ",16,"account_type_receivable","other",TRUE -1608,1608,"crediti per imposte ",16,"account_type_receivable","other",TRUE -1609,1609,"crediti per ritenute subite ",16,"account_type_receivable","other",TRUE -1610,1610,"crediti per cauzioni ",16,"account_type_receivable","other",TRUE -1620,1620,"personale c/acconti ",16,"account_type_receivable","other",TRUE -1630,1630,"crediti v/istituti previdenziali ",16,"account_type_receivable","other",TRUE -1640,1640,"debitori diversi ",16,"account_type_receivable","receivable",TRUE -18,18,"DISPONIBILITÀ LIQUIDE ",1,"account_type_view","view",TRUE -1801,1801,"banche c/c ",18,"account_type_bank","liquidity",TRUE -1810,1810,"c/c postali ",18,"account_type_cash","liquidity",TRUE -1820,1820,"denaro in cassa ",18,"account_type_cash","liquidity",TRUE -1821,1821,"assegni ",18,"account_type_cash","liquidity",TRUE -1822,1822,"valori bollati ",18,"account_type_cash","liquidity",TRUE -19,19,"RATEI E RISCONTI ATTIVI ",1,"account_type_view","view",TRUE -1901,1901,"ratei attivi ",19,"account_type_view","other",TRUE -1902,1902,"risconti attivi ",19,"account_type_view","other",TRUE -2,2,"PASSIVO ",0,"account_type_view","view",TRUE -20,20,"PATRIMONIO NETTO ",2,"account_type_view","view",TRUE -2101,2101,"patrimonio netto ",20,"account_type_view","other",TRUE -2102,2102,"utile d'esercizio ",20,"account_type_view","receivable",TRUE -2103,2103,"perdita d'esercizio ",20,"account_type_view","payable",TRUE -2104,2104,"prelevamenti extra gestione ",20,"account_type_view","other",TRUE -2105,2105,"titolare c/ritenute subite ",20,"account_type_view","other",TRUE -22,22,"FONDI PER RISCHI E ONERI ",2,"account_type_view","view",TRUE -2201,2201,"fondo per imposte ",22,"account_type_view","other",TRUE -2204,2204,"fondo responsabilità civile ",22,"account_type_view","other",TRUE -2205,2205,"fondo spese future ",22,"account_type_view","other",TRUE -2211,2211,"fondo manutenzioni programmate ",22,"account_type_view","other",TRUE -23,23,"TRATTAMENTO FINE RAPPORTO DI LAVORO ",2,"account_type_view","view",TRUE -2301,2301,"debiti per TFRL ",23,"account_type_view","other",TRUE -24,24,"DEBITI FINANZIARI ",2,"account_type_view","view",TRUE -2410,2410,"mutui passivi ",24,"account_type_payable","other",TRUE -2411,2411,"banche c/sovvenzioni ",24,"account_type_payable","other",TRUE -2420,2420,"banche c/c passivi ",24,"account_type_payable","other",TRUE -2421,2421,"banche c/RIBA all'incasso ",24,"account_type_payable","other",TRUE -2422,2422,"banche c/cambiali all'incasso ",24,"account_type_payable","other",TRUE -2423,2423,"banche c/anticipi su fatture ",24,"account_type_payable","other",TRUE -2440,2440,"debiti v/altri finanziatori ",24,"account_type_payable","other",TRUE -25,25,"DEBITI COMMERCIALI ",2,"account_type_view","view",TRUE -2501,2501,"debiti v/fornitori ",25,"account_type_payable","payable",TRUE -2503,2503,"cambiali passive ",25,"account_type_payable","other",TRUE -2520,2520,"fatture da ricevere ",25,"account_type_payable","other",TRUE -2521,2521,"debiti da liquidare ",25,"account_type_payable","other",TRUE -2530,2530,"clienti c/acconti ",25,"account_type_payable","payable",TRUE -26,26,"DEBITI DIVERSI ",2,"account_type_view","view",TRUE -2601,2601,"IVA n/debito ",26,"account_type_payable","other",TRUE -2602,2602,"debiti per ritenute da versare ",26,"account_type_payable","other",TRUE -2605,2605,"erario c/IVA ",26,"account_type_payable","other",TRUE -2606,2606,"debiti per imposte ",26,"account_type_payable","other",TRUE -2619,2619,"debiti per cauzioni ",26,"account_type_payable","other",TRUE -2620,2620,"personale c/retribuzioni ",26,"account_type_payable","other",TRUE -2621,2621,"personale c/liquidazioni ",26,"account_type_payable","other",TRUE -2622,2622,"clienti c/cessione ",26,"account_type_payable","other",TRUE -2630,2630,"debiti v/istituti previdenziali ",26,"account_type_payable","other",TRUE -2640,2640,"creditori diversi ",26,"account_type_payable","payable",TRUE -27,27,"RATEI E RISCONTI PASSIVI ",2,"account_type_view","view",TRUE -2701,2701,"ratei passivi ",27,"account_type_view","other",TRUE -2702,2702,"risconti passivi ",27,"account_type_view","other",TRUE -28,28,"CONTI TRANSITORI E DIVERSI ",2,"account_type_view","view",TRUE -2801,2801,"bilancio di apertura ",28,"account_type_view","other",TRUE -2802,2802,"bilancio di chiusura ",28,"account_type_view","other",TRUE -2810,2810,"IVA c/liquidazioni ",28,"account_type_view","other",TRUE -2811,2811,"istituti previdenziali ",28,"account_type_view","other",TRUE -2820,2820,"banca ... c/c ",28,"account_type_view","other",TRUE -2821,2821,"banca ... c/c ",28,"account_type_view","other",TRUE -2822,2822,"banca ... c/c ",28,"account_type_view","other",TRUE -29,29,"CONTI DEI SISTEMI SUPPLEMENTARI ",2,"account_type_view","view",TRUE -2901,2901,"beni di terzi ",29,"account_type_view","other",TRUE -2902,2902,"depositanti beni ",29,"account_type_view","other",TRUE -2911,2911,"merci da ricevere ",29,"account_type_view","other",TRUE -2912,2912,"fornitori c/impegni ",29,"account_type_view","other",TRUE -2913,2913,"impegni per beni in leasing ",29,"account_type_view","other",TRUE -2914,2914,"creditori c/leasing ",29,"account_type_view","other",TRUE -2916,2916,"clienti c/impegni ",29,"account_type_view","other",TRUE -2917,2917,"merci da consegnare ",29,"account_type_view","other",TRUE -2921,2921,"rischi per effetti scontati ",29,"account_type_view","other",TRUE -2922,2922,"banche c/effetti scontati ",29,"account_type_view","other",TRUE -2926,2926,"rischi per fideiussioni ",29,"account_type_view","other",TRUE -2927,2927,"creditori per fideiussioni ",29,"account_type_view","other",TRUE -2931,2931,"rischi per avalli ",29,"account_type_view","other",TRUE -2932,2932,"creditori per avalli ",29,"account_type_view","other",TRUE -3,3,"VALORE DELLA PRODUZIONE ",0,"account_type_view","view",TRUE -31,31,"VENDITE E PRESTAZIONI ",3,"account_type_view","view",TRUE -3101,3101,"merci c/vendite ",31,"account_type_income","other",TRUE -3103,3103,"rimborsi spese di vendita ",31,"account_type_income","other",TRUE -3110,3110,"resi su vendite ",31,"account_type_income","other",TRUE -3111,3111,"ribassi e abbuoni passivi ",31,"account_type_income","other",TRUE -3112,3112,"premi su vendite ",31,"account_type_income","other",TRUE -32,32,"RICAVI E PROVENTI DIVERSI ",3,"account_type_view","view",TRUE -3201,3201,"fitti attivi ",32,"account_type_income","other",TRUE -3202,3202,"proventi vari ",32,"account_type_income","other",TRUE -3210,3210,"arrotondamenti attivi ",32,"account_type_income","other",TRUE -3220,3220,"plusvalenze ordinarie diverse ",32,"account_type_income","other",TRUE -3230,3230,"sopravvenienze attive ordinarie diverse ",32,"account_type_income","other",TRUE -3240,3240,"insussistenze attive ordinarie diverse ",32,"account_type_income","other",TRUE -4,4,"COSTI DELLA PRODUZIONE ",0,"account_type_view","view",TRUE -41,41,"COSTO DEL VENDUTO ",4,"account_type_view","view",TRUE -4101,4101,"merci c/acquisti ",41,"account_type_expense","other",TRUE -4102,4102,"materie di consumo c/acquisti ",41,"account_type_expense","other",TRUE -4105,4105,"merci c/apporti ",41,"account_type_expense","other",TRUE -4110,4110,"resi su acquisti ",41,"account_type_expense","other",TRUE -4111,4111,"ribassi e abbuoni attivi ",41,"account_type_expense","other",TRUE -4112,4112,"premi su acquisti ",41,"account_type_expense","other",TRUE -4121,4121,"merci c/esistenze iniziali ",41,"account_type_expense","other",TRUE -4122,4122,"materie di consumo c/esistenze iniziali ",41,"account_type_expense","other",TRUE -4131,4131,"merci c/rimanenze finali ",41,"account_type_expense","other",TRUE -4132,4132,"materie di consumo c/rimanenze finali ",41,"account_type_expense","other",TRUE -42,42,"COSTI PER SERVIZI ",4,"account_type_view","view",TRUE -4201,4201,"costi di trasporto ",42,"account_type_expense","other",TRUE -4202,4202,"costi per energia ",42,"account_type_expense","other",TRUE -4203,4203,"costi di pubblicità ",42,"account_type_expense","other",TRUE -4204,4204,"costi di consulenze ",42,"account_type_expense","other",TRUE -4205,4205,"costi postali ",42,"account_type_expense","other",TRUE -4206,4206,"costi telefonici ",42,"account_type_expense","other",TRUE -4207,4207,"costi di assicurazione ",42,"account_type_expense","other",TRUE -4208,4208,"costi di vigilanza ",42,"account_type_expense","other",TRUE -4209,4209,"costi per i locali ",42,"account_type_expense","other",TRUE -4210,4210,"costi di esercizio automezzi ",42,"account_type_expense","other",TRUE -4211,4211,"costi di manutenzione e riparazione ",42,"account_type_expense","other",TRUE -4212,4212,"provvigioni passive ",42,"account_type_expense","other",TRUE -4213,4213,"spese di incasso ",42,"account_type_expense","other",TRUE -43,43,"COSTI PER GODIMENTO BENI DI TERZI ",4,"account_type_view","view",TRUE -4301,4301,"fitti passivi ",43,"account_type_expense","other",TRUE -4302,4302,"canoni di leasing ",43,"account_type_expense","other",TRUE -44,44,"COSTI PER IL PERSONALE ",4,"account_type_view","view",TRUE -4401,4401,"salari e stipendi ",44,"account_type_expense","other",TRUE -4402,4402,"oneri sociali ",44,"account_type_expense","other",TRUE -4403,4403,"TFRL ",44,"account_type_expense","other",TRUE -4404,4404,"altri costi per il personale ",44,"account_type_expense","other",TRUE -45,45,"AMMORTAMENTI IMMOBILIZZAZIONI IMMATERIALI ",4,"account_type_view","view",TRUE -4501,4501,"ammortamento costi di impianto ",45,"account_type_view","other",TRUE -4506,4506,"ammortamento software ",45,"account_type_view","other",TRUE -4508,4508,"ammortamento avviamento ",45,"account_type_view","other",TRUE -46,46,"AMMORTAMENTI IMMOBILIZZAZIONI MATERIALI ",4,"account_type_view","view",TRUE -4601,4601,"ammortamento fabbricati ",46,"account_type_view","other",TRUE -4602,4602,"ammortamento impianti e macchinari ",46,"account_type_view","other",TRUE -4604,4604,"ammortamento attrezzature commerciali ",46,"account_type_view","other",TRUE -4605,4605,"ammortamento macchine d'ufficio ",46,"account_type_view","other",TRUE -4606,4606,"ammortamento arredamento ",46,"account_type_view","other",TRUE -4607,4607,"ammortamento automezzi ",46,"account_type_view","other",TRUE -4608,4608,"ammortamento imballaggi durevoli ",46,"account_type_view","other",TRUE -47,47,"SVALUTAZIONI ",4,"account_type_view","view",TRUE -4701,4701,"svalutazioni immobilizzazioni immateriali ",47,"account_type_view","other",TRUE -4702,4702,"svalutazioni immobilizzazioni materiali ",47,"account_type_view","other",TRUE -4706,4706,"svalutazione crediti ",47,"account_type_view","other",TRUE -48,48,"ACCANTONAMENTI ",4,"account_type_view","view",TRUE -481,481,"ACCANTONAMENTI PER RISCHI ",48,"account_type_view","view",TRUE -4814,4814,"accantonamento per responsabilità civile ",481,"account_type_view","other",TRUE -482,482,"ALTRI ACCANTONAMENTI ",48,"account_type_view","view",TRUE -4821,4821,"accantonamento per spese future ",482,"account_type_view","other",TRUE -4823,4823,"accantonamento per manutenzioni programmate ",482,"account_type_view","other",TRUE -49,49,"ONERI DIVERSI ",4,"account_type_view","view",TRUE -4901,4901,"oneri fiscali diversi ",49,"account_type_view","other",TRUE -4903,4903,"oneri vari ",49,"account_type_view","other",TRUE -4905,4905,"perdite su crediti ",49,"account_type_view","other",TRUE -4910,4910,"arrotondamenti passivi ",49,"account_type_view","other",TRUE -4920,4920,"minusvalenze ordinarie diverse ",49,"account_type_view","other",TRUE -4930,4930,"sopravvenienze passive ordinarie diverse ",49,"account_type_view","other",TRUE -4940,4940,"insussistenze passive ordinarie diverse ",49,"account_type_view","other",TRUE -5,5,"PROVENTI E ONERI FINANZIARI ",0,"account_type_view","view",TRUE -51,51,"PROVENTI FINANZIARI ",5,"account_type_view","view",TRUE -5110,5110,"interessi attivi v/clienti ",51,"account_type_view","other",TRUE -5115,5115,"interessi attivi bancari ",51,"account_type_view","other",TRUE -5116,5116,"interessi attivi postali ",51,"account_type_view","other",TRUE -5140,5140,"proventi finanziari diversi ",51,"account_type_view","other",TRUE -52,52,"ONERI FINANZIARI ",5,"account_type_view","view",TRUE -5201,5201,"interessi passivi v/fornitori ",52,"account_type_view","other",TRUE -5202,5202,"interessi passivi bancari ",52,"account_type_view","other",TRUE -5203,5203,"sconti passivi bancari ",52,"account_type_view","other",TRUE -5210,5210,"interessi passivi su mutui ",52,"account_type_view","other",TRUE -5240,5240,"oneri finanziari diversi ",52,"account_type_view","other",TRUE -7,7,"PROVENTI E ONERI STRAORDINARI ",0,"account_type_view","view",TRUE -71,71,"PROVENTI STRAORDINARI ",7,"account_type_view","view",TRUE -7101,7101,"plusvalenze straordinarie ",71,"account_type_view","other",TRUE -7102,7102,"sopravvenienze attive straordinarie ",71,"account_type_view","other",TRUE -7103,7103,"insussistenze attive straordinarie ",71,"account_type_view","other",TRUE -72,72,"ONERI STRAORDINARI ",7,"account_type_view","view",TRUE -7201,7201,"minusvalenze straordinarie ",72,"account_type_view","other",TRUE -7202,7202,"sopravvenienze passive straordinarie ",72,"account_type_view","other",TRUE -7203,7203,"insussistenze passive straordinarie ",72,"account_type_view","other",TRUE -7204,7204,"imposte esercizi precedenti ",72,"account_type_view","other",TRUE -81,81,"IMPOSTE DELL'ESERCIZIO ",7,"account_type_view","view",TRUE -8101,8101,"imposte dell'esercizio ",81,"account_type_view","other",TRUE -91,91,"CONTI DI RISULTATO ",7,"account_type_view","view",TRUE -9101,9101,"conto di risultato economico ",91,"account_type_view","other",TRUE +"0","0","Azienda",,"account_type_view","view","FALSE" +"1","1","ATTIVO ","0","account_type_view","view","TRUE" +"11","11","IMMOBILIZZAZIONI IMMATERIALI ","1","account_type_view","view","TRUE" +"1101","1101","costi di impianto ","11","account_type_view","other","TRUE" +"1106","1106","software ","11","account_type_view","other","TRUE" +"1108","1108","avviamento ","11","account_type_view","other","TRUE" +"1111","1111","fondo ammortamento costi di impianto ","11","account_type_view","other","TRUE" +"1116","1116","fondo ammortamento software ","11","account_type_view","other","TRUE" +"1118","1118","fondo ammortamento avviamento ","11","account_type_view","other","TRUE" +"12","12","IMMOBILIZZAZIONI MATERIALI ","1","account_type_view","view","TRUE" +"1201","1201","fabbricati ","12","account_type_view","other","TRUE" +"1202","1202","impianti e macchinari ","12","account_type_view","other","TRUE" +"1204","1204","attrezzature commerciali ","12","account_type_view","other","TRUE" +"1205","1205","macchine d'ufficio ","12","account_type_view","other","TRUE" +"1206","1206","arredamento ","12","account_type_view","other","TRUE" +"1207","1207","automezzi ","12","account_type_view","other","TRUE" +"1208","1208","imballaggi durevoli ","12","account_type_view","other","TRUE" +"1211","1211","fondo ammortamento fabbricati ","12","account_type_view","other","TRUE" +"1212","1212","fondo ammortamento impianti e macchinari ","12","account_type_view","other","TRUE" +"1214","1214","fondo ammortamento attrezzature commerciali ","12","account_type_view","other","TRUE" +"1215","1215","fondo ammortamento macchine d'ufficio ","12","account_type_view","other","TRUE" +"1216","1216","fondo ammortamento arredamento ","12","account_type_view","other","TRUE" +"1217","1217","fondo ammortamento automezzi ","12","account_type_view","other","TRUE" +"1218","1218","fondo ammortamento imballaggi durevoli ","12","account_type_view","other","TRUE" +"1220","1220","fornitori immobilizzazioni c/acconti ","12","account_type_view","other","TRUE" +"13","13","IMMOBILIZZAZIONI FINANZIARIE ","1","account_type_view","view","TRUE" +"1301","1301","mutui attivi ","13","account_type_view","other","TRUE" +"14","14","RIMANENZE ","1","account_type_view","view","TRUE" +"1401","1401","materie di consumo ","14","account_type_view","other","TRUE" +"1404","1404","merci ","14","account_type_view","other","TRUE" +"1410","1410","fornitori c/acconti ","14","account_type_view","other","TRUE" +"15","15","CREDITI COMMERCIALI ","1","account_type_view","view","TRUE" +"1501","1501","crediti v/clienti ","15","account_type_receivable","receivable","TRUE" +"1502","1502","crediti commerciali diversi ","15","account_type_receivable","other","TRUE" +"1503","1503","clienti c/spese anticipate ","15","account_type_receivable","receivable","TRUE" +"1505","1505","cambiali attive ","15","account_type_receivable","other","TRUE" +"1506","1506","cambiali allo sconto ","15","account_type_receivable","other","TRUE" +"1507","1507","cambiali all'incasso ","15","account_type_receivable","other","TRUE" +"1509","1509","fatture da emettere ","15","account_type_receivable","other","TRUE" +"1510","1510","crediti insoluti ","15","account_type_receivable","other","TRUE" +"1511","1511","cambiali insolute ","15","account_type_receivable","other","TRUE" +"1531","1531","crediti da liquidare ","15","account_type_receivable","other","TRUE" +"1540","1540","fondo svalutazione crediti ","15","account_type_receivable","other","TRUE" +"1541","1541","fondo rischi su crediti ","15","account_type_receivable","other","TRUE" +"16","16","CREDITI DIVERSI ","1","account_type_view","view","TRUE" +"1601","1601","IVA n/credito ","16","account_type_receivable","other","TRUE" +"1602","1602","IVA c/acconto ","16","account_type_receivable","other","TRUE" +"1605","1605","crediti per IVA ","16","account_type_receivable","other","TRUE" +"1607","1607","imposte c/acconto ","16","account_type_receivable","other","TRUE" +"1608","1608","crediti per imposte ","16","account_type_receivable","other","TRUE" +"1609","1609","crediti per ritenute subite ","16","account_type_receivable","other","TRUE" +"1610","1610","crediti per cauzioni ","16","account_type_receivable","other","TRUE" +"1620","1620","personale c/acconti ","16","account_type_receivable","other","TRUE" +"1630","1630","crediti v/istituti previdenziali ","16","account_type_receivable","other","TRUE" +"1640","1640","debitori diversi ","16","account_type_receivable","receivable","TRUE" +"18","18","DISPONIBILITÀ LIQUIDE ","1","account_type_view","view","TRUE" +"1801","1801","banche c/c ","18","account_type_bank","liquidity","TRUE" +"1810","1810","c/c postali ","18","account_type_cash","liquidity","TRUE" +"1820","1820","denaro in cassa ","18","account_type_cash","liquidity","TRUE" +"1821","1821","assegni ","18","account_type_cash","liquidity","TRUE" +"1822","1822","valori bollati ","18","account_type_cash","liquidity","TRUE" +"19","19","RATEI E RISCONTI ATTIVI ","1","account_type_view","view","TRUE" +"1901","1901","ratei attivi ","19","account_type_view","other","TRUE" +"1902","1902","risconti attivi ","19","account_type_view","other","TRUE" +"2","2","PASSIVO ","0","account_type_view","view","TRUE" +"20","20","PATRIMONIO NETTO ","2","account_type_view","view","TRUE" +"2101","2101","patrimonio netto ","20","account_type_view","other","TRUE" +"2102","2102","utile d'esercizio ","20","account_type_view","receivable","TRUE" +"2103","2103","perdita d'esercizio ","20","account_type_view","payable","TRUE" +"2104","2104","prelevamenti extra gestione ","20","account_type_view","other","TRUE" +"2105","2105","titolare c/ritenute subite ","20","account_type_view","other","TRUE" +"22","22","FONDI PER RISCHI E ONERI ","2","account_type_view","view","TRUE" +"2201","2201","fondo per imposte ","22","account_type_view","other","TRUE" +"2204","2204","fondo responsabilità civile ","22","account_type_view","other","TRUE" +"2205","2205","fondo spese future ","22","account_type_view","other","TRUE" +"2211","2211","fondo manutenzioni programmate ","22","account_type_view","other","TRUE" +"23","23","TRATTAMENTO FINE RAPPORTO DI LAVORO ","2","account_type_view","view","TRUE" +"2301","2301","debiti per TFRL ","23","account_type_view","other","TRUE" +"24","24","DEBITI FINANZIARI ","2","account_type_view","view","TRUE" +"2410","2410","mutui passivi ","24","account_type_payable","other","TRUE" +"2411","2411","banche c/sovvenzioni ","24","account_type_payable","other","TRUE" +"2420","2420","banche c/c passivi ","24","account_type_payable","other","TRUE" +"2421","2421","banche c/RIBA all'incasso ","24","account_type_payable","other","TRUE" +"2422","2422","banche c/cambiali all'incasso ","24","account_type_payable","other","TRUE" +"2423","2423","banche c/anticipi su fatture ","24","account_type_payable","other","TRUE" +"2440","2440","debiti v/altri finanziatori ","24","account_type_payable","other","TRUE" +"25","25","DEBITI COMMERCIALI ","2","account_type_view","view","TRUE" +"2501","2501","debiti v/fornitori ","25","account_type_payable","payable","TRUE" +"2503","2503","cambiali passive ","25","account_type_payable","other","TRUE" +"2520","2520","fatture da ricevere ","25","account_type_payable","other","TRUE" +"2521","2521","debiti da liquidare ","25","account_type_payable","other","TRUE" +"2530","2530","clienti c/acconti ","25","account_type_payable","payable","TRUE" +"26","26","DEBITI DIVERSI ","2","account_type_view","view","TRUE" +"2601","2601","IVA n/debito ","26","account_type_payable","other","TRUE" +"2602","2602","debiti per ritenute da versare ","26","account_type_payable","other","TRUE" +"2605","2605","erario c/IVA ","26","account_type_payable","payable","TRUE" +"2606","2606","debiti per imposte ","26","account_type_payable","other","TRUE" +"2619","2619","debiti per cauzioni ","26","account_type_payable","other","TRUE" +"2620","2620","personale c/retribuzioni ","26","account_type_payable","other","TRUE" +"2621","2621","personale c/liquidazioni ","26","account_type_payable","other","TRUE" +"2622","2622","clienti c/cessione ","26","account_type_payable","other","TRUE" +"2630","2630","debiti v/istituti previdenziali ","26","account_type_payable","other","TRUE" +"2640","2640","creditori diversi ","26","account_type_payable","payable","TRUE" +"27","27","RATEI E RISCONTI PASSIVI ","2","account_type_view","view","TRUE" +"2701","2701","ratei passivi ","27","account_type_view","other","TRUE" +"2702","2702","risconti passivi ","27","account_type_view","other","TRUE" +"28","28","CONTI TRANSITORI E DIVERSI ","2","account_type_view","view","TRUE" +"2801","2801","bilancio di apertura ","28","account_type_view","other","TRUE" +"2802","2802","bilancio di chiusura ","28","account_type_view","other","TRUE" +"2810","2810","IVA c/liquidazioni ","28","account_type_view","other","TRUE" +"2811","2811","istituti previdenziali ","28","account_type_view","other","TRUE" +"2820","2820","banca ... c/c ","28","account_type_view","other","TRUE" +"2821","2821","banca ... c/c ","28","account_type_view","other","TRUE" +"2822","2822","banca ... c/c ","28","account_type_view","other","TRUE" +"29","29","CONTI DEI SISTEMI SUPPLEMENTARI ","2","account_type_view","view","TRUE" +"2901","2901","beni di terzi ","29","account_type_view","other","TRUE" +"2902","2902","depositanti beni ","29","account_type_view","other","TRUE" +"2911","2911","merci da ricevere ","29","account_type_view","other","TRUE" +"2912","2912","fornitori c/impegni ","29","account_type_view","other","TRUE" +"2913","2913","impegni per beni in leasing ","29","account_type_view","other","TRUE" +"2914","2914","creditori c/leasing ","29","account_type_view","other","TRUE" +"2916","2916","clienti c/impegni ","29","account_type_view","other","TRUE" +"2917","2917","merci da consegnare ","29","account_type_view","other","TRUE" +"2921","2921","rischi per effetti scontati ","29","account_type_view","other","TRUE" +"2922","2922","banche c/effetti scontati ","29","account_type_view","other","TRUE" +"2926","2926","rischi per fideiussioni ","29","account_type_view","other","TRUE" +"2927","2927","creditori per fideiussioni ","29","account_type_view","other","TRUE" +"2931","2931","rischi per avalli ","29","account_type_view","other","TRUE" +"2932","2932","creditori per avalli ","29","account_type_view","other","TRUE" +"3","3","VALORE DELLA PRODUZIONE ","0","account_type_view","view","TRUE" +"31","31","VENDITE E PRESTAZIONI ","3","account_type_view","view","TRUE" +"3101","3101","merci c/vendite ","31","account_type_income","other","TRUE" +"3103","3103","rimborsi spese di vendita ","31","account_type_income","other","TRUE" +"3110","3110","resi su vendite ","31","account_type_income","other","TRUE" +"3111","3111","ribassi e abbuoni passivi ","31","account_type_income","other","TRUE" +"3112","3112","premi su vendite ","31","account_type_income","other","TRUE" +"32","32","RICAVI E PROVENTI DIVERSI ","3","account_type_view","view","TRUE" +"3201","3201","fitti attivi ","32","account_type_income","other","TRUE" +"3202","3202","proventi vari ","32","account_type_income","other","TRUE" +"3210","3210","arrotondamenti attivi ","32","account_type_income","other","TRUE" +"3220","3220","plusvalenze ordinarie diverse ","32","account_type_income","other","TRUE" +"3230","3230","sopravvenienze attive ordinarie diverse ","32","account_type_income","other","TRUE" +"3240","3240","insussistenze attive ordinarie diverse ","32","account_type_income","other","TRUE" +"4","4","COSTI DELLA PRODUZIONE ","0","account_type_view","view","TRUE" +"41","41","COSTO DEL VENDUTO ","4","account_type_view","view","TRUE" +"4101","4101","merci c/acquisti ","41","account_type_expense","other","TRUE" +"4102","4102","materie di consumo c/acquisti ","41","account_type_expense","other","TRUE" +"4105","4105","merci c/apporti ","41","account_type_expense","other","TRUE" +"4110","4110","resi su acquisti ","41","account_type_expense","other","TRUE" +"4111","4111","ribassi e abbuoni attivi ","41","account_type_expense","other","TRUE" +"4112","4112","premi su acquisti ","41","account_type_expense","other","TRUE" +"4121","4121","merci c/esistenze iniziali ","41","account_type_expense","other","TRUE" +"4122","4122","materie di consumo c/esistenze iniziali ","41","account_type_expense","other","TRUE" +"4131","4131","merci c/rimanenze finali ","41","account_type_expense","other","TRUE" +"4132","4132","materie di consumo c/rimanenze finali ","41","account_type_expense","other","TRUE" +"42","42","COSTI PER SERVIZI ","4","account_type_view","view","TRUE" +"4201","4201","costi di trasporto ","42","account_type_expense","other","TRUE" +"4202","4202","costi per energia ","42","account_type_expense","other","TRUE" +"4203","4203","costi di pubblicità ","42","account_type_expense","other","TRUE" +"4204","4204","costi di consulenze ","42","account_type_expense","other","TRUE" +"4205","4205","costi postali ","42","account_type_expense","other","TRUE" +"4206","4206","costi telefonici ","42","account_type_expense","other","TRUE" +"4207","4207","costi di assicurazione ","42","account_type_expense","other","TRUE" +"4208","4208","costi di vigilanza ","42","account_type_expense","other","TRUE" +"4209","4209","costi per i locali ","42","account_type_expense","other","TRUE" +"4210","4210","costi di esercizio automezzi ","42","account_type_expense","other","TRUE" +"4211","4211","costi di manutenzione e riparazione ","42","account_type_expense","other","TRUE" +"4212","4212","provvigioni passive ","42","account_type_expense","other","TRUE" +"4213","4213","spese di incasso ","42","account_type_expense","other","TRUE" +"43","43","COSTI PER GODIMENTO BENI DI TERZI ","4","account_type_view","view","TRUE" +"4301","4301","fitti passivi ","43","account_type_expense","other","TRUE" +"4302","4302","canoni di leasing ","43","account_type_expense","other","TRUE" +"44","44","COSTI PER IL PERSONALE ","4","account_type_view","view","TRUE" +"4401","4401","salari e stipendi ","44","account_type_expense","other","TRUE" +"4402","4402","oneri sociali ","44","account_type_expense","other","TRUE" +"4403","4403","TFRL ","44","account_type_expense","other","TRUE" +"4404","4404","altri costi per il personale ","44","account_type_expense","other","TRUE" +"45","45","AMMORTAMENTI IMMOBILIZZAZIONI IMMATERIALI ","4","account_type_view","view","TRUE" +"4501","4501","ammortamento costi di impianto ","45","account_type_view","other","TRUE" +"4506","4506","ammortamento software ","45","account_type_view","other","TRUE" +"4508","4508","ammortamento avviamento ","45","account_type_view","other","TRUE" +"46","46","AMMORTAMENTI IMMOBILIZZAZIONI MATERIALI ","4","account_type_view","view","TRUE" +"4601","4601","ammortamento fabbricati ","46","account_type_view","other","TRUE" +"4602","4602","ammortamento impianti e macchinari ","46","account_type_view","other","TRUE" +"4604","4604","ammortamento attrezzature commerciali ","46","account_type_view","other","TRUE" +"4605","4605","ammortamento macchine d'ufficio ","46","account_type_view","other","TRUE" +"4606","4606","ammortamento arredamento ","46","account_type_view","other","TRUE" +"4607","4607","ammortamento automezzi ","46","account_type_view","other","TRUE" +"4608","4608","ammortamento imballaggi durevoli ","46","account_type_view","other","TRUE" +"47","47","SVALUTAZIONI ","4","account_type_view","view","TRUE" +"4701","4701","svalutazioni immobilizzazioni immateriali ","47","account_type_view","other","TRUE" +"4702","4702","svalutazioni immobilizzazioni materiali ","47","account_type_view","other","TRUE" +"4706","4706","svalutazione crediti ","47","account_type_view","other","TRUE" +"48","48","ACCANTONAMENTI ","4","account_type_view","view","TRUE" +"481","481","ACCANTONAMENTI PER RISCHI ","48","account_type_view","view","TRUE" +"4814","4814","accantonamento per responsabilità civile ","481","account_type_view","other","TRUE" +"482","482","ALTRI ACCANTONAMENTI ","48","account_type_view","view","TRUE" +"4821","4821","accantonamento per spese future ","482","account_type_view","other","TRUE" +"4823","4823","accantonamento per manutenzioni programmate ","482","account_type_view","other","TRUE" +"49","49","ONERI DIVERSI ","4","account_type_view","view","TRUE" +"4901","4901","oneri fiscali diversi ","49","account_type_view","other","TRUE" +"4903","4903","oneri vari ","49","account_type_view","other","TRUE" +"4905","4905","perdite su crediti ","49","account_type_view","other","TRUE" +"4910","4910","arrotondamenti passivi ","49","account_type_view","other","TRUE" +"4920","4920","minusvalenze ordinarie diverse ","49","account_type_view","other","TRUE" +"4930","4930","sopravvenienze passive ordinarie diverse ","49","account_type_view","other","TRUE" +"4940","4940","insussistenze passive ordinarie diverse ","49","account_type_view","other","TRUE" +"5","5","PROVENTI E ONERI FINANZIARI ","0","account_type_view","view","TRUE" +"51","51","PROVENTI FINANZIARI ","5","account_type_view","view","TRUE" +"5110","5110","interessi attivi v/clienti ","51","account_type_view","other","TRUE" +"5115","5115","interessi attivi bancari ","51","account_type_view","other","TRUE" +"5116","5116","interessi attivi postali ","51","account_type_view","other","TRUE" +"5140","5140","proventi finanziari diversi ","51","account_type_view","other","TRUE" +"52","52","ONERI FINANZIARI ","5","account_type_view","view","TRUE" +"5201","5201","interessi passivi v/fornitori ","52","account_type_view","other","TRUE" +"5202","5202","interessi passivi bancari ","52","account_type_view","other","TRUE" +"5203","5203","sconti passivi bancari ","52","account_type_view","other","TRUE" +"5210","5210","interessi passivi su mutui ","52","account_type_view","other","TRUE" +"5240","5240","oneri finanziari diversi ","52","account_type_view","other","TRUE" +"7","7","PROVENTI E ONERI STRAORDINARI ","0","account_type_view","view","TRUE" +"71","71","PROVENTI STRAORDINARI ","7","account_type_view","view","TRUE" +"7101","7101","plusvalenze straordinarie ","71","account_type_view","other","TRUE" +"7102","7102","sopravvenienze attive straordinarie ","71","account_type_view","other","TRUE" +"7103","7103","insussistenze attive straordinarie ","71","account_type_view","other","TRUE" +"72","72","ONERI STRAORDINARI ","7","account_type_view","view","TRUE" +"7201","7201","minusvalenze straordinarie ","72","account_type_view","other","TRUE" +"7202","7202","sopravvenienze passive straordinarie ","72","account_type_view","other","TRUE" +"7203","7203","insussistenze passive straordinarie ","72","account_type_view","other","TRUE" +"7204","7204","imposte esercizi precedenti ","72","account_type_view","other","TRUE" +"81","81","IMPOSTE DELL'ESERCIZIO ","7","account_type_view","view","TRUE" +"8101","8101","imposte dell'esercizio ","81","account_type_view","other","TRUE" +"91","91","CONTI DI RISULTATO ","7","account_type_view","view","TRUE" +"9101","9101","conto di risultato economico ","91","account_type_view","other","TRUE" From baf3c74fc43a3ff47ff68684ce36969a1eb0bce5 Mon Sep 17 00:00:00 2001 From: eLBati Date: Sat, 17 Sep 2011 09:29:30 +0200 Subject: [PATCH 03/41] [FIX] new ordinary VAT 21% http://www.ilsole24ore.com/art/norme-e-tributi/2011-09-15/domani-aumenta-224724.shtml bzr revid: lorenzo.battistini@agilebg.com-20110917072930-i6rnvkjgw4lffgla --- .../data/account.tax.code.template.csv | 4 + addons/l10n_it/data/account.tax.template.csv | 74 ++++++++++--------- 2 files changed, 42 insertions(+), 36 deletions(-) diff --git a/addons/l10n_it/data/account.tax.code.template.csv b/addons/l10n_it/data/account.tax.code.template.csv index 288f169f4ab..01699380f81 100644 --- a/addons/l10n_it/data/account.tax.code.template.csv +++ b/addons/l10n_it/data/account.tax.code.template.csv @@ -26,6 +26,8 @@ "IVC4Idet50","template_impcode_pagata_4det50","IVA a credito 4% detraibile 50% (imponibile)","template_impcode_pagata" "IVC20","template_ivacode_pagata_20","IVA a credito 20%","template_ivacode_pagata" "IVC20I","template_impcode_pagata_20","IVA a credito 20% (imponibile)","template_impcode_pagata" +"IVC21","template_ivacode_pagata_21","IVA a credito 21%","template_ivacode_pagata" +"IVC21I","template_impcode_pagata_21","IVA a credito 21% (imponibile)","template_impcode_pagata" "IVC4","template_ivacode_pagata_4","IVA a credito 4%","template_ivacode_pagata" "IVC4I","template_impcode_pagata_4","IVA a credito 4% (imponibile)","template_impcode_pagata" "IVC12","template_ivacode_pagata_12","IVA a credito 12%","template_ivacode_pagata" @@ -40,6 +42,8 @@ "IVD10I","template_impcode_riscossa_10","IVA a debito 10% (imponibile)","template_impcode_riscossa" "IVD20","template_ivacode_riscossa_20","IVA a debito 20%","template_ivacode_riscossa" "IVD20I","template_impcode_riscossa_20","IVA a debito 20% (imponibile)","template_impcode_riscossa" +"IVD21","template_ivacode_riscossa_21","IVA a debito 21%","template_ivacode_riscossa" +"IVD21I","template_impcode_riscossa_21","IVA a debito 21% (imponibile)","template_impcode_riscossa" "IVD4","template_ivacode_riscossa_4","IVA a debito 4%","template_ivacode_riscossa" "IVD4I","template_impcode_riscossa_4","IVA a debito 4% (imponibile)","template_impcode_riscossa" "IVD12","template_ivacode_riscossa_12","IVA a debito 12%","template_ivacode_riscossa" diff --git a/addons/l10n_it/data/account.tax.template.csv b/addons/l10n_it/data/account.tax.template.csv index 5be051ed009..08a4d770b31 100644 --- a/addons/l10n_it/data/account.tax.template.csv +++ b/addons/l10n_it/data/account.tax.template.csv @@ -1,46 +1,48 @@ "id","description","chart_template_id:id","name","sequence","amount","parent_id:id","child_depend","type","account_collected_id:id","account_paid_id:id","type_tax_use","base_code_id:id","tax_code_id:id","ref_base_code_id:id","ref_tax_code_id:id","ref_base_sign","ref_tax_sign","price_include" -"20a","20a","l10n_it_chart_template_generic","Iva al 20% (debito)",,"0.2",,"False","percent","2601","2601","sale","template_impcode_riscossa_20","template_ivacode_riscossa_20","template_impcode_riscossa_20","template_ivacode_riscossa_20",-1,-1,"False" -"20b","20b","l10n_it_chart_template_generic","Iva al 20% (credito)",,"0.2",,"False","percent","1601","1601","purchase","template_impcode_pagata_20","template_ivacode_pagata_20","template_impcode_pagata_20","template_ivacode_pagata_20",-1,-1,"False" -"10a","10a","l10n_it_chart_template_generic","Iva al 10% (debito)",,"0.1",,"False","percent","2601","2601","sale","template_impcode_riscossa_10","template_ivacode_riscossa_10","template_impcode_riscossa_10","template_ivacode_riscossa_10",-1,-1,"False" -"10b","10b","l10n_it_chart_template_generic","Iva al 10% (credito)",,"0.1",,"False","percent","1601","1601","purchase","template_impcode_pagata_10","template_ivacode_pagata_10","template_impcode_pagata_10","template_ivacode_pagata_10",-1,-1,"False" -"10AO","10AO","l10n_it_chart_template_generic","Iva al 10% indetraibile",,"0.1",,"True","percent",,,"purchase","template_impcode_pagata_10ind",,"template_impcode_pagata_10ind",,-1,,"False" -"10AOa","10AOa","l10n_it_chart_template_generic","Iva al 10% indetraibile (D)","2","0","10AO","False","balance","1601","1601","purchase",,"template_ivacode_pagata_10ind",,"template_ivacode_pagata_10ind",,-1,"False" +"21a","21a","l10n_it_chart_template_generic","Iva al 21% (debito)",,"0.21",,"False","percent","2601","2601","sale","template_impcode_riscossa_21","template_ivacode_riscossa_21","template_impcode_riscossa_21","template_ivacode_riscossa_21","-1","-1","False" +"21b","21b","l10n_it_chart_template_generic","Iva al 21% (credito)",,"0.21",,"False","percent","1601","1601","purchase","template_impcode_pagata_21","template_ivacode_pagata_21","template_impcode_pagata_21","template_ivacode_pagata_21","-1","-1","False" +"20a","20a","l10n_it_chart_template_generic","Iva al 20% (debito)",,"0.2",,"False","percent","2601","2601","sale","template_impcode_riscossa_20","template_ivacode_riscossa_20","template_impcode_riscossa_20","template_ivacode_riscossa_20","-1","-1","False" +"20b","20b","l10n_it_chart_template_generic","Iva al 20% (credito)",,"0.2",,"False","percent","1601","1601","purchase","template_impcode_pagata_20","template_ivacode_pagata_20","template_impcode_pagata_20","template_ivacode_pagata_20","-1","-1","False" +"10a","10a","l10n_it_chart_template_generic","Iva al 10% (debito)",,"0.1",,"False","percent","2601","2601","sale","template_impcode_riscossa_10","template_ivacode_riscossa_10","template_impcode_riscossa_10","template_ivacode_riscossa_10","-1","-1","False" +"10b","10b","l10n_it_chart_template_generic","Iva al 10% (credito)",,"0.1",,"False","percent","1601","1601","purchase","template_impcode_pagata_10","template_ivacode_pagata_10","template_impcode_pagata_10","template_ivacode_pagata_10","-1","-1","False" +"10AO","10AO","l10n_it_chart_template_generic","Iva al 10% indetraibile",,"0.1",,"True","percent",,,"purchase","template_impcode_pagata_10ind",,"template_impcode_pagata_10ind",,"-1",,"False" +"10AOa","10AOa","l10n_it_chart_template_generic","Iva al 10% indetraibile (D)","2","0","10AO","False","balance","1601","1601","purchase",,"template_ivacode_pagata_10ind",,"template_ivacode_pagata_10ind",,"-1","False" "10AOb","10AOb","l10n_it_chart_template_generic","Iva al 10% indetraibile (I)","1","1","10AO","False","percent",,,"purchase",,,,,,,"False" -"12a","12a","l10n_it_chart_template_generic","Iva 12% (debito)",,"0.12",,"False","percent","2601","2601","sale","template_impcode_riscossa_12","template_ivacode_riscossa_12","template_impcode_riscossa_12","template_ivacode_riscossa_12",-1,-1,"False" -"12b","12b","l10n_it_chart_template_generic","Iva 12% (credito)",,"0.12",,"False","percent","1601","1601","purchase","template_impcode_pagata_12","template_ivacode_pagata_12","template_impcode_pagata_12","template_ivacode_pagata_12",-1,-1,"False" -"2010","2010","l10n_it_chart_template_generic","Iva al 20% detraibile 10%",,"0.2",,"True","percent",,,"purchase","template_impcode_pagata_20det10",,"template_impcode_pagata_20det10",,-1,,"False" -"2010a","2010a","l10n_it_chart_template_generic","Iva al 20% detraibile 10% (D)","2","0","2010","False","balance","1601","1601","purchase",,"template_ivacode_pagata_20det10",,"template_ivacode_pagata_20det10",,-1,"False" +"12a","12a","l10n_it_chart_template_generic","Iva 12% (debito)",,"0.12",,"False","percent","2601","2601","sale","template_impcode_riscossa_12","template_ivacode_riscossa_12","template_impcode_riscossa_12","template_ivacode_riscossa_12","-1","-1","False" +"12b","12b","l10n_it_chart_template_generic","Iva 12% (credito)",,"0.12",,"False","percent","1601","1601","purchase","template_impcode_pagata_12","template_ivacode_pagata_12","template_impcode_pagata_12","template_ivacode_pagata_12","-1","-1","False" +"2010","2010","l10n_it_chart_template_generic","Iva al 20% detraibile 10%",,"0.2",,"True","percent",,,"purchase","template_impcode_pagata_20det10",,"template_impcode_pagata_20det10",,"-1",,"False" +"2010a","2010a","l10n_it_chart_template_generic","Iva al 20% detraibile 10% (D)","2","0","2010","False","balance","1601","1601","purchase",,"template_ivacode_pagata_20det10",,"template_ivacode_pagata_20det10",,"-1","False" "2010b","2010b","l10n_it_chart_template_generic","Iva al 20% detraibile 10% (I)","1","0.9","2010","False","percent",,,"purchase",,,,,,,"False" -"2015","2015","l10n_it_chart_template_generic","Iva al 20% detraibile 15%",,"0.2",,"True","percent",,,"purchase","template_impcode_pagata_20det15",,"template_impcode_pagata_20det15",,-1,,"False" -"2015a","2015a","l10n_it_chart_template_generic","Iva al 20% detraibile 15% (D)","2","0","2015","False","balance","1601","1601","purchase",,"template_ivacode_pagata_20det15",,"template_ivacode_pagata_20det15",,-1,"False" +"2015","2015","l10n_it_chart_template_generic","Iva al 20% detraibile 15%",,"0.2",,"True","percent",,,"purchase","template_impcode_pagata_20det15",,"template_impcode_pagata_20det15",,"-1",,"False" +"2015a","2015a","l10n_it_chart_template_generic","Iva al 20% detraibile 15% (D)","2","0","2015","False","balance","1601","1601","purchase",,"template_ivacode_pagata_20det15",,"template_ivacode_pagata_20det15",,"-1","False" "2015b","2015b","l10n_it_chart_template_generic","Iva al 20% detraibile 15% (I)","1","0.85","2015","False","percent",,,"purchase",,,,,,,"False" -"2040","2040","l10n_it_chart_template_generic","Iva al 20% detraibile 40%",,"0.2",,"True","percent",,,"purchase","template_impcode_pagata_20det40",,"template_impcode_pagata_20det40",,-1,,"False" -"2040a","2040a","l10n_it_chart_template_generic","Iva al 20% detraibile 40% (D)","2","0","2040","False","balance","1601","1601","purchase",,"template_ivacode_pagata_20det40",,"template_ivacode_pagata_20det40",,-1,"False" +"2040","2040","l10n_it_chart_template_generic","Iva al 20% detraibile 40%",,"0.2",,"True","percent",,,"purchase","template_impcode_pagata_20det40",,"template_impcode_pagata_20det40",,"-1",,"False" +"2040a","2040a","l10n_it_chart_template_generic","Iva al 20% detraibile 40% (D)","2","0","2040","False","balance","1601","1601","purchase",,"template_ivacode_pagata_20det40",,"template_ivacode_pagata_20det40",,"-1","False" "2040b","2040b","l10n_it_chart_template_generic","Iva al 20% detraibile 40% (I)","1","0.6","2040","False","percent",,,"purchase",,,,,,,"False" -"20AO","20AO","l10n_it_chart_template_generic","Iva al 20% indetraibile",,"0.2",,"True","percent",,,"purchase","template_impcode_pagata_20ind",,"template_impcode_pagata_20ind",,-1,,"False" -"20AOa","20AOa","l10n_it_chart_template_generic","Iva al 20% indetraibile (D)","2","0","20AO","False","balance","1601","1601","purchase",,"template_ivacode_pagata_20ind",,"template_ivacode_pagata_20ind",,-1,"False" +"20AO","20AO","l10n_it_chart_template_generic","Iva al 20% indetraibile",,"0.2",,"True","percent",,,"purchase","template_impcode_pagata_20ind",,"template_impcode_pagata_20ind",,"-1",,"False" +"20AOa","20AOa","l10n_it_chart_template_generic","Iva al 20% indetraibile (D)","2","0","20AO","False","balance","1601","1601","purchase",,"template_ivacode_pagata_20ind",,"template_ivacode_pagata_20ind",,"-1","False" "20AOb","20AOb","l10n_it_chart_template_generic","Iva al 20% indetraibile (I)","1","1","20AO","False","percent",,,"purchase",,,,,,,"False" -"20I5","20I5","l10n_it_chart_template_generic","IVA al 20% detraibile al 50%",,"0.2",,"True","percent",,,"purchase","template_impcode_pagata_20det50",,"template_impcode_pagata_20det50",,-1,,"False" +"20I5","20I5","l10n_it_chart_template_generic","IVA al 20% detraibile al 50%",,"0.2",,"True","percent",,,"purchase","template_impcode_pagata_20det50",,"template_impcode_pagata_20det50",,"-1",,"False" "20I5b","20I5b","l10n_it_chart_template_generic","IVA al 20% detraibile al 50% (I)","1","0.5","20I5","False","percent",,,"purchase",,,,,,,"False" -"20I5a","20I5a","l10n_it_chart_template_generic","IVA al 20% detraibile al 50% (D)","2","0","20I5","False","balance","1601","1601","purchase",,"template_ivacode_pagata_20det50",,"template_ivacode_pagata_20det50",,-1,"False" -"22a","22a","l10n_it_chart_template_generic","Iva 2% (debito)",,"0.02",,"False","percent","2601","2601","sale","template_impcode_riscossa_2","template_ivacode_riscossa_2","template_impcode_riscossa_2","template_ivacode_riscossa_2",-1,-1,"False" -"22b","22b","l10n_it_chart_template_generic","Iva 2% (credito)",,"0.02",,"False","percent","1601","1601","purchase","template_impcode_pagata_2","template_ivacode_pagata_2","template_impcode_pagata_2","template_ivacode_pagata_2",-1,-1,"False" -"4a","4a","l10n_it_chart_template_generic","Iva 4% (debito)",,"0.04",,"False","percent","2601","2601","sale","template_impcode_riscossa_4","template_ivacode_riscossa_4","template_impcode_riscossa_4","template_ivacode_riscossa_4",-1,-1,"False" -"4b","4b","l10n_it_chart_template_generic","Iva 4% (credito)",,"0.04",,"False","percent","1601","1601","purchase","template_impcode_pagata_4","template_ivacode_pagata_4","template_impcode_pagata_4","template_ivacode_pagata_4",-1,-1,"False" -"4AO","4AO","l10n_it_chart_template_generic","Iva al 4% indetraibile",,"0.04",,"True","percent",,,"purchase","template_impcode_pagata_4ind",,"template_impcode_pagata_4ind",,-1,,"False" -"4AOa","4AOa","l10n_it_chart_template_generic","Iva al 4% indetraibile (D)","2","0","4AO","False","balance","1601","1601","purchase",,"template_ivacode_pagata_4ind",,"template_ivacode_pagata_4ind",,-1,"False" +"20I5a","20I5a","l10n_it_chart_template_generic","IVA al 20% detraibile al 50% (D)","2","0","20I5","False","balance","1601","1601","purchase",,"template_ivacode_pagata_20det50",,"template_ivacode_pagata_20det50",,"-1","False" +"22a","22a","l10n_it_chart_template_generic","Iva 2% (debito)",,"0.02",,"False","percent","2601","2601","sale","template_impcode_riscossa_2","template_ivacode_riscossa_2","template_impcode_riscossa_2","template_ivacode_riscossa_2","-1","-1","False" +"22b","22b","l10n_it_chart_template_generic","Iva 2% (credito)",,"0.02",,"False","percent","1601","1601","purchase","template_impcode_pagata_2","template_ivacode_pagata_2","template_impcode_pagata_2","template_ivacode_pagata_2","-1","-1","False" +"4a","4a","l10n_it_chart_template_generic","Iva 4% (debito)",,"0.04",,"False","percent","2601","2601","sale","template_impcode_riscossa_4","template_ivacode_riscossa_4","template_impcode_riscossa_4","template_ivacode_riscossa_4","-1","-1","False" +"4b","4b","l10n_it_chart_template_generic","Iva 4% (credito)",,"0.04",,"False","percent","1601","1601","purchase","template_impcode_pagata_4","template_ivacode_pagata_4","template_impcode_pagata_4","template_ivacode_pagata_4","-1","-1","False" +"4AO","4AO","l10n_it_chart_template_generic","Iva al 4% indetraibile",,"0.04",,"True","percent",,,"purchase","template_impcode_pagata_4ind",,"template_impcode_pagata_4ind",,"-1",,"False" +"4AOa","4AOa","l10n_it_chart_template_generic","Iva al 4% indetraibile (D)","2","0","4AO","False","balance","1601","1601","purchase",,"template_ivacode_pagata_4ind",,"template_ivacode_pagata_4ind",,"-1","False" "4AOb","4AOb","l10n_it_chart_template_generic","Iva al 4% indetraibile (I)","1","1","4AO","False","percent",,,"purchase",,,,,,,"False" -"10I5","10I5","l10n_it_chart_template_generic","IVA al 10% detraibile al 50%",,"0.1",,"True","percent",,,"purchase","template_impcode_pagata_10det50",,"template_impcode_pagata_10det50",,-1,,"False" -"10I5a","10I5a","l10n_it_chart_template_generic","IVA al 10% detraibile al 50% (D)","2","0","10I5","False","balance","1601","1601","purchase",,"template_ivacode_pagata_10det50",,"template_ivacode_pagata_10det50",,-1,"False" +"10I5","10I5","l10n_it_chart_template_generic","IVA al 10% detraibile al 50%",,"0.1",,"True","percent",,,"purchase","template_impcode_pagata_10det50",,"template_impcode_pagata_10det50",,"-1",,"False" +"10I5a","10I5a","l10n_it_chart_template_generic","IVA al 10% detraibile al 50% (D)","2","0","10I5","False","balance","1601","1601","purchase",,"template_ivacode_pagata_10det50",,"template_ivacode_pagata_10det50",,"-1","False" "10I5b","10I5b","l10n_it_chart_template_generic","IVA al 10% detraibile al 50% (I)","1","0.5","10I5","False","percent",,,"purchase",,,,,,,"False" -"4I5","4I5","l10n_it_chart_template_generic","IVA al 4% detraibile al 50%",,"0.04",,"True","percent",,,"purchase","template_impcode_pagata_4det50",,"template_impcode_pagata_4det50",,-1,,"False" -"4I5a","4I5a","l10n_it_chart_template_generic","IVA al 4% detraibile al 50% (D)","2","0","4I5","False","balance","1601","1601","purchase",,"template_ivacode_pagata_4det50",,"template_ivacode_pagata_4det50",,-1,"False" +"4I5","4I5","l10n_it_chart_template_generic","IVA al 4% detraibile al 50%",,"0.04",,"True","percent",,,"purchase","template_impcode_pagata_4det50",,"template_impcode_pagata_4det50",,"-1",,"False" +"4I5a","4I5a","l10n_it_chart_template_generic","IVA al 4% detraibile al 50% (D)","2","0","4I5","False","balance","1601","1601","purchase",,"template_ivacode_pagata_4det50",,"template_ivacode_pagata_4det50",,"-1","False" "4I5b","4I5b","l10n_it_chart_template_generic","IVA al 4% detraibile al 50% (I)","1","0.5","4I5","False","percent",,,"purchase",,,,,,,"False" -"00a","00a","l10n_it_chart_template_generic","Esente IVA (debito)",,"0",,"False","percent","2601","2601","sale","template_impcode_riscossa_0","template_ivacode_riscossa_0","template_impcode_riscossa_0","template_ivacode_riscossa_0",-1,-1,"False" -"00b","00b","l10n_it_chart_template_generic","Esente IVA (credito)",,"0",,"False","percent","1601","1601","purchase","template_impcode_pagata_0","template_ivacode_pagata_0","template_impcode_pagata_0","template_ivacode_pagata_0",-1,-1,"False" -"20a INC","20a INC","l10n_it_chart_template_generic","Iva al 20% (debito) INC",,"0.2",,"False","percent","l10n_it.2601","l10n_it.2601","sale","l10n_it.template_impcode_riscossa_20","l10n_it.template_ivacode_riscossa_20","l10n_it.template_impcode_riscossa_20","l10n_it.template_ivacode_riscossa_20",-1,-1,"True" -"10a INC","10a INC","l10n_it_chart_template_generic","Iva al 10% (debito) INC",,"0.1",,"False","percent","l10n_it.2601","l10n_it.2601","sale","l10n_it.template_impcode_riscossa_10","l10n_it.template_ivacode_riscossa_10","l10n_it.template_impcode_riscossa_10","l10n_it.template_ivacode_riscossa_10",-1,-1,"True" -"12a INC","12a INC","l10n_it_chart_template_generic","Iva 12% (debito) INC",,"0.12",,"False","percent","l10n_it.2601","l10n_it.2601","sale","l10n_it.template_impcode_riscossa_12","l10n_it.template_ivacode_riscossa_12","l10n_it.template_impcode_riscossa_12","l10n_it.template_ivacode_riscossa_12",-1,-1,"True" -"22a INC","22a INC","l10n_it_chart_template_generic","Iva 2% (debito) INC",,"0.02",,"False","percent","l10n_it.2601","l10n_it.2601","sale","l10n_it.template_impcode_riscossa_2","l10n_it.template_ivacode_riscossa_2","l10n_it.template_impcode_riscossa_2","l10n_it.template_ivacode_riscossa_2",-1,-1,"True" -"4a INC","4a INC","l10n_it_chart_template_generic","Iva 4% (debito) INC",,"0.04",,"False","percent","l10n_it.2601","l10n_it.2601","sale","l10n_it.template_impcode_riscossa_4","l10n_it.template_ivacode_riscossa_4","l10n_it.template_impcode_riscossa_4","l10n_it.template_ivacode_riscossa_4",-1,-1,"True" -"00a INC","00a INC","l10n_it_chart_template_generic","Esente IVA (debito) INC",,"0",,"False","percent","l10n_it.2601","l10n_it.2601","sale","l10n_it.template_impcode_riscossa_0","l10n_it.template_ivacode_riscossa_0","l10n_it.template_impcode_riscossa_0","l10n_it.template_ivacode_riscossa_0",-1,-1,"True" +"00a","00a","l10n_it_chart_template_generic","Esente IVA (debito)",,"0",,"False","percent","2601","2601","sale","template_impcode_riscossa_0","template_ivacode_riscossa_0","template_impcode_riscossa_0","template_ivacode_riscossa_0","-1","-1","False" +"00b","00b","l10n_it_chart_template_generic","Esente IVA (credito)",,"0",,"False","percent","1601","1601","purchase","template_impcode_pagata_0","template_ivacode_pagata_0","template_impcode_pagata_0","template_ivacode_pagata_0","-1","-1","False" +"20a INC","20a INC","l10n_it_chart_template_generic","Iva al 20% (debito) INC",,"0.2",,"False","percent","l10n_it.2601","l10n_it.2601","sale","l10n_it.template_impcode_riscossa_20","l10n_it.template_ivacode_riscossa_20","l10n_it.template_impcode_riscossa_20","l10n_it.template_ivacode_riscossa_20","-1","-1","True" +"10a INC","10a INC","l10n_it_chart_template_generic","Iva al 10% (debito) INC",,"0.1",,"False","percent","l10n_it.2601","l10n_it.2601","sale","l10n_it.template_impcode_riscossa_10","l10n_it.template_ivacode_riscossa_10","l10n_it.template_impcode_riscossa_10","l10n_it.template_ivacode_riscossa_10","-1","-1","True" +"12a INC","12a INC","l10n_it_chart_template_generic","Iva 12% (debito) INC",,"0.12",,"False","percent","l10n_it.2601","l10n_it.2601","sale","l10n_it.template_impcode_riscossa_12","l10n_it.template_ivacode_riscossa_12","l10n_it.template_impcode_riscossa_12","l10n_it.template_ivacode_riscossa_12","-1","-1","True" +"22a INC","22a INC","l10n_it_chart_template_generic","Iva 2% (debito) INC",,"0.02",,"False","percent","l10n_it.2601","l10n_it.2601","sale","l10n_it.template_impcode_riscossa_2","l10n_it.template_ivacode_riscossa_2","l10n_it.template_impcode_riscossa_2","l10n_it.template_ivacode_riscossa_2","-1","-1","True" +"4a INC","4a INC","l10n_it_chart_template_generic","Iva 4% (debito) INC",,"0.04",,"False","percent","l10n_it.2601","l10n_it.2601","sale","l10n_it.template_impcode_riscossa_4","l10n_it.template_ivacode_riscossa_4","l10n_it.template_impcode_riscossa_4","l10n_it.template_ivacode_riscossa_4","-1","-1","True" +"00a INC","00a INC","l10n_it_chart_template_generic","Esente IVA (debito) INC",,"0",,"False","percent","l10n_it.2601","l10n_it.2601","sale","l10n_it.template_impcode_riscossa_0","l10n_it.template_ivacode_riscossa_0","l10n_it.template_impcode_riscossa_0","l10n_it.template_ivacode_riscossa_0","-1","-1","True" From 7f44b2a49930e3594232f39f9f9b7e03a8b5fff6 Mon Sep 17 00:00:00 2001 From: eLBati Date: Sun, 18 Sep 2011 17:19:26 +0200 Subject: [PATCH 04/41] [ADD] VAT 21% included bzr revid: lorenzo.battistini@agilebg.com-20110918151926-ux171fc0zixkbz1k --- addons/l10n_it/data/account.tax.template.csv | 1 + 1 file changed, 1 insertion(+) diff --git a/addons/l10n_it/data/account.tax.template.csv b/addons/l10n_it/data/account.tax.template.csv index 08a4d770b31..c0ce348693c 100644 --- a/addons/l10n_it/data/account.tax.template.csv +++ b/addons/l10n_it/data/account.tax.template.csv @@ -40,6 +40,7 @@ "4I5b","4I5b","l10n_it_chart_template_generic","IVA al 4% detraibile al 50% (I)","1","0.5","4I5","False","percent",,,"purchase",,,,,,,"False" "00a","00a","l10n_it_chart_template_generic","Esente IVA (debito)",,"0",,"False","percent","2601","2601","sale","template_impcode_riscossa_0","template_ivacode_riscossa_0","template_impcode_riscossa_0","template_ivacode_riscossa_0","-1","-1","False" "00b","00b","l10n_it_chart_template_generic","Esente IVA (credito)",,"0",,"False","percent","1601","1601","purchase","template_impcode_pagata_0","template_ivacode_pagata_0","template_impcode_pagata_0","template_ivacode_pagata_0","-1","-1","False" +"21a INC","21a INC","l10n_it_chart_template_generic","Iva al 21% (debito) INC",,"0.21",,"False","percent","l10n_it.2601","l10n_it.2601","sale","l10n_it.template_impcode_riscossa_21","l10n_it.template_ivacode_riscossa_21","l10n_it.template_impcode_riscossa_21","l10n_it.template_ivacode_riscossa_21","-1","-1","True" "20a INC","20a INC","l10n_it_chart_template_generic","Iva al 20% (debito) INC",,"0.2",,"False","percent","l10n_it.2601","l10n_it.2601","sale","l10n_it.template_impcode_riscossa_20","l10n_it.template_ivacode_riscossa_20","l10n_it.template_impcode_riscossa_20","l10n_it.template_ivacode_riscossa_20","-1","-1","True" "10a INC","10a INC","l10n_it_chart_template_generic","Iva al 10% (debito) INC",,"0.1",,"False","percent","l10n_it.2601","l10n_it.2601","sale","l10n_it.template_impcode_riscossa_10","l10n_it.template_ivacode_riscossa_10","l10n_it.template_impcode_riscossa_10","l10n_it.template_ivacode_riscossa_10","-1","-1","True" "12a INC","12a INC","l10n_it_chart_template_generic","Iva 12% (debito) INC",,"0.12",,"False","percent","l10n_it.2601","l10n_it.2601","sale","l10n_it.template_impcode_riscossa_12","l10n_it.template_ivacode_riscossa_12","l10n_it.template_impcode_riscossa_12","l10n_it.template_ivacode_riscossa_12","-1","-1","True" From 966ed38ba4651be633d525475c4cb0d0da389953 Mon Sep 17 00:00:00 2001 From: eLBati Date: Fri, 23 Sep 2011 18:32:09 +0200 Subject: [PATCH 05/41] [FIX] various account types bzr revid: lorenzo.battistini@agilebg.com-20110923163209-73xwtba0n62d8o15 --- .../l10n_it/data/account.account.template.csv | 176 +++++++++--------- addons/l10n_it/data/account.account.type.csv | 9 +- 2 files changed, 92 insertions(+), 93 deletions(-) diff --git a/addons/l10n_it/data/account.account.template.csv b/addons/l10n_it/data/account.account.template.csv index d31d42180d0..a838a76e892 100644 --- a/addons/l10n_it/data/account.account.template.csv +++ b/addons/l10n_it/data/account.account.template.csv @@ -2,34 +2,34 @@ "0","0","Azienda",,"account_type_view","view","FALSE" "1","1","ATTIVO ","0","account_type_view","view","TRUE" "11","11","IMMOBILIZZAZIONI IMMATERIALI ","1","account_type_view","view","TRUE" -"1101","1101","costi di impianto ","11","account_type_view","other","TRUE" -"1106","1106","software ","11","account_type_view","other","TRUE" -"1108","1108","avviamento ","11","account_type_view","other","TRUE" -"1111","1111","fondo ammortamento costi di impianto ","11","account_type_view","other","TRUE" -"1116","1116","fondo ammortamento software ","11","account_type_view","other","TRUE" -"1118","1118","fondo ammortamento avviamento ","11","account_type_view","other","TRUE" +"1101","1101","costi di impianto ","11","account_type_asset","other","TRUE" +"1106","1106","software ","11","account_type_asset","other","TRUE" +"1108","1108","avviamento ","11","account_type_asset","other","TRUE" +"1111","1111","fondo ammortamento costi di impianto ","11","account_type_asset","other","TRUE" +"1116","1116","fondo ammortamento software ","11","account_type_asset","other","TRUE" +"1118","1118","fondo ammortamento avviamento ","11","account_type_asset","other","TRUE" "12","12","IMMOBILIZZAZIONI MATERIALI ","1","account_type_view","view","TRUE" -"1201","1201","fabbricati ","12","account_type_view","other","TRUE" -"1202","1202","impianti e macchinari ","12","account_type_view","other","TRUE" -"1204","1204","attrezzature commerciali ","12","account_type_view","other","TRUE" -"1205","1205","macchine d'ufficio ","12","account_type_view","other","TRUE" -"1206","1206","arredamento ","12","account_type_view","other","TRUE" -"1207","1207","automezzi ","12","account_type_view","other","TRUE" -"1208","1208","imballaggi durevoli ","12","account_type_view","other","TRUE" -"1211","1211","fondo ammortamento fabbricati ","12","account_type_view","other","TRUE" -"1212","1212","fondo ammortamento impianti e macchinari ","12","account_type_view","other","TRUE" -"1214","1214","fondo ammortamento attrezzature commerciali ","12","account_type_view","other","TRUE" -"1215","1215","fondo ammortamento macchine d'ufficio ","12","account_type_view","other","TRUE" -"1216","1216","fondo ammortamento arredamento ","12","account_type_view","other","TRUE" -"1217","1217","fondo ammortamento automezzi ","12","account_type_view","other","TRUE" -"1218","1218","fondo ammortamento imballaggi durevoli ","12","account_type_view","other","TRUE" -"1220","1220","fornitori immobilizzazioni c/acconti ","12","account_type_view","other","TRUE" +"1201","1201","fabbricati ","12","account_type_asset","other","TRUE" +"1202","1202","impianti e macchinari ","12","account_type_asset","other","TRUE" +"1204","1204","attrezzature commerciali ","12","account_type_asset","other","TRUE" +"1205","1205","macchine d'ufficio ","12","account_type_asset","other","TRUE" +"1206","1206","arredamento ","12","account_type_asset","other","TRUE" +"1207","1207","automezzi ","12","account_type_asset","other","TRUE" +"1208","1208","imballaggi durevoli ","12","account_type_asset","other","TRUE" +"1211","1211","fondo ammortamento fabbricati ","12","account_type_asset","other","TRUE" +"1212","1212","fondo ammortamento impianti e macchinari ","12","account_type_asset","other","TRUE" +"1214","1214","fondo ammortamento attrezzature commerciali ","12","account_type_asset","other","TRUE" +"1215","1215","fondo ammortamento macchine d'ufficio ","12","account_type_asset","other","TRUE" +"1216","1216","fondo ammortamento arredamento ","12","account_type_asset","other","TRUE" +"1217","1217","fondo ammortamento automezzi ","12","account_type_asset","other","TRUE" +"1218","1218","fondo ammortamento imballaggi durevoli ","12","account_type_asset","other","TRUE" +"1220","1220","fornitori immobilizzazioni c/acconti ","12","account_type_asset","other","TRUE" "13","13","IMMOBILIZZAZIONI FINANZIARIE ","1","account_type_view","view","TRUE" -"1301","1301","mutui attivi ","13","account_type_view","other","TRUE" +"1301","1301","mutui attivi ","13","account_type_asset","other","TRUE" "14","14","RIMANENZE ","1","account_type_view","view","TRUE" -"1401","1401","materie di consumo ","14","account_type_view","other","TRUE" -"1404","1404","merci ","14","account_type_view","other","TRUE" -"1410","1410","fornitori c/acconti ","14","account_type_view","other","TRUE" +"1401","1401","materie di consumo ","14","account_type_asset","other","TRUE" +"1404","1404","merci ","14","account_type_asset","other","TRUE" +"1410","1410","fornitori c/acconti ","14","account_type_asset","other","TRUE" "15","15","CREDITI COMMERCIALI ","1","account_type_view","view","TRUE" "1501","1501","crediti v/clienti ","15","account_type_receivable","receivable","TRUE" "1502","1502","crediti commerciali diversi ","15","account_type_receivable","other","TRUE" @@ -44,15 +44,15 @@ "1540","1540","fondo svalutazione crediti ","15","account_type_receivable","other","TRUE" "1541","1541","fondo rischi su crediti ","15","account_type_receivable","other","TRUE" "16","16","CREDITI DIVERSI ","1","account_type_view","view","TRUE" -"1601","1601","IVA n/credito ","16","account_type_receivable","other","TRUE" -"1602","1602","IVA c/acconto ","16","account_type_receivable","other","TRUE" -"1605","1605","crediti per IVA ","16","account_type_receivable","other","TRUE" -"1607","1607","imposte c/acconto ","16","account_type_receivable","other","TRUE" -"1608","1608","crediti per imposte ","16","account_type_receivable","other","TRUE" -"1609","1609","crediti per ritenute subite ","16","account_type_receivable","other","TRUE" -"1610","1610","crediti per cauzioni ","16","account_type_receivable","other","TRUE" -"1620","1620","personale c/acconti ","16","account_type_receivable","other","TRUE" -"1630","1630","crediti v/istituti previdenziali ","16","account_type_receivable","other","TRUE" +"1601","1601","IVA n/credito ","16","account_type_tax","other","TRUE" +"1602","1602","IVA c/acconto ","16","account_type_tax","other","TRUE" +"1605","1605","crediti per IVA ","16","account_type_tax","other","TRUE" +"1607","1607","imposte c/acconto ","16","account_type_tax","other","TRUE" +"1608","1608","crediti per imposte ","16","account_type_tax","other","TRUE" +"1609","1609","crediti per ritenute subite ","16","account_type_asset","other","TRUE" +"1610","1610","crediti per cauzioni ","16","account_type_asset","other","TRUE" +"1620","1620","personale c/acconti ","16","account_type_asset","other","TRUE" +"1630","1630","crediti v/istituti previdenziali ","16","account_type_asset","other","TRUE" "1640","1640","debitori diversi ","16","account_type_receivable","receivable","TRUE" "18","18","DISPONIBILITÀ LIQUIDE ","1","account_type_view","view","TRUE" "1801","1801","banche c/c ","18","account_type_bank","liquidity","TRUE" @@ -61,73 +61,73 @@ "1821","1821","assegni ","18","account_type_cash","liquidity","TRUE" "1822","1822","valori bollati ","18","account_type_cash","liquidity","TRUE" "19","19","RATEI E RISCONTI ATTIVI ","1","account_type_view","view","TRUE" -"1901","1901","ratei attivi ","19","account_type_view","other","TRUE" -"1902","1902","risconti attivi ","19","account_type_view","other","TRUE" +"1901","1901","ratei attivi ","19","account_type_asset","other","TRUE" +"1902","1902","risconti attivi ","19","account_type_asset","other","TRUE" "2","2","PASSIVO ","0","account_type_view","view","TRUE" "20","20","PATRIMONIO NETTO ","2","account_type_view","view","TRUE" -"2101","2101","patrimonio netto ","20","account_type_view","other","TRUE" -"2102","2102","utile d'esercizio ","20","account_type_view","receivable","TRUE" -"2103","2103","perdita d'esercizio ","20","account_type_view","payable","TRUE" -"2104","2104","prelevamenti extra gestione ","20","account_type_view","other","TRUE" -"2105","2105","titolare c/ritenute subite ","20","account_type_view","other","TRUE" +"2101","2101","patrimonio netto ","20","account_type_asset","other","TRUE" +"2102","2102","utile d'esercizio ","20","account_type_asset","other","TRUE" +"2103","2103","perdita d'esercizio ","20","account_type_asset","other","TRUE" +"2104","2104","prelevamenti extra gestione ","20","account_type_asset","other","TRUE" +"2105","2105","titolare c/ritenute subite ","20","account_type_asset","other","TRUE" "22","22","FONDI PER RISCHI E ONERI ","2","account_type_view","view","TRUE" -"2201","2201","fondo per imposte ","22","account_type_view","other","TRUE" -"2204","2204","fondo responsabilità civile ","22","account_type_view","other","TRUE" -"2205","2205","fondo spese future ","22","account_type_view","other","TRUE" -"2211","2211","fondo manutenzioni programmate ","22","account_type_view","other","TRUE" +"2201","2201","fondo per imposte ","22","account_type_asset","other","TRUE" +"2204","2204","fondo responsabilità civile ","22","account_type_asset","other","TRUE" +"2205","2205","fondo spese future ","22","account_type_asset","other","TRUE" +"2211","2211","fondo manutenzioni programmate ","22","account_type_asset","other","TRUE" "23","23","TRATTAMENTO FINE RAPPORTO DI LAVORO ","2","account_type_view","view","TRUE" -"2301","2301","debiti per TFRL ","23","account_type_view","other","TRUE" +"2301","2301","debiti per TFRL ","23","account_type_asset","other","TRUE" "24","24","DEBITI FINANZIARI ","2","account_type_view","view","TRUE" -"2410","2410","mutui passivi ","24","account_type_payable","other","TRUE" -"2411","2411","banche c/sovvenzioni ","24","account_type_payable","other","TRUE" -"2420","2420","banche c/c passivi ","24","account_type_payable","other","TRUE" -"2421","2421","banche c/RIBA all'incasso ","24","account_type_payable","other","TRUE" -"2422","2422","banche c/cambiali all'incasso ","24","account_type_payable","other","TRUE" -"2423","2423","banche c/anticipi su fatture ","24","account_type_payable","other","TRUE" -"2440","2440","debiti v/altri finanziatori ","24","account_type_payable","other","TRUE" +"2410","2410","mutui passivi ","24","account_type_asset","other","TRUE" +"2411","2411","banche c/sovvenzioni ","24","account_type_asset","other","TRUE" +"2420","2420","banche c/c passivi ","24","account_type_asset","other","TRUE" +"2421","2421","banche c/RIBA all'incasso ","24","account_type_asset","other","TRUE" +"2422","2422","banche c/cambiali all'incasso ","24","account_type_asset","other","TRUE" +"2423","2423","banche c/anticipi su fatture ","24","account_type_asset","other","TRUE" +"2440","2440","debiti v/altri finanziatori ","24","account_type_asset","other","TRUE" "25","25","DEBITI COMMERCIALI ","2","account_type_view","view","TRUE" "2501","2501","debiti v/fornitori ","25","account_type_payable","payable","TRUE" -"2503","2503","cambiali passive ","25","account_type_payable","other","TRUE" -"2520","2520","fatture da ricevere ","25","account_type_payable","other","TRUE" -"2521","2521","debiti da liquidare ","25","account_type_payable","other","TRUE" +"2503","2503","cambiali passive ","25","account_type_asset","other","TRUE" +"2520","2520","fatture da ricevere ","25","account_type_asset","other","TRUE" +"2521","2521","debiti da liquidare ","25","account_type_asset","other","TRUE" "2530","2530","clienti c/acconti ","25","account_type_payable","payable","TRUE" "26","26","DEBITI DIVERSI ","2","account_type_view","view","TRUE" -"2601","2601","IVA n/debito ","26","account_type_payable","other","TRUE" -"2602","2602","debiti per ritenute da versare ","26","account_type_payable","other","TRUE" -"2605","2605","erario c/IVA ","26","account_type_payable","payable","TRUE" -"2606","2606","debiti per imposte ","26","account_type_payable","other","TRUE" -"2619","2619","debiti per cauzioni ","26","account_type_payable","other","TRUE" -"2620","2620","personale c/retribuzioni ","26","account_type_payable","other","TRUE" -"2621","2621","personale c/liquidazioni ","26","account_type_payable","other","TRUE" -"2622","2622","clienti c/cessione ","26","account_type_payable","other","TRUE" -"2630","2630","debiti v/istituti previdenziali ","26","account_type_payable","other","TRUE" +"2601","2601","IVA n/debito ","26","account_type_tax","other","TRUE" +"2602","2602","debiti per ritenute da versare ","26","account_type_tax","other","TRUE" +"2605","2605","erario c/IVA ","26","account_type_tax","payable","TRUE" +"2606","2606","debiti per imposte ","26","account_type_tax","other","TRUE" +"2619","2619","debiti per cauzioni ","26","account_type_asset","other","TRUE" +"2620","2620","personale c/retribuzioni ","26","account_type_asset","other","TRUE" +"2621","2621","personale c/liquidazioni ","26","account_type_asset","other","TRUE" +"2622","2622","clienti c/cessione ","26","account_type_asset","other","TRUE" +"2630","2630","debiti v/istituti previdenziali ","26","account_type_asset","other","TRUE" "2640","2640","creditori diversi ","26","account_type_payable","payable","TRUE" "27","27","RATEI E RISCONTI PASSIVI ","2","account_type_view","view","TRUE" -"2701","2701","ratei passivi ","27","account_type_view","other","TRUE" -"2702","2702","risconti passivi ","27","account_type_view","other","TRUE" +"2701","2701","ratei passivi ","27","account_type_asset","other","TRUE" +"2702","2702","risconti passivi ","27","account_type_asset","other","TRUE" "28","28","CONTI TRANSITORI E DIVERSI ","2","account_type_view","view","TRUE" -"2801","2801","bilancio di apertura ","28","account_type_view","other","TRUE" -"2802","2802","bilancio di chiusura ","28","account_type_view","other","TRUE" -"2810","2810","IVA c/liquidazioni ","28","account_type_view","other","TRUE" -"2811","2811","istituti previdenziali ","28","account_type_view","other","TRUE" -"2820","2820","banca ... c/c ","28","account_type_view","other","TRUE" -"2821","2821","banca ... c/c ","28","account_type_view","other","TRUE" -"2822","2822","banca ... c/c ","28","account_type_view","other","TRUE" +"2801","2801","bilancio di apertura ","28","account_type_asset","other","TRUE" +"2802","2802","bilancio di chiusura ","28","account_type_asset","other","TRUE" +"2810","2810","IVA c/liquidazioni ","28","account_type_asset","other","TRUE" +"2811","2811","istituti previdenziali ","28","account_type_asset","other","TRUE" +"2820","2820","banca ... c/c ","28","account_type_asset","other","TRUE" +"2821","2821","banca ... c/c ","28","account_type_asset","other","TRUE" +"2822","2822","banca ... c/c ","28","account_type_asset","other","TRUE" "29","29","CONTI DEI SISTEMI SUPPLEMENTARI ","2","account_type_view","view","TRUE" -"2901","2901","beni di terzi ","29","account_type_view","other","TRUE" -"2902","2902","depositanti beni ","29","account_type_view","other","TRUE" -"2911","2911","merci da ricevere ","29","account_type_view","other","TRUE" -"2912","2912","fornitori c/impegni ","29","account_type_view","other","TRUE" -"2913","2913","impegni per beni in leasing ","29","account_type_view","other","TRUE" -"2914","2914","creditori c/leasing ","29","account_type_view","other","TRUE" -"2916","2916","clienti c/impegni ","29","account_type_view","other","TRUE" -"2917","2917","merci da consegnare ","29","account_type_view","other","TRUE" -"2921","2921","rischi per effetti scontati ","29","account_type_view","other","TRUE" -"2922","2922","banche c/effetti scontati ","29","account_type_view","other","TRUE" -"2926","2926","rischi per fideiussioni ","29","account_type_view","other","TRUE" -"2927","2927","creditori per fideiussioni ","29","account_type_view","other","TRUE" -"2931","2931","rischi per avalli ","29","account_type_view","other","TRUE" -"2932","2932","creditori per avalli ","29","account_type_view","other","TRUE" +"2901","2901","beni di terzi ","29","account_type_asset","other","TRUE" +"2902","2902","depositanti beni ","29","account_type_asset","other","TRUE" +"2911","2911","merci da ricevere ","29","account_type_asset","other","TRUE" +"2912","2912","fornitori c/impegni ","29","account_type_asset","other","TRUE" +"2913","2913","impegni per beni in leasing ","29","account_type_asset","other","TRUE" +"2914","2914","creditori c/leasing ","29","account_type_asset","other","TRUE" +"2916","2916","clienti c/impegni ","29","account_type_asset","other","TRUE" +"2917","2917","merci da consegnare ","29","account_type_asset","other","TRUE" +"2921","2921","rischi per effetti scontati ","29","account_type_asset","other","TRUE" +"2922","2922","banche c/effetti scontati ","29","account_type_asset","other","TRUE" +"2926","2926","rischi per fideiussioni ","29","account_type_asset","other","TRUE" +"2927","2927","creditori per fideiussioni ","29","account_type_asset","other","TRUE" +"2931","2931","rischi per avalli ","29","account_type_asset","other","TRUE" +"2932","2932","creditori per avalli ","29","account_type_asset","other","TRUE" "3","3","VALORE DELLA PRODUZIONE ","0","account_type_view","view","TRUE" "31","31","VENDITE E PRESTAZIONI ","3","account_type_view","view","TRUE" "3101","3101","merci c/vendite ","31","account_type_income","other","TRUE" diff --git a/addons/l10n_it/data/account.account.type.csv b/addons/l10n_it/data/account.account.type.csv index 273ff71eb05..d6827ca151c 100644 --- a/addons/l10n_it/data/account.account.type.csv +++ b/addons/l10n_it/data/account.account.type.csv @@ -1,11 +1,10 @@ "id","code","name","close_method","report_type" -"account_type_receivable","receivable","Debiti","unreconciled","liability" -"account_type_payable","payable","Crediti","unreconciled","asset" +"account_type_receivable","receivable","Crediti","unreconciled","asset" +"account_type_payable","payable","Debiti","unreconciled","liability" "account_type_view","view","Gerarchia","none", "account_type_income","income","Entrate","none","income" "account_type_expense","expense","Uscite","none","expense" -"account_type_tax","tax","Tasse","none", +"account_type_tax","tax","Tasse","balance", "account_type_cash","cash","Liquidità","balance","asset" -"account_type_asset","asset","Beni","none","asset" +"account_type_asset","asset","Beni","balance","asset" "account_type_bank","bank","Banca","balance","asset" -"account_type_equity","equity","Capitale","none","asset" From a490d148a47c8a3a2a4e7d123b57a7d6fddf85bf Mon Sep 17 00:00:00 2001 From: eLBati Date: Sun, 25 Sep 2011 11:15:08 +0200 Subject: [PATCH 06/41] [FIX] P & L accounts bzr revid: lorenzo.battistini@agilebg.com-20110925091508-tyg6fak0oiik5y2r --- .../l10n_it/data/account.account.template.csv | 82 +++++++++---------- addons/l10n_it/data/account.account.type.csv | 1 + 2 files changed, 42 insertions(+), 41 deletions(-) diff --git a/addons/l10n_it/data/account.account.template.csv b/addons/l10n_it/data/account.account.template.csv index a838a76e892..4fe01b77561 100644 --- a/addons/l10n_it/data/account.account.template.csv +++ b/addons/l10n_it/data/account.account.template.csv @@ -177,58 +177,58 @@ "4403","4403","TFRL ","44","account_type_expense","other","TRUE" "4404","4404","altri costi per il personale ","44","account_type_expense","other","TRUE" "45","45","AMMORTAMENTI IMMOBILIZZAZIONI IMMATERIALI ","4","account_type_view","view","TRUE" -"4501","4501","ammortamento costi di impianto ","45","account_type_view","other","TRUE" -"4506","4506","ammortamento software ","45","account_type_view","other","TRUE" -"4508","4508","ammortamento avviamento ","45","account_type_view","other","TRUE" +"4501","4501","ammortamento costi di impianto ","45","account_type_p_l","other","TRUE" +"4506","4506","ammortamento software ","45","account_type_p_l","other","TRUE" +"4508","4508","ammortamento avviamento ","45","account_type_p_l","other","TRUE" "46","46","AMMORTAMENTI IMMOBILIZZAZIONI MATERIALI ","4","account_type_view","view","TRUE" -"4601","4601","ammortamento fabbricati ","46","account_type_view","other","TRUE" -"4602","4602","ammortamento impianti e macchinari ","46","account_type_view","other","TRUE" -"4604","4604","ammortamento attrezzature commerciali ","46","account_type_view","other","TRUE" -"4605","4605","ammortamento macchine d'ufficio ","46","account_type_view","other","TRUE" -"4606","4606","ammortamento arredamento ","46","account_type_view","other","TRUE" -"4607","4607","ammortamento automezzi ","46","account_type_view","other","TRUE" -"4608","4608","ammortamento imballaggi durevoli ","46","account_type_view","other","TRUE" +"4601","4601","ammortamento fabbricati ","46","account_type_p_l","other","TRUE" +"4602","4602","ammortamento impianti e macchinari ","46","account_type_p_l","other","TRUE" +"4604","4604","ammortamento attrezzature commerciali ","46","account_type_p_l","other","TRUE" +"4605","4605","ammortamento macchine d'ufficio ","46","account_type_p_l","other","TRUE" +"4606","4606","ammortamento arredamento ","46","account_type_p_l","other","TRUE" +"4607","4607","ammortamento automezzi ","46","account_type_p_l","other","TRUE" +"4608","4608","ammortamento imballaggi durevoli ","46","account_type_p_l","other","TRUE" "47","47","SVALUTAZIONI ","4","account_type_view","view","TRUE" -"4701","4701","svalutazioni immobilizzazioni immateriali ","47","account_type_view","other","TRUE" -"4702","4702","svalutazioni immobilizzazioni materiali ","47","account_type_view","other","TRUE" -"4706","4706","svalutazione crediti ","47","account_type_view","other","TRUE" +"4701","4701","svalutazioni immobilizzazioni immateriali ","47","account_type_p_l","other","TRUE" +"4702","4702","svalutazioni immobilizzazioni materiali ","47","account_type_p_l","other","TRUE" +"4706","4706","svalutazione crediti ","47","account_type_p_l","other","TRUE" "48","48","ACCANTONAMENTI ","4","account_type_view","view","TRUE" "481","481","ACCANTONAMENTI PER RISCHI ","48","account_type_view","view","TRUE" -"4814","4814","accantonamento per responsabilità civile ","481","account_type_view","other","TRUE" +"4814","4814","accantonamento per responsabilità civile ","481","account_type_p_l","other","TRUE" "482","482","ALTRI ACCANTONAMENTI ","48","account_type_view","view","TRUE" -"4821","4821","accantonamento per spese future ","482","account_type_view","other","TRUE" -"4823","4823","accantonamento per manutenzioni programmate ","482","account_type_view","other","TRUE" +"4821","4821","accantonamento per spese future ","482","account_type_p_l","other","TRUE" +"4823","4823","accantonamento per manutenzioni programmate ","482","account_type_p_l","other","TRUE" "49","49","ONERI DIVERSI ","4","account_type_view","view","TRUE" -"4901","4901","oneri fiscali diversi ","49","account_type_view","other","TRUE" -"4903","4903","oneri vari ","49","account_type_view","other","TRUE" -"4905","4905","perdite su crediti ","49","account_type_view","other","TRUE" -"4910","4910","arrotondamenti passivi ","49","account_type_view","other","TRUE" -"4920","4920","minusvalenze ordinarie diverse ","49","account_type_view","other","TRUE" -"4930","4930","sopravvenienze passive ordinarie diverse ","49","account_type_view","other","TRUE" -"4940","4940","insussistenze passive ordinarie diverse ","49","account_type_view","other","TRUE" +"4901","4901","oneri fiscali diversi ","49","account_type_p_l","other","TRUE" +"4903","4903","oneri vari ","49","account_type_p_l","other","TRUE" +"4905","4905","perdite su crediti ","49","account_type_p_l","other","TRUE" +"4910","4910","arrotondamenti passivi ","49","account_type_p_l","other","TRUE" +"4920","4920","minusvalenze ordinarie diverse ","49","account_type_p_l","other","TRUE" +"4930","4930","sopravvenienze passive ordinarie diverse ","49","account_type_p_l","other","TRUE" +"4940","4940","insussistenze passive ordinarie diverse ","49","account_type_p_l","other","TRUE" "5","5","PROVENTI E ONERI FINANZIARI ","0","account_type_view","view","TRUE" "51","51","PROVENTI FINANZIARI ","5","account_type_view","view","TRUE" -"5110","5110","interessi attivi v/clienti ","51","account_type_view","other","TRUE" -"5115","5115","interessi attivi bancari ","51","account_type_view","other","TRUE" -"5116","5116","interessi attivi postali ","51","account_type_view","other","TRUE" -"5140","5140","proventi finanziari diversi ","51","account_type_view","other","TRUE" +"5110","5110","interessi attivi v/clienti ","51","account_type_p_l","other","TRUE" +"5115","5115","interessi attivi bancari ","51","account_type_p_l","other","TRUE" +"5116","5116","interessi attivi postali ","51","account_type_p_l","other","TRUE" +"5140","5140","proventi finanziari diversi ","51","account_type_p_l","other","TRUE" "52","52","ONERI FINANZIARI ","5","account_type_view","view","TRUE" -"5201","5201","interessi passivi v/fornitori ","52","account_type_view","other","TRUE" -"5202","5202","interessi passivi bancari ","52","account_type_view","other","TRUE" -"5203","5203","sconti passivi bancari ","52","account_type_view","other","TRUE" -"5210","5210","interessi passivi su mutui ","52","account_type_view","other","TRUE" -"5240","5240","oneri finanziari diversi ","52","account_type_view","other","TRUE" +"5201","5201","interessi passivi v/fornitori ","52","account_type_p_l","other","TRUE" +"5202","5202","interessi passivi bancari ","52","account_type_p_l","other","TRUE" +"5203","5203","sconti passivi bancari ","52","account_type_p_l","other","TRUE" +"5210","5210","interessi passivi su mutui ","52","account_type_p_l","other","TRUE" +"5240","5240","oneri finanziari diversi ","52","account_type_p_l","other","TRUE" "7","7","PROVENTI E ONERI STRAORDINARI ","0","account_type_view","view","TRUE" "71","71","PROVENTI STRAORDINARI ","7","account_type_view","view","TRUE" -"7101","7101","plusvalenze straordinarie ","71","account_type_view","other","TRUE" -"7102","7102","sopravvenienze attive straordinarie ","71","account_type_view","other","TRUE" -"7103","7103","insussistenze attive straordinarie ","71","account_type_view","other","TRUE" +"7101","7101","plusvalenze straordinarie ","71","account_type_p_l","other","TRUE" +"7102","7102","sopravvenienze attive straordinarie ","71","account_type_p_l","other","TRUE" +"7103","7103","insussistenze attive straordinarie ","71","account_type_p_l","other","TRUE" "72","72","ONERI STRAORDINARI ","7","account_type_view","view","TRUE" -"7201","7201","minusvalenze straordinarie ","72","account_type_view","other","TRUE" -"7202","7202","sopravvenienze passive straordinarie ","72","account_type_view","other","TRUE" -"7203","7203","insussistenze passive straordinarie ","72","account_type_view","other","TRUE" -"7204","7204","imposte esercizi precedenti ","72","account_type_view","other","TRUE" +"7201","7201","minusvalenze straordinarie ","72","account_type_p_l","other","TRUE" +"7202","7202","sopravvenienze passive straordinarie ","72","account_type_p_l","other","TRUE" +"7203","7203","insussistenze passive straordinarie ","72","account_type_p_l","other","TRUE" +"7204","7204","imposte esercizi precedenti ","72","account_type_p_l","other","TRUE" "81","81","IMPOSTE DELL'ESERCIZIO ","7","account_type_view","view","TRUE" -"8101","8101","imposte dell'esercizio ","81","account_type_view","other","TRUE" +"8101","8101","imposte dell'esercizio ","81","account_type_p_l","other","TRUE" "91","91","CONTI DI RISULTATO ","7","account_type_view","view","TRUE" -"9101","9101","conto di risultato economico ","91","account_type_view","other","TRUE" +"9101","9101","conto di risultato economico ","91","account_type_p_l","other","TRUE" diff --git a/addons/l10n_it/data/account.account.type.csv b/addons/l10n_it/data/account.account.type.csv index d6827ca151c..36eeebbbe89 100644 --- a/addons/l10n_it/data/account.account.type.csv +++ b/addons/l10n_it/data/account.account.type.csv @@ -8,3 +8,4 @@ "account_type_cash","cash","Liquidità","balance","asset" "account_type_asset","asset","Beni","balance","asset" "account_type_bank","bank","Banca","balance","asset" +"account_type_p_l","p_l","Conto Economico","none", From c9ca63f8bb7936ba02106a79b75b17e513a9142a Mon Sep 17 00:00:00 2001 From: eLBati Date: Fri, 30 Sep 2011 14:10:30 +0200 Subject: [PATCH 07/41] [FIX] conti di fine esercizio bzr revid: lorenzo.battistini@agilebg.com-20110930121030-ru3n6v06npmjt69v --- addons/l10n_it/data/account.account.template.csv | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/l10n_it/data/account.account.template.csv b/addons/l10n_it/data/account.account.template.csv index 4fe01b77561..e1450bcea70 100644 --- a/addons/l10n_it/data/account.account.template.csv +++ b/addons/l10n_it/data/account.account.template.csv @@ -228,7 +228,7 @@ "7202","7202","sopravvenienze passive straordinarie ","72","account_type_p_l","other","TRUE" "7203","7203","insussistenze passive straordinarie ","72","account_type_p_l","other","TRUE" "7204","7204","imposte esercizi precedenti ","72","account_type_p_l","other","TRUE" -"81","81","IMPOSTE DELL'ESERCIZIO ","7","account_type_view","view","TRUE" +"81","81","IMPOSTE DELL'ESERCIZIO ","0","account_type_view","view","TRUE" "8101","8101","imposte dell'esercizio ","81","account_type_p_l","other","TRUE" -"91","91","CONTI DI RISULTATO ","7","account_type_view","view","TRUE" +"91","91","CONTI DI RISULTATO ","0","account_type_view","view","TRUE" "9101","9101","conto di risultato economico ","91","account_type_p_l","other","TRUE" From a403d23b7083486949922a4098429799e27c0d35 Mon Sep 17 00:00:00 2001 From: eLBati Date: Sun, 2 Oct 2011 15:45:53 +0200 Subject: [PATCH 08/41] [IMP] stato patrimoniale per la chiusura dei conti bzr revid: lorenzo.battistini@agilebg.com-20111002134553-vjk7xdk2jbebwqq2 --- addons/l10n_it/data/account.account.template.csv | 1 + 1 file changed, 1 insertion(+) diff --git a/addons/l10n_it/data/account.account.template.csv b/addons/l10n_it/data/account.account.template.csv index e1450bcea70..8d2b5a41769 100644 --- a/addons/l10n_it/data/account.account.template.csv +++ b/addons/l10n_it/data/account.account.template.csv @@ -232,3 +232,4 @@ "8101","8101","imposte dell'esercizio ","81","account_type_p_l","other","TRUE" "91","91","CONTI DI RISULTATO ","0","account_type_view","view","TRUE" "9101","9101","conto di risultato economico ","91","account_type_p_l","other","TRUE" +"9102","9102","stato patrimoniale","91","account_type_p_l","other","TRUE" From ee1df93906970eb03426a90cd7eaaab01c3cf726 Mon Sep 17 00:00:00 2001 From: eLBati Date: Tue, 4 Oct 2011 07:45:11 +0200 Subject: [PATCH 09/41] [FIX] account codes bzr revid: lorenzo.battistini@agilebg.com-20111004054511-4gz8em15cj4piiiq --- addons/l10n_it/data/account.account.template.csv | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/addons/l10n_it/data/account.account.template.csv b/addons/l10n_it/data/account.account.template.csv index 8d2b5a41769..bc05351a898 100644 --- a/addons/l10n_it/data/account.account.template.csv +++ b/addons/l10n_it/data/account.account.template.csv @@ -228,8 +228,8 @@ "7202","7202","sopravvenienze passive straordinarie ","72","account_type_p_l","other","TRUE" "7203","7203","insussistenze passive straordinarie ","72","account_type_p_l","other","TRUE" "7204","7204","imposte esercizi precedenti ","72","account_type_p_l","other","TRUE" -"81","81","IMPOSTE DELL'ESERCIZIO ","0","account_type_view","view","TRUE" -"8101","8101","imposte dell'esercizio ","81","account_type_p_l","other","TRUE" -"91","91","CONTI DI RISULTATO ","0","account_type_view","view","TRUE" -"9101","9101","conto di risultato economico ","91","account_type_p_l","other","TRUE" -"9102","9102","stato patrimoniale","91","account_type_p_l","other","TRUE" +"8","8","IMPOSTE DELL'ESERCIZIO ","0","account_type_view","view","TRUE" +"8101","8101","imposte dell'esercizio ","8","account_type_p_l","other","TRUE" +"9","9","CONTI DI RISULTATO ","0","account_type_view","view","TRUE" +"9101","9101","conto di risultato economico ","9","account_type_p_l","other","TRUE" +"9102","9102","stato patrimoniale","9","account_type_p_l","other","TRUE" From 9410a87c607b95114133455d0396c90467047067 Mon Sep 17 00:00:00 2001 From: eLBati Date: Tue, 11 Oct 2011 17:56:04 +0200 Subject: [PATCH 10/41] [IMP] partially ded VAT 21% bzr revid: lorenzo.battistini@agilebg.com-20111011155604-ta41k3dwb2ti2h7q --- addons/l10n_it/data/account.tax.code.template.csv | 10 ++++++++++ addons/l10n_it/data/account.tax.template.csv | 15 +++++++++++++++ 2 files changed, 25 insertions(+) diff --git a/addons/l10n_it/data/account.tax.code.template.csv b/addons/l10n_it/data/account.tax.code.template.csv index 01699380f81..40f0545aff9 100644 --- a/addons/l10n_it/data/account.tax.code.template.csv +++ b/addons/l10n_it/data/account.tax.code.template.csv @@ -50,3 +50,13 @@ "IVD12I","template_impcode_riscossa_12","IVA a debito 12% (imponibile)","template_impcode_riscossa" "IVD2","template_ivacode_riscossa_2","IVA a debito 2%","template_ivacode_riscossa" "IVD2I","template_impcode_riscossa_2","IVA a debito 2% (imponibile)","template_impcode_riscossa" +"IVC21ind","template_ivacode_pagata_21ind","IVA a credito 21% indetraibile","template_ivacode_pagata" +"IVC21Iind","template_impcode_pagata_21ind","IVA a credito 21% indetraibile (imponibile)","template_impcode_pagata" +"IVC21det10","template_ivacode_pagata_21det10","IVA a credito 21% detraibile 10%","template_ivacode_pagata" +"IVC21Idet10","template_impcode_pagata_21det10","IVA a credito 21% detraibile 10% (imponibile)","template_impcode_pagata" +"IVC21det15","template_ivacode_pagata_21det15","IVA a credito 21% detraibile 15%","template_ivacode_pagata" +"IVC21Idet15","template_impcode_pagata_21det15","IVA a credito 21% detraibile 15% (imponibile)","template_impcode_pagata" +"IVC21det40","template_ivacode_pagata_21det40","IVA a credito 21% detraibile 40%","template_ivacode_pagata" +"IVC21Idet40","template_impcode_pagata_21det40","IVA a credito 21% detraibile 40% (imponibile)","template_impcode_pagata" +"IVC21det50","template_ivacode_pagata_21det50","IVA a credito 21% detraibile 50%","template_ivacode_pagata" +"IVC21Idet50","template_impcode_pagata_21det50","IVA a credito 21% detraibile 50% (imponibile)","template_impcode_pagata" diff --git a/addons/l10n_it/data/account.tax.template.csv b/addons/l10n_it/data/account.tax.template.csv index c0ce348693c..d0e9fe9c3f6 100644 --- a/addons/l10n_it/data/account.tax.template.csv +++ b/addons/l10n_it/data/account.tax.template.csv @@ -47,3 +47,18 @@ "22a INC","22a INC","l10n_it_chart_template_generic","Iva 2% (debito) INC",,"0.02",,"False","percent","l10n_it.2601","l10n_it.2601","sale","l10n_it.template_impcode_riscossa_2","l10n_it.template_ivacode_riscossa_2","l10n_it.template_impcode_riscossa_2","l10n_it.template_ivacode_riscossa_2","-1","-1","True" "4a INC","4a INC","l10n_it_chart_template_generic","Iva 4% (debito) INC",,"0.04",,"False","percent","l10n_it.2601","l10n_it.2601","sale","l10n_it.template_impcode_riscossa_4","l10n_it.template_ivacode_riscossa_4","l10n_it.template_impcode_riscossa_4","l10n_it.template_ivacode_riscossa_4","-1","-1","True" "00a INC","00a INC","l10n_it_chart_template_generic","Esente IVA (debito) INC",,"0",,"False","percent","l10n_it.2601","l10n_it.2601","sale","l10n_it.template_impcode_riscossa_0","l10n_it.template_ivacode_riscossa_0","l10n_it.template_impcode_riscossa_0","l10n_it.template_ivacode_riscossa_0","-1","-1","True" +"2110","2110","l10n_it_chart_template_generic","Iva al 21% detraibile 10%",,"0.21",,"True","percent",,,"purchase","template_impcode_pagata_21det10",,"template_impcode_pagata_21det10",,"-1",,"False" +"2110a","2110a","l10n_it_chart_template_generic","Iva al 21% detraibile 10% (D)","2","0","2110","False","balance","1601","1601","purchase",,"template_ivacode_pagata_21det10",,"template_ivacode_pagata_21det10",,"-1","False" +"2110b","2110b","l10n_it_chart_template_generic","Iva al 21% detraibile 10% (I)","1","0.9","2110","False","percent",,,"purchase",,,,,,,"False" +"2115","2115","l10n_it_chart_template_generic","Iva al 21% detraibile 15%",,"0.21",,"True","percent",,,"purchase","template_impcode_pagata_21det15",,"template_impcode_pagata_21det15",,"-1",,"False" +"2115a","2115a","l10n_it_chart_template_generic","Iva al 21% detraibile 15% (D)","2","0","2115","False","balance","1601","1601","purchase",,"template_ivacode_pagata_21det15",,"template_ivacode_pagata_21det15",,"-1","False" +"2115b","2115b","l10n_it_chart_template_generic","Iva al 21% detraibile 15% (I)","1","0.85","2115","False","percent",,,"purchase",,,,,,,"False" +"2140","2140","l10n_it_chart_template_generic","Iva al 21% detraibile 40%",,"0.21",,"True","percent",,,"purchase","template_impcode_pagata_21det40",,"template_impcode_pagata_21det40",,"-1",,"False" +"2140a","2140a","l10n_it_chart_template_generic","Iva al 21% detraibile 40% (D)","2","0","2140","False","balance","1601","1601","purchase",,"template_ivacode_pagata_21det40",,"template_ivacode_pagata_21det40",,"-1","False" +"2140b","2140b","l10n_it_chart_template_generic","Iva al 21% detraibile 40% (I)","1","0.6","2140","False","percent",,,"purchase",,,,,,,"False" +"21AO","21AO","l10n_it_chart_template_generic","Iva al 21% indetraibile",,"0.21",,"True","percent",,,"purchase","template_impcode_pagata_21ind",,"template_impcode_pagata_21ind",,"-1",,"False" +"21AOa","21AOa","l10n_it_chart_template_generic","Iva al 21% indetraibile (D)","2","0","21AO","False","balance","1601","1601","purchase",,"template_ivacode_pagata_21ind",,"template_ivacode_pagata_21ind",,"-1","False" +"21AOb","21AOb","l10n_it_chart_template_generic","Iva al 21% indetraibile (I)","1","1","21AO","False","percent",,,"purchase",,,,,,,"False" +"21I5","21I5","l10n_it_chart_template_generic","IVA al 21% detraibile al 50%",,"0.21",,"True","percent",,,"purchase","template_impcode_pagata_21det50",,"template_impcode_pagata_21det50",,"-1",,"False" +"21I5b","21I5b","l10n_it_chart_template_generic","IVA al 21% detraibile al 50% (I)","1","0.5","21I5","False","percent",,,"purchase",,,,,,,"False" +"21I5a","21I5a","l10n_it_chart_template_generic","IVA al 21% detraibile al 50% (D)","2","0","21I5","False","balance","1601","1601","purchase",,"template_ivacode_pagata_21det50",,"template_ivacode_pagata_21det50",,"-1","False" From d0f70e9b29ee482c2ead91b04267c4c7e20afadd Mon Sep 17 00:00:00 2001 From: Dmitrijs Ledkovs Date: Thu, 13 Oct 2011 17:20:21 +0100 Subject: [PATCH 11/41] [IMP] allow to unset fields in yaml import lp bug: https://launchpad.net/bugs/873456 fixed bzr revid: dmitrijs.ledkovs@credativ.co.uk-20111013162021-225j5kl25bg9su3a --- openerp/tools/yaml_import.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/openerp/tools/yaml_import.py b/openerp/tools/yaml_import.py index 91cdda1b896..0ec52a9bdf6 100644 --- a/openerp/tools/yaml_import.py +++ b/openerp/tools/yaml_import.py @@ -164,6 +164,8 @@ class YamlInterpreter(object): self.logger.log(logging.ERROR, 'id: %s is to long (max: 64)', id) def get_id(self, xml_id): + if xml_id == None: + return None if not xml_id: raise YamlImportException("The xml_id should be a non empty string.") if isinstance(xml_id, types.IntType): From 4a1951c6b95d975697f206aa9b9522adc9c08fbd Mon Sep 17 00:00:00 2001 From: eLBati Date: Sun, 6 Nov 2011 18:47:44 +0100 Subject: [PATCH 12/41] [DEL] functionality moved to l10n_it_partially_deductible_vat bzr revid: lorenzo.battistini@agilebg.com-20111106174744-tl0efmjn2hfsa9rp --- addons/l10n_it/__init__.py | 2 -- addons/l10n_it/account.py | 56 -------------------------------------- 2 files changed, 58 deletions(-) delete mode 100644 addons/l10n_it/account.py diff --git a/addons/l10n_it/__init__.py b/addons/l10n_it/__init__.py index f9126cd880e..491d2cc7b66 100644 --- a/addons/l10n_it/__init__.py +++ b/addons/l10n_it/__init__.py @@ -25,5 +25,3 @@ # along with this program. If not, see . # ############################################################################## - -import account diff --git a/addons/l10n_it/account.py b/addons/l10n_it/account.py deleted file mode 100644 index 98e4d5ae68b..00000000000 --- a/addons/l10n_it/account.py +++ /dev/null @@ -1,56 +0,0 @@ -# -*- encoding: utf-8 -*- -############################################################################## -# -# OpenERP, Open Source Management Solution -# Copyright (C) 2011 -# Associazione OpenERP Italia () -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as -# published by the Free Software Foundation, either version 3 of the -# License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see . -# -############################################################################## - -from osv import fields, osv -import decimal_precision as dp -from decimal import * - -class account_tax(osv.osv): - - _inherit = 'account.tax' - - def compute_all(self, cr, uid, taxes, price_unit, quantity, address_id=None, product=None, partner=None): - res = super(account_tax, self).compute_all(cr, uid, taxes, price_unit, quantity, address_id, product, partner) - - precision = self.pool.get('decimal.precision').precision_get(cr, uid, 'Account') - tax_list = res['taxes'] - totalex = res['total'] - if len(tax_list) == 2: - for tax in tax_list: - if tax.get('balance',False): # Calcolo di imponibili e imposte per l'IVA parzialmente detraibile - deductible_base = totalex - ind_tax = tax_list[abs(tax_list.index(tax)-1)] - ind_tax_obj = self.browse(cr, uid, ind_tax['id']) - ded_tax_obj = self.browse(cr, uid, tax['id']) - base_ind = float(Decimal(str(totalex * ind_tax_obj.amount)).quantize(Decimal('1.'+precision*'0'), rounding=ROUND_HALF_UP)) - base_ded = float(Decimal(str(totalex - base_ind)).quantize(Decimal('1.'+precision*'0'), rounding=ROUND_HALF_UP)) - tax_total = float(Decimal(str(tax['balance'])).quantize(Decimal('1.'+precision*'0'), rounding=ROUND_HALF_UP)) - tax_ind = float(Decimal(str(tax_total * ind_tax_obj.amount)).quantize(Decimal('1.'+precision*'0'), rounding=ROUND_HALF_UP)) - tax_ded = tax_total - tax_ind - ind_tax['price_unit'] = base_ind - tax['price_unit'] = base_ded - ind_tax['amount'] = tax_ind - tax['amount'] = tax_ded - - return res - -account_tax() From 0aca8061fabf4dc02cfb3354f4ae1a4c38f25337 Mon Sep 17 00:00:00 2001 From: "Yogesh (OpenERP)" Date: Fri, 18 Nov 2011 15:29:05 +0530 Subject: [PATCH 13/41] [FIX] correct selection fields help. False not display in help text. lp bug: https://launchpad.net/bugs/890558 fixed bzr revid: ysa@tinyerp.com-20111118095905-guzif5hgr4m0nk2j --- addons/web/static/src/xml/base.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index fb7ccdf7d8e..0e06d202171 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -837,7 +837,7 @@
  • Selection:
      -
    • +
    • [] - From 779fa653c16e56612523eb25d0f6930e492e5ab5 Mon Sep 17 00:00:00 2001 From: Numerigraphe - Lionel Sausin Date: Tue, 22 Nov 2011 09:51:38 +0100 Subject: [PATCH 14/41] [IMP] Added missing vim mode lines lp bug: https://launchpad.net/bugs/524279 fixed bzr revid: ls@numerigraphe.fr-20111122085138-x6u2lcl6vrpyybp9 --- addons/account/account_bank.py | 2 ++ addons/account/edi/__init__.py | 2 ++ addons/account/edi/invoice.py | 2 ++ addons/account/report/account_analytic_entries_report.py | 2 ++ addons/account/report/account_entries_report.py | 2 ++ addons/account/report/account_financial_report.py | 2 ++ addons/account/report/account_treasury_report.py | 2 ++ addons/account/report/common_report_header.py | 2 ++ addons/account/test/test_parent_structure.py | 2 ++ addons/account/wizard/account_report_central_journal.py | 2 ++ addons/account/wizard/account_report_common_account.py | 2 ++ addons/account/wizard/account_report_common_journal.py | 3 ++- addons/account/wizard/account_report_common_partner.py | 3 ++- addons/account/wizard/account_report_general_journal.py | 2 ++ addons/account/wizard/account_report_print_journal.py | 2 ++ addons/account/wizard/account_vat.py | 3 ++- .../account_analytic_analysis/cron_account_analytic_account.py | 2 ++ addons/account_anglo_saxon/purchase.py | 2 ++ addons/analytic_user_function/analytic_user_function.py | 2 ++ addons/anonymization/__init__.py | 2 ++ addons/anonymization/__openerp__.py | 2 ++ addons/anonymization/anonymization.py | 2 ++ addons/auction/report/report_auction.py | 2 ++ addons/auction/wizard/auction_lots_able.py | 2 ++ addons/auction/wizard/auction_lots_cancel.py | 3 ++- addons/auction/wizard/auction_lots_enable.py | 2 ++ addons/auction/wizard/auction_lots_make_invoice.py | 2 ++ addons/auction/wizard/auction_lots_make_invoice_buyer.py | 2 ++ addons/auction/wizard/auction_pay_sel.py | 2 ++ addons/auction/wizard/auction_taken.py | 2 ++ addons/auction/wizard/auction_transfer_unsold_object.py | 3 ++- addons/audittrail/wizard/audittrail_view_log.py | 2 ++ addons/auth_openid/controllers/__init__.py | 2 ++ addons/auth_openid/controllers/main.py | 2 ++ addons/auth_openid/res_users.py | 2 ++ addons/auth_openid/utils.py | 2 ++ addons/base_crypt/__init__.py | 2 ++ addons/base_crypt/__openerp__.py | 2 ++ addons/base_module_doc_rst/__init__.py | 2 ++ addons/base_module_doc_rst/__openerp__.py | 2 ++ addons/base_module_doc_rst/report/report_proximity_graph.py | 3 ++- addons/base_module_doc_rst/wizard/__init__.py | 2 ++ addons/base_module_doc_rst/wizard/wizard_tech_guide_rst.py | 2 ++ .../plugin/openerp_report_designer/bin/script/About.py | 2 ++ .../plugin/openerp_report_designer/bin/script/AddAttachment.py | 2 ++ .../plugin/openerp_report_designer/bin/script/Change.py | 2 ++ .../openerp_report_designer/bin/script/ConvertBracesToField.py | 2 ++ .../bin/script/ConvertFieldsToBraces.py | 2 ++ .../plugin/openerp_report_designer/bin/script/ExportToRML.py | 2 ++ .../plugin/openerp_report_designer/bin/script/Expression.py | 2 ++ .../plugin/openerp_report_designer/bin/script/Fields.py | 2 ++ .../plugin/openerp_report_designer/bin/script/LoginTest.py | 2 ++ .../openerp_report_designer/bin/script/ModifyExistingReport.py | 2 ++ .../plugin/openerp_report_designer/bin/script/NewReport.py | 2 ++ .../plugin/openerp_report_designer/bin/script/Repeatln.py | 2 ++ .../plugin/openerp_report_designer/bin/script/SendToServer.py | 2 ++ .../openerp_report_designer/bin/script/ServerParameter.py | 2 ++ .../plugin/openerp_report_designer/bin/script/Translation.py | 2 ++ .../plugin/openerp_report_designer/bin/script/__init__.py | 2 ++ .../plugin/openerp_report_designer/bin/script/compile_all.py | 2 ++ .../plugin/openerp_report_designer/bin/script/lib/__init__.py | 2 ++ .../plugin/openerp_report_designer/bin/script/lib/actions.py | 2 ++ .../plugin/openerp_report_designer/bin/script/lib/error.py | 2 ++ .../plugin/openerp_report_designer/bin/script/lib/functions.py | 2 ++ .../plugin/openerp_report_designer/bin/script/lib/gui.py | 2 ++ .../plugin/openerp_report_designer/bin/script/lib/logreport.py | 2 ++ .../plugin/openerp_report_designer/bin/script/lib/rpc.py | 2 ++ .../openerp_report_designer/bin/script/lib/tiny_socket.py | 2 ++ .../plugin/openerp_report_designer/bin/script/lib/tools.py | 2 ++ .../plugin/openerp_report_designer/bin/script/modify.py | 2 ++ .../plugin/openerp_report_designer/test/test_fields.py | 2 ++ .../base_report_designer/wizard/base_report_designer_modify.py | 2 ++ addons/base_tools/__init__.py | 2 ++ addons/base_tools/__openerp__.py | 2 ++ addons/caldav/caldav.py | 2 ++ addons/caldav/calendar_collection.py | 2 ++ addons/caldav/orm_utils.py | 2 ++ addons/caldav/wizard/caldav_browse.py | 2 ++ addons/crm/crm.py | 2 ++ addons/crm/report/crm_phonecall_report.py | 2 ++ addons/crm/wizard/crm_add_note.py | 2 ++ addons/crm/wizard/crm_phonecall_to_opportunity.py | 2 ++ addons/crm_fundraising/crm_fundraising.py | 2 ++ addons/crm_partner_assign/__init__.py | 2 ++ addons/crm_partner_assign/__openerp__.py | 2 ++ addons/crm_partner_assign/partner_geo_assign.py | 2 ++ addons/crm_partner_assign/report/__init__.py | 2 ++ addons/crm_partner_assign/report/crm_partner_report.py | 2 ++ addons/crm_partner_assign/wizard/__init__.py | 2 ++ addons/crm_partner_assign/wizard/crm_merge_opportunity.py | 2 ++ addons/crm_todo/__init__.py | 2 ++ addons/crm_todo/__openerp__.py | 2 ++ addons/crm_todo/crm_todo.py | 2 ++ addons/decimal_precision/__init__.py | 2 ++ addons/decimal_precision/__openerp__.py | 2 ++ addons/document/dict_tools.py | 2 ++ addons/document/directory_content.py | 3 ++- addons/document/directory_report.py | 2 ++ addons/document/document.py | 2 ++ addons/document/document_directory.py | 2 ++ addons/document/document_storage.py | 2 ++ addons/document/nodes.py | 3 ++- addons/document/report/__init__.py | 3 ++- addons/document/std_index.py | 2 ++ addons/document/test_cindex.py | 2 ++ addons/document/wizard/__init__.py | 2 ++ addons/document/wizard/document_configuration.py | 2 ++ addons/document_ftp/test_easyftp.py | 2 ++ addons/document_ftp/wizard/ftp_browse.py | 2 ++ addons/document_ftp/wizard/ftp_configuration.py | 2 ++ addons/document_webdav/__init__.py | 3 ++- addons/document_webdav/__openerp__.py | 2 ++ addons/document_webdav/cache.py | 2 ++ addons/document_webdav/dav_fs.py | 2 ++ addons/document_webdav/document_webdav.py | 3 ++- addons/document_webdav/nodes.py | 2 ++ addons/document_webdav/redirect.py | 2 ++ addons/document_webdav/test_davclient.py | 3 ++- addons/document_webdav/webdav.py | 2 ++ addons/document_webdav/webdav_server.py | 2 ++ addons/edi/__init__.py | 2 ++ addons/edi/controllers/__init__.py | 2 ++ addons/edi/controllers/main.py | 2 ++ addons/edi/edi_service.py | 3 ++- addons/edi/models/__init__.py | 3 ++- addons/edi/models/res_company.py | 2 ++ addons/edi/models/res_currency.py | 3 ++- addons/edi/models/res_partner.py | 3 ++- addons/email_template/html2text.py | 2 ++ addons/email_template/res_partner.py | 3 ++- addons/email_template/wizard/__init__.py | 2 ++ addons/fetchmail/__init__.py | 2 ++ addons/fetchmail/__openerp__.py | 2 ++ addons/fetchmail_crm/__init__.py | 2 ++ addons/fetchmail_crm/__openerp__.py | 2 ++ addons/fetchmail_crm_claim/__init__.py | 2 ++ addons/fetchmail_crm_claim/__openerp__.py | 2 ++ addons/fetchmail_hr_recruitment/__init__.py | 2 ++ addons/fetchmail_hr_recruitment/__openerp__.py | 2 ++ addons/fetchmail_project_issue/__init__.py | 2 ++ addons/fetchmail_project_issue/__openerp__.py | 2 ++ addons/hr_holidays/report/available_holidays.py | 2 ++ addons/hr_timesheet/report/__init__.py | 2 ++ addons/hr_timesheet/report/user_timesheet.py | 2 ++ .../hr_timesheet_invoice/report/hr_timesheet_invoice_report.py | 2 ++ addons/hr_timesheet_sheet/report/hr_timesheet_report.py | 2 ++ addons/hr_timesheet_sheet/report/timesheet_report.py | 2 ++ addons/html_view/__init__.py | 3 ++- addons/html_view/html_view.py | 3 ++- addons/import_base/__init__.py | 3 ++- addons/import_base/__openerp__.py | 2 ++ addons/import_base/import_framework.py | 2 ++ addons/import_base/mapper.py | 2 ++ addons/import_google/wizard/google_import_message.py | 2 ++ addons/import_google/wizard/import_google.py | 2 ++ addons/import_sugarcrm/__init__.py | 2 ++ addons/import_sugarcrm/import_sugarcrm.py | 2 ++ addons/import_sugarcrm/sugar.py | 2 ++ addons/import_sugarcrm/sugarsoap_services.py | 2 ++ addons/import_sugarcrm/sugarsoap_services_types.py | 2 ++ addons/import_sugarcrm/wizard/__init__.py | 2 ++ addons/import_sugarcrm/wizard/import_message.py | 2 ++ addons/l10n_at/__init__.py | 3 ++- addons/l10n_at/__openerp__.py | 2 ++ addons/l10n_at/account_wizard.py | 2 ++ addons/l10n_be_invoice_bba/__init__.py | 2 ++ addons/l10n_be_invoice_bba/__openerp__.py | 2 ++ addons/l10n_be_invoice_bba/invoice.py | 2 ++ addons/l10n_be_invoice_bba/partner.py | 2 ++ addons/l10n_br/account.py | 3 ++- addons/l10n_ch/account_wizard.py | 2 ++ addons/l10n_ch/bank.py | 2 ++ addons/l10n_ch/report/__init__.py | 3 ++- addons/l10n_ch/report/report_webkit_html.py | 2 ++ addons/l10n_ch/wizard/unicode2ascii.py | 2 ++ addons/l10n_cr/__init__.py | 2 ++ addons/l10n_de/__openerp__.py | 2 ++ addons/l10n_ec/__init__.py | 2 ++ addons/l10n_ec/__openerp__.py | 2 ++ addons/l10n_es/__init__.py | 2 ++ addons/l10n_es/__openerp__.py | 2 ++ addons/l10n_it/__init__.py | 2 ++ addons/l10n_it/__openerp__.py | 2 ++ addons/l10n_it/libroIVA.py | 2 ++ addons/l10n_it/report/__init__.py | 3 ++- addons/l10n_it/report/libroIVA_credito.py | 2 ++ addons/l10n_it/report/libroIVA_debito.py | 2 ++ addons/l10n_ma/__init__.py | 2 ++ addons/l10n_ro/res_partner.py | 2 ++ addons/l10n_th/__init__.py | 2 ++ addons/l10n_th/__openerp__.py | 2 ++ addons/lunch/report/report_lunch_order.py | 2 ++ addons/marketing_campaign/marketing_campaign.py | 2 ++ addons/marketing_campaign/report/campaign_analysis.py | 2 ++ addons/marketing_campaign_crm_demo/__init__.py | 2 ++ addons/mrp/product.py | 2 ++ addons/mrp/report/mrp_production_order.py | 2 ++ addons/mrp/report/price.py | 2 ++ addons/outlook/__init__.py | 2 ++ addons/outlook/installer.py | 2 ++ addons/outlook/plugin/openerp-outlook-plugin/addin.py | 2 ++ addons/outlook/plugin/openerp-outlook-plugin/chilkat.py | 2 ++ .../outlook/plugin/openerp-outlook-plugin/dialogs/__init__.py | 2 ++ .../plugin/openerp-outlook-plugin/dialogs/dialog_map.py | 2 ++ .../outlook/plugin/openerp-outlook-plugin/dialogs/dlgcore.py | 2 ++ .../outlook/plugin/openerp-outlook-plugin/dialogs/dlgutils.py | 2 ++ .../plugin/openerp-outlook-plugin/dialogs/opt_processors.py | 2 ++ .../plugin/openerp-outlook-plugin/dialogs/processors.py | 2 ++ .../openerp-outlook-plugin/dialogs/resources/__init__.py | 2 ++ .../plugin/openerp-outlook-plugin/dialogs/resources/dialogs.py | 2 ++ .../plugin/openerp-outlook-plugin/dialogs/resources/rc2py.py | 2 ++ .../openerp-outlook-plugin/dialogs/resources/rcparser.py | 2 ++ addons/outlook/plugin/openerp-outlook-plugin/eml.py | 3 ++- addons/outlook/plugin/openerp-outlook-plugin/manager.py | 2 ++ addons/outlook/plugin/openerp-outlook-plugin/tiny_xmlrpc.py | 2 ++ addons/pad/__init__.py | 2 ++ addons/pad/__openerp__.py | 2 ++ addons/pad/ir_attachment.py | 2 ++ addons/pad/res_company.py | 2 ++ addons/point_of_sale/point_of_sale.py | 2 ++ addons/point_of_sale/wizard/pos_box_entries.py | 2 ++ addons/point_of_sale/wizard/pos_box_out.py | 2 ++ addons/point_of_sale/wizard/pos_payment.py | 2 ++ addons/point_of_sale/wizard/pos_payment_report_user.py | 2 ++ addons/point_of_sale/wizard/pos_receipt.py | 2 ++ addons/portal/__init__.py | 2 ++ addons/portal/ir_ui_menu.py | 2 ++ addons/portal/portal.py | 2 ++ addons/portal/res_user.py | 2 ++ addons/portal/wizard/__init__.py | 2 ++ addons/portal/wizard/portal_wizard.py | 2 ++ addons/portal/wizard/share_wizard.py | 2 ++ addons/procurement/__init__.py | 3 ++- addons/project/company.py | 2 ++ addons/project/wizard/project_task_delegate.py | 2 ++ addons/project/wizard/project_task_reevaluate.py | 2 ++ addons/project_caldav/__openerp__.py | 2 ++ addons/project_long_term/project_long_term.py | 2 ++ addons/project_long_term/wizard/project_compute_phases.py | 2 ++ addons/project_mrp/__init__.py | 2 ++ addons/project_scrum/project_scrum.py | 2 ++ addons/project_scrum/wizard/project_scrum_email.py | 2 ++ addons/purchase/edi/__init__.py | 3 ++- addons/purchase/report/purchase_report.py | 2 ++ addons/purchase_double_validation/__openerp__.py | 2 ++ addons/report_intrastat/report_intrastat.py | 2 ++ addons/report_webkit/__init__.py | 3 ++- addons/report_webkit/__openerp__.py | 2 ++ addons/report_webkit/company.py | 2 ++ addons/report_webkit/header.py | 2 ++ addons/report_webkit/ir_report.py | 2 ++ addons/report_webkit/report_helper.py | 3 ++- addons/report_webkit/webkit_report.py | 2 ++ addons/report_webkit/wizard/__init__.py | 3 ++- addons/report_webkit/wizard/report_webkit_actions.py | 2 ++ addons/report_webkit_sample/__init__.py | 3 ++- addons/report_webkit_sample/__openerp__.py | 2 ++ addons/report_webkit_sample/report/__init__.py | 3 ++- addons/report_webkit_sample/report/report_webkit_html.py | 2 ++ addons/resource/faces/observer.py | 2 ++ addons/resource/faces/pcalendar.py | 2 ++ addons/resource/faces/plocale.py | 2 ++ addons/resource/faces/resource.py | 2 ++ addons/resource/faces/task.py | 2 ++ addons/resource/faces/timescale.py | 2 ++ addons/resource/faces/utils.py | 2 ++ addons/sale/edi/__init__.py | 3 ++- addons/sale/stock.py | 2 ++ addons/sale_crm/wizard/crm_make_sale.py | 2 ++ addons/sale_journal/__init__.py | 2 ++ addons/sale_journal/sale_journal.py | 2 ++ addons/share/__init__.py | 2 ++ addons/share/ir_model.py | 3 ++- addons/share/res_users.py | 2 ++ addons/share/wizard/__init__.py | 2 ++ addons/share/wizard/share_wizard.py | 2 ++ addons/stock/__openerp__.py | 2 ++ addons/stock/report/__init__.py | 2 ++ addons/stock/report/report_stock_move.py | 2 ++ addons/stock/wizard/stock_change_standard_price.py | 2 ++ addons/stock/wizard/stock_move.py | 2 ++ addons/stock/wizard/stock_splitinto.py | 2 ++ addons/stock_location/__openerp__.py | 2 ++ addons/stock_location/procurement_pull.py | 3 ++- addons/stock_planning/wizard/__init__.py | 2 ++ addons/thunderbird/__init__.py | 2 ++ addons/thunderbird/__openerp__.py | 2 ++ addons/thunderbird/installer.py | 2 ++ addons/thunderbird/partner/__init__.py | 2 ++ addons/thunderbird/partner/partner.py | 2 ++ addons/web_livechat/__init__.py | 2 ++ addons/web_livechat/__openerp__.py | 2 ++ addons/web_livechat/publisher_warranty.py | 2 ++ addons/web_uservoice/__init__.py | 2 ++ addons/web_uservoice/__openerp__.py | 2 ++ addons/wiki/web/__init__.py | 2 ++ addons/wiki/web/controllers/__init__.py | 2 ++ addons/wiki/web/controllers/wiki.py | 2 ++ addons/wiki/web/widgets/__init__.py | 2 ++ addons/wiki/web/widgets/rss/__init__.py | 3 ++- addons/wiki/web/widgets/rss/feedparser.py | 2 ++ addons/wiki/web/widgets/wiki.py | 2 ++ addons/wiki/web/widgets/wikimarkup/__init__.py | 2 ++ 303 files changed, 606 insertions(+), 36 deletions(-) diff --git a/addons/account/account_bank.py b/addons/account/account_bank.py index acf070a3ad7..01eab2fbb01 100644 --- a/addons/account/account_bank.py +++ b/addons/account/account_bank.py @@ -108,3 +108,5 @@ class bank(osv.osv): self.write(cr, uid, [bank.id], {'journal_id': journal_id}, context=context) return True + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/account/edi/__init__.py b/addons/account/edi/__init__.py index d86e8a91bf3..a5bf0bbfa2d 100644 --- a/addons/account/edi/__init__.py +++ b/addons/account/edi/__init__.py @@ -20,3 +20,5 @@ ############################################################################## import invoice + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/account/edi/invoice.py b/addons/account/edi/invoice.py index 061bf8ee97d..d36e9163ba9 100644 --- a/addons/account/edi/invoice.py +++ b/addons/account/edi/invoice.py @@ -271,3 +271,5 @@ class account_invoice_tax(osv.osv, EDIMixin): _inherit = "account.invoice.tax" + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/account/report/account_analytic_entries_report.py b/addons/account/report/account_analytic_entries_report.py index f6dfe7cbdb5..1b7e7f9a84b 100644 --- a/addons/account/report/account_analytic_entries_report.py +++ b/addons/account/report/account_analytic_entries_report.py @@ -82,3 +82,5 @@ class analytic_entries_report(osv.osv): ) """) analytic_entries_report() + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/account/report/account_entries_report.py b/addons/account/report/account_entries_report.py index 266b4a056d7..29e40c7d5ad 100644 --- a/addons/account/report/account_entries_report.py +++ b/addons/account/report/account_entries_report.py @@ -153,3 +153,5 @@ class account_entries_report(osv.osv): ) """) account_entries_report() + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/account/report/account_financial_report.py b/addons/account/report/account_financial_report.py index 6b42bb1875d..e9da0a1cd7b 100644 --- a/addons/account/report/account_financial_report.py +++ b/addons/account/report/account_financial_report.py @@ -92,3 +92,5 @@ class report_account_common(report_sxw.rml_parse, common_report_header): report_sxw.report_sxw('report.account.financial.report', 'account.financial.report', 'addons/account/report/account_financial_report.rml', parser=report_account_common, header='internal') + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/account/report/account_treasury_report.py b/addons/account/report/account_treasury_report.py index fce3661b4c4..40d9364981f 100644 --- a/addons/account/report/account_treasury_report.py +++ b/addons/account/report/account_treasury_report.py @@ -79,3 +79,5 @@ class account_treasury_report(osv.osv): ) """) account_treasury_report() + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/account/report/common_report_header.py b/addons/account/report/common_report_header.py index 5769248405f..c0365875bdc 100644 --- a/addons/account/report/common_report_header.py +++ b/addons/account/report/common_report_header.py @@ -141,3 +141,5 @@ class common_report_header(object): return '' #vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/account/test/test_parent_structure.py b/addons/account/test/test_parent_structure.py index 9c3dd2b4c47..99795af311a 100644 --- a/addons/account/test/test_parent_structure.py +++ b/addons/account/test/test_parent_structure.py @@ -47,3 +47,5 @@ for a in account_lists: (a2['parent_right']a['parent_left']) and (a2['parent_right']"package" and __name__=="__main__": elif __name__=="package": g_ImplementationHelper.addImplementation( About, "org.openoffice.openerp.report.about", ("com.sun.star.task.Job",),) + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/AddAttachment.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/AddAttachment.py index 4dbb28a30c0..c65ba32e6bf 100644 --- a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/AddAttachment.py +++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/AddAttachment.py @@ -275,3 +275,5 @@ if __name__<>"package" and __name__=="__main__": AddAttachment(None) elif __name__=="package": g_ImplementationHelper.addImplementation( AddAttachment, "org.openoffice.openerp.report.addattachment", ("com.sun.star.task.Job",),) + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/Change.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/Change.py index 0b68ab10b01..cdc5c7553b1 100644 --- a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/Change.py +++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/Change.py @@ -137,3 +137,5 @@ if __name__<>"package" and __name__=="__main__": elif __name__=="package": g_ImplementationHelper.addImplementation( Change, "org.openoffice.openerp.report.change", ("com.sun.star.task.Job",),) + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/ConvertBracesToField.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/ConvertBracesToField.py index 59b7d32b529..bb80c3ecd61 100644 --- a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/ConvertBracesToField.py +++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/ConvertBracesToField.py @@ -283,3 +283,5 @@ if __name__<>"package": else: g_ImplementationHelper.addImplementation( ConvertBracesToField, "org.openoffice.openerp.report.convertBF", ("com.sun.star.task.Job",),) + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/ConvertFieldsToBraces.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/ConvertFieldsToBraces.py index d804405c990..892061c56b4 100644 --- a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/ConvertFieldsToBraces.py +++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/ConvertFieldsToBraces.py @@ -83,3 +83,5 @@ if __name__<>"package": else: g_ImplementationHelper.addImplementation( ConvertFieldsToBraces, "org.openoffice.openerp.report.convertFB", ("com.sun.star.task.Job",),) + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/ExportToRML.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/ExportToRML.py index e2720c1e803..dd00f1719e1 100644 --- a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/ExportToRML.py +++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/ExportToRML.py @@ -130,3 +130,5 @@ if __name__<>"package" and __name__=="__main__": ExportToRML(None) elif __name__=="package": g_ImplementationHelper.addImplementation( ExportToRML, "org.openoffice.openerp.report.exporttorml", ("com.sun.star.task.Job",),) + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/Expression.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/Expression.py index 074a3bd020e..ecdf13454dc 100644 --- a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/Expression.py +++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/Expression.py @@ -113,3 +113,5 @@ if __name__<>"package" and __name__=="__main__": elif __name__=="package": g_ImplementationHelper.addImplementation( Expression, "org.openoffice.openerp.report.expression", ("com.sun.star.task.Job",),) + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/Fields.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/Fields.py index cfe65d61022..92044f78fe1 100644 --- a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/Fields.py +++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/Fields.py @@ -289,3 +289,5 @@ if __name__<>"package" and __name__=="__main__": elif __name__=="package": g_ImplementationHelper.addImplementation( Fields, "org.openoffice.openerp.report.fields", ("com.sun.star.task.Job",),) + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/LoginTest.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/LoginTest.py index 012c6f896a2..85059d7712c 100644 --- a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/LoginTest.py +++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/LoginTest.py @@ -53,3 +53,5 @@ class LoginTest: if not loginstatus: Change(None) + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/ModifyExistingReport.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/ModifyExistingReport.py index 138513475bb..2ccd8358c97 100644 --- a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/ModifyExistingReport.py +++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/ModifyExistingReport.py @@ -211,3 +211,5 @@ if __name__<>"package" and __name__=="__main__": elif __name__=="package": g_ImplementationHelper.addImplementation( ModifyExistingReport, "org.openoffice.openerp.report.modifyreport", ("com.sun.star.task.Job",),) + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/NewReport.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/NewReport.py index 0e4a18c3b10..6022e44df7a 100644 --- a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/NewReport.py +++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/NewReport.py @@ -117,3 +117,5 @@ elif __name__=="package": NewReport, "org.openoffice.openerp.report.opennewreport", ("com.sun.star.task.Job",),) + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/Repeatln.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/Repeatln.py index d8458be027d..0eab6d1710c 100644 --- a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/Repeatln.py +++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/Repeatln.py @@ -298,3 +298,5 @@ if __name__<>"package" and __name__=="__main__": elif __name__=="package": g_ImplementationHelper = unohelper.ImplementationHelper() g_ImplementationHelper.addImplementation( RepeatIn, "org.openoffice.openerp.report.repeatln", ("com.sun.star.task.Job",),) + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/SendToServer.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/SendToServer.py index 896f3cfcac2..3a6d799f8a5 100644 --- a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/SendToServer.py +++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/SendToServer.py @@ -239,3 +239,5 @@ if __name__<>"package" and __name__=="__main__": SendtoServer(None) elif __name__=="package": g_ImplementationHelper.addImplementation( SendtoServer, "org.openoffice.openerp.report.sendtoserver", ("com.sun.star.task.Job",),) + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/ServerParameter.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/ServerParameter.py index 245cd1dc7ce..9b69e4a5c15 100644 --- a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/ServerParameter.py +++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/ServerParameter.py @@ -172,3 +172,5 @@ if __name__<>"package" and __name__=="__main__": elif __name__=="package": g_ImplementationHelper.addImplementation( ServerParameter, "org.openoffice.openerp.report.serverparam", ("com.sun.star.task.Job",),) + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/Translation.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/Translation.py index 54343d02d7f..73146f1b68a 100644 --- a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/Translation.py +++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/Translation.py @@ -272,3 +272,5 @@ if __name__<>"package" and __name__=="__main__": elif __name__=="package": g_ImplementationHelper.addImplementation( AddLang, "org.openoffice.openerp.report.langtag", ("com.sun.star.task.Job",),) + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/__init__.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/__init__.py index d2192cd5ddd..0ccd1c9d011 100644 --- a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/__init__.py +++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/__init__.py @@ -59,3 +59,5 @@ import ConvertBracesToField import ConvertFieldsToBraces import ExportToRML import SendtoServer + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/compile_all.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/compile_all.py index acafd5f549e..4740c61b178 100644 --- a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/compile_all.py +++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/compile_all.py @@ -47,3 +47,5 @@ import compileall compileall.compile_dir('package') + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/lib/__init__.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/lib/__init__.py index 2a732da8226..a60ae586303 100644 --- a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/lib/__init__.py +++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/lib/__init__.py @@ -26,3 +26,5 @@ import gui import logreport import rpc import tiny_socket + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/lib/actions.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/lib/actions.py index 56a83159e4a..8511bb8343d 100644 --- a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/lib/actions.py +++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/lib/actions.py @@ -109,3 +109,5 @@ class TextListenerProcAdapter( unohelper.Base, XTextListener ): apply( self.oProcToCall, (oTextEvent,) + self.tParams ) + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/lib/error.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/lib/error.py index a6cfe9215a3..c0a3e5b5d63 100644 --- a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/lib/error.py +++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/lib/error.py @@ -58,3 +58,5 @@ class ErrorDialog: def btnOkOrCancel_clicked( self, oActionEvent ): self.win.endExecute() + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/lib/functions.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/lib/functions.py index db1f15b1fc5..29f1cd87e46 100644 --- a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/lib/functions.py +++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/lib/functions.py @@ -262,3 +262,5 @@ def GetAFileName(): return sPath + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/lib/gui.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/lib/gui.py index 79f2ae370de..975aa387193 100644 --- a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/lib/gui.py +++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/lib/gui.py @@ -820,3 +820,5 @@ class DBModalDialog: """ self.oDialogControl.endExecute() + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/lib/logreport.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/lib/logreport.py index dfcc78374c9..2aab8596862 100644 --- a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/lib/logreport.py +++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/lib/logreport.py @@ -46,3 +46,5 @@ class Logger(object): def shutdown(self): logging.shutdown() + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/lib/rpc.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/lib/rpc.py index f211c6309f4..f7c7f636485 100644 --- a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/lib/rpc.py +++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/lib/rpc.py @@ -202,3 +202,5 @@ class NETRPCGateway(RPCGateway): info = reduce(lambda x, y: x+y, traceback.format_exception(sys.exc_type, sys.exc_value, sys.exc_traceback)) + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/lib/tiny_socket.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/lib/tiny_socket.py index 415e4b3c91e..30a2079433a 100644 --- a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/lib/tiny_socket.py +++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/lib/tiny_socket.py @@ -91,3 +91,5 @@ class mysocket: + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/lib/tools.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/lib/tools.py index 8c9a8c9a1a8..ef22a3a0d51 100644 --- a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/lib/tools.py +++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/lib/tools.py @@ -38,3 +38,5 @@ def write_data_to_file( filename, data ): fp.write( data ) fp.close() + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/modify.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/modify.py index fa7874cff45..fc3d6672b79 100644 --- a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/modify.py +++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/modify.py @@ -136,3 +136,5 @@ if __name__<>"package": else: g_ImplementationHelper.addImplementation( modify, "org.openoffice.openerp.report.modify", ("com.sun.star.task.Job",),) + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/base_report_designer/plugin/openerp_report_designer/test/test_fields.py b/addons/base_report_designer/plugin/openerp_report_designer/test/test_fields.py index 8afd773b3fb..8954aa8d7a8 100644 --- a/addons/base_report_designer/plugin/openerp_report_designer/test/test_fields.py +++ b/addons/base_report_designer/plugin/openerp_report_designer/test/test_fields.py @@ -30,3 +30,5 @@ print print 'Field selection for a repeatIn', '='*40 get('account.invoice', level=0, ending=['one2many','many2many'], recur=['many2one']) + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/base_report_designer/wizard/base_report_designer_modify.py b/addons/base_report_designer/wizard/base_report_designer_modify.py index d0790cdc0ad..03d1ac19d7e 100644 --- a/addons/base_report_designer/wizard/base_report_designer_modify.py +++ b/addons/base_report_designer/wizard/base_report_designer_modify.py @@ -148,3 +148,5 @@ class base_report_rml_save(osv.osv_memory): } base_report_rml_save() + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/base_tools/__init__.py b/addons/base_tools/__init__.py index 50a14119520..4c241b72be9 100644 --- a/addons/base_tools/__init__.py +++ b/addons/base_tools/__init__.py @@ -1 +1,3 @@ # Debian packaging removes blank files, so this comment is added. + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/base_tools/__openerp__.py b/addons/base_tools/__openerp__.py index ec32805533e..6fff6c3c207 100644 --- a/addons/base_tools/__openerp__.py +++ b/addons/base_tools/__openerp__.py @@ -19,3 +19,5 @@ Creates menu link for Tools from where tools like survey, lunch, idea, etc. are "installable": True, "certificate" : "00571588675379342237" } + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/caldav/caldav.py b/addons/caldav/caldav.py index 2517f88f789..0f0f5ddd762 100644 --- a/addons/caldav/caldav.py +++ b/addons/caldav/caldav.py @@ -25,3 +25,5 @@ urlparse.uses_netloc.append('caldav') urlparse.uses_netloc.append('caldavs') #EOF + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/caldav/calendar_collection.py b/addons/caldav/calendar_collection.py index 1258ba5bf18..1abbf573ef0 100644 --- a/addons/caldav/calendar_collection.py +++ b/addons/caldav/calendar_collection.py @@ -86,3 +86,5 @@ class calendar_collection(osv.osv): return self.get_schedule_inbox_URL(cr, uid, ids, context=context) calendar_collection() + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/caldav/orm_utils.py b/addons/caldav/orm_utils.py index 00521831e0f..b154d54d1aa 100644 --- a/addons/caldav/orm_utils.py +++ b/addons/caldav/orm_utils.py @@ -46,3 +46,5 @@ if True: # we need this indentation level ;) return res[0][0] #eof + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/caldav/wizard/caldav_browse.py b/addons/caldav/wizard/caldav_browse.py index 5b78c480d07..f4bb8aeaabc 100644 --- a/addons/caldav/wizard/caldav_browse.py +++ b/addons/caldav/wizard/caldav_browse.py @@ -275,3 +275,5 @@ class user_preference(osv.osv_memory): } user_preference() + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/crm/crm.py b/addons/crm/crm.py index 1c1784e961d..03cdb31832d 100644 --- a/addons/crm/crm.py +++ b/addons/crm/crm.py @@ -578,3 +578,5 @@ class users(osv.osv): return res users() + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/crm/report/crm_phonecall_report.py b/addons/crm/report/crm_phonecall_report.py index f68bea03880..ef3bcccdc9a 100644 --- a/addons/crm/report/crm_phonecall_report.py +++ b/addons/crm/report/crm_phonecall_report.py @@ -99,3 +99,5 @@ class crm_phonecall_report(osv.osv): crm_phonecall c )""") crm_phonecall_report() + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/crm/wizard/crm_add_note.py b/addons/crm/wizard/crm_add_note.py index 478f051fe58..6bd84bda21d 100644 --- a/addons/crm/wizard/crm_add_note.py +++ b/addons/crm/wizard/crm_add_note.py @@ -49,3 +49,5 @@ class crm_add_note(osv.osv_memory): return {'type': 'ir.actions.act_window_close'} crm_add_note() + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/crm/wizard/crm_phonecall_to_opportunity.py b/addons/crm/wizard/crm_phonecall_to_opportunity.py index 549afa0559b..ffab1867ebb 100644 --- a/addons/crm/wizard/crm_phonecall_to_opportunity.py +++ b/addons/crm/wizard/crm_phonecall_to_opportunity.py @@ -127,3 +127,5 @@ class crm_phonecall2opportunity(osv.osv_memory): return res crm_phonecall2opportunity() + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/crm_fundraising/crm_fundraising.py b/addons/crm_fundraising/crm_fundraising.py index 07ba7460dec..37c5bb8ccee 100644 --- a/addons/crm_fundraising/crm_fundraising.py +++ b/addons/crm_fundraising/crm_fundraising.py @@ -112,3 +112,5 @@ class crm_fundraising(crm.crm_case, osv.osv): } + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/crm_partner_assign/__init__.py b/addons/crm_partner_assign/__init__.py index 3bb196d3193..8d4bf993aff 100644 --- a/addons/crm_partner_assign/__init__.py +++ b/addons/crm_partner_assign/__init__.py @@ -22,3 +22,5 @@ import partner_geo_assign import wizard import report + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/crm_partner_assign/__openerp__.py b/addons/crm_partner_assign/__openerp__.py index 9e72204e31d..a38da8a665a 100644 --- a/addons/crm_partner_assign/__openerp__.py +++ b/addons/crm_partner_assign/__openerp__.py @@ -52,3 +52,5 @@ You can also use the geolocalization without using the GPS coordinates. 'certificate': '00503409558942442061', 'images': ['images/partner_geo_localization.jpeg','images/partner_grade.jpeg'], } + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/crm_partner_assign/partner_geo_assign.py b/addons/crm_partner_assign/partner_geo_assign.py index 2b67f80c066..401d09146ae 100644 --- a/addons/crm_partner_assign/partner_geo_assign.py +++ b/addons/crm_partner_assign/partner_geo_assign.py @@ -181,3 +181,5 @@ class crm_lead(osv.osv): return ok crm_lead() + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/crm_partner_assign/report/__init__.py b/addons/crm_partner_assign/report/__init__.py index a211aeede1e..45065314b25 100644 --- a/addons/crm_partner_assign/report/__init__.py +++ b/addons/crm_partner_assign/report/__init__.py @@ -22,3 +22,5 @@ import crm_lead_report import crm_partner_report + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/crm_partner_assign/report/crm_partner_report.py b/addons/crm_partner_assign/report/crm_partner_report.py index 10e74a34b76..c5afe9b5b82 100644 --- a/addons/crm_partner_assign/report/crm_partner_report.py +++ b/addons/crm_partner_assign/report/crm_partner_report.py @@ -61,3 +61,5 @@ class crm_partner_report_assign(osv.osv): )""") crm_partner_report_assign() + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/crm_partner_assign/wizard/__init__.py b/addons/crm_partner_assign/wizard/__init__.py index be6c1533722..b6bda71deaf 100644 --- a/addons/crm_partner_assign/wizard/__init__.py +++ b/addons/crm_partner_assign/wizard/__init__.py @@ -21,3 +21,5 @@ import crm_forward_to_partner import crm_merge_opportunity + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/crm_partner_assign/wizard/crm_merge_opportunity.py b/addons/crm_partner_assign/wizard/crm_merge_opportunity.py index 3993a5df066..3c56fada5a1 100644 --- a/addons/crm_partner_assign/wizard/crm_merge_opportunity.py +++ b/addons/crm_partner_assign/wizard/crm_merge_opportunity.py @@ -40,3 +40,5 @@ class crm_merge_opportunity_assign_partner(osv.osv_memory): return data crm_merge_opportunity_assign_partner() + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/crm_todo/__init__.py b/addons/crm_todo/__init__.py index 891c71db7ff..528f4b2d439 100644 --- a/addons/crm_todo/__init__.py +++ b/addons/crm_todo/__init__.py @@ -20,3 +20,5 @@ ############################################################################## import crm_todo + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/crm_todo/__openerp__.py b/addons/crm_todo/__openerp__.py index 9a57a24cf27..3b870153347 100644 --- a/addons/crm_todo/__openerp__.py +++ b/addons/crm_todo/__openerp__.py @@ -39,3 +39,5 @@ Todo list for CRM leads and opportunities. 'installable': True, 'active': False, } + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/crm_todo/crm_todo.py b/addons/crm_todo/crm_todo.py index ba7445ecef1..b1f6aa05af0 100644 --- a/addons/crm_todo/crm_todo.py +++ b/addons/crm_todo/crm_todo.py @@ -35,3 +35,5 @@ class crm_todo(osv.osv): + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/decimal_precision/__init__.py b/addons/decimal_precision/__init__.py index 708ad26bbe1..ea6c1b4d1ca 100644 --- a/addons/decimal_precision/__init__.py +++ b/addons/decimal_precision/__init__.py @@ -22,3 +22,5 @@ #import decimal_precision from decimal_precision import get_precision + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/decimal_precision/__openerp__.py b/addons/decimal_precision/__openerp__.py index b8ac25eb379..91e7ce57029 100644 --- a/addons/decimal_precision/__openerp__.py +++ b/addons/decimal_precision/__openerp__.py @@ -44,3 +44,5 @@ The decimal precision is configured per company. } + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/document/dict_tools.py b/addons/document/dict_tools.py index 10d2fdc69f3..e117b429f83 100644 --- a/addons/document/dict_tools.py +++ b/addons/document/dict_tools.py @@ -55,3 +55,5 @@ def dict_filter(srcdic, keys, res=None): return res #eof + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/document/directory_content.py b/addons/document/directory_content.py index e690e50d4b4..5b8ec3ddd93 100644 --- a/addons/document/directory_content.py +++ b/addons/document/directory_content.py @@ -120,4 +120,5 @@ class document_directory_content(osv.osv): return pdf document_directory_content() -#eof \ No newline at end of file +#eof +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/document/directory_report.py b/addons/document/directory_report.py index 2726fcd5462..202725a1d3f 100644 --- a/addons/document/directory_report.py +++ b/addons/document/directory_report.py @@ -60,3 +60,5 @@ class ir_action_report_xml(osv.osv): } ir_action_report_xml() + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/document/document.py b/addons/document/document.py index 774c4e53a80..1bf177f50e6 100644 --- a/addons/document/document.py +++ b/addons/document/document.py @@ -349,3 +349,5 @@ class document_file(osv.osv): document_file() + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/document/document_directory.py b/addons/document/document_directory.py index 2a3f54f53ba..d09d2cc86d5 100644 --- a/addons/document/document_directory.py +++ b/addons/document/document_directory.py @@ -307,3 +307,5 @@ class document_directory_node(osv.osv): 'directory_id': fields.many2one('document.directory', 'Document directory', ondelete="set null"), } document_directory_node() + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/document/document_storage.py b/addons/document/document_storage.py index b61b7fd65fc..fe757e7876d 100644 --- a/addons/document/document_storage.py +++ b/addons/document/document_storage.py @@ -786,3 +786,5 @@ document_storage() #eof + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/document/nodes.py b/addons/document/nodes.py index 0c4194847c1..ee89f3d4c6c 100644 --- a/addons/document/nodes.py +++ b/addons/document/nodes.py @@ -1557,4 +1557,5 @@ class nodefd_static(StringIO, node_descriptor): cr.close() StringIO.close(self) -#eof \ No newline at end of file +#eof +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/document/report/__init__.py b/addons/document/report/__init__.py index bfdeacdaae8..6fa6327414b 100644 --- a/addons/document/report/__init__.py +++ b/addons/document/report/__init__.py @@ -18,4 +18,5 @@ # along with this program. If not, see . # ############################################################################## -import document_report \ No newline at end of file +import document_report +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/document/std_index.py b/addons/document/std_index.py index 4f939aab4df..fe42cfb1795 100644 --- a/addons/document/std_index.py +++ b/addons/document/std_index.py @@ -209,3 +209,5 @@ cntIndex.register(OpenDoc()) #eof + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/document/test_cindex.py b/addons/document/test_cindex.py index 05101a7a491..a257c2c43a5 100755 --- a/addons/document/test_cindex.py +++ b/addons/document/test_cindex.py @@ -51,3 +51,5 @@ for fname in args: print "Keyboard interrupt" #eof + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/document/wizard/__init__.py b/addons/document/wizard/__init__.py index b143b583426..c4decc58fba 100644 --- a/addons/document/wizard/__init__.py +++ b/addons/document/wizard/__init__.py @@ -19,3 +19,5 @@ # ############################################################################## import document_configuration + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/document/wizard/document_configuration.py b/addons/document/wizard/document_configuration.py index 97eda4e2d62..6a69e638b4e 100644 --- a/addons/document/wizard/document_configuration.py +++ b/addons/document/wizard/document_configuration.py @@ -110,3 +110,5 @@ class document_configuration(osv.osv_memory): 'ressource_tree': 1 }) document_configuration() + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/document_ftp/test_easyftp.py b/addons/document_ftp/test_easyftp.py index 74890b1a333..16bace4b167 100644 --- a/addons/document_ftp/test_easyftp.py +++ b/addons/document_ftp/test_easyftp.py @@ -68,3 +68,5 @@ def get_ftp_fulldata(ftp, fname, limit=8192): return ''.join(data) #eof + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/document_ftp/wizard/ftp_browse.py b/addons/document_ftp/wizard/ftp_browse.py index 6e182082aeb..e8f127c3c3b 100644 --- a/addons/document_ftp/wizard/ftp_browse.py +++ b/addons/document_ftp/wizard/ftp_browse.py @@ -61,3 +61,5 @@ class document_ftp_browse(osv.osv_memory): } document_ftp_browse() + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/document_ftp/wizard/ftp_configuration.py b/addons/document_ftp/wizard/ftp_configuration.py index 0ae133bb92a..5da2ddf11e8 100644 --- a/addons/document_ftp/wizard/ftp_configuration.py +++ b/addons/document_ftp/wizard/ftp_configuration.py @@ -48,3 +48,5 @@ class document_ftp_configuration(osv.osv_memory): {'url': 'ftp://'+(conf.host or 'localhost:8021')+'/' + cr.dbname+'/'}) document_ftp_configuration() + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/document_webdav/__init__.py b/addons/document_webdav/__init__.py index ac417e18087..7cd1a38fc80 100644 --- a/addons/document_webdav/__init__.py +++ b/addons/document_webdav/__init__.py @@ -24,4 +24,5 @@ import webdav_server import document_webdav -#eof \ No newline at end of file +#eof +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/document_webdav/__openerp__.py b/addons/document_webdav/__openerp__.py index 5576c17ba64..303f5c70e2c 100644 --- a/addons/document_webdav/__openerp__.py +++ b/addons/document_webdav/__openerp__.py @@ -72,3 +72,5 @@ which needs explicit configuration in openerp-server.conf, too. "certificate" : "001236490750845657973", 'images': ['images/dav_properties.jpeg','images/directories_structure_principals.jpeg'], } + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/document_webdav/cache.py b/addons/document_webdav/cache.py index 7f03aa6da13..95ff9d31f62 100644 --- a/addons/document_webdav/cache.py +++ b/addons/document_webdav/cache.py @@ -37,3 +37,5 @@ def memoize(maxsize): return wrapper return decorating_function + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/document_webdav/dav_fs.py b/addons/document_webdav/dav_fs.py index c167d90ba42..772b7600f20 100644 --- a/addons/document_webdav/dav_fs.py +++ b/addons/document_webdav/dav_fs.py @@ -1023,3 +1023,5 @@ class openerp_dav_handler(dav_interface): if cr: cr.close() #eof + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/document_webdav/document_webdav.py b/addons/document_webdav/document_webdav.py index f5fa7b591d8..da463c9eb1b 100644 --- a/addons/document_webdav/document_webdav.py +++ b/addons/document_webdav/document_webdav.py @@ -127,4 +127,5 @@ class dav_file_property(osv.osv): dav_file_property() -#eof \ No newline at end of file +#eof +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/document_webdav/nodes.py b/addons/document_webdav/nodes.py index 5927eade899..d6ceca458cd 100644 --- a/addons/document_webdav/nodes.py +++ b/addons/document_webdav/nodes.py @@ -400,3 +400,5 @@ node_descriptor = nodes.node_descriptor #eof + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/document_webdav/redirect.py b/addons/document_webdav/redirect.py index 71af3271ab7..7bc0883f9e8 100644 --- a/addons/document_webdav/redirect.py +++ b/addons/document_webdav/redirect.py @@ -106,3 +106,5 @@ class RedirectHTTPHandler(HttpLogHandler, FixSendError, HttpOptions, HTTPHandler #eof + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/document_webdav/test_davclient.py b/addons/document_webdav/test_davclient.py index b4317282c6a..3c20cfed5b8 100755 --- a/addons/document_webdav/test_davclient.py +++ b/addons/document_webdav/test_davclient.py @@ -704,4 +704,5 @@ class DAVClient(object): etag = m.getheader('ETag') return etag or True -#eof \ No newline at end of file +#eof +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/document_webdav/webdav.py b/addons/document_webdav/webdav.py index 3a68fb04fed..baa394e94a1 100644 --- a/addons/document_webdav/webdav.py +++ b/addons/document_webdav/webdav.py @@ -341,3 +341,5 @@ def create_prop(self): REPORT.create_prop = create_prop #eof + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/document_webdav/webdav_server.py b/addons/document_webdav/webdav_server.py index aeff0a23f25..81435a72137 100644 --- a/addons/document_webdav/webdav_server.py +++ b/addons/document_webdav/webdav_server.py @@ -649,3 +649,5 @@ init_principals_redirect() + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/edi/__init__.py b/addons/edi/__init__.py index f0f96a936ec..b4a80c0f1dd 100644 --- a/addons/edi/__init__.py +++ b/addons/edi/__init__.py @@ -32,3 +32,5 @@ except ImportError: """Could not load openerp-web section of EDI, EDI will not behave correctly To fix, launch openerp-web in embedded mode""") + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/edi/controllers/__init__.py b/addons/edi/controllers/__init__.py index 8ee9bae18d9..9f828025b8e 100644 --- a/addons/edi/controllers/__init__.py +++ b/addons/edi/controllers/__init__.py @@ -1 +1,3 @@ import main + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/edi/controllers/main.py b/addons/edi/controllers/main.py index 00787cdc374..83c3a1608e9 100644 --- a/addons/edi/controllers/main.py +++ b/addons/edi/controllers/main.py @@ -82,3 +82,5 @@ class EDI(openerpweb.Controller): return True # + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/edi/edi_service.py b/addons/edi/edi_service.py index 296b3006525..074720a03e9 100644 --- a/addons/edi/edi_service.py +++ b/addons/edi/edi_service.py @@ -67,4 +67,5 @@ class edi(netsvc.ExportService): fn = getattr(self, 'exp_'+method) return fn(*params) -edi() \ No newline at end of file +edi() +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/edi/models/__init__.py b/addons/edi/models/__init__.py index cf8c0ff2eb0..88259611c6c 100644 --- a/addons/edi/models/__init__.py +++ b/addons/edi/models/__init__.py @@ -22,4 +22,5 @@ import edi import res_partner import res_company -import res_currency \ No newline at end of file +import res_currency +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/edi/models/res_company.py b/addons/edi/models/res_company.py index 665dfb9487d..cf5efe997e0 100644 --- a/addons/edi/models/res_company.py +++ b/addons/edi/models/res_company.py @@ -56,3 +56,5 @@ class res_company(osv.osv): res_partner_bank.browse(cr, uid, bank_ids, context=context), context=context) return result + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/edi/models/res_currency.py b/addons/edi/models/res_currency.py index d057f4e5bbc..4c16150a3a7 100644 --- a/addons/edi/models/res_currency.py +++ b/addons/edi/models/res_currency.py @@ -61,4 +61,5 @@ class res_currency(osv.osv, EDIMixin): if rate: self.pool.get('res.currency.rate').create(cr, SUPERUSER_ID, {'currency_id': currency_id, 'rate': rate}, context=context) - return currency_id \ No newline at end of file + return currency_id +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/edi/models/res_partner.py b/addons/edi/models/res_partner.py index 18ec01eb765..7c40a5c7354 100644 --- a/addons/edi/models/res_partner.py +++ b/addons/edi/models/res_partner.py @@ -101,4 +101,5 @@ class res_partner_address(osv.osv, EDIMixin): logging.getLogger('edi.res_partner').warning('Failed to import bank account using' 'bank type: %s, ignoring', import_ctx['default_state'], exc_info=True) - return address_id \ No newline at end of file + return address_id +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/email_template/html2text.py b/addons/email_template/html2text.py index 2479843777a..745381850e3 100755 --- a/addons/email_template/html2text.py +++ b/addons/email_template/html2text.py @@ -453,3 +453,5 @@ if __name__ == "__main__": data = sys.stdin.read().decode('utf8') wrapwrite(html2text(data, baseurl)) + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/email_template/res_partner.py b/addons/email_template/res_partner.py index 74d8b4e0693..a175323cf3e 100644 --- a/addons/email_template/res_partner.py +++ b/addons/email_template/res_partner.py @@ -34,4 +34,5 @@ class res_partner(osv.osv): _defaults = { 'opt_out': False, - } \ No newline at end of file + } +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/email_template/wizard/__init__.py b/addons/email_template/wizard/__init__.py index b9ac29ec4c2..c979c90acd0 100644 --- a/addons/email_template/wizard/__init__.py +++ b/addons/email_template/wizard/__init__.py @@ -22,3 +22,5 @@ import email_template_preview import mail_compose_message + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/fetchmail/__init__.py b/addons/fetchmail/__init__.py index f9c384ce103..934df9846dd 100644 --- a/addons/fetchmail/__init__.py +++ b/addons/fetchmail/__init__.py @@ -21,3 +21,5 @@ ############################################################################## import fetchmail + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/fetchmail/__openerp__.py b/addons/fetchmail/__openerp__.py index ae082aacacd..b50c33b2394 100644 --- a/addons/fetchmail/__openerp__.py +++ b/addons/fetchmail/__openerp__.py @@ -74,3 +74,5 @@ mail. 'certificate' : '00692978332890137453', 'images': ['images/1_email_servers.jpeg'], } + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/fetchmail_crm/__init__.py b/addons/fetchmail_crm/__init__.py index 5831b3284bb..b5b36afb7e9 100644 --- a/addons/fetchmail_crm/__init__.py +++ b/addons/fetchmail_crm/__init__.py @@ -18,3 +18,5 @@ # along with this program. If not, see . # ############################################################################## + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/fetchmail_crm/__openerp__.py b/addons/fetchmail_crm/__openerp__.py index 66cff346d0a..671aad4a871 100644 --- a/addons/fetchmail_crm/__openerp__.py +++ b/addons/fetchmail_crm/__openerp__.py @@ -37,3 +37,5 @@ 'installable': True, 'active': False, } + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/fetchmail_crm_claim/__init__.py b/addons/fetchmail_crm_claim/__init__.py index 5831b3284bb..b5b36afb7e9 100644 --- a/addons/fetchmail_crm_claim/__init__.py +++ b/addons/fetchmail_crm_claim/__init__.py @@ -18,3 +18,5 @@ # along with this program. If not, see . # ############################################################################## + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/fetchmail_crm_claim/__openerp__.py b/addons/fetchmail_crm_claim/__openerp__.py index cfe6a675d20..6b4a346ed51 100644 --- a/addons/fetchmail_crm_claim/__openerp__.py +++ b/addons/fetchmail_crm_claim/__openerp__.py @@ -37,3 +37,5 @@ 'installable': True, 'active': False, } + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/fetchmail_hr_recruitment/__init__.py b/addons/fetchmail_hr_recruitment/__init__.py index 5831b3284bb..b5b36afb7e9 100644 --- a/addons/fetchmail_hr_recruitment/__init__.py +++ b/addons/fetchmail_hr_recruitment/__init__.py @@ -18,3 +18,5 @@ # along with this program. If not, see . # ############################################################################## + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/fetchmail_hr_recruitment/__openerp__.py b/addons/fetchmail_hr_recruitment/__openerp__.py index 75531097645..0925f2cbcc9 100644 --- a/addons/fetchmail_hr_recruitment/__openerp__.py +++ b/addons/fetchmail_hr_recruitment/__openerp__.py @@ -37,3 +37,5 @@ 'installable': True, 'active': False, } + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/fetchmail_project_issue/__init__.py b/addons/fetchmail_project_issue/__init__.py index 5831b3284bb..b5b36afb7e9 100644 --- a/addons/fetchmail_project_issue/__init__.py +++ b/addons/fetchmail_project_issue/__init__.py @@ -18,3 +18,5 @@ # along with this program. If not, see . # ############################################################################## + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/fetchmail_project_issue/__openerp__.py b/addons/fetchmail_project_issue/__openerp__.py index 1165949108a..ca42ed6faaf 100644 --- a/addons/fetchmail_project_issue/__openerp__.py +++ b/addons/fetchmail_project_issue/__openerp__.py @@ -37,3 +37,5 @@ 'installable': True, 'active': False, } + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/hr_holidays/report/available_holidays.py b/addons/hr_holidays/report/available_holidays.py index 26c654db9dd..cb3a89eeb3e 100644 --- a/addons/hr_holidays/report/available_holidays.py +++ b/addons/hr_holidays/report/available_holidays.py @@ -19,3 +19,5 @@ # ############################################################################## + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/hr_timesheet/report/__init__.py b/addons/hr_timesheet/report/__init__.py index 98e34ed92d4..8304c90421d 100644 --- a/addons/hr_timesheet/report/__init__.py +++ b/addons/hr_timesheet/report/__init__.py @@ -22,3 +22,5 @@ import user_timesheet import users_timesheet + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/hr_timesheet/report/user_timesheet.py b/addons/hr_timesheet/report/user_timesheet.py index 533989210d6..7699f94f41b 100644 --- a/addons/hr_timesheet/report/user_timesheet.py +++ b/addons/hr_timesheet/report/user_timesheet.py @@ -118,3 +118,5 @@ class report_custom(report_rml): report_custom('report.hr.analytical.timesheet', 'hr.employee', '', 'addons/hr_timesheet/report/user_timesheet.xsl') + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report.py b/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report.py index eb1437534d4..6b6dd9f6e52 100644 --- a/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report.py +++ b/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report.py @@ -217,3 +217,5 @@ class report_timesheet_invoice(osv.osv): """) report_timesheet_invoice() + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/hr_timesheet_sheet/report/hr_timesheet_report.py b/addons/hr_timesheet_sheet/report/hr_timesheet_report.py index d20ad3a5f4c..49b18f75e4b 100644 --- a/addons/hr_timesheet_sheet/report/hr_timesheet_report.py +++ b/addons/hr_timesheet_sheet/report/hr_timesheet_report.py @@ -80,3 +80,5 @@ class hr_timesheet_report(osv.osv): ) """) hr_timesheet_report() + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/hr_timesheet_sheet/report/timesheet_report.py b/addons/hr_timesheet_sheet/report/timesheet_report.py index a8c0440a053..986beb453eb 100644 --- a/addons/hr_timesheet_sheet/report/timesheet_report.py +++ b/addons/hr_timesheet_sheet/report/timesheet_report.py @@ -120,3 +120,5 @@ class timesheet_report(osv.osv): ) """) timesheet_report() + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/html_view/__init__.py b/addons/html_view/__init__.py index 465ad75ffe0..e6e7c0728d4 100644 --- a/addons/html_view/__init__.py +++ b/addons/html_view/__init__.py @@ -1 +1,2 @@ -import html_view \ No newline at end of file +import html_view +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/html_view/html_view.py b/addons/html_view/html_view.py index 79f4bd7d0b9..0c89b36f5b5 100644 --- a/addons/html_view/html_view.py +++ b/addons/html_view/html_view.py @@ -10,4 +10,5 @@ class html_view(osv.osv): 'bank_ids': fields.one2many('res.partner.bank', 'partner_id', 'Banks'), } -html_view() \ No newline at end of file +html_view() +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/import_base/__init__.py b/addons/import_base/__init__.py index 0a5d7fb20b7..6df3448e787 100644 --- a/addons/import_base/__init__.py +++ b/addons/import_base/__init__.py @@ -20,4 +20,5 @@ ############################################################################## import import_framework -import mapper \ No newline at end of file +import mapper +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/import_base/__openerp__.py b/addons/import_base/__openerp__.py index 6d4f4374dfe..0f65cf166b6 100644 --- a/addons/import_base/__openerp__.py +++ b/addons/import_base/__openerp__.py @@ -37,3 +37,5 @@ 'installable': True, 'active': False, } + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/import_base/import_framework.py b/addons/import_base/import_framework.py index 1f627d2ad58..ecc5f54e461 100644 --- a/addons/import_base/import_framework.py +++ b/addons/import_base/import_framework.py @@ -498,3 +498,5 @@ class import_framework(Thread): def intialize_test(self): pass + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/import_base/mapper.py b/addons/import_base/mapper.py index 0827509ffab..d68447ad3dd 100644 --- a/addons/import_base/mapper.py +++ b/addons/import_base/mapper.py @@ -167,3 +167,5 @@ class call(mapper): else: args.append(arg) return self.fun(external_values, *args) + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/import_google/wizard/google_import_message.py b/addons/import_google/wizard/google_import_message.py index 5e2b2b6f4b1..bba58cd2250 100644 --- a/addons/import_google/wizard/google_import_message.py +++ b/addons/import_google/wizard/google_import_message.py @@ -40,3 +40,5 @@ class google_import_message(osv.osv): return res google_import_message() + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/import_google/wizard/import_google.py b/addons/import_google/wizard/import_google.py index 87155c806c6..936a6d17649 100644 --- a/addons/import_google/wizard/import_google.py +++ b/addons/import_google/wizard/import_google.py @@ -353,3 +353,5 @@ class google_import(import_framework): } } + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/import_sugarcrm/__init__.py b/addons/import_sugarcrm/__init__.py index 250589105b0..8fdd9aec302 100644 --- a/addons/import_sugarcrm/__init__.py +++ b/addons/import_sugarcrm/__init__.py @@ -23,3 +23,5 @@ import import_sugarcrm import sugar import wizard + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/import_sugarcrm/import_sugarcrm.py b/addons/import_sugarcrm/import_sugarcrm.py index d5f487c5377..b3908be0050 100644 --- a/addons/import_sugarcrm/import_sugarcrm.py +++ b/addons/import_sugarcrm/import_sugarcrm.py @@ -1147,3 +1147,5 @@ class import_sugarcrm(osv.osv): } import_sugarcrm() + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/import_sugarcrm/sugar.py b/addons/import_sugarcrm/sugar.py index 4ce5e0048ea..35103a41173 100644 --- a/addons/import_sugarcrm/sugar.py +++ b/addons/import_sugarcrm/sugar.py @@ -176,3 +176,5 @@ def search(portType, sessionid, module_name, offset, max_results, query=None, or ans_list.append(ans_dir) #end for return ans_list + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/import_sugarcrm/sugarsoap_services.py b/addons/import_sugarcrm/sugarsoap_services.py index a80102e5081..b42eb4041c1 100644 --- a/addons/import_sugarcrm/sugarsoap_services.py +++ b/addons/import_sugarcrm/sugarsoap_services.py @@ -1418,3 +1418,5 @@ class get_attendee_listResponse: self._return = None return get_attendee_listResponse.typecode.pyclass = get_attendee_listResponse + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/import_sugarcrm/sugarsoap_services_types.py b/addons/import_sugarcrm/sugarsoap_services_types.py index acd22bbb97f..182e9ce4c37 100644 --- a/addons/import_sugarcrm/sugarsoap_services_types.py +++ b/addons/import_sugarcrm/sugarsoap_services_types.py @@ -644,3 +644,5 @@ class ns0: self.pyclass = Holder # end class ns0 (tns: http://www.sugarcrm.com/sugarcrm) + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/import_sugarcrm/wizard/__init__.py b/addons/import_sugarcrm/wizard/__init__.py index 6910c3981bd..08b611401b1 100644 --- a/addons/import_sugarcrm/wizard/__init__.py +++ b/addons/import_sugarcrm/wizard/__init__.py @@ -20,3 +20,5 @@ ############################################################################## import import_message + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/import_sugarcrm/wizard/import_message.py b/addons/import_sugarcrm/wizard/import_message.py index 7c9f1703282..1d2e765580b 100644 --- a/addons/import_sugarcrm/wizard/import_message.py +++ b/addons/import_sugarcrm/wizard/import_message.py @@ -27,3 +27,5 @@ class import_message(osv.osv): _description = __doc__ import_message() + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/l10n_at/__init__.py b/addons/l10n_at/__init__.py index b3516a699d9..329606c4f82 100644 --- a/addons/l10n_at/__init__.py +++ b/addons/l10n_at/__init__.py @@ -19,4 +19,5 @@ # ############################################################################## -import account_wizard \ No newline at end of file +import account_wizard +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/l10n_at/__openerp__.py b/addons/l10n_at/__openerp__.py index d28598c1ed2..570841374d8 100644 --- a/addons/l10n_at/__openerp__.py +++ b/addons/l10n_at/__openerp__.py @@ -33,3 +33,5 @@ "installable": True } + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/l10n_at/account_wizard.py b/addons/l10n_at/account_wizard.py index cf63b2c5dc3..15b0735b9ca 100644 --- a/addons/l10n_at/account_wizard.py +++ b/addons/l10n_at/account_wizard.py @@ -32,3 +32,5 @@ class AccountWizard_cd(osv.osv_memory): AccountWizard_cd() + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/l10n_be_invoice_bba/__init__.py b/addons/l10n_be_invoice_bba/__init__.py index 176d1b9a904..48cd4bc0347 100644 --- a/addons/l10n_be_invoice_bba/__init__.py +++ b/addons/l10n_be_invoice_bba/__init__.py @@ -22,3 +22,5 @@ import partner import invoice + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/l10n_be_invoice_bba/__openerp__.py b/addons/l10n_be_invoice_bba/__openerp__.py index e4b209317d0..c18f49817b5 100644 --- a/addons/l10n_be_invoice_bba/__openerp__.py +++ b/addons/l10n_be_invoice_bba/__openerp__.py @@ -53,3 +53,5 @@ A 'random' Structured Communication will generated if no algorithm is specified ], 'active': False, 'installable': True,} + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/l10n_be_invoice_bba/invoice.py b/addons/l10n_be_invoice_bba/invoice.py index 947ccb6f71c..997036c0cec 100644 --- a/addons/l10n_be_invoice_bba/invoice.py +++ b/addons/l10n_be_invoice_bba/invoice.py @@ -215,3 +215,5 @@ class account_invoice(osv.osv): ] account_invoice() + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/l10n_be_invoice_bba/partner.py b/addons/l10n_be_invoice_bba/partner.py index 194ae39ed86..04a51c3a6ab 100644 --- a/addons/l10n_be_invoice_bba/partner.py +++ b/addons/l10n_be_invoice_bba/partner.py @@ -50,3 +50,5 @@ class res_partner(osv.osv): 'out_inv_comm_type': 'none', } res_partner() + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/l10n_br/account.py b/addons/l10n_br/account.py index 965ff500829..a2c9f7d75f8 100644 --- a/addons/l10n_br/account.py +++ b/addons/l10n_br/account.py @@ -174,4 +174,5 @@ class wizard_multi_charts_accounts(osv.osv_memory): if tax.tax_code_id: obj_acc_tax.write(cr, uid, tax.id, {'domain': tax.tax_code_id.domain,'tax_discount': tax.tax_code_id.tax_discount}) -wizard_multi_charts_accounts() \ No newline at end of file +wizard_multi_charts_accounts() +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/l10n_ch/account_wizard.py b/addons/l10n_ch/account_wizard.py index f9b2600adca..7b80e3697ee 100644 --- a/addons/l10n_ch/account_wizard.py +++ b/addons/l10n_ch/account_wizard.py @@ -42,3 +42,5 @@ class WizardMultiChartsAccounts(osv.osv_memory): WizardMultiChartsAccounts() + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/l10n_ch/bank.py b/addons/l10n_ch/bank.py index 6b9294bea13..fd69dec625f 100644 --- a/addons/l10n_ch/bank.py +++ b/addons/l10n_ch/bank.py @@ -77,3 +77,5 @@ class ResPartnerBank(osv.osv): 'The BVR adherent number must be unique !')] ResPartnerBank() + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/l10n_ch/report/__init__.py b/addons/l10n_ch/report/__init__.py index 04cc14f1d80..1839cb9bed0 100644 --- a/addons/l10n_ch/report/__init__.py +++ b/addons/l10n_ch/report/__init__.py @@ -29,4 +29,5 @@ # ############################################################################## -import report_webkit_html \ No newline at end of file +import report_webkit_html +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/l10n_ch/report/report_webkit_html.py b/addons/l10n_ch/report/report_webkit_html.py index b551845322f..8b179e7ae58 100644 --- a/addons/l10n_ch/report/report_webkit_html.py +++ b/addons/l10n_ch/report/report_webkit_html.py @@ -322,3 +322,5 @@ BVRWebKitParser('report.invoice_web_bvr', 'account.invoice', 'addons/l10n_ch/report/report_webkit_html.mako', parser=l10n_ch_report_webkit_html) + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/l10n_ch/wizard/unicode2ascii.py b/addons/l10n_ch/wizard/unicode2ascii.py index 7d95a4ab714..1cec519420c 100644 --- a/addons/l10n_ch/wizard/unicode2ascii.py +++ b/addons/l10n_ch/wizard/unicode2ascii.py @@ -590,3 +590,5 @@ if __name__ == '__main__': if argz: parser.error('Only stdin -> stdout conversion suported') uc_filter(sys.stdin, sys.stdout, bs=optz.bs, in_enc=optz.src_enc, out_enc=optz.dst_enc) + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/l10n_cr/__init__.py b/addons/l10n_cr/__init__.py index c4c6ee3e380..88b86329a8d 100644 --- a/addons/l10n_cr/__init__.py +++ b/addons/l10n_cr/__init__.py @@ -32,3 +32,5 @@ # ############################################################################## + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/l10n_de/__openerp__.py b/addons/l10n_de/__openerp__.py index 8cbdaa3b6ee..646836eba2a 100644 --- a/addons/l10n_de/__openerp__.py +++ b/addons/l10n_de/__openerp__.py @@ -152,3 +152,5 @@ German accounting chart and localization. "certificate": "00517849017945584893", 'images': ['images/config_chart_l10n_de.jpeg','images/l10n_de_chart.jpeg'], } + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/l10n_ec/__init__.py b/addons/l10n_ec/__init__.py index e59e7efc423..d9537494d6e 100644 --- a/addons/l10n_ec/__init__.py +++ b/addons/l10n_ec/__init__.py @@ -18,3 +18,5 @@ # ############################################################################## + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/l10n_ec/__openerp__.py b/addons/l10n_ec/__openerp__.py index 0e93a3ac57b..f3dbf88289b 100644 --- a/addons/l10n_ec/__openerp__.py +++ b/addons/l10n_ec/__openerp__.py @@ -47,3 +47,5 @@ Accounting chart and localization for Ecuador. 'certificate' : '001226484516187330589', 'images': ['images/config_chart_l10n_ec.jpeg','images/l10n_ec_chart.jpeg'], } + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/l10n_es/__init__.py b/addons/l10n_es/__init__.py index 297d923f6bb..bec854aac95 100644 --- a/addons/l10n_es/__init__.py +++ b/addons/l10n_es/__init__.py @@ -24,3 +24,5 @@ ############################################################################## + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/l10n_es/__openerp__.py b/addons/l10n_es/__openerp__.py index 3cdc521ad60..e2f5ad3402d 100644 --- a/addons/l10n_es/__openerp__.py +++ b/addons/l10n_es/__openerp__.py @@ -59,3 +59,5 @@ for yearly account reporting (balance, profit & losses). "certificate" : "00408828172062583229", 'images': ['images/config_chart_l10n_es.jpeg','images/l10n_es_chart.jpeg'], } + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/l10n_it/__init__.py b/addons/l10n_it/__init__.py index 026004bfa0f..d75c9e75e3f 100644 --- a/addons/l10n_it/__init__.py +++ b/addons/l10n_it/__init__.py @@ -26,3 +26,5 @@ import libroIVA import report + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/l10n_it/__openerp__.py b/addons/l10n_it/__openerp__.py index d6138608aa2..e443b71bb4f 100644 --- a/addons/l10n_it/__openerp__.py +++ b/addons/l10n_it/__openerp__.py @@ -60,3 +60,5 @@ Italian accounting chart and localization. 'certificate' : '00926677190009155165', 'images': ['images/config_chart_l10n_it.jpeg','images/l10n_it_chart.jpeg'], } + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/l10n_it/libroIVA.py b/addons/l10n_it/libroIVA.py index a78c81ffdb3..d8446720c2b 100644 --- a/addons/l10n_it/libroIVA.py +++ b/addons/l10n_it/libroIVA.py @@ -52,3 +52,5 @@ class l10n_chart_it_report_libroIVA (osv.osv): l10n_chart_it_report_libroIVA() + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/l10n_it/report/__init__.py b/addons/l10n_it/report/__init__.py index be32155c675..0b57a963b2b 100644 --- a/addons/l10n_it/report/__init__.py +++ b/addons/l10n_it/report/__init__.py @@ -1,2 +1,3 @@ import libroIVA_credito -import libroIVA_debito \ No newline at end of file +import libroIVA_debito +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/l10n_it/report/libroIVA_credito.py b/addons/l10n_it/report/libroIVA_credito.py index b48c81d2475..9ab4b07f92d 100644 --- a/addons/l10n_it/report/libroIVA_credito.py +++ b/addons/l10n_it/report/libroIVA_credito.py @@ -77,3 +77,5 @@ class l10n_chart_it_report_libroIVA_credito(report_sxw.rml_parse): report_sxw.report_sxw('report.l10n_it.report.libroIVA_credito','account.report_libroiva', 'l10n_it/report/libroIVA_credito.rml', parser=l10n_chart_it_report_libroIVA_credito,header=False) + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/l10n_it/report/libroIVA_debito.py b/addons/l10n_it/report/libroIVA_debito.py index c7720ab69a1..0a0bd8179c4 100644 --- a/addons/l10n_it/report/libroIVA_debito.py +++ b/addons/l10n_it/report/libroIVA_debito.py @@ -78,3 +78,5 @@ class l10n_chart_it_report_libroIVA_debito(report_sxw.rml_parse): report_sxw.report_sxw('report.l10n_it.report.libroIVA_debito','account.report_libroiva', 'l10n_it/report/libroIVA_debito.rml', parser=l10n_chart_it_report_libroIVA_debito,header=False) + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/l10n_ma/__init__.py b/addons/l10n_ma/__init__.py index 35aef5a2c44..070b09bdf33 100644 --- a/addons/l10n_ma/__init__.py +++ b/addons/l10n_ma/__init__.py @@ -21,3 +21,5 @@ import l10n_ma import report import wizard + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/l10n_ro/res_partner.py b/addons/l10n_ro/res_partner.py index f5521844a49..009aa76b62f 100644 --- a/addons/l10n_ro/res_partner.py +++ b/addons/l10n_ro/res_partner.py @@ -30,3 +30,5 @@ class res_partner(osv.osv): 'nrc' : fields.char('NRC', size=16, help='Registration number at the Registry of Commerce'), } res_partner() + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/l10n_th/__init__.py b/addons/l10n_th/__init__.py index 45de899ed49..a4a5d907c6b 100644 --- a/addons/l10n_th/__init__.py +++ b/addons/l10n_th/__init__.py @@ -18,3 +18,5 @@ # along with this program. If not, see . # ############################################################################## + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/l10n_th/__openerp__.py b/addons/l10n_th/__openerp__.py index 1b2c4771aee..4ab8f7d355c 100644 --- a/addons/l10n_th/__openerp__.py +++ b/addons/l10n_th/__openerp__.py @@ -38,3 +38,5 @@ Thai accounting chart and localization. 'certificate' : '00722263103978957725', 'images': ['images/config_chart_l10n_th.jpeg','images/l10n_th_chart.jpeg'], } + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/lunch/report/report_lunch_order.py b/addons/lunch/report/report_lunch_order.py index 05f730db740..7e2b8de9f49 100644 --- a/addons/lunch/report/report_lunch_order.py +++ b/addons/lunch/report/report_lunch_order.py @@ -64,3 +64,5 @@ class report_lunch_order(osv.osv): ) """) report_lunch_order() + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/marketing_campaign/marketing_campaign.py b/addons/marketing_campaign/marketing_campaign.py index 547281911c4..82832134c27 100644 --- a/addons/marketing_campaign/marketing_campaign.py +++ b/addons/marketing_campaign/marketing_campaign.py @@ -844,3 +844,5 @@ class report_xml(osv.osv): report_xml() + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/marketing_campaign/report/campaign_analysis.py b/addons/marketing_campaign/report/campaign_analysis.py index af04a7e6dff..ebbb6034a1a 100644 --- a/addons/marketing_campaign/report/campaign_analysis.py +++ b/addons/marketing_campaign/report/campaign_analysis.py @@ -99,3 +99,5 @@ class campaign_analysis(osv.osv): ) """) campaign_analysis() + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/marketing_campaign_crm_demo/__init__.py b/addons/marketing_campaign_crm_demo/__init__.py index 50a14119520..4c241b72be9 100644 --- a/addons/marketing_campaign_crm_demo/__init__.py +++ b/addons/marketing_campaign_crm_demo/__init__.py @@ -1 +1,3 @@ # Debian packaging removes blank files, so this comment is added. + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/mrp/product.py b/addons/mrp/product.py index 9731d93f84b..c3f9ee855df 100644 --- a/addons/mrp/product.py +++ b/addons/mrp/product.py @@ -66,3 +66,5 @@ class product_product(osv.osv): product_product() + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/mrp/report/mrp_production_order.py b/addons/mrp/report/mrp_production_order.py index 4bb525db1ff..d0ff7ba7970 100644 --- a/addons/mrp/report/mrp_production_order.py +++ b/addons/mrp/report/mrp_production_order.py @@ -20,3 +20,5 @@ ############################################################################## + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/mrp/report/price.py b/addons/mrp/report/price.py index a12c580e378..c072b821196 100644 --- a/addons/mrp/report/price.py +++ b/addons/mrp/report/price.py @@ -219,3 +219,5 @@ class report_custom(report_rml): return xml report_custom('report.product.price', 'product.product', '', 'addons/mrp/report/price.xsl') + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/outlook/__init__.py b/addons/outlook/__init__.py index 0190f2f396f..7f5a7a9a9f1 100644 --- a/addons/outlook/__init__.py +++ b/addons/outlook/__init__.py @@ -20,3 +20,5 @@ ############################################################################## import installer + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/outlook/installer.py b/addons/outlook/installer.py index 2be0c243037..061c27da5e5 100644 --- a/addons/outlook/installer.py +++ b/addons/outlook/installer.py @@ -65,3 +65,5 @@ Please refer to the README file for dependencies (external link: openobject-addo """ } outlook_installer() + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/outlook/plugin/openerp-outlook-plugin/addin.py b/addons/outlook/plugin/openerp-outlook-plugin/addin.py index 5872ed0291a..c720c5e417d 100644 --- a/addons/outlook/plugin/openerp-outlook-plugin/addin.py +++ b/addons/outlook/plugin/openerp-outlook-plugin/addin.py @@ -297,3 +297,5 @@ if __name__ == '__main__': #mngr = manager.GetManager() #mngr.ShowManager("IDD_MANAGER") + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/outlook/plugin/openerp-outlook-plugin/chilkat.py b/addons/outlook/plugin/openerp-outlook-plugin/chilkat.py index 1afd9f85fdd..3aa329807ef 100644 --- a/addons/outlook/plugin/openerp-outlook-plugin/chilkat.py +++ b/addons/outlook/plugin/openerp-outlook-plugin/chilkat.py @@ -5605,3 +5605,5 @@ CkDirTree_swigregister(CkDirTree) + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/outlook/plugin/openerp-outlook-plugin/dialogs/__init__.py b/addons/outlook/plugin/openerp-outlook-plugin/dialogs/__init__.py index 3b3d8973497..a19f2d59cff 100644 --- a/addons/outlook/plugin/openerp-outlook-plugin/dialogs/__init__.py +++ b/addons/outlook/plugin/openerp-outlook-plugin/dialogs/__init__.py @@ -79,3 +79,5 @@ def MakePropertyPage(parent, manager, config, idd, yoffset=24): import dlgutils SetWaitCursor = dlgutils.SetWaitCursor + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/outlook/plugin/openerp-outlook-plugin/dialogs/dialog_map.py b/addons/outlook/plugin/openerp-outlook-plugin/dialogs/dialog_map.py index 87138554e16..8576a3526ff 100644 --- a/addons/outlook/plugin/openerp-outlook-plugin/dialogs/dialog_map.py +++ b/addons/outlook/plugin/openerp-outlook-plugin/dialogs/dialog_map.py @@ -1806,3 +1806,5 @@ dialog_map = { (CommandButtonProcessor, "IDPB_SELECT_STATE IDC_LIST_STATE IDD_SELECT_STATE" , SelectStateFromList,()), ), } + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/outlook/plugin/openerp-outlook-plugin/dialogs/dlgcore.py b/addons/outlook/plugin/openerp-outlook-plugin/dialogs/dlgcore.py index efccf4f494e..bce802b5ed1 100644 --- a/addons/outlook/plugin/openerp-outlook-plugin/dialogs/dlgcore.py +++ b/addons/outlook/plugin/openerp-outlook-plugin/dialogs/dlgcore.py @@ -321,3 +321,5 @@ class ProcessorPage(ProcessorDialog): self.template[0][2] = self.template[0][2] & ~(win32con.DS_MODALFRAME|win32con.WS_POPUP|win32con.WS_OVERLAPPED|win32con.WS_CAPTION) self.template[0][2] = self.template[0][2] | win32con.WS_CHILD return win32gui.CreateDialogIndirect(self.hinst, self.template, self.parent, message_map) + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/outlook/plugin/openerp-outlook-plugin/dialogs/dlgutils.py b/addons/outlook/plugin/openerp-outlook-plugin/dialogs/dlgutils.py index 8ffc4e62d22..bede3cd63c2 100644 --- a/addons/outlook/plugin/openerp-outlook-plugin/dialogs/dlgutils.py +++ b/addons/outlook/plugin/openerp-outlook-plugin/dialogs/dlgutils.py @@ -16,3 +16,5 @@ def SetWaitCursor(wait): else: hCursor = win32gui.LoadCursor(0, 0) win32gui.SetCursor(hCursor) + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/outlook/plugin/openerp-outlook-plugin/dialogs/opt_processors.py b/addons/outlook/plugin/openerp-outlook-plugin/dialogs/opt_processors.py index 7a4970491b0..0a129423e29 100644 --- a/addons/outlook/plugin/openerp-outlook-plugin/dialogs/opt_processors.py +++ b/addons/outlook/plugin/openerp-outlook-plugin/dialogs/opt_processors.py @@ -316,3 +316,5 @@ class ProtocolComboProcessor(ComboProcessor): if sel == -1: win32gui.SendMessage(combo, win32con.CB_SETCURSEL, 1, 0) self.active_control_id = self.control_id + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/outlook/plugin/openerp-outlook-plugin/dialogs/processors.py b/addons/outlook/plugin/openerp-outlook-plugin/dialogs/processors.py index 0b427852c89..34af9e073a4 100644 --- a/addons/outlook/plugin/openerp-outlook-plugin/dialogs/processors.py +++ b/addons/outlook/plugin/openerp-outlook-plugin/dialogs/processors.py @@ -143,3 +143,5 @@ class CommandButtonProcessor(ButtonProcessor): if doc is None: return "" return " ".join(doc.split()) + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/outlook/plugin/openerp-outlook-plugin/dialogs/resources/__init__.py b/addons/outlook/plugin/openerp-outlook-plugin/dialogs/resources/__init__.py index abeff9ae69b..cf3e416c209 100644 --- a/addons/outlook/plugin/openerp-outlook-plugin/dialogs/resources/__init__.py +++ b/addons/outlook/plugin/openerp-outlook-plugin/dialogs/resources/__init__.py @@ -28,3 +28,5 @@ def GetImageParamsFromBitmapID(rc_parser, bmpid): filename = os.path.join( os.path.dirname( __file__ ), filename) return 0, filename, win32con.LR_LOADFROMFILE assert 0, "not reached" + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/outlook/plugin/openerp-outlook-plugin/dialogs/resources/dialogs.py b/addons/outlook/plugin/openerp-outlook-plugin/dialogs/resources/dialogs.py index aa417b2cd59..e1e8bac21d7 100644 --- a/addons/outlook/plugin/openerp-outlook-plugin/dialogs/resources/dialogs.py +++ b/addons/outlook/plugin/openerp-outlook-plugin/dialogs/resources/dialogs.py @@ -9,3 +9,5 @@ class FakeParser: bitmaps = {'IDB_OPENERPLOGO': 'OpenERP_Logo.bmp'} def ParseDialogs(s): return FakeParser() + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/outlook/plugin/openerp-outlook-plugin/dialogs/resources/rc2py.py b/addons/outlook/plugin/openerp-outlook-plugin/dialogs/resources/rc2py.py index d944fc2dd99..68d62fc7060 100644 --- a/addons/outlook/plugin/openerp-outlook-plugin/dialogs/resources/rc2py.py +++ b/addons/outlook/plugin/openerp-outlook-plugin/dialogs/resources/rc2py.py @@ -37,3 +37,5 @@ if __name__=="__main__": convert(sys.argv[1], sys.argv[2]) else: convert() + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/outlook/plugin/openerp-outlook-plugin/dialogs/resources/rcparser.py b/addons/outlook/plugin/openerp-outlook-plugin/dialogs/resources/rcparser.py index 0b05af3f0be..ed20f80e3d4 100644 --- a/addons/outlook/plugin/openerp-outlook-plugin/dialogs/resources/rcparser.py +++ b/addons/outlook/plugin/openerp-outlook-plugin/dialogs/resources/rcparser.py @@ -375,3 +375,5 @@ if __name__=='__main__': print "Dialog %s (%d controls)" % (id, len(ddef)) pprint.pprint(ddef) print + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/outlook/plugin/openerp-outlook-plugin/eml.py b/addons/outlook/plugin/openerp-outlook-plugin/eml.py index fe455c91117..f2cd192230a 100644 --- a/addons/outlook/plugin/openerp-outlook-plugin/eml.py +++ b/addons/outlook/plugin/openerp-outlook-plugin/eml.py @@ -90,4 +90,5 @@ def generateEML(mail): if (success == False): print cemail.lastErrorText() sys.exit() - return new_mail, eml_path \ No newline at end of file + return new_mail, eml_path +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/outlook/plugin/openerp-outlook-plugin/manager.py b/addons/outlook/plugin/openerp-outlook-plugin/manager.py index 0c7e0e640fe..643a5c40e58 100644 --- a/addons/outlook/plugin/openerp-outlook-plugin/manager.py +++ b/addons/outlook/plugin/openerp-outlook-plugin/manager.py @@ -191,3 +191,5 @@ if __name__=='__main__': else: usage() sys.exit(main(verbose)) + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/outlook/plugin/openerp-outlook-plugin/tiny_xmlrpc.py b/addons/outlook/plugin/openerp-outlook-plugin/tiny_xmlrpc.py index 41346fe7cf9..9cbcb14d40e 100644 --- a/addons/outlook/plugin/openerp-outlook-plugin/tiny_xmlrpc.py +++ b/addons/outlook/plugin/openerp-outlook-plugin/tiny_xmlrpc.py @@ -569,3 +569,5 @@ class XMLRpcConn(object): name = ustr(rec['name']) res.append((obj,rec['id'],name,obj)) return res + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/pad/__init__.py b/addons/pad/__init__.py index 445f0f9dd9f..663cac2cbf0 100644 --- a/addons/pad/__init__.py +++ b/addons/pad/__init__.py @@ -1,3 +1,5 @@ # -*- coding: utf-8 -*- import res_company import ir_attachment + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/pad/__openerp__.py b/addons/pad/__openerp__.py index 1abf8f0ebfa..9630e74c27a 100644 --- a/addons/pad/__openerp__.py +++ b/addons/pad/__openerp__.py @@ -27,3 +27,5 @@ Lets the company customize which Pad installation should be used to link to new ], 'images': ['static/src/img/pad_link_companies.jpeg'], } + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/pad/ir_attachment.py b/addons/pad/ir_attachment.py index efcf1817289..ba8c88632dd 100644 --- a/addons/pad/ir_attachment.py +++ b/addons/pad/ir_attachment.py @@ -33,3 +33,5 @@ class ir_attachment(osv.osv): 'url' : url, }) return url + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/pad/res_company.py b/addons/pad/res_company.py index fe822e213c2..0c1dc7c4929 100644 --- a/addons/pad/res_company.py +++ b/addons/pad/res_company.py @@ -11,3 +11,5 @@ class company_pad(osv.osv): 'pad_url_template': 'http://ietherpad.com/%(db)s-%(model)s-%(id)d-%(salt)s-%(name)s' } + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/point_of_sale/point_of_sale.py b/addons/point_of_sale/point_of_sale.py index bccb8d7fb1f..b19405bd43f 100644 --- a/addons/point_of_sale/point_of_sale.py +++ b/addons/point_of_sale/point_of_sale.py @@ -698,3 +698,5 @@ class product_product(osv.osv): } product_product() + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/point_of_sale/wizard/pos_box_entries.py b/addons/point_of_sale/wizard/pos_box_entries.py index 0c48aff736f..8313b345834 100644 --- a/addons/point_of_sale/wizard/pos_box_entries.py +++ b/addons/point_of_sale/wizard/pos_box_entries.py @@ -125,3 +125,5 @@ class pos_box_entries(osv.osv_memory): pos_box_entries() + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/point_of_sale/wizard/pos_box_out.py b/addons/point_of_sale/wizard/pos_box_out.py index b4298745c35..46f710c7882 100644 --- a/addons/point_of_sale/wizard/pos_box_out.py +++ b/addons/point_of_sale/wizard/pos_box_out.py @@ -110,3 +110,5 @@ class pos_box_out(osv.osv_memory): pos_box_out() + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/point_of_sale/wizard/pos_payment.py b/addons/point_of_sale/wizard/pos_payment.py index adf59e3cbce..3a50ac0f7c9 100644 --- a/addons/point_of_sale/wizard/pos_payment.py +++ b/addons/point_of_sale/wizard/pos_payment.py @@ -101,3 +101,5 @@ class pos_make_payment(osv.osv_memory): pos_make_payment() + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/point_of_sale/wizard/pos_payment_report_user.py b/addons/point_of_sale/wizard/pos_payment_report_user.py index 02db921618b..05d06f4df29 100644 --- a/addons/point_of_sale/wizard/pos_payment_report_user.py +++ b/addons/point_of_sale/wizard/pos_payment_report_user.py @@ -51,3 +51,5 @@ class pos_payment_report_user(osv.osv_memory): pos_payment_report_user() + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/point_of_sale/wizard/pos_receipt.py b/addons/point_of_sale/wizard/pos_receipt.py index 71efee85b7c..f4feee85504 100644 --- a/addons/point_of_sale/wizard/pos_receipt.py +++ b/addons/point_of_sale/wizard/pos_receipt.py @@ -56,3 +56,5 @@ class pos_receipt(osv.osv_memory): } pos_receipt() + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/portal/__init__.py b/addons/portal/__init__.py index 89397d2eab5..b35d11bac45 100644 --- a/addons/portal/__init__.py +++ b/addons/portal/__init__.py @@ -24,3 +24,5 @@ import wizard import res_user import ir_ui_menu + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/portal/ir_ui_menu.py b/addons/portal/ir_ui_menu.py index a4fe364a4fd..c8f59ca8bd1 100644 --- a/addons/portal/ir_ui_menu.py +++ b/addons/portal/ir_ui_menu.py @@ -56,3 +56,5 @@ class portal_menu(osv.osv): portal_menu() + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/portal/portal.py b/addons/portal/portal.py index 1c7f84c363a..de39944e69f 100644 --- a/addons/portal/portal.py +++ b/addons/portal/portal.py @@ -226,3 +226,5 @@ portal_widget() + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/portal/res_user.py b/addons/portal/res_user.py index 2f32a65b761..127c3079b29 100644 --- a/addons/portal/res_user.py +++ b/addons/portal/res_user.py @@ -32,3 +32,5 @@ class res_users(osv.osv): res_users() + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/portal/wizard/__init__.py b/addons/portal/wizard/__init__.py index 90b71a62c30..9d52ae0db6d 100644 --- a/addons/portal/wizard/__init__.py +++ b/addons/portal/wizard/__init__.py @@ -22,3 +22,5 @@ import portal_wizard import share_wizard + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/portal/wizard/portal_wizard.py b/addons/portal/wizard/portal_wizard.py index 7157f22f129..706d6fd4a7f 100644 --- a/addons/portal/wizard/portal_wizard.py +++ b/addons/portal/wizard/portal_wizard.py @@ -225,3 +225,5 @@ wizard_user() + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/portal/wizard/share_wizard.py b/addons/portal/wizard/share_wizard.py index ab639bdeccc..b5c9d165cc6 100644 --- a/addons/portal/wizard/share_wizard.py +++ b/addons/portal/wizard/share_wizard.py @@ -184,3 +184,5 @@ class share_wizard_portal(osv.osv_memory): share_wizard_portal() + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/procurement/__init__.py b/addons/procurement/__init__.py index 3420ef1f75e..cf186f4136f 100644 --- a/addons/procurement/__init__.py +++ b/addons/procurement/__init__.py @@ -22,4 +22,5 @@ import procurement import wizard import schedulers -import company \ No newline at end of file +import company +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/project/company.py b/addons/project/company.py index 0967d130737..6400450cd3e 100644 --- a/addons/project/company.py +++ b/addons/project/company.py @@ -33,3 +33,5 @@ class res_company(osv.osv): } res_company() + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/project/wizard/project_task_delegate.py b/addons/project/wizard/project_task_delegate.py index 0b4457d5e7f..efadc3f124b 100644 --- a/addons/project/wizard/project_task_delegate.py +++ b/addons/project/wizard/project_task_delegate.py @@ -133,3 +133,5 @@ class project_task_delegate(osv.osv_memory): return action project_task_delegate() + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/project/wizard/project_task_reevaluate.py b/addons/project/wizard/project_task_reevaluate.py index ce3e728a98e..382c9d64361 100644 --- a/addons/project/wizard/project_task_reevaluate.py +++ b/addons/project/wizard/project_task_reevaluate.py @@ -81,3 +81,5 @@ class project_task_reevaluate(osv.osv_memory): task_pool.do_reopen(cr, uid, [task_id], context=context) return {'type': 'ir.actions.act_window_close'} project_task_reevaluate() + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/project_caldav/__openerp__.py b/addons/project_caldav/__openerp__.py index 37ecbb1c910..6e716a2e9d0 100644 --- a/addons/project_caldav/__openerp__.py +++ b/addons/project_caldav/__openerp__.py @@ -41,3 +41,5 @@ on a remote server. "certificate" : "001114200456808204637", 'images': ['images/project_tasks_caldav.jpeg','images/project_tasks_caldav_attendees.jpeg','images/project_caldav_calendars.jpeg'], } + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/project_long_term/project_long_term.py b/addons/project_long_term/project_long_term.py index f7e23c29a58..4ab1722336e 100644 --- a/addons/project_long_term/project_long_term.py +++ b/addons/project_long_term/project_long_term.py @@ -270,3 +270,5 @@ class project_task(osv.osv): 'phase_id': fields.many2one('project.phase', 'Project Phase'), } project_task() + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/project_long_term/wizard/project_compute_phases.py b/addons/project_long_term/wizard/project_compute_phases.py index 57a1b3b6ed3..4a66cecf9cd 100644 --- a/addons/project_long_term/wizard/project_compute_phases.py +++ b/addons/project_long_term/wizard/project_compute_phases.py @@ -72,3 +72,5 @@ class project_compute_phases(osv.osv_memory): return result project_compute_phases() + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/project_mrp/__init__.py b/addons/project_mrp/__init__.py index 364dec5a437..df4f0fa8a52 100644 --- a/addons/project_mrp/__init__.py +++ b/addons/project_mrp/__init__.py @@ -21,3 +21,5 @@ import project_procurement import project_mrp + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/project_scrum/project_scrum.py b/addons/project_scrum/project_scrum.py index f0db98294e7..1ac0871de68 100644 --- a/addons/project_scrum/project_scrum.py +++ b/addons/project_scrum/project_scrum.py @@ -332,3 +332,5 @@ class project_scrum_meeting(osv.osv): project_scrum_meeting() + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/project_scrum/wizard/project_scrum_email.py b/addons/project_scrum/wizard/project_scrum_email.py index f1d5b6665f7..c61f43e6779 100644 --- a/addons/project_scrum/wizard/project_scrum_email.py +++ b/addons/project_scrum/wizard/project_scrum_email.py @@ -105,3 +105,5 @@ class project_scrum_email(osv.osv_memory): if data.product_owner_email: mail_message.schedule_with_attach(cr, uid, user_email, [data.product_owner_email], data.subject, body, reply_to=user_email, context=context) return {'type': 'ir.actions.act_window_close'} + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/purchase/edi/__init__.py b/addons/purchase/edi/__init__.py index cfac0182d76..75db9cb06b1 100644 --- a/addons/purchase/edi/__init__.py +++ b/addons/purchase/edi/__init__.py @@ -19,4 +19,5 @@ # ############################################################################## -import purchase_order \ No newline at end of file +import purchase_order +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/purchase/report/purchase_report.py b/addons/purchase/report/purchase_report.py index 4c59f9ea002..e3a4a651b7f 100644 --- a/addons/purchase/report/purchase_report.py +++ b/addons/purchase/report/purchase_report.py @@ -143,3 +143,5 @@ class purchase_report(osv.osv): """) purchase_report() + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/purchase_double_validation/__openerp__.py b/addons/purchase_double_validation/__openerp__.py index c02da2fc9d7..7bd9df87c8b 100644 --- a/addons/purchase_double_validation/__openerp__.py +++ b/addons/purchase_double_validation/__openerp__.py @@ -47,3 +47,5 @@ that exceeds minimum amount set by configuration wizard. 'certificate' : '00436592682510544157', } + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/report_intrastat/report_intrastat.py b/addons/report_intrastat/report_intrastat.py index a77c4f5d389..ffe90b54d4f 100644 --- a/addons/report_intrastat/report_intrastat.py +++ b/addons/report_intrastat/report_intrastat.py @@ -124,3 +124,5 @@ class report_intrastat(osv.osv): )""") report_intrastat() + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/report_webkit/__init__.py b/addons/report_webkit/__init__.py index a97025f4896..71aff129508 100644 --- a/addons/report_webkit/__init__.py +++ b/addons/report_webkit/__init__.py @@ -34,4 +34,5 @@ import company import report_helper import webkit_report import ir_report -import wizard \ No newline at end of file +import wizard +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/report_webkit/__openerp__.py b/addons/report_webkit/__openerp__.py index 52f03efaff7..56496a2d130 100644 --- a/addons/report_webkit/__openerp__.py +++ b/addons/report_webkit/__openerp__.py @@ -98,3 +98,5 @@ TODO "certificate" : "001159699313338995949", 'images': ['images/companies_webkit.jpeg','images/header_html.jpeg','images/header_img.jpeg'], } + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/report_webkit/company.py b/addons/report_webkit/company.py index 5b826617417..eaf3c02b50f 100644 --- a/addons/report_webkit/company.py +++ b/addons/report_webkit/company.py @@ -58,3 +58,5 @@ class ResCompany(osv.osv): } ResCompany() + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/report_webkit/header.py b/addons/report_webkit/header.py index 53252c5e245..b052c612445 100644 --- a/addons/report_webkit/header.py +++ b/addons/report_webkit/header.py @@ -99,3 +99,5 @@ class HeaderImage(osv.osv): 'type' : fields.char('Type', size=32, required =True, help="Image type(png,gif,jpeg)") } HeaderImage() + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/report_webkit/ir_report.py b/addons/report_webkit/ir_report.py index bca10b0d1d8..d2709ea6fc2 100644 --- a/addons/report_webkit/ir_report.py +++ b/addons/report_webkit/ir_report.py @@ -136,3 +136,5 @@ class ReportXML(osv.osv): } ReportXML() + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/report_webkit/report_helper.py b/addons/report_webkit/report_helper.py index 2b9d8c93256..321e1261cd8 100644 --- a/addons/report_webkit/report_helper.py +++ b/addons/report_webkit/report_helper.py @@ -79,4 +79,5 @@ class WebKitHelper(object): """Return HTML embedded logo by name""" img, type = self.get_logo_by_name(name) return self.embed_image(type, img, width, height) - \ No newline at end of file + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/report_webkit/webkit_report.py b/addons/report_webkit/webkit_report.py index 8d6373e412b..7e828403437 100644 --- a/addons/report_webkit/webkit_report.py +++ b/addons/report_webkit/webkit_report.py @@ -329,3 +329,5 @@ class WebKitParser(report_sxw): if not result: return (False,False) return result + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/report_webkit/wizard/__init__.py b/addons/report_webkit/wizard/__init__.py index f6f7b3c8019..1d19467ac24 100644 --- a/addons/report_webkit/wizard/__init__.py +++ b/addons/report_webkit/wizard/__init__.py @@ -29,4 +29,5 @@ # ############################################################################## -import report_webkit_actions \ No newline at end of file +import report_webkit_actions +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/report_webkit/wizard/report_webkit_actions.py b/addons/report_webkit/wizard/report_webkit_actions.py index 79426f8d159..bb2c5312441 100644 --- a/addons/report_webkit/wizard/report_webkit_actions.py +++ b/addons/report_webkit/wizard/report_webkit_actions.py @@ -144,3 +144,5 @@ class report_webkit_actions(osv.osv_memory): } report_webkit_actions() + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/report_webkit_sample/__init__.py b/addons/report_webkit_sample/__init__.py index 9b406f754d8..3e7c030e3ed 100644 --- a/addons/report_webkit_sample/__init__.py +++ b/addons/report_webkit_sample/__init__.py @@ -29,4 +29,5 @@ # ############################################################################## import wizard -import report \ No newline at end of file +import report +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/report_webkit_sample/__openerp__.py b/addons/report_webkit_sample/__openerp__.py index d485692c164..4e144736c24 100644 --- a/addons/report_webkit_sample/__openerp__.py +++ b/addons/report_webkit_sample/__openerp__.py @@ -54,3 +54,5 @@ You have to create the print buttons by calling the wizard. For more details see "certificate" : "00436592682591421981", 'images': ['images/webkit_invoice_report.jpeg'], } + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/report_webkit_sample/report/__init__.py b/addons/report_webkit_sample/report/__init__.py index 04cc14f1d80..1839cb9bed0 100644 --- a/addons/report_webkit_sample/report/__init__.py +++ b/addons/report_webkit_sample/report/__init__.py @@ -29,4 +29,5 @@ # ############################################################################## -import report_webkit_html \ No newline at end of file +import report_webkit_html +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/report_webkit_sample/report/report_webkit_html.py b/addons/report_webkit_sample/report/report_webkit_html.py index 3e7f70c4154..5da7f008569 100644 --- a/addons/report_webkit_sample/report/report_webkit_html.py +++ b/addons/report_webkit_sample/report/report_webkit_html.py @@ -15,3 +15,5 @@ report_sxw.report_sxw('report.webkitaccount.invoice', 'account.invoice', 'addons/report_webkit_sample/report/report_webkit_html.mako', parser=report_webkit_html) + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/resource/faces/observer.py b/addons/resource/faces/observer.py index 411b2c5395b..894345230ea 100644 --- a/addons/resource/faces/observer.py +++ b/addons/resource/faces/observer.py @@ -77,3 +77,5 @@ factories = { } clear_cache_funcs = {} #@-node:@file observer.py #@-leo + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/resource/faces/pcalendar.py b/addons/resource/faces/pcalendar.py index aba9635fc4b..c82c49d4816 100644 --- a/addons/resource/faces/pcalendar.py +++ b/addons/resource/faces/pcalendar.py @@ -949,3 +949,5 @@ if __name__ == '__main__': start3 = cal.StartDate("10.1.2005") #@-node:@file pcalendar.py #@-leo + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/resource/faces/plocale.py b/addons/resource/faces/plocale.py index a9de390b255..61bfa91917b 100644 --- a/addons/resource/faces/plocale.py +++ b/addons/resource/faces/plocale.py @@ -52,3 +52,5 @@ def get_encoding(): if trans: return trans.charset() return locale.getpreferredencoding() + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/resource/faces/resource.py b/addons/resource/faces/resource.py index 7cc2741fc8e..3451806444e 100644 --- a/addons/resource/faces/resource.py +++ b/addons/resource/faces/resource.py @@ -864,3 +864,5 @@ class _AndResourceGroup(_ResourceGroup): #@-others #@-node:@file resource.py #@-leo + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/resource/faces/task.py b/addons/resource/faces/task.py index fe90c42d806..f5240112277 100644 --- a/addons/resource/faces/task.py +++ b/addons/resource/faces/task.py @@ -3851,3 +3851,5 @@ class AdjustedProject(_AllocationPoject): """ #@-node:@file task.py #@-leo + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/resource/faces/timescale.py b/addons/resource/faces/timescale.py index 215766eb958..3e7c3c1dc89 100644 --- a/addons/resource/faces/timescale.py +++ b/addons/resource/faces/timescale.py @@ -111,3 +111,5 @@ class TimeScale(object): _default_scale = TimeScale(pcal._default_calendar) + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/resource/faces/utils.py b/addons/resource/faces/utils.py index f7d61fb1dc9..54985767613 100644 --- a/addons/resource/faces/utils.py +++ b/addons/resource/faces/utils.py @@ -122,3 +122,5 @@ def progress_end(): + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/sale/edi/__init__.py b/addons/sale/edi/__init__.py index 566b1714ffd..89edae49949 100644 --- a/addons/sale/edi/__init__.py +++ b/addons/sale/edi/__init__.py @@ -19,4 +19,5 @@ # ############################################################################## -import sale_order \ No newline at end of file +import sale_order +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/sale/stock.py b/addons/sale/stock.py index 9043bc9abe9..9e0a47b3ceb 100644 --- a/addons/sale/stock.py +++ b/addons/sale/stock.py @@ -198,3 +198,5 @@ class stock_picking(osv.osv): stock_picking() + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/sale_crm/wizard/crm_make_sale.py b/addons/sale_crm/wizard/crm_make_sale.py index d1f6dc98edd..ae0371a15e5 100644 --- a/addons/sale_crm/wizard/crm_make_sale.py +++ b/addons/sale_crm/wizard/crm_make_sale.py @@ -154,3 +154,5 @@ class crm_make_sale(osv.osv_memory): } crm_make_sale() + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/sale_journal/__init__.py b/addons/sale_journal/__init__.py index b05803da6c6..2af863efc1b 100644 --- a/addons/sale_journal/__init__.py +++ b/addons/sale_journal/__init__.py @@ -21,3 +21,5 @@ import sale_journal + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/sale_journal/sale_journal.py b/addons/sale_journal/sale_journal.py index 5a2004842cd..edae822e832 100644 --- a/addons/sale_journal/sale_journal.py +++ b/addons/sale_journal/sale_journal.py @@ -85,3 +85,5 @@ class sale(osv.osv): return result sale() + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/share/__init__.py b/addons/share/__init__.py index e3c3acf1bc5..0ad202a6162 100644 --- a/addons/share/__init__.py +++ b/addons/share/__init__.py @@ -22,3 +22,5 @@ import ir_model import res_users import wizard + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/share/ir_model.py b/addons/share/ir_model.py index 437a0c51095..067cebf86d5 100644 --- a/addons/share/ir_model.py +++ b/addons/share/ir_model.py @@ -43,4 +43,5 @@ class ir_model_access(osv.osv): a.perm_''' + access_mode, (model_name,)) return [x[0] for x in cr.fetchall()] -ir_model_access() \ No newline at end of file +ir_model_access() +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/share/res_users.py b/addons/share/res_users.py index 07031ab3845..f7a81a24948 100644 --- a/addons/share/res_users.py +++ b/addons/share/res_users.py @@ -37,3 +37,5 @@ class res_users(osv.osv): help="External user with limited access, created only for the purpose of sharing data.") } res_users() + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/share/wizard/__init__.py b/addons/share/wizard/__init__.py index 2034dfe2fc6..1dae9e7a508 100644 --- a/addons/share/wizard/__init__.py +++ b/addons/share/wizard/__init__.py @@ -21,3 +21,5 @@ import share_wizard + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/share/wizard/share_wizard.py b/addons/share/wizard/share_wizard.py index 1cd8104100c..5f33f02f9e5 100644 --- a/addons/share/wizard/share_wizard.py +++ b/addons/share/wizard/share_wizard.py @@ -754,3 +754,5 @@ class share_result_line(osv.osv_memory): 'newly_created': True, } share_result_line() + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/stock/__openerp__.py b/addons/stock/__openerp__.py index 73215505177..9608aa9d8ad 100644 --- a/addons/stock/__openerp__.py +++ b/addons/stock/__openerp__.py @@ -91,3 +91,5 @@ Thanks to the double entry management, the inventory controlling is powerful and 'active': False, 'certificate': '0055421559965', } + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/stock/report/__init__.py b/addons/stock/report/__init__.py index 412e77f3f17..e1e083c2a8d 100644 --- a/addons/stock/report/__init__.py +++ b/addons/stock/report/__init__.py @@ -27,3 +27,5 @@ import report_stock_move import stock_inventory_move_report import lot_overview + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/stock/report/report_stock_move.py b/addons/stock/report/report_stock_move.py index 7bf817811c4..520efc229a0 100644 --- a/addons/stock/report/report_stock_move.py +++ b/addons/stock/report/report_stock_move.py @@ -222,3 +222,5 @@ CREATE OR REPLACE view report_stock_inventory AS ( report_stock_inventory() + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/stock/wizard/stock_change_standard_price.py b/addons/stock/wizard/stock_change_standard_price.py index fa36559dddc..d4ca8d1138f 100644 --- a/addons/stock/wizard/stock_change_standard_price.py +++ b/addons/stock/wizard/stock_change_standard_price.py @@ -117,3 +117,5 @@ class change_standard_price(osv.osv_memory): return {'type': 'ir.actions.act_window_close'} change_standard_price() + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/stock/wizard/stock_move.py b/addons/stock/wizard/stock_move.py index 9ff0c96a3b8..f8ef095fb01 100644 --- a/addons/stock/wizard/stock_move.py +++ b/addons/stock/wizard/stock_move.py @@ -268,3 +268,5 @@ class stock_move_split_lines_exist(osv.osv_memory): loc_id=False, product_id=False, uom_id=False): return self.pool.get('stock.move').onchange_lot_id(cr, uid, [], prodlot_id, product_qty, loc_id, product_id, uom_id) + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/stock/wizard/stock_splitinto.py b/addons/stock/wizard/stock_splitinto.py index 1f48c8cfc19..78396656389 100644 --- a/addons/stock/wizard/stock_splitinto.py +++ b/addons/stock/wizard/stock_splitinto.py @@ -82,3 +82,5 @@ class stock_split_into(osv.osv_memory): return {'type': 'ir.actions.act_window_close'} stock_split_into() + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/stock_location/__openerp__.py b/addons/stock_location/__openerp__.py index 1c4b7841a10..63d145136c5 100644 --- a/addons/stock_location/__openerp__.py +++ b/addons/stock_location/__openerp__.py @@ -102,3 +102,5 @@ You can use the demo data as follow: 'active': False, 'certificate': '0046505115101', } + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/stock_location/procurement_pull.py b/addons/stock_location/procurement_pull.py index 7122e5ccd12..92cee8c166f 100644 --- a/addons/stock_location/procurement_pull.py +++ b/addons/stock_location/procurement_pull.py @@ -121,4 +121,5 @@ class procurement_order(osv.osv): wf_service.trg_validate(uid, 'procurement.order', proc_id, 'button_check', cr) return False -procurement_order() \ No newline at end of file +procurement_order() +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/stock_planning/wizard/__init__.py b/addons/stock_planning/wizard/__init__.py index 1e9d74d0394..876b4afdf68 100644 --- a/addons/stock_planning/wizard/__init__.py +++ b/addons/stock_planning/wizard/__init__.py @@ -22,3 +22,5 @@ import stock_planning_create_periods import stock_planning_forecast import stock_planning_createlines + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/thunderbird/__init__.py b/addons/thunderbird/__init__.py index 68afc0cccf9..33d232b3f50 100644 --- a/addons/thunderbird/__init__.py +++ b/addons/thunderbird/__init__.py @@ -21,3 +21,5 @@ import partner import installer + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/thunderbird/__openerp__.py b/addons/thunderbird/__openerp__.py index 5b124af05aa..53a704d2f1b 100644 --- a/addons/thunderbird/__openerp__.py +++ b/addons/thunderbird/__openerp__.py @@ -45,3 +45,5 @@ HR Applicant and Project Issue from selected mails. "certificate" : "00899858104035139949", 'images': ['images/config_thunderbird.jpeg','images/config_thunderbird_plugin.jpeg','images/thunderbird_document.jpeg'], } + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/thunderbird/installer.py b/addons/thunderbird/installer.py index 35d31b9d636..4cbcec9fff0 100644 --- a/addons/thunderbird/installer.py +++ b/addons/thunderbird/installer.py @@ -68,3 +68,5 @@ Configure OpenERP in Thunderbird: } thunderbird_installer() + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/thunderbird/partner/__init__.py b/addons/thunderbird/partner/__init__.py index 8eee7a82e06..5583bc0e78a 100644 --- a/addons/thunderbird/partner/__init__.py +++ b/addons/thunderbird/partner/__init__.py @@ -21,3 +21,5 @@ import partner + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/thunderbird/partner/partner.py b/addons/thunderbird/partner/partner.py index 80a4bfa4d98..3ce48281de7 100644 --- a/addons/thunderbird/partner/partner.py +++ b/addons/thunderbird/partner/partner.py @@ -281,3 +281,5 @@ class thunderbird_partner(osv.osv_memory): return object thunderbird_partner() + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/web_livechat/__init__.py b/addons/web_livechat/__init__.py index 9af39b2f58c..761db42923c 100644 --- a/addons/web_livechat/__init__.py +++ b/addons/web_livechat/__init__.py @@ -18,3 +18,5 @@ # ############################################################################## import publisher_warranty + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/web_livechat/__openerp__.py b/addons/web_livechat/__openerp__.py index 750c4ca7ec5..66d365b5636 100644 --- a/addons/web_livechat/__openerp__.py +++ b/addons/web_livechat/__openerp__.py @@ -47,3 +47,5 @@ Add "Support" button in header from where you can access OpenERP Support. 'certificate': '0013762192410413', 'images': ['static/src/img/web_livechat_support.jpeg'], } + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/web_livechat/publisher_warranty.py b/addons/web_livechat/publisher_warranty.py index 132e78d013e..b0a7e793ecf 100644 --- a/addons/web_livechat/publisher_warranty.py +++ b/addons/web_livechat/publisher_warranty.py @@ -48,3 +48,5 @@ class publisher_warranty_contract(osv.osv): publisher_warranty_contract() + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/web_uservoice/__init__.py b/addons/web_uservoice/__init__.py index b0c3c528f28..ac2fe14a5c1 100644 --- a/addons/web_uservoice/__init__.py +++ b/addons/web_uservoice/__init__.py @@ -18,3 +18,5 @@ # ############################################################################## + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/web_uservoice/__openerp__.py b/addons/web_uservoice/__openerp__.py index 64b443be3e2..41f80d4f7d1 100644 --- a/addons/web_uservoice/__openerp__.py +++ b/addons/web_uservoice/__openerp__.py @@ -44,3 +44,5 @@ Invite OpenERP user feedback, powered by uservoice. ], 'images': ['static/src/img/submit_an_idea.jpeg', 'static/src/img/web_uservoice_feedback.jpeg'], } + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/wiki/web/__init__.py b/addons/wiki/web/__init__.py index 5b55f6cf43b..6fb28f7f2ad 100644 --- a/addons/wiki/web/__init__.py +++ b/addons/wiki/web/__init__.py @@ -1,2 +1,4 @@ import widgets import controllers + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/wiki/web/controllers/__init__.py b/addons/wiki/web/controllers/__init__.py index 8c163ddd260..e1edf0f0f96 100644 --- a/addons/wiki/web/controllers/__init__.py +++ b/addons/wiki/web/controllers/__init__.py @@ -1 +1,3 @@ import wiki + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/wiki/web/controllers/wiki.py b/addons/wiki/web/controllers/wiki.py index f4b0527e1e2..2f147827f24 100644 --- a/addons/wiki/web/controllers/wiki.py +++ b/addons/wiki/web/controllers/wiki.py @@ -61,3 +61,5 @@ class WikiView(SecuredController): res, file_name = self.get_attachment(**kws) cherrypy.response.headers['Content-Disposition'] = 'filename="%s"' % (file_name,) return base64.decodestring(res) + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/wiki/web/widgets/__init__.py b/addons/wiki/web/widgets/__init__.py index a3caa17e700..4b2c273d02a 100644 --- a/addons/wiki/web/widgets/__init__.py +++ b/addons/wiki/web/widgets/__init__.py @@ -1 +1,3 @@ from wiki import WikiWidget + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/wiki/web/widgets/rss/__init__.py b/addons/wiki/web/widgets/rss/__init__.py index 464c4364414..1696c2f554b 100644 --- a/addons/wiki/web/widgets/rss/__init__.py +++ b/addons/wiki/web/widgets/rss/__init__.py @@ -1 +1,2 @@ -import feedparser \ No newline at end of file +import feedparser +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/wiki/web/widgets/rss/feedparser.py b/addons/wiki/web/widgets/rss/feedparser.py index 6f30574d300..885050d49f8 100755 --- a/addons/wiki/web/widgets/rss/feedparser.py +++ b/addons/wiki/web/widgets/rss/feedparser.py @@ -2856,3 +2856,5 @@ if __name__ == '__main__': # terminology; parse RFC 822-style dates with no time; lots of other # bug fixes #4.1 - MAP - removed socket timeout; added support for chardet library + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/wiki/web/widgets/wiki.py b/addons/wiki/web/widgets/wiki.py index 0f7240f6fcc..ccf2a75899c 100644 --- a/addons/wiki/web/widgets/wiki.py +++ b/addons/wiki/web/widgets/wiki.py @@ -220,3 +220,5 @@ class WikiWidget(Text): self.data = html register_widget(WikiWidget, ["text_wiki"]) + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/wiki/web/widgets/wikimarkup/__init__.py b/addons/wiki/web/widgets/wikimarkup/__init__.py index 5eceea0e86d..f5fe67fada1 100644 --- a/addons/wiki/web/widgets/wikimarkup/__init__.py +++ b/addons/wiki/web/widgets/wikimarkup/__init__.py @@ -2142,3 +2142,5 @@ def str2url(str): for i in zip(mfrom, to): str = str.replace(*i) return str + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: From a2f4f2669b29e8bce8d9a72b6b6b1167e3906907 Mon Sep 17 00:00:00 2001 From: Numerigraphe - Lionel Sausin Date: Tue, 22 Nov 2011 09:58:48 +0100 Subject: [PATCH 15/41] [IMP] Added missing vim mode lines lp bug: https://launchpad.net/bugs/524279 fixed bzr revid: ls@numerigraphe.fr-20111122085848-1atcrcw8e64altcp --- gunicorn.conf.py | 2 + history/xml2yml.py | 2 + openerp/addons/base/ir/ir_config_parameter.py | 2 + openerp/addons/base/ir/ir_default.py | 2 + openerp/addons/base/ir/ir_values.py | 2 + .../addons/base/ir/osv_memory_autovacuum.py | 2 + .../addons/base/ir/wizard/wizard_screen.py | 3 +- openerp/addons/base/module/__init__.py | 2 + openerp/addons/base/module/module.py | 2 + .../module/wizard/base_import_language.py | 2 + .../base/module/wizard/base_module_scan.py | 3 +- .../base/module/wizard/base_module_upgrade.py | 2 + .../module/wizard/base_update_translations.py | 2 + openerp/addons/base/report/__init__.py | 2 + openerp/addons/base/res/res_bank.py | 2 + openerp/addons/base/res/res_log.py | 2 + openerp/addons/base/res/res_widget.py | 2 + openerp/addons/base/res/test/res_lang.py | 2 + .../res/wizard/partner_wizard_ean_check.py | 3 +- openerp/report/preprocess.py | 2 + openerp/report/pyPdf/__init__.py | 2 + openerp/report/pyPdf/xmp.py | 2 + openerp/report/render/html2html/html2html.py | 2 + .../report/render/makohtml2html/__init__.py | 2 + .../render/makohtml2html/makohtml2html.py | 2 + openerp/report/render/odt2odt/odt2odt.py | 2 + openerp/report/render/rml2pdf/__init__.py | 2 + openerp/report/render/rml2pdf/customfonts.py | 2 + openerp/report/render/rml2pdf/trml2pdf.py | 2 + openerp/report/report_sxw.py | 2 + openerp/run_tests.py | 2 + openerp/service/http_server.py | 2 + openerp/service/netrpc_server.py | 2 + openerp/service/security.py | 2 + openerp/service/websrv_lib.py | 2 + openerp/test/__init__.py | 2 + openerp/test/test_osv.py | 2 + openerp/test/test_translate.py | 2 + openerp/tiny_socket.py | 2 + openerp/tools/amount_to_text_en.py | 2 + openerp/tools/cache.py | 2 + openerp/tools/config.py | 2 + openerp/tools/convert.py | 2 + openerp/tools/copy.py | 2 + openerp/tools/func.py | 2 + openerp/tools/lru.py | 2 + openerp/tools/osutil.py | 2 + openerp/tools/parse_version.py | 2 + openerp/tools/test_config.py | 2 + openerp/tools/test_reports.py | 2 + openerp/tools/which.py | 2 + openerp/tools/yaml_tag.py | 2 + setup.py | 174 +++++++++++------- tests/__init__.py | 2 + tests/common.py | 2 + tests/test_ir_sequence.py | 2 + tests/test_orm.py | 2 + tests/test_xmlrpc.py | 2 + 58 files changed, 222 insertions(+), 69 deletions(-) mode change 100644 => 100755 setup.py diff --git a/gunicorn.conf.py b/gunicorn.conf.py index 7b117c040f6..55adfb55070 100644 --- a/gunicorn.conf.py +++ b/gunicorn.conf.py @@ -15,3 +15,5 @@ conf = openerp.tools.config conf['addons_path'] = '/home/openerp/repos/addons/trunk-xmlrpc' conf['static_http_document_root'] = '/tmp' #conf['log_level'] = 10 # 10 is DEBUG + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/history/xml2yml.py b/history/xml2yml.py index e926ddf5f94..8344d5f81e0 100755 --- a/history/xml2yml.py +++ b/history/xml2yml.py @@ -343,3 +343,5 @@ if __name__=='__main__': p = xml_parse() p.parse(fname) + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/openerp/addons/base/ir/ir_config_parameter.py b/openerp/addons/base/ir/ir_config_parameter.py index fe8c651621c..f21c2db8d0a 100644 --- a/openerp/addons/base/ir/ir_config_parameter.py +++ b/openerp/addons/base/ir/ir_config_parameter.py @@ -92,3 +92,5 @@ class ir_config_parameter(osv.osv): else: self.create(cr, uid, {'key': key, 'value': value}, context=context) return False + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/openerp/addons/base/ir/ir_default.py b/openerp/addons/base/ir/ir_default.py index a51405b32c1..2378551153d 100644 --- a/openerp/addons/base/ir/ir_default.py +++ b/openerp/addons/base/ir/ir_default.py @@ -45,3 +45,5 @@ class ir_default(osv.osv): } ir_default() + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/openerp/addons/base/ir/ir_values.py b/openerp/addons/base/ir/ir_values.py index 15e8f3bf3ce..3802baecddc 100644 --- a/openerp/addons/base/ir/ir_values.py +++ b/openerp/addons/base/ir/ir_values.py @@ -457,3 +457,5 @@ class ir_values(osv.osv): def do_get(model,res_id): return self.get_actions(cr, uid, action_slot=key2, model=model, res_id=res_id, context=context) return self._map_legacy_model_list(models, do_get, merge_results=True) + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/openerp/addons/base/ir/osv_memory_autovacuum.py b/openerp/addons/base/ir/osv_memory_autovacuum.py index 975fcd0a403..1b3ca507eb8 100644 --- a/openerp/addons/base/ir/osv_memory_autovacuum.py +++ b/openerp/addons/base/ir/osv_memory_autovacuum.py @@ -31,3 +31,5 @@ class osv_memory_autovacuum(openerp.osv.osv.osv_memory): model._transient_vacuum(cr, uid) return True + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/openerp/addons/base/ir/wizard/wizard_screen.py b/openerp/addons/base/ir/wizard/wizard_screen.py index 5762bdc8752..303cd37a6f1 100644 --- a/openerp/addons/base/ir/wizard/wizard_screen.py +++ b/openerp/addons/base/ir/wizard/wizard_screen.py @@ -49,4 +49,5 @@ class wizard_screen(osv.osv_memory): _defaults = { 'config_logo': _get_image } -wizard_screen() \ No newline at end of file +wizard_screen() +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/openerp/addons/base/module/__init__.py b/openerp/addons/base/module/__init__.py index 1b7abf2e76e..f92a94f735e 100644 --- a/openerp/addons/base/module/__init__.py +++ b/openerp/addons/base/module/__init__.py @@ -22,3 +22,5 @@ import module import wizard import report + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/openerp/addons/base/module/module.py b/openerp/addons/base/module/module.py index 3a6a044832f..8e8181c89a2 100644 --- a/openerp/addons/base/module/module.py +++ b/openerp/addons/base/module/module.py @@ -707,3 +707,5 @@ class module_dependency(osv.osv): ], string='State', readonly=True, select=True), } module_dependency() + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/openerp/addons/base/module/wizard/base_import_language.py b/openerp/addons/base/module/wizard/base_import_language.py index fdb9a177d8b..acc0aa9640a 100644 --- a/openerp/addons/base/module/wizard/base_import_language.py +++ b/openerp/addons/base/module/wizard/base_import_language.py @@ -68,3 +68,5 @@ class base_language_import(osv.osv_memory): return {} base_language_import() + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/openerp/addons/base/module/wizard/base_module_scan.py b/openerp/addons/base/module/wizard/base_module_scan.py index d47e091955f..d99c2db7e4d 100644 --- a/openerp/addons/base/module/wizard/base_module_scan.py +++ b/openerp/addons/base/module/wizard/base_module_scan.py @@ -70,4 +70,5 @@ class base_module_scan(osv.osv_memory): mod_obj.write(cr, uid, [mod['id']], {'state': 'uninstalled'}) return {} -base_module_scan() \ No newline at end of file +base_module_scan() +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/openerp/addons/base/module/wizard/base_module_upgrade.py b/openerp/addons/base/module/wizard/base_module_upgrade.py index ca82cfb20d2..3b8671b0ebb 100644 --- a/openerp/addons/base/module/wizard/base_module_upgrade.py +++ b/openerp/addons/base/module/wizard/base_module_upgrade.py @@ -116,3 +116,5 @@ class base_module_upgrade(osv.osv_memory): return self.pool.get('res.config').next(cr, uid, [], context=context) base_module_upgrade() + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/openerp/addons/base/module/wizard/base_update_translations.py b/openerp/addons/base/module/wizard/base_update_translations.py index bd950ea628d..ebdfc05b75c 100644 --- a/openerp/addons/base/module/wizard/base_update_translations.py +++ b/openerp/addons/base/module/wizard/base_update_translations.py @@ -72,3 +72,5 @@ class base_update_translations(osv.osv_memory): } base_update_translations() + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/openerp/addons/base/report/__init__.py b/openerp/addons/base/report/__init__.py index 254008f0185..6faf7839863 100644 --- a/openerp/addons/base/report/__init__.py +++ b/openerp/addons/base/report/__init__.py @@ -1 +1,3 @@ import preview_report + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/openerp/addons/base/res/res_bank.py b/openerp/addons/base/res/res_bank.py index 9184cf2ad1c..35deb32d551 100644 --- a/openerp/addons/base/res/res_bank.py +++ b/openerp/addons/base/res/res_bank.py @@ -225,3 +225,5 @@ class res_partner_bank(osv.osv): res_partner_bank() + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/openerp/addons/base/res/res_log.py b/openerp/addons/base/res/res_log.py index 0ec39dbf615..ef49b52ee52 100644 --- a/openerp/addons/base/res/res_log.py +++ b/openerp/addons/base/res/res_log.py @@ -76,3 +76,5 @@ class res_log(osv.osv): return result res_log() + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/openerp/addons/base/res/res_widget.py b/openerp/addons/base/res/res_widget.py index 71bdd85fc21..c4765c3cb1f 100644 --- a/openerp/addons/base/res/res_widget.py +++ b/openerp/addons/base/res/res_widget.py @@ -84,3 +84,5 @@ class res_widget_wizard(osv.osv_memory): res_widget_wizard() + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/openerp/addons/base/res/test/res_lang.py b/openerp/addons/base/res/test/res_lang.py index 9272f1142ea..58963043ee6 100644 --- a/openerp/addons/base/res/test/res_lang.py +++ b/openerp/addons/base/res/test/res_lang.py @@ -10,3 +10,5 @@ for k, v in list(sys.modules.items()): import openerp.addons.base.res.res_lang as res_lang res_lang._group_examples() + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/openerp/addons/base/res/wizard/partner_wizard_ean_check.py b/openerp/addons/base/res/wizard/partner_wizard_ean_check.py index 8ee383c18f5..cf55fe753a8 100644 --- a/openerp/addons/base/res/wizard/partner_wizard_ean_check.py +++ b/openerp/addons/base/res/wizard/partner_wizard_ean_check.py @@ -74,4 +74,5 @@ class partner_wizard_ean_check(osv.osv_memory): }) return {} -partner_wizard_ean_check() \ No newline at end of file +partner_wizard_ean_check() +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/openerp/report/preprocess.py b/openerp/report/preprocess.py index b339e078d81..e681860d7a2 100644 --- a/openerp/report/preprocess.py +++ b/openerp/report/preprocess.py @@ -100,3 +100,5 @@ if __name__=='__main__': result = a.preprocess_rml(node) print etree.tostring(result) + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/openerp/report/pyPdf/__init__.py b/openerp/report/pyPdf/__init__.py index 8d17648d4b9..9e4f84d3863 100644 --- a/openerp/report/pyPdf/__init__.py +++ b/openerp/report/pyPdf/__init__.py @@ -3,3 +3,5 @@ from pdf import PdfFileReader, PdfFileWriter __all__ = ["pdf"] + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/openerp/report/pyPdf/xmp.py b/openerp/report/pyPdf/xmp.py index b070df9093e..0813b806d45 100644 --- a/openerp/report/pyPdf/xmp.py +++ b/openerp/report/pyPdf/xmp.py @@ -353,3 +353,5 @@ class XmpInformation(PdfObject): custom_properties = property(custom_properties) + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/openerp/report/render/html2html/html2html.py b/openerp/report/render/html2html/html2html.py index 9847c4412e3..181c7f7ba67 100644 --- a/openerp/report/render/html2html/html2html.py +++ b/openerp/report/render/html2html/html2html.py @@ -93,3 +93,5 @@ def parseString(node, localcontext = {}): root = r.url_modify(root) return root + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/openerp/report/render/makohtml2html/__init__.py b/openerp/report/render/makohtml2html/__init__.py index ee458d04718..8ce38649762 100644 --- a/openerp/report/render/makohtml2html/__init__.py +++ b/openerp/report/render/makohtml2html/__init__.py @@ -23,3 +23,5 @@ from makohtml2html import parseNode #.apidoc title: MAKO to HTML engine + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/openerp/report/render/makohtml2html/makohtml2html.py b/openerp/report/render/makohtml2html/makohtml2html.py index 9241862d251..1682385be19 100644 --- a/openerp/report/render/makohtml2html/makohtml2html.py +++ b/openerp/report/render/makohtml2html/makohtml2html.py @@ -131,3 +131,5 @@ class makohtml2html(object): def parseNode(html, localcontext = {}): r = makohtml2html(html, localcontext) return r.render() + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/openerp/report/render/odt2odt/odt2odt.py b/openerp/report/render/odt2odt/odt2odt.py index a28ec904a22..d077207f4d7 100644 --- a/openerp/report/render/odt2odt/odt2odt.py +++ b/openerp/report/render/odt2odt/odt2odt.py @@ -53,3 +53,5 @@ def parseNode(node, localcontext = {}): r = odt2odt(node, localcontext) return r.render() + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/openerp/report/render/rml2pdf/__init__.py b/openerp/report/render/rml2pdf/__init__.py index ffe9339b659..fdbb5f77b89 100644 --- a/openerp/report/render/rml2pdf/__init__.py +++ b/openerp/report/render/rml2pdf/__init__.py @@ -23,3 +23,5 @@ from trml2pdf import parseString, parseNode #.apidoc title: RML to PDF engine + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/openerp/report/render/rml2pdf/customfonts.py b/openerp/report/render/rml2pdf/customfonts.py index bc70d1f65ea..56803648b4f 100644 --- a/openerp/report/render/rml2pdf/customfonts.py +++ b/openerp/report/render/rml2pdf/customfonts.py @@ -150,3 +150,5 @@ def SetCustomFonts(rmldoc): return True #eof + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/openerp/report/render/rml2pdf/trml2pdf.py b/openerp/report/render/rml2pdf/trml2pdf.py index 13ba8fee40d..6cb8a7ec83e 100644 --- a/openerp/report/render/rml2pdf/trml2pdf.py +++ b/openerp/report/render/rml2pdf/trml2pdf.py @@ -1015,3 +1015,5 @@ if __name__=="__main__": print 'Usage: trml2pdf input.rml >output.pdf' print 'Try \'trml2pdf --help\' for more information.' + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/openerp/report/report_sxw.py b/openerp/report/report_sxw.py index 98de86b01a8..742efd7e5f5 100644 --- a/openerp/report/report_sxw.py +++ b/openerp/report/report_sxw.py @@ -656,3 +656,5 @@ class report_sxw(report_rml, preprocess.report): html = create_doc(mako_html,html_parser.localcontext) return (html,'html') + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/openerp/run_tests.py b/openerp/run_tests.py index 7c0ee2a2431..4735bc9f331 100644 --- a/openerp/run_tests.py +++ b/openerp/run_tests.py @@ -25,3 +25,5 @@ import test if __name__ == '__main__': unittest.TextTestRunner(verbosity=2).run(unittest.defaultTestLoader.loadTestsFromModule(test)) + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/openerp/service/http_server.py b/openerp/service/http_server.py index 63bd991ee35..506138b7fb4 100644 --- a/openerp/service/http_server.py +++ b/openerp/service/http_server.py @@ -183,3 +183,5 @@ class OpenERPAuthProvider(AuthProvider): raise AuthRequiredExc(atype='Basic', realm=self.realm) #eof + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/openerp/service/netrpc_server.py b/openerp/service/netrpc_server.py index 5b0fe239e51..c15ed514249 100644 --- a/openerp/service/netrpc_server.py +++ b/openerp/service/netrpc_server.py @@ -153,3 +153,5 @@ def init_servers(): netrpcd = TinySocketServerThread( tools.config.get('netrpc_interface', ''), int(tools.config.get('netrpc_port', 8070))) + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/openerp/service/security.py b/openerp/service/security.py index ff140ad261b..d327efe5443 100644 --- a/openerp/service/security.py +++ b/openerp/service/security.py @@ -40,3 +40,5 @@ def check(db, uid, passwd): pool = pooler.get_pool(db) user_obj = pool.get('res.users') return user_obj.check(db, uid, passwd) + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/openerp/service/websrv_lib.py b/openerp/service/websrv_lib.py index 3df441458fd..a4bdebcec27 100644 --- a/openerp/service/websrv_lib.py +++ b/openerp/service/websrv_lib.py @@ -232,3 +232,5 @@ class HttpOptions: """ return opts + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/openerp/test/__init__.py b/openerp/test/__init__.py index 248f468a34c..7a6c167d85b 100644 --- a/openerp/test/__init__.py +++ b/openerp/test/__init__.py @@ -21,3 +21,5 @@ from test_osv import * from test_translate import * + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/openerp/test/test_osv.py b/openerp/test/test_osv.py index 48039fa46fa..d3ff75c03d5 100644 --- a/openerp/test/test_osv.py +++ b/openerp/test/test_osv.py @@ -62,3 +62,5 @@ class QueryTestCase(unittest.TestCase): query.tables.append('"product_product"') self.assertRaises(AssertionError, query.join, ("product_template", "product_category", "categ_id", "id"), outer=False) + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/openerp/test/test_translate.py b/openerp/test/test_translate.py index 85c980bede5..d9f771b69fb 100644 --- a/openerp/test/test_translate.py +++ b/openerp/test/test_translate.py @@ -46,3 +46,5 @@ class TranslationToolsTestCase(unittest.TestCase): \\\\nope\n\n" """) + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/openerp/tiny_socket.py b/openerp/tiny_socket.py index 29782109347..b4bed83a4c0 100644 --- a/openerp/tiny_socket.py +++ b/openerp/tiny_socket.py @@ -96,3 +96,5 @@ class mysocket: raise res[0] else: return res[0] + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/openerp/tools/amount_to_text_en.py b/openerp/tools/amount_to_text_en.py index 914794118aa..48999c066df 100644 --- a/openerp/tools/amount_to_text_en.py +++ b/openerp/tools/amount_to_text_en.py @@ -126,3 +126,5 @@ if __name__=='__main__': else: print int_to_text(int(argv[1]), lang) + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/openerp/tools/cache.py b/openerp/tools/cache.py index 33a821ce3b3..2c5c4a46e0d 100644 --- a/openerp/tools/cache.py +++ b/openerp/tools/cache.py @@ -135,3 +135,5 @@ if __name__ == '__main__': # For backward compatibility cache = ormcache + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/openerp/tools/config.py b/openerp/tools/config.py index f1c3931e81f..7708ab1812d 100644 --- a/openerp/tools/config.py +++ b/openerp/tools/config.py @@ -601,3 +601,5 @@ class configmanager(object): config = configmanager() + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/openerp/tools/convert.py b/openerp/tools/convert.py index 7d6a982986b..66522f47c8b 100644 --- a/openerp/tools/convert.py +++ b/openerp/tools/convert.py @@ -999,3 +999,5 @@ def convert_xml_import(cr, module, xmlfile, idref=None, mode='init', noupdate=Fa obj.parse(doc.getroot()) return True + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/openerp/tools/copy.py b/openerp/tools/copy.py index badd4d51fc5..2f8ddb52cd3 100644 --- a/openerp/tools/copy.py +++ b/openerp/tools/copy.py @@ -437,3 +437,5 @@ def _test(): if __name__ == '__main__': _test() + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/openerp/tools/func.py b/openerp/tools/func.py index 03463678ffb..9f52f1da956 100644 --- a/openerp/tools/func.py +++ b/openerp/tools/func.py @@ -118,3 +118,5 @@ def frame_codeinfo(fframe, back=0): return (fname, lineno) except Exception: return ("", '') + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/openerp/tools/lru.py b/openerp/tools/lru.py index aa7b14a745c..5e84775a352 100644 --- a/openerp/tools/lru.py +++ b/openerp/tools/lru.py @@ -118,3 +118,5 @@ class LRU(object): self.d = {} self.first = None self.last = None + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/openerp/tools/osutil.py b/openerp/tools/osutil.py index 51540ae28c7..3da9fa624a3 100644 --- a/openerp/tools/osutil.py +++ b/openerp/tools/osutil.py @@ -60,3 +60,5 @@ def walksymlinks(top, topdown=True, onerror=None): if __name__ == '__main__': from pprint import pprint as pp pp(listdir('../report', True)) + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/openerp/tools/parse_version.py b/openerp/tools/parse_version.py index c743a9bb239..316f102a5e6 100644 --- a/openerp/tools/parse_version.py +++ b/openerp/tools/parse_version.py @@ -99,3 +99,5 @@ if __name__ == '__main__': chk(('0', '4.2', '4.2.3.4', '5.0.0-alpha', '5.0.0-rc1', '5.0.0-rc1.1', '5.0.0_rc2', '5.0.0_rc3', '5.0.0'), False) chk(('5.0.0-0_rc3', '5.0.0-1dev', '5.0.0-1'), False) + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/openerp/tools/test_config.py b/openerp/tools/test_config.py index 256e7ba4c32..d89fda19b2e 100644 --- a/openerp/tools/test_config.py +++ b/openerp/tools/test_config.py @@ -44,3 +44,5 @@ conf = config.configmanager() conf.parse_config(['-c', config_file_00, '--osv-memory-age-limit=2.3']) assert conf['osv_memory_age_limit'] == 2.3 + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/openerp/tools/test_reports.py b/openerp/tools/test_reports.py index 88430dffc5c..ede199a44f8 100644 --- a/openerp/tools/test_reports.py +++ b/openerp/tools/test_reports.py @@ -307,3 +307,5 @@ def try_report_action(cr, uid, action_id, active_model=None, active_ids=None, return True #eof + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/openerp/tools/which.py b/openerp/tools/which.py index 548b836247c..81318541bdc 100755 --- a/openerp/tools/which.py +++ b/openerp/tools/which.py @@ -151,3 +151,5 @@ def which(file, mode=F_OK | X_OK, path=None, pathext=None): if __name__ == '__main__': import doctest doctest.testmod() + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/openerp/tools/yaml_tag.py b/openerp/tools/yaml_tag.py index 6f7ceec4aee..aca802c374a 100644 --- a/openerp/tools/yaml_tag.py +++ b/openerp/tools/yaml_tag.py @@ -182,3 +182,5 @@ def add_constructors(): yaml.add_constructor(u"!ir_set", ir_set_constructor) add_constructors() + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/setup.py b/setup.py old mode 100644 new mode 100755 index 3f108685f94..40695bd7c41 --- a/setup.py +++ b/setup.py @@ -1,73 +1,115 @@ +#!/usr/bin/env python +# -*- coding: utf-8 -*- +############################################################################## +# +# OpenERP, Open Source Management Solution +# Copyright (C) 2004-2010 Tiny SPRL (). +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . +# +############################################################################## -import os -import re -import sys -from setuptools import setup, find_packages +import glob, os, re, setuptools, sys +from os.path import join, isfile -execfile('addons/web/common/release.py') +# List all data files +def data(): + files = [] + for root, dirnames, filenames in os.walk('openerp'): + for filename in filenames: + if not re.match(r'.*(\.pyc|\.pyo|\~)$',filename): + files.append(os.path.join(root, filename)) + d = {} + for v in files: + k=os.path.dirname(v) + if k in d: + d[k].append(v) + else: + d[k]=[v] + r = d.items() + return r -version_dash_incompatible = False -if 'bdist_rpm' in sys.argv: - version_dash_incompatible = True -try: - import py2exe - from py2exe_utils import opts - version_dash_incompatible = True -except ImportError: - opts = {} -if version_dash_incompatible: - version = version.split('-')[0] +def gen_manifest(): + file_list="\n".join(data()) + open('MANIFEST','w').write(file_list) -FILE_PATTERNS = \ - r'.+\.(py|cfg|po|pot|mo|txt|rst|gif|png|jpg|ico|mako|html|js|css|htc|swf)$' -def find_data_files(source, patterns=FILE_PATTERNS): - file_matcher = re.compile(patterns, re.I) - out = [] - for base, _, files in os.walk(source): - cur_files = [] - for f in files: - if file_matcher.match(f): - cur_files.append(os.path.join(base, f)) - if cur_files: - out.append( - (base, cur_files)) +def py2exe_options(): + if os.name == 'nt': + import py2exe + return { + "console" : [ { "script": "openerp-server", "icon_resources": [(1, join("pixmaps","openerp-icon.ico"))], }], + 'options' : { + "py2exe": { + "skip_archive": 1, + "optimize": 2, + "dist_dir": 'dist', + "packages": [ "DAV", "HTMLParser", "PIL", "asynchat", "asyncore", "commands", "dateutil", "decimal", "email", "encodings", "imaplib", "lxml", "lxml._elementpath", "lxml.builder", "lxml.etree", "lxml.objectify", "mako", "openerp", "poplib", "pychart", "pydot", "pyparsing", "reportlab", "select", "simplejson", "smtplib", "uuid", "vatnumber" "vobject", "xml", "xml", "xml.dom", "xml.xpath", "yaml", ], + "excludes" : ["Tkconstants","Tkinter","tcl"], + } + } + } + else: + return {} - return out +execfile(join(os.path.dirname(__file__), 'openerp', 'release.py')) -setup( - name=name, - version=version, - description=description, - long_description=long_description, - author=author, - author_email=author_email, - url=url, - download_url=download_url, - license=license, - install_requires=[ - "Babel >= 0.9.6", - "simplejson >= 2.0.9", - "python-dateutil >= 1.4.1", - "pytz", - "werkzeug == 0.7", - ], - tests_require=[ - 'unittest2', - 'mock', - ], - test_suite = 'unittest2.collector', - zip_safe=False, - packages=find_packages(), - classifiers=[ - 'Development Status :: 6 - Production/Stable', - 'Operating System :: OS Independent', - 'Programming Language :: Python', - 'Environment :: Web Environment', - 'Topic :: Office/Business :: Financial', - ], - scripts=['openerp-web'], - data_files=(find_data_files('addons') - + opts.pop('data_files', []) - ), - **opts +setuptools.setup( + name = 'openerp', + version = version, + description = description, + long_description = long_desc, + url = url, + author = author, + author_email = author_email, + classifiers = filter(None, classifiers.split("\n")), + license = license, + scripts = ['openerp-server'], + data_files = data(), + packages = setuptools.find_packages(), + #include_package_data = True, + install_requires = [ + # TODO the pychart package we include in openerp corresponds to PyChart 1.37. + # It seems there is a single difference, which is a spurious print in generate_docs.py. + # It is probably safe to move to PyChart 1.39 (the latest one). + # (Let setup.py choose the latest one, and we should check we can remove pychart from + # our tree.) http://download.gna.org/pychart/ + # TODO 'pychart', + 'babel', + 'feedparser', + 'gdata', + 'lxml', + 'mako', + 'psycopg2', + 'pydot', + 'python-dateutil', + 'python-ldap', + 'python-openid', + 'pytz', + 'pywebdav', + 'pyyaml', + 'reportlab', + 'simplejson', + 'vatnumber', + 'vobject', + 'werkzeug', + 'zsi', + ], + extras_require = { + 'SSL' : ['pyopenssl'], + }, + **py2exe_options() ) + + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/tests/__init__.py b/tests/__init__.py index 396284efaf7..ec2b8de39b1 100644 --- a/tests/__init__.py +++ b/tests/__init__.py @@ -1,2 +1,4 @@ # -*- coding: utf-8 -*- import test_xmlrpc + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/tests/common.py b/tests/common.py index 116898dc7ef..3de65489587 100644 --- a/tests/common.py +++ b/tests/common.py @@ -61,3 +61,5 @@ def setUpModule(): def tearDownModule(): """ Shutdown the OpenERP server similarly to a single ctrl-c. """ openerp.service.stop_services() + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/tests/test_ir_sequence.py b/tests/test_ir_sequence.py index 8a4731d524f..263710cbd3b 100644 --- a/tests/test_ir_sequence.py +++ b/tests/test_ir_sequence.py @@ -196,3 +196,5 @@ class test_ir_sequence_generate(unittest2.TestCase): if __name__ == '__main__': unittest2.main() + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/tests/test_orm.py b/tests/test_orm.py index 61b574df5eb..0dfed0005cb 100644 --- a/tests/test_orm.py +++ b/tests/test_orm.py @@ -173,3 +173,5 @@ class TestO2MSerialization(unittest2.TestCase): self.partner.resolve_o2m_commands_to_record_dicts( self.cr, UID, 'address', [REPLACE_WITH([42])], ['name']) + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/tests/test_xmlrpc.py b/tests/test_xmlrpc.py index 4ad530cbeda..3f7286cfab1 100644 --- a/tests/test_xmlrpc.py +++ b/tests/test_xmlrpc.py @@ -64,3 +64,5 @@ class test_xmlrpc(unittest2.TestCase): if __name__ == '__main__': unittest2.main() + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: From 733941e97976e161f4f9188e381884fbc441f28e Mon Sep 17 00:00:00 2001 From: "Tejas (OpenERP)" Date: Tue, 22 Nov 2011 16:11:45 +0530 Subject: [PATCH 16/41] Fix search m2o field, default added bzr revid: tta@openerp.com-20111122104145-ce1z32beh8ef6346 --- addons/web/static/src/js/view_form.js | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index 9bd1916d714..178f326f437 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -2534,6 +2534,16 @@ openerp.web.form.SelectCreatePopup = openerp.web.OldWidget.extend(/** @lends ope start: function() { this._super(); var self = this; + search_defaults = {}; + if( "__contexts" in this.context.__contexts[0]) + { + _.each(this.context.__contexts[0].__contexts[0], function (value, key) { + var match = /^search_default_(.*)$/.exec(key); + if (match) { + search_defaults[match[1]] = value; + } + }); + } this.dataset = new openerp.web.ProxyDataSet(this, this.model, this.context); this.dataset.create_function = function() { @@ -2548,18 +2558,18 @@ openerp.web.form.SelectCreatePopup = openerp.web.OldWidget.extend(/** @lends ope this.dataset.parent_view = this.options.parent_view; this.dataset.on_default_get.add(this.on_default_get); if (this.options.initial_view == "search") { - this.setup_search_view(); + this.setup_search_view(search_defaults); } else { // "form" this.new_object(); } }, - setup_search_view: function() { + setup_search_view: function(search_defaults) { var self = this; if (this.searchview) { this.searchview.stop(); } this.searchview = new openerp.web.SearchView(this, - this.dataset, false, {}); + this.dataset, false, search_defaults); this.searchview.on_search.add(function(domains, contexts, groupbys) { if (self.initial_ids) { self.do_search(domains.concat([[["id", "in", self.initial_ids]], self.domain]), From 40e3f490a2dfffe81d164f0b8d8b68317a3e11cf Mon Sep 17 00:00:00 2001 From: vishmita Date: Tue, 22 Nov 2011 16:29:37 +0530 Subject: [PATCH 17/41] [FIX]Title should be change when going to subprocess. bzr revid: vja@vja-desktop-20111122105937-gi2zdinsmajtb53b --- addons/web_process/static/src/js/process.js | 1 + 1 file changed, 1 insertion(+) diff --git a/addons/web_process/static/src/js/process.js b/addons/web_process/static/src/js/process.js index ab5384340f3..2b7eb9b8c35 100644 --- a/addons/web_process/static/src/js/process.js +++ b/addons/web_process/static/src/js/process.js @@ -45,6 +45,7 @@ openerp.web_process = function (openerp) { if(self.process_id) { self.graph_get().done(function(res) { self.process_notes = res.notes; + self.process_title = res.name; self.process_subflows = _.filter(res.nodes, function(x) { return x.subflow != false; }); From 1c7fa1fabc86da6abf8bed400f1a8514aac56529 Mon Sep 17 00:00:00 2001 From: "Kunal Chavda (OpenERP)" Date: Tue, 22 Nov 2011 17:04:20 +0530 Subject: [PATCH 18/41] [FIX]Fixed code for showing process view icon on viewmanager. bzr revid: kch@tinyerp.com-20111122113420-m5pme4wdkrfrrm19 --- addons/web_process/__openerp__.py | 2 +- addons/web_process/static/src/css/process.css | 10 ++++++++++ addons/web_process/static/src/xml/web_process.xml | 2 +- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/addons/web_process/__openerp__.py b/addons/web_process/__openerp__.py index 1ef47573d55..edf86ce96f3 100644 --- a/addons/web_process/__openerp__.py +++ b/addons/web_process/__openerp__.py @@ -9,7 +9,7 @@ "static/src/css/process.css" ], 'qweb': [ - "static/src/xml/web_process.css" + "static/src/xml/*.xml" ], 'active': True } diff --git a/addons/web_process/static/src/css/process.css b/addons/web_process/static/src/css/process.css index 364c3788b11..ebb2267714c 100644 --- a/addons/web_process/static/src/css/process.css +++ b/addons/web_process/static/src/css/process.css @@ -50,6 +50,16 @@ a.cta-a strong { display: table-cell; } +.oe-process-view { + height: 20px; + padding: 0; + width: 24px; + cursor: pointer; + display: block; + background: url(/web/static/src/img/icons/gtk-help.png) no-repeat bottom; + float: left; +} + .process-help-text { float: left; padding:5px 10px; diff --git a/addons/web_process/static/src/xml/web_process.xml b/addons/web_process/static/src/xml/web_process.xml index 63e207a4f96..727bdad9d25 100644 --- a/addons/web_process/static/src/xml/web_process.xml +++ b/addons/web_process/static/src/xml/web_process.xml @@ -1,7 +1,7 @@