From 0eee4e49bb09507443265064de6e7f06670f6f1e Mon Sep 17 00:00:00 2001 From: Leonardo Pistone Date: Wed, 8 Aug 2012 10:49:20 +0200 Subject: [PATCH 01/14] [ADD] l10n_it: purchase taxes included in the price bzr revid: leonardo.pistone@domsense.com-20120808084920-0tsjlx652an02lgk --- addons/l10n_it/data/account.tax.template.csv | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/addons/l10n_it/data/account.tax.template.csv b/addons/l10n_it/data/account.tax.template.csv index 36c4f99db79..9ce6f02c7f5 100644 --- a/addons/l10n_it/data/account.tax.template.csv +++ b/addons/l10n_it/data/account.tax.template.csv @@ -41,11 +41,17 @@ id,description,chart_template_id:id,name,sequence,amount,parent_id:id,child_depe 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,,,False,-1,-1 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,, +21b INC,21b INC,l10n_it_chart_template_generic,Iva al 21% (credito) INC,,0.21,,False,percent,1601,1601,purchase,template_impcode_pagata_21,template_ivacode_pagata_21,template_impcode_pagata_21,template_ivacode_pagata_21,,,True,-1,-1 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,, +20b INC,20b INC,l10n_it_chart_template_generic,Iva al 20% (credito) INC,,0.2,,False,percent,1601,1601,purchase,template_impcode_pagata_20,template_ivacode_pagata_20,template_impcode_pagata_20,template_ivacode_pagata_20,,,True,-1,-1 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,, +10b INC,10b INC,l10n_it_chart_template_generic,Iva al 10% (credito) INC,,0.1,,False,percent,1601,1601,purchase,template_impcode_pagata_10,template_ivacode_pagata_10,template_impcode_pagata_10,template_ivacode_pagata_10,,,True,-1,-1 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,, +12b INC,12b INC,l10n_it_chart_template_generic,Iva 12% (credito) INC,,0.12,,False,percent,1601,1601,purchase,template_impcode_pagata_12,template_ivacode_pagata_12,template_impcode_pagata_12,template_ivacode_pagata_12,,,True,-1,-1 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,, +22b INC,22b INC,l10n_it_chart_template_generic,Iva 2% (credito) INC,,0.02,,False,percent,1601,1601,purchase,template_impcode_pagata_2,template_ivacode_pagata_2,template_impcode_pagata_2,template_ivacode_pagata_2,,,True,-1,-1 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,, +4b INC,4b INC,l10n_it_chart_template_generic,Iva 4% (credito) INC,,0.04,,False,percent,1601,1601,purchase,template_impcode_pagata_4,template_ivacode_pagata_4,template_impcode_pagata_4,template_ivacode_pagata_4,,,True,-1,-1 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,,,,False,-1,-1 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,,,False,, From 2f774e42b55504d6f15ed91efa777c75c975e11a Mon Sep 17 00:00:00 2001 From: Cubic ERP Date: Wed, 14 Nov 2012 11:49:46 -0500 Subject: [PATCH 02/14] [ADD] l10n_bo bzr revid: info@cubicerp.com-20121114164946-zry0w8fyn4vhjvqf --- addons/l10n_bo/__init__.py | 32 +++ addons/l10n_bo/__openerp__.py | 52 +++++ addons/l10n_bo/account_tax.xml | 50 +++++ addons/l10n_bo/account_tax_code.xml | 94 +++++++++ addons/l10n_bo/i18n/es.po | 72 +++++++ addons/l10n_bo/i18n/es_BO.po | 53 +++++ addons/l10n_bo/i18n/l10n_bo.pot | 35 ++++ addons/l10n_bo/l10n_bo_chart.xml | 257 +++++++++++++++++++++++++ addons/l10n_bo/l10n_bo_wizard.xml | 10 + addons/l10n_bo/static/src/img/icon.png | Bin 0 -> 1846 bytes 10 files changed, 655 insertions(+) create mode 100644 addons/l10n_bo/__init__.py create mode 100644 addons/l10n_bo/__openerp__.py create mode 100644 addons/l10n_bo/account_tax.xml create mode 100644 addons/l10n_bo/account_tax_code.xml create mode 100644 addons/l10n_bo/i18n/es.po create mode 100644 addons/l10n_bo/i18n/es_BO.po create mode 100644 addons/l10n_bo/i18n/l10n_bo.pot create mode 100644 addons/l10n_bo/l10n_bo_chart.xml create mode 100644 addons/l10n_bo/l10n_bo_wizard.xml create mode 100644 addons/l10n_bo/static/src/img/icon.png diff --git a/addons/l10n_bo/__init__.py b/addons/l10n_bo/__init__.py new file mode 100644 index 00000000000..92da5dbf966 --- /dev/null +++ b/addons/l10n_bo/__init__.py @@ -0,0 +1,32 @@ +# -*- encoding: utf-8 -*- +############################################################################## +# +# OpenERP, Open Source Management Solution +# Copyright (c) 2011 Cubic ERP - Teradata SAC. (http://cubicerp.com). +# +# WARNING: This program as such is intended to be used by professional +# programmers who take the whole responsability of assessing all potential +# consequences resulting from its eventual inadequacies and bugs +# End users who are looking for a ready-to-use solution with commercial +# garantees and support are strongly adviced to contract a Free Software +# Service Company +# +# This program is Free Software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# 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 General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# +############################################################################## + + + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/l10n_bo/__openerp__.py b/addons/l10n_bo/__openerp__.py new file mode 100644 index 00000000000..d55777d198f --- /dev/null +++ b/addons/l10n_bo/__openerp__.py @@ -0,0 +1,52 @@ +# -*- encoding: utf-8 -*- +############################################################################## +# +# OpenERP, Open Source Management Solution +# Copyright (C) 2012 Cubic ERP - Teradata SAC (). +# +# 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 . +# +############################################################################## +{ + "name": "Bolivia Localization Chart Account", + "version": "1.0", + "description": """ +Bolivian accounting chart and tax localization. + +Plan contable boliviano e impuestos de acuerdo a disposiciones vigentes + + """, + "author": "Cubic ERP", + "website": "http://cubicERP.com", + "category": "Localization/Account Charts", + "depends": [ + "account_chart", + ], + "data":[ + "account_tax_code.xml", + "l10n_bo_chart.xml", + "account_tax.xml", + "l10n_bo_wizard.xml", + ], + "demo_xml": [ + ], + "update_xml": [ + ], + "active": False, + "installable": True, + "certificate" : "", + 'images': ['images/config_chart_l10n_bo.jpeg','images/l10n_bo_chart.jpeg'], + +} +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/l10n_bo/account_tax.xml b/addons/l10n_bo/account_tax.xml new file mode 100644 index 00000000000..6c0ca68c4ba --- /dev/null +++ b/addons/l10n_bo/account_tax.xml @@ -0,0 +1,50 @@ + + + + + + + IVA 13% Venta + 0.130000 + percent + sale + 1 + + + + + + + + + + IVA 13% Compra + 0.130000 + percent + purchase + 1 + + + + + + + + + + + IT 3% + 0.30000 + percent + sale + 0 + + + + + + + + + + diff --git a/addons/l10n_bo/account_tax_code.xml b/addons/l10n_bo/account_tax_code.xml new file mode 100644 index 00000000000..9b3fa8cf6e3 --- /dev/null +++ b/addons/l10n_bo/account_tax_code.xml @@ -0,0 +1,94 @@ + + + + + + Bolivia Impuestos + + + Base Imponible + + + + Base Imponible - Ventas + + + + Impuesto al Valor Agregado con IVA + + + + Ventas NO Gravadas (Exoneradas) + + + + Ventas Gravadas Fuera de Ámbito + + + + Base Imponible - Compras + + + + Compras Gravadas con IVA + + + + Compras NO Gravadas (Exoneradas) + + + + Compras Gravadas Fuera de Ámbito + + + + + Impuesto al Valor Agregado (IVA) Total a Pagar + + + + Impuesto Pagado + + + + Impuesto Pagado IVA + + -1 + + + Impuesto Pagado de Exonerados al IVA + + -1 + + + Impuesto Pagado Fuera de Ámbito + + -1 + + + Impuesto Cobrado + + + + Impuesto Cobrado IVA + + + + Impuesto Cobrado de Exonerados al IVA + + + + Impuesto Cobrado Fuera de Ámbito + + + + + Impuesto a las Transacciones IT (3%) + + + + Impuesto a las Utilidades de la Empresa IUE (25%) + + + + diff --git a/addons/l10n_bo/i18n/es.po b/addons/l10n_bo/i18n/es.po new file mode 100644 index 00000000000..9d12c53b71c --- /dev/null +++ b/addons/l10n_bo/i18n/es.po @@ -0,0 +1,72 @@ +# Spanish translation for openobject-addons +# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010 +# This file is distributed under the same license as the openobject-addons package. +# FIRST AUTHOR , 2010. +# +msgid "" +msgstr "" +"Project-Id-Version: openobject-addons\n" +"Report-Msgid-Bugs-To: FULL NAME \n" +"POT-Creation-Date: 2011-01-11 11:15+0000\n" +"PO-Revision-Date: 2011-01-10 13:46+0000\n" +"Last-Translator: Yury Tello \n" +"Language-Team: Spanish \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2011-01-15 05:56+0000\n" +"X-Generator: Launchpad (build 12177)\n" + +#. module: l10n_ar +#: model:ir.module.module,description:l10n_ar.module_meta_information +msgid "" +"\n" +" Bolivian Accounting : chart of Account\n" +" " +msgstr "" +"\n" +" Contabilidad Peruana : Plan de cuentas\n" +" " + +#. module: l10n_bo +#: model:ir.module.module,shortdesc:l10n_bo.module_meta_information +msgid "Bolivian Chart of Account" +msgstr "Plan de cuentas de Boliviana" + +#. module: l10n_bo +#: model:ir.actions.todo,note:l10n_bo.config_call_account_template_in_minimal +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 "" +"Generar el plan contable a partir de una plantilla de plan contable. Se le " +"pedirá el nombre de la compañia, la plantilla de plan contable a utilizar, " +"el número de dígitos para generar el código de las cuentas y de la cuenta " +"bancaria, la moneda para crear los diarios. Así pues, se genere una copia " +"exacta de la plantilla de plan contable.\n" +"\tEste es el mismo asistente que se ejecuta desde Contabilidad y finanzas / " +"Configuración / Contabilidad financiera / Cuentas financieras / Generar el " +"plan contable a partir de una plantilla de plan contable." + +#~ msgid "Liability" +#~ msgstr "Pasivo" + +#~ msgid "Asset" +#~ msgstr "Activo" + +#~ msgid "Closed" +#~ msgstr "Cerrado" + +#~ msgid "Income" +#~ msgstr "Ingreso" + +#~ msgid "Expense" +#~ msgstr "Gasto" + +#~ msgid "View" +#~ msgstr "Vista" diff --git a/addons/l10n_bo/i18n/es_BO.po b/addons/l10n_bo/i18n/es_BO.po new file mode 100644 index 00000000000..5dc0ecb42be --- /dev/null +++ b/addons/l10n_bo/i18n/es_BO.po @@ -0,0 +1,53 @@ +# Spanish (Paraguay) 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. +# +msgid "" +msgstr "" +"Project-Id-Version: openobject-addons\n" +"Report-Msgid-Bugs-To: FULL NAME \n" +"POT-Creation-Date: 2011-01-11 11:15+0000\n" +"PO-Revision-Date: 2011-03-21 16:23+0000\n" +"Last-Translator: FULL NAME \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2011-03-22 04:36+0000\n" +"X-Generator: Launchpad (build 12559)\n" + +#. module: l10n_bo +#: model:ir.module.module,description:l10n_bo.module_meta_information +msgid "" +"\n" +" Bolivian Accounting : chart of Account\n" +" " +msgstr "" +"\n" +" Contabilidad boliviana : Plan de cuentas\n" +" " + +#. module: l10n_ar +#: model:ir.module.module,shortdesc:l10n_ar.module_meta_information +msgid "Bolivian Chart of Account" +msgstr "Plan de cuentas de Bolivia" + +#. module: l10n_ar +#: model:ir.actions.todo,note:l10n_ar.config_call_account_template_in_minimal +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 "" +"Generar el plan contable a partir de una plantilla de plan contable. Se le " +"pedirá el nombre de la compañía, la plantilla de plan contable a utilizar, " +"el número de dígitos para generar el código de las cuentas y de la cuenta " +"bancaria, la moneda para crear los diarios. Así pues, se genere una copia " +"exacta de la plantilla de plan contable.\n" +"\tEste es el mismo asistente que se ejecuta desde Contabilidad y finanzas / " +"Configuración / Contabilidad financiera / Cuentas financieras / Generar el " +"plan contable a partir de una plantilla de plan contable." diff --git a/addons/l10n_bo/i18n/l10n_bo.pot b/addons/l10n_bo/i18n/l10n_bo.pot new file mode 100644 index 00000000000..8d117342eea --- /dev/null +++ b/addons/l10n_bo/i18n/l10n_bo.pot @@ -0,0 +1,35 @@ +# Translation of OpenERP Server. +# This file contains the translation of the following modules: +# * l10n_ar +# +msgid "" +msgstr "" +"Project-Id-Version: OpenERP Server 6.1.0-rc1\n" +"Report-Msgid-Bugs-To: soporte@cubicerp.com\n" +"POT-Creation-Date: 2011-01-11 11:15:31+0000\n" +"PO-Revision-Date: 2011-01-11 11:15:31+0000\n" +"Last-Translator: <>\n" +"Language-Team: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Plural-Forms: \n" + +#. module: l10n_ar +#: model:ir.module.module,description:l10n_ar.module_meta_information +msgid "\n" +" Argentinian Accounting : chart of Account\n" +" " +msgstr "" + +#. module: l10n_ar +#: model:ir.module.module,shortdesc:l10n_ar.module_meta_information +msgid "Argentinian Chart of Account" +msgstr "" + +#. module: l10n_ar +#: model:ir.actions.todo,note:l10n_ar.config_call_account_template_in_minimal +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 "" + diff --git a/addons/l10n_bo/l10n_bo_chart.xml b/addons/l10n_bo/l10n_bo_chart.xml new file mode 100644 index 00000000000..dc9e9598909 --- /dev/null +++ b/addons/l10n_bo/l10n_bo_chart.xml @@ -0,0 +1,257 @@ + + + + + + + noneviewVistanone + + balanceBG_ACC_10Caja y Bancosasset + detailBG_ACC_20Inversiones al Valor Razonable y Disponibleasset + unreconciledBG_ACC_30Créditos o Exigiblesasset + unreconciledBG_ACC_50Otros Créditosasset + balanceBG_ACC_60Bienes de Cambio o Realizablezasset + + detailBG_ACN_10Otros Creditos no Corrientesasset + detailBG_ACN_40Inversiones Permanentesasset + balanceBG_ACN_50Bienes de Usoasset + + unreconciledBG_PAC_10Deudas Bancarias y Financierasliability + unreconciledBG_PAC_20Cuentas por Pagarliability + unreconciledBG_PAC_35Deudas del Personal e Instituciones de Seguridad Socialliability + unreconciledBG_PAC_40Deudas Fiscalesliability + unreconciledBG_PAC_45Otros Pasivosliability + + unreconciledBG_PAN_10Deudas Bancarias y Financieras a Largo Plazoliability + unreconciledBG_PAN_20Otros Pasivos a Largo Plazoliability + unreconciledBG_PAN_40Previsiones y Provisionesliability + + balanceBG_PTN_10Patrimonio o Capital Contableliability + + noneEGP_FU_010Ventas de Mercaderia en Generalincome + noneEGP_FU_030Costo de Ventas de Mercaderíasexpense + noneEGP_FU_040Gastos de Administraciónexpense + noneEGP_FU_050Gastos de Distribución o Ventasexpense + unreconciledEGP_FU_060Ingresos Financierosincome + noneEGP_FU_070Gastos Financierosexpense + noneEGP_FU_080Otros Ingresosincome + noneEGP_FU_090Otros Gastosexpense + noneEGP_FU_120Tributosexpense + noneEGP_FU_160Ganancia (Pérdida) Neta del Ejercicioincome + + noneEGP_NA_010Compras de Bienes de Usonone + + noneORDCuentas de Ordennone + + noneNCLASIFICADOCuentas No Clasificadasnone + + + + + Bolivia + pcge + + view + + + Cuentas Patrimoniales + .1.BG + + + view + + + ACTIVO1view + Caja y Bancos11view + Caja y Bancos - Caja111view + Caja y bancos - Caja / efectivo en BOB111.001liquidity + Caja y Bancos - Moneda Extranjera112view + Caja y bancos - Caja / efectivo USD112.001liquidity + Caja y Bancos - Fondos fijos113view + Caja y ...- Fondos fijos / caja chica 01 BOB113.001liquidity + Caja y Bancos - Cuentas Corrientes114view + Caja y Bancos.../ BCO. CTA CTE BOB114.001liquidity + Caja y bancos - Valores a Depositar 115other + Caja y bancos - Recaudaciones a Depositar 116other + Créditos fiscal IVA12view + Créditos fiscal IVA / Deudores por Ventas121receivable1 + Créditos fiscal IVA / Deudores Morosos122receivable1 + Créditos fiscal IVA / Deudores en Gestión Judicial123receivable + Créditos fiscal IVA / Deudores Varios124receivable + Créditos fiscal IVA / (-) Previsión para Ds. Incobrables125receivable1 + Otros Créditos13view + Otros Créditos / Préstamos otorgados131receivable + Otros Créditos / Anticipos a Proveedores132receivable + Otros Créditos / Anticipo de Impuestos133receivable + Otros Créditos / Anticipo al Personal134receivable + Otros Créditos / Alquileres Pagados por Adelantado135receivable + Otros Créditos / Intereses Pagados por Adelantado136receivable + Otros Créditos / Accionistas137receivable + Otros Créditos / (-) Previsión para Descuentos138receivable + Otros Créditos / (-) Intereses (+) a Devengar139receivable + Inversiones14view + Inversiones / Acciones Transitorias141other + Inversiones / Acciones Permanentes142other + Inversiones / Títulos Públicos143other + Inversiones / (-) Previsión para Devalorización de Acciones144other + Bienes de Cambio o Realizables15view + Bienes de Cambio - Mercaderías151view + Bienes de Cambio - Existencia de Mercaderías / Categoria de productos 01151.01other + Bienes de Cambio - Mercaderías en Tránsito152other + Materias primas153other + Productos en Curso de Elaboración154other + Productos Elaborados155other + Materiales Varios 156other + (-) Desvalorización de Existencias157other + Bienes de Uso16view + Bienes de Uso / Inmuebles161other + Bienes de Uso / Maquinaria162other + Bienes de Uso / Equipos163other + Bienes de Uso / Vehículos164other + Bienes de Uso / (-) Depreciación Acumulada Bienes de Uso165other + Bienes Intangibles17view + Bienes Intangibles / Marcas de Fábrica171other + Bienes Intangibles / Concesiones y Franquicias172other + Bienes Intangibles / Patentes de Invención173other + Bienes Intangibles / (-) Amortización Acumulada174other + PASIVO2view + Deudas Comerciales21view + Deudas Comerciales / Proveedores211payable1 + Deudas Comerciales / Anticipos de Clientes212payable1 + Deudas Comerciales / (-) Intereses a Devengar por Compras al Crédito213payable1 + Deudas Bancarias y Financieras22view + Deudas Bancarias y Financieras / Adelantos en Cuenta Corriente221payable + Deudas Bancarias y Financieras / Prestamos222payable + Deudas Bancarias y Financieras / Obligaciones a Pagar223payable + Deudas Bancarias y Financieras / Intereses a Pagar224payable + Deudas Bancarias y Financieras / Letras de Cambio Emitidos225payable + Deudas Fiscales23view + Deudas Fiscales / IVA a Pagar231other + Deudas Fiscales / Impuesto a las Transacciones IT a Pagar232other + Deudas Fiscales / Impuesto a las Utilidades de Empresas IUE a Pagar233other + Deudas Sociales24view + Deudas Sociales / Sueldos a Pagar241payable + Deudas Sociales / Cargas Sociales a Pagar242payable + Deudas Sociales / Provisión para Sueldo Anual Complementario243payable + Deudas Sociales / Retenciones a Depositar244payable + Otras Deudas25view + Otras Deudas / Acreedores Varios251payable + Otras Deudas / Dividendos a Pagar252payable + Otras Deudas / Cobros por Adelantado253payable + Otras Deudas / Honorarios Directores y Síndicos a Pagar254payable + Previsiones26view + Previsiones / Previsión Indemnización por Despidos261payable + Previsiones / Previsión para juicios Pendientes262payable + Previsiones / Previsión para Garantías por Service263payable + PATRIMONIO NETO3view + Capital Social31view + Capital social / Capital Suscripto311other + Capital social / Acciones en Circulación312other + Capital social / Dividendos a Distribuir en Acciones313other + Capital social / (-) Descuento de Emisión de Acciones314other + Aportes No Capitalizados32view + Aportes No Capitalizados / Primas de Emsión321other + Aportes No Capitalizados / Aportes Irrevocables Futura Suscripción de Acciones322other + Ajustes al Patrimonio33view + Ajustes al Patrimonio / Revaluo Técnico de Bienes de Uso331other + Ganancias Reservadas34view + Reserva Legal341other + Reserva Estatutaria342other + Reserva Facultativa343other + Reserva para Renovación de Bienes de Uso344other + Resultados No Asignados35view + Resultados Acumulados351other + Resultados Acumulados del Ejercicio Anterior352other + Ganancias y Pérdidas del Ejercicio353other + Resultado del Ejercicio354other + + + Cuentas de Resultado + .2.GP + + + view + + + RESULTADOS POSITIVOS4view + Resultados Positivos Ordinarios41view + Ventas411view + Ventas - Categoria de productos 01411.01other + Intereses gananados, obtenidos, percibidos412other + Alquileres gananados, obtenidos, percibidos413other + Comisiones gananados, obtenidos, percibidos414other + Descuentos gananados, obtenidos, percibidos415other + Renta de Títulos Públicos416other + Honorarios gananados, obtenidos, percibidos417other + Ganancia Venta de Acciones418other + Resultados Positivos Extraordinarios42view + Recupero de Rezagos421other + Recupero de Deudores Incobrables422other + Ganancia Venta de Bienes de Uso423other + Donaciones obtenidas, ganandas, percibidas424other + Ganancia Venta Inversiones Permanentes425other + RESULTADOS NEGATIVOS5view + Resultados Negativos Ordinarios51view + Costo de Mercaderías Vendidas511view + Costo de Mercaderías Vendidas - Categoria de productos 01511.01other + Gastos en Depreciación de Bienes de Uso512other + Gastos en Amortización513other + Gastos en Sueldos y Jormales514other + Gastos en Cargas Sociales515other + Gastos en Impuestos516other + Gastos Bancarios517other + Gastos en Servicios Públicos518other + Gastos de Publicidad y Propaganda519other + Resultados Negativos Extraordinarios52view + Gastos en Siniestros521other + Donaciones Cedidas, Otorgadas522other + Pérdida Venta Bienes de Uso523other + + + Cuentas de Movimiento + .3.CC + + + view + + + Compras61view + Compras - Categoria de productos 0161.01other + Costos de Producción62other + Gastos de Administración63other + Gastos de Comercialización64other + + + Cuentas de Orden + .4.CO + + + view + + + CUENTAS DE ORDEN DEUDORAS71view + Mercaderias Recibidas en Consignación711other + Depósito de Valores Recibos en Garantía712other + Garantias Otorgadas713other + Documentos Descontados714other + Documentos Endosados715other + CUENTAS DE ORDEN ACREEDORAS72view + Comitente por Mercaderias Recibidas en Consignación721other + Acreedor por Garantías Otorgadas722other + Acreedor por Documentos Descontados723other + + + Bolivia - Plan de Cuentas + + + + + + + + + + + + + diff --git a/addons/l10n_bo/l10n_bo_wizard.xml b/addons/l10n_bo/l10n_bo_wizard.xml new file mode 100644 index 00000000000..4de61247b90 --- /dev/null +++ b/addons/l10n_bo/l10n_bo_wizard.xml @@ -0,0 +1,10 @@ + + + + + + open + + + + diff --git a/addons/l10n_bo/static/src/img/icon.png b/addons/l10n_bo/static/src/img/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..aaf8ad438b211291933b328ebeb5c6b6799d8a34 GIT binary patch literal 1846 zcmbtUX*8P&7k(4XtG1?^iY1hat&F8~q>@PVtCld0U8|Oq`ASiW2}4OITAhlR8bjOB zYMg4-HiWU0NGv5IRZDdQwUxG%ptUruU^p{B=bW$Sd_SIh&;4=ld7gWpa~ZB=2PJt8 zc>n;ENRIaI+nK(D-Qad?BLoToV3%I#@#C(fYQ=7k@ke`<>A|a(kSZyNm&JACuG5_$XIV0i(wR_WJhLeOI#9@F`yJ;HzWgh z#2-`wgA#|<_|+tj8^$Fh$HbX-_(20P%xkhKF38ZM-EZ}?&}Q7`E$(f=h`lW(wC1k5 zSL*H3^7}n{x3UV6*{oA({Z#|bG6SWvWYbJx_dc^0m57dDU6+K`fiIUem!4bif|f$>&~o?1_jMZDk`EH)ZuT0_ zsg&*JfOw85*t{-~BBLhAn)Hf9HR=XuR+aq{7}GOpo)KMlcnfZJFLq_#|Js@L+=7O0 z>*0(slQqv~263=vMRUoyg2HYf1^xh&WPI*Vg2rpRtrY)4qmI3Gpis*8kAY*b#J;FP zg;VQcv4;~i)hhc|_2+&SppOp5hU}|)q)K1(mQ;(royjZ`c!W*_PP91DN^&T7qrKmx zj0&sH<~)U>Gycmf?4G8}(uvh&oFZ6vKNe$^kNn_#Iy|zx_}FmyT^~1v4a*!{K!)H@ zMANO-Y;ED5#<&OSLZnki->kt8Wx(amP;%I_R##CoY`tPb- z(|orATqiq<_ebR!qQ?+KsvT4{Z-ELyJgUHm?#=IZZo#(ffyu{2U{#Et(~MS^IWDoD zNG#d)gVc^@lD?%KaDaYI;|@rJ8D}cB6g*zG{PNTc-y-)hb@gV{7Ka`W^>iEK(BVl>VF!i(^{uMIuOU5V4Gud}5b>F;<{#r_7$ zfvm!5?$W&6TDRhc7FUfbUln$$Ceif$F0~_Yeegaw*x~skrId>F8Oh6f>~1aS5UrpK zxVkaWL`bJ-1_3A!0+WW+c zJoR30xBnGzd`~{9H11F9E|t?m>=O1NxumXoOaB)RH&nWhsPw!xvi`oF+sb^X*L+R) z=FG9N_2v_Cqlys=zVC;qp?+v(ZEr3w~&43mx(?=bo@n>31a(g$VEB&dk~ya4!29D0!{q9({QO(za@>Cta~UDa$lJ9ne(TuD zy;bjSBJ@>z4VD7Jm>i5bPpbTQ;B1@hAU~aH_UTVLgpacTWaudRR1*LK7@+feh$0XP z+@vf_y`)^_D@%|7L2B9vQ3GBAn&U7FpdNCxS>YTIB@>mT$_FOE35nVE5GDS5|9=~^ z2>suURZQq{h0Gnd6o(vKjp@It zBx|re6D5#1SrS>cm<`Z8`70ebAxXhb*5V_}@xvzvLSAk@taoyGZQ=Tk5V%Xoj*|2^ z|7v)7a;{Tn!5#cC+YYo_;BUcxcHvc`{?8SD5%GVH1{|=<(GD0q>zqA=f7f$fc|-wS z>pwp%5!zmj-Kw_kFcK%kik)(cN7Jo>e;e$KPN+$Ze6Q|do9=UeZ82eMO1jdvoFU7XK!q=7^(HEVDwLeX0h`3K1z=>(_-z>s|JXo=rslXpH+cq{pIzhHC J|IfLre*wi6NK60# literal 0 HcmV?d00001 From be4047ff1b26331d4f9a49bfee2d29c011e4407b Mon Sep 17 00:00:00 2001 From: "Hiral Patel (OpenERP)" Date: Fri, 23 Nov 2012 17:47:45 +0530 Subject: [PATCH 03/14] [IMP] The bounce effect is too fast everywhere, slow it down a little bit bzr revid: hip@tinyerp.com-20121123121745-rmi0wnmzmfq6nx9z --- addons/web/static/src/js/view_form.js | 4 ++-- addons/web/static/src/js/view_list.js | 2 +- addons/web_kanban/static/src/js/kanban.js | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index 7170bdcec72..c2b47d01a34 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -204,7 +204,7 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM this.$el.find(".oe_form_group_row,.oe_form_field,label").on('click', function (e) { if(self.get("actual_mode") == "view") { var $button = self.options.$buttons.find(".oe_form_button_edit"); - $button.css('box-sizing', 'content-box').effect('bounce', {distance: 18, times: 5}, 150); + $button.css('box-sizing', 'content-box').effect('bounce', {distance: 18, times: 5}, 250); e.stopPropagation(); instance.web.bus.trigger('click', e); } @@ -213,7 +213,7 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM this.$el.find(".oe_form_field_status:not(.oe_form_status_clickable)").on('click', function (e) { if((self.get("actual_mode") == "view")) { var $button = self.$el.find(".oe_highlight:not(.oe_form_invisible)").css({'float':'left','clear':'none'}); - $button.effect('bounce', {distance:18, times: 5}, 150); + $button.effect('bounce', {distance:18, times: 5}, 250); e.stopPropagation(); } }); diff --git a/addons/web/static/src/js/view_list.js b/addons/web/static/src/js/view_list.js index 55e3c17b494..fc5df164102 100644 --- a/addons/web/static/src/js/view_list.js +++ b/addons/web/static/src/js/view_list.js @@ -829,7 +829,7 @@ instance.web.ListView = instance.web.View.extend( /** @lends instance.web.ListVi ); var create_nocontent = this.$buttons; this.$el.find('.oe_view_nocontent').click(function() { - create_nocontent.effect('bounce', {distance: 18, times: 5}, 150); + create_nocontent.effect('bounce', {distance: 18, times: 5}, 250); }); } }); diff --git a/addons/web_kanban/static/src/js/kanban.js b/addons/web_kanban/static/src/js/kanban.js index cd1ea74983f..ce581f526e4 100644 --- a/addons/web_kanban/static/src/js/kanban.js +++ b/addons/web_kanban/static/src/js/kanban.js @@ -50,7 +50,7 @@ instance.web_kanban.KanbanView = instance.web.View.extend({ this._super.apply(this, arguments); this.$el.on('click', '.oe_kanban_dummy_cell', function() { if (self.$buttons) { - self.$buttons.find('.oe_kanban_add_column').effect('bounce', {distance: 18, times: 5}, 150); + self.$buttons.find('.oe_kanban_add_column').effect('bounce', {distance: 18, times: 5}, 250); } }); }, @@ -468,7 +468,7 @@ instance.web_kanban.KanbanView = instance.web.View.extend({ ); var create_nocontent = this.$buttons; this.$el.find('.oe_view_nocontent').click(function() { - create_nocontent.effect('bounce', {distance: 18, times: 5}, 150); + create_nocontent.effect('bounce', {distance: 18, times: 5}, 250); }); }, @@ -612,7 +612,7 @@ instance.web_kanban.KanbanGroup = instance.web.Widget.extend({ this.$records.click(function (ev) { if (ev.target == ev.currentTarget) { if (!self.state.folded) { - add_btn.effect('bounce', {distance: 18, times: 5}, 150); + add_btn.effect('bounce', {distance: 18, times: 5}, 250); } } }); From f09b67d560393165f12ebbf68eb21a8fd955db20 Mon Sep 17 00:00:00 2001 From: Tejas Tank Date: Wed, 28 Nov 2012 19:02:22 +0500 Subject: [PATCH 04/14] [IMP] Fixed tag issue rendering. bzr revid: tta@openerp.com-20121128140222-y8pijs2rtx3htgv4 --- addons/web_kanban/static/src/css/kanban.css | 3 +++ addons/web_kanban/static/src/js/kanban.js | 11 ++++++----- addons/web_kanban/static/src/xml/web_kanban.xml | 1 + 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/addons/web_kanban/static/src/css/kanban.css b/addons/web_kanban/static/src/css/kanban.css index 9b74462ee13..6e5edf61bc5 100644 --- a/addons/web_kanban/static/src/css/kanban.css +++ b/addons/web_kanban/static/src/css/kanban.css @@ -109,6 +109,9 @@ .openerp .oe_kanban_view .oe_kanban_column { height: 100%; } +.openerp .oe_kanban_view .oe_kanban_column .oe_kanban_column_cards{ + height: 100%; +} .openerp .oe_kanban_view .oe_kanban_aggregates { padding: 0; margin: 0px; diff --git a/addons/web_kanban/static/src/js/kanban.js b/addons/web_kanban/static/src/js/kanban.js index 9484c6ed38b..eaded30efaa 100644 --- a/addons/web_kanban/static/src/js/kanban.js +++ b/addons/web_kanban/static/src/js/kanban.js @@ -319,7 +319,7 @@ instance.web_kanban.KanbanView = instance.web.View.extend({ this.compute_groups_width(); if (this.group_by) { // Kanban cards drag'n'drop - var $columns = this.$el.find('.oe_kanban_column'); + var $columns = this.$el.find('.oe_kanban_column .oe_kanban_column_cards'); $columns.sortable({ handle : '.oe_kanban_draghandle', start: function(event, ui) { @@ -368,8 +368,8 @@ instance.web_kanban.KanbanView = instance.web.View.extend({ stop: function(event, ui) { var stop_index = ui.item.index(); if (start_index !== stop_index) { - var $start_column = $('.oe_kanban_groups_records .oe_kanban_column').eq(start_index); - var $stop_column = $('.oe_kanban_groups_records .oe_kanban_column').eq(stop_index); + var $start_column = $('.oe_kanban_groups_records .oe_kanban_column .oe_kanban_column_cards').eq(start_index); + var $stop_column = $('.oe_kanban_groups_records .oe_kanban_column .oe_kanban_column_cards').eq(stop_index); var method = (start_index > stop_index) ? 'insertBefore' : 'insertAfter'; $start_column[method]($stop_column); var tmp_group = self.groups.splice(start_index, 1)[0]; @@ -657,14 +657,15 @@ instance.web_kanban.KanbanGroup = instance.web.Widget.extend({ var self = this; var $list_header = this.$records.find('.oe_kanban_group_list_header'); var $show_more = this.$records.find('.oe_kanban_show_more'); + var $cards = this.$records.find('.oe_kanban_column_cards'); _.each(records, function(record) { var rec = new instance.web_kanban.KanbanRecord(self, record); if (!prepend) { - rec.insertBefore($show_more); + rec.appendTo($cards); self.records.push(rec); } else { - rec.insertAfter($list_header); + rec.prependTo($cards); self.records.unshift(rec); } }); diff --git a/addons/web_kanban/static/src/xml/web_kanban.xml b/addons/web_kanban/static/src/xml/web_kanban.xml index 2bef63a5730..115e6d4466b 100644 --- a/addons/web_kanban/static/src/xml/web_kanban.xml +++ b/addons/web_kanban/static/src/xml/web_kanban.xml @@ -68,6 +68,7 @@
+
From 4fcb917d394ec28577ae742a9a78d199528e2c11 Mon Sep 17 00:00:00 2001 From: Tejas Tank Date: Thu, 6 Dec 2012 16:15:43 +0500 Subject: [PATCH 05/14] [FIX] Corrected bounce effect. bzr revid: tta@openerp.com-20121206111543-rm3irpfsx8fp58x4 --- addons/web_kanban/static/src/js/kanban.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/web_kanban/static/src/js/kanban.js b/addons/web_kanban/static/src/js/kanban.js index 6073fd55819..ca57c97ef34 100644 --- a/addons/web_kanban/static/src/js/kanban.js +++ b/addons/web_kanban/static/src/js/kanban.js @@ -610,7 +610,7 @@ instance.web_kanban.KanbanGroup = instance.web.Widget.extend({ this.$has_been_started.resolve(); var add_btn = this.$el.find('.oe_kanban_add'); add_btn.tipsy({delayIn: 500, delayOut: 1000}); - this.$records.click(function (ev) { + this.$records.find(".oe_kanban_column_cards").click(function (ev) { if (ev.target == ev.currentTarget) { if (!self.state.folded) { add_btn.effect('bounce', {distance: 18, times: 5}, 250); From addd89fb4f1b8aefeb81a6e0381d0921ac3af807 Mon Sep 17 00:00:00 2001 From: Tejas Tank Date: Thu, 6 Dec 2012 18:30:35 +0500 Subject: [PATCH 06/14] [FIX] Kanban column dragging issue. bzr revid: tta@openerp.com-20121206133035-tigtaa18gpwj0le1 --- addons/web_kanban/static/src/js/kanban.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/web_kanban/static/src/js/kanban.js b/addons/web_kanban/static/src/js/kanban.js index ca57c97ef34..5fabe2519d7 100644 --- a/addons/web_kanban/static/src/js/kanban.js +++ b/addons/web_kanban/static/src/js/kanban.js @@ -369,8 +369,8 @@ instance.web_kanban.KanbanView = instance.web.View.extend({ stop: function(event, ui) { var stop_index = ui.item.index(); if (start_index !== stop_index) { - var $start_column = $('.oe_kanban_groups_records .oe_kanban_column .oe_kanban_column_cards').eq(start_index); - var $stop_column = $('.oe_kanban_groups_records .oe_kanban_column .oe_kanban_column_cards').eq(stop_index); + var $start_column = $('.oe_kanban_groups_records .oe_kanban_column ').eq(start_index); + var $stop_column = $('.oe_kanban_groups_records .oe_kanban_column ').eq(stop_index); var method = (start_index > stop_index) ? 'insertBefore' : 'insertAfter'; $start_column[method]($stop_column); var tmp_group = self.groups.splice(start_index, 1)[0]; From 4a1c6ae2284d9df01c77f342107e11edd1cbe9bf Mon Sep 17 00:00:00 2001 From: "fclementi@camptocamp.com" <> Date: Fri, 7 Dec 2012 16:51:56 +0100 Subject: [PATCH 07/14] [FIX] l10n_fr : shorten taxe codes due to new invoices layout, reverse VAT correction, remove reconcile=true on vat accounts, remamed some taxes to match legal terms bzr revid: fclementi@camptocamp.com-20121207155156-c54b2q7kjx5azdmc --- addons/l10n_fr/fr_tax.xml | 156 ++++++++++------------ addons/l10n_fr/plan_comptable_general.xml | 13 -- 2 files changed, 68 insertions(+), 101 deletions(-) diff --git a/addons/l10n_fr/fr_tax.xml b/addons/l10n_fr/fr_tax.xml index 36c5feb47b6..d03ee4520f0 100644 --- a/addons/l10n_fr/fr_tax.xml +++ b/addons/l10n_fr/fr_tax.xml @@ -11,7 +11,7 @@ TVA collectée (vente) 19,6% - TVA-VT-19.6 + 19.6 percent @@ -33,7 +33,7 @@ TVA collectée (vente) 8,5% - TVA-VT-8.5 + 8.5 percent @@ -55,7 +55,7 @@ TVA collectée (vente) 7,0% - TVA-VT-7.0 + 7.0 percent @@ -77,7 +77,7 @@ TVA collectée (vente) 5,5% - TVA-VT-5.5 + 5.5 percent @@ -99,7 +99,7 @@ TVA collectée (vente) 2,1% - TVA-VT-2.1 + 2.1 percent @@ -122,8 +122,8 @@ - TVA acquittée (achat) 19,6% - TVA-HA-19.6 + TVA déductible (achat) 19,6% + ACH-19.6 percent @@ -144,8 +144,8 @@ - TVA acquittée (achat) 8,5% - TVA-HA-8.5 + TVA déductible (achat) 8,5% + ACH-8.5 percent @@ -166,8 +166,8 @@ - TVA acquittée (achat) 7,0% - TVA-HA-7.0 + TVA déductible (achat) 7,0% + ACH-7.0 percent @@ -188,8 +188,8 @@ - TVA acquittée (achat) 5,5% - TVA-HA-5.5 + TVA déductible (achat) 5,5% + ACH-5.5 percent @@ -210,8 +210,8 @@ - TVA acquittée (achat) 2,1% - TVA-HA-2.1 + TVA déductible (achat) 2,1% + ACH-2.1 percent @@ -232,10 +232,10 @@ - + - TVA acquittée (achat) 19,6% inclue - TVA-HA-19.6-inclue + TVA déductible (achat) 19,6% TTC + ACH-19.6-TTC percent @@ -255,10 +255,10 @@ purchase - + - TVA acquittée (achat) 8,5% inclue - TVA-HA-8.5-inclue + TVA déductible (achat) 8,5% TTC + ACH-8.5-TTC percent @@ -278,10 +278,10 @@ purchase - + - TVA acquittée (achat) 7,0% inclue - TVA-HA-7.0-inclue + TVA déductible (achat) 7,0% TTC + ACH-7.0-TTC percent @@ -301,10 +301,10 @@ purchase - + - TVA acquittée (achat) 5,5% inclue - TVA-HA-5.5-inclue + TVA déductible (achat) 5,5% TTC + ACH-5.5-TTC percent @@ -324,10 +324,10 @@ purchase - + - TVA acquittée (achat) 2,1% inclue - TVA-HA-2.1-inclue + TVA déductible (achat) 2,1% TTC + ACH-2.1-TTC percent @@ -349,11 +349,11 @@ - + - TVA immobilisation (achat) 19,6% - TVA-immo-19.6 + TVA déd./immobilisation (achat) 19,6% + IMMO-19.6 percent @@ -374,8 +374,8 @@ - TVA immobilisation (achat) 8,5% - TVA-immo-8.5 + TVA déd./immobilisation (achat) 8,5% + IMMO-8.5 percent @@ -396,8 +396,8 @@ - TVA immobilisation (achat) 7,0% - TVA-immo-7.0 + TVA déd./immobilisation (achat) 7,0% + IMMO-7.0 percent @@ -418,8 +418,8 @@ - TVA immobilisation (achat) 5,5% - TVA-immo-5.5 + TVA déd./immobilisation (achat) 5,5% + IMMO-5.5 percent @@ -440,8 +440,8 @@ - TVA immobilisation (achat) 2,1% - TVA-immo-2.1 + TVA déd./immobilisation (achat) 2,1% + IMMO-2.1 percent @@ -464,8 +464,8 @@ - TVA due intracommunautaire (achat) 19,6% - TVA-HA_UE_due-19.6 + TVA due s/ acq. intracommunautaire (achat) 19,6% + ACH_UE_due-19.6 percent @@ -486,8 +486,8 @@ - TVA due intracommunautaire (achat) 8,5% - TVA-HA_UE_due-8.5 + TVA due s/ acq. intracommunautaire (achat) 8,5% + ACH_UE_due-8.5 percent @@ -508,8 +508,8 @@ - TVA due intracommunautaire (achat) 7,0% - TVA-HA_UE_due-7.0 + TVA due s/ acq. intracommunautaire (achat) 7,0% + ACH_UE_due-7.0 percent @@ -530,8 +530,8 @@ - TVA due intracommunautaire (achat) 5,5% - TVA-HA_UE_due-5.5 + TVA due s/ acq. intracommunautaire (achat) 5,5% + ACH_UE_due-5.5 percent @@ -552,8 +552,8 @@ - TVA due intracommunautaire (achat) 2,1% - TVA-HA_UE_due-2.1 + TVA due s/ acq. intracommunautaire (achat) 2,1% + ACH_UE_due-2.1 percent @@ -576,20 +576,16 @@ - TVA déductible intracommunautaire (achat) 19,6% - TVA-HA_UE_déduc-19.6 + TVA déd. s/ acq. intracommunautaire (achat) 19,6% + ACH_UE_ded.-19.6 percent - - - - @@ -598,20 +594,16 @@ - TVA déductible intracommunautaire (achat) 8,5% - TVA-HA_UE_déduc-8.5 + TVA déd. s/ acq. intracommunautaire (achat) 8,5% + ACH_UE_ded.-8.5 percent - - - - @@ -620,20 +612,16 @@ - TVA déductible intracommunautaire (achat) 7,0% - TVA-HA_UE_déduc-7.0 + TVA déd. s/ acq. intracommunautaire (achat) 7,0% + ACH_UE_ded.-7.0 percent - - - - @@ -642,20 +630,16 @@ - TVA déductible intracommunautaire (achat) 5,5% - TVA-HA_UE_déduc-5.5 + TVA déd. s/ acq. intracommunautaire (achat) 5,5% + ACH_UE_ded.-5.5 percent - - - - @@ -664,20 +648,16 @@ - TVA déductible intracommunautaire (achat) 2,1% - TVA-HA_UE_déduc-2.1 + TVA déd. s/ acq. intracommunautaire (achat) 2,1% + ACH_UE_ded.-2.1 percent - - - - @@ -689,7 +669,7 @@ TVA 0% autres opérations non imposables (vente) - TVA-VT-autre-0 + EXO-0 percent @@ -707,7 +687,7 @@ TVA 0% export (vente) - TVA-export-0 + EXPORT-0 percent @@ -725,7 +705,7 @@ TVA 0% livraisons intracommunautaires (vente) - TVA-VT-UE-0 + UE-0 percent @@ -743,7 +723,7 @@ TVA 0% import (achat) - TVA-import-0 + IMPORT-0 percent @@ -796,7 +776,7 @@ - + @@ -880,7 +860,7 @@ - + @@ -1056,7 +1036,7 @@ - + diff --git a/addons/l10n_fr/plan_comptable_general.xml b/addons/l10n_fr/plan_comptable_general.xml index 268f4bd6336..c68e0a88a4c 100644 --- a/addons/l10n_fr/plan_comptable_general.xml +++ b/addons/l10n_fr/plan_comptable_general.xml @@ -3581,7 +3581,6 @@ view - @@ -3590,7 +3589,6 @@ other - @@ -3599,7 +3597,6 @@ other - @@ -3608,7 +3605,6 @@ other - @@ -3644,7 +3640,6 @@ view - @@ -3653,7 +3648,6 @@ other - @@ -3671,7 +3665,6 @@ other - @@ -3680,7 +3673,6 @@ other - @@ -3717,7 +3709,6 @@ view - @@ -3726,7 +3717,6 @@ other - @@ -3735,7 +3725,6 @@ other - @@ -3744,7 +3733,6 @@ other - @@ -3762,7 +3750,6 @@ view - From b6cb0014b7b219ac30549640b836d45c84815595 Mon Sep 17 00:00:00 2001 From: Tejas Tank Date: Mon, 10 Dec 2012 11:24:44 +0500 Subject: [PATCH 08/14] [FIX] Hide quick create box when drag and drop. bzr revid: tta@openerp.com-20121210062444-n4ll8y9yoy5sabia --- addons/web_kanban/static/src/js/kanban.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/addons/web_kanban/static/src/js/kanban.js b/addons/web_kanban/static/src/js/kanban.js index 5fabe2519d7..a25e13820d5 100644 --- a/addons/web_kanban/static/src/js/kanban.js +++ b/addons/web_kanban/static/src/js/kanban.js @@ -364,6 +364,7 @@ instance.web_kanban.KanbanView = instance.web.View.extend({ scroll: false, start: function(event, ui) { start_index = ui.item.index(); + self.$('.oe_kanban_quick_create').css({ visibility: 'hidden' }); self.$('.oe_kanban_record').css({ visibility: 'hidden' }); }, stop: function(event, ui) { @@ -382,6 +383,7 @@ instance.web_kanban.KanbanView = instance.web.View.extend({ } }); } + self.$('.oe_kanban_quick_create').css({ visibility: 'visible' }); self.$('.oe_kanban_record').css({ visibility: 'visible' }); } }); From 15e8533aa42cc11967d6e537c1a6f9a484e7a7d8 Mon Sep 17 00:00:00 2001 From: Tejas Tank Date: Mon, 10 Dec 2012 15:22:59 +0500 Subject: [PATCH 09/14] [FIX] Merged jquery selector and removed space from selector. bzr revid: tta@openerp.com-20121210102259-y6bz503v9ucvgpcr --- addons/web_kanban/static/src/js/kanban.js | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/addons/web_kanban/static/src/js/kanban.js b/addons/web_kanban/static/src/js/kanban.js index a25e13820d5..b58f5024620 100644 --- a/addons/web_kanban/static/src/js/kanban.js +++ b/addons/web_kanban/static/src/js/kanban.js @@ -364,14 +364,13 @@ instance.web_kanban.KanbanView = instance.web.View.extend({ scroll: false, start: function(event, ui) { start_index = ui.item.index(); - self.$('.oe_kanban_quick_create').css({ visibility: 'hidden' }); - self.$('.oe_kanban_record').css({ visibility: 'hidden' }); + self.$('.oe_kanban_record, .oe_kanban_quick_create').css({ visibility: 'hidden' }); }, stop: function(event, ui) { var stop_index = ui.item.index(); if (start_index !== stop_index) { - var $start_column = $('.oe_kanban_groups_records .oe_kanban_column ').eq(start_index); - var $stop_column = $('.oe_kanban_groups_records .oe_kanban_column ').eq(stop_index); + var $start_column = $('.oe_kanban_groups_records .oe_kanban_column').eq(start_index); + var $stop_column = $('.oe_kanban_groups_records .oe_kanban_column').eq(stop_index); var method = (start_index > stop_index) ? 'insertBefore' : 'insertAfter'; $start_column[method]($stop_column); var tmp_group = self.groups.splice(start_index, 1)[0]; @@ -383,8 +382,7 @@ instance.web_kanban.KanbanView = instance.web.View.extend({ } }); } - self.$('.oe_kanban_quick_create').css({ visibility: 'visible' }); - self.$('.oe_kanban_record').css({ visibility: 'visible' }); + self.$('.oe_kanban_record, .oe_kanban_quick_create').css({ visibility: 'visible' }); } }); } From 163dceec5787adfd14b4eebe425320c99c680b35 Mon Sep 17 00:00:00 2001 From: "fclementi@camptocamp.com" <> Date: Mon, 17 Dec 2012 17:14:00 +0100 Subject: [PATCH 10/14] [IMP] put sequence 0 on main default taxes (for configuration wizard) bzr revid: fclementi@camptocamp.com-20121217161400-0wxxrsk8d4x0ho8w --- addons/l10n_fr/fr_tax.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/l10n_fr/fr_tax.xml b/addons/l10n_fr/fr_tax.xml index d03ee4520f0..7cd3a36f54a 100644 --- a/addons/l10n_fr/fr_tax.xml +++ b/addons/l10n_fr/fr_tax.xml @@ -26,7 +26,7 @@ - + sale @@ -138,7 +138,7 @@ - + purchase From 31592e96aa99c029c6256b644269038e221aeafc Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Wed, 19 Dec 2012 16:12:17 +0100 Subject: [PATCH 11/14] [ADD] Added an openerpBounce jquery plugin bzr revid: fme@openerp.com-20121219151217-bxp1p04gmbccckys --- addons/web/static/src/js/coresetup.js | 5 +++++ addons/web/static/src/js/view_form.js | 4 ++-- addons/web/static/src/js/view_list.js | 2 +- addons/web_kanban/static/src/js/kanban.js | 6 +++--- 4 files changed, 11 insertions(+), 6 deletions(-) diff --git a/addons/web/static/src/js/coresetup.js b/addons/web/static/src/js/coresetup.js index eac26520301..a8b0510389b 100644 --- a/addons/web/static/src/js/coresetup.js +++ b/addons/web/static/src/js/coresetup.js @@ -477,6 +477,11 @@ $.fn.openerpClass = function(additionalClass) { $(this).addClass('openerp ' + additionalClass); }); }; +$.fn.openerpBounce = function() { + return this.each(function() { + $(this).css('box-sizing', 'content-box').effect('bounce', {distance: 18, times: 5}, 250); + }); +}; /** Jquery extentions */ $.Mutex = (function() { diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index 328919144e6..5c76a13ef0d 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -206,7 +206,7 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM this.$el.find(".oe_form_group_row,.oe_form_field,label").on('click', function (e) { if(self.get("actual_mode") == "view") { var $button = self.options.$buttons.find(".oe_form_button_edit"); - $button.css('box-sizing', 'content-box').effect('bounce', {distance: 18, times: 5}, 250); + $button.openerpBounce(); e.stopPropagation(); instance.web.bus.trigger('click', e); } @@ -215,7 +215,7 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM this.$el.find(".oe_form_field_status:not(.oe_form_status_clickable)").on('click', function (e) { if((self.get("actual_mode") == "view")) { var $button = self.$el.find(".oe_highlight:not(.oe_form_invisible)").css({'float':'left','clear':'none'}); - $button.effect('bounce', {distance:18, times: 5}, 250); + $button.openerpBounce(); e.stopPropagation(); } }); diff --git a/addons/web/static/src/js/view_list.js b/addons/web/static/src/js/view_list.js index 8420a870eec..4687b3cb2ba 100644 --- a/addons/web/static/src/js/view_list.js +++ b/addons/web/static/src/js/view_list.js @@ -833,7 +833,7 @@ instance.web.ListView = instance.web.View.extend( /** @lends instance.web.ListVi ); var create_nocontent = this.$buttons; this.$el.find('.oe_view_nocontent').click(function() { - create_nocontent.effect('bounce', {distance: 18, times: 5}, 250); + create_nocontent.openerpBounce(); }); } }); diff --git a/addons/web_kanban/static/src/js/kanban.js b/addons/web_kanban/static/src/js/kanban.js index 915fff2f567..71e8336d0eb 100644 --- a/addons/web_kanban/static/src/js/kanban.js +++ b/addons/web_kanban/static/src/js/kanban.js @@ -52,7 +52,7 @@ instance.web_kanban.KanbanView = instance.web.View.extend({ this._super.apply(this, arguments); this.$el.on('click', '.oe_kanban_dummy_cell', function() { if (self.$buttons) { - self.$buttons.find('.oe_kanban_add_column').effect('bounce', {distance: 18, times: 5}, 250); + self.$buttons.find('.oe_kanban_add_column').openerpBounce(); } }); }, @@ -471,7 +471,7 @@ instance.web_kanban.KanbanView = instance.web.View.extend({ ); var create_nocontent = this.$buttons; this.$el.find('.oe_view_nocontent').click(function() { - create_nocontent.effect('bounce', {distance: 18, times: 5}, 250); + create_nocontent.openerpBounce(); }); }, @@ -615,7 +615,7 @@ instance.web_kanban.KanbanGroup = instance.web.Widget.extend({ this.$records.find(".oe_kanban_column_cards").click(function (ev) { if (ev.target == ev.currentTarget) { if (!self.state.folded) { - add_btn.effect('bounce', {distance: 18, times: 5}, 250); + add_btn.openerpBounce(); } } }); From bcd4686ad8c86d4bcafe555ef342fb0bc70e87a6 Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Wed, 19 Dec 2012 16:15:50 +0100 Subject: [PATCH 12/14] [FIX] osv exception message not displayed anymore Reverted part of revid:chs@openerp.com-20121108145001-pswe7r5ss4nzgu00 bzr revid: fme@openerp.com-20121219151550-6lkn996jxdv2r7x2 --- 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 a3fd74bfb00..885c5f84572 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -40,7 +40,7 @@

- var message = d.error.message ? d.error.message : d.error.data.fault_code; + var message = d.message ? d.message : d.error.data.fault_code; d.html_error = context.engine.tools.html_escape(message) .replace(/\n/g, '
'); From f14a8b9aac07a0cf8c346adf53b856a4c01ec07c Mon Sep 17 00:00:00 2001 From: Antony Lesuisse Date: Wed, 19 Dec 2012 16:45:05 +0100 Subject: [PATCH 13/14] [IMP] version_info more info bzr revid: al@openerp.com-20121219154505-lcartslny586t07n --- addons/web/controllers/main.py | 4 +--- addons/web/static/src/xml/base.xml | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py index 0d5194829ad..6d12f8a49fe 100644 --- a/addons/web/controllers/main.py +++ b/addons/web/controllers/main.py @@ -679,9 +679,7 @@ class WebClient(openerpweb.Controller): @openerpweb.jsonrequest def version_info(self, req): - return { - "version": openerp.release.version - } + return openerp.service.web_services.RPC_VERSION_1 class Proxy(openerpweb.Controller): _cp_path = '/web/proxy' diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index 885c5f84572..877a2c183ee 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -412,7 +412,7 @@

Activate the developer mode -

Version

+

Version

Copyright © 2004-TODAY OpenERP SA. All Rights Reserved.
From b33e5309c39df29f3035d6dd7246aca7412dbcf8 Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Wed, 19 Dec 2012 16:47:17 +0100 Subject: [PATCH 14/14] [IMP] Improved kanban style bzr revid: fme@openerp.com-20121219154717-61fe54e66q6f2rs5 --- addons/web_kanban/static/src/css/kanban.css | 6 ++---- addons/web_kanban/static/src/css/kanban.sass | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/addons/web_kanban/static/src/css/kanban.css b/addons/web_kanban/static/src/css/kanban.css index 4d50f73d2cf..325f92b621d 100644 --- a/addons/web_kanban/static/src/css/kanban.css +++ b/addons/web_kanban/static/src/css/kanban.css @@ -1,3 +1,4 @@ +@charset "utf-8"; .openerp .oe_kanban_view { background: white; height: inherit; @@ -108,10 +109,7 @@ padding: 0px; background: white; } -.openerp .oe_kanban_view .oe_kanban_column { - height: 100%; -} -.openerp .oe_kanban_view .oe_kanban_column .oe_kanban_column_cards{ +.openerp .oe_kanban_view .oe_kanban_column, .openerp .oe_kanban_view .oe_kanban_column_cards { height: 100%; } .openerp .oe_kanban_view .oe_kanban_aggregates { diff --git a/addons/web_kanban/static/src/css/kanban.sass b/addons/web_kanban/static/src/css/kanban.sass index 84de3e32842..c115862ef0a 100644 --- a/addons/web_kanban/static/src/css/kanban.sass +++ b/addons/web_kanban/static/src/css/kanban.sass @@ -135,7 +135,7 @@ padding: 0px background: #ffffff - .oe_kanban_column + .oe_kanban_column, .oe_kanban_column_cards height: 100% .oe_kanban_aggregates padding: 0