From 87312dca7f8414f73fde55061292b61122dce0c8 Mon Sep 17 00:00:00 2001 From: Stefan Rijnhart Date: Fri, 28 Dec 2012 16:14:53 +0100 Subject: [PATCH 01/74] [FIX] l10n_nl: missing sequence on tax gives wrong default tax lp bug: https://launchpad.net/bugs/1094285 fixed bzr revid: stefan@therp.nl-20121228151453-c902fq2ovqpihxtc --- addons/l10n_nl/account_chart_netherlands.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/addons/l10n_nl/account_chart_netherlands.xml b/addons/l10n_nl/account_chart_netherlands.xml index 516c88bdcf9..9f59e603c69 100644 --- a/addons/l10n_nl/account_chart_netherlands.xml +++ b/addons/l10n_nl/account_chart_netherlands.xml @@ -4402,6 +4402,7 @@ TODO rubriek 1c en 1d moeten nog, zijn variabel, dus BTW percentage moet door ge + 20 Inkopen import binnen EU hoog 21% BTW import binnen EU From 496ea9b6e58713462321f0c6a93914e52277f9b4 Mon Sep 17 00:00:00 2001 From: Tien Tran Date: Mon, 31 Dec 2012 21:58:00 +0700 Subject: [PATCH 02/74] [ADD] public l10n-vn module bzr revid: tientranphuoc@gmail.com-20121231145800-s1g9h6zdsq2m82k3 --- addons/l10n_vn/__init__.py | 23 + addons/l10n_vn/__openerp__.py | 34 + addons/l10n_vn/account_chart.xml | 2016 +++++++++++++++++++++++++++ addons/l10n_vn/account_tax.xml | 90 ++ addons/l10n_vn/account_tax_code.xml | 122 ++ addons/l10n_vn/l10n_vn_wizard.xml | 10 + 6 files changed, 2295 insertions(+) create mode 100755 addons/l10n_vn/__init__.py create mode 100755 addons/l10n_vn/__openerp__.py create mode 100755 addons/l10n_vn/account_chart.xml create mode 100755 addons/l10n_vn/account_tax.xml create mode 100755 addons/l10n_vn/account_tax_code.xml create mode 100755 addons/l10n_vn/l10n_vn_wizard.xml diff --git a/addons/l10n_vn/__init__.py b/addons/l10n_vn/__init__.py new file mode 100755 index 00000000000..dcac853bc01 --- /dev/null +++ b/addons/l10n_vn/__init__.py @@ -0,0 +1,23 @@ +# -*- coding: utf-8 -*- +############################################################################## +# +# OpenERP, Open Source Management Solution +# Copyright (c) 2010 General Solutions (http://gscom.vn) All Rights Reserved. +# +# 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 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 General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . +# +############################################################################## + + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/l10n_vn/__openerp__.py b/addons/l10n_vn/__openerp__.py new file mode 100755 index 00000000000..b5ded5c54e0 --- /dev/null +++ b/addons/l10n_vn/__openerp__.py @@ -0,0 +1,34 @@ +# -*- coding: utf-8 -*- +############################################################################## +# +# OpenERP, Open Source Management Solution +# Copyright (c) 2010 General Solutions (http://gscom.vn) All Rights Reserved. +# +# 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 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 General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . +# +############################################################################## + +{ + "name" : "Vietnam Chart of Accounts", + "version" : "1.0", + "author" : "General Solutions", + 'website': 'http://gscom.vn', + "category" : "Localization/Account Charts", + "description": "This is the module to manage the accounting chart for Vietnam.", + "depends" : ["account","base_vat","base_iban"], + "data" : ["account_tax_code.xml","account_chart.xml","account_tax.xml","l10n_vn_wizard.xml"], + "demo" : [], + 'auto_install': False, + "installable": True, +} diff --git a/addons/l10n_vn/account_chart.xml b/addons/l10n_vn/account_chart.xml new file mode 100755 index 00000000000..893850b5957 --- /dev/null +++ b/addons/l10n_vn/account_chart.xml @@ -0,0 +1,2016 @@ + + + + + + + + + 1. TÀI SẢN NGẮN HẠN + current_asset + balance + asset + + + + 1. TÀI SẢN NGẮN HẠN - REC + current_asset + unreconciled + asset + + + + 2. TÀI SẢN DÀI HẠN + long_term_asset + balance + asset + + + + 3. NỢ PHẢI TRẢ + liability + unreconciled + liability + + + + 4. VỐN CHỦ SỞ HỮU + equity + balance + asset + + + + 5. DOANH THU + income + none + income + + + + 6. CHI PHÍ SẢN XUẤT, KINH DOANH + expense + none + expense + + + + 7. THU NHẬP KHÁC + other_income + none + income + + + + 8. CHI PHÍ KHÁC + other_expense + none + expense + + + + 9. XÁC ĐỊNH KẾT QUẢ KINH DOANH + evaluation + none + + + + X. TÀI KHOẢN NGOÀI BẢNG + other + none + + + + CHỈ XEM + view + none + + + + + + 0 + Hệ thống tài khoản kế toán Việt Nam + view + + + + + + 1 + TÀI SẢN NGẮN HẠN + view + + + + + + 111 + + view + + + Tiền mặt + + + 1111 + + liquidity + + + Tiền Việt Nam + + + 1112 + + other + + + Ngoại tệ + + + 1113 + + other + + + Vàng bạc, kim khí quý, đá quý + + + + 112 + + view + + + Tiền gửi ngân hàng + + + 1121 + + liquidity + + + Tiền Việt Nam + + + 1122 + + other + + + Ngoại tệ + + + 1123 + + other + + + Vàng bạc, kim khí quý, đá quý + + + + 113 + + view + + + Tiền đang chuyển + + + 1131 + + other + + + Tiền Việt Nam + + + 1132 + + other + + + Ngoại tệ + + + + 121 + + view + + + Đầu tư tài chính ngắn hạn + + + 1211 + + other + + + Cổ phiếu + + + 1212 + + other + + + Trái phiếu, Tín phiếu, Kỳ phiếu + + + + 128 + + view + + + Đầu tư ngắn hạn khác + + + 1281 + + other + + + Tiền gửi có kỳ hạn + + + 1282 + + other + + + Đầu tư ngắn hạn khác + + + + 129 + + other + + + Dự phòng giảm giá đầu tư ngắn hạn + + + + 131 + + receivable + + + Phải thu của khách hàng + + + + 133 + + view + + + Thuế GTGT được khấu trừ + + + 1331 + + other + + + Thuế GTGT được khấu trừ của hàng hóa, dịch vụ + + + 1332 + + other + + + Thuế GTGT được khấu trừ của TSCĐ + + + + 136 + + view + + + Phải thu nội bộ + + + 1361 + + other + + + Vốn kinh doanh ở đơn vị trực thuộc + + + 1368 + + other + + + Phải thu nội bộ khác + + + + 138 + + view + + + Phải thu khác + + + 1381 + + other + + + Tài sản thiếu chờ xử lý + + + 1385 + + other + + + Phải thu về cổ phần hóa + + + 1388 + + other + + + Phải thu khác + + + + 139 + + other + + + Dự phòng phải thu khó đòi + + + + 141 + + other + + + Tạm ứng + + + + 142 + + other + + + Chi phí trả trước ngắn hạn + + + + 144 + + other + + + Cầm cố, ký cược, ký quỹ ngắn hạn + + + + 151 + + other + + + Hàng hóa mua đang đi trên đường + + + + 152 + + other + + + Nguyên liệu, vật liệu + + + + 153 + + other + + + Công cụ, dụng cụ + + + + 154 + + other + + + Chi phí sản xuất kinh doanh dở dang + + + + 155 + + other + + + Thành phẩm + + + + 156 + + view + + + Hàng hóa + + + 1561 + + other + + + Giá mua hàng hóa + + + 1562 + + other + + + Chi phí thu mua hàng hóa + + + 1567 + + other + + + Hàng hóa bất động sản + + + + 157 + + other + + + Hàng gửi đi bán + + + + 158 + + other + + + Hàng hóa kho bảo thuế + + + + 159 + + other + + + Dự phòng giảm giá hàng tồn kho + + + + 161 + + view + + + Chi sự nghiệp + + + 1611 + + other + + + Chi sự nghiệp năm trước + + + 1612 + + other + + + Chi sự nghiệp năm nay + + + + + 2 + TÀI SẢN DÀI HẠN + view + + + + + + 211 + + view + + + Tài sản cố định hữu hình + + + 2111 + + other + + + Nhà cửa, vật kiến trúc + + + 2112 + + other + + + Máy móc, thiết bị + + + 2113 + + other + + + Phương tiện vận tải truyền dẫn + + + 2114 + + other + + + Thiết bị, dụng cụ quản lý + + + 2115 + + other + + + Cây lâu năm, súc vật làm việc và cho sản phẩm + + + 2118 + + other + + + Tài sản cố định khác + + + + 212 + + other + + + Tài sản cố định thuê tài chính + + + + 213 + + view + + + Tài sản cố định vô hình + + + 2131 + + other + + + Quyền sử dụng đất + + + 2132 + + other + + + Quyền phát hành + + + 2133 + + other + + + Bản quyền, bằng sáng chế + + + 2134 + + other + + + Nhãn hiệu hàng hóa + + + 2135 + + other + + + Phần mềm máy tính + + + 2136 + + other + + + Giấy phép và giấy phép nhượng quyền + + + 2138 + + other + + + Tài sản cố định vô hình khác + + + + 214 + + view + + + Hao mòn TSCĐ + + + 2141 + + other + + + Hao mòn TSCĐ cố định hữu hình + + + 2142 + + other + + + Hao mòn TSCĐ thuê tài chính + + + 2143 + + other + + + Hao mòn TSCĐ vô hình + + + 2147 + + other + + + Hao mòn bất động sản đầu tư + + + + 217 + + other + + + Bất động sản đầu tư + + + + 221 + + other + + + Đầu tư vào công ty con + + + + 222 + + other + + + Vốn góp liên doanh + + + + 223 + + other + + + Đầu tư vào công ty liên kết + + + + 228 + + view + + + Đầu tư dài hạn khác + + + 2281 + + other + + + Cổ phiếu + + + 2282 + + other + + + Trái phiếu + + + 2288 + + other + + + Đầu tư dài hạn khác + + + + 229 + + other + + + Dự phòng giảm giá đầu tư dài hạn + + + + 241 + + view + + + Xây dựng cơ bản dở dang + + + 2411 + + other + + + Mua sắm TSCĐ + + + 2412 + + other + + + Xây dựng cơ bản + + + 2413 + + other + + + Sửa chữa lớn TSCĐ + + + + 242 + + other + + + Chi phí trả trước dài hạn + + + + 243 + + other + + + Tài sản thuế thu nhập hoãn lại + + + + 244 + + other + + + Ký quỹ, ký cược dài hạn + + + + + 3 + NỢ PHẢI TRẢ + view + + + + + + 311 + + other + + + Vay ngắn hạn + + + + 315 + + other + + + Nợ dài hạn đến hạn trả + + + + 331 + + payable + + + Phải trả người bán + + + + 333 + + view + + + Thuế và các khoản phải nộp Nhà nước + + + 3331 + + view + + + Thuế GTGT phải nộp + + + 33311 + + other + + + Thuế GTGT đầu ra + + + 33312 + + other + + + Thuế GTGT hàng nhập khẩu + + + 3332 + + other + + + Thuế tiêu thụ đặc biệt + + + 3333 + + other + + + Thuế xuất, nhập khẩu + + + 3334 + + other + + + Thuế thu nhập doanh nghiệp + + + 3335 + + other + + + Thuế thu nhập cá nhân + + + 3336 + + other + + + Thuế tài nguyên + + + 3337 + + other + + + Thuế nhà đất, tiền thuê đất + + + 3338 + + other + + + Các loại thuế khác + + + 3339 + + other + + + Phí, lệ phí và các khoản phải nộp khác + + + + 334 + + view + + + Phải trả người lao động + + + 3341 + + other + + + Phải trả công nhân viên + + + 3342 + + other + + + Phải trả người lao động khác + + + + 335 + + other + + + Chi phí phải trả + + + + 336 + + other + + + Phải trả nội bộ + + + + 337 + + other + + + Thanh toán theo tiến độ kế hoạch hợp đồng xây dựng + + + + 338 + + view + + + Phải trả, phải nộp khác + + + 3381 + + other + + + Tài sản thừa chờ giải quyết + + + 3382 + + other + + + Kinh phí công đoàn + + + 3383 + + other + + + Bảo hiểm xã hội + + + 3384 + + other + + + Bảo hiểm y tế + + + 3385 + + other + + + Phải trả về cổ phần hóa + + + 3386 + + other + + + Nhận ký quỹ, ký cược ngắn hạn + + + 3387 + + other + + + Doanh thu chưa thực hiện + + + 3388 + + other + + + Phải trả, phải nộp khác + + + + 341 + + other + + + Vay dài hạn + + + + 342 + + other + + + Nợ dài hạn + + + + 343 + + view + + + Trái phiếu phát hành + + + 3431 + + other + + + Mệnh giá trái phiếu + + + 3432 + + other + + + Chiết khấu trái phiếu + + + 3434 + + other + + + Phụ trội trái phiếu + + + + 344 + + other + + + Nhận ký quỹ, ký cược dài hạn + + + + 347 + + other + + + Thuế thu nhập hoãn lại phải trả + + + + 351 + + other + + + Quỹ dự phòng trợ cấp mất việc làm + + + + 352 + + other + + + Dự phòng phải trả + + + + + 4 + VỐN CHỦ SỞ HỮU + view + + + + + + 411 + + view + + + Nguồn vốn kinh doanh + + + 4111 + + other + + + Vốn đầu tư chủ sỡ hữu + + + 4112 + + other + + + Thặng dư vốn cổ phần + + + 4118 + + other + + + Vốn khác + + + + 412 + + other + + + Chênh lệch đánh giá lại tài sản + + + + 413 + + view + + + Chênh lệnh tỉ giá hối đoái + + + 4131 + + other + + + Chênh lệnh tỉ giá hối đoái đánh giá lại cuối năm tài chính + + + 4132 + + other + + + Chênh lệnh tỉ giá hối đoái trong giai đoạn đầu tư XDCB + + + + 414 + + other + + + Quỹ đầu tư phát triển + + + + 415 + + other + + + Quỹ dự phòng tài chính + + + + 418 + + other + + + Các quỹ khác thuộc vốn chủ sở hữu + + + + 419 + + other + + + Cổ phiếu quỹ + + + + 421 + + view + + + Lợi nhuận chưa phân phối + + + 4211 + + other + + + Lợi nhuận chưa phân phối năm trước + + + 4212 + + other + + + Lợi nhuận chưa phân phối năm nay + + + + 431 + + view + + + Quỹ khen thưởng phúc lợi + + + 4311 + + other + + + Quỹ khen thưởng + + + 4312 + + other + + + Quỹ phúc lợi + + + 4313 + + other + + + Quỹ phúc lợi đã hình thành TSCĐ + + + + 441 + + other + + + Ngồn vố đầu tư xây dựng cơ bản + + + + 461 + + view + + + Nguồn kinh phí sự nghiệp + + + 4611 + + other + + + Nguồn kinh phí sự nghiệp năm trước + + + 4612 + + other + + + Nguồn kinh phí sự nghiệp năm nay + + + + 466 + + other + + + Nguồn kinh phí đã hình thành TSCĐ + + + + + 5 + DOANH THU + view + + + + + + 511 + + view + + + Doanh thu bán hàng và cung cấp dịch vụ + + + 5111 + + other + + + Doanh thu bán hàng hóa + + + 5112 + + other + + + Doanh thu bán các thành phẩm + + + 5113 + + other + + + Doanh thu cung cấp dịch vụ + + + 5114 + + other + + + Doanh thu trợ cấp, trợ giá + + + 5117 + + other + + + Doanh thu kinh doanh bất động sản đầu tư + + + + 512 + + view + + + Doanh thu bán hàng nội bộ + + + 5121 + + other + + + Doanh thu bán hàng hóa + + + 5122 + + other + + + Doanh thu bán các thành phẩm + + + 5123 + + other + + + Doanh thu cung cấp dịch vụ + + + + 515 + + other + + + Doanh thu hoạt động tài chính khác + + + + 521 + + other + + + Chiết khấu thương mại + + + + 531 + + other + + + Hàng bán bị trả lại + + + + 532 + + other + + + Giảm giá hàng bán + + + + + 6 + CHI PHÍ SẢN XUẤT, KINH DOANH + view + + + + + + 611 + + view + + + Mua hàng + + + 6111 + + other + + + Mua nguyên liệu, vật liệu + + + 6112 + + other + + + Mua hàng hóa + + + + 621 + + other + + + Chi phí nguyên liệu, vật liệu trực tiếp + + + + 622 + + other + + + Chi phí nhân công trực tiếp + + + + 623 + + view + + + Chi phí sử dụng máy thi công + + + 6231 + + other + + + Chi phí nhân công + + + 6232 + + other + + + Chi phí vật liệu + + + 6233 + + other + + + Chi phí dụng cụ sản xuất + + + 6234 + + other + + + Chi phí khấu hao máy thi công + + + 6237 + + other + + + Chi phí dịch vụ mua ngoài + + + 6238 + + other + + + Chi phí bằng tiền khác + + + + 627 + + view + + + Chi phí sản xuất chung + + + 6271 + + other + + + Chi phí nhân viên phân xưởng + + + 6272 + + other + + + Chi phí vật liệu + + + 6273 + + other + + + Chi phí dụng cụ sản xuất + + + 6274 + + other + + + Chi phí khấu hao TSCĐ + + + 6277 + + other + + + Chi phí dịch vụ mua ngoài + + + 6278 + + other + + + Chi phí bằng tiền khác + + + + 631 + + other + + + Giá thành sản xuất + + + + 632 + + other + + + Giá vốn hàng bán + + + + 635 + + other + + + Chi phí tài chính + + + + 641 + + view + + + Chi phí bán hàng + + + 6411 + + other + + + Chi phí nhân viên + + + 6412 + + other + + + Chi phí vật liệu, bao bì + + + 6413 + + other + + + Chi phí dụng cụ, đồ dùng + + + 6414 + + other + + + Chi phí khấu hao TSCĐ + + + 6415 + + other + + + Chi phí bảo hành + + + 6417 + + other + + + Chi phí dịch vụ mua ngoài + + + 6418 + + other + + + Chi phí bằng tiền khác + + + + 642 + + view + + + Chi phí quản lý doanh nghiệp + + + 6421 + + other + + + Chi phí nhân viên quản lý + + + 6422 + + other + + + Chi phí vật liệu quản lý + + + 6423 + + other + + + Chi phí đồ dùng văn phòng + + + 6424 + + other + + + Chi phí khấu hao tài sản cố định + + + 6425 + + other + + + Thuế, phí và lệ phí + + + 6426 + + other + + + Chi phí dự phòng + + + 6427 + + other + + + Chi phí dịch vụ mua ngoài + + + 6428 + + other + + + Chi phí bằng tiền khác + + + + + 7 + THU NHẬP KHÁC + view + + + + + + 711 + + other + + + Thu nhập khác + + + + + 8 + CHI PHÍ KHÁC + view + + + + + + 811 + + other + + + Chi phí khác + + + + 821 + + view + + + Chi phí thuế thu nhập doanh nghiệp + + + 8211 + + other + + + Chi phí thuế TNDN hiện hành + + + 8212 + + other + + + Chi phí thuế TNDN hoãn lại + + + + + 9 + XÁC ĐỊNH KẾT QUẢ KINH DOANH + view + + + + + + 911 + + other + + + Xác định kết quả kinh doanh + + + + + X10 + TÀI KHOẢN NGOÀI BẢNG + view + + + + + + 001 + + other + + + Tài sản thuê ngoài + + + + 002 + + other + + + Vật tư, hàng hóa nhận giữ hộ, nhận gia công + + + + 003 + + other + + + Hàng hóa nhận bán hộ, nhận ký gửi, ký cược + + + + 004 + + other + + + Nợ khó đòi đã xử lý + + + + 007 + + other + + + Ngoại tệ các loại + + + + 008 + + other + + + Dự toán chi sự nghiệp, dự án + + + + OBA + + other + + + Opening Balance Account + + + + + VN - Chart of Accounts + 0 + + + + + + + + + + + + diff --git a/addons/l10n_vn/account_tax.xml b/addons/l10n_vn/account_tax.xml new file mode 100755 index 00000000000..ce2b7ddd1dd --- /dev/null +++ b/addons/l10n_vn/account_tax.xml @@ -0,0 +1,90 @@ + + + + + + + + + + Thuế GTGT được khấu trừ 10% + + percent + + + purchase + + + + + + + + Thuế GTGT được khấu trừ 5% + + percent + + + purchase + + + + + + + + Thuế GTGT được khấu trừ 0% + + percent + + + purchase + + + + + + + + + + Thuế GTGT phải nộp 10% + + percent + + + sale + + + + + + + + Thuế GTGT phải nộp 5% + + percent + + + sale + + + + + + + + Thuế GTGT phải nộp 0% + + percent + + + sale + + + + + + + + diff --git a/addons/l10n_vn/account_tax_code.xml b/addons/l10n_vn/account_tax_code.xml new file mode 100755 index 00000000000..f4139c8c745 --- /dev/null +++ b/addons/l10n_vn/account_tax_code.xml @@ -0,0 +1,122 @@ + + + + + + + + Tờ khai thuế GTGT + MAIN + + + + HHDV mua vào + + IN + + + + HHDV bán ra + + OUT + + + + + Giá trị HHDV mua vào + + IN_BASE + + + + Giá trị HHDV mua vào chịu thuế 0% + + IN_BASE_00 + + + + Giá trị HHDV mua vào chịu thuế 5% + + IN_BASE_05 + + + + Giá trị HHDV mua vào chịu thuế 10% + + IN_BASE_10 + + + + Giá trị HHDV bán ra + + OUT_BASE + + + + Giá trị HHDV bán ra chịu thuế 0% + + OUT_BASE_00 + + + + Giá trị HHDV bán ra chịu thuế 5% + + OUT_BASE_05 + + + + Giá trị HHDV bán ra chịu thuế 10% + + OUT_BASE_10 + + + + + Thuế GTGT HHDV mua vào + + IN_BALANCE + + + + Thuế GTGT HHDV mua vào chịu thuế 0% + + IN_BALANCE_00 + + + + Thuế GTGT HHDV mua vào chịu thuế 5% + + IN_BALANCE_05 + + + + Thuế GTGT HHDV mua vào chịu thuế 10% + + IN_BALANCE_10 + + + + Thuế GTGT HHDV bán ra + + OUT_BALANCE + + + + Thuế GTGT HHDV bán ra chịu thuế 0% + + OUT_BALANCE_00 + + + + Thuế GTGT HHDV bán ra chịu thuế 5% + + OUT_BALANCE_05 + + + + Thuế GTGT HHDV bán ra chịu thuế 10% + + OUT_BALANCE_10 + + + diff --git a/addons/l10n_vn/l10n_vn_wizard.xml b/addons/l10n_vn/l10n_vn_wizard.xml new file mode 100755 index 00000000000..368a3cbd8b3 --- /dev/null +++ b/addons/l10n_vn/l10n_vn_wizard.xml @@ -0,0 +1,10 @@ + + + + + + open + + + + \ No newline at end of file From e6be210641bc58bc11117d8d55858e61c8469e7e Mon Sep 17 00:00:00 2001 From: Tien Tran Date: Fri, 18 Jan 2013 20:24:38 +0700 Subject: [PATCH 03/74] Updated with Stefan comment bzr revid: tientranphuoc@gmail.com-20130118132438-hnncmyf38kod493u --- addons/l10n_vn/__init__.py | 2 +- addons/l10n_vn/__openerp__.py | 2 +- addons/l10n_vn/account_chart.xml | 239 ++++++++++++++-------------- addons/l10n_vn/account_tax.xml | 2 +- addons/l10n_vn/account_tax_code.xml | 2 +- 5 files changed, 123 insertions(+), 124 deletions(-) diff --git a/addons/l10n_vn/__init__.py b/addons/l10n_vn/__init__.py index dcac853bc01..4b18956216e 100755 --- a/addons/l10n_vn/__init__.py +++ b/addons/l10n_vn/__init__.py @@ -2,7 +2,7 @@ ############################################################################## # # OpenERP, Open Source Management Solution -# Copyright (c) 2010 General Solutions (http://gscom.vn) All Rights Reserved. +# This module is Copyright (c) 2009-2013 General Solutions (http://gscom.vn) All Rights Reserved. # # 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 diff --git a/addons/l10n_vn/__openerp__.py b/addons/l10n_vn/__openerp__.py index b5ded5c54e0..69083af6631 100755 --- a/addons/l10n_vn/__openerp__.py +++ b/addons/l10n_vn/__openerp__.py @@ -2,7 +2,7 @@ ############################################################################## # # OpenERP, Open Source Management Solution -# Copyright (c) 2010 General Solutions (http://gscom.vn) All Rights Reserved. +# This module is Copyright (c) 2009-2013 General Solutions (http://gscom.vn) All Rights Reserved. # # 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 diff --git a/addons/l10n_vn/account_chart.xml b/addons/l10n_vn/account_chart.xml index 893850b5957..bb1fccc463f 100755 --- a/addons/l10n_vn/account_chart.xml +++ b/addons/l10n_vn/account_chart.xml @@ -1,109 +1,108 @@  - - + - 1. TÀI SẢN NGẮN HẠN - current_asset - balance - asset + 1. TÀI SẢN NGẮN HẠN + current_asset + balance + asset - 1. TÀI SẢN NGẮN HẠN - REC - current_asset - unreconciled - asset + 1. TÀI SẢN NGẮN HẠN - REC + current_asset + unreconciled + asset - 2. TÀI SẢN DÀI HẠN - long_term_asset - balance - asset + 2. TÀI SẢN DÀI HẠN + long_term_asset + balance + asset - 3. NỢ PHẢI TRẢ - liability - unreconciled - liability + 3. NỢ PHẢI TRẢ + liability + unreconciled + liability - 4. VỐN CHỦ SỞ HỮU - equity - balance - asset + 4. VỐN CHỦ SỞ HỮU + equity + balance + asset - 5. DOANH THU - income - none - income + 5. DOANH THU + income + none + income - 6. CHI PHÍ SẢN XUẤT, KINH DOANH - expense - none - expense + 6. CHI PHÍ SẢN XUẤT, KINH DOANH + expense + none + expense - 7. THU NHẬP KHÁC - other_income - none - income + 7. THU NHẬP KHÁC + other_income + none + income - 8. CHI PHÍ KHÁC - other_expense - none - expense + 8. CHI PHÍ KHÁC + other_expense + none + expense - 9. XÁC ĐỊNH KẾT QUẢ KINH DOANH - evaluation - none + 9. XÁC ĐỊNH KẾT QUẢ KINH DOANH + evaluation + none - X. TÀI KHOẢN NGOÀI BẢNG - other - none + X. TÀI KHOẢN NGOÀI BẢNG + other + none - CHỈ XEM - view - none + CHỈ XEM + view + none - 0 - Hệ thống tài khoản kế toán Việt Nam - view - + 0 + Hệ thống tài khoản kế toán Việt Nam + view + - 1 - TÀI SẢN NGẮN HẠN - view - - + 1 + TÀI SẢN NGẮN HẠN + view + + - + 111 @@ -514,13 +513,13 @@ - 2 - TÀI SẢN DÀI HẠN - view - - + 2 + TÀI SẢN DÀI HẠN + view + + - + 211 @@ -833,13 +832,13 @@ - 3 - NỢ PHẢI TRẢ - view - - + 3 + NỢ PHẢI TRẢ + view + + - + 311 @@ -1178,13 +1177,13 @@ - 4 - VỐN CHỦ SỞ HỮU - view - - + 4 + VỐN CHỦ SỞ HỮU + view + + - + 411 @@ -1391,13 +1390,13 @@ - 5 - DOANH THU - view - - + 5 + DOANH THU + view + + - + 511 @@ -1518,13 +1517,13 @@ - 6 - CHI PHÍ SẢN XUẤT, KINH DOANH - view - - + 6 + CHI PHÍ SẢN XUẤT, KINH DOANH + view + + - + 611 @@ -1849,13 +1848,13 @@ - 7 - THU NHẬP KHÁC - view - - + 7 + THU NHẬP KHÁC + view + + - + 711 @@ -1867,13 +1866,13 @@ - 8 - CHI PHÍ KHÁC - view - - + 8 + CHI PHÍ KHÁC + view + + - + 811 @@ -1910,13 +1909,13 @@ - 9 - XÁC ĐỊNH KẾT QUẢ KINH DOANH - view - - + 9 + XÁC ĐỊNH KẾT QUẢ KINH DOANH + view + + - + 911 @@ -1928,13 +1927,13 @@ - X10 - TÀI KHOẢN NGOÀI BẢNG - view - - + X10 + TÀI KHOẢN NGOÀI BẢNG + view + + - + 001 @@ -2000,15 +1999,15 @@ - VN - Chart of Accounts - 0 - - - - - - - + VN - Chart of Accounts + 0 + + + + + + + diff --git a/addons/l10n_vn/account_tax.xml b/addons/l10n_vn/account_tax.xml index ce2b7ddd1dd..85f068023c2 100755 --- a/addons/l10n_vn/account_tax.xml +++ b/addons/l10n_vn/account_tax.xml @@ -1,6 +1,6 @@  - + diff --git a/addons/l10n_vn/account_tax_code.xml b/addons/l10n_vn/account_tax_code.xml index f4139c8c745..4f3aee1bfc6 100755 --- a/addons/l10n_vn/account_tax_code.xml +++ b/addons/l10n_vn/account_tax_code.xml @@ -1,6 +1,6 @@  - + From 9eb5b216e10ffed7422a5cdae4ad447fa71aff3d Mon Sep 17 00:00:00 2001 From: Tien Tran Date: Fri, 25 Jan 2013 18:50:07 +0700 Subject: [PATCH 04/74] fix indent bzr revid: tientranphuoc@gmail.com-20130125115007-xmvlkgjiszdkfp9d --- addons/l10n_vn/account_chart.xml | 2803 +++++++++++++++--------------- 1 file changed, 1404 insertions(+), 1399 deletions(-) diff --git a/addons/l10n_vn/account_chart.xml b/addons/l10n_vn/account_chart.xml index bb1fccc463f..11fcc5105e4 100755 --- a/addons/l10n_vn/account_chart.xml +++ b/addons/l10n_vn/account_chart.xml @@ -5,2011 +5,2016 @@ - 1. TÀI SẢN NGẮN HẠN - current_asset - balance - asset + 1. TÀI SẢN NGẮN HẠN + current_asset + balance + asset - 1. TÀI SẢN NGẮN HẠN - REC - current_asset - unreconciled - asset + 1. TÀI SẢN NGẮN HẠN - REC + current_asset + unreconciled + asset - 2. TÀI SẢN DÀI HẠN - long_term_asset - balance - asset + 2. TÀI SẢN DÀI HẠN + long_term_asset + balance + asset - 3. NỢ PHẢI TRẢ - liability - unreconciled - liability + 3. NỢ PHẢI TRẢ + liability + unreconciled + liability - 4. VỐN CHỦ SỞ HỮU - equity - balance - asset + 4. VỐN CHỦ SỞ HỮU + equity + balance + asset - 5. DOANH THU - income - none - income + 5. DOANH THU + income + none + income - 6. CHI PHÍ SẢN XUẤT, KINH DOANH - expense - none - expense + 6. CHI PHÍ SẢN XUẤT, KINH DOANH + expense + none + expense - 7. THU NHẬP KHÁC - other_income - none - income + 7. THU NHẬP KHÁC + other_income + none + income - 8. CHI PHÍ KHÁC - other_expense - none - expense + 8. CHI PHÍ KHÁC + other_expense + none + expense - 9. XÁC ĐỊNH KẾT QUẢ KINH DOANH - evaluation - none + 9. XÁC ĐỊNH KẾT QUẢ KINH DOANH + evaluation + none - X. TÀI KHOẢN NGOÀI BẢNG - other - none + X. TÀI KHOẢN NGOÀI BẢNG + other + none - CHỈ XEM - view - none + CHỈ XEM + view + none - 0 - Hệ thống tài khoản kế toán Việt Nam - view - + 0 + Hệ thống tài khoản kế toán Việt Nam + view + - 1 - TÀI SẢN NGẮN HẠN - view - - + 1 + TÀI SẢN NGẮN HẠN + view + + - 111 - - view - - - Tiền mặt + 111 + + view + + + Tiền mặt - 1111 - - liquidity - - - Tiền Việt Nam + 1111 + + liquidity + + + Tiền Việt Nam - 1112 - - other - - - Ngoại tệ + 1112 + + other + + + Ngoại tệ - 1113 - - other - - - Vàng bạc, kim khí quý, đá quý + 1113 + + other + + + Vàng bạc, kim khí quý, đá quý - 112 - - view - - - Tiền gửi ngân hàng + 112 + + view + + + Tiền gửi ngân hàng - 1121 - - liquidity - - - Tiền Việt Nam + 1121 + + liquidity + + + Tiền Việt Nam - 1122 - - other - - - Ngoại tệ + 1122 + + other + + + Ngoại tệ - 1123 - - other - - - Vàng bạc, kim khí quý, đá quý + 1123 + + other + + + Vàng bạc, kim khí quý, đá quý - 113 - - view - - - Tiền đang chuyển + 113 + + view + + + Tiền đang chuyển - 1131 - - other - - - Tiền Việt Nam + 1131 + + other + + + Tiền Việt Nam - 1132 - - other - - - Ngoại tệ + 1132 + + other + + + Ngoại tệ - 121 - - view - - - Đầu tư tài chính ngắn hạn + 121 + + view + + + Đầu tư tài chính ngắn hạn - 1211 - - other - - - Cổ phiếu + 1211 + + other + + + Cổ phiếu - 1212 - - other - - - Trái phiếu, Tín phiếu, Kỳ phiếu + 1212 + + other + + + Trái phiếu, Tín phiếu, Kỳ phiếu - 128 - - view - - - Đầu tư ngắn hạn khác + 128 + + view + + + Đầu tư ngắn hạn khác - 1281 - - other - - - Tiền gửi có kỳ hạn + 1281 + + other + + + Tiền gửi có kỳ hạn - 1282 - - other - - - Đầu tư ngắn hạn khác + 1282 + + other + + + Đầu tư ngắn hạn khác - 129 - - other - - - Dự phòng giảm giá đầu tư ngắn hạn + 129 + + other + + + Dự phòng giảm giá đầu tư ngắn hạn - 131 - - receivable - - - Phải thu của khách hàng + 131 + + receivable + + + Phải thu của khách hàng - 133 - - view - - - Thuế GTGT được khấu trừ + 133 + + view + + + Thuế GTGT được khấu trừ - 1331 - - other - - - Thuế GTGT được khấu trừ của hàng hóa, dịch vụ + 1331 + + other + + + Thuế GTGT được khấu trừ của hàng hóa, dịch vụ + - 1332 - - other - - - Thuế GTGT được khấu trừ của TSCĐ + 1332 + + other + + + Thuế GTGT được khấu trừ của TSCĐ - 136 - - view - - - Phải thu nội bộ + 136 + + view + + + Phải thu nội bộ - 1361 - - other - - - Vốn kinh doanh ở đơn vị trực thuộc + 1361 + + other + + + Vốn kinh doanh ở đơn vị trực thuộc - 1368 - - other - - - Phải thu nội bộ khác + 1368 + + other + + + Phải thu nội bộ khác - 138 - - view - - - Phải thu khác + 138 + + view + + + Phải thu khác - 1381 - - other - - - Tài sản thiếu chờ xử lý + 1381 + + other + + + Tài sản thiếu chờ xử lý - 1385 - - other - - - Phải thu về cổ phần hóa + 1385 + + other + + + Phải thu về cổ phần hóa - 1388 - - other - - - Phải thu khác + 1388 + + other + + + Phải thu khác - 139 - - other - - - Dự phòng phải thu khó đòi + 139 + + other + + + Dự phòng phải thu khó đòi - 141 - - other - - - Tạm ứng + 141 + + other + + + Tạm ứng - 142 - - other - - - Chi phí trả trước ngắn hạn + 142 + + other + + + Chi phí trả trước ngắn hạn - 144 - - other - - - Cầm cố, ký cược, ký quỹ ngắn hạn + 144 + + other + + + Cầm cố, ký cược, ký quỹ ngắn hạn - 151 - - other - - - Hàng hóa mua đang đi trên đường + 151 + + other + + + Hàng hóa mua đang đi trên đường - 152 - - other - - - Nguyên liệu, vật liệu + 152 + + other + + + Nguyên liệu, vật liệu - 153 - - other - - - Công cụ, dụng cụ + 153 + + other + + + Công cụ, dụng cụ - 154 - - other - - - Chi phí sản xuất kinh doanh dở dang + 154 + + other + + + Chi phí sản xuất kinh doanh dở dang - 155 - - other - - - Thành phẩm + 155 + + other + + + Thành phẩm - 156 - - view - - - Hàng hóa + 156 + + view + + + Hàng hóa - 1561 - - other - - - Giá mua hàng hóa + 1561 + + other + + + Giá mua hàng hóa - 1562 - - other - - - Chi phí thu mua hàng hóa + 1562 + + other + + + Chi phí thu mua hàng hóa - 1567 - - other - - - Hàng hóa bất động sản + 1567 + + other + + + Hàng hóa bất động sản - 157 - - other - - - Hàng gửi đi bán + 157 + + other + + + Hàng gửi đi bán - 158 - - other - - - Hàng hóa kho bảo thuế + 158 + + other + + + Hàng hóa kho bảo thuế - 159 - - other - - - Dự phòng giảm giá hàng tồn kho + 159 + + other + + + Dự phòng giảm giá hàng tồn kho - 161 - - view - - - Chi sự nghiệp + 161 + + view + + + Chi sự nghiệp - 1611 - - other - - - Chi sự nghiệp năm trước + 1611 + + other + + + Chi sự nghiệp năm trước - 1612 - - other - - - Chi sự nghiệp năm nay + 1612 + + other + + + Chi sự nghiệp năm nay - 2 - TÀI SẢN DÀI HẠN - view - - + 2 + TÀI SẢN DÀI HẠN + view + + - 211 - - view - - - Tài sản cố định hữu hình + 211 + + view + + + Tài sản cố định hữu hình - 2111 - - other - - - Nhà cửa, vật kiến trúc + 2111 + + other + + + Nhà cửa, vật kiến trúc - 2112 - - other - - - Máy móc, thiết bị + 2112 + + other + + + Máy móc, thiết bị - 2113 - - other - - - Phương tiện vận tải truyền dẫn + 2113 + + other + + + Phương tiện vận tải truyền dẫn - 2114 - - other - - - Thiết bị, dụng cụ quản lý + 2114 + + other + + + Thiết bị, dụng cụ quản lý - 2115 - - other - - - Cây lâu năm, súc vật làm việc và cho sản phẩm + 2115 + + other + + + Cây lâu năm, súc vật làm việc và cho sản phẩm + - 2118 - - other - - - Tài sản cố định khác + 2118 + + other + + + Tài sản cố định khác - 212 - - other - - - Tài sản cố định thuê tài chính + 212 + + other + + + Tài sản cố định thuê tài chính - 213 - - view - - - Tài sản cố định vô hình + 213 + + view + + + Tài sản cố định vô hình - 2131 - - other - - - Quyền sử dụng đất + 2131 + + other + + + Quyền sử dụng đất - 2132 - - other - - - Quyền phát hành + 2132 + + other + + + Quyền phát hành - 2133 - - other - - - Bản quyền, bằng sáng chế + 2133 + + other + + + Bản quyền, bằng sáng chế - 2134 - - other - - - Nhãn hiệu hàng hóa + 2134 + + other + + + Nhãn hiệu hàng hóa - 2135 - - other - - - Phần mềm máy tính + 2135 + + other + + + Phần mềm máy tính - 2136 - - other - - - Giấy phép và giấy phép nhượng quyền + 2136 + + other + + + Giấy phép và giấy phép nhượng quyền - 2138 - - other - - - Tài sản cố định vô hình khác + 2138 + + other + + + Tài sản cố định vô hình khác - 214 - - view - - - Hao mòn TSCĐ + 214 + + view + + + Hao mòn TSCĐ - 2141 - - other - - - Hao mòn TSCĐ cố định hữu hình + 2141 + + other + + + Hao mòn TSCĐ cố định hữu hình - 2142 - - other - - - Hao mòn TSCĐ thuê tài chính + 2142 + + other + + + Hao mòn TSCĐ thuê tài chính - 2143 - - other - - - Hao mòn TSCĐ vô hình + 2143 + + other + + + Hao mòn TSCĐ vô hình - 2147 - - other - - - Hao mòn bất động sản đầu tư + 2147 + + other + + + Hao mòn bất động sản đầu tư - 217 - - other - - - Bất động sản đầu tư + 217 + + other + + + Bất động sản đầu tư - 221 - - other - - - Đầu tư vào công ty con + 221 + + other + + + Đầu tư vào công ty con - 222 - - other - - - Vốn góp liên doanh + 222 + + other + + + Vốn góp liên doanh - 223 - - other - - - Đầu tư vào công ty liên kết + 223 + + other + + + Đầu tư vào công ty liên kết - 228 - - view - - - Đầu tư dài hạn khác + 228 + + view + + + Đầu tư dài hạn khác - 2281 - - other - - - Cổ phiếu + 2281 + + other + + + Cổ phiếu - 2282 - - other - - - Trái phiếu + 2282 + + other + + + Trái phiếu - 2288 - - other - - - Đầu tư dài hạn khác + 2288 + + other + + + Đầu tư dài hạn khác - 229 - - other - - - Dự phòng giảm giá đầu tư dài hạn + 229 + + other + + + Dự phòng giảm giá đầu tư dài hạn - 241 - - view - - - Xây dựng cơ bản dở dang + 241 + + view + + + Xây dựng cơ bản dở dang - 2411 - - other - - - Mua sắm TSCĐ + 2411 + + other + + + Mua sắm TSCĐ - 2412 - - other - - - Xây dựng cơ bản + 2412 + + other + + + Xây dựng cơ bản - 2413 - - other - - - Sửa chữa lớn TSCĐ + 2413 + + other + + + Sửa chữa lớn TSCĐ - 242 - - other - - - Chi phí trả trước dài hạn + 242 + + other + + + Chi phí trả trước dài hạn - 243 - - other - - - Tài sản thuế thu nhập hoãn lại + 243 + + other + + + Tài sản thuế thu nhập hoãn lại - 244 - - other - - - Ký quỹ, ký cược dài hạn + 244 + + other + + + Ký quỹ, ký cược dài hạn - 3 - NỢ PHẢI TRẢ - view - - + 3 + NỢ PHẢI TRẢ + view + + - 311 - - other - - - Vay ngắn hạn + 311 + + other + + + Vay ngắn hạn - 315 - - other - - - Nợ dài hạn đến hạn trả + 315 + + other + + + Nợ dài hạn đến hạn trả - 331 - - payable - - - Phải trả người bán + 331 + + payable + + + Phải trả người bán - 333 - - view - - - Thuế và các khoản phải nộp Nhà nước + 333 + + view + + + Thuế và các khoản phải nộp Nhà nước - 3331 - - view - - - Thuế GTGT phải nộp + 3331 + + view + + + Thuế GTGT phải nộp - 33311 - - other - - - Thuế GTGT đầu ra + 33311 + + other + + + Thuế GTGT đầu ra - 33312 - - other - - - Thuế GTGT hàng nhập khẩu + 33312 + + other + + + Thuế GTGT hàng nhập khẩu - 3332 - - other - - - Thuế tiêu thụ đặc biệt + 3332 + + other + + + Thuế tiêu thụ đặc biệt - 3333 - - other - - - Thuế xuất, nhập khẩu + 3333 + + other + + + Thuế xuất, nhập khẩu - 3334 - - other - - - Thuế thu nhập doanh nghiệp + 3334 + + other + + + Thuế thu nhập doanh nghiệp - 3335 - - other - - - Thuế thu nhập cá nhân + 3335 + + other + + + Thuế thu nhập cá nhân - 3336 - - other - - - Thuế tài nguyên + 3336 + + other + + + Thuế tài nguyên - 3337 - - other - - - Thuế nhà đất, tiền thuê đất + 3337 + + other + + + Thuế nhà đất, tiền thuê đất - 3338 - - other - - - Các loại thuế khác + 3338 + + other + + + Các loại thuế khác - 3339 - - other - - - Phí, lệ phí và các khoản phải nộp khác + 3339 + + other + + + Phí, lệ phí và các khoản phải nộp khác - 334 - - view - - - Phải trả người lao động + 334 + + view + + + Phải trả người lao động - 3341 - - other - - - Phải trả công nhân viên + 3341 + + other + + + Phải trả công nhân viên - 3342 - - other - - - Phải trả người lao động khác + 3342 + + other + + + Phải trả người lao động khác - 335 - - other - - - Chi phí phải trả + 335 + + other + + + Chi phí phải trả - 336 - - other - - - Phải trả nội bộ + 336 + + other + + + Phải trả nội bộ - 337 - - other - - - Thanh toán theo tiến độ kế hoạch hợp đồng xây dựng + 337 + + other + + + Thanh toán theo tiến độ kế hoạch hợp đồng xây dựng + - 338 - - view - - - Phải trả, phải nộp khác + 338 + + view + + + Phải trả, phải nộp khác - 3381 - - other - - - Tài sản thừa chờ giải quyết + 3381 + + other + + + Tài sản thừa chờ giải quyết - 3382 - - other - - - Kinh phí công đoàn + 3382 + + other + + + Kinh phí công đoàn - 3383 - - other - - - Bảo hiểm xã hội + 3383 + + other + + + Bảo hiểm xã hội - 3384 - - other - - - Bảo hiểm y tế + 3384 + + other + + + Bảo hiểm y tế - 3385 - - other - - - Phải trả về cổ phần hóa + 3385 + + other + + + Phải trả về cổ phần hóa - 3386 - - other - - - Nhận ký quỹ, ký cược ngắn hạn + 3386 + + other + + + Nhận ký quỹ, ký cược ngắn hạn - 3387 - - other - - - Doanh thu chưa thực hiện + 3387 + + other + + + Doanh thu chưa thực hiện - 3388 - - other - - - Phải trả, phải nộp khác + 3388 + + other + + + Phải trả, phải nộp khác - 341 - - other - - - Vay dài hạn + 341 + + other + + + Vay dài hạn - 342 - - other - - - Nợ dài hạn + 342 + + other + + + Nợ dài hạn - 343 - - view - - - Trái phiếu phát hành + 343 + + view + + + Trái phiếu phát hành - 3431 - - other - - - Mệnh giá trái phiếu + 3431 + + other + + + Mệnh giá trái phiếu - 3432 - - other - - - Chiết khấu trái phiếu + 3432 + + other + + + Chiết khấu trái phiếu - 3434 - - other - - - Phụ trội trái phiếu + 3434 + + other + + + Phụ trội trái phiếu - 344 - - other - - - Nhận ký quỹ, ký cược dài hạn + 344 + + other + + + Nhận ký quỹ, ký cược dài hạn - 347 - - other - - - Thuế thu nhập hoãn lại phải trả + 347 + + other + + + Thuế thu nhập hoãn lại phải trả - 351 - - other - - - Quỹ dự phòng trợ cấp mất việc làm + 351 + + other + + + Quỹ dự phòng trợ cấp mất việc làm - 352 - - other - - - Dự phòng phải trả + 352 + + other + + + Dự phòng phải trả - 4 - VỐN CHỦ SỞ HỮU - view - - + 4 + VỐN CHỦ SỞ HỮU + view + + - 411 - - view - - - Nguồn vốn kinh doanh + 411 + + view + + + Nguồn vốn kinh doanh - 4111 - - other - - - Vốn đầu tư chủ sỡ hữu + 4111 + + other + + + Vốn đầu tư chủ sỡ hữu - 4112 - - other - - - Thặng dư vốn cổ phần + 4112 + + other + + + Thặng dư vốn cổ phần - 4118 - - other - - - Vốn khác + 4118 + + other + + + Vốn khác - 412 - - other - - - Chênh lệch đánh giá lại tài sản + 412 + + other + + + Chênh lệch đánh giá lại tài sản - 413 - - view - - - Chênh lệnh tỉ giá hối đoái + 413 + + view + + + Chênh lệnh tỉ giá hối đoái - 4131 - - other - - - Chênh lệnh tỉ giá hối đoái đánh giá lại cuối năm tài chính + 4131 + + other + + + Chênh lệnh tỉ giá hối đoái đánh giá lại cuối năm + tài chính - 4132 - - other - - - Chênh lệnh tỉ giá hối đoái trong giai đoạn đầu tư XDCB + 4132 + + other + + + Chênh lệnh tỉ giá hối đoái trong giai đoạn đầu tư + XDCB - 414 - - other - - - Quỹ đầu tư phát triển + 414 + + other + + + Quỹ đầu tư phát triển - 415 - - other - - - Quỹ dự phòng tài chính + 415 + + other + + + Quỹ dự phòng tài chính - 418 - - other - - - Các quỹ khác thuộc vốn chủ sở hữu + 418 + + other + + + Các quỹ khác thuộc vốn chủ sở hữu - 419 - - other - - - Cổ phiếu quỹ + 419 + + other + + + Cổ phiếu quỹ - 421 - - view - - - Lợi nhuận chưa phân phối + 421 + + view + + + Lợi nhuận chưa phân phối - 4211 - - other - - - Lợi nhuận chưa phân phối năm trước + 4211 + + other + + + Lợi nhuận chưa phân phối năm trước - 4212 - - other - - - Lợi nhuận chưa phân phối năm nay + 4212 + + other + + + Lợi nhuận chưa phân phối năm nay - 431 - - view - - - Quỹ khen thưởng phúc lợi + 431 + + view + + + Quỹ khen thưởng phúc lợi - 4311 - - other - - - Quỹ khen thưởng + 4311 + + other + + + Quỹ khen thưởng - 4312 - - other - - - Quỹ phúc lợi + 4312 + + other + + + Quỹ phúc lợi - 4313 - - other - - - Quỹ phúc lợi đã hình thành TSCĐ + 4313 + + other + + + Quỹ phúc lợi đã hình thành TSCĐ - 441 - - other - - - Ngồn vố đầu tư xây dựng cơ bản + 441 + + other + + + Ngồn vố đầu tư xây dựng cơ bản - 461 - - view - - - Nguồn kinh phí sự nghiệp + 461 + + view + + + Nguồn kinh phí sự nghiệp - 4611 - - other - - - Nguồn kinh phí sự nghiệp năm trước + 4611 + + other + + + Nguồn kinh phí sự nghiệp năm trước - 4612 - - other - - - Nguồn kinh phí sự nghiệp năm nay + 4612 + + other + + + Nguồn kinh phí sự nghiệp năm nay - 466 - - other - - - Nguồn kinh phí đã hình thành TSCĐ + 466 + + other + + + Nguồn kinh phí đã hình thành TSCĐ - 5 - DOANH THU - view - - + 5 + DOANH THU + view + + - 511 - - view - - - Doanh thu bán hàng và cung cấp dịch vụ + 511 + + view + + + Doanh thu bán hàng và cung cấp dịch vụ - 5111 - - other - - - Doanh thu bán hàng hóa + 5111 + + other + + + Doanh thu bán hàng hóa - 5112 - - other - - - Doanh thu bán các thành phẩm + 5112 + + other + + + Doanh thu bán các thành phẩm - 5113 - - other - - - Doanh thu cung cấp dịch vụ + 5113 + + other + + + Doanh thu cung cấp dịch vụ - 5114 - - other - - - Doanh thu trợ cấp, trợ giá + 5114 + + other + + + Doanh thu trợ cấp, trợ giá - 5117 - - other - - - Doanh thu kinh doanh bất động sản đầu tư + 5117 + + other + + + Doanh thu kinh doanh bất động sản đầu tư - 512 - - view - - - Doanh thu bán hàng nội bộ + 512 + + view + + + Doanh thu bán hàng nội bộ - 5121 - - other - - - Doanh thu bán hàng hóa + 5121 + + other + + + Doanh thu bán hàng hóa - 5122 - - other - - - Doanh thu bán các thành phẩm + 5122 + + other + + + Doanh thu bán các thành phẩm - 5123 - - other - - - Doanh thu cung cấp dịch vụ + 5123 + + other + + + Doanh thu cung cấp dịch vụ - 515 - - other - - - Doanh thu hoạt động tài chính khác + 515 + + other + + + Doanh thu hoạt động tài chính khác - 521 - - other - - - Chiết khấu thương mại + 521 + + other + + + Chiết khấu thương mại - 531 - - other - - - Hàng bán bị trả lại + 531 + + other + + + Hàng bán bị trả lại - 532 - - other - - - Giảm giá hàng bán + 532 + + other + + + Giảm giá hàng bán - 6 - CHI PHÍ SẢN XUẤT, KINH DOANH - view - - + 6 + CHI PHÍ SẢN XUẤT, KINH DOANH + view + + - 611 - - view - - - Mua hàng + 611 + + view + + + Mua hàng - 6111 - - other - - - Mua nguyên liệu, vật liệu + 6111 + + other + + + Mua nguyên liệu, vật liệu - 6112 - - other - - - Mua hàng hóa + 6112 + + other + + + Mua hàng hóa - 621 - - other - - - Chi phí nguyên liệu, vật liệu trực tiếp + 621 + + other + + + Chi phí nguyên liệu, vật liệu trực tiếp - 622 - - other - - - Chi phí nhân công trực tiếp + 622 + + other + + + Chi phí nhân công trực tiếp - 623 - - view - - - Chi phí sử dụng máy thi công + 623 + + view + + + Chi phí sử dụng máy thi công - 6231 - - other - - - Chi phí nhân công + 6231 + + other + + + Chi phí nhân công - 6232 - - other - - - Chi phí vật liệu + 6232 + + other + + + Chi phí vật liệu - 6233 - - other - - - Chi phí dụng cụ sản xuất + 6233 + + other + + + Chi phí dụng cụ sản xuất - 6234 - - other - - - Chi phí khấu hao máy thi công + 6234 + + other + + + Chi phí khấu hao máy thi công - 6237 - - other - - - Chi phí dịch vụ mua ngoài + 6237 + + other + + + Chi phí dịch vụ mua ngoài - 6238 - - other - - - Chi phí bằng tiền khác + 6238 + + other + + + Chi phí bằng tiền khác - 627 - - view - - - Chi phí sản xuất chung + 627 + + view + + + Chi phí sản xuất chung - 6271 - - other - - - Chi phí nhân viên phân xưởng + 6271 + + other + + + Chi phí nhân viên phân xưởng - 6272 - - other - - - Chi phí vật liệu + 6272 + + other + + + Chi phí vật liệu - 6273 - - other - - - Chi phí dụng cụ sản xuất + 6273 + + other + + + Chi phí dụng cụ sản xuất - 6274 - - other - - - Chi phí khấu hao TSCĐ + 6274 + + other + + + Chi phí khấu hao TSCĐ - 6277 - - other - - - Chi phí dịch vụ mua ngoài + 6277 + + other + + + Chi phí dịch vụ mua ngoài - 6278 - - other - - - Chi phí bằng tiền khác + 6278 + + other + + + Chi phí bằng tiền khác - 631 - - other - - - Giá thành sản xuất + 631 + + other + + + Giá thành sản xuất - 632 - - other - - - Giá vốn hàng bán + 632 + + other + + + Giá vốn hàng bán - 635 - - other - - - Chi phí tài chính + 635 + + other + + + Chi phí tài chính - 641 - - view - - - Chi phí bán hàng + 641 + + view + + + Chi phí bán hàng - 6411 - - other - - - Chi phí nhân viên + 6411 + + other + + + Chi phí nhân viên - 6412 - - other - - - Chi phí vật liệu, bao bì + 6412 + + other + + + Chi phí vật liệu, bao bì - 6413 - - other - - - Chi phí dụng cụ, đồ dùng + 6413 + + other + + + Chi phí dụng cụ, đồ dùng - 6414 - - other - - - Chi phí khấu hao TSCĐ + 6414 + + other + + + Chi phí khấu hao TSCĐ - 6415 - - other - - - Chi phí bảo hành + 6415 + + other + + + Chi phí bảo hành - 6417 - - other - - - Chi phí dịch vụ mua ngoài + 6417 + + other + + + Chi phí dịch vụ mua ngoài - 6418 - - other - - - Chi phí bằng tiền khác + 6418 + + other + + + Chi phí bằng tiền khác - 642 - - view - - - Chi phí quản lý doanh nghiệp + 642 + + view + + + Chi phí quản lý doanh nghiệp - 6421 - - other - - - Chi phí nhân viên quản lý + 6421 + + other + + + Chi phí nhân viên quản lý - 6422 - - other - - - Chi phí vật liệu quản lý + 6422 + + other + + + Chi phí vật liệu quản lý - 6423 - - other - - - Chi phí đồ dùng văn phòng + 6423 + + other + + + Chi phí đồ dùng văn phòng - 6424 - - other - - - Chi phí khấu hao tài sản cố định + 6424 + + other + + + Chi phí khấu hao tài sản cố định - 6425 - - other - - - Thuế, phí và lệ phí + 6425 + + other + + + Thuế, phí và lệ phí - 6426 - - other - - - Chi phí dự phòng + 6426 + + other + + + Chi phí dự phòng - 6427 - - other - - - Chi phí dịch vụ mua ngoài + 6427 + + other + + + Chi phí dịch vụ mua ngoài - 6428 - - other - - - Chi phí bằng tiền khác + 6428 + + other + + + Chi phí bằng tiền khác - 7 - THU NHẬP KHÁC - view - - + 7 + THU NHẬP KHÁC + view + + - 711 - - other - - - Thu nhập khác + 711 + + other + + + Thu nhập khác - 8 - CHI PHÍ KHÁC - view - - + 8 + CHI PHÍ KHÁC + view + + - 811 - - other - - - Chi phí khác + 811 + + other + + + Chi phí khác - 821 - - view - - - Chi phí thuế thu nhập doanh nghiệp + 821 + + view + + + Chi phí thuế thu nhập doanh nghiệp - 8211 - - other - - - Chi phí thuế TNDN hiện hành + 8211 + + other + + + Chi phí thuế TNDN hiện hành - 8212 - - other - - - Chi phí thuế TNDN hoãn lại + 8212 + + other + + + Chi phí thuế TNDN hoãn lại - 9 - XÁC ĐỊNH KẾT QUẢ KINH DOANH - view - - + 9 + XÁC ĐỊNH KẾT QUẢ KINH DOANH + view + + - 911 - - other - - - Xác định kết quả kinh doanh + 911 + + other + + + Xác định kết quả kinh doanh - X10 - TÀI KHOẢN NGOÀI BẢNG - view - - + X10 + TÀI KHOẢN NGOÀI BẢNG + view + + - 001 - - other - - - Tài sản thuê ngoài + 001 + + other + + + Tài sản thuê ngoài - 002 - - other - - - Vật tư, hàng hóa nhận giữ hộ, nhận gia công + 002 + + other + + + Vật tư, hàng hóa nhận giữ hộ, nhận gia công - 003 - - other - - - Hàng hóa nhận bán hộ, nhận ký gửi, ký cược + 003 + + other + + + Hàng hóa nhận bán hộ, nhận ký gửi, ký cược - 004 - - other - - - Nợ khó đòi đã xử lý + 004 + + other + + + Nợ khó đòi đã xử lý - 007 - - other - - - Ngoại tệ các loại + 007 + + other + + + Ngoại tệ các loại - 008 - - other - - - Dự toán chi sự nghiệp, dự án + 008 + + other + + + Dự toán chi sự nghiệp, dự án - OBA - - other - - - Opening Balance Account + OBA + + other + + + Opening Balance Account - VN - Chart of Accounts - 0 - - - - - - - + VN - Chart of Accounts + 0 + + + + + + + - + From e6f13c1f6ab29456e9e8c0f0fa9fbf395cd831de Mon Sep 17 00:00:00 2001 From: Tien Tran Date: Wed, 30 Jan 2013 23:24:38 +0700 Subject: [PATCH 05/74] split account type and account template in separated data tag bzr revid: tientranphuoc@gmail.com-20130130162438-96g57rc2gd1g01m6 --- addons/l10n_vn/account_chart.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/addons/l10n_vn/account_chart.xml b/addons/l10n_vn/account_chart.xml index 11fcc5105e4..c7d3f6a9ee3 100755 --- a/addons/l10n_vn/account_chart.xml +++ b/addons/l10n_vn/account_chart.xml @@ -84,7 +84,9 @@ view none + + From 5171a1d716c310be3d78fae08d4ad8eae459a34a Mon Sep 17 00:00:00 2001 From: Tien Tran Date: Wed, 6 Feb 2013 23:06:57 +0700 Subject: [PATCH 06/74] change module description and add vn flag icon bzr revid: tientranphuoc@gmail.com-20130206160657-d5aml51ogq6stnnz --- addons/l10n_vn/__openerp__.py | 10 +++++++++- addons/l10n_vn/static/src/img/icon.png | Bin 0 -> 4196 bytes 2 files changed, 9 insertions(+), 1 deletion(-) create mode 100755 addons/l10n_vn/static/src/img/icon.png diff --git a/addons/l10n_vn/__openerp__.py b/addons/l10n_vn/__openerp__.py index 69083af6631..19b81654523 100755 --- a/addons/l10n_vn/__openerp__.py +++ b/addons/l10n_vn/__openerp__.py @@ -25,10 +25,18 @@ "author" : "General Solutions", 'website': 'http://gscom.vn', "category" : "Localization/Account Charts", - "description": "This is the module to manage the accounting chart for Vietnam.", + "description": """ +This is the module to manage the accounting chart for Vietnam in OpenERP. +======================================================================== + +This module applies to companies based in Vietnamese Accounting Standard (VAS). + +**Credits:** General Solutions. +""", "depends" : ["account","base_vat","base_iban"], "data" : ["account_tax_code.xml","account_chart.xml","account_tax.xml","l10n_vn_wizard.xml"], "demo" : [], 'auto_install': False, "installable": True, } + diff --git a/addons/l10n_vn/static/src/img/icon.png b/addons/l10n_vn/static/src/img/icon.png new file mode 100755 index 0000000000000000000000000000000000000000..241a2d3fa74e5e3b7ed4e63f3b7bf81eb7bcca1c GIT binary patch literal 4196 zcmeH}`8O79x5u~0JkJ@*6f(~;54U*?w-7SB4GE=8k$FfDN#=;kJQRvsK&7vzWqzy?|2Qe( zaoql#`ukYO{Pb+D15hyh;{=fNkQIR3)DwfbaKXbj!1ua`uOF8_2E*ld&DY)YiW@-C zWS#{MYq7$tvOBx2X_yf4z|hy6iImG+Gbw^Gm0yUPjMgB5yKsWZtc^}vn~1%)Ab~JB zIpQvpnF!?_@^O+y?#Ic|PZI9D+n*18;yu>9`?de*!g)1uy^R$w@27;gw3Q}k_&TW<8h(|Q5 zn%Q;)5ita<0jcK=Nh26RJtSGP7}RwLBJ#5MEuer19Q$0H7vO>@I11eUIsy@Sd)c7` zVEcfZiJ%}AxES0Lw7^3NDhDs#(FSV?V01U^RDf|&kkGes*MsK`&^ka%Q46G$AYqme zdk%;~!LgT@Hwa>~fl+7EO8KX7HSMy{F{$iYWjvpPcBCz-s6UC7mDp*)0eu!>MmeVw zPC4pg?ZMfnq#|W#K5xATC`e^G?sn@iXn?wUU_dUpp4vfl^$juNaduufS{khIQwNw2 z2p>8U5wBy5P$G`-IeL6{oyg-dMZt~TB==ex^_NhvGHJEt_YWKG!h86MiKWHGaf41x zTc>wcVMn-jhgPe@E5E~)4|aDxzy87(DPYOY*_fjPYO%*M*cOm>` zC_rl+(E4Q;V6(}$?V}(mVT4EY{9qv3P&?EuI13T(`uF_-E^G0LVc*rM^^gK+6+{X> z*I?gnV-;y7=4d-P-9~ZXC>Nv2*V(Q~t4Zz}!Ew#;TxFD|U|j!mP9aC}kLsK+aC3IWIz%=F(TgQ%PCT z&G!6aC1F$Ij>}+8AQ63}b}N}2QJ^N5(`gMoYa?rualKM54n7&WNiumd!Wgr50iLu{ z!x#LGbiX@Uouwq>t@T8B$LLcS#A!nlFrD&z^obZL0sOra`ZZ6n!}P;C!&l9DS47Hk zW%Ss1)80Kp8c90UgO!k%{GPR( zO_S|wX)RPQbc-qV9eKJzI)6I5kT|xiytsU}oWgR;vJab5cG)7VTE|k_Vxf%eV@8E# zdESNZ7VH+dGNsb^a$Kn|R_$rH&0!+3O@~p3DdwqJL5;&gb2k@-%c;5`5pHj)intq* zvYq@j{S&ut3N>XNayBKYl$RAMV5AMCt?JCT9=NNKEM)obJq$1*TNW(I+zP)l%eZmw z%Q^O986&);o1J%gMrMX}gtFiEtw5&S^mQjCVq%L^!Zb=qf2Q` zTt~@AJViOcs@x^(@2kuy-ZS;n3}fG+jwy0VcgmcPNyQH-KN;2eONZvJXSdw~--1uK zPxljkVt#IZL*rHB^&E3!eDS$rB_k!Hp8og!kNd~6Wph;|KS?d;F6VyAoojHs6m&_X zzO??8n||%$rDB`)`sS;#mlSM@tSv9u*XdN{Rh=Dcs%k2sE5VzjnN;MD;X0oGtbbcy z)^O_i(m3%{b-ho0m=n&K1=rA3-Lan5k`~q&_Sc~b303?Abp_`o&hYCmt}!ZJRGiHj zc(|?>*0r6nB95~jq#YcWUZ`j2JJ;!%XOTOii(|pzuSahsBqbU~^@(MwisiC*&-At| z8U*b4+s}s#@8spy<+iVtPCZ+fTlZX#pMLaS=Fz!)8|mvGI(jjm&6bALC?2Itc+XXa zn_^5OaW9v7#a+Zxt*SmfZzu{Z-*wtxQT?TQ?a_kjg0lRq)U1ued->Le-iAKY4&Qu- z*g4E?UgU~G&=8bFoF%{!CPr#R+Md|o3%SMpCRt5!%I#O}#G1z40=x#3MoLsw)KXg& zw@2@fdsW=K%UJ`d1D@2e7s9`deIRlA>Xg(GPAL!@A8Qq-mh6{c%{C;NDH}L6jk!Lj z^+zj1Yc>}rX{zu{)Ie59wOq_gc~ZVnrcte1%-!bwsCAyT{uM(G1u>y&xvN)R&mF97 z#ed2BLa`9ak|o}2?-yJ+(7qj8!dxasFQS;CZj@kh{=wfGv_hrKch7Dz1fESM4{qmd z$MJ{{$qglpW9)=Zn{4U{8He2ek=iU9%-1DdB(j8$5h%OYY(!-=ldG7|oO6@QM@mJp zMKbz+>OFtWa&F_adfY1RtNYEqO1IeBqpqt-4dSQMN#1(b-K#ulBT8PcS^N!qN$`^p zNiELJ%Kc4$;yZQT7PY+^irr*_79#S zUtl^Z9CwkpQu)=LdLf@t(~32#%s`BwvaR`#$|?&EC{n z+-B~j)1SCJc2%atJJpO+ESXHV#|5W@me}Kc-@VD6e(<8Kq7&~r=sxVe@^w};-w%X zQz=f~yc=3MPcm}mCMS+l+)FcOGe;-aB4^*$*|yR2z3R}|>TJk??$jBYhce1G!3JB{ zx1N(LQ6p)%&B42Q>3Lz{V!x*yrykdbF1rlOdC~Z8G|~pl4{M{OWu<1N0lUpt0h_f` zOAJ=8ta6?yI{2&xtSTR+jhOZ{J#5OU#@l)0*F#!fhPv;ru;O0tMEqnoXM>w$;}(CNMMcqiVKC)8iY{x4l{e3$})) zb$5wlqX&;tcT#9DCsVRh`r@eKzUQA;RZ#e%cI|NGpae7MI>?{Ta`gD9ubPEfJbZ8T z`=^1Stf9ip&CIknKDUYvS6jcIdN$SF-hKM@+aPJl%i9{xs#*-tx_mWGH3v$hUgq(!HW?@c0{hOq`fP4caMv$W%!%SF%J7$D^A@m(4X z@EaZL3cw8sfK^8T#Vi08-}??-Isk-l!3e935TI^AJ%CyPwE^k?)Cs5yP$QrwK+S+! z0KEqE2G9#Y^?(`xy#iDX=oz3IKy`r1096301XKm+F`%b_iU5@W$^-NWP$8g9KskW! z14;vw4(KkRzW}8GiUkx8C;?C+pa?*bfT95f0}25Y3MdTFbwB}tZU71dbOn$PAYVZK zfZPG$0C@uP0^|h98ITJgS3q`v>;X9d!UDPo$O@1RAQM0r09gRi1Edeg7!U@KE+Az< zs({o0sRPmgBnLgfFuA(0+IqG3rGl%Fdz{?qJa1SodqNSND$B&KwN-$0PzB1 z1;hr39S{c~PCyKR7y&T>Vg|$lh!PMLAR0ilfQSK+03riK0mq|31b|KeA_8<05Gg4l zCrAHn$AkQj{r?a+Y3ud%xKez8xrxR9!2fqg;Q76L3xMFWzLo|yX!1w4sF9`_V-Jlo zhf7^ltPW4AK3`qp(?lMu9L`V4<*IX?HAk##&BQcEDt_V$vtr%(Z2d?&t?jm%t(grn z#6H`iw5&Rik{7Bf#y7bb$ajm7kL>@V&DZr>W&ccw``25GBwH}?x0^Ti3Ho>El$#1L zAAgcd@UdMDU^HT;F$G*wPh8_?MVVk=jp1kH-GyagiXM0*Owj;=?M0Xf-FbR5#}aOQ z5OV1#Q?H+qA^GsI*Xm(f>r;v-jLkkrmI|TL!&J#fPFuz+LtNpbQ{v+ZQ71|ke2lKQ znX{f|pDDg3?&#Dkx>1vpF#bI3cP^dUjE={y!7mH{b6=EdUxXDkajQ*JEH$}Vb(M1#+tvIzbm&4yKHC^F_rO=1>HA}8DG{}WPhY^j1hUat_FNyW=`1W{?8RZj Date: Thu, 7 Feb 2013 13:42:06 +0100 Subject: [PATCH 07/74] [IMP] l10n_es: Added updated taxes (IVA 21% and so on...) bzr revid: pedro.baeza@serviciosbaeza.com-20130207124206-166v2sq1joyde4rr --- addons/l10n_es/__openerp__.py | 60 +- addons/l10n_es/account_chart.xml | 70 +- addons/l10n_es/account_chart_pymes.xml | 76 +- addons/l10n_es/fiscal_templates.xml | 1669 +++++++++++-- addons/l10n_es/fiscal_templates_pymes.xml | 1659 +++++++++++-- addons/l10n_es/taxes_data.xml | 2718 +++++++++++++-------- addons/l10n_es/taxes_data_pymes.xml | 2600 +++++++++++++------- 7 files changed, 6489 insertions(+), 2363 deletions(-) diff --git a/addons/l10n_es/__openerp__.py b/addons/l10n_es/__openerp__.py index 2264988fd99..2a5ca339896 100644 --- a/addons/l10n_es/__openerp__.py +++ b/addons/l10n_es/__openerp__.py @@ -7,54 +7,50 @@ # $Id$ # # 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 +# 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 General Public License for more details. +# GNU Affero General Public License for more details. # -# You should have received a copy of the GNU General Public License +# You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . # ############################################################################## { - 'name': 'Spanish - Accounting (PGCE 2008)', - 'version': '3.0', - 'author': 'Spanish Localization Team', - 'website': 'https://launchpad.net/openerp-spain', - 'category': 'Localization/Account Charts', - 'description': """ -Spanish Charts of Accounts (PGCE 2008). -======================================= + "name" : "Spanish Charts of Accounts (PGCE 2008)", + "version" : "3.0", + "author" : "Spanish Localization Team", + 'website' : 'https://launchpad.net/openerp-spain', + "category" : "Localization/Account Charts", + "description": """Spanish Charts of Accounts (PGCE 2008) - * Defines the following chart of account templates: - * Spanish General Chart of Accounts 2008 - * Spanish General Chart of Accounts 2008 for small and medium companies - * Defines templates for sale and purchase VAT - * Defines tax code templates +* Defines the following chart of account templates: + * Spanish General Chart of Accounts 2008. + * Spanish General Chart of Accounts 2008 for small and medium companies. +* Defines templates for sale and purchase VAT. +* Defines tax code templates. -**Note:** You should install the l10n_ES_account_balance_report module for yearly - account reporting (balance, profit & losses). +Note: You should install the l10n_ES_account_balance_report module +for yearly account reporting (balance, profit & losses). """, - 'license': 'GPL-3', - 'depends': ['account', 'base_vat', 'base_iban'], - 'data': [ - 'account_chart.xml', - 'taxes_data.xml', - 'fiscal_templates.xml', - 'account_chart_pymes.xml', - 'taxes_data_pymes.xml', - 'fiscal_templates_pymes.xml', - 'l10n_es_wizard.xml' + "license" : "AGPL-3", + "depends" : ["account", "base_vat", "base_iban"], + "data" : [ + "account_chart.xml", + "taxes_data.xml", + "fiscal_templates.xml", + "account_chart_pymes.xml", + "taxes_data_pymes.xml", + "fiscal_templates_pymes.xml", + "l10n_es_wizard.xml", ], - 'demo': [], + "demo" : [], 'auto_install': False, - 'installable': True, + "installable": True, '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_es/account_chart.xml b/addons/l10n_es/account_chart.xml index 8ffabd17fe7..1bc63f6419f 100644 --- a/addons/l10n_es/account_chart.xml +++ b/addons/l10n_es/account_chart.xml @@ -1,6 +1,6 @@ - + @@ -2722,7 +2722,7 @@ view - Amortización acumulada de otras instaciones + Amortización acumulada de otras instalaciones @@ -2730,7 +2730,7 @@ other - Amortización acumulada de otras instaciones + Amortización acumulada de otras instalaciones @@ -4743,7 +4743,7 @@ 460 - + other Anticipos de remuneraciones @@ -4759,7 +4759,7 @@ 465 - + other Remuneraciones pendientes de pago @@ -4775,7 +4775,7 @@ 466 - + other Remuneraciones mediante sistemas de aportación definida pendientes de pago @@ -4805,8 +4805,8 @@ Hacienda Pública, deudora por IVA - - 4700 + + 470000 receivable @@ -4869,6 +4869,14 @@ Hacienda Pública, IVA soportado + + 472000 + + + other + Hacienda Pública. IVA soportado + + 473 @@ -4877,6 +4885,14 @@ Hacienda Pública, retenciones y pagos a cuenta + + 473000 + + + other + Hacienda Pública, retenciones y pagos a cuenta + + 474 @@ -4949,8 +4965,8 @@ Hacienda Pública, acreedora por IVA - - 4750 + + 475000 payable @@ -4965,8 +4981,8 @@ Hacienda Pública, acreedora por retenciones practicadas - - 4751 + + 475100 payable @@ -5029,6 +5045,14 @@ Hacienda Pública, IVA repercutido + + 477000 + + + other + Hacienda Pública. IVA repercutido + + 479 @@ -8722,7 +8746,7 @@ view - Ingresos de créditos a largo plazo + Intereses de deudas @@ -8730,7 +8754,7 @@ view - Ingresos de créditos a largo plazo, empresas del grupo + Intereses de deudas, empresas del grupo @@ -8738,7 +8762,7 @@ other - Ingresos de créditos a largo plazo, empresas del grupo + Intereses de deudas, empresas del grupo @@ -8746,7 +8770,7 @@ view - Ingresos de créditos a largo plazo, empresas asociadas + Intereses de deudas, empresas asociadas @@ -8754,7 +8778,7 @@ other - Ingresos de créditos a largo plazo, empresas asociadas + Intereses de deudas, empresas asociadas @@ -8762,7 +8786,7 @@ view - Ingresos de créditos a largo plazo, otras partes vinculadas + Intereses de deudas, otras partes vinculadas @@ -8770,7 +8794,7 @@ other - Ingresos de créditos a largo plazo, otras partes vinculadas + Intereses de deudas, otras partes vinculadas @@ -8778,7 +8802,7 @@ view - Ingresos de créditos a largo plazo con entidades de crédito + Intereses de deudas con entidades de crédito @@ -8786,7 +8810,7 @@ other - Ingresos de créditos a largo plazo con entidades de crédito + Intereses de deudas con entidades de crédito @@ -8794,7 +8818,7 @@ view - Ingresos de créditos a largo plazo, otras empresas + Intereses de deudas, otras empresas @@ -8802,7 +8826,7 @@ other - Ingresos de créditos a largo plazo, otras empresas + Intereses de deudas, otras empresas diff --git a/addons/l10n_es/account_chart_pymes.xml b/addons/l10n_es/account_chart_pymes.xml index ed2e4f18e7c..223d80e3193 100644 --- a/addons/l10n_es/account_chart_pymes.xml +++ b/addons/l10n_es/account_chart_pymes.xml @@ -1,6 +1,6 @@ - + + Jordi Esteve (Zikzakmedia) - jesteve@zikzakmedia.com 2010-02-18 + + Añadido mapeo de cuentas del regimen de equivalencia para compras : + Ignacio Ibeas (Acysos) - ignacio@acysos.com 2011-02-22 --> + + - Régimen Nacional @@ -32,6 +36,16 @@ + + Retención IRPF 21% + + + + + Retención IRPF 20% + + + Retención IRPF 19% @@ -47,6 +61,11 @@ + + Retención IRPF 9% + + + Retención IRPF 7% @@ -68,6 +87,54 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -78,7 +145,7 @@ - + @@ -90,35 +157,15 @@ - + - - + + - + - - - - - - - - - - - - - - - - - - - - - - + + @@ -138,6 +185,12 @@ + + + + + + @@ -148,29 +201,24 @@ + + + + + - + - - + + - + + - - - - - - - - - - - - - + + @@ -178,30 +226,71 @@ + + + - + + - - + + - + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -215,27 +304,87 @@ - + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -260,42 +409,188 @@ - + - - + + - + - - - - - - - - + + - - - - + + + + - - - - + + + + - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -372,7 +667,310 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -386,18 +984,6 @@ - - - - - - - - - - - - @@ -410,6 +996,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + @@ -434,6 +1044,18 @@ + + + + + + + + + + + + @@ -446,18 +1068,6 @@ - - - - - - - - - - - - @@ -470,6 +1080,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + @@ -495,6 +1129,18 @@ + + + + + + + + + + + + @@ -508,6 +1154,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + @@ -520,18 +1190,6 @@ - - - - - - - - - - - - @@ -556,6 +1214,18 @@ + + + + + + + + + + + + @@ -568,6 +1238,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + @@ -580,18 +1274,6 @@ - - - - - - - - - - - - @@ -616,7 +1298,19 @@ - + + + + + + + + + + + + + @@ -630,18 +1324,6 @@ - - - - - - - - - - - - @@ -654,6 +1336,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + @@ -678,6 +1384,18 @@ + + + + + + + + + + + + @@ -690,18 +1408,6 @@ - - - - - - - - - - - - @@ -714,6 +1420,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + @@ -738,7 +1468,142 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -752,18 +1617,6 @@ - - - - - - - - - - - - @@ -776,6 +1629,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + @@ -800,6 +1677,18 @@ + + + + + + + + + + + + @@ -812,6 +1701,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + @@ -824,18 +1737,6 @@ - - - - - - - - - - - - @@ -862,6 +1763,18 @@ + + + + + + + + + + + + @@ -874,18 +1787,6 @@ - - - - - - - - - - - - @@ -898,6 +1799,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + @@ -922,6 +1847,18 @@ + + + + + + + + + + + + @@ -934,18 +1871,6 @@ - - - - - - - - - - - - @@ -958,6 +1883,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + @@ -984,6 +1933,19 @@ + + + + + + + + + + + + + @@ -996,18 +1958,6 @@ - - - - - - - - - - - - @@ -1020,6 +1970,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + @@ -1044,6 +2018,18 @@ + + + + + + + + + + + + @@ -1056,18 +2042,6 @@ - - - - - - - - - - - - @@ -1080,6 +2054,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + @@ -1104,5 +2102,222 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/addons/l10n_es/fiscal_templates_pymes.xml b/addons/l10n_es/fiscal_templates_pymes.xml index 05871fad842..2e84e63bc34 100644 --- a/addons/l10n_es/fiscal_templates_pymes.xml +++ b/addons/l10n_es/fiscal_templates_pymes.xml @@ -1,10 +1,10 @@ - + + Añadidas posiciones fiscales Retención de IRPF 19%, 2% : + Jordi Esteve (Zikzakmedia) - jesteve@zikzakmedia.com 2010-02-18 + + Añadido mapeo de cuentas del regimen de equivalencia para compras y ventas separados: + Ignacio Ibeas (Acysos) - ignacio@acysos.com 2011-05-06 --> + + - Régimen Nacional @@ -59,6 +63,16 @@ + + Retención IRPF 21% + + + + + Retención IRPF 20% + + + Retención IRPF 19% @@ -74,6 +88,11 @@ + + Retención IRPF 9% + + + Retención IRPF 7% @@ -94,26 +113,16 @@ + + + + + - + - - - - - - - - - - - - - - - - - + + @@ -121,30 +130,69 @@ + + + - + + - - + + - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -164,6 +212,12 @@ + + + + + + @@ -175,8 +229,62 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -198,35 +306,15 @@ - + - - + + - + - - - - - - - - - - - - - - - - - - - - - - + + @@ -246,6 +334,12 @@ + + + + + + @@ -257,30 +351,24 @@ + + + + + + - + - - + + - + - - - - - - - - - - - - - - + + @@ -294,7 +382,7 @@ - + @@ -307,16 +395,220 @@ - + - - + + - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -395,9 +687,312 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -410,18 +1005,6 @@ - - - - - - - - - - - - @@ -434,6 +1017,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + @@ -458,6 +1065,18 @@ + + + + + + + + + + + + @@ -470,6 +1089,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + @@ -482,18 +1125,6 @@ - - - - - - - - - - - - @@ -520,6 +1151,18 @@ + + + + + + + + + + + + @@ -532,18 +1175,6 @@ - - - - - - - - - - - - @@ -556,6 +1187,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + @@ -580,6 +1235,18 @@ + + + + + + + + + + + + @@ -592,18 +1259,6 @@ - - - - - - - - - - - - @@ -616,6 +1271,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + @@ -642,6 +1321,18 @@ + + + + + + + + + + + + @@ -654,18 +1345,6 @@ - - - - - - - - - - - - @@ -678,6 +1357,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + @@ -702,6 +1405,18 @@ + + + + + + + + + + + + @@ -714,18 +1429,6 @@ - - - - - - - - - - - - @@ -738,6 +1441,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + @@ -762,8 +1489,142 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -776,18 +1637,6 @@ - - - - - - - - - - - - @@ -800,6 +1649,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + @@ -824,6 +1697,18 @@ + + + + + + + + + + + + @@ -836,6 +1721,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + @@ -848,17 +1757,6 @@ - - - - - - - - - - - @@ -886,6 +1784,18 @@ + + + + + + + + + + + + @@ -898,18 +1808,6 @@ - - - - - - - - - - - - @@ -922,6 +1820,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + @@ -946,6 +1868,18 @@ + + + + + + + + + + + + @@ -958,18 +1892,6 @@ - - - - - - - - - - - - @@ -982,6 +1904,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + @@ -1008,6 +1954,18 @@ + + + + + + + + + + + + @@ -1020,18 +1978,6 @@ - - - - - - - - - - - - @@ -1044,6 +1990,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + @@ -1068,6 +2038,18 @@ + + + + + + + + + + + + @@ -1080,6 +2062,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + @@ -1092,18 +2098,6 @@ - - - - - - - - - - - - @@ -1128,5 +2122,222 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/addons/l10n_es/taxes_data.xml b/addons/l10n_es/taxes_data.xml index 41b52ee077d..586358ffc70 100644 --- a/addons/l10n_es/taxes_data.xml +++ b/addons/l10n_es/taxes_data.xml @@ -1,25 +1,37 @@ - - - + + - + + Ignacio Ibeas (Acysos) - ignacio@acysos.com (2011-02-22) + Modificado type_tax_use de los recargos de equivalencia a "all" + + Jordi Esteve (Zikzakmedia) - jesteve@zikzakmedia.com (2011-08-29) + Cambiado Recargos de equivalencia de "all" a "venta" (ya existen los de compra). Ahora quedan definidos de la misma forma que en taxes_data_pymes.xml + + Pedro M. Baeza (Serv. Tecnol. Avanzados) - pedro.baeza@serviciosbaeza.com (2013-01-29) + Limpieza de subcuentas de impuestos y corrección de inversión de sujeto pasivo + + --> + + - - + + - + @@ -28,46 +40,102 @@ 1.0 - - - + + + + Base adquisiciones exentas + + -- + 1.0 + + + + Base ventas exentas + -- + + 1.0 + + + + + + IVA Soportado exento (operaciones corrientes) + + percent + + + + + + + purchase + + + + + + IVA Exento + + percent + + + + + + + sale + + - + Régimen general IVA Devengado. Base Imponible 4% [01] 1.0 - + Régimen general IVA Devengado. Base Imponible 7% [04] 1.0 - + Régimen general IVA Devengado. Base Imponible 8% [04] 1.0 - + + + Régimen general IVA Devengado. Base Imponible 10% + [04] + + 1.0 + + Régimen general IVA Devengado. Base Imponible 16% [07] 1.0 - + Régimen general IVA Devengado. Base Imponible 18% [07] 1.0 - + + Régimen general IVA Devengado. Base Imponible 21% + [07] + + 1.0 + + - + Recargo Equivalencia Base Imponible 0.5% [10] 1.0 - + Recargo Equivalencia Base Imponible 1% [13] 1.0 - + + + Recargo Equivalencia Base Imponible 1.4% + [13] + + 1.0 + + Recargo Equivalencia Base Imponible 4% [16] 1.0 - - + + + Recargo Equivalencia Base Imponible 5.2% + [16] + + 1.0 + + - + Adquisiciones intracomunitarias. Base Imponible [19] 1.0 - + - - + + - - + + IVA Cuota total devengada [21] 1.0 - + Régimen general IVA Devengado. Cuota 4% [03] 1.0 - + Régimen general IVA Devengado. Cuota 7% [06] 1.0 - + Régimen general IVA Devengado. Cuota 8% [06] 1.0 - + + + Régimen general IVA Devengado. Cuota 10% + [06] + + 1.0 + + Régimen general IVA Devengado. Cuota 16% [09] @@ -155,7 +243,14 @@ 1.0 - + + + Régimen general IVA Devengado. Cuota 21% + [09] + + 1.0 + + - + Recargo Equivalencia. Cuota 0.5% [12] 1.0 - + Recargo Equivalencia. Cuota 1% [15] 1.0 - + + + Recargo Equivalencia. Cuota 1.4% + [15] + + 1.0 + + Recargo Equivalencia. Cuota 4% [18] 1.0 - - + + + Recargo Equivalencia. Cuota 5.2% + [18] + + 1.0 + + + - + Adquisiciones intracomunitarias. Cuota [20] 1.0 - - - - - + + + + + - - + + @@ -212,7 +321,7 @@ 1.0 - + Base operaciones interiores corrientes @@ -220,19 +329,12 @@ 1.0 - - Base operaciones interiores corrientes (16%) + + Base operaciones interiores corrientes (4%) -- 1.0 - - Base operaciones interiores corrientes (18%) - -- - - 1.0 - - Base operaciones interiores corrientes (7%) -- @@ -245,13 +347,30 @@ 1.0 - - Base operaciones interiores corrientes (4%) + + Base operaciones interiores corrientes (10%) + -- + + 1.0 + + + Base operaciones interiores corrientes (16%) + -- + + 1.0 + + + Base operaciones interiores corrientes (18%) + -- + + 1.0 + + + Base operaciones interiores corrientes (21%) -- 1.0 - Base operaciones interiores bienes inversión @@ -259,19 +378,12 @@ 1.0 - - Base operaciones interiores bienes inversión (16%) + + Base operaciones interiores bienes inversión (4%) -- 1.0 - - Base operaciones interiores bienes inversión (18%) - -- - - 1.0 - - Base operaciones interiores bienes inversión (7%) -- @@ -284,14 +396,31 @@ 1.0 - - Base operaciones interiores bienes inversión (4%) + + Base operaciones interiores bienes inversión (10%) -- 1.0 - - + + Base operaciones interiores bienes inversión (16%) + -- + + 1.0 + + + Base operaciones interiores bienes inversión (18%) + -- + + 1.0 + + + Base operaciones interiores bienes inversión (21%) + -- + + 1.0 + + Base importaciones bienes corrientes @@ -299,6 +428,30 @@ 1.0 + + Base importaciones bienes corrientes (4%) + -- + + 1.0 + + + Base importaciones bienes corrientes (7%) + -- + + 1.0 + + + Base importaciones bienes corrientes (8%) + -- + + 1.0 + + + Base importaciones bienes corrientes (10%) + -- + + 1.0 + Base importaciones bienes corrientes (16%) -- @@ -311,26 +464,13 @@ 1.0 - - - Base importaciones bienes corrientes (7%) + + Base importaciones bienes corrientes (21%) -- 1.0 - - Base importaciones bienes corrientes (8%) - -- - - 1.0 - - - Base importaciones bienes corrientes (4%) - -- - - 1.0 - - + Base importaciones bienes inversión @@ -338,19 +478,12 @@ 1.0 - - Base importaciones bienes inversión (16%) + + Base importaciones bienes inversión (4%) -- 1.0 - - Base importaciones bienes inversión (18%) - -- - - 1.0 - - Base importaciones bienes inversión (7%) -- @@ -363,13 +496,31 @@ 1.0 - - Base importaciones bienes inversión (4%) + + Base importaciones bienes inversión (10%) -- 1.0 - + + Base importaciones bienes inversión (16%) + -- + + 1.0 + + + Base importaciones bienes inversión (18%) + -- + + 1.0 + + + Base importaciones bienes inversión (21%) + -- + + 1.0 + + Base adquisiciones intracomunitarias bienes corrientes @@ -377,6 +528,30 @@ 1.0 + + Base adquisiciones intracomunitarias bienes corrientes (4%) + -- + + 1.0 + + + Base adquisiciones intracomunitarias bienes corrientes (7%) + -- + + 1.0 + + + Base adquisiciones intracomunitarias bienes corrientes (8%) + -- + + 1.0 + + + Base adquisiciones intracomunitarias bienes corrientes (10%) + -- + + 1.0 + Base adquisiciones intracomunitarias bienes corrientes (16%) -- @@ -389,26 +564,13 @@ 1.0 - - - Base adquisiciones intracomunitarias bienes corrientes (7%) + + Base adquisiciones intracomunitarias bienes corrientes (21%) -- 1.0 - - Base adquisiciones intracomunitarias bienes corrientes (8%) - -- - - 1.0 - - - Base adquisiciones intracomunitarias bienes corrientes (4%) - -- - - 1.0 - - + Base adquisiciones intracomunitarias bienes inversión @@ -416,19 +578,12 @@ 1.0 - - Base adquisiciones intracomunitarias bienes inversión (16%) + + Base adquisiciones intracomunitarias bienes inversión (4%) -- 1.0 - - Base adquisiciones intracomunitarias bienes inversión (18%) - -- - - 1.0 - - Base adquisiciones intracomunitarias bienes inversión (7%) -- @@ -441,18 +596,71 @@ 1.0 - - Base adquisiciones intracomunitarias bienes inversión (4%) + + Base adquisiciones intracomunitarias bienes inversión (10%) -- 1.0 - - - + + Base adquisiciones intracomunitarias bienes inversión (16%) + -- + + 1.0 + + + Base adquisiciones intracomunitarias bienes inversión (18%) + -- + + 1.0 + + + Base adquisiciones intracomunitarias bienes inversión (21%) + -- + + 1.0 + + + + + Recargo Equivalencia Ded. Base Imponible 0.5% + -- + + 1.0 + + + + Recargo Equivalencia Ded. Base Imponible 1% + -- + + 1.0 + + + + Recargo Equivalencia Ded. Base Imponible 1.4% + -- + + 1.0 + + + + Recargo Equivalencia Ded. Base Imponible 4% + -- + + 1.0 + + + + Recargo Equivalencia Ded. Base Imponible 5.2% + -- + + 1.0 + + + - + IVA deducible (Cuota)- Total a deducir [Mod.303] [37] @@ -467,19 +675,12 @@ 1.0 - - Cuotas soportadas operaciones interiores corrientes (16%) + + Cuotas soportadas operaciones interiores corrientes (4%) -- 1.0 - - Cuotas soportadas operaciones interiores corrientes (18%) - -- - - 1.0 - - Cuotas soportadas operaciones interiores corrientes (7%) -- @@ -492,13 +693,31 @@ 1.0 - - Cuotas soportadas operaciones interiores corrientes (4%) + + Cuotas soportadas operaciones interiores corrientes (10%) -- 1.0 - + + Cuotas soportadas operaciones interiores corrientes (16%) + -- + + 1.0 + + + Cuotas soportadas operaciones interiores corrientes (18%) + -- + + 1.0 + + + Cuotas soportadas operaciones interiores corrientes (21%) + -- + + 1.0 + + Cuotas soportadas operaciones interiores bienes inversión @@ -506,19 +725,12 @@ 1.0 - - Cuotas soportadas operaciones interiores bienes inversión (16%) + + Cuotas soportadas operaciones interiores bienes inversión (4%) -- 1.0 - - Cuotas soportadas operaciones interiores bienes inversión (18%) - -- - - 1.0 - - Cuotas soportadas operaciones interiores bienes inversión (7%) -- @@ -531,13 +743,31 @@ 1.0 - - Cuotas soportadas operaciones interiores bienes inversión (4%) + + Cuotas soportadas operaciones interiores bienes inversión (10%) -- 1.0 - + + Cuotas soportadas operaciones interiores bienes inversión (16%) + -- + + 1.0 + + + Cuotas soportadas operaciones interiores bienes inversión (18%) + -- + + 1.0 + + + Cuotas soportadas operaciones interiores bienes inversión (21%) + -- + + 1.0 + + Cuotas devengadas importaciones bienes corrientes @@ -545,19 +775,12 @@ 1.0 - - Cuotas devengadas importaciones bienes corrientes (16%) + + Cuotas devengadas importaciones bienes corrientes (4%) -- 1.0 - - Cuotas devengadas importaciones bienes corrientes (18%) - -- - - 1.0 - - Cuotas devengadas importaciones bienes corrientes (7%) -- @@ -570,13 +793,31 @@ 1.0 - - Cuotas devengadas importaciones bienes corrientes (4%) + + Cuotas devengadas importaciones bienes corrientes (10%) -- 1.0 - + + Cuotas devengadas importaciones bienes corrientes (16%) + -- + + 1.0 + + + Cuotas devengadas importaciones bienes corrientes (18%) + -- + + 1.0 + + + Cuotas devengadas importaciones bienes corrientes (21%) + -- + + 1.0 + + Cuotas devengadas importaciones bienes inversión @@ -584,19 +825,12 @@ 1.0 - - Cuotas devengadas importaciones bienes inversión (16%) + + Cuotas devengadas importaciones bienes inversión (4%) -- 1.0 - - Cuotas devengadas importaciones bienes inversión (18%) - -- - - 1.0 - - Cuotas devengadas importaciones bienes inversión (7%) -- @@ -609,13 +843,30 @@ 1.0 - - Cuotas devengadas importaciones bienes inversión (4%) + + Cuotas devengadas importaciones bienes inversión (10%) + -- + + 1.0 + + + Cuotas devengadas importaciones bienes inversión (16%) + -- + + 1.0 + + + Cuotas devengadas importaciones bienes inversión (18%) + -- + + 1.0 + + + Cuotas devengadas importaciones bienes inversión (21%) -- 1.0 - En adquisiciones intracomunitarias bienes corrientes @@ -623,6 +874,30 @@ 1.0 + + En adquisiciones intracomunitarias bienes corrientes (4%) + -- + + 1.0 + + + En adquisiciones intracomunitarias bienes corrientes (7%) + -- + + 1.0 + + + En adquisiciones intracomunitarias bienes corrientes (8%) + -- + + 1.0 + + + En adquisiciones intracomunitarias bienes corrientes (10%) + -- + + 1.0 + En adquisiciones intracomunitarias bienes corrientes (16%) -- @@ -635,26 +910,12 @@ 1.0 - - - En adquisiciones intracomunitarias bienes corrientes (7%) + + En adquisiciones intracomunitarias bienes corrientes (21%) -- 1.0 - - En adquisiciones intracomunitarias bienes corrientes (8%) - -- - - 1.0 - - - En adquisiciones intracomunitarias bienes corrientes (4%) - -- - - 1.0 - - En adquisiciones intracomunitarias bienes inversión @@ -662,19 +923,12 @@ 1.0 - - En adquisiciones intracomunitarias bienes inversión (16%) + + En adquisiciones intracomunitarias bienes inversión (4%) -- 1.0 - - En adquisiciones intracomunitarias bienes inversión (18%) - -- - - 1.0 - - En adquisiciones intracomunitarias bienes inversión (7%) -- @@ -687,8 +941,26 @@ 1.0 - - En adquisiciones intracomunitarias bienes inversión (4%) + + En adquisiciones intracomunitarias bienes inversión (10%) + -- + + 1.0 + + + En adquisiciones intracomunitarias bienes inversión (16%) + -- + + 1.0 + + + En adquisiciones intracomunitarias bienes inversión (18%) + -- + + 1.0 + + + En adquisiciones intracomunitarias bienes inversión (21%) -- 1.0 @@ -716,110 +988,42 @@ 1.0 - - - - - - 472004 - - - other - Hacienda Pública. IVA soportado 4% - - - - - 472007 - - - other - Hacienda Pública. IVA soportado 7% - - - - - 472008 - - - other - Hacienda Pública. IVA soportado 8% - - - - - 472016 - - - other - Hacienda Pública. IVA soportado 16% - - - - - 472018 - - - other - Hacienda Pública. IVA soportado 18% - - - - - 477004 - - - other - Hacienda Pública. IVA repercutido 4% - - - - - 477007 - - - other - Hacienda Pública. IVA repercutido 7% - - - - - 477008 - - - other - Hacienda Pública. IVA repercutido 8% - - - - - 477016 - - - other - Hacienda Pública. IVA repercutido 16% - + + + Recargo Equivalencia Ded. Cuota 0.5% + [12] + + 1.0 - - 477018 - - - other - Hacienda Pública. IVA repercutido 18% - + + Recargo Equivalencia Ded. Cuota 1% + [15] + + 1.0 - - - 475001 - - - payable - Hacienda acreedora IVA - + + + Recargo Equivalencia Ded. Cuota 1.4% + [15] + + 1.0 - - + + + Recargo Equivalencia Ded. Cuota 4% + [18] + + 1.0 + + + + Recargo Equivalencia Ded. Cuota 5.2% + [18] + + 1.0 + + @@ -831,8 +1035,8 @@ 4% IVA Soportado (operaciones corrientes) percent - - + + @@ -843,14 +1047,14 @@ purchase - + 4% IVA Soportado (bienes de inversión) percent - - + + @@ -861,14 +1065,14 @@ purchase - + 7% IVA Soportado (operaciones corrientes) percent - - + + @@ -879,14 +1083,14 @@ purchase - + 7% IVA Soportado (bienes de inversión) percent - - + + @@ -897,14 +1101,14 @@ purchase - + 8% IVA Soportado (operaciones corrientes) percent - - + + @@ -915,14 +1119,14 @@ purchase - + 8% IVA Soportado (bienes de inversión) percent - - + + @@ -933,14 +1137,50 @@ purchase - + + + + 10% IVA Soportado (operaciones corrientes) + + percent + + + + + + + + + + + purchase + + + + + 10% IVA Soportado (bienes de inversión) + + percent + + + + + + + + + + + purchase + + 16% IVA Soportado (operaciones corrientes) percent - - + + @@ -951,14 +1191,14 @@ purchase - + 16% IVA Soportado (bienes de inversión) percent - - + + @@ -969,14 +1209,14 @@ purchase - + 18% IVA Soportado (operaciones corrientes) percent - - + + @@ -986,15 +1226,16 @@ purchase + - + 18% IVA Soportado (bienes de inversión) percent - - + + @@ -1005,7 +1246,44 @@ purchase - + + + + 21% IVA Soportado (operaciones corrientes) + + percent + + + + + + + + + + + purchase + + + + + + 21% IVA Soportado (bienes de inversión) + + percent + + + + + + + + + + + purchase + + @@ -1036,15 +1314,15 @@ purchase - + IVA 4% Importaciones bienes corrientes IVA 4% Importaciones bienes corrientes percent - - + + @@ -1061,8 +1339,8 @@ IVA 4% Importaciones bienes de inversión percent - - + + @@ -1073,15 +1351,15 @@ purchase - + IVA 7% Importaciones bienes corrientes IVA 7% Importaciones bienes corrientes percent - - + + @@ -1098,8 +1376,8 @@ IVA 7% Importaciones bienes de inversión percent - - + + @@ -1110,15 +1388,15 @@ purchase - + IVA 8% Importaciones bienes corrientes IVA 8% Importaciones bienes corrientes percent - - + + @@ -1135,8 +1413,8 @@ IVA 8% Importaciones bienes de inversión percent - - + + @@ -1147,15 +1425,53 @@ purchase - + + + + IVA 10% Importaciones bienes corrientes + IVA 10% Importaciones bienes corrientes + + percent + + + + + + + + + + + purchase + + + + IVA 10% Importaciones bienes de inversión + IVA 10% Importaciones bienes de inversión + + percent + + + + + + + + + + + purchase + + + IVA 16% Importaciones bienes corrientes IVA 16% Importaciones bienes corrientes percent - - + + @@ -1172,8 +1488,8 @@ IVA 16% Importaciones bienes de inversión percent - - + + @@ -1184,15 +1500,15 @@ purchase - + IVA 18% Importaciones bienes corrientes IVA 18% Importaciones bienes corrientes percent - - + + @@ -1209,8 +1525,8 @@ IVA 18% Importaciones bienes de inversión percent - - + + @@ -1221,7 +1537,44 @@ purchase - + + + + IVA 21% Importaciones bienes corrientes + IVA 21% Importaciones bienes corrientes + + percent + + + + + + + + + + + purchase + + + + IVA 21% Importaciones bienes de inversión + IVA 21% Importaciones bienes de inversión + + percent + + + + + + + + + + + purchase + + @@ -1269,16 +1622,16 @@ percent - - + + - + - + purchase @@ -1287,8 +1640,8 @@ percent - - + + @@ -1299,7 +1652,7 @@ purchase - + IVA 18% Inversión del sujeto pasivo @@ -1333,16 +1686,16 @@ percent - - + + - + - + purchase @@ -1351,8 +1704,8 @@ percent - - + + @@ -1363,16 +1716,81 @@ purchase - - + + + + + IVA 21% Inversión del sujeto pasivo + IVA 21% Inversión del sujeto pasivo + + percent + + + + + + purchase + + + + IVA 21% Inversión del sujeto pasivo (1) + + + percent + + + + + + + purchase + + + + IVA 21% Inversión del sujeto pasivo (2) + + + percent + + + + + + + + + + + purchase + + + + IVA 21% Inversión del sujeto pasivo (3) + + + percent + + + + + + + + + + + purchase + + + IVA 4% percent - - + + @@ -1383,14 +1801,14 @@ sale - + IVA 7% percent - - + + @@ -1401,14 +1819,14 @@ sale - + IVA 8% percent - - + + @@ -1419,14 +1837,32 @@ sale - + + + + IVA 10% + + percent + + + + + + + + + + + sale + + IVA 16% percent - - + + @@ -1437,14 +1873,14 @@ sale - + IVA 18% percent - - + + @@ -1454,17 +1890,37 @@ sale + - - + + + + IVA 21% + + percent + + + + + + + + + + + sale + + + + - 0.50% Recargo Equivalencia + 0.50% Recargo Equivalencia Ventas percent - - + + @@ -1475,14 +1931,14 @@ sale - + - 1% Recargo Equivalencia + 1% Recargo Equivalencia Ventas percent - - + + @@ -1493,14 +1949,32 @@ sale - + + + + 1.4% Recargo Equivalencia Ventas + + percent + + + + + + + + + + + sale + + - 4% Recargo Equivalencia + 4% Recargo Equivalencia Ventas percent - - + + @@ -1511,10 +1985,118 @@ sale - - + + + + 5.2% Recargo Equivalencia Ventas + + percent + + + + + + + + + + + sale + + + + + 0.50% Recargo Equivalencia Compras + + percent + + + + + + + + + + + purchase + + + + + 1% Recargo Equivalencia Compras + + percent + + + + + + + + + + + purchase + + + + + 1.4% Recargo Equivalencia Compras + + percent + + + + + + + + + + + purchase + + + + + 4% Recargo Equivalencia Compras + + percent + + + + + + + + + + + purchase + + + + + 5.2% Recargo Equivalencia Compras + + percent + + + + + + + + + + + purchase + + + - + @@ -1528,366 +2110,11 @@ sale - - + + - - - IVA 16% Intracomunitario. Bienes corrientes - IVA 16% Intracomunitario. Bienes corrientes - - percent - - purchase - - - - - IVA 16% Intracomunitario. Bienes corrientes (1) - - percent - - - - - - - - - purchase - - - - - IVA 16% Intracomunitario. Bienes corrientes (2) - - percent - - - - - - - - - - - purchase - - - - - IVA 18% Intracomunitario. Bienes corrientes - IVA 18% Intracomunitario. Bienes corrientes - - percent - - purchase - - - - - IVA 18% Intracomunitario. Bienes corrientes (1) - - percent - - - - - - - - - purchase - - - - - IVA 18% Intracomunitario. Bienes corrientes (2) - - percent - - - - - - - - - - - purchase - - - - - - IVA 16% Intracomunitario. Bienes de inversión - IVA 16% Intracomunitario. Bienes de inversión - - percent - - purchase - - - - - IVA 16% Intracomunitario. Bienes de inversión (1) - - percent - - - - - - - - - purchase - - - - - IVA 16% Intracomunitario. Bienes de inversión (2) - - percent - - - - - - - - - - purchase - - - - IVA 18% Intracomunitario. Bienes de inversión - IVA 18% Intracomunitario. Bienes de inversión - - percent - - purchase - - - - - IVA 18% Intracomunitario. Bienes de inversión (1) - - percent - - - - - - - - - purchase - - - - - IVA 18% Intracomunitario. Bienes de inversión (2) - - percent - - - - - - - - - - purchase - - - - - IVA 7% Intracomunitario. Bienes corrientes - IVA 7% Intracomunitario. Bienes corrientes - - percent - - purchase - - - - - IVA 7% Intracomunitario. Bienes corrientes (1) - - percent - - - - - - - - - purchase - - - - - IVA 7% Intracomunitario. Bienes corrientes (2) - - percent - - - - - - - - - - purchase - - - - - IVA 7% Intracomunitario. Bienes de inversión - IVA 7% Intracomunitario. Bienes de inversión - - percent - - purchase - - - - - IVA 7% Intracomunitario. Bienes de inversión (1) - - percent - - - - - - - - - purchase - - - - - IVA 7% Intracomunitario. Bienes de inversión (2) - - percent - - - - - - - - - - purchase - - - - - IVA 8% Intracomunitario. Bienes corrientes - IVA 8% Intracomunitario. Bienes corrientes - - percent - - purchase - - - - - IVA 8% Intracomunitario. Bienes corrientes (1) - - percent - - - - - - - - - purchase - - - - - IVA 8% Intracomunitario. Bienes corrientes (2) - - percent - - - - - - - - - - purchase - - - - - IVA 8% Intracomunitario. Bienes de inversión - IVA 8% Intracomunitario. Bienes de inversión - - percent - - purchase - - - - - IVA 8% Intracomunitario. Bienes de inversión (1) - - percent - - - - - - - - - purchase - - - - - IVA 8% Intracomunitario. Bienes de inversión (2) - - percent - - - - - - - - - - purchase - - - + IVA 4% Intracomunitario. Bienes corrientes IVA 4% Intracomunitario. Bienes corrientes @@ -1902,8 +2129,8 @@ IVA 4% Intracomunitario. Bienes corrientes (1) percent - - + + @@ -1918,8 +2145,8 @@ IVA 4% Intracomunitario. Bienes corrientes (2) percent - - + + @@ -1945,8 +2172,8 @@ IVA 4% Intracomunitario. Bienes de inversión (1) percent - - + + @@ -1961,8 +2188,8 @@ IVA 4% Intracomunitario. Bienes de inversión (2) percent - - + + @@ -1972,7 +2199,538 @@ purchase - + + + + IVA 7% Intracomunitario. Bienes corrientes + IVA 7% Intracomunitario. Bienes corrientes + + percent + + purchase + + + + + IVA 7% Intracomunitario. Bienes corrientes (1) + + percent + + + + + + + + + purchase + + + + + IVA 7% Intracomunitario. Bienes corrientes (2) + + percent + + + + + + + + + + purchase + + + + + IVA 7% Intracomunitario. Bienes de inversión + IVA 7% Intracomunitario. Bienes de inversión + + percent + + purchase + + + + + IVA 7% Intracomunitario. Bienes de inversión (1) + + percent + + + + + + + + + purchase + + + + + IVA 7% Intracomunitario. Bienes de inversión (2) + + percent + + + + + + + + + + purchase + + + + + IVA 8% Intracomunitario. Bienes corrientes + IVA 8% Intracomunitario. Bienes corrientes + + percent + + purchase + + + + + IVA 8% Intracomunitario. Bienes corrientes (1) + + percent + + + + + + + + + purchase + + + + + IVA 8% Intracomunitario. Bienes corrientes (2) + + percent + + + + + + + + + + purchase + + + + + IVA 8% Intracomunitario. Bienes de inversión + IVA 8% Intracomunitario. Bienes de inversión + + percent + + purchase + + + + + IVA 8% Intracomunitario. Bienes de inversión (1) + + percent + + + + + + + + + purchase + + + + + IVA 8% Intracomunitario. Bienes de inversión (2) + + percent + + + + + + + + + + purchase + + + + + IVA 10% Intracomunitario. Bienes corrientes + IVA 10% Intracomunitario. Bienes corrientes + + percent + + purchase + + + + + IVA 10% Intracomunitario. Bienes corrientes (1) + + percent + + + + + + + + + purchase + + + + + IVA 10% Intracomunitario. Bienes corrientes (2) + + percent + + + + + + + + + + purchase + + + + + IVA 10% Intracomunitario. Bienes de inversión + IVA 10% Intracomunitario. Bienes de inversión + + percent + + purchase + + + + + IVA 10% Intracomunitario. Bienes de inversión (1) + + percent + + + + + + + + + purchase + + + + + IVA 10% Intracomunitario. Bienes de inversión (2) + + percent + + + + + + + + + + purchase + + + + + IVA 16% Intracomunitario. Bienes corrientes + IVA 16% Intracomunitario. Bienes corrientes + + percent + + purchase + + + + + IVA 16% Intracomunitario. Bienes corrientes (1) + + percent + + + + + + + + + purchase + + + + + IVA 16% Intracomunitario. Bienes corrientes (2) + + percent + + + + + + + + + + + purchase + + + + + IVA 16% Intracomunitario. Bienes de inversión + IVA 16% Intracomunitario. Bienes de inversión + + percent + + purchase + + + + + IVA 16% Intracomunitario. Bienes de inversión (1) + + percent + + + + + + + + + purchase + + + + + IVA 16% Intracomunitario. Bienes de inversión (2) + + percent + + + + + + + + + + purchase + + + + + IVA 18% Intracomunitario. Bienes corrientes + IVA 18% Intracomunitario. Bienes corrientes + + percent + + purchase + + + + + IVA 18% Intracomunitario. Bienes corrientes (1) + + percent + + + + + + + + + purchase + + + + + IVA 18% Intracomunitario. Bienes corrientes (2) + + percent + + + + + + + + + + + purchase + + + + + + + IVA 18% Intracomunitario. Bienes de inversión + IVA 18% Intracomunitario. Bienes de inversión + + percent + + purchase + + + + + IVA 18% Intracomunitario. Bienes de inversión (1) + + percent + + + + + + + + + purchase + + + + + IVA 18% Intracomunitario. Bienes de inversión (2) + + percent + + + + + + + + + + purchase + + + + + IVA 21% Intracomunitario. Bienes corrientes + IVA 21% Intracomunitario. Bienes corrientes + + percent + + purchase + + + + + IVA 21% Intracomunitario. Bienes corrientes (1) + + percent + + + + + + + + + purchase + + + + + IVA 21% Intracomunitario. Bienes corrientes (2) + + percent + + + + + + + + + + + purchase + + + + + IVA 21% Intracomunitario. Bienes de inversión + IVA 21% Intracomunitario. Bienes de inversión + + percent + + purchase + + + + + IVA 21% Intracomunitario. Bienes de inversión (1) + + percent + + + + + + + + + purchase + + + + + IVA 21% Intracomunitario. Bienes de inversión (2) + + percent + + + + + + + + + + purchase + + + - + - + IRPF Retenciones practicadas Base Imponible @@ -1990,56 +2748,70 @@ 1.0 - + IRPF Retenciones practicadas Base Imponible 1% B.IRPF1 1.0 - + IRPF Retenciones practicadas Base Imponible 2% B.IRPF2 1.0 - + IRPF Retenciones practicadas Base Imponible 7% B.IRPF7 1.0 - + + + IRPF Retenciones practicadas Base Imponible 9% + B.IRPF9 + + 1.0 + + IRPF Retenciones practicadas Base Imponible 15% B.IRPF15 1.0 - + IRPF Retenciones practicadas Base Imponible 18% B.IRPF18 1.0 - + IRPF Retenciones practicadas Base Imponible 19% B.IRPF19 1.0 - + + + IRPF Retenciones practicadas Base Imponible 20% + B.IRPF20 + + 1.0 + + IRPF Retenciones practicadas Base Imponible 21% B.IRPF21 1.0 - + IRPF Retenciones practicadas Total Cuota @@ -2047,128 +2819,78 @@ 1.0 - + IRPF Retenciones practicadas Cuota 1% IRPF1 1.0 - + IRPF Retenciones practicadas Cuota 2% IRPF2 1.0 - + IRPF Retenciones practicadas Cuota 7% IRPF7 1.0 - + + + IRPF Retenciones practicadas Cuota 9% + IRPF9 + + 1.0 + + IRPF Retenciones practicadas Cuota 15% IRPF15 1.0 - + IRPF Retenciones practicadas Cuota 18% IRPF18 1.0 - + IRPF Retenciones practicadas Cuota 19% IRPF19 1.0 - + + + IRPF Retenciones practicadas Cuota 20% + IRPF20 + + 1.0 + + IRPF Retenciones practicadas Cuota 21% IRPF21 1.0 - - - - 475101 - - - other - Hacienda Pública. Retenciones empresarios módulos 1% - - - - - 475102 - - - other - Hacienda Pública. Retenciones act. agrícolas, ganaderas, forestales 2% - - - - - 475107 - - - other - Hacienda Pública. Retenciones act. profesionales 7% - - - - - 475115 - - - other - Hacienda Pública. Retenciones act. profesionales 15% - - - - - 475118 - - - other - Hacienda Pública. Retenciones arrendamientos, cap. mobiliario 18% - - - - - 475119 - - - other - Hacienda Pública. Retenciones arrendamientos, cap. mobiliario 19% - - - - - 475121 - - - other - Hacienda Pública. Retenciones arrendamientos, cap. mobiliario 21% - - - + Retenciones IRPF 1% percent - - + + @@ -2179,14 +2901,14 @@ purchase - + Retenciones IRPF 2% percent - - + + @@ -2197,14 +2919,14 @@ purchase - + Retenciones IRPF 7% percent - - + + @@ -2215,14 +2937,32 @@ purchase - + + + + Retenciones IRPF 9% + + percent + + + + + + + + + + + purchase + + Retenciones IRPF 15% percent - - + + @@ -2233,14 +2973,14 @@ purchase - + Retenciones IRPF 18% percent - - + + @@ -2251,14 +2991,14 @@ purchase - + Retenciones IRPF 19% percent - - + + @@ -2269,14 +3009,32 @@ purchase - + + + + Retenciones IRPF 20% + + percent + + + + + + + + + + + purchase + + Retenciones IRPF 21% percent - - + + @@ -2287,9 +3045,9 @@ purchase - + - + IRPF Retenciones a cuenta Base Imponible @@ -2297,56 +3055,70 @@ 1.0 - + IRPF Retenciones a cuenta Base Imponible 1% B.IRPF1 AC 1.0 - + IRPF Retenciones a cuenta Base Imponible 2% B.IRPF2 AC 1.0 - + IRPF Retenciones a cuenta Base Imponible 7% B.IRPF7 AC 1.0 - + + + IRPF Retenciones a cuenta Base Imponible 9% + B.IRPF9 AC + + 1.0 + + IRPF Retenciones a cuenta Base Imponible 15% B.IRPF15 AC 1.0 - + IRPF Retenciones a cuenta Base Imponible 18% B.IRPF18 AC 1.0 - + IRPF Retenciones a cuenta Base Imponible 19% B.IRPF19 AC 1.0 - + + + IRPF Retenciones a cuenta Base Imponible 20% + B.IRPF20 AC + + 1.0 + + IRPF Retenciones a cuenta Base Imponible 21% B.IRPF21 AC 1.0 - + IRPF Retenciones a cuenta Total Cuota @@ -2354,128 +3126,78 @@ 1.0 - + IRPF Retenciones a cuenta Cuota 1% IRPF1 AC 1.0 - + IRPF Retenciones a cuenta Cuota 2% IRPF2 AC 1.0 - + IRPF Retenciones a cuenta Cuota 7% IRPF7 AC 1.0 - + + + IRPF Retenciones a cuenta Cuota 9% + IRPF9 AC + + 1.0 + + IRPF Retenciones a cuenta Cuota 15% IRPF15 AC 1.0 - + IRPF Retenciones a cuenta Cuota 18% IRPF18 AC 1.0 - + IRPF Retenciones a cuenta Cuota 19% IRPF19 AC 1.0 - + + + IRPF Retenciones a cuenta Cuota 20% + IRPF20 AC + + 1.0 + + IRPF Retenciones a cuenta Cuota 21% IRPF21 AC 1.0 - - - - 473001 - - - other - Hacienda Pública. Retenciones a cuenta empresarios módulos 1% - - - - - 473002 - - - other - Hacienda Pública. Retenciones a cuenta act. agrícolas, ganaderas, forestales 2% - - - - 473007 - - - other - Hacienda Pública. Retenciones a cuenta act. profesionales 7% - - - - - 473015 - - - other - Hacienda Pública. Retenciones a cuenta act. profesionales 15% - - - - - 473018 - - - other - Hacienda Pública. Retenciones a cuenta arrendamientos, cap. mobiliario 18% - - - - - 473019 - - - other - Hacienda Pública. Retenciones a cuenta arrendamientos, cap. mobiliario 19% - - - - - 473021 - - - other - Hacienda Pública. Retenciones a cuenta arrendamientos, cap. mobiliario 21% - - - Retenciones a cuenta IRPF 1% percent - - + + @@ -2486,14 +3208,14 @@ sale - + Retenciones a cuenta IRPF 2% percent - - + + @@ -2504,14 +3226,14 @@ sale - + Retenciones a cuenta IRPF 7% percent - - + + @@ -2522,14 +3244,32 @@ sale - + + + + Retenciones a cuenta IRPF 9% + + percent + + + + + + + + + + + sale + + Retenciones a cuenta IRPF 15% percent - - + + @@ -2540,14 +3280,14 @@ sale - + Retenciones a cuenta IRPF 18% percent - - + + @@ -2558,14 +3298,14 @@ sale - + Retenciones a cuenta IRPF 19% percent - - + + @@ -2576,14 +3316,32 @@ sale - + + + + Retenciones a cuenta IRPF 20% + + percent + + + + + + + + + + + sale + + Retenciones a cuenta IRPF 21% percent - - + + diff --git a/addons/l10n_es/taxes_data_pymes.xml b/addons/l10n_es/taxes_data_pymes.xml index 7467dbb9596..f48d46d951a 100644 --- a/addons/l10n_es/taxes_data_pymes.xml +++ b/addons/l10n_es/taxes_data_pymes.xml @@ -1,9 +1,10 @@ - + - + + - - - + Ignacio Ibeas (Acysos) - ignacio@acysos.com (2011-05-06) + Añadido Recargos de equivalencia para venta y compra + + Pedro M. Baeza (Serv. Tecnol. Avanzados) - pedro.baeza@serviciosbaeza.com (2013-01-30) + Limpieza de subcuentas de impuestos y corrección de inversión de sujeto pasivo + + --> + + - - + + - + @@ -48,44 +54,103 @@ 1.0 - - - + + + + Base adquisiciones exentas + + -- + 1.0 + + + + Base ventas exentas + -- + + 1.0 + + + + + + IVA Soportado exento (operaciones corrientes) + + percent + + + + + + + purchase + + + + + + IVA Exento + + percent + + + + + + + sale + + - + Régimen general IVA Devengado. Base Imponible 4% [01] 1.0 - + Régimen general IVA Devengado. Base Imponible 7% [04] 1.0 + Régimen general IVA Devengado. Base Imponible 8% [04] 1.0 - + + + Régimen general IVA Devengado. Base Imponible 10% + [04] + + 1.0 + + Régimen general IVA Devengado. Base Imponible 16% [07] 1.0 + Régimen general IVA Devengado. Base Imponible 18% [07] 1.0 - + + + Régimen general IVA Devengado. Base Imponible 21% + [07] + + 1.0 + + - + Recargo Equivalencia Base Imponible 0.5% [10] 1.0 - + Recargo Equivalencia Base Imponible 1% [13] 1.0 - + + + Recargo Equivalencia Base Imponible 1.4% + [13] + + 1.0 + + Recargo Equivalencia Base Imponible 4% [16] 1.0 - - + + + Recargo Equivalencia Base Imponible 5.2% + [16] + + 1.0 + + - + Adquisiciones intracomunitarias. Base Imponible [19] 1.0 - + - - + + - - + + IVA Cuota total devengada [21] 1.0 - + Régimen general IVA Devengado. Cuota 4% [03] 1.0 - + Régimen general IVA Devengado. Cuota 7% [06] 1.0 - + Régimen general IVA Devengado. Cuota 8% [06] 1.0 - + + + Régimen general IVA Devengado. Cuota 10% + [06] + + 1.0 + + Régimen general IVA Devengado. Cuota 16% [09] @@ -173,7 +258,14 @@ 1.0 - + + + Régimen general IVA Devengado. Cuota 21% + [09] + + 1.0 + + - + Recargo Equivalencia. Cuota 0.5% [12] 1.0 - + Recargo Equivalencia. Cuota 1% [15] 1.0 - + + + Recargo Equivalencia. Cuota 1.4% + [15] + + 1.0 + + Recargo Equivalencia. Cuota 4% [18] 1.0 - - + + + Recargo Equivalencia. Cuota 5.2% + [18] + + 1.0 + + + - + Adquisiciones intracomunitarias. Cuota [20] 1.0 - - - - - + + + + + - - + + @@ -230,7 +336,7 @@ 1.0 - + Base operaciones interiores corrientes @@ -238,19 +344,12 @@ 1.0 - - Base operaciones interiores corrientes (16%) + + Base operaciones interiores corrientes (4%) -- 1.0 - - Base operaciones interiores corrientes (18%) - -- - - 1.0 - - Base operaciones interiores corrientes (7%) -- @@ -263,13 +362,31 @@ 1.0 - - Base operaciones interiores corrientes (4%) + + Base operaciones interiores corrientes (10%) -- 1.0 - + + Base operaciones interiores corrientes (16%) + -- + + 1.0 + + + Base operaciones interiores corrientes (18%) + -- + + 1.0 + + + Base operaciones interiores corrientes (21%) + -- + + 1.0 + + Base operaciones interiores bienes inversión @@ -277,48 +394,79 @@ 1.0 - - Base operaciones interiores bienes inversión (16%) - -- - - 1.0 - - - - Base operaciones interiores bienes inversión (18%) - -- - - 1.0 - - - - Base operaciones interiores bienes inversión (7%) - -- - - 1.0 - - - - Base operaciones interiores bienes inversión (8%) - -- - - 1.0 - - Base operaciones interiores bienes inversión (4%) -- 1.0 - - + + Base operaciones interiores bienes inversión (7%) + -- + + 1.0 + + + Base operaciones interiores bienes inversión (8%) + -- + + 1.0 + + + Base operaciones interiores bienes inversión (10%) + -- + + 1.0 + + + Base operaciones interiores bienes inversión (16%) + -- + + 1.0 + + + Base operaciones interiores bienes inversión (18%) + -- + + 1.0 + + + Base operaciones interiores bienes inversión (21%) + -- + + 1.0 + + Base importaciones bienes corrientes [26] 1.0 + + + Base importaciones bienes corrientes (4%) + -- + + 1.0 + + + Base importaciones bienes corrientes (7%) + -- + + 1.0 + + + Base importaciones bienes corrientes (8%) + -- + + 1.0 + + + Base importaciones bienes corrientes (10%) + -- + + 1.0 Base importaciones bienes corrientes (16%) @@ -332,26 +480,13 @@ 1.0 - - - Base importaciones bienes corrientes (7%) + + Base importaciones bienes corrientes (21%) -- 1.0 - - Base importaciones bienes corrientes (8%) - -- - - 1.0 - - - Base importaciones bienes corrientes (4%) - -- - - 1.0 - - + Base importaciones bienes inversión @@ -359,19 +494,12 @@ 1.0 - - Base importaciones bienes inversión (16%) + + Base importaciones bienes inversión (4%) -- 1.0 - - Base importaciones bienes inversión (18%) - -- - - 1.0 - - Base importaciones bienes inversión (7%) -- @@ -384,13 +512,30 @@ 1.0 - - Base importaciones bienes inversión (4%) + + Base importaciones bienes inversión (10%) + -- + + 1.0 + + + Base importaciones bienes inversión (16%) + -- + + 1.0 + + + Base importaciones bienes inversión (18%) + -- + + 1.0 + + + Base importaciones bienes inversión (21%) -- 1.0 - Base adquisiciones intracomunitarias bienes corrientes @@ -398,19 +543,12 @@ 1.0 - - Base adquisiciones intracomunitarias bienes corrientes (16%) + + Base adquisiciones intracomunitarias bienes corrientes (4%) -- 1.0 - - Base adquisiciones intracomunitarias bienes corrientes (18%) - -- - - 1.0 - - Base adquisiciones intracomunitarias bienes corrientes (7%) -- @@ -423,13 +561,30 @@ 1.0 - - Base adquisiciones intracomunitarias bienes corrientes (4%) + + Base adquisiciones intracomunitarias bienes corrientes (10%) + -- + + 1.0 + + + Base adquisiciones intracomunitarias bienes corrientes (16%) + -- + + 1.0 + + + Base adquisiciones intracomunitarias bienes corrientes (18%) + -- + + 1.0 + + + Base adquisiciones intracomunitarias bienes corrientes (21%) -- 1.0 - Base adquisiciones intracomunitarias bienes inversión @@ -437,6 +592,30 @@ 1.0 + + Base adquisiciones intracomunitarias bienes inversión (4%) + -- + + 1.0 + + + Base adquisiciones intracomunitarias bienes inversión (7%) + -- + + 1.0 + + + Base adquisiciones intracomunitarias bienes inversión (8%) + -- + + 1.0 + + + Base adquisiciones intracomunitarias bienes inversión (10%) + -- + + 1.0 + Base adquisiciones intracomunitarias bienes inversión (16%) -- @@ -449,31 +628,53 @@ 1.0 - - - Base adquisiciones intracomunitarias bienes inversión (7%) - -- - - 1.0 - - - Base adquisiciones intracomunitarias bienes inversión (8%) - -- - - 1.0 - - - Base adquisiciones intracomunitarias bienes inversión (4%) + + Base adquisiciones intracomunitarias bienes inversión (21%) -- 1.0 - - + + + Recargo Equivalencia Ded. Base Imponible 0.5% + -- + + 1.0 + + + + Recargo Equivalencia Ded. Base Imponible 1% + -- + + 1.0 + + + + Recargo Equivalencia Ded. Base Imponible 1.4% + -- + + 1.0 + + + + Recargo Equivalencia Ded. Base Imponible 4% + -- + + 1.0 + + + + Recargo Equivalencia Ded. Base Imponible 5.2% + -- + + 1.0 + + + - + IVA deducible (Cuota)- Total a deducir [Mod.303] [37] @@ -488,19 +689,12 @@ 1.0 - - Cuotas soportadas operaciones interiores corrientes (16%) + + Cuotas soportadas operaciones interiores corrientes (4%) -- 1.0 - - Cuotas soportadas operaciones interiores corrientes (18%) - -- - - 1.0 - - Cuotas soportadas operaciones interiores corrientes (7%) -- @@ -513,13 +707,30 @@ 1.0 - - Cuotas soportadas operaciones interiores corrientes (4%) + + Cuotas soportadas operaciones interiores corrientes (10%) + -- + + 1.0 + + + Cuotas soportadas operaciones interiores corrientes (16%) + -- + + 1.0 + + + Cuotas soportadas operaciones interiores corrientes (18%) + -- + + 1.0 + + + Cuotas soportadas operaciones interiores corrientes (21%) -- 1.0 - Cuotas soportadas operaciones interiores bienes inversión @@ -527,19 +738,12 @@ 1.0 - - Cuotas soportadas operaciones interiores bienes inversión (16%) + + Cuotas soportadas operaciones interiores bienes inversión (4%) -- 1.0 - - Cuotas soportadas operaciones interiores bienes inversión (18%) - -- - - 1.0 - - Cuotas soportadas operaciones interiores bienes inversión (7%) -- @@ -552,13 +756,30 @@ 1.0 - - Cuotas soportadas operaciones interiores bienes inversión (4%) + + Cuotas soportadas operaciones interiores bienes inversión (10%) + -- + + 1.0 + + + Cuotas soportadas operaciones interiores bienes inversión (16%) + -- + + 1.0 + + + Cuotas soportadas operaciones interiores bienes inversión (18%) + -- + + 1.0 + + + Cuotas soportadas operaciones interiores bienes inversión (21%) -- 1.0 - Cuotas devengadas importaciones bienes corrientes @@ -566,19 +787,12 @@ 1.0 - - Cuotas devengadas importaciones bienes corrientes (16%) + + Cuotas devengadas importaciones bienes corrientes (4%) -- 1.0 - - Cuotas devengadas importaciones bienes corrientes (18%) - -- - - 1.0 - - Cuotas devengadas importaciones bienes corrientes (7%) -- @@ -591,13 +805,30 @@ 1.0 - - Cuotas devengadas importaciones bienes corrientes (4%) + + Cuotas devengadas importaciones bienes corrientes (10%) + -- + + 1.0 + + + Cuotas devengadas importaciones bienes corrientes (16%) + -- + + 1.0 + + + Cuotas devengadas importaciones bienes corrientes (18%) + -- + + 1.0 + + + Cuotas devengadas importaciones bienes corrientes (21%) -- 1.0 - Cuotas devengadas importaciones bienes inversión @@ -605,19 +836,12 @@ 1.0 - - Cuotas devengadas importaciones bienes inversión (16%) + + Cuotas devengadas importaciones bienes inversión (4%) -- 1.0 - - Cuotas devengadas importaciones bienes inversión (18%) - -- - - 1.0 - - Cuotas devengadas importaciones bienes inversión (7%) -- @@ -630,13 +854,30 @@ 1.0 - - Cuotas devengadas importaciones bienes inversión (4%) + + Cuotas devengadas importaciones bienes inversión (10%) + -- + + 1.0 + + + Cuotas devengadas importaciones bienes inversión (16%) + -- + + 1.0 + + + Cuotas devengadas importaciones bienes inversión (18%) + -- + + 1.0 + + + Cuotas devengadas importaciones bienes inversión (21%) -- 1.0 - En adquisiciones intracomunitarias bienes corrientes @@ -644,19 +885,12 @@ 1.0 - - En adquisiciones intracomunitarias bienes corrientes (16%) + + En adquisiciones intracomunitarias bienes corrientes (4%) -- 1.0 - - En adquisiciones intracomunitarias bienes corrientes (18%) - -- - - 1.0 - - En adquisiciones intracomunitarias bienes corrientes (7%) -- @@ -669,13 +903,30 @@ 1.0 - - En adquisiciones intracomunitarias bienes corrientes (4%) + + En adquisiciones intracomunitarias bienes corrientes (10%) + -- + + 1.0 + + + En adquisiciones intracomunitarias bienes corrientes (16%) + -- + + 1.0 + + + En adquisiciones intracomunitarias bienes corrientes (18%) + -- + + 1.0 + + + En adquisiciones intracomunitarias bienes corrientes (21%) -- 1.0 - En adquisiciones intracomunitarias bienes inversión @@ -683,19 +934,12 @@ 1.0 - - En adquisiciones intracomunitarias bienes inversión (16%) + + En adquisiciones intracomunitarias bienes inversión (4%) -- 1.0 - - En adquisiciones intracomunitarias bienes inversión (18%) - -- - - 1.0 - - En adquisiciones intracomunitarias bienes inversión (7%) -- @@ -708,13 +952,30 @@ 1.0 - - En adquisiciones intracomunitarias bienes inversión (4%) + + En adquisiciones intracomunitarias bienes inversión (10%) + -- + + 1.0 + + + En adquisiciones intracomunitarias bienes inversión (16%) + -- + + 1.0 + + + En adquisiciones intracomunitarias bienes inversión (18%) + -- + + 1.0 + + + En adquisiciones intracomunitarias bienes inversión (21%) -- 1.0 - Entregas Intracomunitarias @@ -737,109 +998,42 @@ 1.0 - - - + + + Recargo Equivalencia Ded. Cuota 0.5% + [12] + + 1.0 + - - 472004 - - - other - Hacienda Pública. IVA soportado 4% - + + Recargo Equivalencia Ded. Cuota 1% + [15] + + 1.0 - - - 472007 - - - other - Hacienda Pública. IVA soportado 7% - + + + Recargo Equivalencia Ded. Cuota 1.4% + [15] + + 1.0 - - - 472008 - - - other - Hacienda Pública. IVA soportado 8% - + + + Recargo Equivalencia Ded. Cuota 4% + [18] + + 1.0 - - - 472016 - - - other - Hacienda Pública. IVA soportado 16% - + + + Recargo Equivalencia Ded. Cuota 5.2% + [18] + + 1.0 - - - 472018 - - - other - Hacienda Pública. IVA soportado 18% - - - - - 477004 - - - other - Hacienda Pública. IVA repercutido 4% - - - - - 477007 - - - other - Hacienda Pública. IVA repercutido 7% - - - - 477008 - - - other - Hacienda Pública. IVA repercutido 8% - - - - - 477016 - - - other - Hacienda Pública. IVA repercutido 16% - - - - - 477018 - - - other - Hacienda Pública. IVA repercutido 18% - - - - - 475001 - - - payable - Hacienda acreedora IVA - - - - + @@ -851,8 +1045,8 @@ 4% IVA Soportado (operaciones corrientes) percent - - + + @@ -863,14 +1057,14 @@ purchase - + 4% IVA Soportado (bienes de inversión) percent - - + + @@ -881,14 +1075,14 @@ purchase - + 7% IVA Soportado (operaciones corrientes) percent - - + + @@ -899,14 +1093,14 @@ purchase - + 7% IVA Soportado (bienes de inversión) percent - - + + @@ -917,14 +1111,14 @@ purchase - + 8% IVA Soportado (operaciones corrientes) percent - - + + @@ -935,14 +1129,14 @@ purchase - + 8% IVA Soportado (bienes de inversión) percent - - + + @@ -953,14 +1147,50 @@ purchase - + + + + 10% IVA Soportado (operaciones corrientes) + + percent + + + + + + + + + + + purchase + + + + + 10% IVA Soportado (bienes de inversión) + + percent + + + + + + + + + + + purchase + + 16% IVA Soportado (operaciones corrientes) percent - - + + @@ -971,14 +1201,14 @@ purchase - + 16% IVA Soportado (bienes de inversión) percent - - + + @@ -989,14 +1219,14 @@ purchase - + 18% IVA Soportado (operaciones corrientes) percent - - + + @@ -1006,15 +1236,16 @@ purchase + - + 18% IVA Soportado (bienes de inversión) percent - - + + @@ -1025,7 +1256,44 @@ purchase - + + + + 21% IVA Soportado (operaciones corrientes) + + percent + + + + + + + + + + + purchase + + + + + + 21% IVA Soportado (bienes de inversión) + + percent + + + + + + + + + + + purchase + + @@ -1056,15 +1324,15 @@ purchase - + IVA 4% Importaciones bienes corrientes IVA 4% Importaciones bienes corrientes percent - - + + @@ -1081,8 +1349,8 @@ IVA 4% Importaciones bienes de inversión percent - - + + @@ -1093,15 +1361,15 @@ purchase - + IVA 7% Importaciones bienes corrientes IVA 7% Importaciones bienes corrientes percent - - + + @@ -1118,8 +1386,8 @@ IVA 7% Importaciones bienes de inversión percent - - + + @@ -1130,15 +1398,15 @@ purchase - + IVA 8% Importaciones bienes corrientes IVA 8% Importaciones bienes corrientes percent - - + + @@ -1155,8 +1423,8 @@ IVA 8% Importaciones bienes de inversión percent - - + + @@ -1167,15 +1435,52 @@ purchase - + + + + IVA 10% Importaciones bienes corrientes + IVA 10% Importaciones bienes corrientes + + percent + + + + + + + + + + + purchase + + + + IVA 10% Importaciones bienes de inversión + IVA 10% Importaciones bienes de inversión + + percent + + + + + + + + + + + purchase + + IVA 16% Importaciones bienes corrientes IVA 16% Importaciones bienes corrientes percent - - + + @@ -1192,8 +1497,8 @@ IVA 16% Importaciones bienes de inversión percent - - + + @@ -1204,15 +1509,15 @@ purchase - + IVA 18% Importaciones bienes corrientes IVA 18% Importaciones bienes corrientes percent - - + + @@ -1229,8 +1534,8 @@ IVA 18% Importaciones bienes de inversión percent - - + + @@ -1241,7 +1546,42 @@ purchase - + + + IVA 21% Importaciones bienes corrientes + IVA 21% Importaciones bienes corrientes + + percent + + + + + + + + + + + purchase + + + + IVA 21% Importaciones bienes de inversión + IVA 21% Importaciones bienes de inversión + + percent + + + + + + + + + + + purchase + @@ -1255,7 +1595,7 @@ sale - + @@ -1290,16 +1630,16 @@ percent - - + + - + - + purchase @@ -1308,8 +1648,8 @@ percent - - + + @@ -1320,7 +1660,7 @@ purchase - + IVA 18% Inversión del sujeto pasivo @@ -1354,16 +1694,16 @@ percent - - + + - + - + purchase @@ -1372,8 +1712,8 @@ percent - - + + @@ -1384,15 +1724,79 @@ purchase - + + + IVA 21% Inversión del sujeto pasivo + IVA 21% Inversión del sujeto pasivo + + percent + + + + + + purchase + + + + IVA 21% Inversión del sujeto pasivo (1) + + + percent + + + + + + + purchase + + + + IVA 21% Inversión del sujeto pasivo (2) + + + percent + + + + + + + + + + + purchase + + + + IVA 21% Inversión del sujeto pasivo (3) + + + percent + + + + + + + + + + + purchase + + + IVA 4% percent - - + + @@ -1403,14 +1807,14 @@ sale - + IVA 7% percent - - + + @@ -1421,14 +1825,14 @@ sale - + IVA 8% percent - - + + @@ -1439,14 +1843,32 @@ sale - + + + + IVA 10% + + percent + + + + + + + + + + + sale + + IVA 16% percent - - + + @@ -1457,14 +1879,14 @@ sale - + IVA 18% percent - - + + @@ -1474,17 +1896,36 @@ sale + - - + + + + IVA 21% + + percent + + + + + + + + + + + sale + + + - 0.50% Recargo Equivalencia + 0.50% Recargo Equivalencia Ventas percent - - + + @@ -1495,14 +1936,14 @@ sale - + - 1% Recargo Equivalencia + 1% Recargo Equivalencia Ventas percent - - + + @@ -1513,14 +1954,32 @@ sale - + + + + 1.4% Recargo Equivalencia Ventas + + percent + + + + + + + + + + + sale + + - 4% Recargo Equivalencia + 4% Recargo Equivalencia Ventas percent - - + + @@ -1531,10 +1990,117 @@ sale - - + + + + 5.2% Recargo Equivalencia Ventas + + percent + + + + + + + + + + + sale + + + + 0.50% Recargo Equivalencia Compras + + percent + + + + + + + + + + + purchase + + + + + 1% Recargo Equivalencia Compras + + percent + + + + + + + + + + + purchase + + + + + 1.4% Recargo Equivalencia Compras + + percent + + + + + + + + + + + purchase + + + + + 4% Recargo Equivalencia Compras + + percent + + + + + + + + + + + purchase + + + + + 5.2% Recargo Equivalencia Compras + + percent + + + + + + + + + + + purchase + + + - + @@ -1548,365 +2114,9 @@ sale - - + + - - - IVA 16% Intracomunitario. Bienes corrientes - IVA 16% Intracomunitario. Bienes corrientes - - percent - - purchase - - - - - IVA 16% Intracomunitario. Bienes corrientes (1) - - percent - - - - - - - - - purchase - - - - - IVA 16% Intracomunitario. Bienes corrientes (2) - - percent - - - - - - - - - - - purchase - - - - - IVA 18% Intracomunitario. Bienes corrientes - IVA 18% Intracomunitario. Bienes corrientes - - percent - - purchase - - - - - IVA 18% Intracomunitario. Bienes corrientes (1) - - percent - - - - - - - - - purchase - - - - - IVA 18% Intracomunitario. Bienes corrientes (2) - - percent - - - - - - - - - - - purchase - - - - - - - IVA 16% Intracomunitario. Bienes de inversión - IVA 16% Intracomunitario. Bienes de inversión - - percent - - purchase - - - - - IVA 16% Intracomunitario. Bienes de inversión (1) - - percent - - - - - - - - - purchase - - - - - IVA 16% Intracomunitario. Bienes de inversión (2) - - percent - - - - - - - - - - purchase - - - - - IVA 18% Intracomunitario. Bienes de inversión - IVA 18% Intracomunitario. Bienes de inversión - - percent - - purchase - - - - - IVA 18% Intracomunitario. Bienes de inversión (1) - - percent - - - - - - - - - purchase - - - - - IVA 18% Intracomunitario. Bienes de inversión (2) - - percent - - - - - - - - - - purchase - - - - - IVA 7% Intracomunitario. Bienes corrientes - IVA 7% Intracomunitario. Bienes corrientes - - percent - - purchase - - - - - IVA 7% Intracomunitario. Bienes corrientes (1) - - percent - - - - - - - - - purchase - - - - - IVA 7% Intracomunitario. Bienes corrientes (2) - - percent - - - - - - - - - - purchase - - - - - IVA 7% Intracomunitario. Bienes de inversión - IVA 7% Intracomunitario. Bienes de inversión - - percent - - purchase - - - - - IVA 7% Intracomunitario. Bienes de inversión (1) - - percent - - - - - - - - - purchase - - - - - IVA 7% Intracomunitario. Bienes de inversión (2) - - percent - - - - - - - - - - purchase - - - - - IVA 8% Intracomunitario. Bienes corrientes - IVA 8% Intracomunitario. Bienes corrientes - - percent - - purchase - - - - - IVA 8% Intracomunitario. Bienes corrientes (1) - - percent - - - - - - - - - purchase - - - - - IVA 8% Intracomunitario. Bienes corrientes (2) - - percent - - - - - - - - - - purchase - - - - - IVA 8% Intracomunitario. Bienes de inversión - IVA 8% Intracomunitario. Bienes de inversión - - percent - - purchase - - - - - IVA 8% Intracomunitario. Bienes de inversión (1) - - percent - - - - - - - - - purchase - - - - - IVA 8% Intracomunitario. Bienes de inversión (2) - - percent - - - - - - - - - - purchase - @@ -1923,8 +2133,8 @@ IVA 4% Intracomunitario. Bienes corrientes (1) percent - - + + @@ -1939,8 +2149,8 @@ IVA 4% Intracomunitario. Bienes corrientes (2) percent - - + + @@ -1966,8 +2176,8 @@ IVA 4% Intracomunitario. Bienes de inversión (1) percent - - + + @@ -1982,8 +2192,8 @@ IVA 4% Intracomunitario. Bienes de inversión (2) percent - - + + @@ -1993,7 +2203,539 @@ purchase - + + + IVA 7% Intracomunitario. Bienes corrientes + IVA 7% Intracomunitario. Bienes corrientes + + percent + + purchase + + + + + IVA 7% Intracomunitario. Bienes corrientes (1) + + percent + + + + + + + + + purchase + + + + + IVA 7% Intracomunitario. Bienes corrientes (2) + + percent + + + + + + + + + + purchase + + + + + IVA 7% Intracomunitario. Bienes de inversión + IVA 7% Intracomunitario. Bienes de inversión + + percent + + purchase + + + + + + IVA 7% Intracomunitario. Bienes de inversión (1) + + percent + + + + + + + + + purchase + + + + + + IVA 7% Intracomunitario. Bienes de inversión (2) + + percent + + + + + + + + + + purchase + + + + + IVA 8% Intracomunitario. Bienes corrientes + IVA 8% Intracomunitario. Bienes corrientes + + percent + + purchase + + + + + IVA 8% Intracomunitario. Bienes corrientes (1) + + percent + + + + + + + + + purchase + + + + + IVA 8% Intracomunitario. Bienes corrientes (2) + + percent + + + + + + + + + + purchase + + + + + IVA 8% Intracomunitario. Bienes de inversión + IVA 8% Intracomunitario. Bienes de inversión + + percent + + purchase + + + + + IVA 8% Intracomunitario. Bienes de inversión (1) + + percent + + + + + + + + + purchase + + + + + IVA 8% Intracomunitario. Bienes de inversión (2) + + percent + + + + + + + + + + purchase + + + + + IVA 10% Intracomunitario. Bienes corrientes + IVA 10% Intracomunitario. Bienes corrientes + + percent + + purchase + + + + + IVA 10% Intracomunitario. Bienes corrientes (1) + + percent + + + + + + + + + purchase + + + + + IVA 10% Intracomunitario. Bienes corrientes (2) + + percent + + + + + + + + + + purchase + + + + + IVA 10% Intracomunitario. Bienes de inversión + IVA 10% Intracomunitario. Bienes de inversión + + percent + + purchase + + + + + IVA 10% Intracomunitario. Bienes de inversión (1) + + percent + + + + + + + + + purchase + + + + + IVA 10% Intracomunitario. Bienes de inversión (2) + + percent + + + + + + + + + + purchase + + + + + IVA 16% Intracomunitario. Bienes corrientes + IVA 16% Intracomunitario. Bienes corrientes + + percent + + purchase + + + + + IVA 16% Intracomunitario. Bienes corrientes (1) + + percent + + + + + + + + + purchase + + + + + IVA 16% Intracomunitario. Bienes corrientes (2) + + percent + + + + + + + + + + + purchase + + + + + IVA 16% Intracomunitario. Bienes de inversión + IVA 16% Intracomunitario. Bienes de inversión + + percent + + purchase + + + + + IVA 16% Intracomunitario. Bienes de inversión (1) + + percent + + + + + + + + + purchase + + + + + IVA 16% Intracomunitario. Bienes de inversión (2) + + percent + + + + + + + + + + purchase + + + + + IVA 18% Intracomunitario. Bienes corrientes + IVA 18% Intracomunitario. Bienes corrientes + + percent + + purchase + + + + + IVA 18% Intracomunitario. Bienes corrientes (1) + + percent + + + + + + + + + purchase + + + + + IVA 18% Intracomunitario. Bienes corrientes (2) + + percent + + + + + + + + + + + purchase + + + + + + + IVA 18% Intracomunitario. Bienes de inversión + IVA 18% Intracomunitario. Bienes de inversión + + percent + + purchase + + + + + IVA 18% Intracomunitario. Bienes de inversión (1) + + percent + + + + + + + + + purchase + + + + + IVA 18% Intracomunitario. Bienes de inversión (2) + + percent + + + + + + + + + + purchase + + + + + + IVA 21% Intracomunitario. Bienes corrientes + IVA 21% Intracomunitario. Bienes corrientes + + percent + + purchase + + + + + IVA 21% Intracomunitario. Bienes corrientes (1) + + percent + + + + + + + + + purchase + + + + + IVA 21% Intracomunitario. Bienes corrientes (2) + + percent + + + + + + + + + + + purchase + + + + + IVA 21% Intracomunitario. Bienes de inversión + IVA 21% Intracomunitario. Bienes de inversión + + percent + + purchase + + + + + IVA 21% Intracomunitario. Bienes de inversión (1) + + percent + + + + + + + + + purchase + + + + + IVA 21% Intracomunitario. Bienes de inversión (2) + + percent + + + + + + + + + + purchase + + - + - + IRPF Retenciones practicadas Base Imponible @@ -2011,56 +2753,70 @@ 1.0 - + IRPF Retenciones practicadas Base Imponible 1% B.IRPF1 1.0 - + IRPF Retenciones practicadas Base Imponible 2% B.IRPF2 1.0 - + IRPF Retenciones practicadas Base Imponible 7% B.IRPF7 1.0 - + + + IRPF Retenciones practicadas Base Imponible 9% + B.IRPF9 + + 1.0 + + IRPF Retenciones practicadas Base Imponible 15% B.IRPF15 1.0 - + IRPF Retenciones practicadas Base Imponible 18% B.IRPF18 1.0 - + IRPF Retenciones practicadas Base Imponible 19% B.IRPF19 1.0 - + + + IRPF Retenciones practicadas Base Imponible 20% + B.IRPF20 + + 1.0 + + IRPF Retenciones practicadas Base Imponible 21% B.IRPF21 1.0 - + IRPF Retenciones practicadas Total Cuota @@ -2068,56 +2824,70 @@ 1.0 - + IRPF Retenciones practicadas Cuota 1% IRPF1 1.0 - + IRPF Retenciones practicadas Cuota 2% IRPF2 1.0 - + IRPF Retenciones practicadas Cuota 7% IRPF7 1.0 - + + + IRPF Retenciones practicadas Cuota 9% + IRPF9 + + 1.0 + + IRPF Retenciones practicadas Cuota 15% IRPF15 1.0 - + IRPF Retenciones practicadas Cuota 18% IRPF18 1.0 - + IRPF Retenciones practicadas Cuota 19% IRPF19 1.0 - + + + IRPF Retenciones practicadas Cuota 20% + IRPF20 + + 1.0 + + IRPF Retenciones practicadas Cuota 21% IRPF21 1.0 - + 475101 @@ -2127,7 +2897,7 @@ Hacienda Pública. Retenciones empresarios módulos 1% - + 475102 @@ -2136,7 +2906,7 @@ Hacienda Pública. Retenciones act. agrícolas, ganaderas, forestales 2% - + 475107 @@ -2145,7 +2915,16 @@ Hacienda Pública. Retenciones act. profesionales 7% - + + + 475109 + + + other + Hacienda Pública. Retenciones act. profesionales 9% + + + 475115 @@ -2154,7 +2933,7 @@ Hacienda Pública. Retenciones act. profesionales 15% - + 475118 @@ -2163,7 +2942,7 @@ Hacienda Pública. Retenciones arrendamientos, cap. mobiliario 18% - + 475119 @@ -2172,7 +2951,16 @@ Hacienda Pública. Retenciones arrendamientos, cap. mobiliario 19% - + + + 475120 + + + other + Hacienda Pública. Retenciones arrendamientos, cap. mobiliario 20% + + + 475121 @@ -2181,7 +2969,7 @@ Hacienda Pública. Retenciones arrendamientos, cap. mobiliario 21% - + @@ -2200,7 +2988,7 @@ purchase - + Retenciones IRPF 2% @@ -2218,7 +3006,7 @@ purchase - + Retenciones IRPF 7% @@ -2236,7 +3024,25 @@ purchase - + + + + Retenciones IRPF 9% + + percent + + + + + + + + + + + purchase + + Retenciones IRPF 15% @@ -2254,7 +3060,7 @@ purchase - + Retenciones IRPF 18% @@ -2272,7 +3078,7 @@ purchase - + Retenciones IRPF 19% @@ -2291,6 +3097,24 @@ purchase + + + Retenciones IRPF 20% + + percent + + + + + + + + + + + purchase + + Retenciones IRPF 21% @@ -2308,9 +3132,9 @@ purchase - + - + IRPF Retenciones a cuenta Base Imponible @@ -2318,56 +3142,70 @@ 1.0 - + IRPF Retenciones a cuenta Base Imponible 1% B.IRPF1 AC 1.0 - + IRPF Retenciones a cuenta Base Imponible 2% B.IRPF2 AC 1.0 - + IRPF Retenciones a cuenta Base Imponible 7% B.IRPF7 AC 1.0 - + + + IRPF Retenciones a cuenta Base Imponible 9% + B.IRPF9 AC + + 1.0 + + IRPF Retenciones a cuenta Base Imponible 15% B.IRPF15 AC 1.0 - + IRPF Retenciones a cuenta Base Imponible 18% B.IRPF18 AC 1.0 - + IRPF Retenciones a cuenta Base Imponible 19% B.IRPF19 AC 1.0 - + + + IRPF Retenciones a cuenta Base Imponible 20% + B.IRPF20 AC + + 1.0 + + IRPF Retenciones a cuenta Base Imponible 21% B.IRPF21 AC 1.0 - + IRPF Retenciones a cuenta Total Cuota @@ -2375,56 +3213,70 @@ 1.0 - + IRPF Retenciones a cuenta Cuota 1% IRPF1 AC 1.0 - + IRPF Retenciones a cuenta Cuota 2% IRPF2 AC 1.0 - + IRPF Retenciones a cuenta Cuota 7% IRPF7 AC 1.0 - + + + IRPF Retenciones a cuenta Cuota 9% + IRPF9 AC + + 1.0 + + IRPF Retenciones a cuenta Cuota 15% IRPF15 AC 1.0 - + IRPF Retenciones a cuenta Cuota 18% IRPF18 AC 1.0 - + IRPF Retenciones a cuenta Cuota 19% IRPF19 AC 1.0 - + + + IRPF Retenciones a cuenta Cuota 20% + IRPF20 AC + + 1.0 + + IRPF Retenciones a cuenta Cuota 21% IRPF21 AC 1.0 - + 473001 @@ -2434,7 +3286,7 @@ Hacienda Pública. Retenciones a cuenta empresarios módulos 1% - + 473002 @@ -2443,7 +3295,7 @@ Hacienda Pública. Retenciones a cuenta act. agrícolas, ganaderas, forestales 2% - + 473007 @@ -2452,7 +3304,16 @@ Hacienda Pública. Retenciones a cuenta act. profesionales 7% - + + + 473009 + + + other + Hacienda Pública. Retenciones a cuenta act. profesionales 9% + + + 473015 @@ -2461,7 +3322,7 @@ Hacienda Pública. Retenciones a cuenta act. profesionales 15% - + 473018 @@ -2470,7 +3331,7 @@ Hacienda Pública. Retenciones a cuenta arrendamientos, cap. mobiliario 18% - + 473019 @@ -2479,7 +3340,16 @@ Hacienda Pública. Retenciones a cuenta arrendamientos, cap. mobiliario 19% - + + + 473020 + + + other + Hacienda Pública. Retenciones a cuenta arrendamientos, cap. mobiliario 20% + + + 473021 @@ -2488,7 +3358,7 @@ Hacienda Pública. Retenciones a cuenta arrendamientos, cap. mobiliario 21% - + @@ -2507,7 +3377,7 @@ sale - + Retenciones a cuenta IRPF 2% @@ -2525,7 +3395,7 @@ sale - + Retenciones a cuenta IRPF 7% @@ -2543,7 +3413,25 @@ sale - + + + + Retenciones a cuenta IRPF 9% + + percent + + + + + + + + + + + sale + + Retenciones a cuenta IRPF 15% @@ -2561,7 +3449,7 @@ sale - + Retenciones a cuenta IRPF 18% @@ -2579,7 +3467,7 @@ sale - + Retenciones a cuenta IRPF 19% @@ -2597,7 +3485,25 @@ sale - + + + + Retenciones a cuenta IRPF 20% + + percent + + + + + + + + + + + sale + + Retenciones a cuenta IRPF 21% From 43c8796514d865d990ff867ac521de51305c10ae Mon Sep 17 00:00:00 2001 From: "Pedro M. Baeza" Date: Thu, 7 Feb 2013 13:55:22 +0100 Subject: [PATCH 08/74] [FIX] l10n_es: Incremented version number to allow automatic updates. bzr revid: pedro.baeza@serviciosbaeza.com-20130207125522-1dv2nj0azqi78yfk --- addons/l10n_es/__openerp__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/l10n_es/__openerp__.py b/addons/l10n_es/__openerp__.py index 2a5ca339896..3b91c2e5dae 100644 --- a/addons/l10n_es/__openerp__.py +++ b/addons/l10n_es/__openerp__.py @@ -23,7 +23,7 @@ { "name" : "Spanish Charts of Accounts (PGCE 2008)", - "version" : "3.0", + "version" : "3.1", "author" : "Spanish Localization Team", 'website' : 'https://launchpad.net/openerp-spain', "category" : "Localization/Account Charts", From 93cecb8f0a4da5dd672ef1434686fe9c78cf01a7 Mon Sep 17 00:00:00 2001 From: "nicolas.bessi@camptocamp.com" <> Date: Fri, 15 Feb 2013 14:40:18 +0100 Subject: [PATCH 09/74] [FIX] update l10n_ch contributors and meta-data bzr revid: nicolas.bessi@camptocamp.com-20130215134018-e5w25wvbf0u0cat1 --- addons/l10n_ch/__init__.py | 7 ++++-- addons/l10n_ch/__openerp__.py | 41 +++++++++++++++++--------------- addons/l10n_ch/account_wizard.py | 7 ++++-- 3 files changed, 32 insertions(+), 23 deletions(-) diff --git a/addons/l10n_ch/__init__.py b/addons/l10n_ch/__init__.py index f0b006c2b32..12d42707679 100644 --- a/addons/l10n_ch/__init__.py +++ b/addons/l10n_ch/__init__.py @@ -1,8 +1,11 @@ -# -*- encoding: utf-8 -*- +# -*- coding: utf-8 -*- ############################################################################## # # Author: Nicolas Bessi. Copyright Camptocamp SA -# Donors: Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique SA +# Financial contributors: Hasa SA, Open Net SA, +# Prisme Solutions Informatique SA, Quod SA +# +# Translation contributors: brain-tec AG, Agile Business Group # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as diff --git a/addons/l10n_ch/__openerp__.py b/addons/l10n_ch/__openerp__.py index e068c7365a1..8960224891d 100644 --- a/addons/l10n_ch/__openerp__.py +++ b/addons/l10n_ch/__openerp__.py @@ -1,8 +1,11 @@ -# -*- encoding: utf-8 -*- +# -*- coding: utf-8 -*- ############################################################################## # # Author: Nicolas Bessi. Copyright Camptocamp SA -# Donors: Hasa SA, Open Net SA and Prisme Solutions Informatique SA +# Financial contributors: Hasa SA, Open Net SA, +# Prisme Solutions Informatique SA, Quod SA +# +# Translation contributors: brain-tec AG, Agile Business Group # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -21,29 +24,29 @@ {'name': 'Switzerland - Accounting', 'description': """ -Swiss localization : -==================== -**Multilang swiss STERCHI account chart and taxes** - **Author:** Camptocamp SA + Swiss localization : + ==================== + **Multilang swiss STERCHI account chart and taxes** + **Author:** Camptocamp SA - **Donors:** Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique SA + **Financial contributors:** Prisme Solutions Informatique SA, Quod SA - **Translators:** brain-tec AG, Agile Business Group + **Translation contributors:** brain-tec AG, Agile Business Group -**This release will introduce major changes to l10n_ch.** + **This release will introduce major changes to l10n_ch.** -Due to important refactoring needs and the Switzerland adoption of new international payment standard during 2013-2014. We have reorganised the swiss localization addons this way: + Due to important refactoring needs and the Switzerland adoption of new international payment standard during 2013-2014. We have reorganised the swiss localization addons this way: -- **l10n_ch**: Multilang swiss STERCHI account chart and taxes (official addon) -- **l10n_ch_base_bank**: Technical module that introduces a new and simplified version of bank type management -- **l10n_ch_bank**: List of swiss banks -- **l10n_ch_zip**: List of swiss postal zip -- **l10n_ch_dta**: Support of dta payment protocol (will be deprecated end 2014) -- **l10n_ch_payment_slip**: Support of ESR/BVR payment slip report and reconciliation. Report refactored with easy element positioning. -- **l10n_ch_sepa**: Alpha implementation of PostFinance SEPA/PAIN support will be completed during 2013/2014 + - **l10n_ch**: Multilang swiss STERCHI account chart and taxes (official addon) + - **l10n_ch_base_bank**: Technical module that introduces a new and simplified version of bank type management + - **l10n_ch_bank**: List of swiss banks + - **l10n_ch_zip**: List of swiss postal zip + - **l10n_ch_dta**: Support of dta payment protocol (will be deprecated end 2014) + - **l10n_ch_payment_slip**: Support of ESR/BVR payment slip report and reconciliation. Report refactored with easy element positioning. + - **l10n_ch_sepa**: Alpha implementation of PostFinance SEPA/PAIN support will be completed during 2013/2014 -The modules will be soon available on OpenERP swiss localization on launchpad: -https://launchpad.net/openerp-swiss-localization + The modules will be soon available on OpenERP swiss localization on launchpad: + https://launchpad.net/openerp-swiss-localization """, 'version': '7.0', 'author': 'Camptocamp', diff --git a/addons/l10n_ch/account_wizard.py b/addons/l10n_ch/account_wizard.py index e0a9e84b90a..4b985c09b76 100644 --- a/addons/l10n_ch/account_wizard.py +++ b/addons/l10n_ch/account_wizard.py @@ -1,8 +1,11 @@ -# -*- encoding: utf-8 -*- +# -*- coding: utf-8 -*- ############################################################################## # # Author: Nicolas Bessi. Copyright Camptocamp SA -# Donors: Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique SA +# Financial contributors: Hasa SA, Open Net SA, +# Prisme Solutions Informatique SA, Quod SA +# +# Translation contributors: brain-tec AG, Agile Business Group # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as From 6c8be94ab704a68a624180dba65504fe395bae26 Mon Sep 17 00:00:00 2001 From: Paramjit Singh Sahota Date: Wed, 20 Mar 2013 15:45:28 +0530 Subject: [PATCH 10/74] [IMP] Set cursor on 'or' in Advance search. bzr revid: psa@tinyerp.com-20130320101528-0i90ne0dzqr5adgc --- addons/web/static/src/css/base.css | 1 + addons/web/static/src/css/base.sass | 1 + 2 files changed, 2 insertions(+) diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 2056bc2876f..d6da7e0d02f 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -1969,6 +1969,7 @@ .openerp .oe_searchview .oe_searchview_drawer .oe_searchview_advanced .searchview_extended_prop_or { opacity: 0.5; margin-left: -14px; + cursor: auto; } .openerp .oe_searchview .oe_searchview_drawer .oe_opened h4:before { content: "▾ "; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 69e7ff55589..812fe1ce17b 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1562,6 +1562,7 @@ $sheet-padding: 16px .searchview_extended_prop_or opacity: 0.5 margin-left: -14px + cursor: auto .oe_opened h4:before content: "▾ " From 3d545a45305e6789bf31b7f97f15d6d4bef88ec9 Mon Sep 17 00:00:00 2001 From: Paramjit Singh Sahota Date: Wed, 20 Mar 2013 16:02:07 +0530 Subject: [PATCH 11/74] [IMP] Set position, width and top for hover on 'or' in Advance search to inhibits the excution of CURSOR on hover. bzr revid: psa@tinyerp.com-20130320103207-6vbrf4dqnwo2s1u8 --- addons/web/static/src/css/base.css | 3 +++ addons/web/static/src/css/base.sass | 3 +++ 2 files changed, 6 insertions(+) diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index d6da7e0d02f..b0bd60c0ca7 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -1970,6 +1970,9 @@ opacity: 0.5; margin-left: -14px; cursor: auto; + position: absolute; + width: 16px; + top: 5px; } .openerp .oe_searchview .oe_searchview_drawer .oe_opened h4:before { content: "▾ "; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 812fe1ce17b..e1cc01d4c8c 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1563,6 +1563,9 @@ $sheet-padding: 16px opacity: 0.5 margin-left: -14px cursor: auto + position: absolute + width: 16px + top: 5px .oe_opened h4:before content: "▾ " From 876c7900775baa7a653983ba1049355497dcd439 Mon Sep 17 00:00:00 2001 From: bth Date: Tue, 26 Mar 2013 15:14:32 +0530 Subject: [PATCH 12/74] [FIX] Put arrow on or. bzr revid: bth@bth-laptop-20130326094432-rq3rnxw60r6e00bv --- addons/web/static/src/css/base.css | 2 +- addons/web/static/src/css/base.sass | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 4584b418296..b4d6e7968b9 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -1970,7 +1970,7 @@ .openerp .oe_searchview .oe_searchview_drawer .oe_searchview_advanced .searchview_extended_prop_or { opacity: 0.5; margin-left: -14px; - cursor: auto; + cursor: cell; position: absolute; width: 16px; top: 5px; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 49d2878a746..52893fc77ca 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1564,7 +1564,7 @@ $sheet-padding: 16px .searchview_extended_prop_or opacity: 0.5 margin-left: -14px - cursor: auto + cursor: cell position: absolute width: 16px top: 5px From eb6e8a830824890fcbc2266eaced1b7a29ed4980 Mon Sep 17 00:00:00 2001 From: Holger Brunn Date: Wed, 27 Mar 2013 13:24:47 +0100 Subject: [PATCH 13/74] [FIX] get id from dataset to pass it as integer in place of string lp bug: https://launchpad.net/bugs/1160871 fixed bzr revid: hbrunn@therp.nl-20130327122447-bhsjd3b8moj2kgny --- addons/web_calendar/static/src/js/calendar.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/web_calendar/static/src/js/calendar.js b/addons/web_calendar/static/src/js/calendar.js index ae28c486f2c..e1e77173fd4 100644 --- a/addons/web_calendar/static/src/js/calendar.js +++ b/addons/web_calendar/static/src/js/calendar.js @@ -498,7 +498,7 @@ instance.web_calendar.CalendarView = instance.web.View.extend({ var self = this; var index = this.dataset.get_id_index(event_id); if (index !== null) { - this.dataset.unlink(event_id); + this.dataset.unlink(this.dataset.ids[index]); } }, }); From 6073d6b6423e736d861cec13089f2699c10dd12f Mon Sep 17 00:00:00 2001 From: "Darshan Kalola (OpenERP Trainee)" Date: Fri, 29 Mar 2013 17:57:41 +0530 Subject: [PATCH 14/74] [FIX]Bad view O2M with attribute delete lp bug: https://launchpad.net/bugs/1126027 fixed bzr revid: darshankalola@gmail.com-20130329122741-pqj62e06oivq5cjs --- 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 c9adc91a6ad..9d968f10fa5 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -739,7 +739,7 @@ - + From cb47467d800aa0a1ade2eeca844b03086b88129b Mon Sep 17 00:00:00 2001 From: Josse Colpaert Date: Thu, 4 Apr 2013 11:48:16 +0200 Subject: [PATCH 15/74] [IMP] Only change manual action date when not set already bzr revid: jco@openerp.com-20130404094816-h9v18bgc3lkaa79u --- addons/account_followup/account_followup.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/addons/account_followup/account_followup.py b/addons/account_followup/account_followup.py index cd24bd93664..0e3cd0ac5f7 100644 --- a/addons/account_followup/account_followup.py +++ b/addons/account_followup/account_followup.py @@ -165,9 +165,8 @@ class res_partner(osv.osv): else: action_text = partner.latest_followup_level_id_without_lit.manual_action_note or '' - #Check date: put the minimum date if it existed already - action_date = (partner.payment_next_action_date and min(partner.payment_next_action_date, fields.date.context_today(self, cr, uid, context=context)) - ) or fields.date.context_today(self, cr, uid, context=context) + #Check date: only change when it did not exist already + action_date = partner.payment_next_action_date or fields.date.context_today(self, cr, uid, context=context) # Check responsible: if partner has not got a responsible already, take from follow-up responsible_id = False From 543c6012da4022087cb0d2ed5a24571371500f9b Mon Sep 17 00:00:00 2001 From: Anael Closson Date: Thu, 11 Apr 2013 18:20:35 +0200 Subject: [PATCH 16/74] [FIX] Multiline texts could not be matched for tranlations bzr revid: acl@openerp.com-20130411162035-ij47tyulejkqqz4t --- addons/web/static/src/js/coresetup.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/web/static/src/js/coresetup.js b/addons/web/static/src/js/coresetup.js index dedb4a49710..fd1ace312a9 100644 --- a/addons/web/static/src/js/coresetup.js +++ b/addons/web/static/src/js/coresetup.js @@ -562,7 +562,7 @@ instance.web.qweb.preprocess_node = function() { if (translation && translation.value === 'off') { return; } - var match = /^(\s*)(.+?)(\s*)$/.exec(this.node.data); + var match = /^(\s*)([\s\S]+?)(\s*)$/.exec(this.node.data); if (match) { this.node.data = match[1] + instance.web._t(match[2]) + match[3]; } From 729caa70e4b823572bf8355d14550b07435aae5c Mon Sep 17 00:00:00 2001 From: Stefan Rijnhart Date: Tue, 23 Apr 2013 16:39:48 +0200 Subject: [PATCH 17/74] [ADD] [l10n_nl] Fiscal position for transferred VAT 'BTW verlegd' [FIX] [l10_nl]: Tax code is not created because of duplicate (truncated) name [FIX] [l10n_nl] Fix sign, sequence and label of tax 'BTW verlegd inkoop' [FIX] Remove duplicate tax 'BTW te vorderen verlegd' plus child taxes [FIX] l10n_nl: tax 'BTW verlegd 0%' is a sales tax lp bug: https://launchpad.net/bugs/1171872 fixed bzr revid: stefan@therp.nl-20130423143948-v3swgp4jsxms2xup --- addons/l10n_nl/account_chart_netherlands.xml | 58 ++----------------- .../account_fiscal_position_tax_template.xml | 7 +++ .../account_fiscal_position_template.xml | 4 ++ 3 files changed, 17 insertions(+), 52 deletions(-) diff --git a/addons/l10n_nl/account_chart_netherlands.xml b/addons/l10n_nl/account_chart_netherlands.xml index 516c88bdcf9..5464d027a63 100644 --- a/addons/l10n_nl/account_chart_netherlands.xml +++ b/addons/l10n_nl/account_chart_netherlands.xml @@ -3940,7 +3940,7 @@ 2a - Leveringen/diensten waarbij de heffing van omzetbelasting naar u is verlegd (BTW) + Heffing van omzetbelasting is naar u verlegd (BTW) @@ -4052,7 +4052,7 @@ 2a - Leveringen/diensten waarbij de heffing van omzetbelasting naar u is verlegd (omzet) + Heffing van omzetbelasting is naar u verlegd (omzet) @@ -4260,7 +4260,7 @@ TODO rubriek 1c en 1d moeten nog, zijn variabel, dus BTW percentage moet door ge - purchase + sale 15 @@ -4279,9 +4279,9 @@ TODO rubriek 1c en 1d moeten nog, zijn variabel, dus BTW percentage moet door ge - 99 + 98 - BTW af te dragen verlegd (inkopen1) + BTW te vorderen verlegd (inkopen1) percent @@ -4304,54 +4304,8 @@ TODO rubriek 1c en 1d moeten nog, zijn variabel, dus BTW percentage moet door ge + - - purchase - - - 15 - - BTW te vorderen verlegd (inkopen) - 21% BTW verlegd - - percent - - - - - - - purchase - - - - 99 - - BTW te vorderen verlegd (inkopen1) - - percent - - - - - - - - purchase - - - 99 - - BTW te vorderen verlegd (inkopen2) - - percent - - - - - - - purchase diff --git a/addons/l10n_nl/account_fiscal_position_tax_template.xml b/addons/l10n_nl/account_fiscal_position_tax_template.xml index 622ffafa67c..9fe9a3df786 100644 --- a/addons/l10n_nl/account_fiscal_position_tax_template.xml +++ b/addons/l10n_nl/account_fiscal_position_tax_template.xml @@ -90,6 +90,13 @@ + + + + + + + diff --git a/addons/l10n_nl/account_fiscal_position_template.xml b/addons/l10n_nl/account_fiscal_position_template.xml index fe658c6d4b7..1c69f2d1198 100644 --- a/addons/l10n_nl/account_fiscal_position_template.xml +++ b/addons/l10n_nl/account_fiscal_position_template.xml @@ -7,6 +7,10 @@ Binnenland + + BTW verlegd + + EU landen From 488f86846b71308124f5f94cbb0af6ae2138f106 Mon Sep 17 00:00:00 2001 From: "Pedro M. Baeza" Date: Tue, 30 Apr 2013 19:25:09 +0200 Subject: [PATCH 18/74] [ADD] l10n_es: Added chart account and templates for associations. bzr revid: pedro.baeza@serviciosbaeza.com-20130430172509-cfsifh2ihkm8hhk5 --- addons/l10n_es/__openerp__.py | 27 +- addons/l10n_es/account_chart_assoc.xml | 12426 ++++++++++++++++++++ addons/l10n_es/fiscal_templates_assoc.xml | 2047 ++++ addons/l10n_es/taxes_data_assoc.xml | 3540 ++++++ 4 files changed, 18030 insertions(+), 10 deletions(-) create mode 100644 addons/l10n_es/account_chart_assoc.xml create mode 100644 addons/l10n_es/fiscal_templates_assoc.xml create mode 100644 addons/l10n_es/taxes_data_assoc.xml diff --git a/addons/l10n_es/__openerp__.py b/addons/l10n_es/__openerp__.py index 3b91c2e5dae..9dd201c20cc 100644 --- a/addons/l10n_es/__openerp__.py +++ b/addons/l10n_es/__openerp__.py @@ -4,6 +4,10 @@ # OpenERP, Open Source Management Solution # Copyright (c) 2008-2010 Zikzakmedia S.L. (http://zikzakmedia.com) All Rights Reserved. # Jordi Esteve +# Copyright (c) 2012-2013, Grupo OPENTIA () Registered EU Trademark. +# Dpto. Consultoría +# Copyright (c) 2013 Serv. Tecnol. Avanzados (http://www.serviciosbaeza.com) +# Pedro Manuel Baeza # $Id$ # # This program is free software: you can redistribute it and/or modify @@ -23,20 +27,20 @@ { "name" : "Spanish Charts of Accounts (PGCE 2008)", - "version" : "3.1", + "version" : "3.0", "author" : "Spanish Localization Team", 'website' : 'https://launchpad.net/openerp-spain', "category" : "Localization/Account Charts", - "description": """Spanish Charts of Accounts (PGCE 2008) + "description": """ +Spanish Charts of Accounts (PGCE 2008). +======================================= -* Defines the following chart of account templates: - * Spanish General Chart of Accounts 2008. - * Spanish General Chart of Accounts 2008 for small and medium companies. -* Defines templates for sale and purchase VAT. -* Defines tax code templates. - -Note: You should install the l10n_ES_account_balance_report module -for yearly account reporting (balance, profit & losses). + * Defines the following chart of account templates: + * Spanish General Chart of Accounts 2008 + * Spanish General Chart of Accounts 2008 for small and medium companies + * Spanish General Chart of Accounts 2008 for associations + * Defines templates for sale and purchase VAT + * Defines tax code templates """, "license" : "AGPL-3", "depends" : ["account", "base_vat", "base_iban"], @@ -47,6 +51,9 @@ for yearly account reporting (balance, profit & losses). "account_chart_pymes.xml", "taxes_data_pymes.xml", "fiscal_templates_pymes.xml", + "account_chart_assoc.xml", + "taxes_data_assoc.xml", + "fiscal_templates_assoc.xml", "l10n_es_wizard.xml", ], "demo" : [], diff --git a/addons/l10n_es/account_chart_assoc.xml b/addons/l10n_es/account_chart_assoc.xml new file mode 100644 index 00000000000..b11ad85bd33 --- /dev/null +++ b/addons/l10n_es/account_chart_assoc.xml @@ -0,0 +1,12426 @@ + + + + + + + + + 0 + + + view + Plan General Contable ASOCIACIONES 2008 + + + + + 1 + + + view + Financiación Básica + + + + 10 + + + view + Capital + + + + + 100 + + + view + Dotación fundacional + + + + 100 + + + other + Dotación fundacional + + + + 101 + + + view + Fondo social + + + + 101 + + + other + Fondo social + + + + 102 + + + view + Capital + + + + 102 + + + other + Capital + + + + 103 + + + view + Fundadores/asociados por desembolsos no exigidos + + + + 1030 + + + view + Fundadores, parte no desembolsada en fundaciones + + + + 1030 + + + other + Fundadores, parte no desembolsada en fundaciones + + + + 1034 + + + view + Asociados, parte no desembolsada en asociaciones + + + + 1034 + + + other + Asociados, parte no desembolsada en asociaciones + + + + 104 + + + view + Fundadores/asociados por aportaciones no dinerarias pendientes + + + + 1040 + + + view + Fundadores, por aportaciones no dinerarias pendientes, en fundaciones + + + + 1040 + + + other + Fundadores, por aportaciones no dinerarias pendientes, en fundaciones + + + + 1044 + + + view + Asociados, por aportaciones no dinerarias pendientes, en asociaciones + + + + 1044 + + + other + Asociados, por aportaciones no dinerarias pendientes, en asociaciones + + + + 108 + + + view + Acciones o participaciones propias en situaciones especiales + + + + 108 + + + other + Acciones o participaciones propias en situaciones especiales + + + + 109 + + + view + Acciones o participaciones propias para reducción de capital + + + + 109 + + + other + Acciones o participaciones propias para reducción de capital + + + + 11 + + + view + Reservas y otros instrumentos de patrimonio + + + + 110 + + + view + Prima de Emisión o asunción + + + + 110 + + + other + Prima de Emisión o asunción + + + + 112 + + + view + Reserva Legal + + + + 112 + + + other + Reserva Legal + + + + 113 + + + view + Reservas voluntarias + + + + 113 + + + other + Reservas voluntarias + + + + 114 + + + view + Reservas especiales + + + + 1140 + + + view + Reservas para acciones o participaciones de la sociedad dominante + + + + 1140 + + + other + Reservas para acciones o participaciones de la sociedad dominante + + + + 1141 + + + view + Reservas estatutarias + + + + 1141 + + + other + Reservas estatutarias + + + + 1142 + + + view + Reserva por capital amortizado + + + + 1142 + + + other + Reserva por capital amortizado + + + + 1144 + + + view + Reservas por acciones propias aceptadas en garantía + + + + 1144 + + + other + Reservas por acciones propias aceptadas en garantía + + + + 118 + + + view + Aportaciones de socios o propietarios + + + + 118 + + + other + Aportaciones de socios o propietarios + + + + 119 + + + view + Diferencias por ajuste del capital a euros + + + + 119 + + + other + Diferencias por ajuste del capital a euros + + + + 12 + + + view + Excedentes pendientes de aplicación + + + + 120 + + + view + Remanente + + + + 120 + + + other + Remanente + + + + 121 + + + view + Excedentes negativos de ejercicios anteriores + + + + 121 + + + other + Excedentes negativos de ejercicios anteriores + + + + 129 + + + view + Excedente del ejercicio + + + + 129 + + + other + Excedente del ejercicio + + + + 13 + + + view + Subvenciones, donaciones y ajustes por cambio de valor + + + + 130 + + + view + Subvenciones oficiales de capital + + + + 1300 + + + view + Subvenciones del Estado + + + + 1300 + + + other + Subvenciones del Estado + + + + 1301 + + + view + Subvenciones de otras Administraciones Públicas + + + + 1301 + + + other + Subvenciones de otras Administraciones Públicas + + + + 131 + + + view + Donaciones y legados de capital + + + + 131 + + + other + Donaciones y legados de capital + + + + 132 + + + view + Otras subvenciones, donaciones y legados + + + + 1320 + + + view + Otras subvenciones + + + + 1320 + + + other + Otras subvenciones + + + + 1321 + + + view + Otras donaciones y legados + + + + 1321 + + + other + Otras donaciones y legados + + + + + 137 + + + view + Ingresos fiscales a distribuir en varios ejercicios + + + + 1370 + + + view + Ingresos fiscales por diferencias permanentes a distribuir en varios ejercicios + + + + 1370 + + + other + Ingresos fiscales por diferencias permanentes a distribuir en varios ejercicios + + + + 1371 + + + view + Ingresos fiscales por deducciones y bonificaciones a distribuir en varios ejercicios + + + + 1371 + + + other + Ingresos fiscales por deducciones y bonificaciones a distribuir en varios ejercicios + + + + 14 + + + view + Provisiones + + + + 141 + + + view + Provisión para impuestos + + + + 141 + + + other + Provisión para impuestos + + + + 142 + + + view + Provisión para otras responsabilidades + + + + 142 + + + other + Provisión para otras responsabilidades + + + + 143 + + + view + Provisión por desmantelamiento, retiro o rehabilitación del inmovilizado + + + + 143 + + + other + Provisión por desmantelamiento, retiro o rehabilitación del inmovilizado + + + + 145 + + + view + Provisión para actuaciones medioambientales + + + + 145 + + + other + Provisión para actuaciones medioambientales + + + + 15 + + + view + Deudas con características especiales + + + + 150 + + + view + Acciones o participaciones consideradas como pasivos financieros + + + + 150 + + + other + Acciones o participaciones consideradas como pasivos financieros + + + + 153 + + + view + Desembolsos no exigidos por acciones o participaciones consideradas como pasivos financieros + + + + 1533 + + + view + Desembolsos no exigidos, empresas del grupo + + + + 1533 + + + other + Desembolsos no exigidos, empresas del grupo + + + + 1534 + + + view + Desembolsos no exigidos, empresas asociadas + + + + 1534 + + + other + Desembolsos no exigidos, empresas asociadas + + + + 1535 + + + view + Desembolsos no exigidos, otras partes vinculadas + + + + 1535 + + + other + Desembolsos no exigidos, otras partes vinculadas + + + + 1536 + + + view + Otros desembolsos no exigidos + + + + 1536 + + + other + Otros desembolsos no exigidos + + + + 154 + + + view + Aportaciones no dinerarias pendientes por acciones o participaciones consideradas como pasivos financieros + + + + 1543 + + + view + Aportaciones no dinerarias pendientes, empresas del grupo + + + + 1543 + + + other + Aportaciones no dinerarias pendientes, empresas del grupo + + + + 1544 + + + view + Aportaciones no dinerarias pendientes, empresas asociadas + + + + 1544 + + + other + Aportaciones no dinerarias pendientes, empresas asociadas + + + + 1545 + + + view + Aportaciones no dinerarias pendientes, otras partes vinculadas + + + + 1545 + + + other + Aportaciones no dinerarias pendientes, otras partes vinculadas + + + + 1546 + + + view + Otras aportaciones no dinerarias pendientes + + + + 1546 + + + other + Otras aportaciones no dinerarias pendientes + + + + 16 + + + view + Deudas con partes vinculadas + + + + 160 + + + view + Deudas con entidades de crédito vinculadas + + + + 1603 + + + view + Deudas con entidades de crédito vinculadas, empresas del grupo + + + + 1603 + + + other + Deudas con entidades de crédito vinculadas, empresas del grupo + + + + 1604 + + + view + Deudas con entidades de crédito vinculadas, empresas asociadas + + + + 1604 + + + other + Deudas con entidades de crédito vinculadas, empresas asociadas + + + + 1605 + + + view + Deudas con otras entidades de crédito vinculadas + + + + 1605 + + + other + Deudas con otras entidades de crédito vinculadas + + + + 161 + + + view + Proveedores de inmovilizado, partes vinculadas + + + + 1613 + + + view + Proveedores de inmovilizado, empresas del grupo + + + + 1613 + + + other + Proveedores de inmovilizado, empresas del grupo + + + + 1614 + + + view + Proveedores de inmovilizado, empresas asociadas + + + + 1614 + + + other + Proveedores de inmovilizado, empresas asociadas + + + + 1615 + + + view + Proveedores de inmovilizado, otras partes vinculadas + + + + 1615 + + + other + Proveedores de inmovilizado, otras partes vinculadas + + + + 162 + + + view + Acreedores por arrendamiento financiero, partes vinculadas + + + + 1623 + + + view + Acreedores por arrendamiento financiero, empresas de grupo + + + + 1623 + + + other + Acreedores por arrendamiento financiero, empresas de grupo + + + + 1624 + + + view + Acreedores por arrendamiento financiero, empresas asociadas + + + + 1624 + + + other + Acreedores por arrendamiento financiero, empresas asociadas + + + + 1625 + + + view + Acreedores por arrendamiento financiero, otras partes vinculadas + + + + 1625 + + + other + Acreedores por arrendamiento financiero, otras partes vinculadas + + + + 163 + + + view + Otras deudas con partes vinculadas + + + + 1633 + + + view + Otras deudas, empresas del grupo + + + + 1633 + + + other + Otras deudas, empresas del grupo + + + + 1634 + + + view + Otras deudas, empresas asociadas + + + + 1634 + + + other + Otras deudas, empresas asociadas + + + + 1635 + + + view + Otras deudas, con otras partes vinculadas + + + + 1635 + + + other + Otras deudas, con otras partes vinculadas + + + + 17 + + + view + Deudas por préstamos recibidos, empréstitos y otros conceptos + + + + 170 + + + view + Deudas con entidades de crédito + + + + 170 + + + other + Deudas con entidades de crédito + + + + 171 + + + view + Deudas + + + + 171 + + + other + Deudas + + + + 172 + + + view + Deudas transformables en subvenciones, donaciones y legados + + + + 172 + + + other + Deudas transformables en subvenciones, donaciones y legados + + + + 173 + + + view + Proveedores de inmovilizado + + + + 173 + + + other + Proveedores de inmovilizado + + + + 174 + + + view + Acreedores por arrendamiento financiero + + + + 174 + + + other + Acreedores por arrendamiento financiero + + + + 175 + + + view + Efectos a pagar + + + + 175 + + + other + Efectos a pagar + + + + 176 + + + view + Pasivos por derivados financieros + + + + 176 + + + other + Pasivos por derivados financieros + + + + 177 + + + view + Obligaciones y bonos + + + + 177 + + + other + Obligaciones y bonos + + + + 179 + + + view + Deudas representadas en otros valores negociables + + + + 179 + + + other + Deudas representadas en otros valores negociables + + + + 18 + + + view + Pasivos por fianzas, garantías y otros conceptos + + + + 180 + + + view + Fianzas recibidas + + + + 180 + + + other + Fianzas recibidas + + + + 181 + + + view + Anticipos recibidos por ventas o prestaciones de servicios + + + + 181 + + + other + Anticipos recibidos por ventas o prestaciones de servicios + + + + 185 + + + view + Depósitos recibidos + + + + 185 + + + other + Depósitos recibidos + + + + 19 + + + view + Situaciones transitorias de financiación + + + + 190 + + + view + Acciones o participaciones emitidas + + + + 190 + + + other + Acciones o participaciones emitidas + + + + 192 + + + view + Suscriptores de acciones + + + + 192 + + + other + Suscriptores de acciones + + + + 194 + + + view + Capital emitido pendiente de inscripción + + + + 194 + + + other + Capital emitido pendiente de inscripción + + + + 195 + + + view + Acciones o participaciones emitidas consideradas como pasivos financieros + + + + 195 + + + other + Acciones o participaciones emitidas consideradas como pasivos financieros + + + + 197 + + + view + Suscriptores de acciones consideradas como pasivos financieros + + + + 197 + + + other + Suscriptores de acciones consideradas como pasivos financieros + + + + 199 + + + view + Acciones o participaciones emitidas consideradas como pasivos financieros pendientes de inscripción + + + + 199 + + + other + Acciones o participaciones emitidas consideradas como pasivos financieros pendientes de inscripción + + + + 2 + + + view + Activo no corriente + + + + 20 + + + view + Inmovilizaciones intangibles + + + + 200 + + + view + Investigación + + + + 200 + + + other + Investigación + + + + 201 + + + view + Desarrollo + + + + 201 + + + other + Desarrollo + + + + 202 + + + view + Concesiones administrativas + + + + 202 + + + other + Concesiones administrativas + + + + 203 + + + view + Propiedad industrial + + + + 203 + + + other + Propiedad industrial + + + + 205 + + + view + Derechos de traspaso + + + + 205 + + + other + Derechos de traspaso + + + + 206 + + + view + Aplicaciones informáticas + + + + 206 + + + other + Aplicaciones informáticas + + + + 207 + + + view + Derechos sobre activos cedidos en uso + + + + 207 + + + other + Derechos sobre activos cedidos en uso + + + + 209 + + + view + Anticipos para inmovilizaciones intangibles + + + + 209 + + + other + Anticipos para inmovilizaciones intangibles + + + + 21 + + + view + Inmovilizaciones materiales + + + + 210 + + + view + Terrenos y bienes naturales + + + + 210 + + + other + Terrenos y bienes naturales + + + + 211 + + + view + Construcciones + + + + 211 + + + other + Construcciones + + + + 212 + + + view + Instalaciones técnicas + + + + 212 + + + other + Instalaciones técnicas + + + + 213 + + + view + Maquinaria + + + + 213 + + + other + Maquinaria + + + + 214 + + + view + Utillaje + + + + 214 + + + other + Utillaje + + + + 215 + + + view + Otras instalaciones + + + + 215 + + + other + Otras instalaciones + + + + 216 + + + view + Mobiliario + + + + 216 + + + other + Mobiliario + + + + 217 + + + view + Equipos para proceso de información + + + + 217 + + + other + Equipos para proceso de información + + + + 218 + + + view + Elementos de transporte + + + + 218 + + + other + Elementos de transporte + + + + 219 + + + view + Otro inmovilizado material + + + + 219 + + + other + Otro inmovilizado material + + + + 22 + + + view + Inversiones inmobiliarias + + + + 220 + + + view + Inversiones en terrenos y bienes naturales + + + + 220 + + + other + Inversiones en terrenos y bienes naturales + + + + 221 + + + view + Inversiones en construcciones + + + + 221 + + + other + Inversiones en construcciones + + + + 23 + + + view + Inmovilizaciones materiales en curso + + + + 230 + + + view + Adaptación de terrenos y bienes naturales + + + + 230 + + + other + Adaptación de terrenos y bienes naturales + + + + 231 + + + view + Construcciones en curso + + + + 231 + + + other + Construcciones en curso + + + + 232 + + + view + Instalaciones técnicas en montaje + + + + 232 + + + other + Instalaciones técnicas en montaje + + + + 233 + + + view + Maquinaria en montaje + + + + 233 + + + other + Maquinaria en montaje + + + + 237 + + + view + Equipos para procesos de información en montaje + + + + 237 + + + other + Equipos para procesos de información en montaje + + + + 239 + + + view + Anticipos para inmovilizaciones materiales + + + + 239 + + + other + Anticipos para inmovilizaciones materiales + + + + 24 + + + view + Bienes del patrimonio histórico + + + + 240 + + + view + Bienes inmuebles + + + + 2400 + + + view + Monumentos + + + + 2400 + + + other + Monumentos + + + + + 2401 + + + view + Jardines históricos + + + + 2401 + + + other + Jardines históricos + + + + + 2402 + + + view + Conjuntos históricos + + + + 2402 + + + other + Conjuntos históricos + + + + + 2403 + + + view + Sitios históricos + + + + 2403 + + + other + Sitios históricos + + + + 2404 + + + view + Zonas arqueológicas + + + + 2404 + + + other + Zonas arqueológicas + + + + 2405 + + + view + Participaciones en otras partes vinculadas + + + + 2405 + + + other + Participaciones en otras partes vinculadas + + + + 241 + + + view + Archivos + + + + 2413 + + + view + Valores representativos de deuda de empresas del grupo + + + + 2413 + + + other + Valores representativos de deuda de empresas del grupo + + + + 2414 + + + view + Valores representativos de deuda de empresas asociadas + + + + 2414 + + + other + Valores representativos de deuda de empresas asociadas + + + + 2415 + + + view + Valores representativos de deuda de otras partes vinculadas + + + + 2415 + + + other + Valores representativos de deuda de otras partes vinculadas + + + + 242 + + + view + Bibliotecas + + + + 2423 + + + view + Créditos a empresas del grupo + + + + 2423 + + + other + Créditos a empresas del grupo + + + + 2424 + + + view + Créditos a empresas asociadas + + + + 2424 + + + other + Créditos a empresas asociadas + + + + 2425 + + + view + Créditos a otras partes vinculadas + + + + 2425 + + + other + Créditos a otras partes vinculadas + + + + + 243 + + + view + Museos + + + + + 243 + + + other + Museos + + + + + 244 + + + view + Bienes muebles + + + + + 244 + + + other + Bienes muebles + + + + + + 249 + + + view + Anticipos sobre bienes del Patrimonio Histórico + + + + + 2490 + + + view + Anticipos sobre bienes inmuebles del Patrimonio Histórico + + + + 2490 + + + other + Anticipos sobre bienes inmuebles del Patrimonio Histórico + + + + + 2491 + + + view + Anticipos sobre archivos del Patrimonio Histórico + + + + 2491 + + + other + Anticipos sobre archivos del Patrimonio Histórico + + + + + 2492 + + + view + Anticipos sobre bibliotecas del Patrimonio Histórico + + + + 2492 + + + other + Anticipos sobre bibliotecas del Patrimonio Histórico + + + + + + 2493 + + + view + Anticipos sobre museos del Patrimonio Histórico + + + + 2493 + + + other + Anticipos sobre museos del Patrimonio Histórico + + + + + 2494 + + + view + Anticipos sobre bienes muebles del Patrimonio Histórico + + + + 2494 + + + other + Anticipos sobre bienes muebles del Patrimonio Histórico + + + + 2495 + + + view + Desembolsos pendientes sobre participaciones en otras partes vinculadas + + + + 2495 + + + other + Desembolsos pendientes sobre participaciones en otras partes vinculadas + + + + 25 + + + view + Otras inversiones financieras + + + + 250 + + + view + Inversiones financieras en instrumentos de patrimonio + + + + 250 + + + other + Inversiones financieras en instrumentos de patrimonio + + + + 251 + + + view + Valores representativos de deuda + + + + 251 + + + other + Valores representativos de deuda + + + + 252 + + + view + Créditos + + + + 252 + + + other + Créditos + + + + 253 + + + view + Créditos por enajenación de inmovilizado + + + + 253 + + + other + Créditos por enajenación de inmovilizado + + + + 254 + + + view + Créditos al personal + + + + 254 + + + other + Créditos al personal + + + + 255 + + + view + Activos por derivados financieros + + + + 255 + + + other + Activos por derivados financieros + + + + 258 + + + view + Imposiciones + + + + 258 + + + other + Imposiciones + + + + 259 + + + view + Desembolsos pendientes sobre participaciones en el patrimonio neto + + + + 259 + + + other + Desembolsos pendientes sobre participaciones en el patrimonio neto + + + + 26 + + + view + Fianzas y depósitos constituidos + + + + 260 + + + view + Fianzas constituidas + + + + 260 + + + other + Fianzas constituidas + + + + 265 + + + view + Depósitos constituidos + + + + 265 + + + other + Depósitos constituidos + + + + 28 + + + view + Amortización acumulada del inmovilizado y otras cuentas correctoras + + + + 280 + + + view + Amortización acumulada del inmovilizado intangible + + + + + 2800 + + + view + Amortización acumulada de investigación + + + + 2800 + + + other + Amortización acumulada de investigación + + + + + + 2801 + + + view + Amortización acumulada de desarrollo + + + + 2801 + + + other + Amortización acumulada de desarrollo + + + + 2802 + + + view + Amortización acumulada de concesiones administrativas + + + + 2802 + + + other + Amortización acumulada de concesiones administrativas + + + + 2803 + + + view + Amortización acumulada de propiedad industrial + + + + 2803 + + + other + Amortización acumulada de propiedad industrial + + + + 2805 + + + view + Amortización acumulada de derechos de traspaso + + + + 2805 + + + other + Amortización acumulada de derechos de traspaso + + + + + 2806 + + + view + Amortización acumulada de aplicaciones informáticas + + + + 2806 + + + other + Amortización acumulada de aplicaciones informáticas + + + + + 2807 + + + view + Amortización acumulada de derechos sobre activos cedidos en uso + + + + 2807 + + + other + Amortización acumulada de derechos sobre activos cedidos en uso + + + + + + + 281 + + + view + Amortización acumulada del inmovilizado material + + + + 2811 + + + view + Amortización acumulada de construcciones + + + + 2811 + + + other + Amortización acumulada de construcciones + + + + 2812 + + + view + Amortización acumulada de instalaciones técnicas + + + + 2812 + + + other + Amortización acumulada de instalaciones técnicas + + + + 2813 + + + view + Amortización acumulada de maquinaria + + + + 2813 + + + other + Amortización acumulada de maquinaria + + + + 2814 + + + view + Amortización acumulada de utillaje + + + + 2814 + + + other + Amortización acumulada de utillaje + + + + 2815 + + + view + Amortización acumulada de otras instaciones + + + + 2815 + + + other + Amortización acumulada de otras instaciones + + + + 2816 + + + view + Amortización acumulada de mobiliario + + + + 2816 + + + other + Amortización acumulada de mobiliario + + + + 2817 + + + view + Amortización acumulada de equipos para proceso de información + + + + 2817 + + + other + Amortización acumulada de equipos para proceso de información + + + + 2818 + + + view + Amortización acumulada de elementos de transporte + + + + 2818 + + + other + Amortización acumulada de elementos de transporte + + + + 2819 + + + view + Amortización acumulada de otro inmovilizado material + + + + 2819 + + + other + Amortización acumulada de otro inmovilizado material + + + + 282 + + + view + Amortización acumulada de las inversiones inmobiliarias + + + + 282 + + + other + Amortización acumulada de las inversiones inmobiliarias + + + + + 283 + + + view + Cesiones de uso sin contraprestación + + + + 2830 + + + view + Cesiones de uso del inmovilizado intangible + + + + 2830 + + + other + Cesiones de uso del inmovilizado intangible + + + + + + 2831 + + + view + Cesiones de uso del inmovilizado material + + + + 2831 + + + other + Cesiones de uso del inmovilizado material + + + + + + 2832 + + + view + Cesiones de uso de las inversiones inmobiliarias + + + + + + 2832 + + + other + Cesiones de uso de las inversiones inmobiliarias + + + + + + 29 + + + view + Deterioro de valor de activos no corrientes + + + + 290 + + + view + Deterioro de valor del inmovilizado intangible + + + + 2900 + + + view + Deterioro del valor de investigación + + + + 2900 + + + other + Deterioro del valor de investigación + + + + 2901 + + + view + Deterioro del valor de desarrollo + + + + 2901 + + + other + Deterioro del valor de desarrollo + + + + 2902 + + + view + Deterioro del valor de concesiones administrativas + + + + 2902 + + + other + Deterioro del valor de concesiones administrativas + + + + 2903 + + + view + Deterioro del valor de propiedad industrial + + + + 2903 + + + other + Deterioro del valor de propiedad industrial + + + + 2905 + + + view + Deterioro del valor de derechos de traspaso + + + + 2905 + + + other + Deterioro del valor de derechos de traspaso + + + + 2906 + + + view + Deterioro del valor de aplicaciones informáticas + + + + 2906 + + + other + Deterioro del valor de aplicaciones informáticas + + + + + 2907 + + + view + Deterioro del valor sobre activos cedidos en uso + + + + 2907 + + + other + Deterioro del valor sobre activos cedidos en uso + + + + + + + + 291 + + + view + Deterioro del valor del inmovilizado material + + + + 2910 + + + view + Deterioro de valor de terrenos y bienes naturales + + + + 2910 + + + other + Deterioro de valor de terrenos y bienes naturales + + + + 2911 + + + view + Deterioro de valor de construcciones + + + + 2911 + + + other + Deterioro de valor de construcciones + + + + 2912 + + + view + Deterioro de valor de instalaciones técnicas + + + + 2912 + + + other + Deterioro de valor de instalaciones técnicas + + + + 2913 + + + view + Deterioro de valor de maquinaria + + + + 2913 + + + other + Deterioro de valor de maquinaria + + + + 2914 + + + view + Deterioro de valor de utillaje + + + + 2914 + + + other + Deterioro de valor de utillaje + + + + 2915 + + + view + Deterioro de valor de otras instaciones + + + + 2915 + + + other + Deterioro de valor de otras instaciones + + + + 2916 + + + view + Deterioro de valor de mobiliario + + + + 2916 + + + other + Deterioro de valor de mobiliario + + + + 2917 + + + view + Deterioro de valor de equipos para proceso de información + + + + 2917 + + + other + Deterioro de valor de equipos para proceso de información + + + + 2918 + + + view + Deterioro de valor de elementos de transporte + + + + 2918 + + + other + Deterioro de valor de elementos de transporte + + + + 2919 + + + view + Deterioro de valor de otro inmovilizado material + + + + 2919 + + + other + Deterioro de valor de otro inmovilizado material + + + + 292 + + + view + Deterioro de valor de las inversiones inmobiliarias + + + + 2920 + + + view + Deterioro de valor de los terrenos y bienes naturales + + + + 2920 + + + other + Deterioro de valor de los terrenos y bienes naturales + + + + 2921 + + + view + Deterioro de valor de construcciones + + + + 2921 + + + other + Deterioro de valor de construcciones + + + + 293 + + + view + Deterioro de valor de participaciones en partes vinculadas + + + + 2933 + + + view + Deterioro de valor de participaciones en empresas del grupo + + + + 2933 + + + other + Deterioro de valor de participaciones en empresas del grupo + + + + 2934 + + + view + Deterioro de valor de participaciones en empresas asociadas + + + + 2934 + + + other + Deterioro de valor de participaciones en empresas asociadas + + + + 2935 + + + view + Deterioro de valor de participaciones a largo plazo en otras partes vinculadas + + + + 2935 + + + other + Deterioro de valor de participaciones a largo plazo en otras partes vinculadas + + + + 294 + + + view + Deterioro de valor de valores representativos de deuda de partes vinculadas + + + + 2943 + + + view + Deterioro de valor de valores representativos de deuda de empresas del grupo + + + + 2943 + + + other + Deterioro de valor de valores representativos de deuda de empresas del grupo + + + + 2944 + + + view + Deterioro de valor de valores representativos de deuda de empresas asociadas + + + + 2944 + + + other + Deterioro de valor de valores representativos de deuda de empresas asociadas + + + + 2945 + + + view + Deterioro de valor de valores representativos de deuda de otras partes vinculadas + + + + 2945 + + + other + Deterioro de valor de valores representativos de deuda de otras partes vinculadas + + + + 295 + + + view + Deterioro de valor de créditos a partes vinculadas + + + + 2953 + + + view + Deterioro de valor de créditos a empresas del grupo + + + + 2953 + + + other + Deterioro de valor de créditos a empresas del grupo + + + + 2954 + + + view + Deterioro de valor de créditos a empresas asociadas + + + + 2954 + + + other + Deterioro de valor de créditos a empresas asociadas + + + + 2955 + + + view + Deterioro de valor de créditos a otras partes vinculadas + + + + 2955 + + + other + Deterioro de valor de créditos a otras partes vinculadas + + + + 296 + + + view + Deterioro de valor de participaciones en el patrimonio neto a largo plazo + + + + 296 + + + other + Deterioro de valor de participaciones en el patrimonio neto a largo plazo + + + + 297 + + + view + Deterioro de valor de valores representativos de deuda + + + + 297 + + + other + Deterioro de valor de valores representativos de deuda + + + + + 298 + + + view + Deterioro de valor de créditos + + + + 298 + + + other + Deterioro de valor de créditos + + + + + 299 + + + view + Deterioro de valor de bienes del Patrimonio Histórico + + + + 299 + + + other + Deterioro de valor de bienes del Patrimonio Histórico + + + + + 2990 + + + view + Deterioro de valor de bienes inmuebles + + + + + 2991 + + + view + Deterioro de valor de archivos + + + + 2991 + + + other + Deterioro de valor de archivos + + + + + + 2992 + + + view + Deterioro de valor de bibliotecas + + + + 2992 + + + other + Deterioro de valor de bibliotecas + + + + + 2993 + + + view + Deterioro de valor de Museos + + + + 2993 + + + other + Deterioro de valor de Museos + + + + + + 2994 + + + view + Deterioro de valor de bienes muebles + + + + 2994 + + + other + Deterioro de valor de bienes muebles + + + + + + 3 + + + view + Existencias + + + + 30 + + + view + Bienes destinados a la actividad + + + + 300 + + + view + Mercaderías A + + + + 300 + + + other + Mercaderías A + + + + 301 + + + view + Mercaderías B + + + + 301 + + + other + Mercaderías B + + + + 31 + + + view + Materias Primas + + + + 310 + + + view + Materias Primas A + + + + 310 + + + other + Materias Primas A + + + + 311 + + + view + Materias Primas B + + + + 311 + + + other + Materias Primas B + + + + 32 + + + view + Otros aprovisionamientos + + + + 320 + + + view + Elementos y conjuntos incorporables + + + + 320 + + + other + Elementos y conjuntos incorporables + + + + 321 + + + view + Combustibles + + + + 321 + + + other + Combustibles + + + + 322 + + + view + Repuestos + + + + 322 + + + other + Repuestos + + + + 325 + + + view + Materiales diversos + + + + 325 + + + other + Materiales diversos + + + + 326 + + + view + Embalajes + + + + 326 + + + other + Embalajes + + + + 327 + + + view + Envases + + + + 327 + + + other + Envases + + + + 328 + + + view + Material de oficina + + + + 328 + + + other + Material de oficina + + + + 33 + + + view + Productos en curso + + + + 330 + + + view + Productos en curso A + + + + 330 + + + other + Productos en curso A + + + + 331 + + + view + Productos en curso B + + + + 331 + + + other + Productos en curso B + + + + 34 + + + view + Productos semiterminados + + + + 340 + + + view + Productos semiterminados A + + + + 340 + + + other + Productos semiterminados A + + + + 341 + + + view + Productos semiterminados B + + + + 341 + + + other + Productos semiterminados B + + + + 35 + + + view + Productos terminados + + + + 350 + + + view + Productos terminados A + + + + 350 + + + other + Productos terminados A + + + + 351 + + + view + Productos terminados B + + + + 351 + + + other + Productos terminados B + + + + 36 + + + view + Subproductos, residuos y materiales recuperados + + + + 360 + + + view + Subproductos A + + + + 360 + + + other + Subproductos A + + + + 361 + + + view + Subproductos B + + + + 361 + + + other + Subproductos B + + + + 365 + + + view + Residuos A + + + + 365 + + + other + Residuos A + + + + 366 + + + view + Residuos B + + + + 366 + + + other + Residuos B + + + + 368 + + + view + Materiales recuperados A + + + + 368 + + + other + Materiales recuperados A + + + + 369 + + + view + Materiales recuperados B + + + + 369 + + + other + Materiales recuperados B + + + + 39 + + + view + Deterioro de valor de las existencias + + + + 390 + + + view + Deterioro de valor de bienes destinados a la actividad + + + + 390 + + + other + Deterioro de valor de bienes destinados a la actividad + + + + 391 + + + view + Deterioro de valor de las materias primas + + + + 391 + + + other + Deterioro de valor de las materias primas + + + + 392 + + + view + Deterioro de valor de otros aprovisionamientos + + + + 392 + + + other + Deterioro de valor de otros aprovisionamientos + + + + 393 + + + view + Deterioro de valor de los productos en curso + + + + 393 + + + other + Deterioro de valor de los productos en curso + + + + 394 + + + view + Deterioro de valor de los productos semiterminados + + + + 394 + + + other + Deterioro de valor de los productos semiterminados + + + + 395 + + + view + Deterioro de valor de los productos terminados + + + + 395 + + + other + Deterioro de valor de los productos terminados + + + + 396 + + + view + Deterioro de valor de los subproductos, residuos y materiales recuperados + + + + 396 + + + other + Deterioro de valor de los subproductos, residuos y materiales recuperados + + + + 4 + + + view + Acreedores y deudores por operaciones de la actividad + + + + 40 + + + view + Proveedores + + + + 400 + + + view + Proveedores + + + + 4000 + + + view + Proveedores (euros) + + + + 4000 + + + payable + Proveedores (euros) + + + + 4004 + + + view + Proveedores (moneda extranjera) + + + + 4004 + + + payable + Proveedores (moneda extranjera) + + + + 4009 + + + view + Proveedores, facturas pendientes de recibir o de formalizar + + + + 4009 + + + payable + Proveedores, facturas pendientes de recibir o de formalizar + + + + 401 + + + view + Proveedores, efectos comerciales a pagar + + + + 401 + + + other + Proveedores, efectos comerciales a pagar + + + + 403 + + + view + Proveedores, empresas del grupo + + + + 4030 + + + view + Proveedores, empresas del grupo (euros) + + + + 4030 + + + payable + Proveedores, empresas del grupo (euros) + + + + 4031 + + + view + Efectos comerciales a pagar, empresas del grupo + + + + 4031 + + + payable + Efectos comerciales a pagar, empresas del grupo + + + + 4034 + + + view + Proveedores, empresas del grupo (moneda extranjera) + + + + 4034 + + + payable + Proveedores, empresas del grupo (moneda extranjera) + + + + 4036 + + + view + Envases y embalajes a devolver a proveedores, empresas del grupo + + + + 4036 + + + payable + Envases y embalajes a devolver a proveedores, empresas del grupo + + + + 4039 + + + view + Proveedores, empresas del grupo, facturas pendientes de recibir o de formalizar + + + + 4039 + + + payable + Proveedores, empresas del grupo, facturas pendientes de recibir o de formalizar + + + + 404 + + + view + Proveedores, empresas asociadas + + + + 404 + + + other + Proveedores, empresas asociadas + + + + 405 + + + view + Proveedores, otras partes vinculadas + + + + 405 + + + other + Proveedores, otras partes vinculadas + + + + 406 + + + view + Envases y embalajes a devolver a proveedores + + + + 406 + + + other + Envases y embalajes a devolver a proveedores + + + + 407 + + + view + Anticipos a proveedores + + + + 407 + + + other + Anticipos a proveedores + + + + 41 + + + view + Benerificiarios y acreedores varios + + + + 410 + + + view + Acreedores por prestaciones de servicios + + + + 4100 + + + view + Acreedores por prestaciones de servicios (euros) + + + + 4100 + + + payable + Acreedores por prestaciones de servicios (euros) + + + + 4104 + + + view + Acreedores por prestaciones de servicios (moneda extranjera) + + + + 4104 + + + payable + Acreedores por prestaciones de servicios (moneda extranjera) + + + + 4109 + + + view + Acreedores por prestaciones de servicios, facturas pendientes de recibir o de formalizar + + + + 4109 + + + payable + Acreedores por prestaciones de servicios, facturas pendientes de recibir o de formalizar + + + + 411 + + + view + Acreedores, efectos comerciales a pagar + + + + 411 + + + other + Acreedores, efectos comerciales a pagar + + + + 412 + + + view + Beneficiarios, acreedores + + + + 412 + + + other + Beneficiarios, acreedores + + + + + + + + + 419 + + + view + Acreedores por operaciones en común + + + + 419 + + + other + Acreedores por operaciones en común + + + + 43 + + + view + Clientes + + + + 430 + + + view + Clientes + + + + 4300 + + + view + Clientes (euros) + + + + 4300 + + + receivable + Clientes (euros) + + + + 4304 + + + view + Clientes (moneda extranjera) + + + + 4304 + + + receivable + Clientes (moneda extranjera) + + + + 4309 + + + view + Clientes, facturas pendientes de recibir o de formalizar + + + + 4309 + + + receivable + Clientes, facturas pendientes de recibir o de formalizar + + + + 431 + + + view + Clientes, efectos comerciales a cobrar + + + + 4310 + + + view + Efectos comerciales en cartera + + + + 4310 + + + receivable + Efectos comerciales en cartera + + + + 4311 + + + view + Efectos comerciales descontados + + + + 4311 + + + receivable + Efectos comerciales descontados + + + + 4312 + + + view + Efectos comerciales en gestión de cobro + + + + 4312 + + + receivable + Efectos comerciales en gestión de cobro + + + + 4315 + + + view + Efectos comerciales impagados + + + + 4315 + + + receivable + Efectos comerciales impagados + + + + 432 + + + view + Clientes, operaciones de factoring + + + + 432 + + + other + Clientes, operaciones de factoring + + + + 433 + + + view + Clientes, empresas del grupo + + + + 4330 + + + view + Clientes empresas del grupo (euros) + + + + 4330 + + + receivable + Clientes empresas del grupo (euros) + + + + 4331 + + + view + Efectos comerciales a cobrar, empresas del grupo + + + + 4331 + + + receivable + Efectos comerciales a cobrar, empresas del grupo + + + + 4332 + + + view + Clientes empresas del grupo, operaciones de factoring + + + + 4332 + + + receivable + Clientes empresas del grupo, operaciones de factoring + + + + 4334 + + + view + Clientes empresas del grupo (moneda extranjera) + + + + 4334 + + + receivable + Clientes empresas del grupo (moneda extranjera) + + + + 4336 + + + view + Clientes empresas del grupo de dudoso cobro + + + + 4336 + + + receivable + Clientes empresas del grupo de dudoso cobro + + + + 4337 + + + view + Envases y embalajes a devolver a clientes, empresas del grupo + + + + 4337 + + + receivable + Envases y embalajes a devolver a clientes, empresas del grupo + + + + 4339 + + + view + Clientes empresas del grupo, facturas pendientes de formalizar + + + + 4339 + + + receivable + Clientes empresas del grupo, facturas pendientes de formalizar + + + + 434 + + + view + Clientes, empresas asociadas + + + + 434 + + + other + Clientes, empresas asociadas + + + + 435 + + + view + Clientes, otras partes vinculadas + + + + 435 + + + other + Clientes, otras partes vinculadas + + + + 436 + + + view + Clientes de dudoso cobro + + + + 436 + + + other + Clientes de dudoso cobro + + + + 437 + + + view + Envases y embalajes a devolver por clientes + + + + 437 + + + other + Envases y embalajes a devolver por clientes + + + + 438 + + + view + Anticipos de clientes + + + + 438 + + + other + Anticipos de clientes + + + + 44 + + + view + Usuarios y deudores varios + + + + 440 + + + view + Deudores + + + + 4400 + + + view + Deudores (euros) + + + + 4400 + + + receivable + Deudores (euros) + + + + 4404 + + + view + Deudores (moneda extranjera) + + + + 4404 + + + receivable + Deudores (moneda extranjera) + + + + 4409 + + + view + Deudores, facturas pendientes de formalizar + + + + 4409 + + + receivable + Deudores, facturas pendientes de formalizar + + + + 441 + + + view + Deudores, efectos comerciales a cobrar + + + + 4410 + + + view + Deudores, efectos comerciales en cartera + + + + 4410 + + + receivable + Deudores, efectos comerciales en cartera + + + + 4411 + + + view + Deudores, efectos comerciales descontados + + + + 4411 + + + receivable + Deudores, efectos comerciales descontados + + + + 4412 + + + view + Deudores, efectos comerciales en gestión de cobro + + + + 4412 + + + receivable + Deudores, efectos comerciales en gestión de cobro + + + + 4415 + + + view + Deudores, efectos comerciales impagados + + + + 4415 + + + receivable + Deudores, efectos comerciales impagados + + + + 446 + + + view + Deudores de dudoso cobro + + + + 446 + + + other + Deudores de dudoso cobro + + + + + 447 + + + view + Usuarios, deudores + + + + 447 + + + other + Usuarios, deudores + + + + 448 + + + view + Patrocinadores, afiliados y otros deudores + + + + 4480 + + + view + Patrocinadores + + + + 4480 + + + other + Patrocinadores + + + + 4482 + + + view + Afiliados + + + + 4482 + + + other + Afiliados + + + + + 4489 + + + view + Otros deudores + + + + 4489 + + + other + Otros deudores + + + + + + 449 + + + view + Deudores por operaciones en común + + + + 449 + + + other + Deudores por operaciones en común + + + + 46 + + + view + Personal + + + + 460 + + + view + Anticipos de remuneraciones + + + + 460 + + + other + Anticipos de remuneraciones + + + + + 464 + + + view + Entregas para gastos a justificar + + + + 464 + + + other + Entregas para gastos a justificar + + + + + + 465 + + + view + Remuneraciones pendientes de pago + + + + 465 + + + other + Remuneraciones pendientes de pago + + + + 47 + + + view + Administraciones públicas + + + + 470 + + + view + Hacienda Pública, deudora por diversos conceptos + + + + 4700 + + + view + Hacienda Pública, deudora por IVA + + + + 4700 + + + receivable + Hacienda Pública, deudora por IVA + + + + 4707 + + + view + Hacienda Pública, deudora por colaboración en la entrega y distribución de subvenciones (art.12 Ley de Subvenciones) + + + + 4707 + + + receivable + Hacienda Pública, deudora por colaboración en la entrega y distribución de subvenciones (art.12 Ley de Subvenciones) + + + + + + 4708 + + + view + Hacienda Pública, deudora por subvenciones concedidas + + + + 4708 + + + receivable + Hacienda Pública, deudora por subvenciones concedidas + + + + 4709 + + + view + Hacienda Pública, deudora por devolución de impuestos + + + + 4709 + + + receivable + Hacienda Pública, deudora por devolución de impuestos + + + + 471 + + + view + Organismos de la Seguridad Social, deudores + + + + 471 + + + other + Organismos de la Seguridad Social, deudores + + + + 472 + + + view + Hacienda Pública, IVA soportado + + + + 472000 + + + other + Hacienda Pública. IVA soportado + + + + 473 + + + view + Hacienda Pública, retenciones y pagos a cuenta + + + + 474 + + + view + Activos por impuesto diferido + + + + 4740 + + + view + Activos por diferencias temporarias deducibles + + + + 4740 + + + other + Activos por diferencias temporarias deducibles + + + + 4742 + + + view + Derechos por deducciones y bonificaciones pendientes de aplicar + + + + 4742 + + + other + Derechos por deducciones y bonificaciones pendientes de aplicar + + + + 4745 + + + view + Crédito por pérdidas a compensar del ejercicio + + + + 4745 + + + other + Crédito por pérdidas a compensar del ejercicio + + + + 475 + + + view + Hacienda Pública, acreedora por conceptos fiscales + + + + 4750 + + + view + Hacienda Pública, acreedora por IVA + + + + 475000 + + + payable + Hacienda Pública, acreedora por IVA + + + + 4751 + + + view + Hacienda Pública, acreedora por retenciones practicadas + + + + 4751 + + + payable + Hacienda Pública, acreedora por retenciones practicadas + + + + 4752 + + + view + Hacienda Pública, acreedora por impuesto sobre sociedades + + + + 4752 + + + payable + Hacienda Pública, acreedora por impuesto sobre sociedades + + + + + 4757 + + + view + Hacienda Pública, acreedora por subvenciones recibidas en concepto de entidad colaboradora (art.12 Ley de Subvenciones) + + + + 4757 + + + payable + Hacienda Pública, acreedora por subvenciones recibidas en concepto de entidad colaboradora (art.12 Ley de Subvencioens) + + + + + 4758 + + + view + Hacienda Pública, acreedora por subvenciones a reintegrar + + + + 4758 + + + payable + Hacienda Pública, acreedora por subvenciones a reintegrar + + + + 476 + + + view + Organismos de la Seguridad Social, acreedores + + + + 476 + + + other + Organismos de la Seguridad Social, acreedores + + + + 477 + + + view + Hacienda Pública, IVA repercutido + + + + 477000 + + + other + Hacienda Pública. IVA repercutido + + + + 479 + + + view + Pasivos por diferencias temporarias imponibles + + + + 479 + + + other + Pasivos por diferencias temporarias imponibles + + + + 48 + + + view + Ajustes por periodificación + + + + 480 + + + view + Gastos anticipados + + + + 480 + + + other + Gastos anticipados + + + + 485 + + + view + Ingresos anticipados + + + + 485 + + + other + Ingresos anticipados + + + + 49 + + + view + Deterioro de valor por operaciones de la actividad y provisiones a corto plazo + + + + 490 + + + view + Deterioro de valor de créditos por operaciones de la actividad + + + + 490 + + + other + Deterioro de valor de créditos por operaciones de la actividad + + + + 493 + + + view + Deterioro de valor de créditos por operaciones comerciales con partes vinculadas + + + + 4933 + + + view + Deterioro de valor de créditos por operaciones comerciales con empresas del grupo + + + + 4933 + + + other + Deterioro de valor de créditos por operaciones comerciales con empresas del grupo + + + + 4934 + + + view + Deterioro de valor de créditos por operaciones comerciales con empresas asociadas + + + + 4934 + + + other + Deterioro de valor de créditos por operaciones comerciales con empresas asociadas + + + + 4935 + + + view + Deterioro de valor de créditos por operaciones comerciales con otras partes vinculadas + + + + 4935 + + + other + Deterioro de valor de créditos por operaciones comerciales con otras partes vinculadas + + + + 499 + + + view + Provisiones por operaciones comerciales + + + + 4994 + + + view + Provisión por contratos onerosos + + + + 4994 + + + other + Provisión por contratos onerosos + + + + 4999 + + + view + Provisión para otras operaciones comerciales + + + + 4999 + + + other + Provisión para otras operaciones comerciales + + + + 5 + + + view + Cuentas financieras + + + + 50 + + + view + Empréstitos, deudas con características especiales y otras emisiones análogas a corto plazo + + + + 500 + + + view + Obligaciones y bonos a corto plazo + + + + 500 + + + other + Obligaciones y bonos a corto plazo + + + + 502 + + + view + Acciones o participaciones a corto plazo consideradas como pasivos financieros + + + + 502 + + + other + Acciones o participaciones a corto plazo consideradas como pasivos financieros + + + + 505 + + + view + Deudas representadas en otros valores negociables a corto plazo + + + + 505 + + + other + Deudas representadas en otros valores negociables a corto plazo + + + + 506 + + + view + Intereses a corto plazo de empréstitos y otras emisiones análogas + + + + 506 + + + other + Intereses a corto plazo de empréstitos y otras emisiones análogas + + + + 507 + + + view + Dividendos de acciones o participaciones consideradas como pasivos financieros + + + + 507 + + + other + Dividendos de acciones o participaciones consideradas como pasivos financieros + + + + 509 + + + view + Valores negociables amortizados + + + + 5090 + + + view + Obligaciones y bonos amortizados + + + + 5090 + + + other + Obligaciones y bonos amortizados + + + + 5095 + + + view + Otros valores negociables amortizados + + + + 5095 + + + other + Otros valores negociables amortizados + + + + 51 + + + view + Deudas a corto plazo con partes vinculadas + + + + 510 + + + view + Deudas a corto plazo con entidades de crédito vinculadas + + + + 5103 + + + view + Deudas a corto plazo con entidades de crédito, empresas del grupo + + + + 5103 + + + other + Deudas a corto plazo con entidades de crédito, empresas del grupo + + + + 5104 + + + view + Deudas a corto plazo con entidades de crédito, empresas asociadas + + + + 5104 + + + other + Deudas a corto plazo con entidades de crédito, empresas asociadas + + + + 5105 + + + view + Deudas a corto plazo con otras entidades de crédito vinculadas + + + + 5105 + + + other + Deudas a corto plazo con otras entidades de crédito vinculadas + + + + 511 + + + view + Proveedores de inmovilizado a corto plazo, partes vinculadas + + + + 5113 + + + view + Proveedores de inmovilizado a corto plazo, empresas del grupo + + + + 5113 + + + other + Proveedores de inmovilizado a corto plazo, empresas del grupo + + + + 5114 + + + view + Proveedores de inmovilizado a corto plazo, empresas asociadas + + + + 5114 + + + other + Proveedores de inmovilizado a corto plazo, empresas asociadas + + + + 5115 + + + view + Proveedores de inmovilizado a corto plazo, otras partes vinculadas + + + + 5115 + + + other + Proveedores de inmovilizado a corto plazo, otras partes vinculadas + + + + 512 + + + view + Acreedores por arrendamiento financiero a corto plazo, partes vinculadas + + + + 5123 + + + view + Acreedores por arrendamiento financiero a corto plazo, empresas del grupo + + + + 5123 + + + other + Acreedores por arrendamiento financiero a corto plazo, empresas del grupo + + + + 5124 + + + view + Acreedores por arrendamiento financiero a corto plazo, empresas asociadas + + + + 5124 + + + other + Acreedores por arrendamiento financiero a corto plazo, empresas asociadas + + + + 5125 + + + view + Acreedores por arrendamiento financiero a corto plazo, otras partes vinculadas + + + + 5125 + + + other + Acreedores por arrendamiento financiero a corto plazo, otras partes vinculadas + + + + 513 + + + view + Otras deudas a corto plazo con partes vinculadas + + + + 5133 + + + view + Otras deudas a corto plazo con empresas del grupo + + + + 5133 + + + other + Otras deudas a corto plazo con empresas del grupo + + + + 5134 + + + view + Otras deudas a corto plazo con empresas asociadas + + + + 5134 + + + other + Otras deudas a corto plazo con empresas asociadas + + + + 5135 + + + view + Otras deudas a corto plazo con otras partes vinculadas + + + + 5135 + + + other + Otras deudas a corto plazo con otras partes vinculadas + + + + 514 + + + view + Intereses a corto plazo de deudas con partes vinculadas + + + + 5143 + + + view + Intereses a corto plazo de deudas con empresas del grupo + + + + 5143 + + + other + Intereses a corto plazo de deudas con empresas del grupo + + + + 5144 + + + view + Intereses a corto plazo de deudas con empresas asociadas + + + + 5144 + + + other + Intereses a corto plazo de deudas con empresas asociadas + + + + 5145 + + + view + Intereses a corto plazo de deudas con otras partes vinculadas + + + + 5145 + + + other + Intereses a corto plazo de deudas con otras partes vinculadas + + + + 52 + + + view + Deudas a corto plazo por préstamos recibidos y otros conceptos + + + + 520 + + + view + Deudas a corto plazo con entidades de crédito + + + + 5200 + + + view + Préstamos a corto plazo de entidades de crédito + + + + 5200 + + + other + Préstamos a corto plazo de entidades de crédito + + + + 5201 + + + view + Deudas a corto plazo por crédito dispuesto + + + + 5201 + + + other + Deudas a corto plazo por crédito dispuesto + + + + 5208 + + + view + Deudas por efectos descontados + + + + 5208 + + + other + Deudas por efectos descontados + + + + 5209 + + + view + Deudas por operaciones de “factoring” + + + + 5209 + + + other + Deudas por operaciones de “factoring” + + + + 521 + + + view + Deudas a corto plazo + + + + 521 + + + other + Deudas a corto plazo + + + + 522 + + + view + Deudas a corto plazo transformables en subvenciones, donaciones y legados + + + + 522 + + + other + Deudas a corto plazo transformables en subvenciones, donaciones y legados + + + + 523 + + + view + Proveedores de inmovilizado a corto plazo + + + + 523 + + + other + Proveedores de inmovilizado a corto plazo + + + + 524 + + + view + Acreedores por arrendamiento financiero a corto plazo + + + + 524 + + + other + Acreedores por arrendamiento financiero a corto plazo + + + + 525 + + + view + Efectos a pagar a corto plazo + + + + 525 + + + other + Efectos a pagar a corto plazo + + + + 526 + + + view + Dividendo activo a pagar + + + + 526 + + + other + Dividendo activo a pagar + + + + 527 + + + view + Intereses a corto plazo de deudas con entidades de crédito + + + + 527 + + + other + Intereses a corto plazo de deudas con entidades de crédito + + + + 528 + + + view + Intereses a corto plazo de deudas + + + + 528 + + + other + Intereses a corto plazo de deudas + + + + 529 + + + view + Provisiones a corto plazo + + + + 5290 + + + view + Provisión a corto plazo por retribuciones al personal + + + + 5290 + + + other + Provisión a corto plazo por retribuciones al personal + + + + 5291 + + + view + Provisión a corto plazo para impuestos + + + + 5291 + + + other + Provisión a corto plazo para impuestos + + + + 5292 + + + view + Provisión a corto plazo para otras responsabilidades + + + + 5292 + + + other + Provisión a corto plazo para otras responsabilidades + + + + 5293 + + + view + Provisión a corto plazo por desmantelamiento, retiro o rehabilitación del inmovilizado + + + + 5293 + + + other + Provisión a corto plazo por desmantelamiento, retiro o rehabilitación del inmovilizado + + + + 5295 + + + view + Provisión a corto plazo para actuaciones medioambientales + + + + 5295 + + + other + Provisión a corto plazo para actuaciones medioambientales + + + + 53 + + + view + Inversiones financieras a corto plazo en partes vinculadas + + + + 530 + + + view + Participaciones a corto plazo en partes vinculadas + + + + 5303 + + + view + Participaciones a corto plazo en empresas del grupo + + + + 5303 + + + other + Participaciones a corto plazo en empresas del grupo + + + + 5304 + + + view + Participaciones a corto plazo en empresas asociadas + + + + 5304 + + + other + Participaciones a corto plazo en empresas asociadas + + + + 5305 + + + view + Participaciones a corto plazo en otras partes vinculadas + + + + 5305 + + + other + Participaciones a corto plazo en otras partes vinculadas + + + + 531 + + + view + Valores representativos de deuda a corto plazo de partes vinculadas + + + + 5313 + + + view + Valores representativos de deuda a corto plazo de empresas del grupo + + + + 5313 + + + other + Valores representativos de deuda a corto plazo de empresas del grupo + + + + 5314 + + + view + Valores representativos de deuda a corto plazo de empresas asociadas + + + + 5314 + + + other + Valores representativos de deuda a corto plazo de empresas asociadas + + + + 5315 + + + view + Valores representativos de deuda a corto plazo de otras partes vinculadas + + + + 5315 + + + other + Valores representativos de deuda a corto plazo de otras partes vinculadas + + + + 532 + + + view + Créditos a corto plazo a partes vinculadas + + + + 5323 + + + view + Créditos a corto plazo a empresas del grupo + + + + 5323 + + + other + Créditos a corto plazo a empresas del grupo + + + + 5324 + + + view + Créditos a corto plazo a empresas asociadas + + + + 5324 + + + other + Créditos a corto plazo a empresas asociadas + + + + 5325 + + + view + Créditos a corto plazo a otras partes vinculadas + + + + 5325 + + + other + Créditos a corto plazo a otras partes vinculadas + + + + 533 + + + view + Intereses a corto plazo de valores representativos de deuda de partes vinculadas + + + + 5333 + + + view + Intereses a corto plazo de valores representativos de deuda de empresas del grupo + + + + 5333 + + + other + Intereses a corto plazo de valores representativos de deuda de empresas del grupo + + + + 5334 + + + view + Intereses a corto plazo de valores representativos de deuda de empresas asociadas + + + + 5334 + + + other + Intereses a corto plazo de valores representativos de deuda de empresas asociadas + + + + 5335 + + + view + Intereses a corto plazo de valores representativos de deuda de otras partes vinculadas + + + + 5335 + + + other + Intereses a corto plazo de valores representativos de deuda de otras partes vinculadas + + + + 534 + + + view + Intereses a corto plazo de créditos a partes vinculadas + + + + 5343 + + + view + Intereses a corto plazo de créditos a empresas del grupo + + + + 5343 + + + other + Intereses a corto plazo de créditos a empresas del grupo + + + + 5344 + + + view + Intereses a corto plazo de créditos a empresas asociadas + + + + 5344 + + + other + Intereses a corto plazo de créditos a empresas asociadas + + + + 5345 + + + view + Intereses a corto plazo de créditos a otras partes vinculadas + + + + 5345 + + + other + Intereses a corto plazo de créditos a otras partes vinculadas + + + + 535 + + + view + Dividendo a cobrar de inversiones financieras en partes vinculadas + + + + 5353 + + + view + Dividendo a cobrar de inversiones financieras en empresas del grupo + + + + 5353 + + + other + Dividendo a cobrar de inversiones financieras en empresas del grupo + + + + 5354 + + + view + Dividendo a cobrar de inversiones financieras en empresas asociadas + + + + 5354 + + + other + Dividendo a cobrar de inversiones financieras en empresas asociadas + + + + 5355 + + + view + Dividendo a cobrar de inversiones financieras en otras partes vinculadas + + + + 5355 + + + other + Dividendo a cobrar de inversiones financieras en otras partes vinculadas + + + + 539 + + + view + Desembolsos pendientes sobre participaciones a corto plazo en partes vinculadas + + + + 5393 + + + view + Desembolsos pendientes sobre participaciones a corto plazo en empresas del grupo + + + + 5393 + + + other + Desembolsos pendientes sobre participaciones a corto plazo en empresas del grupo + + + + 5394 + + + view + Desembolsos pendientes sobre participaciones a corto plazo en empresas asociadas + + + + 5394 + + + other + Desembolsos pendientes sobre participaciones a corto plazo en empresas asociadas + + + + 5395 + + + view + Desembolsos pendientes sobre participaciones a corto plazo en otras partes vinculadas + + + + 5395 + + + other + Desembolsos pendientes sobre participaciones a corto plazo en otras partes vinculadas + + + + 54 + + + view + Otras inversiones financieras a corto plazo + + + + 540 + + + view + Inversiones financieras a corto plazo en instrumentos de patrimonio + + + + 540 + + + other + Inversiones financieras a corto plazo en instrumentos de patrimonio + + + + 541 + + + view + Valores representativos de deuda a corto plazo + + + + 541 + + + other + Valores representativos de deuda a corto plazo + + + + 542 + + + view + Créditos a corto plazo + + + + 542 + + + other + Créditos a corto plazo + + + + 543 + + + view + Créditos a corto plazo por enajenación de inmovilizado + + + + 543 + + + other + Créditos a corto plazo por enajenación de inmovilizado + + + + 544 + + + view + Créditos a corto plazo al personal + + + + 544 + + + other + Créditos a corto plazo al personal + + + + 545 + + + view + Dividendo a cobrar + + + + 545 + + + other + Dividendo a cobrar + + + + 546 + + + view + Intereses a corto plazo de valores representativos de deudas + + + + 546 + + + other + Intereses a corto plazo de valores representativos de deudas + + + + 547 + + + view + Intereses a corto plazo de créditos + + + + 547 + + + other + Intereses a corto plazo de créditos + + + + 548 + + + view + Imposiciones a corto plazo + + + + 548 + + + other + Imposiciones a corto plazo + + + + 549 + + + view + Desembolsos pendientes sobre participaciones en el patrimonio neto a corto plazo + + + + 549 + + + other + Desembolsos pendientes sobre participaciones en el patrimonio neto a corto plazo + + + + 55 + + + view + Otras cuentas no bancarias + + + + 550 + + + view + Titular de la explotación + + + + 550 + + + other + Titular de la explotación + + + + 551 + + + view + Cuenta corriente con patronos y otros + + + + 551 + + + other + Cuenta corriente con patronos y otros + + + + 552 + + + view + Cuenta corriente con otras personas y entidades vinculadas + + + + 5523 + + + view + Cuenta corriente con empresas del grupo + + + + 5523 + + + other + Cuenta corriente con empresas del grupo + + + + 5524 + + + view + Cuenta corriente con empresas asociadas + + + + 5524 + + + other + Cuenta corriente con empresas asociadas + + + + 5525 + + + view + Cuenta corriente con otras partes vinculadas + + + + 5525 + + + other + Cuenta corriente con otras partes vinculadas + + + + 554 + + + view + Cuenta corriente con uniones temporales de empresas y comunidades de bienes + + + + 554 + + + other + Cuenta corriente con uniones temporales de empresas y comunidades de bienes + + + + 555 + + + view + Partidas pendientes de aplicación + + + + 555 + + + other + Partidas pendientes de aplicación + + + + 556 + + + view + Desembolsos exigidos sobre participaciones en el patrimonio neto + + + + 5563 + + + view + Desembolsos exigidos sobre participaciones, empresas del grupo + + + + 5563 + + + other + Desembolsos exigidos sobre participaciones, empresas del grupo + + + + 5564 + + + view + Desembolsos exigidos sobre participaciones, empresas asociadas + + + + 5564 + + + other + Desembolsos exigidos sobre participaciones, empresas asociadas + + + + 5565 + + + view + Desembolsos exigidos sobre participaciones, otras partes vinculadas + + + + 5565 + + + other + Desembolsos exigidos sobre participaciones, otras partes vinculadas + + + + 5566 + + + view + Desembolsos exigidos sobre participaciones de otras empresas + + + + 5566 + + + other + Desembolsos exigidos sobre participaciones de otras empresas + + + + 557 + + + view + Dividendo activo a cuenta + + + + 557 + + + other + Dividendo activo a cuenta + + + + 558 + + + view + Fundadores y asociados por desembolsos exigidos + + + + 5580 + + + view + Socios por desembolsos exigidos sobre acciones o participaciones ordinarias + + + + 5580 + + + other + Socios por desembolsos exigidos sobre acciones o participaciones ordinarias + + + + 5585 + + + view + Socios por desembolsos exigidos sobre acciones o participaciones consideradas como pasivos financieros + + + + 5585 + + + other + Socios por desembolsos exigidos sobre acciones o participaciones consideradas como pasivos financieros + + + + 559 + + + view + Derivados financieros a corto plazo + + + + 5590 + + + view + Activos por derivados financieros a corto plazo + + + + 5590 + + + other + Activos por derivados financieros a corto plazo + + + + 5595 + + + view + Pasivos por derivados financieros a corto plazo + + + + 5595 + + + other + Pasivos por derivados financieros a corto plazo + + + + 56 + + + view + Fianzas y depósitos recibidos y constituidos a corto plazo y ajustes por periodificación + + + + 560 + + + view + Fianzas recibidas a corto plazo + + + + 560 + + + other + Fianzas recibidas a corto plazo + + + + 561 + + + view + Depósitos recibidos a corto plazo + + + + 561 + + + other + Depósitos recibidos a corto plazo + + + + 565 + + + view + Fianzas constituidas a corto plazo + + + + 565 + + + other + Fianzas constituidas a corto plazo + + + + 566 + + + view + Depósitos constituidos a corto plazo + + + + 566 + + + other + Depósitos constituidos a corto plazo + + + + 567 + + + view + Intereses pagados por anticipado + + + + 567 + + + other + Intereses pagados por anticipado + + + + 568 + + + view + Intereses cobrados por anticipado + + + + 568 + + + other + Intereses cobrados por anticipado + + + + 57 + + + view + Tesorería + + + + 570 + + + view + Caja, euros + + + + 570 + + + liquidity + Caja, euros + + + + 571 + + + view + Caja, moneda extranjera + + + + 571 + + + liquidity + Caja, moneda extranjera + + + + 572 + + + view + Bancos e instituciones de crédito c/c vista, euros + + + + 572 + + + liquidity + Bancos e instituciones de crédito c/c vista, euros + + + + 573 + + + view + Bancos e instituciones de crédito c/c vista, moneda extranjera + + + + 573 + + + liquidity + Bancos e instituciones de crédito c/c vista, moneda extranjera + + + + 574 + + + view + Bancos e instituciones de crédito, cuentas de ahorro, euros + + + + 574 + + + liquidity + Bancos e instituciones de crédito, cuentas de ahorro, euros + + + + 575 + + + view + Bancos e instituciones de crédito, cuentas de ahorro, moneda extranjera + + + + 575 + + + liquidity + Bancos e instituciones de crédito, cuentas de ahorro, moneda extranjera + + + + 576 + + + view + Inversiones a corto plazo de gran liquidez + + + + 576 + + + liquidity + Inversiones a corto plazo de gran liquidez + + + + 59 + + + view + Deterioro del valor de inversiones financieras a corto plazo y de activos no corrientes mantenidos para la venta + + + + 593 + + + view + Deterioro de valor de participaciones a corto plazo en partes vinculadas + + + + 5933 + + + view + Deterioro de valor de participaciones a corto plazo en empresas del grupo + + + + 5933 + + + other + Deterioro de valor de participaciones a corto plazo en empresas del grupo + + + + 5934 + + + view + Deterioro de valor de participaciones a corto plazo en empresas asociadas + + + + 5934 + + + other + Deterioro de valor de participaciones a corto plazo en empresas asociadas + + + + 5935 + + + view + Deterioro de valor de participaciones a corto plazo en otras partes vinculadas + + + + 5935 + + + other + Deterioro de valor de participaciones a corto plazo en otras partes vinculadas + + + + 594 + + + view + Deterioro de valor de valores representativos de deuda a corto plazo de partes vinculadas + + + + 5943 + + + view + Deterioro de valor de valores representativos de deuda a corto plazo de empresas del grupo + + + + 5943 + + + other + Deterioro de valor de valores representativos de deuda a corto plazo de empresas del grupo + + + + 5944 + + + view + Deterioro de valor de valores representativos de deuda a corto plazo de empresas asociadas + + + + 5944 + + + other + Deterioro de valor de valores representativos de deuda a corto plazo de empresas asociadas + + + + 5945 + + + view + Deterioro de valor de valores representativos de deuda a corto plazo de otras partes vinculadas + + + + 5945 + + + other + Deterioro de valor de valores representativos de deuda a corto plazo de otras partes vinculadas + + + + 595 + + + view + Deterioro de valor de créditos a corto plazo a partes vinculadas + + + + 5953 + + + view + Deterioro de valor de créditos a corto plazo a empresas del grupo + + + + 5953 + + + other + Deterioro de valor de créditos a corto plazo a empresas del grupo + + + + 5954 + + + view + Deterioro de valor de créditos a corto plazo a empresas asociadas + + + + 5954 + + + other + Deterioro de valor de créditos a corto plazo a empresas asociadas + + + + 5955 + + + view + Deterioro de valor de créditos a corto plazo a otras partes vinculadas + + + + 5955 + + + other + Deterioro de valor de créditos a corto plazo a otras partes vinculadas + + + + 596 + + + view + Deterioro de valor de participaciones a corto plazo + + + + 596 + + + other + Deterioro de valor de participaciones a corto plazo + + + + 597 + + + view + Deterioro de valor de valores representativos de deuda a corto plazo + + + + 597 + + + other + Deterioro de valor de valores representativos de deuda a corto plazo + + + + 598 + + + view + Deterioro de valor de créditos a corto plazo + + + + 598 + + + other + Deterioro de valor de créditos a corto plazo + + + + 6 + + + view + Compras y Gastos + + + + 60 + + + view + Compras + + + + 600 + + + view + Compras de bienes destinados a la actividad + + + + 600 + + + other + Compras de bienes destinados a la actividad + + + + 601 + + + view + Compras de materias primas + + + + 601 + + + other + Compras de materias primas + + + + 602 + + + view + Compras de otros aprovisionamientos + + + + 602 + + + other + Compras de otros aprovisionamientos + + + + 606 + + + view + Descuentos sobre compras por pronto pago + + + + 6060 + + + view + Descuentos sobre compras por pronto pago de bienes destinados a la actividad + + + + 6060 + + + other + Descuentos sobre compras por pronto pago de bienes destinados a la actividad + + + + 6061 + + + view + Descuentos sobre compras por pronto pago de materias primas + + + + 6061 + + + other + Descuentos sobre compras por pronto pago de materias primas + + + + 6062 + + + view + Descuentos sobre compras por pronto pago de otros aprovisionamientos + + + + 6062 + + + other + Descuentos sobre compras por pronto pago de otros aprovisionamientos + + + + 607 + + + view + Trabajos realizados por otras empresas + + + + 607 + + + other + Trabajos realizados por otras empresas + + + + 608 + + + view + Devoluciones de compras y operaciones similares + + + + 6080 + + + view + Devoluciones de compras de bienes destinados a la actividad + + + + 6080 + + + other + Devoluciones de compras de bienes destinados a la actividad + + + + 6081 + + + view + Devoluciones de compras de materias primas + + + + 6081 + + + other + Devoluciones de compras de materias primas + + + + 6082 + + + view + Devoluciones de compras de otros aprovisionamientos + + + + 6082 + + + other + Devoluciones de compras de otros aprovisionamientos + + + + 609 + + + view + “Rappels” por compras + + + + 6090 + + + view + "Rappels" por compras de bienes destinados a la actividad + + + + 6090 + + + other + "Rappels" por compras de bienes destinados a la actividad + + + + 6091 + + + view + "Rappels" por compras de materias primas + + + + 6091 + + + other + "Rappels" por compras de materias primas + + + + 6092 + + + view + "Rappels" por compras de otros aprovisionamientos + + + + 6092 + + + other + "Rappels" por compras de otros aprovisionamientos + + + + 61 + + + view + Variación de existencias + + + + 610 + + + view + Variación de existencias de bienes destinados a la actividad + + + + 610 + + + other + Variación de existencias de mercaderías + + + + 611 + + + view + Variación de existencias de materias primas + + + + 611 + + + other + Variación de existencias de materias primas + + + + 612 + + + view + Variación de existencias de otros aprovisionamientos + + + + 612 + + + other + Variación de existencias de otros aprovisionamientos + + + + 62 + + + view + Servicios Exteriores + + + + 620 + + + view + Gastos en investigación y desarrollo del ejercicio + + + + 620 + + + other + Gastos en investigación y desarrollo del ejercicio + + + + 621 + + + view + Arrendamientos y cánones + + + + 621 + + + other + Arrendamientos y cánones + + + + 622 + + + view + Reparaciones y conservación + + + + 622 + + + other + Reparaciones y conservación + + + + 623 + + + view + Servicios de profesionales independientes + + + + 623 + + + other + Servicios de profesionales independientes + + + + 624 + + + view + Transportes + + + + 624 + + + other + Transportes + + + + 625 + + + view + Primas de seguros + + + + 625 + + + other + Primas de seguros + + + + 626 + + + view + Servicios bancarios y similares + + + + 626 + + + other + Servicios bancarios y similares + + + + 627 + + + view + Publicidad, propaganda y relaciones públicas + + + + 627 + + + other + Publicidad, propaganda y relaciones públicas + + + + 628 + + + view + Suministros + + + + 628 + + + other + Suministros + + + + 629 + + + view + Otros servicios + + + + 629 + + + other + Otros servicios + + + + 63 + + + view + Tributos + + + + 630 + + + view + Impuesto sobre beneficios + + + + 6300 + + + view + Impuesto corriente + + + + 6300 + + + other + Impuesto corriente + + + + 6301 + + + view + Impuesto diferido + + + + 6301 + + + other + Impuesto diferido + + + + 631 + + + view + Otros tributos + + + + 631 + + + other + Otros tributos + + + + 633 + + + view + Ajustes negativos en la imposición sobre beneficios + + + + 633 + + + other + Ajustes negativos en la imposición sobre beneficios + + + + 634 + + + view + Ajustes negativos en la imposición indirecta + + + + 6341 + + + view + Ajustes negativos en IVA de activo corriente + + + + 6341 + + + other + Ajustes negativos en IVA de activo corriente + + + + 6342 + + + view + Ajustes negativos en IVA de inversiones + + + + 6342 + + + other + Ajustes negativos en IVA de inversiones + + + + 636 + + + view + Devolución de impuestos + + + + 636 + + + other + Devolución de impuestos + + + + 638 + + + view + Ajustes positivos en la imposición sobre beneficios + + + + 638 + + + other + Ajustes positivos en la imposición sobre beneficios + + + + 639 + + + view + Ajustes positivos en la imposición indirecta + + + + 6391 + + + view + Ajustes positivos en IVA de activo corriente + + + + 6391 + + + other + Ajustes positivos en IVA de activo corriente + + + + 6392 + + + view + Ajustes positivos en IVA de inversiones + + + + 6392 + + + other + Ajustes positivos en IVA de inversiones + + + + 64 + + + view + Gastos de personal + + + + 640 + + + view + Sueldos y salarios + + + + 640 + + + other + Sueldos y salarios + + + + 641 + + + view + Indemnizaciones + + + + 641 + + + other + Indemnizaciones + + + + 642 + + + view + Seguridad Social a cargo de la empresa + + + + 642 + + + other + Seguridad Social a cargo de la empresa + + + + 649 + + + view + Otros gastos sociales + + + + 649 + + + other + Otros gastos sociales + + + + 65 + + + view + Ayudas monetarias de la entidad y otros gastos de gestión + + + + 650 + + + view + Ayudas monetarias + + + + + 6501 + + + view + Ayudas monetarias individuales + + + + 6501 + + + other + Ayudas monetarias individuales + + + + + 6502 + + + view + Ayudas monetarias a entidades + + + + 6502 + + + other + Ayudas monetarias a entidades + + + + + 6503 + + + view + Ayudas monetarias realizadas a través de otras entidades o centros + + + + 6503 + + + other + Ayudas monetarias realizadas a través de otras entidades o centros + + + + + 6504 + + + view + Ayudas monetarias de cooperación internacional + + + + 6504 + + + other + Ayudas monetarias de cooperación internacional + + + + + + + + 651 + + + view + Ayudas no monetarias + + + + 6510 + + + view + Beneficio transferido (gestor) + + + + 6510 + + + other + Beneficio transferido (gestor) + + + + 6511 + + + view + Ayudas no monetarias individuales + + + + 6511 + + + other + Ayudas no monetarias individuales + + + + 6512 + + + view + Ayudas no monetarias a entidades + + + + 6512 + + + other + Ayudas no monetarias a entidades + + + + + 6513 + + + view + Ayudas no monetarias realizadas a través de otras entidades o centros + + + + 6513 + + + other + Ayudas no monetarias realizadas a través de otras entidades o centros + + + + + 6514 + + + view + Ayudas no monetarias de cooperación internacional + + + + 6514 + + + other + Ayudas no monetarias de cooperación internacional + + + + + 653 + + + view + Compensación de gastos por prestaciones de colaboración + + + + 653 + + + other + Compensación de gastos por prestaciones de colaboración + + + + + 654 + + + view + Reembolsos de gastos al órgano de gobierno + + + + 654 + + + other + Reembolsos de gastos al órgano de gobierno + + + + + 655 + + + view + Pérdidas de créditos derivados de la actividad incobrables + + + + 655 + + + other + Pérdidas de créditos derivados de la actividad incobrables + + + + + + 656 + + + view + Resultados de operaciones en común + + + + 6560 + + + view + Beneficio transferido (gestor) + + + + 6560 + + + other + Beneficio transferido (gestor) + + + + + 6561 + + + view + Pérdida soportada (partícipe o asociado no gestor) + + + + 6561 + + + other + Pérdida soportada(partícipe o asociado no gestor) + + + + + 658 + + + view + Reintegro de subvenciones, donaciones y legados recibidos, afectados a la actividad propia de la entidad + + + + 658 + + + other + Reintegro de subvenciones, donaciones y legados recibidos, afectos a la actividad propia de la entidad + + + + + + 659 + + + view + Otras pérdidas en gestión corriente + + + + 659 + + + other + Otras pérdidas en gestión corriente + + + + 66 + + + view + Gastos financieros + + + + 660 + + + view + Gastos financieros por actualización de provisiones + + + + 660 + + + other + Gastos financieros por actualización de provisiones + + + + 661 + + + view + Intereses de obligaciones y bonos + + + + 6610 + + + view + Intereses de obligaciones y bonos, empresas del grupo + + + + 6610 + + + other + Intereses de obligaciones y bonos, empresas del grupo + + + + 6611 + + + view + Intereses de obligaciones y bonos, empresas asociadas + + + + 6611 + + + other + Intereses de obligaciones y bonos, empresas asociadas + + + + 6612 + + + view + Intereses de obligaciones y bonos, otras partes vinculadas + + + + 6612 + + + other + Intereses de obligaciones y bonos, otras partes vinculadas + + + + 6613 + + + view + Intereses de obligaciones y bonos, otras empresas + + + + 6613 + + + other + Intereses de obligaciones y bonos, otras empresas + + + + 6615 + + + view + Intereses de obligaciones y bonos a corto plazo, empresas del grupo + + + + 6615 + + + other + Intereses de obligaciones y bonos a corto plazo, empresas del grupo + + + + 6616 + + + view + Intereses de obligaciones y bonos a corto plazo, empresas asociadas + + + + 6616 + + + other + Intereses de obligaciones y bonos a corto plazo, empresas asociadas + + + + 6617 + + + view + Intereses de obligaciones y bonos a corto plazo, otras partes vinculadas + + + + 6617 + + + other + Intereses de obligaciones y bonos a corto plazo, otras partes vinculadas + + + + 6618 + + + view + Intereses de obligaciones y bonos a corto plazo, otras empresas + + + + 6618 + + + other + Intereses de obligaciones y bonos a corto plazo, otras empresas + + + + 662 + + + view + Ingresos de créditos a largo plazo + + + + 6620 + + + view + Ingresos de créditos a largo plazo, empresas del grupo + + + + 6620 + + + other + Ingresos de créditos a largo plazo, empresas del grupo + + + + 6621 + + + view + Ingresos de créditos a largo plazo, empresas asociadas + + + + 6621 + + + other + Ingresos de créditos a largo plazo, empresas asociadas + + + + 6622 + + + view + Ingresos de créditos a largo plazo, otras partes vinculadas + + + + 6622 + + + other + Ingresos de créditos a largo plazo, otras partes vinculadas + + + + 6623 + + + view + Ingresos de créditos a largo plazo con entidades de crédito + + + + 6623 + + + other + Ingresos de créditos a largo plazo con entidades de crédito + + + + 6624 + + + view + Ingresos de créditos a largo plazo, otras empresas + + + + 6624 + + + other + Ingresos de créditos a largo plazo, otras empresas + + + + 663 + + + view + Pérdidas por valoración de activos y pasivos financieros por su valor razonable + + + + 663 + + + other + Pérdidas por valoración de activos y pasivos financieros por su valor razonable + + + + 664 + + + view + Dividendos de acciones o participaciones consideradas como pasivos financieros + + + + 6640 + + + view + Dividendos de pasivos, empresas del grupo + + + + 6640 + + + other + Dividendos de pasivos, empresas del grupo + + + + 6641 + + + view + Dividendos de pasivos, empresas asociadas + + + + 6641 + + + other + Dividendos de pasivos, empresas asociadas + + + + 6642 + + + view + Dividendos de pasivos, otras partes vinculadas + + + + 6642 + + + other + Dividendos de pasivos, otras partes vinculadas + + + + 6643 + + + view + Dividendos de pasivos, otras empresas + + + + 6643 + + + other + Dividendos de pasivos, otras empresas + + + + 665 + + + view + Intereses por descuento de efectos y operaciones de “factoring” + + + + 6650 + + + view + Intereses por descuento de efectos en entidades de crédito del grupo + + + + 6650 + + + other + Intereses por descuento de efectos en entidades de crédito del grupo + + + + 6651 + + + view + Intereses por descuento de efectos en entidades de crédito asociadas + + + + 6651 + + + other + Intereses por descuento de efectos en entidades de crédito asociadas + + + + 6652 + + + view + Intereses por descuento de efectos en entidades de crédito vinculadas + + + + 6652 + + + other + Intereses por descuento de efectos en entidades de crédito vinculadas + + + + 6653 + + + view + Intereses por descuento de efectos en otras entidades de crédito + + + + 6653 + + + other + Intereses por descuento de efectos en otras entidades de crédito + + + + 6654 + + + view + Intereses por operaciones de "factoring" con entidades de crédito del grupo + + + + 6654 + + + other + Intereses por operaciones de "factoring" con entidades de crédito del grupo + + + + 6655 + + + view + Intereses por operaciones de "factoring" con entidades de crédito asociadas + + + + 6655 + + + other + Intereses por operaciones de "factoring" con entidades de crédito asociadas + + + + 6656 + + + view + Intereses por operaciones de "factoring" con entidades de crédito vinculadas + + + + 6656 + + + other + Intereses por operaciones de "factoring" con entidades de crédito vinculadas + + + + 6657 + + + view + Intereses por operaciones de "factoring" con otras entidades de crédito + + + + 6657 + + + other + Intereses por operaciones de "factoring" con otras entidades de crédito + + + + 666 + + + view + Pérdidas en participaciones y valores representativos de deuda + + + + 6660 + + + view + Pérdidas en valores representativos de deuda, empresas del grupo + + + + 6660 + + + other + Pérdidas en valores representativos de deuda, empresas del grupo + + + + 6661 + + + view + Pérdidas en valores representativos de deuda, empresas asociadas + + + + 6661 + + + other + Pérdidas en valores representativos de deuda, empresas asociadas + + + + 6662 + + + view + Pérdidas en valores representativos de deuda, otras partes vinculadas + + + + 6662 + + + other + Pérdidas en valores representativos de deuda, otras partes vinculadas + + + + 6663 + + + view + Pérdidas en valores representativos de deuda, otras empresas + + + + 6663 + + + other + Pérdidas en valores representativos de deuda, otras empresas + + + + 6665 + + + view + Pérdidas en valores representativos de deuda a corto plazo, empresas del grupo + + + + 6665 + + + other + Pérdidas en valores representativos de deuda a corto plazo, empresas del grupo + + + + 6666 + + + view + Pérdidas en valores representativos de deuda a corto plazo, empresas asociadas + + + + 6666 + + + other + Pérdidas en valores representativos de deuda a corto plazo, empresas asociadas + + + + 6667 + + + view + Pérdidas en valores representativos de deuda a corto plazo, otras partes vinculadas + + + + 6667 + + + other + Pérdidas en valores representativos de deuda a corto plazo, otras partes vinculadas + + + + 6668 + + + view + Pérdidas en valores representativos de deuda a corto plazo, otras empresas + + + + 6668 + + + other + Pérdidas en valores representativos de deuda a corto plazo, otras empresas + + + + 667 + + + view + Pérdidas de créditos no comerciales + + + + 6670 + + + view + Pérdidas de créditos, empresas del grupo + + + + 6670 + + + other + Pérdidas de créditos, empresas del grupo + + + + 6671 + + + view + Pérdidas de créditos, empresas asociadas + + + + 6671 + + + other + Pérdidas de créditos, empresas asociadas + + + + 6672 + + + view + Pérdidas de créditos, otras partes vinculadas + + + + 6672 + + + other + Pérdidas de créditos, otras partes vinculadas + + + + 6673 + + + view + Pérdidas de créditos, otras empresas + + + + 6673 + + + other + Pérdidas de créditos, otras empresas + + + + 6675 + + + view + Pérdidas de créditos a corto plazo, empresas del grupo + + + + 6675 + + + other + Pérdidas de créditos a corto plazo, empresas del grupo + + + + 6676 + + + view + Pérdidas de créditos a corto plazo, empresas asociadas + + + + 6676 + + + other + Pérdidas de créditos a corto plazo, empresas asociadas + + + + 6677 + + + view + Pérdidas de créditos a corto plazo, otras partes vinculadas + + + + 6677 + + + other + Pérdidas de créditos a corto plazo, otras partes vinculadas + + + + 6678 + + + view + Pérdidas de créditos a corto plazo, otras empresas + + + + 6678 + + + other + Pérdidas de créditos a corto plazo, otras empresas + + + + 668 + + + view + Diferencias negativas de cambio + + + + 668 + + + other + Diferencias negativas de cambio + + + + 669 + + + view + Otros gastos financieros + + + + 669 + + + other + Otros gastos financieros + + + + 67 + + + view + Pérdidas procedentes de activos no corrientes y gastos excepcionales + + + + 670 + + + view + Pérdidas procedentes del inmovilizado intangible + + + + 670 + + + other + Pérdidas procedentes del inmovilizado intangible + + + + 671 + + + view + Pérdidas procedentes del inmovilizado material y bienes del Patrimonio Histórico + + + + 671 + + + other + Pérdidas procedentes del inmovilizado material y bienes del Patrimonio Histórico + + + + 672 + + + view + Pérdidas procedentes de las inversiones inmobiliarias + + + + 672 + + + other + Pérdidas procedentes de las inversiones inmobiliarias + + + + 673 + + + view + Pérdidas procedentes de participaciones en partes vinculadas + + + + 6733 + + + view + Pérdidas procedentes de participaciones en, empresas del grupo + + + + 6733 + + + other + Pérdidas procedentes de participaciones en, empresas del grupo + + + + 6734 + + + view + Pérdidas procedentes de participaciones, empresas asociadas + + + + 6734 + + + other + Pérdidas procedentes de participaciones, empresas asociadas + + + + 6735 + + + view + Pérdidas procedentes de participaciones, otras partes vinculadas + + + + 6735 + + + other + Pérdidas procedentes de participaciones, otras partes vinculadas + + + + 675 + + + view + Pérdidas por operaciones con obligaciones propias + + + + 675 + + + other + Pérdidas por operaciones con obligaciones propias + + + + 678 + + + view + Gastos excepcionales + + + + 678 + + + other + Gastos excepcionales + + + + 68 + + + view + Dotaciones para amortizaciones + + + + 680 + + + view + Amortización del inmovilizado intangible + + + + 680 + + + other + Amortización del inmovilizado intangible + + + + 681 + + + view + Amortización del inmovilizado material + + + + 681 + + + other + Amortización del inmovilizado material + + + + 682 + + + view + Amortización de las inversiones inmobiliarias + + + + 682 + + + other + Amortización de las inversiones inmobiliarias + + + + 69 + + + view + Pérdidas por deterioro y otras dotaciones + + + + 690 + + + view + Pérdidas por deterioro del inmovilizado intangible + + + + 690 + + + other + Pérdidas por deterioro del inmovilizado intangible + + + + 691 + + + view + Pérdidas por deterioro del inmovilizado material y bienes del Patrimonio Histórico + + + + 691 + + + other + Pérdidas por deterioro del inmovilizado material y bienes del Patrimonio Histórico + + + + + 6910 + + + view + Pérdidas por deterioro del inmovilizado material + + + + + 6911 + + + view + Pérdidas por deterioro de bienes del Patrimonio Histórico + + + + 6911 + + + other + Pérdidas por deterioro bienes del Patrimonio Histórico + + + + + + + 692 + + + view + Pérdidas por deterioro de las inversiones inmobiliarias + + + + 692 + + + other + Pérdidas por deterioro de las inversiones inmobiliarias + + + + 693 + + + view + Pérdidas por deterioro de existencias + + + + 6930 + + + view + Pérdidas por deterioro de productos terminados y en curso de fabricación + + + + 6930 + + + other + Pérdidas por deterioro de productos terminados y en curso de fabricación + + + + 6931 + + + view + Pérdidas por deterioro de mercaderías + + + + 6931 + + + other + Pérdidas por deterioro de mercaderías + + + + 6932 + + + view + Pérdidas por deterioro de materias primas + + + + 6932 + + + other + Pérdidas por deterioro de materias primas + + + + 6933 + + + view + Pérdidas por deterioro de otros aprovisionamientos + + + + 6933 + + + other + Pérdidas por deterioro de otros aprovisionamientos + + + + 694 + + + view + Pérdidas por deterioro de créditos por operaciones de la actividad + + + + 694 + + + other + Pérdidas por deterioro de créditos por operaciones de la actividad + + + + 695 + + + view + Dotación a la provisión por operaciones comerciales + + + + 6954 + + + view + Dotación a la provisión por contratos onerosos + + + + 6954 + + + other + Dotación a la provisión por contratos onerosos + + + + 6959 + + + view + Dotación a la provisión para otras operaciones comerciales + + + + 6959 + + + other + Dotación a la provisión para otras operaciones comerciales + + + + 696 + + + view + Pérdidas por deterioro de participaciones y valores representativos de deuda + + + + 6960 + + + view + Pérdidas por deterioro de participaciones en instrumentos de patrimonio neto, empresas del grupo + + + + 6960 + + + other + Pérdidas por deterioro de participaciones en instrumentos de patrimonio neto, empresas del grupo + + + + 6961 + + + view + Pérdidas por deterioro de participaciones en instrumentos de patrimonio neto, empresas asociadas + + + + 6961 + + + other + Pérdidas por deterioro de participaciones en instrumentos de patrimonio neto, empresas asociadas + + + + 6962 + + + view + Pérdidas por deterioro de participaciones en instrumentos de patrimonio neto, otras partes vinculadas + + + + 6962 + + + other + Pérdidas por deterioro de participaciones en instrumentos de patrimonio neto, otras partes vinculadas + + + + 6963 + + + view + Pérdidas por deterioro de participaciones en instrumentos de patrimonio neto, otras empresas + + + + 6963 + + + other + Pérdidas por deterioro de participaciones en instrumentos de patrimonio neto, otras empresas + + + + 6965 + + + view + Pérdidas por deterioro en valores representativos de deuda, empresas del grupo + + + + 6965 + + + other + Pérdidas por deterioro en valores representativos de deuda, empresas del grupo + + + + 6966 + + + view + Pérdidas por deterioro en valores representativos de deuda, empresas asociadas + + + + 6966 + + + other + Pérdidas por deterioro en valores representativos de deuda, empresas asociadas + + + + 6967 + + + view + Pérdidas por deterioro en valores representativos de deuda, otras partes vinculadas + + + + 6967 + + + other + Pérdidas por deterioro en valores representativos de deuda, otras partes vinculadas + + + + 6968 + + + view + Pérdidas por deterioro en valores representativos de deuda, otras empresas + + + + 6968 + + + other + Pérdidas por deterioro en valores representativos de deuda, otras empresas + + + + 697 + + + view + Pérdidas por deterioro de créditos + + + + 6970 + + + view + Pérdidas por deterioro de créditos, empresas del grupo + + + + 6970 + + + other + Pérdidas por deterioro de créditos, empresas del grupo + + + + 6971 + + + view + Pérdidas por deterioro de créditos, empresas asociadas + + + + 6971 + + + other + Pérdidas por deterioro de créditos, empresas asociadas + + + + 6972 + + + view + Pérdidas por deterioro de créditos, otras partes vinculadas + + + + 6972 + + + other + Pérdidas por deterioro de créditos, otras partes vinculadas + + + + 6973 + + + view + Pérdidas por deterioro de créditos, otras empresas + + + + 6973 + + + other + Pérdidas por deterioro de créditos, otras empresas + + + + 698 + + + view + Pérdidas por deterioro de participaciones y valores representativos de deuda a corto plazo + + + + 6980 + + + view + Pérdidas por deterioro de participaciones en instrumentos de patrimonio neto a corto plazo, empresas del grupo + + + + 6980 + + + other + Pérdidas por deterioro de participaciones en instrumentos de patrimonio neto a corto plazo, empresas del grupo + + + + 6981 + + + view + Pérdidas por deterioro de participaciones en instrumentos de patrimonio neto a corto plazo, empresas asociadas + + + + 6981 + + + other + Pérdidas por deterioro de participaciones en instrumentos de patrimonio neto a corto plazo, empresas asociadas + + + + 6985 + + + view + Pérdidas por deterioro en valores representativos de deuda a corto plazo, empresas del grupo + + + + 6985 + + + other + Pérdidas por deterioro en valores representativos de deuda a corto plazo, empresas del grupo + + + + 6986 + + + view + Pérdidas por deterioro en valores representativos de deuda a corto plazo, empresas asociadas + + + + 6986 + + + other + Pérdidas por deterioro en valores representativos de deuda a corto plazo, empresas asociadas + + + + 6987 + + + view + Pérdidas por deterioro en valores representativos de deuda a corto plazo, otras partes vinculadas + + + + 6987 + + + other + Pérdidas por deterioro en valores representativos de deuda a corto plazo, otras partes vinculadas + + + + 6988 + + + view + Pérdidas por deterioro en valores representativos de deuda a corto plazo, otras empresas + + + + 6988 + + + other + Pérdidas por deterioro en valores representativos de deuda a corto plazo, otras empresas + + + + 699 + + + view + Pérdidas por deterioro de créditos a corto plazo + + + + 6990 + + + view + Pérdidas por deterioro de créditos a corto plazo, empresas del grupo + + + + 6990 + + + other + Pérdidas por deterioro de créditos a corto plazo, empresas del grupo + + + + 6991 + + + view + Pérdidas por deterioro de créditos a corto plazo, empresas asociadas + + + + 6991 + + + other + Pérdidas por deterioro de créditos a corto plazo, empresas asociadas + + + + 6992 + + + view + Pérdidas por deterioro de créditos a corto plazo, otras partes vinculadas + + + + 6992 + + + other + Pérdidas por deterioro de créditos a corto plazo, otras partes vinculadas + + + + 6993 + + + view + Pérdidas por deterioro de créditos a corto plazo, otras empresas + + + + 6993 + + + other + Pérdidas por deterioro de créditos a corto plazo, otras empresas + + + + 7 + + + view + Ventas e ingresos + + + + 70 + + + view + Ventas de mercaderías, de producción propia, de servicios, etc. + + + + 700 + + + view + Ventas de mercaderías + + + + 7000 + + + view + Ventas de mercaderías en España + + + + 7000 + + + other + Ventas de mercaderías en España + + + + 7001 + + + view + Ventas de mercaderías Intracomunitarias + + + + 7001 + + + other + Ventas de mercaderías Intracomunitarias + + + + 7002 + + + view + Ventas de mercaderías Exportación + + + + 7002 + + + other + Ventas de mercaderías Exportación + + + + 701 + + + view + Ventas de productos terminados + + + + 7010 + + + view + Ventas de productos terminados en España + + + + 7010 + + + other + Ventas de productos terminados en España + + + + 7011 + + + view + Ventas de productos terminados Intracomunitarias + + + + 7011 + + + other + Ventas de productos terminados Intracomunitarias + + + + 7012 + + + view + Ventas de productos terminados Exportación + + + + 7012 + + + other + Ventas de productos terminados Exportación + + + + 702 + + + view + Ventas de productos semiterminados + + + + 7020 + + + view + Ventas de productos semiterminados en España + + + + 7020 + + + other + Ventas de productos semiterminados en España + + + + 7021 + + + view + Ventas de productos semiterminados Intracomunitarias + + + + 7021 + + + other + Ventas de productos semiterminados Intracomunitarias + + + + 7022 + + + view + Ventas de productos semiterminados Exportación + + + + 7022 + + + other + Ventas de productos semiterminados Exportación + + + + 703 + + + view + Ventas de subproductos y residuos + + + + 7030 + + + view + Ventas de subproductos y residuos en España + + + + 7030 + + + other + Ventas de subproductos y residuos en España + + + + 7031 + + + view + Ventas de subproductos y residuos Intracomunitarias + + + + 7031 + + + other + Ventas de subproductos y residuos Intracomunitarias + + + + 7032 + + + view + Ventas de subproductos y residuos Exportación + + + + 7032 + + + other + Ventas de subproductos y residuos Exportación + + + + 704 + + + view + Ventas de envases y embalajes + + + + 7040 + + + view + Ventas de envases y embalajes en España + + + + 7040 + + + other + Ventas de envases y embalajes en España + + + + 7041 + + + view + Ventas de envases y embalajes Intracomunitarias + + + + 7041 + + + other + Ventas de envases y embalajes Intracomunitarias + + + + 7042 + + + view + Ventas de envases y embalajes Exportación + + + + 7042 + + + other + Ventas de envases y embalajes Exportación + + + + 705 + + + view + Prestaciones de servicios + + + + 7050 + + + view + Prestaciones de servicios en España + + + + 7050 + + + other + Prestaciones de servicios en España + + + + 7051 + + + view + Prestaciones de servicios Intracomunitarias + + + + 7051 + + + other + Prestaciones de servicios Intracomunitarias + + + + 7052 + + + view + Prestaciones de servicios fuera de la UE + + + + 7052 + + + other + Prestaciones de servicios fuera de la UE + + + + 706 + + + view + Descuentos sobre ventas por pronto pago + + + + 7060 + + + view + Descuentos sobre ventas por pronto pago de mercaderías + + + + 7060 + + + other + Descuentos sobre ventas por pronto pago de mercaderías + + + + 7061 + + + view + Descuentos sobre ventas por pronto pago de productos terminados + + + + 7061 + + + other + Descuentos sobre ventas por pronto pago de productos terminados + + + + 7062 + + + view + Descuentos sobre ventas por pronto pago de productos semiterminados + + + + 7062 + + + other + Descuentos sobre ventas por pronto pago de productos semiterminados + + + + 7063 + + + view + Descuentos sobre ventas por pronto pago de subproductos y residuos + + + + 7063 + + + other + Descuentos sobre ventas por pronto pago de subproductos y residuos + + + + 708 + + + view + Devoluciones de ventas y operaciones similares + + + + 7080 + + + view + Devoluciones de ventas de mercaderías + + + + 7080 + + + other + Devoluciones de ventas de mercaderías + + + + 7081 + + + view + Devoluciones de ventas de productos terminados + + + + 7081 + + + other + Devoluciones de ventas de productos terminados + + + + 7082 + + + view + Devoluciones de ventas de productos semiterminados + + + + 7082 + + + other + Devoluciones de ventas de productos semiterminados + + + + 7083 + + + view + Devoluciones de ventas de subproductos y residuos + + + + 7083 + + + other + Devoluciones de ventas de subproductos y residuos + + + + 7084 + + + view + Devoluciones de ventas de envases y embalajes + + + + 7084 + + + other + Devoluciones de ventas de envases y embalajes + + + + 709 + + + view + "Rappels" sobre ventas + + + + 7090 + + + view + "Rappels" sobre ventas de mercaderías + + + + 7090 + + + other + "Rappels" sobre ventas de mercaderías + + + + 7091 + + + view + "Rappels" sobre ventas de productos terminados + + + + 7091 + + + other + "Rappels" sobre ventas de productos terminados + + + + 7092 + + + view + "Rappels" sobre ventas de productos semiterminados + + + + 7092 + + + other + "Rappels" sobre ventas de productos semiterminados + + + + 7093 + + + view + "Rappels" sobre ventas de subproductos y residuos + + + + 7093 + + + other + "Rappels" sobre ventas de subproductos y residuos + + + + 7094 + + + view + "Rappels" sobre ventas de envases y embalajes + + + + 7094 + + + other + "Rappels" sobre ventas de envases y embalajes + + + + 71 + + + view + Variación de existencias + + + + 710 + + + view + Variación de existencias de productos en curso + + + + 710 + + + other + Variación de existencias de productos en curso + + + + 711 + + + view + Variación de existencias de productos semiterminados + + + + 711 + + + other + Variación de existencias de productos semiterminados + + + + 712 + + + view + Variación de existencias de productos terminados + + + + 712 + + + other + Variación de existencias de productos terminados + + + + 713 + + + view + Variación de existencias de subproductos, residuos y materiales recuperados + + + + 713 + + + other + Variación de existencias de subproductos, residuos y materiales recuperados + + + + 72 + + + view + Ingresos propios de la entidad + + + + 720 + + + view + Cuotas de asociados y afiliados + + + + 720 + + + other + Cuotas de asociados y afiliados + + + + + 721 + + + view + Cuotas de usuarios + + + + 721 + + + other + Cuotas de usuarios + + + + + 722 + + + view + Promociones de captación de recursos + + + + 722 + + + other + Promociones de captación de recursos + + + + + 723 + + + view + Ingresos de patrocinadores y colaboraciones + + + + 7230 + + + view + Patrocinio + + + + 7230 + + + other + Patrocinio + + + + + 7231 + + + view + Patrocinio publicitario + + + + 7231 + + + other + Patrocinio publicitario + + + + + + 7233 + + + view + Colaboraciones empresariales + + + + 7233 + + + other + Colaboraciones empresariales + + + + + + + 728 + + + view + Ingresos por reintegro de ayudas y asignaciones + + + + 728 + + + other + Ingresos por reintegro de ayudas y asignaciones + + + + + + + 73 + + + view + Trabajos realizados para la empresa + + + + 730 + + + view + Trabajos realizados para el inmovilizado intangible + + + + 730 + + + other + Trabajos realizados para el inmovilizado intangible + + + + 731 + + + view + Trabajos realizados para el inmovilizado material + + + + 731 + + + other + Trabajos realizados para el inmovilizado material + + + + 732 + + + view + Trabajos realizados en inversiones inmobiliarias + + + + 732 + + + other + Trabajos realizados en inversiones inmobiliarias + + + + 733 + + + view + Trabajos realizados para el inmovilizado material en curso + + + + 733 + + + other + Trabajos realizados para el inmovilizado material en curso + + + + 74 + + + view + Subvenciones, donaciones y legados + + + + 740 + + + view + Subvenciones, donaciones y legados a la explotación + + + + 740 + + + other + Subvenciones, donaciones y legados a la explotación + + + + 746 + + + view + Subvenciones, donaciones y legados de capital transferidos al resultado del ejercicio + + + + 746 + + + other + Subvenciones, donaciones y legados de capital transferidos al resultado del ejercicio + + + + 747 + + + view + Otras subvenciones, donaciones y legados transferidos al resultado del ejercicio + + + + 747 + + + other + Otras subvenciones, donaciones y legados transferidos al resultado del ejercicio + + + + 75 + + + view + Otros ingresos de gestión + + + + 751 + + + view + Resultados de operaciones en común + + + + 7510 + + + view + Pérdida transferido (gestor) + + + + 7510 + + + other + Pérdida transferido (gestor) + + + + 7511 + + + view + Beneficio atribuido (partícipe o asociado no gestor) + + + + 7511 + + + other + Beneficio atribuido (partícipe o asociado no gestor) + + + + 752 + + + view + Ingresos por arrendamientos + + + + 752 + + + other + Ingresos por arrendamientos + + + + 753 + + + view + Ingresos de propiedad industrial cedida en explotación + + + + 753 + + + other + Ingresos de propiedad industrial cedida en explotación + + + + 754 + + + view + Ingresos por comisiones + + + + 754 + + + other + Ingresos por comisiones + + + + 755 + + + view + Ingresos por servicios al personal + + + + 755 + + + other + Ingresos por servicios al personal + + + + 759 + + + view + Ingresos por servicios diversos + + + + 759 + + + other + Ingresos por servicios diversos + + + + 76 + + + view + Ingresos financieros + + + + 760 + + + view + Ingresos de participaciones en instrumentos de patrimonio + + + + 7600 + + + view + Ingresos de participaciones en instrumentos de patrimonio, empresas del grupo + + + + 7600 + + + other + Ingresos de participaciones en instrumentos de patrimonio, empresas del grupo + + + + 7601 + + + view + Ingresos de participaciones en instrumentos de patrimonio, empresas asociadas + + + + 7601 + + + other + Ingresos de participaciones en instrumentos de patrimonio, empresas asociadas + + + + 7602 + + + view + Ingresos de participaciones en instrumentos de patrimonio, otras partes vinculadas + + + + 7602 + + + other + Ingresos de participaciones en instrumentos de patrimonio, otras partes vinculadas + + + + 7603 + + + view + Ingresos de participaciones en instrumentos de patrimonio, otras empresas + + + + 7603 + + + other + Ingresos de participaciones en instrumentos de patrimonio, otras empresas + + + + 761 + + + view + Ingresos de valores representativos de deuda + + + + 7610 + + + view + Ingresos de valores representativos de deuda, empresas del grupo + + + + 7610 + + + other + Ingresos de valores representativos de deuda, empresas del grupo + + + + 7611 + + + view + Ingresos de valores representativos de deuda, empresas asociadas + + + + 7611 + + + other + Ingresos de valores representativos de deuda, empresas asociadas + + + + 7612 + + + view + Ingresos de valores representativos de deuda, otras partes vinculadas + + + + 7612 + + + other + Ingresos de valores representativos de deuda, otras partes vinculadas + + + + 7613 + + + view + Ingresos de valores representativos de deuda, otras empresas + + + + 7613 + + + other + Ingresos de valores representativos de deuda, otras empresas + + + + 762 + + + view + Ingresos de créditos + + + + 7620 + + + view + Ingresos de créditos a largo plazo + + + + 76200 + + + view + Ingresos de créditos a largo plazo, empresas del grupo + + + + 76200 + + + other + Ingresos de créditos a largo plazo, empresas del grupo + + + + 76201 + + + view + Ingresos de créditos a largo plazo, empresas asociadas + + + + 76201 + + + other + Ingresos de créditos a largo plazo, empresas asociadas + + + + 76202 + + + view + Ingresos de créditos a largo plazo, otras partes vinculadas + + + + 76202 + + + other + Ingresos de créditos a largo plazo, otras partes vinculadas + + + + 76203 + + + view + Ingresos de créditos a largo plazo, otras empresas + + + + 76203 + + + other + Ingresos de créditos a largo plazo, otras empresas + + + + 7621 + + + view + Ingresos de créditos a corto plazo + + + + 76210 + + + view + Ingresos de créditos a corto plazo, empresas del grupo + + + + 76210 + + + other + Ingresos de créditos a corto plazo, empresas del grupo + + + + 76211 + + + view + Ingresos de créditos a corto plazo, empresas asociadas + + + + 76211 + + + other + Ingresos de créditos a corto plazo, empresas asociadas + + + + 76212 + + + view + Ingresos de créditos a corto plazo, otras partes vinculadas + + + + 76212 + + + other + Ingresos de créditos a corto plazo, otras partes vinculadas + + + + 76213 + + + view + Ingresos de créditos a corto plazo, otras empresas + + + + 76213 + + + other + Ingresos de créditos a corto plazo, otras empresas + + + + 763 + + + view + Beneficios por valoración de activos y pasivos financieros por su valor razonable + + + + 763 + + + other + Beneficios por valoración de activos y pasivos financieros por su valor razonable + + + + 766 + + + view + Beneficios en participaciones y valores representativos de deuda + + + + 7660 + + + view + Beneficios en valores representativos de deuda a largo plazo, empresas del grupo + + + + 7660 + + + other + Beneficios en valores representativos de deuda a largo plazo, empresas del grupo + + + + 7661 + + + view + Beneficios en valores representativos de deuda a largo plazo, empresas asociadas + + + + 7661 + + + other + Beneficios en valores representativos de deuda a largo plazo, empresas asociadas + + + + 7662 + + + view + Beneficios en valores representativos de deuda a largo plazo, otras partes vinculadas + + + + 7662 + + + other + Beneficios en valores representativos de deuda a largo plazo, otras partes vinculadas + + + + 7663 + + + view + Beneficios en valores representativos de deuda a largo plazo, otras empresas + + + + 7663 + + + other + Beneficios en valores representativos de deuda a largo plazo, otras empresas + + + + 7665 + + + view + Beneficios en valores representativos de deuda a corto plazo, empresas del grupo + + + + 7665 + + + other + Beneficios en valores representativos de deuda a corto plazo, empresas del grupo + + + + 7666 + + + view + Beneficios en valores representativos de deuda a corto plazo, empresas asociadas + + + + 7666 + + + other + Beneficios en valores representativos de deuda a corto plazo, empresas asociadas + + + + 7667 + + + view + Beneficios en valores representativos de deuda a corto plazo, otras partes vinculadas + + + + 7667 + + + other + Beneficios en valores representativos de deuda a corto plazo, otras partes vinculadas + + + + 7668 + + + view + Beneficios en valores representativos de deuda a corto plazo, otras empresas + + + + 7668 + + + other + Beneficios en valores representativos de deuda a corto plazo, otras empresas + + + + 768 + + + view + Diferencias positivas de cambio + + + + 768 + + + other + Diferencias positivas de cambio + + + + 769 + + + view + Otros ingresos financieros + + + + 769 + + + other + Otros ingresos financieros + + + + 77 + + + view + Beneficios procedentes de activos no corrientes e ingresos excepcionales + + + + 770 + + + view + Beneficios procedentes del inmovilizado intangible + + + + 770 + + + other + Beneficios procedentes del inmovilizado intangible + + + + 771 + + + view + Beneficios procedentes del inmovilizado material + + + + 771 + + + other + Beneficios procedentes del inmovilizado material + + + + 772 + + + view + Beneficios procedentes de las inversiones inmobiliarias + + + + 772 + + + other + Beneficios procedentes de las inversiones inmobiliarias + + + + 773 + + + view + Beneficios procedentes de participaciones a largo plazo en partes vinculadas + + + + 7733 + + + view + Beneficios procedentes de participaciones a largo plazo en, empresas del grupo + + + + 7733 + + + other + Beneficios procedentes de participaciones a largo plazo en, empresas del grupo + + + + 7734 + + + view + Beneficios procedentes de participaciones a largo plazo, empresas asociadas + + + + 7734 + + + other + Beneficios procedentes de participaciones a largo plazo, empresas asociadas + + + + 7735 + + + view + Beneficios procedentes de participaciones a largo plazo, otras partes vinculadas + + + + 7735 + + + other + Beneficios procedentes de participaciones a largo plazo, otras partes vinculadas + + + + 775 + + + view + Beneficos por operaciones con obligaciones propias + + + + 775 + + + other + Beneficos por operaciones con obligaciones propias + + + + 778 + + + view + Ingresos excepcionales + + + + 778 + + + other + Ingresos excepcionales + + + + 79 + + + view + Excesos y aplicaciones de provisiones y de pérdidas por deterioro + + + + 790 + + + view + Reversión del deterioro del inmovilizado intangible + + + + 790 + + + other + Reversión del deterioro del inmovilizado intangible + + + + 791 + + + view + Reversión del deterioro del inmovilizado material y de bienes del Patrimonio Histórico + + + + 791 + + + other + Reversión del deterioro del inmovilizado material y de bienes del Patrimonio Histórico + + + + 792 + + + view + Reversión del deterioro de las inversiones inmobiliarias + + + + 792 + + + other + Reversión del deterioro de las inversiones inmobiliarias + + + + 793 + + + view + Reversión del deterioro de existencias + + + + 7930 + + + view + Reversión del deterioro de productos terminados y en curso de fabricación + + + + 7930 + + + other + Reversión del deterioro de productos terminados y en curso de fabricación + + + + 7931 + + + view + Reversión del deterioro de mercaderías + + + + 7931 + + + other + Reversión del deterioro de mercaderías + + + + 7932 + + + view + Reversión del deterioro de materias primas + + + + 7932 + + + other + Reversión del deterioro de materias primas + + + + 7933 + + + view + Reversión del deterioro de otros aprovisionamientos + + + + 7933 + + + other + Reversión del deterioro de otros aprovisionamientos + + + + 794 + + + view + Reversión del deterioro de créditos por operaciones de la actividad + + + + 794 + + + other + Reversión del deterioro de créditos por operaciones de la actividad + + + + 795 + + + view + Exceso de provisiones + + + + 7951 + + + view + Exceso de provisión para impuestos + + + + 7951 + + + other + Exceso de provisión para impuestos + + + + 7952 + + + view + Exceso de provisión para otras responsabilidades + + + + 7952 + + + other + Exceso de provisión para otras responsabilidades + + + + 7954 + + + view + Exceso de provisión por operaciones comerciales + + + + 79544 + + + view + Exceso de provisión por contratos onerosos + + + + 79544 + + + other + Exceso de provisión por contratos onerosos + + + + 79549 + + + view + Exceso de provisión para otras operaciones comerciales + + + + 79549 + + + other + Exceso de provisión para otras operaciones comerciales + + + + 7955 + + + view + Exceso de provisión para actuaciones medioambientales + + + + 7955 + + + other + Exceso de provisión para actuaciones medioambientales + + + + 796 + + + view + Reversión del deterioro de participaciones y valores representativos de deuda a largo plazo + + + + 7960 + + + view + Reversión del deterioro de participaciones en instrumentos de patrimonio neto a largo plazo, empresas del grupo + + + + 7960 + + + other + Reversión del deterioro de participaciones en instrumentos de patrimonio neto a largo plazo, empresas del grupo + + + + 7961 + + + view + Reversión del deterioro de participaciones en instrumentos de patrimonio neto a largo plazo, empresas asociadas + + + + 7961 + + + other + Reversión del deterioro de participaciones en instrumentos de patrimonio neto a largo plazo, empresas asociadas + + + + 7962 + + + view + Reversión del deterioro de participaciones en instrumentos de patrimonio neto a largo plazo, otras partes vinculadas + + + + 7962 + + + other + Reversión del deterioro de participaciones en instrumentos de patrimonio neto a largo plazo, otras partes vinculadas + + + + 7963 + + + view + Reversión del deterioro de participaciones en instrumentos de patrimonio neto a largo plazo, otras empresas + + + + 7963 + + + other + Reversión del deterioro de participaciones en instrumentos de patrimonio neto a largo plazo, otras empresas + + + + 7965 + + + view + Reversión del deterioro de valores representativos de deuda a largo plazo, empresas del grupo + + + + 7965 + + + other + Reversión del deterioro de valores representativos de deuda a largo plazo, empresas del grupo + + + + 7966 + + + view + Reversión del deterioro de valores representativos de deuda a largo plazo, empresas asociadas + + + + 7966 + + + other + Reversión del deterioro de valores representativos de deuda a largo plazo, empresas asociadas + + + + 7967 + + + view + Reversión del deterioro de valores representativos de deuda a largo plazo, otras partes vinculadas + + + + 7967 + + + other + Reversión del deterioro de valores representativos de deuda a largo plazo, otras partes vinculadas + + + + 7968 + + + view + Reversión del deterioro de valores representativos de deuda a largo plazo, otras empresas + + + + 7968 + + + other + Reversión del deterioro de valores representativos de deuda a largo plazo, otras empresas + + + + 797 + + + view + Reversión del deterioro de créditos a largo plazo + + + + 7970 + + + view + Reversión del deterioro de créditos a largo plazo, empresas del grupo + + + + 7970 + + + other + Reversión del deterioro de créditos a largo plazo, empresas del grupo + + + + 7971 + + + view + Reversión del deterioro de créditos a largo plazo, empresas asociadas + + + + 7971 + + + other + Reversión del deterioro de créditos a largo plazo, empresas asociadas + + + + 7972 + + + view + Reversión del deterioro de créditos a largo plazo, otras partes vinculadas + + + + 7972 + + + other + Reversión del deterioro de créditos a largo plazo, otras partes vinculadas + + + + 7973 + + + view + Reversión del deterioro de créditos a largo plazo, otras empresas + + + + 7973 + + + other + Reversión del deterioro de créditos a largo plazo, otras empresas + + + + 798 + + + view + Reversión del deterioro de participaciones y valores representativos de deuda a corto plazo + + + + 7980 + + + view + Reversión del deterioro de participaciones en instrumentos de patrimonio neto a corto plazo, empresas del grupo + + + + 7980 + + + other + Reversión del deterioro de participaciones en instrumentos de patrimonio neto a corto plazo, empresas del grupo + + + + 7981 + + + view + Reversión del deterioro de participaciones en instrumentos de patrimonio neto a corto plazo, empresas asociadas + + + + 7981 + + + other + Reversión del deterioro de participaciones en instrumentos de patrimonio neto a corto plazo, empresas asociadas + + + + 7985 + + + view + Reversión del deterioro de valores representativos de deuda a corto plazo, empresas del grupo + + + + 7985 + + + other + Reversión del deterioro de valores representativos de deuda a corto plazo, empresas del grupo + + + + 7986 + + + view + Reversión del deterioro de valores representativos de deuda a corto plazo, empresas asociadas + + + + 7986 + + + other + Reversión del deterioro de valores representativos de deuda a corto plazo, empresas asociadas + + + + 7987 + + + view + Reversión del deterioro de valores representativos de deuda a corto plazo, otras partes vinculadas + + + + 7987 + + + other + Reversión del deterioro de valores representativos de deuda a corto plazo, otras partes vinculadas + + + + 7988 + + + view + Reversión del deterioro de valores representativos de deuda a corto plazo, otras empresas + + + + 7988 + + + other + Reversión del deterioro de valores representativos de deuda a corto plazo, otras empresas + + + + 799 + + + view + Reversión del deterioro de créditos a corto plazo + + + + 7990 + + + view + Reversión del deterioro de créditos a corto plazo, empresas del grupo + + + + 7990 + + + other + Reversión del deterioro de créditos a corto plazo, empresas del grupo + + + + 7991 + + + view + Reversión del deterioro de créditos a corto plazo, empresas asociadas + + + + 7991 + + + other + Reversión del deterioro de créditos a corto plazo, empresas asociadas + + + + 7992 + + + view + Reversión del deterioro de créditos a corto plazo, otras partes vinculadas + + + + 7992 + + + other + Reversión del deterioro de créditos a corto plazo, otras partes vinculadas + + + + 7993 + + + view + Reversión del deterioro de créditos a corto plazo, otras empresas + + + + 7993 + + + other + Reversión del deterioro de créditos a corto plazo, otras empresas + + + + + + + Plantilla Plan de Impuestos ASSOC + + + + + + Plantilla PGCE Asociaciones 2008 + + + + + + + + + + + diff --git a/addons/l10n_es/fiscal_templates_assoc.xml b/addons/l10n_es/fiscal_templates_assoc.xml new file mode 100644 index 00000000000..d81c4b41af5 --- /dev/null +++ b/addons/l10n_es/fiscal_templates_assoc.xml @@ -0,0 +1,2047 @@ + + + + + + + + Régimen Nacional + + + + + Recargo de Equivalencia + + + + + Régimen Extracomunitario + + + + + Régimen Intracomunitario + + + + + Retención IRPF 21% + + + + + Retención IRPF 20% + + + + + Retención IRPF 19% + + + + + Retención IRPF 18% + + + + + Retención IRPF 15% + + + + + Retención IRPF 9% + + + + + Retención IRPF 7% + + + + + Retención IRPF 2% + + + + + Retención IRPF 1% + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/addons/l10n_es/taxes_data_assoc.xml b/addons/l10n_es/taxes_data_assoc.xml new file mode 100644 index 00000000000..1c4c9f61700 --- /dev/null +++ b/addons/l10n_es/taxes_data_assoc.xml @@ -0,0 +1,3540 @@ + + + + + + + + + + + + + + + + + + + + IVA Devengado Base Imponible + -- + 1.0 + + + + + + Base adquisiciones exentas + + + -- + 1.0 + + + + Base ventas exentas + -- + + + 1.0 + + + + + + IVA Soportado exento (operaciones corrientes) + + percent + + + + + + + purchase + + + + + + IVA Exento + + percent + + + + + + + sale + + + + + + + + Régimen general IVA Devengado. Base Imponible 4% + [01] + + 1.0 + + + + Régimen general IVA Devengado. Base Imponible 7% + [04] + + 1.0 + + + Régimen general IVA Devengado. Base Imponible 8% + [04] + + 1.0 + + + + Régimen general IVA Devengado. Base Imponible 10% + [04] + + 1.0 + + + + Régimen general IVA Devengado. Base Imponible 16% + [07] + + 1.0 + + + Régimen general IVA Devengado. Base Imponible 18% + [07] + + 1.0 + + + + Régimen general IVA Devengado. Base Imponible 21% + [07] + + 1.0 + + + + + + + Recargo Equivalencia Base Imponible 0.5% + [10] + + 1.0 + + + + Recargo Equivalencia Base Imponible 1% + [13] + + 1.0 + + + + Recargo Equivalencia Base Imponible 1.4% + [13] + + 1.0 + + + + Recargo Equivalencia Base Imponible 4% + [16] + + 1.0 + + + + Recargo Equivalencia Base Imponible 5.2% + [16] + + 1.0 + + + + + + + Adquisiciones intracomunitarias. Base Imponible + [19] + + 1.0 + + + + + + + + + + + IVA Cuota total devengada + [21] + 1.0 + + + + + Régimen general IVA Devengado. Cuota 4% + [03] + + 1.0 + + + + Régimen general IVA Devengado. Cuota 7% + [06] + + 1.0 + + + + Régimen general IVA Devengado. Cuota 8% + [06] + + 1.0 + + + + Régimen general IVA Devengado. Cuota 10% + [06] + + 1.0 + + + + Régimen general IVA Devengado. Cuota 16% + [09] + + 1.0 + + + + Régimen general IVA Devengado. Cuota 18% + [09] + + 1.0 + + + + Régimen general IVA Devengado. Cuota 21% + [09] + + 1.0 + + + + + + + Recargo Equivalencia. Cuota 0.5% + [12] + + 1.0 + + + + Recargo Equivalencia. Cuota 1% + [15] + + 1.0 + + + + Recargo Equivalencia. Cuota 1.4% + [15] + + 1.0 + + + + Recargo Equivalencia. Cuota 4% + [18] + + 1.0 + + + + Recargo Equivalencia. Cuota 5.2% + [18] + + 1.0 + + + + + + + Adquisiciones intracomunitarias. Cuota + [20] + + 1.0 + + + + + + + + + + + + + + + IVA Deducible Base Imponible + -- + 1.0 + + + + + + Base operaciones interiores corrientes + [22] + + 1.0 + + + Base operaciones interiores corrientes (16%) + -- + + 1.0 + + + Base operaciones interiores corrientes (18%) + -- + + 1.0 + + + + Base operaciones interiores corrientes (7%) + -- + + 1.0 + + + Base operaciones interiores corrientes (8%) + -- + + 1.0 + + + Base operaciones interiores corrientes (4%) + -- + + 1.0 + + + + Base operaciones interiores corrientes (10%) + -- + + 1.0 + + + + Base operaciones interiores corrientes (21%) + -- + + 1.0 + + + + + Base operaciones interiores bienes inversión + [24] + + 1.0 + + + Base operaciones interiores bienes inversión (16%) + -- + + 1.0 + + + + Base operaciones interiores bienes inversión (18%) + -- + + 1.0 + + + + Base operaciones interiores bienes inversión (7%) + -- + + 1.0 + + + + Base operaciones interiores bienes inversión (8%) + -- + + 1.0 + + + + Base operaciones interiores bienes inversión (4%) + -- + + 1.0 + + + + Base operaciones interiores bienes inversión (10%) + -- + + 1.0 + + + + Base operaciones interiores bienes inversión (21%) + -- + + 1.0 + + + + + + Base importaciones bienes corrientes + [26] + + 1.0 + + + Base importaciones bienes corrientes (16%) + -- + + 1.0 + + + Base importaciones bienes corrientes (18%) + -- + + 1.0 + + + + Base importaciones bienes corrientes (7%) + -- + + 1.0 + + + Base importaciones bienes corrientes (8%) + -- + + 1.0 + + + Base importaciones bienes corrientes (4%) + -- + + 1.0 + + + + Base importaciones bienes corrientes (10%) + -- + + 1.0 + + + Base importaciones bienes corrientes (21%) + -- + + 1.0 + + + + + Base importaciones bienes inversión + [28] + + 1.0 + + + Base importaciones bienes inversión (16%) + -- + + 1.0 + + + Base importaciones bienes inversión (18%) + -- + + 1.0 + + + + Base importaciones bienes inversión (7%) + -- + + 1.0 + + + Base importaciones bienes inversión (8%) + -- + + 1.0 + + + Base importaciones bienes inversión (4%) + -- + + 1.0 + + + Base importaciones bienes inversión (10%) + -- + + 1.0 + + + Base importaciones bienes inversión (21%) + -- + + 1.0 + + + + + Base adquisiciones intracomunitarias bienes corrientes + [30] + + 1.0 + + + Base adquisiciones intracomunitarias bienes corrientes (16%) + -- + + 1.0 + + + Base adquisiciones intracomunitarias bienes corrientes (18%) + -- + + 1.0 + + + + Base adquisiciones intracomunitarias bienes corrientes (7%) + -- + + 1.0 + + + Base adquisiciones intracomunitarias bienes corrientes (8%) + -- + + 1.0 + + + Base adquisiciones intracomunitarias bienes corrientes (4%) + -- + + 1.0 + + + Base adquisiciones intracomunitarias bienes corrientes (10%) + -- + + 1.0 + + + Base adquisiciones intracomunitarias bienes corrientes (21%) + -- + + 1.0 + + + + + Base adquisiciones intracomunitarias bienes inversión + [32] + + 1.0 + + + Base adquisiciones intracomunitarias bienes inversión (16%) + -- + + 1.0 + + + Base adquisiciones intracomunitarias bienes inversión (18%) + -- + + 1.0 + + + + Base adquisiciones intracomunitarias bienes inversión (7%) + -- + + 1.0 + + + Base adquisiciones intracomunitarias bienes inversión (8%) + -- + + 1.0 + + + Base adquisiciones intracomunitarias bienes inversión (4%) + -- + + 1.0 + + + Base adquisiciones intracomunitarias bienes inversión (10%) + -- + + 1.0 + + + Base adquisiciones intracomunitarias bienes inversión (21%) + -- + + 1.0 + + + + + Recargo Equivalencia Ded. Base Imponible 0.5% + -- + + 1.0 + + + + Recargo Equivalencia Ded. Base Imponible 1% + -- + + 1.0 + + + + Recargo Equivalencia Ded. Base Imponible 1.4% + -- + + 1.0 + + + + Recargo Equivalencia Ded. Base Imponible 4% + -- + + 1.0 + + + + Recargo Equivalencia Ded. Base Imponible 5.2% + -- + + 1.0 + + + + + + + + IVA deducible (Cuota)- Total a deducir [Mod.303] + [37] + + 1.0 + + + + + Cuotas soportadas operaciones interiores corrientes + [23] + + 1.0 + + + Cuotas soportadas operaciones interiores corrientes (16%) + -- + + 1.0 + + + Cuotas soportadas operaciones interiores corrientes (18%) + -- + + 1.0 + + + + Cuotas soportadas operaciones interiores corrientes (7%) + -- + + 1.0 + + + Cuotas soportadas operaciones interiores corrientes (8%) + -- + + 1.0 + + + Cuotas soportadas operaciones interiores corrientes (10%) + -- + + 1.0 + + + Cuotas soportadas operaciones interiores corrientes (4%) + -- + + 1.0 + + + Cuotas soportadas operaciones interiores corrientes (21%) + -- + + 1.0 + + + + + Cuotas soportadas operaciones interiores bienes inversión + [25] + + 1.0 + + + Cuotas soportadas operaciones interiores bienes inversión (16%) + -- + + 1.0 + + + Cuotas soportadas operaciones interiores bienes inversión (18%) + -- + + 1.0 + + + + Cuotas soportadas operaciones interiores bienes inversión (7%) + -- + + 1.0 + + + Cuotas soportadas operaciones interiores bienes inversión (8%) + -- + + 1.0 + + + Cuotas soportadas operaciones interiores bienes inversión (4%) + -- + + 1.0 + + + Cuotas soportadas operaciones interiores bienes inversión (10%) + -- + + 1.0 + + + Cuotas soportadas operaciones interiores bienes inversión (21%) + -- + + 1.0 + + + + + Cuotas devengadas importaciones bienes corrientes + [27] + + 1.0 + + + Cuotas devengadas importaciones bienes corrientes (16%) + -- + + 1.0 + + + Cuotas devengadas importaciones bienes corrientes (18%) + -- + + 1.0 + + + + Cuotas devengadas importaciones bienes corrientes (7%) + -- + + 1.0 + + + Cuotas devengadas importaciones bienes corrientes (8%) + -- + + 1.0 + + + Cuotas devengadas importaciones bienes corrientes (4%) + -- + + 1.0 + + + Cuotas devengadas importaciones bienes corrientes (10%) + -- + + 1.0 + + + Cuotas devengadas importaciones bienes corrientes (21%) + -- + + 1.0 + + + + + Cuotas devengadas importaciones bienes inversión + [29] + + 1.0 + + + Cuotas devengadas importaciones bienes inversión (16%) + -- + + 1.0 + + + Cuotas devengadas importaciones bienes inversión (18%) + -- + + 1.0 + + + + Cuotas devengadas importaciones bienes inversión (7%) + -- + + 1.0 + + + Cuotas devengadas importaciones bienes inversión (8%) + -- + + 1.0 + + + Cuotas devengadas importaciones bienes inversión (4%) + -- + + 1.0 + + + Cuotas devengadas importaciones bienes inversión (10%) + -- + + 1.0 + + + Cuotas devengadas importaciones bienes inversión (21%) + -- + + 1.0 + + + + En adquisiciones intracomunitarias bienes corrientes + [31] + + 1.0 + + + En adquisiciones intracomunitarias bienes corrientes (16%) + -- + + 1.0 + + + En adquisiciones intracomunitarias bienes corrientes (18%) + -- + + 1.0 + + + + En adquisiciones intracomunitarias bienes corrientes (7%) + -- + + 1.0 + + + En adquisiciones intracomunitarias bienes corrientes (8%) + -- + + 1.0 + + + En adquisiciones intracomunitarias bienes corrientes (4%) + -- + + 1.0 + + + En adquisiciones intracomunitarias bienes corrientes (10%) + -- + + 1.0 + + + En adquisiciones intracomunitarias bienes corrientes (21%) + -- + + 1.0 + + + + En adquisiciones intracomunitarias bienes inversión + [33] + + 1.0 + + + En adquisiciones intracomunitarias bienes inversión (16%) + -- + + 1.0 + + + En adquisiciones intracomunitarias bienes inversión (18%) + -- + + 1.0 + + + + En adquisiciones intracomunitarias bienes inversión (7%) + -- + + 1.0 + + + En adquisiciones intracomunitarias bienes inversión (8%) + -- + + 1.0 + + + En adquisiciones intracomunitarias bienes inversión (4%) + -- + + 1.0 + + + En adquisiciones intracomunitarias bienes inversión (10%) + -- + + 1.0 + + + En adquisiciones intracomunitarias bienes inversión (21%) + -- + + 1.0 + + + + + Entregas Intracomunitarias + [42] + + 1.0 + + + + Exportaciones y operaciones asimiladas + [43] + + 1.0 + + + + Inversión del sujeto pasivo + [44] + + 1.0 + + + + + Recargo Equivalencia Ded. Cuota 0.5% + [12] + + 1.0 + + + + Recargo Equivalencia Ded. Cuota 1% + [15] + + 1.0 + + + + Recargo Equivalencia Ded. Cuota 1.4% + [15] + + 1.0 + + + + Recargo Equivalencia Ded. Cuota 4% + [18] + + 1.0 + + + + Recargo Equivalencia Ded. Cuota 5.2% + [18] + + 1.0 + + + + + + + + + + + 4% IVA Soportado (operaciones corrientes) + + percent + + + + + + + + + + + purchase + + + + + 4% IVA Soportado (bienes de inversión) + + percent + + + + + + + + + + + purchase + + + + + 7% IVA Soportado (operaciones corrientes) + + percent + + + + + + + + + + + purchase + + + + + 7% IVA Soportado (bienes de inversión) + + percent + + + + + + + + + + + purchase + + + + + 8% IVA Soportado (operaciones corrientes) + + percent + + + + + + + + + + + purchase + + + + + 8% IVA Soportado (bienes de inversión) + + percent + + + + + + + + + + + purchase + + + + + 10% IVA Soportado (operaciones corrientes) + + percent + + + + + + + + + + + purchase + + + + + 10% IVA Soportado (bienes de inversión) + + percent + + + + + + + + + + + purchase + + + + + 16% IVA Soportado (operaciones corrientes) + + percent + + + + + + + + + + + purchase + + + + + 16% IVA Soportado (bienes de inversión) + + percent + + + + + + + + + + + purchase + + + + + 18% IVA Soportado (operaciones corrientes) + + percent + + + + + + + + + + + purchase + + + + + 18% IVA Soportado (bienes de inversión) + + percent + + + + + + + + + + + purchase + + + + + 21% IVA Soportado (operaciones corrientes) + + percent + + + + + + + + + + + purchase + + + + + + 21% IVA Soportado (bienes de inversión) + + percent + + + + + + + + + + + purchase + + + + + + + IVA 0% Importaciones bienes corrientes + IVA 0% Importaciones bienes corrientes + + percent + + + + + + + purchase + + + + IVA 0% Importaciones bienes de inversión + IVA 0% Importaciones bienes de inversión + + percent + + + + + + + purchase + + + + + IVA 4% Importaciones bienes corrientes + IVA 4% Importaciones bienes corrientes + + percent + + + + + + + + + + + purchase + + + + IVA 4% Importaciones bienes de inversión + IVA 4% Importaciones bienes de inversión + + percent + + + + + + + + + + + purchase + + + + + IVA 7% Importaciones bienes corrientes + IVA 7% Importaciones bienes corrientes + + percent + + + + + + + + + + + purchase + + + + IVA 7% Importaciones bienes de inversión + IVA 7% Importaciones bienes de inversión + + percent + + + + + + + + + + + purchase + + + + + IVA 8% Importaciones bienes corrientes + IVA 8% Importaciones bienes corrientes + + percent + + + + + + + + + + + purchase + + + + IVA 8% Importaciones bienes de inversión + IVA 8% Importaciones bienes de inversión + + percent + + + + + + + + + + + purchase + + + + + IVA 10% Importaciones bienes corrientes + IVA 10% Importaciones bienes corrientes + + percent + + + + + + + + + + + purchase + + + + IVA 10% Importaciones bienes de inversión + IVA 10% Importaciones bienes de inversión + + percent + + + + + + + + + + + purchase + + + + + IVA 16% Importaciones bienes corrientes + IVA 16% Importaciones bienes corrientes + + percent + + + + + + + + + + + purchase + + + + IVA 16% Importaciones bienes de inversión + IVA 16% Importaciones bienes de inversión + + percent + + + + + + + + + + + purchase + + + + + IVA 18% Importaciones bienes corrientes + IVA 18% Importaciones bienes corrientes + + percent + + + + + + + + + + + purchase + + + + IVA 18% Importaciones bienes de inversión + IVA 18% Importaciones bienes de inversión + + percent + + + + + + + + + + + purchase + + + + + IVA 21% Importaciones bienes corrientes + IVA 21% Importaciones bienes corrientes + + percent + + + + + + + + + + + purchase + + + + IVA 21% Importaciones bienes de inversión + IVA 21% Importaciones bienes de inversión + + percent + + + + + + + + + + + purchase + + + + + + + IVA 0% Exportaciones + IVA 0% Exportaciones + + percent + + + + sale + + + + + + IVA 16% Inversión del sujeto pasivo + IVA 16% Inversión del sujeto pasivo + + percent + + + + + + purchase + + + + IVA 16% Inversión del sujeto pasivo (1) + + + percent + + + + + + + purchase + + + + IVA 16% Inversión del sujeto pasivo (2) + + + percent + + + + + + + + + + + purchase + + + + IVA 16% Inversión del sujeto pasivo (3) + + + percent + + + + + + + + + + + purchase + + + + + IVA 18% Inversión del sujeto pasivo + IVA 18% Inversión del sujeto pasivo + + percent + + + + + + purchase + + + + IVA 18% Inversión del sujeto pasivo (1) + + + percent + + + + + + + purchase + + + + IVA 18% Inversión del sujeto pasivo (2) + + + percent + + + + + + + + + + + purchase + + + + IVA 18% Inversión del sujeto pasivo (3) + + + percent + + + + + + + + + + + purchase + + + + + IVA 21% Inversión del sujeto pasivo + IVA 21% Inversión del sujeto pasivo + + percent + + + + + + purchase + + + + IVA 21% Inversión del sujeto pasivo (1) + + + percent + + + + + + + purchase + + + + IVA 21% Inversión del sujeto pasivo (2) + + + percent + + + + + + + + + + + purchase + + + + IVA 21% Inversión del sujeto pasivo (3) + + + percent + + + + + + + + + + + purchase + + + + + + IVA 4% + + percent + + + + + + + + + + + sale + + + + + IVA 7% + + percent + + + + + + + + + + + sale + + + + + IVA 8% + + percent + + + + + + + + + + + sale + + + + + IVA 10% + + percent + + + + + + + + + + + sale + + + + + IVA 16% + + percent + + + + + + + + + + + sale + + + + + IVA 18% + + percent + + + + + + + + + + + sale + + + + + IVA 21% + + percent + + + + + + + + + + + sale + + + + + + + + 0.50% Recargo Equivalencia + + percent + + + + + + + + + + + sale + + + + + 1% Recargo Equivalencia + + percent + + + + + + + + + + + sale + + + + + 1.4% Recargo Equivalencia + + percent + + + + + + + + + + + sale + + + + + 4% Recargo Equivalencia + + percent + + + + + + + + + + + sale + + + + + 5.2% Recargo Equivalencia + + percent + + + + + + + + + + + sale + + + + + 0.50% Recargo Equivalencia Compras + + percent + + + + + + + + + + + purchase + + + + + 1% Recargo Equivalencia Compras + + percent + + + + + + + + + + + purchase + + + + + 1.4% Recargo Equivalencia Compras + + percent + + + + + + + + + + + purchase + + + + + 4% Recargo Equivalencia Compras + + percent + + + + + + + + + + + purchase + + + + + 5.2% Recargo Equivalencia Compras + + percent + + + + + + + + + + + purchase + + + + + + + + + IVA 0% Intracomunitario + IVA 0% Intracomunitario 0 + + percent + + + + + sale + + + + + + + IVA 16% Intracomunitario. Bienes corrientes + IVA 16% Intracomunitario. Bienes corrientes + + percent + + purchase + + + + + IVA 16% Intracomunitario. Bienes corrientes (1) + + percent + + + + + + + + + purchase + + + + + IVA 16% Intracomunitario. Bienes corrientes (2) + + percent + + + + + + + + + + + purchase + + + + + IVA 18% Intracomunitario. Bienes corrientes + IVA 18% Intracomunitario. Bienes corrientes + + percent + + purchase + + + + + IVA 18% Intracomunitario. Bienes corrientes (1) + + percent + + + + + + + + + purchase + + + + + IVA 18% Intracomunitario. Bienes corrientes (2) + + percent + + + + + + + + + + + purchase + + + + + + + IVA 16% Intracomunitario. Bienes de inversión + IVA 16% Intracomunitario. Bienes de inversión + + percent + + purchase + + + + + IVA 16% Intracomunitario. Bienes de inversión (1) + + percent + + + + + + + + + purchase + + + + + IVA 16% Intracomunitario. Bienes de inversión (2) + + percent + + + + + + + + + + purchase + + + + + IVA 18% Intracomunitario. Bienes de inversión + IVA 18% Intracomunitario. Bienes de inversión + + percent + + purchase + + + + + IVA 18% Intracomunitario. Bienes de inversión (1) + + percent + + + + + + + + + purchase + + + + + IVA 18% Intracomunitario. Bienes de inversión (2) + + percent + + + + + + + + + + purchase + + + + + IVA 7% Intracomunitario. Bienes corrientes + IVA 7% Intracomunitario. Bienes corrientes + + percent + + purchase + + + + + IVA 7% Intracomunitario. Bienes corrientes (1) + + percent + + + + + + + + + purchase + + + + + IVA 7% Intracomunitario. Bienes corrientes (2) + + percent + + + + + + + + + + purchase + + + + + IVA 7% Intracomunitario. Bienes de inversión + IVA 7% Intracomunitario. Bienes de inversión + + percent + + purchase + + + + + IVA 7% Intracomunitario. Bienes de inversión (1) + + percent + + + + + + + + + purchase + + + + + IVA 7% Intracomunitario. Bienes de inversión (2) + + percent + + + + + + + + + + purchase + + + + + IVA 8% Intracomunitario. Bienes corrientes + IVA 8% Intracomunitario. Bienes corrientes + + percent + + purchase + + + + + IVA 8% Intracomunitario. Bienes corrientes (1) + + percent + + + + + + + + + purchase + + + + + IVA 8% Intracomunitario. Bienes corrientes (2) + + percent + + + + + + + + + + purchase + + + + + IVA 8% Intracomunitario. Bienes de inversión + IVA 8% Intracomunitario. Bienes de inversión + + percent + + purchase + + + + + IVA 8% Intracomunitario. Bienes de inversión (1) + + percent + + + + + + + + + purchase + + + + + IVA 8% Intracomunitario. Bienes de inversión (2) + + percent + + + + + + + + + + purchase + + + + + IVA 4% Intracomunitario. Bienes corrientes + IVA 4% Intracomunitario. Bienes corrientes + + percent + + purchase + + + + + IVA 4% Intracomunitario. Bienes corrientes (1) + + percent + + + + + + + + + purchase + + + + + IVA 4% Intracomunitario. Bienes corrientes (2) + + percent + + + + + + + + + + purchase + + + + + IVA 4% Intracomunitario. Bienes de inversión + IVA 4% Intracomunitario. Bienes de inversión + + percent + + purchase + + + + + IVA 4% Intracomunitario. Bienes de inversión (1) + + percent + + + + + + + + + purchase + + + + + IVA 4% Intracomunitario. Bienes de inversión (2) + + percent + + + + + + + + + + purchase + + + + + IVA 10% Intracomunitario. Bienes corrientes + IVA 10% Intracomunitario. Bienes corrientes + + percent + + purchase + + + + + IVA 10% Intracomunitario. Bienes corrientes (1) + + percent + + + + + + + + + purchase + + + + + IVA 10% Intracomunitario. Bienes corrientes (2) + + percent + + + + + + + + + + purchase + + + + + IVA 10% Intracomunitario. Bienes de inversión + IVA 10% Intracomunitario. Bienes de inversión + + percent + + purchase + + + + + IVA 10% Intracomunitario. Bienes de inversión (1) + + percent + + + + + + + + + purchase + + + + + IVA 10% Intracomunitario. Bienes de inversión (2) + + percent + + + + + + + + + + purchase + + + + + IVA 21% Intracomunitario. Bienes corrientes + IVA 21% Intracomunitario. Bienes corrientes + + percent + + purchase + + + + + IVA 21% Intracomunitario. Bienes corrientes (1) + + percent + + + + + + + + + purchase + + + + + IVA 21% Intracomunitario. Bienes corrientes (2) + + percent + + + + + + + + + + + purchase + + + + + IVA 21% Intracomunitario. Bienes de inversión + IVA 21% Intracomunitario. Bienes de inversión + + percent + + purchase + + + + + IVA 21% Intracomunitario. Bienes de inversión (1) + + percent + + + + + + + + + purchase + + + + + IVA 21% Intracomunitario. Bienes de inversión (2) + + percent + + + + + + + + + + purchase + + + + + + + + + + IRPF Retenciones practicadas Base Imponible + B.IRPF + 1.0 + + + + + IRPF Retenciones practicadas Base Imponible 1% + B.IRPF1 + + 1.0 + + + + IRPF Retenciones practicadas Base Imponible 2% + B.IRPF2 + + 1.0 + + + + IRPF Retenciones practicadas Base Imponible 7% + B.IRPF7 + + 1.0 + + + + IRPF Retenciones practicadas Base Imponible 9% + B.IRPF9 + + 1.0 + + + + IRPF Retenciones practicadas Base Imponible 15% + B.IRPF15 + + 1.0 + + + + IRPF Retenciones practicadas Base Imponible 18% + B.IRPF18 + + 1.0 + + + + IRPF Retenciones practicadas Base Imponible 19% + B.IRPF19 + + 1.0 + + + + IRPF Retenciones practicadas Base Imponible 20% + B.IRPF20 + + 1.0 + + + + IRPF Retenciones practicadas Base Imponible 21% + B.IRPF21 + + 1.0 + + + + + IRPF Retenciones practicadas Total Cuota + IRPF + + 1.0 + + + + IRPF Retenciones practicadas Cuota 1% + IRPF1 + + 1.0 + + + + IRPF Retenciones practicadas Cuota 2% + IRPF2 + + 1.0 + + + + IRPF Retenciones practicadas Cuota 7% + IRPF7 + + 1.0 + + + + IRPF Retenciones practicadas Cuota 9% + IRPF9 + + 1.0 + + + + IRPF Retenciones practicadas Cuota 15% + IRPF15 + + 1.0 + + + + IRPF Retenciones practicadas Cuota 18% + IRPF18 + + 1.0 + + + + IRPF Retenciones practicadas Cuota 19% + IRPF19 + + 1.0 + + + + IRPF Retenciones practicadas Cuota 20% + IRPF20 + + 1.0 + + + + IRPF Retenciones practicadas Cuota 21% + IRPF21 + + 1.0 + + + + + 475101 + + + other + Hacienda Pública. Retenciones empresarios módulos 1% + + + + + 475102 + + + other + Hacienda Pública. Retenciones act. agrícolas, ganaderas, forestales 2% + + + + + 475107 + + + other + Hacienda Pública. Retenciones act. profesionales 7% + + + + + 475109 + + + other + Hacienda Pública. Retenciones act. profesionales 9% + + + + + 475115 + + + other + Hacienda Pública. Retenciones act. profesionales 15% + + + + + 475118 + + + other + Hacienda Pública. Retenciones arrendamientos, cap. mobiliario 18% + + + + + 475119 + + + other + Hacienda Pública. Retenciones arrendamientos, cap. mobiliario 19% + + + + + 475120 + + + other + Hacienda Pública. Retenciones arrendamientos, cap. mobiliario 20% + + + + + 475121 + + + other + Hacienda Pública. Retenciones arrendamientos, cap. mobiliario 21% + + + + + + + Retenciones IRPF 1% + + percent + + + + + + + + + + + purchase + + + + + Retenciones IRPF 2% + + percent + + + + + + + + + + + purchase + + + + + Retenciones IRPF 7% + + percent + + + + + + + + + + + purchase + + + + + Retenciones IRPF 9% + + percent + + + + + + + + + + + purchase + + + + + Retenciones IRPF 15% + + percent + + + + + + + + + + + purchase + + + + + Retenciones IRPF 18% + + percent + + + + + + + + + + + purchase + + + + + Retenciones IRPF 19% + + percent + + + + + + + + + + + purchase + + + + + Retenciones IRPF 20% + + percent + + + + + + + + + + + purchase + + + + + Retenciones IRPF 21% + + percent + + + + + + + + + + + purchase + + + + + + + IRPF Retenciones a cuenta Base Imponible + B.IRPF AC + 1.0 + + + + + IRPF Retenciones a cuenta Base Imponible 1% + B.IRPF1 AC + + 1.0 + + + + IRPF Retenciones a cuenta Base Imponible 2% + B.IRPF2 AC + + 1.0 + + + + IRPF Retenciones a cuenta Base Imponible 7% + B.IRPF7 AC + + 1.0 + + + + IRPF Retenciones a cuenta Base Imponible 9% + B.IRPF9 AC + + 1.0 + + + + IRPF Retenciones a cuenta Base Imponible 15% + B.IRPF15 AC + + 1.0 + + + + IRPF Retenciones a cuenta Base Imponible 18% + B.IRPF18 AC + + 1.0 + + + + IRPF Retenciones a cuenta Base Imponible 19% + B.IRPF19 AC + + 1.0 + + + + IRPF Retenciones a cuenta Base Imponible 20% + B.IRPF20 AC + + 1.0 + + + + IRPF Retenciones a cuenta Base Imponible 21% + B.IRPF21 AC + + 1.0 + + + + + IRPF Retenciones a cuenta Total Cuota + IRPF AC + + 1.0 + + + + IRPF Retenciones a cuenta Cuota 1% + IRPF1 AC + + 1.0 + + + + IRPF Retenciones a cuenta Cuota 2% + IRPF2 AC + + 1.0 + + + + IRPF Retenciones a cuenta Cuota 7% + IRPF7 AC + + 1.0 + + + + IRPF Retenciones a cuenta Cuota 9% + IRPF9 AC + + 1.0 + + + + IRPF Retenciones a cuenta Cuota 15% + IRPF15 AC + + 1.0 + + + + IRPF Retenciones a cuenta Cuota 18% + IRPF18 AC + + 1.0 + + + + IRPF Retenciones a cuenta Cuota 19% + IRPF19 AC + + 1.0 + + + + IRPF Retenciones a cuenta Cuota 20% + IRPF20 AC + + 1.0 + + + + IRPF Retenciones a cuenta Cuota 21% + IRPF21 AC + + 1.0 + + + + + 473001 + + + other + Hacienda Pública. Retenciones a cuenta empresarios módulos 1% + + + + + 473002 + + + other + Hacienda Pública. Retenciones a cuenta act. agrícolas, ganaderas, forestales 2% + + + + + 473007 + + + other + Hacienda Pública. Retenciones a cuenta act. profesionales 7% + + + + + 473009 + + + other + Hacienda Pública. Retenciones a cuenta act. profesionales 9% + + + + + 473015 + + + other + Hacienda Pública. Retenciones a cuenta act. profesionales 15% + + + + + 473018 + + + other + Hacienda Pública. Retenciones a cuenta arrendamientos, cap. mobiliario 18% + + + + + 473019 + + + other + Hacienda Pública. Retenciones a cuenta arrendamientos, cap. mobiliario 19% + + + + + 473020 + + + other + Hacienda Pública. Retenciones a cuenta arrendamientos, cap. mobiliario 20% + + + + + 473021 + + + other + Hacienda Pública. Retenciones a cuenta arrendamientos, cap. mobiliario 21% + + + + + + + Retenciones a cuenta IRPF 1% + + percent + + + + + + + + + + + sale + + + + + Retenciones a cuenta IRPF 2% + + percent + + + + + + + + + + + sale + + + + + Retenciones a cuenta IRPF 7% + + percent + + + + + + + + + + + sale + + + + + Retenciones a cuenta IRPF 9% + + percent + + + + + + + + + + + sale + + + + + Retenciones a cuenta IRPF 15% + + percent + + + + + + + + + + + sale + + + + + Retenciones a cuenta IRPF 18% + + percent + + + + + + + + + + + sale + + + + + Retenciones a cuenta IRPF 19% + + percent + + + + + + + + + + + sale + + + + + Retenciones a cuenta IRPF 20% + + percent + + + + + + + + + + + sale + + + + + Retenciones a cuenta IRPF 21% + + percent + + + + + + + + + + + sale + + + From 408f17a88468a3b54e3abc5d21d5a83da89671b7 Mon Sep 17 00:00:00 2001 From: "Ravi Gohil (OpenERP)" Date: Mon, 6 May 2013 14:57:51 +0530 Subject: [PATCH 19/74] [FIX] Company Logo not shown if database name contains capitals(Courtesy: Karel Marissens). (Maintenance Case: 592257) lp bug: https://launchpad.net/bugs/1172679 fixed bzr revid: rgo@tinyerp.com-20130506092751-9zutbjsc5e5mnnvh --- addons/web/controllers/main.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py index 01624ceb1ce..1b4afc643f0 100644 --- a/addons/web/controllers/main.py +++ b/addons/web/controllers/main.py @@ -1379,7 +1379,7 @@ class Binary(openerpweb.Controller): else: try: # create an empty registry - registry = openerp.modules.registry.Registry(dbname.lower()) + registry = openerp.modules.registry.Registry(dbname) with registry.cursor() as cr: cr.execute("""SELECT c.logo_web FROM res_users u From 74dcc49bd8868116a53cf27fb58974c61ba12a99 Mon Sep 17 00:00:00 2001 From: Anael Closson Date: Tue, 7 May 2013 11:27:34 +0200 Subject: [PATCH 20/74] [FIX] OPW 590091 : not searchable functional fields aren't removed from advanced search bzr revid: acl@openerp.com-20130507092734-zmmm0g5c1t8va1dl --- addons/web/static/src/js/search.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/web/static/src/js/search.js b/addons/web/static/src/js/search.js index 37f8bd8b3f2..13abda0c2f4 100644 --- a/addons/web/static/src/js/search.js +++ b/addons/web/static/src/js/search.js @@ -1899,7 +1899,7 @@ instance.web.search.ExtendedSearchProposition = instance.web.Widget.extend(/** @ this._super(parent); this.fields = _(fields).chain() .map(function(val, key) { return _.extend({}, val, {'name': key}); }) - .filter(function (field) { return !field.deprecated; }) + .filter(function (field) { return !field.deprecated && (typeof field.store === 'undefined' || field.store || field.funct_search); }) .sortBy(function(field) {return field.string;}) .value(); this.attrs = {_: _, fields: this.fields, selected: null}; From 9db02eae90a42470ffe4e23c5e1479f206957edb Mon Sep 17 00:00:00 2001 From: Anael Closson Date: Tue, 7 May 2013 17:21:03 +0200 Subject: [PATCH 21/74] [FIX] typo & imp bzr revid: acl@openerp.com-20130507152103-0gm36pnuc4pp6wet --- addons/web/static/src/js/search.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/web/static/src/js/search.js b/addons/web/static/src/js/search.js index 13abda0c2f4..e84a9472ff3 100644 --- a/addons/web/static/src/js/search.js +++ b/addons/web/static/src/js/search.js @@ -1899,7 +1899,7 @@ instance.web.search.ExtendedSearchProposition = instance.web.Widget.extend(/** @ this._super(parent); this.fields = _(fields).chain() .map(function(val, key) { return _.extend({}, val, {'name': key}); }) - .filter(function (field) { return !field.deprecated && (typeof field.store === 'undefined' || field.store || field.funct_search); }) + .filter(function (field) { return !field.deprecated && (field.store === void 0 || field.store || field.fnct_search); }) .sortBy(function(field) {return field.string;}) .value(); this.attrs = {_: _, fields: this.fields, selected: null}; From 3d4b2e27f66280e4804ce5c085a474248f65407f Mon Sep 17 00:00:00 2001 From: "Purnendu Singh (OpenERP)" Date: Fri, 10 May 2013 17:38:40 +0530 Subject: [PATCH 22/74] [FIX] web_calender: when filter is of kind object it was not handled properly bzr revid: psi@tinyerp.com-20130510120840-52zlu9iqpz7977og --- addons/web_calendar/static/src/js/calendar.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/web_calendar/static/src/js/calendar.js b/addons/web_calendar/static/src/js/calendar.js index fdc2f947728..66d2b674128 100644 --- a/addons/web_calendar/static/src/js/calendar.js +++ b/addons/web_calendar/static/src/js/calendar.js @@ -281,7 +281,7 @@ instance.web_calendar.CalendarView = instance.web.View.extend({ var filter = evt[this.color_field]; if (filter) { if(this.fields[this.color_field].selection) { - filter = selection_label[filter]; + filter = (typeof filter === 'object') ? selection_label[filter[0]] : selection_label[filter]; } var filter_value = (typeof filter === 'object') ? filter[0] : filter; if (typeof(fn_filter) === 'function' && !fn_filter(filter_value)) { From 955d3af504b829d1fbba9b869e0eb731cdf6a631 Mon Sep 17 00:00:00 2001 From: Launchpad Translations on behalf of openerp <> Date: Tue, 14 May 2013 06:25:45 +0000 Subject: [PATCH 23/74] Launchpad automatic translations update. bzr revid: launchpad_translations_on_behalf_of_openerp-20130514062545-amio4juyvdyzilre --- addons/account/i18n/ko.po | 14 +- addons/portal/i18n/ko.po | 548 ++++++++++++++++++++++++++++ addons/project_long_term/i18n/tr.po | 10 +- addons/report_intrastat/i18n/tr.po | 10 +- 4 files changed, 566 insertions(+), 16 deletions(-) create mode 100644 addons/portal/i18n/ko.po diff --git a/addons/account/i18n/ko.po b/addons/account/i18n/ko.po index 711b4a354de..36b61c2ea77 100644 --- a/addons/account/i18n/ko.po +++ b/addons/account/i18n/ko.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2013-03-07 08:37+0000\n" -"PO-Revision-Date: 2012-12-21 23:00+0000\n" -"Last-Translator: FULL NAME \n" +"PO-Revision-Date: 2013-05-14 01:08+0000\n" +"Last-Translator: AhnJD \n" "Language-Team: Korean \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-03-28 05:23+0000\n" -"X-Generator: Launchpad (build 16546)\n" +"X-Launchpad-Export-Date: 2013-05-14 06:25+0000\n" +"X-Generator: Launchpad (build 16617)\n" #. module: account #: model:process.transition,name:account.process_transition_supplierreconcilepaid0 @@ -92,7 +92,7 @@ msgstr "총 차변" msgid "" "Error!\n" "You cannot create recursive account templates." -msgstr "" +msgstr "순환구조를 가진 계정과목은 생성할 수 없습니다." #. module: account #. openerp-web @@ -1299,7 +1299,7 @@ msgstr "세금 코드" #. module: account #: field:account.account,currency_mode:0 msgid "Outgoing Currencies Rate" -msgstr "" +msgstr "외화매각 환율" #. module: account #: view:account.analytic.account:0 @@ -2425,7 +2425,7 @@ msgstr "설명" #: field:account.tax,price_include:0 #: field:account.tax.template,price_include:0 msgid "Tax Included in Price" -msgstr "" +msgstr "세금포함된 가격" #. module: account #: view:account.subscription:0 diff --git a/addons/portal/i18n/ko.po b/addons/portal/i18n/ko.po new file mode 100644 index 00000000000..f6325669652 --- /dev/null +++ b/addons/portal/i18n/ko.po @@ -0,0 +1,548 @@ +# Korean translation for openobject-addons +# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013 +# This file is distributed under the same license as the openobject-addons package. +# FIRST AUTHOR , 2013. +# +msgid "" +msgstr "" +"Project-Id-Version: openobject-addons\n" +"Report-Msgid-Bugs-To: FULL NAME \n" +"POT-Creation-Date: 2013-03-07 08:38+0000\n" +"PO-Revision-Date: 2013-05-14 01:13+0000\n" +"Last-Translator: AhnJD \n" +"Language-Team: Korean \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2013-05-14 06:25+0000\n" +"X-Generator: Launchpad (build 16617)\n" + +#. module: portal +#: view:portal.payment.acquirer:0 +msgid "Mako" +msgstr "" + +#. module: portal +#: code:addons/portal/wizard/share_wizard.py:50 +#, python-format +msgid "Please select at least one user to share with" +msgstr "" + +#. module: portal +#: view:portal.wizard:0 +msgid "" +"Select which contacts should belong to the portal in the list below.\n" +" The email address of each selected contact must be " +"valid and unique.\n" +" If necessary, you can fix any contact's email " +"address directly in the list." +msgstr "" + +#. module: portal +#: model:mail.group,name:portal.company_jobs +msgid "Company Jobs" +msgstr "" + +#. module: portal +#: view:portal.payment.acquirer:0 +msgid "amount: the total amount to pay, as a float" +msgstr "" + +#. module: portal +#: view:portal.wizard.user:0 +msgid "Contacts" +msgstr "연락처" + +#. module: portal +#: view:portal.wizard:0 +msgid "This text is included in the email sent to new portal users." +msgstr "" + +#. module: portal +#: view:share.wizard:0 +#: field:share.wizard,group_ids:0 +msgid "Existing groups" +msgstr "기존 그룹" + +#. module: portal +#: view:res.groups:0 +msgid "Portal Groups" +msgstr "포털 그룹" + +#. module: portal +#: code:addons/portal/mail_mail.py:52 +#, python-format +msgid "

Access this document directly in OpenERP

" +msgstr "" + +#. module: portal +#: field:portal.wizard,welcome_message:0 +msgid "Invitation Message" +msgstr "초대 메시지" + +#. module: portal +#: model:ir.actions.act_window,name:portal.partner_wizard_action +#: model:ir.model,name:portal.model_portal_wizard +#: view:portal.wizard:0 +msgid "Portal Access Management" +msgstr "" + +#. module: portal +#: view:res.groups:0 +msgid "Non-Portal Groups" +msgstr "" + +#. module: portal +#: code:addons/portal/wizard/share_wizard.py:54 +#, python-format +msgid "Please select at least one group to share with" +msgstr "" + +#. module: portal +#: model:ir.actions.client,name:portal.action_mail_archives_feeds_portal +#: model:ir.ui.menu,name:portal.portal_mail_archivesfeeds +msgid "Archives" +msgstr "보관" + +#. module: portal +#: model:ir.ui.menu,name:portal.portal_orders +msgid "Quotations and Sales Orders" +msgstr "" + +#. module: portal +#: view:portal.payment.acquirer:0 +msgid "reference: the reference number of the document to pay" +msgstr "" + +#. module: portal +#: help:portal.payment.acquirer,visible:0 +msgid "" +"Make this payment acquirer available in portal forms (Customer invoices, " +"etc.)" +msgstr "" + +#. module: portal +#: model:ir.model,name:portal.model_share_wizard +msgid "Share Wizard" +msgstr "" + +#. module: portal +#: view:portal.payment.acquirer:0 +msgid "" +", so it may use Mako expressions.\n" +" The Mako evaluation context provides:" +msgstr "" + +#. module: portal +#: model:ir.actions.client,help:portal.action_news +msgid "" +"

\n" +" Youd don't have unread company's news.\n" +"

\n" +" " +msgstr "" + +#. module: portal +#: field:portal.wizard.user,email:0 +msgid "Email" +msgstr "" + +#. module: portal +#: view:portal.wizard:0 +msgid "or" +msgstr "" + +#. module: portal +#: model:ir.actions.client,name:portal.action_mail_star_feeds_portal +#: model:ir.ui.menu,name:portal.portal_mail_starfeeds +msgid "To-do" +msgstr "" + +#. module: portal +#: code:addons/portal/wizard/portal_wizard.py:194 +#, python-format +msgid "" +"You must have an email address in your User Preferences to send emails." +msgstr "" + +#. module: portal +#: model:ir.actions.client,name:portal.action_jobs +#: model:ir.ui.menu,name:portal.portal_jobs +msgid "Jobs" +msgstr "" + +#. module: portal +#: field:portal.wizard,user_ids:0 +msgid "Users" +msgstr "" + +#. module: portal +#: code:addons/portal/acquirer.py:82 +#, python-format +msgid "Pay safely online" +msgstr "" + +#. module: portal +#: code:addons/portal/acquirer.py:77 +#, python-format +msgid "No online payment acquirers configured" +msgstr "" + +#. module: portal +#: view:portal.payment.acquirer:0 +msgid "" +"kind: the kind of document on which the payment form is rendered (translated " +"to user language, e.g. \"Invoice\")" +msgstr "" + +#. module: portal +#: help:portal.wizard,portal_id:0 +msgid "The portal that users can be added in or removed from." +msgstr "" + +#. module: portal +#: code:addons/portal/wizard/share_wizard.py:38 +#, python-format +msgid "Users you already shared with" +msgstr "" + +#. module: portal +#: model:ir.actions.client,help:portal.action_jobs +msgid "" +"

\n" +" Youd don't have unread job offers.\n" +"

\n" +" " +msgstr "" + +#. module: portal +#: model:ir.actions.client,help:portal.action_mail_archives_feeds_portal +msgid "" +"

\n" +" No message found and no message sent yet.\n" +"

\n" +" Click on the top-right icon to compose a message. This\n" +" message will be sent by email if it's an internal " +"contact.\n" +"

\n" +" " +msgstr "" + +#. module: portal +#: model:ir.ui.menu,name:portal.portal_menu +#: field:portal.wizard,portal_id:0 +#: field:res.groups,is_portal:0 +#: model:res.groups,name:portal.group_portal +msgid "Portal" +msgstr "" + +#. module: portal +#: code:addons/portal/wizard/portal_wizard.py:34 +#, python-format +msgid "Your OpenERP account at %(company)s" +msgstr "" + +#. module: portal +#: model:res.groups,name:portal.group_anonymous +msgid "Anonymous" +msgstr "" + +#. module: portal +#: field:portal.wizard.user,in_portal:0 +msgid "In Portal" +msgstr "" + +#. module: portal +#: model:ir.actions.client,name:portal.action_news +#: model:ir.ui.menu,name:portal.portal_company_news +msgid "News" +msgstr "" + +#. module: portal +#: model:ir.ui.menu,name:portal.portal_after_sales +msgid "After Sale Services" +msgstr "" + +#. module: portal +#: model:res.groups,comment:portal.group_portal +msgid "" +"Portal members have specific access rights (such as record rules and " +"restricted menus).\n" +" They usually do not belong to the usual OpenERP groups." +msgstr "" + +#. module: portal +#: model:ir.actions.act_window,name:portal.action_acquirer_list +#: view:portal.payment.acquirer:0 +msgid "Payment Acquirers" +msgstr "" + +#. module: portal +#: model:ir.ui.menu,name:portal.portal_projects +msgid "Projects" +msgstr "" + +#. module: portal +#: model:ir.actions.client,name:portal.action_mail_inbox_feeds_portal +#: model:ir.ui.menu,name:portal.portal_inbox +msgid "Inbox" +msgstr "" + +#. module: portal +#: view:share.wizard:0 +#: field:share.wizard,user_ids:0 +msgid "Existing users" +msgstr "" + +#. module: portal +#: field:portal.wizard.user,wizard_id:0 +msgid "Wizard" +msgstr "" + +#. module: portal +#: field:portal.payment.acquirer,name:0 +msgid "Name" +msgstr "" + +#. module: portal +#: model:ir.model,name:portal.model_res_groups +msgid "Access Groups" +msgstr "" + +#. module: portal +#: view:portal.payment.acquirer:0 +msgid "uid: the current user id" +msgstr "" + +#. module: portal +#: view:portal.payment.acquirer:0 +msgid "" +"quote(): a method to quote special string character to make them suitable " +"for inclusion in a URL" +msgstr "" + +#. module: portal +#: code:addons/portal/mail_mail.py:44 +#, python-format +msgid "" +"

Access your messages and personal documents through our " +"Customer Portal

" +msgstr "" + +#. module: portal +#: field:portal.payment.acquirer,form_template:0 +msgid "Payment form template (HTML)" +msgstr "" + +#. module: portal +#: field:portal.wizard.user,partner_id:0 +msgid "Contact" +msgstr "" + +#. module: portal +#: model:ir.model,name:portal.model_mail_mail +msgid "Outgoing Mails" +msgstr "" + +#. module: portal +#: code:addons/portal/wizard/portal_wizard.py:193 +#, python-format +msgid "Email required" +msgstr "" + +#. module: portal +#: model:ir.ui.menu,name:portal.portal_messages +msgid "Messaging" +msgstr "" + +#. module: portal +#: model:res.groups,comment:portal.group_anonymous +msgid "" +"Anonymous users have specific access rights (such as record rules and " +"restricted menus).\n" +" They usually do not belong to the usual OpenERP groups." +msgstr "" + +#. module: portal +#: model:ir.model,name:portal.model_portal_payment_acquirer +msgid "Online Payment Acquirer" +msgstr "" + +#. module: portal +#: model:mail.group,name:portal.company_news_feed +msgid "Company News" +msgstr "" + +#. module: portal +#: code:addons/portal/acquirer.py:76 +#, python-format +msgid "" +"You can finish the configuration in the Bank&Cash settings" +msgstr "" + +#. module: portal +#: view:portal.payment.acquirer:0 +msgid "cr: the current database cursor" +msgstr "" + +#. module: portal +#: model:ir.actions.client,help:portal.action_mail_inbox_feeds_portal +msgid "" +"

\n" +" Good Job! Your inbox is empty.\n" +"

\n" +" Your inbox contains private messages or emails sent to " +"you\n" +" as well as information related to documents or people " +"you\n" +" follow.\n" +"

\n" +" " +msgstr "" + +#. module: portal +#: view:portal.payment.acquirer:0 +msgid "" +"object: the document on which the payment form is rendered (usually an " +"invoice or sales order record)" +msgstr "" + +#. module: portal +#: help:portal.wizard,welcome_message:0 +msgid "This text is included in the email sent to new users of the portal." +msgstr "" + +#. module: portal +#: model:ir.ui.menu,name:portal.portal_company +msgid "About Us" +msgstr "" + +#. module: portal +#: help:res.groups,is_portal:0 +msgid "If checked, this group is usable as a portal." +msgstr "" + +#. module: portal +#: view:portal.payment.acquirer:0 +msgid "Payment Acquirer" +msgstr "" + +#. module: portal +#: code:addons/portal/wizard/portal_wizard.py:35 +#, python-format +msgid "" +"Dear %(name)s,\n" +"\n" +"You have been given access to %(portal)s.\n" +"\n" +"Your login account data is:\n" +"Database: %(db)s\n" +"Username: %(login)s\n" +"\n" +"In order to complete the signin process, click on the following url:\n" +"%(url)s\n" +"\n" +"%(welcome_message)s\n" +"\n" +"--\n" +"OpenERP - Open Source Business Applications\n" +"http://www.openerp.com\n" +msgstr "" + +#. module: portal +#: view:portal.payment.acquirer:0 +msgid "" +"currency: the currency record in which the document is issued (e.g. " +"currency.name could be EUR)" +msgstr "" + +#. module: portal +#: model:portal.payment.acquirer,form_template:portal.paypal_acquirer +msgid "" +"\n" +"% if object.company_id.paypal_account:\n" +"
\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"
\n" +"% endif\n" +" " +msgstr "" + +#. module: portal +#: model:ir.model,name:portal.model_portal_wizard_user +msgid "Portal User Config" +msgstr "" + +#. module: portal +#: view:portal.payment.acquirer:0 +msgid "" +"If the template renders to an empty result in a certain context it will be " +"ignored, as if it was inactive." +msgstr "" + +#. module: portal +#: field:portal.payment.acquirer,visible:0 +msgid "Visible" +msgstr "" + +#. module: portal +#: code:addons/portal/wizard/share_wizard.py:39 +#, python-format +msgid "Existing Groups (e.g Portal Groups)" +msgstr "" + +#. module: portal +#: view:portal.wizard:0 +msgid "Cancel" +msgstr "" + +#. module: portal +#: view:portal.wizard:0 +msgid "Apply" +msgstr "" + +#. module: portal +#: view:portal.payment.acquirer:0 +msgid "ctx: the current context dictionary" +msgstr "" + +#. module: portal +#: view:portal.payment.acquirer:0 +msgid "" +"This is an HTML form template to submit a payment through this acquirer.\n" +" The template will be rendered with" +msgstr "" + +#. module: portal +#: model:ir.actions.client,help:portal.action_mail_star_feeds_portal +msgid "" +"

\n" +" No todo.\n" +"

\n" +" When you process messages in your inbox, you can mark " +"some\n" +" as todo. From this menu, you can process all your " +"todo.\n" +"

\n" +" " +msgstr "" + +#. module: portal +#: view:portal.payment.acquirer:0 +msgid "Form Template" +msgstr "" + +#. module: portal +#: view:share.wizard:0 +msgid "Details" +msgstr "" diff --git a/addons/project_long_term/i18n/tr.po b/addons/project_long_term/i18n/tr.po index f0f67b82700..2a2d28e6d35 100644 --- a/addons/project_long_term/i18n/tr.po +++ b/addons/project_long_term/i18n/tr.po @@ -7,14 +7,14 @@ msgstr "" "Project-Id-Version: OpenERP Server 7.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2013-03-07 08:38+0000\n" -"PO-Revision-Date: 2013-05-08 09:17+0000\n" -"Last-Translator: Ediz Duman \n" +"PO-Revision-Date: 2013-05-13 10:14+0000\n" +"Last-Translator: Ayhan KIZILTAN \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: 2013-05-09 06:11+0000\n" -"X-Generator: Launchpad (build 16598)\n" +"X-Launchpad-Export-Date: 2013-05-14 06:25+0000\n" +"X-Generator: Launchpad (build 16617)\n" #. module: project_long_term #: help:project.phase,constraint_date_end:0 @@ -436,6 +436,8 @@ msgid "" "It's computed by the scheduler according the project date or the end date of " "the previous phase." msgstr "" +"Planlamacı tarafından proje tarihine göre ya da önceki aşamanın bitiş " +"tarihine göre hesaplanmıştır." #. module: project_long_term #: model:ir.actions.act_window,name:project_long_term.act_project_phase diff --git a/addons/report_intrastat/i18n/tr.po b/addons/report_intrastat/i18n/tr.po index d3d5e2699e9..563bc4a1b6a 100644 --- a/addons/report_intrastat/i18n/tr.po +++ b/addons/report_intrastat/i18n/tr.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2013-03-07 08:38+0000\n" -"PO-Revision-Date: 2012-12-21 23:00+0000\n" -"Last-Translator: FULL NAME \n" +"PO-Revision-Date: 2013-05-13 10:10+0000\n" +"Last-Translator: serkan erdoğan \n" "Language-Team: Turkish \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-03-28 05:59+0000\n" -"X-Generator: Launchpad (build 16546)\n" +"X-Launchpad-Export-Date: 2013-05-14 06:25+0000\n" +"X-Generator: Launchpad (build 16617)\n" #. module: report_intrastat #: report:account.invoice.intrastat:0 @@ -51,7 +51,7 @@ msgstr "İçe Aktar" #: report:account.invoice.intrastat:0 #: field:report.intrastat.code,description:0 msgid "Description" -msgstr "" +msgstr "Açıklama" #. module: report_intrastat #: report:account.invoice.intrastat:0 From 852479d5bec692791829995ac43441fd4cc3f2d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Mon, 13 May 2013 16:26:33 +0200 Subject: [PATCH 24/74] [FIX] mail_followers: avoid partners_to_notify parameter in _notify only if None, not if void. bzr revid: tde@openerp.com-20130513142633-bf02usbabnncy6me --- addons/mail/mail_followers.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/mail/mail_followers.py b/addons/mail/mail_followers.py index fe2362eecc0..fcd32ec7315 100644 --- a/addons/mail/mail_followers.py +++ b/addons/mail/mail_followers.py @@ -88,7 +88,7 @@ class mail_notification(osv.Model): continue partner = notification.partner_id # If partners_to_notify specified: restrict to them - if partners_to_notify and partner.id not in partners_to_notify: + if partners_to_notify is not None and partner.id not in partners_to_notify: continue # Do not send to partners without email address defined if not partner.email: From 77e51ba1e2e661cf5db799c94a5f1e3053a82d9e Mon Sep 17 00:00:00 2001 From: Christophe Matthieu Date: Mon, 13 May 2013 16:40:24 +0200 Subject: [PATCH 25/74] [FIX] portal mail: Override of _search and check_access_rule of mail_message to add specific access rights of mail.message, to remove all no discussion message if uid is a portal user. bzr revid: chm@openerp.com-20130513144024-m1o4q8in62fe123b --- addons/portal/__init__.py | 1 + addons/portal/mail_message.py | 57 +++++++++++++++++++++++++++++++++++ 2 files changed, 58 insertions(+) create mode 100644 addons/portal/mail_message.py diff --git a/addons/portal/__init__.py b/addons/portal/__init__.py index 0045a557a49..e7026986ea4 100644 --- a/addons/portal/__init__.py +++ b/addons/portal/__init__.py @@ -21,6 +21,7 @@ import portal import mail_mail +import mail_message import wizard import acquirer diff --git a/addons/portal/mail_message.py b/addons/portal/mail_message.py new file mode 100644 index 00000000000..38516268c24 --- /dev/null +++ b/addons/portal/mail_message.py @@ -0,0 +1,57 @@ +# -*- coding: utf-8 -*- +############################################################################## +# +# OpenERP, Open Source Management Solution +# Copyright (C) 2004-2011 OpenERP S.A (). +# +# 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 openerp.osv import osv, orm +from openerp.tools.translate import _ + + +class mail_message(osv.Model): + """ Update of mail_message class, to restrict mail access. """ + _inherit = 'mail.message' + + def _search(self, cr, uid, args, offset=0, limit=None, order=None, + context=None, count=False, access_rights_uid=None): + """ Override that adds specific access rights of mail.message, to remove + all no discussion message if uid is a portal user. + """ + group_ids = self.pool.get('res.users').browse(cr, uid, uid, context=context).groups_id + if any(group.is_portal for group in group_ids): + subtype_id = self.pool.get("ir.model.data").get_object_reference(cr, uid, 'mail', 'mt_comment')[1] + args = ['&', ('subtype_id', '=', subtype_id)] + args + + return super(mail_message, self)._search(cr, uid, args, offset=offset, limit=limit, order=order, + context=context, count=False, access_rights_uid=access_rights_uid) + + def check_access_rule(self, cr, uid, ids, operation, context=None): + """ Add Access rules of mail.message for portal user: + - read: + - raise if the type is not 'comment' or 'email' + """ + group_ids = self.pool.get('res.users').browse(cr, uid, uid, context=context).groups_id + if any(group.is_portal for group in group_ids): + subtype_id = self.pool.get("ir.model.data").get_object_reference(cr, uid, 'mail', 'mt_comment')[1] + cr.execute('SELECT DISTINCT id FROM "%s" WHERE subtype_id != %s AND id = ANY (%%s)' % (self._table, subtype_id), (ids,)) + if cr.fetchall(): + raise orm.except_orm(_('Access Denied'), + _('The requested operation cannot be completed due to security restrictions. Please contact your system administrator.\n\n(Document type: %s, Operation: %s)') % \ + (self._description, operation)) + + return super(mail_message, self).check_access_rule(cr, uid, ids=ids, operation=operation, context=context) From 8beab22311187fe0cae25090c462dd2e38f3e6c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Tue, 14 May 2013 12:45:21 +0200 Subject: [PATCH 26/74] [IMP] mail_message for portal users: actually only comment without subtype are not shown (internal notes). bzr revid: tde@openerp.com-20130514104521-e8pbgvgn2xtmyr5o --- addons/portal/mail_message.py | 12 ++++++------ addons/portal/tests/test_portal.py | 22 +++++++++++++++++++++- 2 files changed, 27 insertions(+), 7 deletions(-) diff --git a/addons/portal/mail_message.py b/addons/portal/mail_message.py index 38516268c24..d0a4db5853e 100644 --- a/addons/portal/mail_message.py +++ b/addons/portal/mail_message.py @@ -33,9 +33,9 @@ class mail_message(osv.Model): all no discussion message if uid is a portal user. """ group_ids = self.pool.get('res.users').browse(cr, uid, uid, context=context).groups_id - if any(group.is_portal for group in group_ids): - subtype_id = self.pool.get("ir.model.data").get_object_reference(cr, uid, 'mail', 'mt_comment')[1] - args = ['&', ('subtype_id', '=', subtype_id)] + args + group_user_id = self.pool.get("ir.model.data").get_object_reference(cr, uid, 'base', 'group_user')[1] + if group_user_id not in [group.id for group in group_ids]: + args = ['&', '|', ('type', '!=', 'comment'), ('subtype_id', '!=', False)] + list(args) return super(mail_message, self)._search(cr, uid, args, offset=offset, limit=limit, order=order, context=context, count=False, access_rights_uid=access_rights_uid) @@ -46,9 +46,9 @@ class mail_message(osv.Model): - raise if the type is not 'comment' or 'email' """ group_ids = self.pool.get('res.users').browse(cr, uid, uid, context=context).groups_id - if any(group.is_portal for group in group_ids): - subtype_id = self.pool.get("ir.model.data").get_object_reference(cr, uid, 'mail', 'mt_comment')[1] - cr.execute('SELECT DISTINCT id FROM "%s" WHERE subtype_id != %s AND id = ANY (%%s)' % (self._table, subtype_id), (ids,)) + group_user_id = self.pool.get("ir.model.data").get_object_reference(cr, uid, 'base', 'group_user')[1] + if group_user_id not in [group.id for group in group_ids]: + cr.execute('SELECT DISTINCT id FROM "%s" WHERE type = %%s AND subtype_id != NULL AND id = ANY (%%s)' % (self._table), ('comment', ids,)) if cr.fetchall(): raise orm.except_orm(_('Access Denied'), _('The requested operation cannot be completed due to security restrictions. Please contact your system administrator.\n\n(Document type: %s, Operation: %s)') % \ diff --git a/addons/portal/tests/test_portal.py b/addons/portal/tests/test_portal.py index 03f2491315b..1cfb2aef269 100644 --- a/addons/portal/tests/test_portal.py +++ b/addons/portal/tests/test_portal.py @@ -40,7 +40,9 @@ class test_portal(TestMailBase): self.partner_chell_id = self.user_chell.partner_id.id # Create a PigsPortal group - self.group_port_id = self.mail_group.create(cr, uid, {'name': 'PigsPortal', 'public': 'groups', 'group_public_id': self.group_portal_id}) + self.group_port_id = self.mail_group.create(cr, uid, + {'name': 'PigsPortal', 'public': 'groups', 'group_public_id': self.group_portal_id}, + {'mail_create_nolog': True}) # Set an email address for the user running the tests, used as Sender for outgoing mails self.res_users.write(cr, uid, uid, {'email': 'test@localhost'}) @@ -130,3 +132,21 @@ class test_portal(TestMailBase): 'body of invitation email is incorrect') self.assertTrue(partner_carine.signup_url in sent_email.get('body'), 'body of invitation email does not contain signup url') + + def test_20_message_read(self): + cr, uid, group_port_id = self.cr, self.uid, self.group_port_id + + # Data: custom subtypes + mt_group_public_id = self.mail_message_subtype.create(cr, uid, {'name': 'group_public', 'description': 'Group changed'}) + self.ir_model_data.create(cr, uid, {'name': 'mt_group_public', 'model': 'mail.message.subtype', 'module': 'mail', 'res_id': mt_group_public_id}) + # Data: post messages with various subtypes + msg1_id = self.mail_group.message_post(cr, uid, group_port_id, body='Body1', type='comment', subtype='mail.mt_comment') + msg2_id = self.mail_group.message_post(cr, uid, group_port_id, body='Body2', type='comment', subtype='mail.mt_group_public') + msg3_id = self.mail_group.message_post(cr, uid, group_port_id, body='Body3', type='comment', subtype='mail.mt_comment') + msg4_id = self.mail_group.message_post(cr, uid, group_port_id, body='Body4', type='comment') + msg5_id = self.mail_group.message_post(cr, uid, group_port_id, body='Body5', type='notification') + + # Do: Chell search messages: should not see internal notes (comment without subtype) + msg_ids = self.mail_message.search(cr, self.user_chell_id, [('model', '=', 'mail.group'), ('res_id', '=', group_port_id)]) + self.assertEqual(set(msg_ids), set([msg1_id, msg2_id, msg3_id, msg5_id]), + 'mail_message: portal user has access to messages he should not read') From 0b7b3213106c6cab686fccfae5ea1a3224fecafc Mon Sep 17 00:00:00 2001 From: "Quentin (OpenERP)" Date: Mon, 13 May 2013 15:24:22 +0200 Subject: [PATCH 27/74] [FIX] account_voucher: display the multi-currency options each time needed bzr revid: qdp-launchpad@openerp.com-20130513132422-q78dopdnnyd2x8dy --- addons/account_voucher/account_voucher.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/addons/account_voucher/account_voucher.py b/addons/account_voucher/account_voucher.py index 4b4639daeb6..f8b380a7ea4 100644 --- a/addons/account_voucher/account_voucher.py +++ b/addons/account_voucher/account_voucher.py @@ -247,13 +247,12 @@ class account_voucher(osv.osv): line_osv = self.pool.get("account.voucher.line") line_dr_ids = resolve_o2m_operations(cr, uid, line_osv, line_dr_ids, ['amount'], context) line_cr_ids = resolve_o2m_operations(cr, uid, line_osv, line_cr_ids, ['amount'], context) - #compute the field is_multi_currency that is used to hide/display options linked to secondary currency on the voucher is_multi_currency = False #loop on the voucher lines to see if one of these has a secondary currency. If yes, we need to see the options for voucher_line in line_dr_ids+line_cr_ids: - line_currency = voucher_line.get('move_line_id', False) and self.pool.get('account.move.line').browse(cr, uid, voucher_line.get('move_line_id'), context=context).currency_id - if line_currency: + line_id = voucher_line.get('id') and self.pool.get('account.voucher.line').browse(cr, uid, voucher_line['id'], context=context).move_line_id.id or voucher_line.get('move_line_id') + if line_id and self.pool.get('account.move.line').browse(cr, uid, line_id, context=context).currency_id: is_multi_currency = True break return {'value': {'writeoff_amount': self._compute_writeoff_amount(cr, uid, line_dr_ids, line_cr_ids, amount, type), 'is_multi_currency': is_multi_currency}} From 9b01552b79e67af818c96b37f292b7f2d26fc8ef Mon Sep 17 00:00:00 2001 From: "Quentin (OpenERP)" Date: Mon, 13 May 2013 16:21:16 +0200 Subject: [PATCH 28/74] [IMP] account_voucher, usability: reset the amount to 0 in the 'pay invoice wizard' if the currency is not the same than the invoice currency to avoid a common mistake bzr revid: qdp-launchpad@openerp.com-20130513142116-wyuud8n9fcnafc7l --- addons/account_voucher/account_voucher.py | 6 ++++++ addons/account_voucher/invoice.py | 1 + 2 files changed, 7 insertions(+) diff --git a/addons/account_voucher/account_voucher.py b/addons/account_voucher/account_voucher.py index f8b380a7ea4..322d9dab6d5 100644 --- a/addons/account_voucher/account_voucher.py +++ b/addons/account_voucher/account_voucher.py @@ -880,6 +880,12 @@ class account_voucher(osv.osv): else: currency_id = journal.company_id.currency_id.id vals['value'].update({'currency_id': currency_id}) + #in case we want to register the payment directly from an invoice, it's confusing to allow to switch the journal + #without seeing that the amount is expressed in the journal currency, and not in the invoice currency. So to avoid + #this common mistake, we simply reset the amount to 0 if the currency is not the invoice currency. + if context.get('payment_expected_currency') and currency_id != context.get('payment_expected_currency'): + vals['value']['amount'] = 0 + amount = 0 res = self.onchange_partner_id(cr, uid, ids, partner_id, journal_id, amount, currency_id, ttype, date, context) for key in res.keys(): vals[key].update(res[key]) diff --git a/addons/account_voucher/invoice.py b/addons/account_voucher/invoice.py index c0584ddbd52..a38a3d3e9b6 100644 --- a/addons/account_voucher/invoice.py +++ b/addons/account_voucher/invoice.py @@ -41,6 +41,7 @@ class invoice(osv.osv): 'target': 'new', 'domain': '[]', 'context': { + 'payment_expected_currency': inv.currency_id.id, 'default_partner_id': self.pool.get('res.partner')._find_accounting_partner(inv.partner_id).id, 'default_amount': inv.type in ('out_refund', 'in_refund') and -inv.residual or inv.residual, 'default_reference': inv.name, From e19d5e4685d3d98fcb3b9f6020e4717542d85726 Mon Sep 17 00:00:00 2001 From: Cedric Snauwaert Date: Mon, 13 May 2013 16:53:18 +0200 Subject: [PATCH 29/74] [FIX]purchase/stock: when validating a PO, information on scheduled_date was not correct, should take into account, schedule_date for each product instead of PO date. Also add a message in chatter whenever we receive a product. Added a function in tools/misc/py for the purpose of printing correct date in user timezone + timezone information. bzr revid: csn@openerp.com-20130513145318-qterabm7vmjkezi4 --- addons/purchase/purchase.py | 2 +- addons/stock/stock.py | 10 +++++++--- addons/stock/stock_view.xml | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py index b1f552b64cc..a7973a40a47 100644 --- a/addons/purchase/purchase.py +++ b/addons/purchase/purchase.py @@ -641,7 +641,7 @@ class purchase_order(osv.osv): 'product_uom': order_line.product_uom.id, 'product_uos': order_line.product_uom.id, 'date': self.date_to_datetime(cr, uid, order.date_order, context), - 'date_expected': self.date_to_datetime(cr, uid, order.date_order, context), + 'date_expected': self.date_to_datetime(cr, uid, order_line.date_planned, context), 'location_id': order.partner_id.property_stock_supplier.id, 'location_dest_id': order.location_id.id, 'picking_id': picking_id, diff --git a/addons/stock/stock.py b/addons/stock/stock.py index 6d9cb1aae84..fbbee7771b1 100644 --- a/addons/stock/stock.py +++ b/addons/stock/stock.py @@ -29,7 +29,7 @@ from openerp.osv import fields, osv from openerp.tools.translate import _ from openerp import netsvc from openerp import tools -from openerp.tools import float_compare +from openerp.tools import float_compare, DEFAULT_SERVER_DATETIME_FORMAT, server_to_local_timestamp_info import openerp.addons.decimal_precision as dp import logging _logger = logging.getLogger(__name__) @@ -651,7 +651,7 @@ class stock_picking(osv.osv): ), 'min_date': fields.function(get_min_max_date, fnct_inv=_set_minimum_date, multi="min_max_date", store=True, type='datetime', string='Scheduled Time', select=1, help="Scheduled time for the shipment to be processed"), - 'date': fields.datetime('Time', help="Creation time, usually the time of the order.", select=True, states={'done':[('readonly', True)], 'cancel':[('readonly',True)]}), + 'date': fields.datetime('Creation Date', help="Creation date, usually the time of the order.", select=True, states={'done':[('readonly', True)], 'cancel':[('readonly',True)]}), 'date_done': fields.datetime('Date of Transfer', help="Date of Completion", states={'done':[('readonly', True)], 'cancel':[('readonly',True)]}), 'max_date': fields.function(get_min_max_date, fnct_inv=_set_maximum_date, multi="min_max_date", store=True, type='datetime', string='Max. Expected Date', select=2), @@ -2360,6 +2360,10 @@ class stock_move(osv.osv): if move.picking_id: picking_ids.append(move.picking_id.id) + #add a message in chatter to say that product has been received + user_time = server_to_local_timestamp_info(fields.datetime.now(),context=context) + message = _('Product \'%s\' has been received at \'%s\'') % (move.name, user_time) + move.picking_id.message_post(body = message) if move.move_dest_id.id and (move.state != 'done'): # Downstream move should only be triggered if this move is the last pending upstream move other_upstream_move_ids = self.search(cr, uid, [('id','!=',move.id),('state','not in',['done','cancel']), @@ -2380,7 +2384,7 @@ class stock_move(osv.osv): if todo: self.action_confirm(cr, uid, todo, context=context) - self.write(cr, uid, move_ids, {'state': 'done', 'date': time.strftime('%Y-%m-%d %H:%M:%S')}, context=context) + self.write(cr, uid, move_ids, {'state': 'done', 'date': time.strftime(DEFAULT_SERVER_DATETIME_FORMAT)}, context=context) for id in move_ids: wf_service.trg_trigger(uid, 'stock.move', id, cr) diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml index 83362ab5d6f..5865ad31994 100644 --- a/addons/stock/stock_view.xml +++ b/addons/stock/stock_view.xml @@ -1253,7 +1253,7 @@ - + From 55b4b2d1d066cd7ac88ed76cf54223499e769573 Mon Sep 17 00:00:00 2001 From: Cedric Snauwaert Date: Mon, 13 May 2013 17:45:46 +0200 Subject: [PATCH 30/74] [FIX]stock: add method that was added in server here to prevent user to have to update base do not forward in trunk bzr revid: csn@openerp.com-20130513154546-v5zqi6723aeiymxl --- addons/stock/stock.py | 29 +++++++++++++++++++++++++++-- 1 file changed, 27 insertions(+), 2 deletions(-) diff --git a/addons/stock/stock.py b/addons/stock/stock.py index fbbee7771b1..bacea01968f 100644 --- a/addons/stock/stock.py +++ b/addons/stock/stock.py @@ -29,7 +29,7 @@ from openerp.osv import fields, osv from openerp.tools.translate import _ from openerp import netsvc from openerp import tools -from openerp.tools import float_compare, DEFAULT_SERVER_DATETIME_FORMAT, server_to_local_timestamp_info +from openerp.tools import float_compare, DEFAULT_SERVER_DATETIME_FORMAT, server_to_local_timestamp import openerp.addons.decimal_precision as dp import logging _logger = logging.getLogger(__name__) @@ -2334,6 +2334,31 @@ class stock_move(osv.osv): 'line_id': move_lines, 'ref': move.picking_id and move.picking_id.name}) + #Should be add in server/tools/misc.py in trunk + def server_to_local_timestamp_info(self, str_date, src_format, context=None): + """ + Convert a source timestamp string into a destination timestamp string, attempting to apply the + correct offset if both the server and local timezone are recognized, or no + offset at all if they aren't. + This will return a string representing the date in the timezone of the user with the details of + which timezone is used (for example UTC+0200 (CEST)) + + @param src_date: the str value containing the timestamp in the server timezone. + @param src_format: the format to use when parsing the server timestamp. + @param context: context to be used (should contain the user local timezone) + + @return local/client formatted timestamp, expressed in the local/client timezone if possible + and add information about that timezone. + example: str_date = '2013-03-10 10:35:00' (if server timezone is UTC), if user is in UTC+0200 + return: '2013-03-10 10:35:00 UTC+0200 (CEST)' + """ + if not str_date: + return False + if not context: + context = {} + dst_format = src_format + ' UTC%z (%Z)' + return server_to_local_timestamp(str_date, src_format, dst_format, context.get('tz') or 'UTC') + def action_done(self, cr, uid, ids, context=None): """ Makes the move done and if all moves are done, it will finish the picking. @@ -2361,7 +2386,7 @@ class stock_move(osv.osv): if move.picking_id: picking_ids.append(move.picking_id.id) #add a message in chatter to say that product has been received - user_time = server_to_local_timestamp_info(fields.datetime.now(),context=context) + user_time = self.server_to_local_timestamp_info(fields.datetime.now(), DEFAULT_SERVER_DATETIME_FORMAT, context=context) message = _('Product \'%s\' has been received at \'%s\'') % (move.name, user_time) move.picking_id.message_post(body = message) if move.move_dest_id.id and (move.state != 'done'): From a4c6c62e75966f6bd58dcaab593c944c76a7fe45 Mon Sep 17 00:00:00 2001 From: Cedric Snauwaert Date: Tue, 14 May 2013 11:19:14 +0200 Subject: [PATCH 31/74] [FIX]stock: remove message from chatter, useless since information appears with tracking state and change view so that schedule date appears when product hasn't been received and date of reception appears when it has been received bzr revid: csn@openerp.com-20130514091914-rod821mkj7v4s97c --- addons/stock/stock.py | 32 +------------------------------- addons/stock/stock_view.xml | 4 ++-- 2 files changed, 3 insertions(+), 33 deletions(-) diff --git a/addons/stock/stock.py b/addons/stock/stock.py index bacea01968f..fca3d9ff073 100644 --- a/addons/stock/stock.py +++ b/addons/stock/stock.py @@ -29,7 +29,7 @@ from openerp.osv import fields, osv from openerp.tools.translate import _ from openerp import netsvc from openerp import tools -from openerp.tools import float_compare, DEFAULT_SERVER_DATETIME_FORMAT, server_to_local_timestamp +from openerp.tools import float_compare, DEFAULT_SERVER_DATETIME_FORMAT import openerp.addons.decimal_precision as dp import logging _logger = logging.getLogger(__name__) @@ -2334,32 +2334,6 @@ class stock_move(osv.osv): 'line_id': move_lines, 'ref': move.picking_id and move.picking_id.name}) - #Should be add in server/tools/misc.py in trunk - def server_to_local_timestamp_info(self, str_date, src_format, context=None): - """ - Convert a source timestamp string into a destination timestamp string, attempting to apply the - correct offset if both the server and local timezone are recognized, or no - offset at all if they aren't. - This will return a string representing the date in the timezone of the user with the details of - which timezone is used (for example UTC+0200 (CEST)) - - @param src_date: the str value containing the timestamp in the server timezone. - @param src_format: the format to use when parsing the server timestamp. - @param context: context to be used (should contain the user local timezone) - - @return local/client formatted timestamp, expressed in the local/client timezone if possible - and add information about that timezone. - example: str_date = '2013-03-10 10:35:00' (if server timezone is UTC), if user is in UTC+0200 - return: '2013-03-10 10:35:00 UTC+0200 (CEST)' - """ - if not str_date: - return False - if not context: - context = {} - dst_format = src_format + ' UTC%z (%Z)' - return server_to_local_timestamp(str_date, src_format, dst_format, context.get('tz') or 'UTC') - - def action_done(self, cr, uid, ids, context=None): """ Makes the move done and if all moves are done, it will finish the picking. @return: @@ -2385,10 +2359,6 @@ class stock_move(osv.osv): if move.picking_id: picking_ids.append(move.picking_id.id) - #add a message in chatter to say that product has been received - user_time = self.server_to_local_timestamp_info(fields.datetime.now(), DEFAULT_SERVER_DATETIME_FORMAT, context=context) - message = _('Product \'%s\' has been received at \'%s\'') % (move.name, user_time) - move.picking_id.message_post(body = message) if move.move_dest_id.id and (move.state != 'done'): # Downstream move should only be triggered if this move is the last pending upstream move other_upstream_move_ids = self.search(cr, uid, [('id','!=',move.id),('state','not in',['done','cancel']), diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml index 5865ad31994..3c3967e2e2e 100644 --- a/addons/stock/stock_view.xml +++ b/addons/stock/stock_view.xml @@ -1252,8 +1252,8 @@ - - + + From c8c298c83cfd337a7ce304c68fb9c2df48d0e9a5 Mon Sep 17 00:00:00 2001 From: Martin Trigaux Date: Tue, 14 May 2013 12:31:13 +0200 Subject: [PATCH 32/74] [IMP] clean permissions and shebang in files bzr revid: mat@openerp.com-20130514103113-8idhvhokt0e8jzea --- addons/account/wizard/pos_box.py | 1 - addons/auth_openid/res_users.py | 1 - addons/auth_openid/utils.py | 1 - addons/base_report_designer/openerp_sxw2rml/openerp_sxw2rml.py | 0 addons/document/odt2txt.py | 0 addons/document_webdav/test_davclient.py | 1 - addons/email_template/html2text.py | 0 addons/hr_payroll/report/__init__.py | 1 - addons/hr_payroll/report/report_contribution_register.py | 1 - addons/hr_payroll/report/report_payslip.py | 1 - addons/hr_payroll/report/report_payslip_details.py | 1 - addons/l10n_fr_hr_payroll/report/__init__.py | 1 - addons/l10n_in_hr_payroll/report/__init__.py | 1 - addons/mail/static/scripts/openerp_mailgate.py | 0 addons/pad/py_etherpad/__init__.py | 1 - addons/point_of_sale/res_partner.py | 1 - addons/point_of_sale/res_users.py | 1 - addons/point_of_sale/wizard/pos_box.py | 1 - addons/point_of_sale/wizard/pos_session_opening.py | 1 - 19 files changed, 15 deletions(-) mode change 100644 => 100755 addons/base_report_designer/openerp_sxw2rml/openerp_sxw2rml.py mode change 100644 => 100755 addons/document/odt2txt.py mode change 100644 => 100755 addons/email_template/html2text.py mode change 100644 => 100755 addons/mail/static/scripts/openerp_mailgate.py diff --git a/addons/account/wizard/pos_box.py b/addons/account/wizard/pos_box.py index 49178dfd3ea..c884f1bbe78 100644 --- a/addons/account/wizard/pos_box.py +++ b/addons/account/wizard/pos_box.py @@ -1,4 +1,3 @@ -#!/usr/bin/env python from openerp.osv import fields, osv import openerp.addons.decimal_precision as dp from openerp.tools.translate import _ diff --git a/addons/auth_openid/res_users.py b/addons/auth_openid/res_users.py index feea2d8d396..79d86a1bac3 100644 --- a/addons/auth_openid/res_users.py +++ b/addons/auth_openid/res_users.py @@ -1,4 +1,3 @@ -#!/usr/bin/env python ############################################################################## # # OpenERP, Open Source Management Solution diff --git a/addons/auth_openid/utils.py b/addons/auth_openid/utils.py index 806198f99c2..0474e23fe4b 100644 --- a/addons/auth_openid/utils.py +++ b/addons/auth_openid/utils.py @@ -1,4 +1,3 @@ -#!/usr/bin/env python ############################################################################## # # OpenERP, Open Source Management Solution diff --git a/addons/base_report_designer/openerp_sxw2rml/openerp_sxw2rml.py b/addons/base_report_designer/openerp_sxw2rml/openerp_sxw2rml.py old mode 100644 new mode 100755 diff --git a/addons/document/odt2txt.py b/addons/document/odt2txt.py old mode 100644 new mode 100755 diff --git a/addons/document_webdav/test_davclient.py b/addons/document_webdav/test_davclient.py index 058dc1c748d..76a5e4514b3 100644 --- a/addons/document_webdav/test_davclient.py +++ b/addons/document_webdav/test_davclient.py @@ -1,4 +1,3 @@ -#!/usr/bin/env python # -*- encoding: utf-8 -*- # # Copyright P. Christeas 2008,2009 diff --git a/addons/email_template/html2text.py b/addons/email_template/html2text.py old mode 100644 new mode 100755 diff --git a/addons/hr_payroll/report/__init__.py b/addons/hr_payroll/report/__init__.py index 8de2f51d18f..e5b8dea8e48 100644 --- a/addons/hr_payroll/report/__init__.py +++ b/addons/hr_payroll/report/__init__.py @@ -1,4 +1,3 @@ -#!/usr/bin/env python #-*- coding:utf-8 -*- ############################################################################## diff --git a/addons/hr_payroll/report/report_contribution_register.py b/addons/hr_payroll/report/report_contribution_register.py index 39c913adada..72500a9c6c9 100644 --- a/addons/hr_payroll/report/report_contribution_register.py +++ b/addons/hr_payroll/report/report_contribution_register.py @@ -1,4 +1,3 @@ -#!/usr/bin/env python #-*- coding:utf-8 -*- ############################################################################## diff --git a/addons/hr_payroll/report/report_payslip.py b/addons/hr_payroll/report/report_payslip.py index 8ed91bd9a82..3e1dc2b1966 100644 --- a/addons/hr_payroll/report/report_payslip.py +++ b/addons/hr_payroll/report/report_payslip.py @@ -1,4 +1,3 @@ -#!/usr/bin/env python #-*- coding:utf-8 -*- ############################################################################## diff --git a/addons/hr_payroll/report/report_payslip_details.py b/addons/hr_payroll/report/report_payslip_details.py index 1251fedd826..6b561b8d688 100644 --- a/addons/hr_payroll/report/report_payslip_details.py +++ b/addons/hr_payroll/report/report_payslip_details.py @@ -1,4 +1,3 @@ -#!/usr/bin/env python #-*- coding:utf-8 -*- ############################################################################## diff --git a/addons/l10n_fr_hr_payroll/report/__init__.py b/addons/l10n_fr_hr_payroll/report/__init__.py index 40d2ccc3c05..d6c9481579e 100644 --- a/addons/l10n_fr_hr_payroll/report/__init__.py +++ b/addons/l10n_fr_hr_payroll/report/__init__.py @@ -1,4 +1,3 @@ -#!/usr/bin/env python #-*- coding:utf-8 -*- ############################################################################## diff --git a/addons/l10n_in_hr_payroll/report/__init__.py b/addons/l10n_in_hr_payroll/report/__init__.py index 8a20170c384..e76f45b69c0 100644 --- a/addons/l10n_in_hr_payroll/report/__init__.py +++ b/addons/l10n_in_hr_payroll/report/__init__.py @@ -1,4 +1,3 @@ -#!/usr/bin/env python #-*- coding:utf-8 -*- ############################################################################## diff --git a/addons/mail/static/scripts/openerp_mailgate.py b/addons/mail/static/scripts/openerp_mailgate.py old mode 100644 new mode 100755 diff --git a/addons/pad/py_etherpad/__init__.py b/addons/pad/py_etherpad/__init__.py index 6af310b48aa..0db607fe16f 100644 --- a/addons/pad/py_etherpad/__init__.py +++ b/addons/pad/py_etherpad/__init__.py @@ -1,4 +1,3 @@ -#!/usr/bin/env python """Module to talk to EtherpadLite API.""" import json diff --git a/addons/point_of_sale/res_partner.py b/addons/point_of_sale/res_partner.py index 81a0f6083be..d7969b0e21a 100644 --- a/addons/point_of_sale/res_partner.py +++ b/addons/point_of_sale/res_partner.py @@ -1,4 +1,3 @@ -#!/usr/bin/env python import math diff --git a/addons/point_of_sale/res_users.py b/addons/point_of_sale/res_users.py index 05e49a5545d..ed2c6fae598 100644 --- a/addons/point_of_sale/res_users.py +++ b/addons/point_of_sale/res_users.py @@ -1,4 +1,3 @@ -#!/usr/bin/env python import math diff --git a/addons/point_of_sale/wizard/pos_box.py b/addons/point_of_sale/wizard/pos_box.py index 776d962a3a8..b8354666919 100644 --- a/addons/point_of_sale/wizard/pos_box.py +++ b/addons/point_of_sale/wizard/pos_box.py @@ -1,4 +1,3 @@ -#!/usr/bin/env python from openerp.osv import osv, fields from openerp.tools.translate import _ diff --git a/addons/point_of_sale/wizard/pos_session_opening.py b/addons/point_of_sale/wizard/pos_session_opening.py index 1aa4cb702c4..355cd407d14 100644 --- a/addons/point_of_sale/wizard/pos_session_opening.py +++ b/addons/point_of_sale/wizard/pos_session_opening.py @@ -1,4 +1,3 @@ -#!/usr/bin/env python from openerp import netsvc from openerp.osv import osv, fields From eb90dd937077aa5e5dd0b1b36fa0655b45f2a97f Mon Sep 17 00:00:00 2001 From: Martin Trigaux Date: Tue, 14 May 2013 12:37:36 +0200 Subject: [PATCH 33/74] [IMP] clean permissions and shebang in files bzr revid: mat@openerp.com-20130514103736-kfuk3nutvezyo7l0 --- addons/web/session.py | 1 - addons/web/static/lib/jquery.placeholder/jquery.placeholder.js | 0 addons/web/static/src/font/entypo-webfont.svg | 0 addons/web/static/src/font/mnmliconsv21-webfont.svg | 0 addons/web_calendar/__init__.py | 1 - addons/web_gantt/__init__.py | 1 - addons/web_hello/__init__.py | 1 - 7 files changed, 4 deletions(-) mode change 100755 => 100644 addons/web/static/lib/jquery.placeholder/jquery.placeholder.js mode change 100755 => 100644 addons/web/static/src/font/entypo-webfont.svg mode change 100755 => 100644 addons/web/static/src/font/mnmliconsv21-webfont.svg diff --git a/addons/web/session.py b/addons/web/session.py index 8a083e0dec9..0104c68f9f9 100644 --- a/addons/web/session.py +++ b/addons/web/session.py @@ -1,4 +1,3 @@ -#!/usr/bin/python import datetime import babel import dateutil.relativedelta diff --git a/addons/web/static/lib/jquery.placeholder/jquery.placeholder.js b/addons/web/static/lib/jquery.placeholder/jquery.placeholder.js old mode 100755 new mode 100644 diff --git a/addons/web/static/src/font/entypo-webfont.svg b/addons/web/static/src/font/entypo-webfont.svg old mode 100755 new mode 100644 diff --git a/addons/web/static/src/font/mnmliconsv21-webfont.svg b/addons/web/static/src/font/mnmliconsv21-webfont.svg old mode 100755 new mode 100644 diff --git a/addons/web_calendar/__init__.py b/addons/web_calendar/__init__.py index 013e4b7ec4e..e69de29bb2d 100644 --- a/addons/web_calendar/__init__.py +++ b/addons/web_calendar/__init__.py @@ -1 +0,0 @@ -#!/usr/bin/python diff --git a/addons/web_gantt/__init__.py b/addons/web_gantt/__init__.py index 013e4b7ec4e..e69de29bb2d 100644 --- a/addons/web_gantt/__init__.py +++ b/addons/web_gantt/__init__.py @@ -1 +0,0 @@ -#!/usr/bin/python diff --git a/addons/web_hello/__init__.py b/addons/web_hello/__init__.py index 013e4b7ec4e..e69de29bb2d 100644 --- a/addons/web_hello/__init__.py +++ b/addons/web_hello/__init__.py @@ -1 +0,0 @@ -#!/usr/bin/python From 5a367b4c9a453eb532157bbc3cb05a9574ee07b6 Mon Sep 17 00:00:00 2001 From: "Quentin (OpenERP)" Date: Tue, 14 May 2013 13:52:13 +0200 Subject: [PATCH 34/74] [IMP] account_voucher, usability: added currency_help_label to help at the understanding when using the payment rate fields bzr revid: qdp-launchpad@openerp.com-20130514115213-cklf7s6r889ahen7 --- addons/account_voucher/account_voucher.py | 36 +++++++++++++++++-- .../voucher_payment_receipt_view.xml | 28 +++++++++++---- .../voucher_sales_purchase_view.xml | 6 ++-- 3 files changed, 59 insertions(+), 11 deletions(-) diff --git a/addons/account_voucher/account_voucher.py b/addons/account_voucher/account_voucher.py index 322d9dab6d5..bbd8976f36c 100644 --- a/addons/account_voucher/account_voucher.py +++ b/addons/account_voucher/account_voucher.py @@ -27,6 +27,7 @@ from openerp.osv import fields, osv import openerp.addons.decimal_precision as dp from openerp.tools.translate import _ from openerp.tools import float_compare +from openerp.report import report_sxw class res_currency(osv.osv): _inherit = "res.currency" @@ -293,6 +294,36 @@ class account_voucher(osv.osv): res[voucher.id] = self.pool.get('res.currency').compute(cr, uid, voucher.currency_id.id, voucher.company_id.currency_id.id, voucher.amount, context=ctx) return res + def _get_currency_help_label(self, cr, uid, currency_id, payment_rate, payment_rate_currency_id, context=None): + """ + This function builds a string to help the users to understand the behavior of the payment rate fields they can specify on the voucher. + This string is only used to improve the usability in the voucher form view and has no other effect. + + :param currency_id: the voucher currency + :type currency_id: integer + :param payment_rate: the value of the payment_rate field of the voucher + :type payment_rate: float + :param payment_rate_currency_id: the value of the payment_rate_currency_id field of the voucher + :type payment_rate_currency_id: integer + :return: translated string giving a tip on what's the effect of the current payment rate specified + :rtype: str + """ + rml_parser = report_sxw.rml_parse(cr, uid, 'currency_help_label', context=context) + currency_pool = self.pool.get('res.currency') + currency_str = payment_rate_str = '' + if currency_id: + currency_str = rml_parser.formatLang(1, currency_obj=currency_pool.browse(cr, uid, currency_id, context=context)) + if payment_rate_currency_id: + payment_rate_str = rml_parser.formatLang(payment_rate, currency_obj=currency_pool.browse(cr, uid, payment_rate_currency_id, context=context)) + currency_help_label = _('At the operation date, the exchange rate was\n%s = %s') % (currency_str, payment_rate_str) + return currency_help_label + + def _fnct_currency_help_label(self, cr, uid, ids, name, args, context=None): + res = {} + for voucher in self.browse(cr, uid, ids, context=context): + res[voucher.id] = self._get_currency_help_label(cr, uid, voucher.currency_id.id, voucher.payment_rate, voucher.payment_rate_currency_id.id, context=context) + return res + _name = 'account.voucher' _description = 'Accounting Voucher' _inherit = ['mail.thread'] @@ -364,6 +395,7 @@ class account_voucher(osv.osv): help='The specific rate that will be used, in this voucher, between the selected currency (in \'Payment Rate Currency\' field) and the voucher currency.'), 'paid_amount_in_company_currency': fields.function(_paid_amount_in_company_currency, string='Paid Amount in Company Currency', type='float', readonly=True), 'is_multi_currency': fields.boolean('Multi Currency Voucher', help='Fields with internal purpose only that depicts if the voucher is a multi currency one or not'), + 'currency_help_label': fields.function(_fnct_currency_help_label, type='text', string="Helping Sentence", help="This sentence helps you to know how to specify the payment rate by giving you the direct effect it has"), } _defaults = { 'active': True, @@ -536,7 +568,7 @@ class account_voucher(osv.osv): return default def onchange_rate(self, cr, uid, ids, rate, amount, currency_id, payment_rate_currency_id, company_id, context=None): - res = {'value': {'paid_amount_in_company_currency': amount}} + res = {'value': {'paid_amount_in_company_currency': amount, 'currency_help_label': self._get_currency_help_label(cr, uid, currency_id, rate, payment_rate_currency_id, context=context)}} if rate and amount and currency_id: company_currency = self.pool.get('res.company').browse(cr, uid, company_id, context=context).currency_id #context should contain the date, the payment currency and the payment rate specified on the voucher @@ -815,7 +847,7 @@ class account_voucher(osv.osv): if context is None: context = {} res = {'value': {}} - if currency_id and currency_id == payment_rate_currency_id: + if currency_id: #set the default payment rate of the voucher and compute the paid amount in company currency ctx = context.copy() ctx.update({'date': date}) diff --git a/addons/account_voucher/voucher_payment_receipt_view.xml b/addons/account_voucher/voucher_payment_receipt_view.xml index e7296a6670f..dea94d59f4e 100644 --- a/addons/account_voucher/voucher_payment_receipt_view.xml +++ b/addons/account_voucher/voucher_payment_receipt_view.xml @@ -46,6 +46,9 @@ + + + account.voucher.payment.low.priority.form account.voucher @@ -119,6 +122,7 @@ + account.voucher.payment.form account.voucher @@ -193,12 +197,16 @@ - - + + - - - + @@ -282,6 +290,7 @@ + account.voucher.receipt.dialog.form account.voucher @@ -392,6 +401,7 @@ + account.voucher.receipt.form account.voucher @@ -474,8 +484,12 @@ - - + diff --git a/addons/account_voucher/voucher_sales_purchase_view.xml b/addons/account_voucher/voucher_sales_purchase_view.xml index ca7e46053b4..dc732129803 100644 --- a/addons/account_voucher/voucher_sales_purchase_view.xml +++ b/addons/account_voucher/voucher_sales_purchase_view.xml @@ -147,8 +147,9 @@ - - + + + @@ -243,6 +244,7 @@ on_change="onchange_journal(journal_id, line_dr_ids, tax_id, partner_id, date, amount, type, company_id, context)" groups="account.group_account_user"/> + From 7c1353a1e4d6f82bb54c5a0b28ea38f544085aa9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Tue, 14 May 2013 13:15:59 +0200 Subject: [PATCH 35/74] [FIX] portal_project_long_term: fixed access right using a non-existing field. bzr revid: tde@openerp.com-20130514111559-az39rnmrow5v30oi --- .../security/portal_security.xml | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/addons/portal_project_long_term/security/portal_security.xml b/addons/portal_project_long_term/security/portal_security.xml index eab70ebe734..cd3f591df0c 100644 --- a/addons/portal_project_long_term/security/portal_security.xml +++ b/addons/portal_project_long_term/security/portal_security.xml @@ -5,14 +5,7 @@ Project/Phase: portal users: public or portal and following - ['|', - ('project_id.privacy_visibility', '=', 'public'), - '&', - ('project_id.privacy_visibility', 'in', ['portal', 'followers']), - '|', - ('message_follower_ids','in', [user.partner_id.id]), - ('user_id', '=', user.id), - ] + [('project_id.privacy_visibility', 'in', ['public', 'portal'])] From 1e03e6df7806619cc753fb9740146f276b116ed3 Mon Sep 17 00:00:00 2001 From: Cedric Snauwaert Date: Tue, 14 May 2013 13:31:00 +0200 Subject: [PATCH 36/74] [FIX]res_partner: change fields selection of tz so that timezone starting with Etc/ are at the end of the selection, that way it's less confusing for the users. bzr revid: csn@openerp.com-20130514113100-h2oihowcplaba10j --- openerp/addons/base/res/res_partner.py | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/openerp/addons/base/res/res_partner.py b/openerp/addons/base/res/res_partner.py index fb4387fb3ae..fa31e26375c 100644 --- a/openerp/addons/base/res/res_partner.py +++ b/openerp/addons/base/res/res_partner.py @@ -74,7 +74,17 @@ class format_address(object): def _tz_get(self,cr,uid, context=None): - return [(x, x) for x in pytz.all_timezones] + #the timezone with name Etc/GMT+x are different than GMT+x, Etc/GMT+x actually is UTC-x and not UTC+x + #not a bug but an historical fact. Can be confusing, so we put those at the end of the list so that + #user won't get to much confused if they find in the list their country first + tz = [] + etc_tz = [] + for x in pytz.all_timezones: + if x.startswith('Etc/'): + etc_tz.append((x, x)) + else: + tz.append((x, x)) + return tz+etc_tz class res_partner_category(osv.osv): From 18ad74bef3ceae6d1eb7f38d99c75c452fb96316 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Tue, 14 May 2013 13:38:59 +0200 Subject: [PATCH 37/74] [FIX] portal: mail_message: fixed wrong condition for check_access_rule introduced at revision 9117. Added tests by the way. bzr revid: tde@openerp.com-20130514113859-3yucygu3pkav7qbt --- addons/portal/mail_message.py | 2 +- addons/portal/tests/test_portal.py | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/addons/portal/mail_message.py b/addons/portal/mail_message.py index d5acfdf74c1..d6a38f27378 100644 --- a/addons/portal/mail_message.py +++ b/addons/portal/mail_message.py @@ -48,7 +48,7 @@ class mail_message(osv.Model): group_ids = self.pool.get('res.users').browse(cr, uid, uid, context=context).groups_id group_user_id = self.pool.get("ir.model.data").get_object_reference(cr, uid, 'base', 'group_user')[1] if group_user_id not in [group.id for group in group_ids]: - cr.execute('SELECT DISTINCT id FROM "%s" WHERE type = %%s AND subtype_id != NULL AND id = ANY (%%s)' % (self._table), ('comment', ids,)) + cr.execute('SELECT DISTINCT id FROM "%s" WHERE type = %%s AND subtype_id IS NULL AND id = ANY (%%s)' % (self._table), ('comment', ids,)) if cr.fetchall(): raise orm.except_orm(_('Access Denied'), _('The requested operation cannot be completed due to security restrictions. Please contact your system administrator.\n\n(Document type: %s, Operation: %s)') % \ diff --git a/addons/portal/tests/test_portal.py b/addons/portal/tests/test_portal.py index 1cfb2aef269..c0b5709ac4f 100644 --- a/addons/portal/tests/test_portal.py +++ b/addons/portal/tests/test_portal.py @@ -150,3 +150,10 @@ class test_portal(TestMailBase): msg_ids = self.mail_message.search(cr, self.user_chell_id, [('model', '=', 'mail.group'), ('res_id', '=', group_port_id)]) self.assertEqual(set(msg_ids), set([msg1_id, msg2_id, msg3_id, msg5_id]), 'mail_message: portal user has access to messages he should not read') + + # Do: Chell read messages she can read + self.mail_message.read(cr, self.user_chell_id, msg_ids, ['body', 'type', 'subtype_id']) + + # Do: Chell read a message she should not be able to read + with self.assertRaises(except_orm): + self.mail_message.read(cr, self.user_chell_id, [msg4_id], ['body', 'type', 'subtype_id']) From 60c0ad3992f3561365b446c4340c9035d4c46841 Mon Sep 17 00:00:00 2001 From: Martin Trigaux Date: Tue, 14 May 2013 14:04:06 +0200 Subject: [PATCH 38/74] [FIX] fix FSF address bzr revid: mat@openerp.com-20130514120406-mz9mo1cnif04pyz9 --- addons/web_calendar/static/lib/dhtmlxScheduler/license.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/web_calendar/static/lib/dhtmlxScheduler/license.txt b/addons/web_calendar/static/lib/dhtmlxScheduler/license.txt index 4a7d08c91e4..82120142269 100644 --- a/addons/web_calendar/static/lib/dhtmlxScheduler/license.txt +++ b/addons/web_calendar/static/lib/dhtmlxScheduler/license.txt @@ -5,7 +5,7 @@ Version 2, June 1991 Copyright (C) 1989, 1991 Free Software Foundation, Inc. -59 Temple Place - Suite 330, Boston, MA 02111-1307, USA +51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA Everyone is permitted to copy and distribute verbatim copies From 7b8f704f90a52dee73a4e65ea51f842f16f05fc4 Mon Sep 17 00:00:00 2001 From: Martin Trigaux Date: Tue, 14 May 2013 14:04:24 +0200 Subject: [PATCH 39/74] [FIX] fix FSF address bzr revid: mat@openerp.com-20130514120424-xwjzdf3mufifl90d --- addons/account/report/account_general_ledger.py | 2 +- addons/account_test/account_test.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 +- .../openerp_report_designer/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/modify.py | 2 +- addons/document_webdav/__openerp__.py | 2 +- addons/document_webdav/test_davclient.py | 2 +- addons/document_webdav/webdav_server.py | 2 +- addons/l10n_ar/__init__.py | 2 +- addons/l10n_bo/__init__.py | 2 +- addons/l10n_cl/__init__.py | 2 +- addons/l10n_fr/__init__.py | 2 +- addons/l10n_fr/__openerp__.py | 2 +- addons/l10n_fr/report/__init__.py | 2 +- addons/l10n_fr/report/base_report.py | 2 +- addons/l10n_fr/report/bilan_report.py | 2 +- addons/l10n_fr/report/compute_resultant_report.py | 2 +- addons/l10n_fr/wizard/__init__.py | 2 +- addons/l10n_fr/wizard/fr_report_bilan.py | 2 +- addons/l10n_fr/wizard/fr_report_compute_resultant.py | 2 +- addons/l10n_nl/__init__.py | 2 +- addons/l10n_nl/__openerp__.py | 2 +- addons/l10n_pa/__init__.py | 2 +- addons/l10n_pe/__init__.py | 2 +- addons/report_webkit/__init__.py | 2 +- addons/report_webkit/__openerp__.py | 2 +- addons/report_webkit/company.py | 2 +- addons/report_webkit/convert.py | 2 +- addons/report_webkit/header.py | 2 +- addons/report_webkit/ir_report.py | 2 +- addons/report_webkit/report_helper.py | 2 +- addons/report_webkit/webkit_report.py | 2 +- addons/report_webkit/wizard/__init__.py | 2 +- addons/report_webkit/wizard/report_webkit_actions.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 +- 56 files changed, 56 insertions(+), 56 deletions(-) diff --git a/addons/account/report/account_general_ledger.py b/addons/account/report/account_general_ledger.py index 498cb1369a8..50ab732ea5f 100644 --- a/addons/account/report/account_general_ledger.py +++ b/addons/account/report/account_general_ledger.py @@ -23,7 +23,7 @@ # # 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. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # ############################################################################## diff --git a/addons/account_test/account_test.py b/addons/account_test/account_test.py index 7cea7b3afd6..3ed26556fd9 100644 --- a/addons/account_test/account_test.py +++ b/addons/account_test/account_test.py @@ -24,7 +24,7 @@ # # 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. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # ############################################################################## diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/About.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/About.py index 3ede2c5ae6a..e412a714f61 100644 --- a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/About.py +++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/About.py @@ -15,7 +15,7 @@ # # You should have received a copy of the GNU Lesser General Public # License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-13017 USA # # See: http://www.gnu.org/licenses/lgpl.html # 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 c7f743f916e..353be998710 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 @@ -15,7 +15,7 @@ # # You should have received a copy of the GNU Lesser General Public # License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-13017 USA # # See: http://www.gnu.org/licenses/lgpl.html # 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 cfea09c7163..82db7426b40 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 @@ -15,7 +15,7 @@ # # You should have received a copy of the GNU Lesser General Public # License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-13017 USA # # See: http://www.gnu.org/licenses/lgpl.html # 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 b84c94fcc75..9753592562b 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 @@ -15,7 +15,7 @@ # # You should have received a copy of the GNU Lesser General Public # License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-13017 USA # # See: http://www.gnu.org/licenses/lgpl.html # 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 e4e3f4ca31c..24db3a9ef82 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 @@ -15,7 +15,7 @@ # # You should have received a copy of the GNU Lesser General Public # License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-13017 USA # # See: http://www.gnu.org/licenses/lgpl.html # 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 c09bac21b3f..ffc74f91796 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 @@ -15,7 +15,7 @@ # # You should have received a copy of the GNU Lesser General Public # License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-13017 USA # # See: http://www.gnu.org/licenses/lgpl.html # 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 9ba40432c6d..aae838ea302 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 @@ -15,7 +15,7 @@ # # You should have received a copy of the GNU Lesser General Public # License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-13017 USA # # See: http://www.gnu.org/licenses/lgpl.html # 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 edfc35e30ae..45695757799 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 @@ -15,7 +15,7 @@ # # You should have received a copy of the GNU Lesser General Public # License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-13017 USA # # See: http://www.gnu.org/licenses/lgpl.html # 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 c6d4b3733cd..f16ed3eb8b2 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 @@ -15,7 +15,7 @@ # # You should have received a copy of the GNU Lesser General Public # License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-13017 USA # # See: http://www.gnu.org/licenses/lgpl.html # 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 ff75e0bcd75..a70271f9285 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 @@ -15,7 +15,7 @@ # # You should have received a copy of the GNU Lesser General Public # License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-13017 USA # # See: http://www.gnu.org/licenses/lgpl.html # 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 884e601b9ad..df339c771d7 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 @@ -15,7 +15,7 @@ # # You should have received a copy of the GNU Lesser General Public # License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-13017 USA # # See: http://www.gnu.org/licenses/lgpl.html # 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 35e4966de84..4acca9e8e04 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 @@ -15,7 +15,7 @@ # # You should have received a copy of the GNU Lesser General Public # License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-13017 USA # # See: http://www.gnu.org/licenses/lgpl.html # 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 eec2131a8bf..f8f088ec181 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 @@ -15,7 +15,7 @@ # # You should have received a copy of the GNU Lesser General Public # License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-13017 USA # # See: http://www.gnu.org/licenses/lgpl.html # 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 b65fe403a80..2c763907a72 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 @@ -15,7 +15,7 @@ # # You should have received a copy of the GNU Lesser General Public # License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-13017 USA # # See: http://www.gnu.org/licenses/lgpl.html # 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 0b513b1256d..b2c863e7395 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 @@ -15,7 +15,7 @@ # # You should have received a copy of the GNU Lesser General Public # License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-13017 USA # # See: http://www.gnu.org/licenses/lgpl.html # 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 8c2545c6fdc..fdb0c078d7c 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 @@ -15,7 +15,7 @@ # # You should have received a copy of the GNU Lesser General Public # License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-13017 USA # # See: http://www.gnu.org/licenses/lgpl.html # 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 05decaaab5d..9dd6ea68295 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 @@ -15,7 +15,7 @@ # # You should have received a copy of the GNU Lesser General Public # License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-13017 USA # # See: http://www.gnu.org/licenses/lgpl.html # 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 aed354771d1..7ea486a2f03 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 @@ -15,7 +15,7 @@ # # You should have received a copy of the GNU Lesser General Public # License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-13017 USA # # See: http://www.gnu.org/licenses/lgpl.html # diff --git a/addons/document_webdav/__openerp__.py b/addons/document_webdav/__openerp__.py index ec112ec7c38..faf943cc4e3 100644 --- a/addons/document_webdav/__openerp__.py +++ b/addons/document_webdav/__openerp__.py @@ -24,7 +24,7 @@ # # 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. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # ############################################################################## diff --git a/addons/document_webdav/test_davclient.py b/addons/document_webdav/test_davclient.py index 76a5e4514b3..bd9296ec94e 100644 --- a/addons/document_webdav/test_davclient.py +++ b/addons/document_webdav/test_davclient.py @@ -23,7 +23,7 @@ # # 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. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ############################################################################### """ A trivial HTTP/WebDAV client, used for testing the server diff --git a/addons/document_webdav/webdav_server.py b/addons/document_webdav/webdav_server.py index 2c008abe02f..351b71b3a14 100644 --- a/addons/document_webdav/webdav_server.py +++ b/addons/document_webdav/webdav_server.py @@ -30,7 +30,7 @@ # # 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. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ############################################################################### diff --git a/addons/l10n_ar/__init__.py b/addons/l10n_ar/__init__.py index 92da5dbf966..4bfa5fda319 100644 --- a/addons/l10n_ar/__init__.py +++ b/addons/l10n_ar/__init__.py @@ -23,7 +23,7 @@ # # 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. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # ############################################################################## diff --git a/addons/l10n_bo/__init__.py b/addons/l10n_bo/__init__.py index 92da5dbf966..4bfa5fda319 100644 --- a/addons/l10n_bo/__init__.py +++ b/addons/l10n_bo/__init__.py @@ -23,7 +23,7 @@ # # 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. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # ############################################################################## diff --git a/addons/l10n_cl/__init__.py b/addons/l10n_cl/__init__.py index 92da5dbf966..4bfa5fda319 100644 --- a/addons/l10n_cl/__init__.py +++ b/addons/l10n_cl/__init__.py @@ -23,7 +23,7 @@ # # 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. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # ############################################################################## diff --git a/addons/l10n_fr/__init__.py b/addons/l10n_fr/__init__.py index 8d5728e334e..8631b775662 100644 --- a/addons/l10n_fr/__init__.py +++ b/addons/l10n_fr/__init__.py @@ -22,7 +22,7 @@ # # 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. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # ############################################################################## diff --git a/addons/l10n_fr/__openerp__.py b/addons/l10n_fr/__openerp__.py index e1d4b9ac334..7d7ef3dbd65 100644 --- a/addons/l10n_fr/__openerp__.py +++ b/addons/l10n_fr/__openerp__.py @@ -22,7 +22,7 @@ # # 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. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # ############################################################################## { diff --git a/addons/l10n_fr/report/__init__.py b/addons/l10n_fr/report/__init__.py index 9907a2f5765..2608e4f397e 100644 --- a/addons/l10n_fr/report/__init__.py +++ b/addons/l10n_fr/report/__init__.py @@ -22,7 +22,7 @@ # # 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. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # ############################################################################## diff --git a/addons/l10n_fr/report/base_report.py b/addons/l10n_fr/report/base_report.py index 39a18bc7ca4..0e85f4b8536 100644 --- a/addons/l10n_fr/report/base_report.py +++ b/addons/l10n_fr/report/base_report.py @@ -22,7 +22,7 @@ # # 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. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # ############################################################################## diff --git a/addons/l10n_fr/report/bilan_report.py b/addons/l10n_fr/report/bilan_report.py index a7947434da0..559074e12f4 100644 --- a/addons/l10n_fr/report/bilan_report.py +++ b/addons/l10n_fr/report/bilan_report.py @@ -22,7 +22,7 @@ # # 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. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # ############################################################################## diff --git a/addons/l10n_fr/report/compute_resultant_report.py b/addons/l10n_fr/report/compute_resultant_report.py index 9a1809fd7cc..f67e00495c4 100644 --- a/addons/l10n_fr/report/compute_resultant_report.py +++ b/addons/l10n_fr/report/compute_resultant_report.py @@ -22,7 +22,7 @@ # # 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. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # ############################################################################## diff --git a/addons/l10n_fr/wizard/__init__.py b/addons/l10n_fr/wizard/__init__.py index 6e29471a975..f1ccf013477 100644 --- a/addons/l10n_fr/wizard/__init__.py +++ b/addons/l10n_fr/wizard/__init__.py @@ -22,7 +22,7 @@ # # 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. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # ############################################################################## diff --git a/addons/l10n_fr/wizard/fr_report_bilan.py b/addons/l10n_fr/wizard/fr_report_bilan.py index 90e97389eed..0fc1ac0e39d 100644 --- a/addons/l10n_fr/wizard/fr_report_bilan.py +++ b/addons/l10n_fr/wizard/fr_report_bilan.py @@ -22,7 +22,7 @@ # # 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. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # ############################################################################## diff --git a/addons/l10n_fr/wizard/fr_report_compute_resultant.py b/addons/l10n_fr/wizard/fr_report_compute_resultant.py index eff52189bc9..4d7069f8440 100644 --- a/addons/l10n_fr/wizard/fr_report_compute_resultant.py +++ b/addons/l10n_fr/wizard/fr_report_compute_resultant.py @@ -22,7 +22,7 @@ # # 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. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # ############################################################################## diff --git a/addons/l10n_nl/__init__.py b/addons/l10n_nl/__init__.py index 57a3bb10df3..45c8387f5e8 100644 --- a/addons/l10n_nl/__init__.py +++ b/addons/l10n_nl/__init__.py @@ -22,7 +22,7 @@ # # 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. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # ############################################################################## diff --git a/addons/l10n_nl/__openerp__.py b/addons/l10n_nl/__openerp__.py index 5e811511c01..c85ee24f74c 100644 --- a/addons/l10n_nl/__openerp__.py +++ b/addons/l10n_nl/__openerp__.py @@ -22,7 +22,7 @@ # # 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. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # ############################################################################## # diff --git a/addons/l10n_pa/__init__.py b/addons/l10n_pa/__init__.py index 92da5dbf966..4bfa5fda319 100644 --- a/addons/l10n_pa/__init__.py +++ b/addons/l10n_pa/__init__.py @@ -23,7 +23,7 @@ # # 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. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # ############################################################################## diff --git a/addons/l10n_pe/__init__.py b/addons/l10n_pe/__init__.py index 92da5dbf966..4bfa5fda319 100644 --- a/addons/l10n_pe/__init__.py +++ b/addons/l10n_pe/__init__.py @@ -23,7 +23,7 @@ # # 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. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # ############################################################################## diff --git a/addons/report_webkit/__init__.py b/addons/report_webkit/__init__.py index dd44517e787..d548f4edebe 100644 --- a/addons/report_webkit/__init__.py +++ b/addons/report_webkit/__init__.py @@ -25,7 +25,7 @@ # # 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. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # ############################################################################## diff --git a/addons/report_webkit/__openerp__.py b/addons/report_webkit/__openerp__.py index 5b88cb78eb4..c494c252a75 100644 --- a/addons/report_webkit/__openerp__.py +++ b/addons/report_webkit/__openerp__.py @@ -25,7 +25,7 @@ # # 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. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # ############################################################################## diff --git a/addons/report_webkit/company.py b/addons/report_webkit/company.py index f9ae4191528..0b2069b9ef5 100644 --- a/addons/report_webkit/company.py +++ b/addons/report_webkit/company.py @@ -25,7 +25,7 @@ # # 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. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # ############################################################################## diff --git a/addons/report_webkit/convert.py b/addons/report_webkit/convert.py index b4d42325bb6..0a394c47adb 100644 --- a/addons/report_webkit/convert.py +++ b/addons/report_webkit/convert.py @@ -25,7 +25,7 @@ # # 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. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # ############################################################################## diff --git a/addons/report_webkit/header.py b/addons/report_webkit/header.py index 71deb57c370..5363f2e9951 100644 --- a/addons/report_webkit/header.py +++ b/addons/report_webkit/header.py @@ -25,7 +25,7 @@ # # 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. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # ############################################################################## diff --git a/addons/report_webkit/ir_report.py b/addons/report_webkit/ir_report.py index 1385f504928..7f5dae3ff88 100644 --- a/addons/report_webkit/ir_report.py +++ b/addons/report_webkit/ir_report.py @@ -25,7 +25,7 @@ # # 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. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # ############################################################################## diff --git a/addons/report_webkit/report_helper.py b/addons/report_webkit/report_helper.py index f1df1e786e3..35a38718254 100644 --- a/addons/report_webkit/report_helper.py +++ b/addons/report_webkit/report_helper.py @@ -25,7 +25,7 @@ # # 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. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # ############################################################################## diff --git a/addons/report_webkit/webkit_report.py b/addons/report_webkit/webkit_report.py index 99e1aa31058..b552769fe8e 100644 --- a/addons/report_webkit/webkit_report.py +++ b/addons/report_webkit/webkit_report.py @@ -26,7 +26,7 @@ # # 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. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # ############################################################################## diff --git a/addons/report_webkit/wizard/__init__.py b/addons/report_webkit/wizard/__init__.py index e8ae8b79fc0..f14ff575845 100644 --- a/addons/report_webkit/wizard/__init__.py +++ b/addons/report_webkit/wizard/__init__.py @@ -25,7 +25,7 @@ # # 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. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # ############################################################################## diff --git a/addons/report_webkit/wizard/report_webkit_actions.py b/addons/report_webkit/wizard/report_webkit_actions.py index b0e761752f6..f471ab67e98 100644 --- a/addons/report_webkit/wizard/report_webkit_actions.py +++ b/addons/report_webkit/wizard/report_webkit_actions.py @@ -25,7 +25,7 @@ # # 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. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # ############################################################################## diff --git a/addons/resource/faces/observer.py b/addons/resource/faces/observer.py index 894345230ea..4d2a3790796 100644 --- a/addons/resource/faces/observer.py +++ b/addons/resource/faces/observer.py @@ -22,7 +22,7 @@ # 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. +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ############################################################################ #@-node:<< Copyright >> diff --git a/addons/resource/faces/pcalendar.py b/addons/resource/faces/pcalendar.py index c82c49d4816..231cb21fbef 100644 --- a/addons/resource/faces/pcalendar.py +++ b/addons/resource/faces/pcalendar.py @@ -22,7 +22,7 @@ # 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. +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ############################################################################ #@-node:<< Copyright >> diff --git a/addons/resource/faces/plocale.py b/addons/resource/faces/plocale.py index 61bfa91917b..75478dc538a 100644 --- a/addons/resource/faces/plocale.py +++ b/addons/resource/faces/plocale.py @@ -17,7 +17,7 @@ # 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. +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ############################################################################ import gettext diff --git a/addons/resource/faces/resource.py b/addons/resource/faces/resource.py index 3451806444e..48e74290ff5 100644 --- a/addons/resource/faces/resource.py +++ b/addons/resource/faces/resource.py @@ -22,7 +22,7 @@ # 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. +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ############################################################################ #@-node:<< Copyright >> diff --git a/addons/resource/faces/task.py b/addons/resource/faces/task.py index 7516f41db2a..2a7ec4f271f 100644 --- a/addons/resource/faces/task.py +++ b/addons/resource/faces/task.py @@ -22,7 +22,7 @@ # 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. +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ############################################################################ #@-node:<< Copyright >> diff --git a/addons/resource/faces/timescale.py b/addons/resource/faces/timescale.py index 3e7c3c1dc89..0c4dedcd9b3 100644 --- a/addons/resource/faces/timescale.py +++ b/addons/resource/faces/timescale.py @@ -17,7 +17,7 @@ # 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. +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ############################################################################ import faces.pcalendar as pcal diff --git a/addons/resource/faces/utils.py b/addons/resource/faces/utils.py index 54985767613..9412f045a38 100644 --- a/addons/resource/faces/utils.py +++ b/addons/resource/faces/utils.py @@ -17,7 +17,7 @@ # 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. +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ############################################################################ import observer From 7d79e8ade46001ba6d1797c1f84f060cae72c313 Mon Sep 17 00:00:00 2001 From: Martin Trigaux Date: Tue, 14 May 2013 15:51:50 +0200 Subject: [PATCH 40/74] [IMP] fix EOL : CRLF to unix bzr revid: mat@openerp.com-20130514135150-j0flc0ffsddx09bw --- .../static/lib/dhtmlxScheduler/license.txt | 456 +++++++++--------- 1 file changed, 228 insertions(+), 228 deletions(-) diff --git a/addons/web_calendar/static/lib/dhtmlxScheduler/license.txt b/addons/web_calendar/static/lib/dhtmlxScheduler/license.txt index 82120142269..d273d6c65a8 100644 --- a/addons/web_calendar/static/lib/dhtmlxScheduler/license.txt +++ b/addons/web_calendar/static/lib/dhtmlxScheduler/license.txt @@ -1,228 +1,228 @@ - - GNU GENERAL PUBLIC LICENSE - -Version 2, June 1991 - -Copyright (C) 1989, 1991 Free Software Foundation, Inc. - -51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA - -Everyone is permitted to copy and distribute verbatim copies - -of this license document, but changing it is not allowed. - -TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - -0. This License applies to any program or other work which contains a -notice placed by the copyright holder saying it may be distributed under -the terms of this General Public License. The "Program", below, refers -to any such program or work, and a "work based on the Program" means -either the Program or any derivative work under copyright law: that is -to say, a work containing the Program or a portion of it, either -verbatim or with modifications and/or translated into another language. -(Hereinafter, translation is included without limitation in the term -"modification".) Each licensee is addressed as "you". - -Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of running -the Program is not restricted, and the output from the Program is -covered only if its contents constitute a work based on the Program -(independent of having been made by running the Program). Whether that -is true depends on what the Program does. - -1. You may copy and distribute verbatim copies of the Program's source -code as you receive it, in any medium, provided that you conspicuously -and appropriately publish on each copy an appropriate copyright notice -and disclaimer of warranty; keep intact all the notices that refer to -this License and to the absence of any warranty; and give any other -recipients of the Program a copy of this License along with the Program. - -You may charge a fee for the physical act of transferring a copy, and -you may at your option offer warranty protection in exchange for a fee. - -2. You may modify your copy or copies of the Program or any portion of -it, thus forming a work based on the Program, and copy and distribute -such modifications or work under the terms of Section 1 above, provided -that you also meet all of these conditions: - -a) You must cause the modified files to carry prominent notices stating -that you changed the files and the date of any change. - -b) You must cause any work that you distribute or publish, that in whole -or in part contains or is derived from the Program or any part thereof, -to be licensed as a whole at no charge to all third parties under the -terms of this License. - -c) If the modified program normally reads commands interactively when -run, you must cause it, when started running for such interactive use in -the most ordinary way, to print or display an announcement including an -appropriate copyright notice and a notice that there is no warranty (or -else, saying that you provide a warranty) and that users may -redistribute the program under these conditions, and telling the user -how to view a copy of this License. (Exception: if the Program itself is -interactive but does not normally print such an announcement, your work -based on the Program is not required to print an announcement.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Program, and -can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based on -the Program, the distribution of the whole must be on the terms of this -License, whose permissions for other licensees extend to the entire -whole, and thus to each and every part regardless of who wrote it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Program. - -In addition, mere aggregation of another work not based on the Program -with the Program (or with a work based on the Program) on a volume of a -storage or distribution medium does not bring the other work under the -scope of this License. - -3. You may copy and distribute the Program (or a work based on it, under -Section 2) in object code or executable form under the terms of Sections -1 and 2 above provided that you also do one of the following: - -a) Accompany it with the complete corresponding machine-readable source -code, which must be distributed under the terms of Sections 1 and 2 -above on a medium customarily used for software interchange; or, - -b) Accompany it with a written offer, valid for at least three years, to -give any third party, for a charge no more than your cost of physically -performing source distribution, a complete machine-readable copy of the -corresponding source code, to be distributed under the terms of Sections -1 and 2 above on a medium customarily used for software interchange; or, - -c) Accompany it with the information you received as to the offer to -distribute corresponding source code. (This alternative is allowed only -for noncommercial distribution and only if you received the program in -object code or executable form with such an offer, in accord with -Subsection b above.) - -The source code for a work means the preferred form of the work for -making modifications to it. For an executable work, complete source code -means all the source code for all modules it contains, plus any -associated interface definition files, plus the scripts used to control -compilation and installation of the executable. However, as a special -exception, the source code distributed need not include anything that is -normally distributed (in either source or binary form) with the major -components (compiler, kernel, and so on) of the operating system on -which the executable runs, unless that component itself accompanies the -executable. - -If distribution of executable or object code is made by offering access -to copy from a designated place, then offering equivalent access to copy -the source code from the same place counts as distribution of the source -code, even though third parties are not compelled to copy the source -along with the object code. - -4. You may not copy, modify, sublicense, or distribute the Program -except as expressly provided under this License. Any attempt otherwise -to copy, modify, sublicense or distribute the Program is void, and will -automatically terminate your rights under this License. However, parties -who have received copies, or rights, from you under this License will -not have their licenses terminated so long as such parties remain in -full compliance. - -5. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Program or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Program (or any work based on the -Program), you indicate your acceptance of this License to do so, and all -its terms and conditions for copying, distributing or modifying the -Program or works based on it. - -6. Each time you redistribute the Program (or any work based on the -Program), the recipient automatically receives a license from the -original licensor to copy, distribute or modify the Program subject to -these terms and conditions. You may not impose any further restrictions -on the recipients' exercise of the rights granted herein. You are not -responsible for enforcing compliance by third parties to this License. - -7. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot distribute -so as to satisfy simultaneously your obligations under this License and -any other pertinent obligations, then as a consequence you may not -distribute the Program at all. For example, if a patent license would -not permit royalty-free redistribution of the Program by all those who -receive copies directly or indirectly through you, then the only way you -could satisfy both it and this License would be to refrain entirely from -distribution of the Program. - -If any portion of this section is held invalid or unenforceable under -any particular circumstance, the balance of the section is intended to -apply and the section as a whole is intended to apply in other -circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system, which is implemented -by public license practices. Many people have made generous -contributions to the wide range of software distributed through that -system in reliance on consistent application of that system; it is up to -the author/donor to decide if he or she is willing to distribute -software through any other system and a licensee cannot impose that choice. - -This section is intended to make thoroughly clear what is believed to be -a consequence of the rest of this License. - -8. If the distribution and/or use of the Program is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Program under this License may -add an explicit geographical distribution limitation excluding those -countries, so that distribution is permitted only in or among countries -not thus excluded. In such case, this License incorporates the -limitation as if written in the body of this License. - -9. The Free Software Foundation may publish revised and/or new versions -of the General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - -Each version is given a distinguishing version number. If the Program -specifies a version number of this License which applies to it and "any -later version", you have the option of following the terms and -conditions either of that version or of any later version published by -the Free Software Foundation. If the Program does not specify a version -number of this License, you may choose any version ever published by the -Free Software Foundation. - -10. If you wish to incorporate parts of the Program into other free -programs whose distribution conditions are different, write to the -author to ask for permission. For software which is copyrighted by the -Free Software Foundation, write to the Free Software Foundation; we -sometimes make exceptions for this. Our decision will be guided by the -two goals of preserving the free status of all derivatives of our free -software and of promoting the sharing and reuse of software generally. - -NO WARRANTY - -11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY -FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN -OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES -PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER -EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE -ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH -YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL -NECESSARY SERVICING, REPAIR OR CORRECTION. - -12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN -WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY -AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR -DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL -DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM -(INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED -INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF -THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR -OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. - + + GNU GENERAL PUBLIC LICENSE + +Version 2, June 1991 + +Copyright (C) 1989, 1991 Free Software Foundation, Inc. + +51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA + +Everyone is permitted to copy and distribute verbatim copies + +of this license document, but changing it is not allowed. + +TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + +0. This License applies to any program or other work which contains a +notice placed by the copyright holder saying it may be distributed under +the terms of this General Public License. The "Program", below, refers +to any such program or work, and a "work based on the Program" means +either the Program or any derivative work under copyright law: that is +to say, a work containing the Program or a portion of it, either +verbatim or with modifications and/or translated into another language. +(Hereinafter, translation is included without limitation in the term +"modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of running +the Program is not restricted, and the output from the Program is +covered only if its contents constitute a work based on the Program +(independent of having been made by running the Program). Whether that +is true depends on what the Program does. + +1. You may copy and distribute verbatim copies of the Program's source +code as you receive it, in any medium, provided that you conspicuously +and appropriately publish on each copy an appropriate copyright notice +and disclaimer of warranty; keep intact all the notices that refer to +this License and to the absence of any warranty; and give any other +recipients of the Program a copy of this License along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + +2. You may modify your copy or copies of the Program or any portion of +it, thus forming a work based on the Program, and copy and distribute +such modifications or work under the terms of Section 1 above, provided +that you also meet all of these conditions: + +a) You must cause the modified files to carry prominent notices stating +that you changed the files and the date of any change. + +b) You must cause any work that you distribute or publish, that in whole +or in part contains or is derived from the Program or any part thereof, +to be licensed as a whole at no charge to all third parties under the +terms of this License. + +c) If the modified program normally reads commands interactively when +run, you must cause it, when started running for such interactive use in +the most ordinary way, to print or display an announcement including an +appropriate copyright notice and a notice that there is no warranty (or +else, saying that you provide a warranty) and that users may +redistribute the program under these conditions, and telling the user +how to view a copy of this License. (Exception: if the Program itself is +interactive but does not normally print such an announcement, your work +based on the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, and +can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based on +the Program, the distribution of the whole must be on the terms of this +License, whose permissions for other licensees extend to the entire +whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of a +storage or distribution medium does not bring the other work under the +scope of this License. + +3. You may copy and distribute the Program (or a work based on it, under +Section 2) in object code or executable form under the terms of Sections +1 and 2 above provided that you also do one of the following: + +a) Accompany it with the complete corresponding machine-readable source +code, which must be distributed under the terms of Sections 1 and 2 +above on a medium customarily used for software interchange; or, + +b) Accompany it with a written offer, valid for at least three years, to +give any third party, for a charge no more than your cost of physically +performing source distribution, a complete machine-readable copy of the +corresponding source code, to be distributed under the terms of Sections +1 and 2 above on a medium customarily used for software interchange; or, + +c) Accompany it with the information you received as to the offer to +distribute corresponding source code. (This alternative is allowed only +for noncommercial distribution and only if you received the program in +object code or executable form with such an offer, in accord with +Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source code +means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to control +compilation and installation of the executable. However, as a special +exception, the source code distributed need not include anything that is +normally distributed (in either source or binary form) with the major +components (compiler, kernel, and so on) of the operating system on +which the executable runs, unless that component itself accompanies the +executable. + +If distribution of executable or object code is made by offering access +to copy from a designated place, then offering equivalent access to copy +the source code from the same place counts as distribution of the source +code, even though third parties are not compelled to copy the source +along with the object code. + +4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt otherwise +to copy, modify, sublicense or distribute the Program is void, and will +automatically terminate your rights under this License. However, parties +who have received copies, or rights, from you under this License will +not have their licenses terminated so long as such parties remain in +full compliance. + +5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and all +its terms and conditions for copying, distributing or modifying the +Program or works based on it. + +6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further restrictions +on the recipients' exercise of the rights granted herein. You are not +responsible for enforcing compliance by third parties to this License. + +7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot distribute +so as to satisfy simultaneously your obligations under this License and +any other pertinent obligations, then as a consequence you may not +distribute the Program at all. For example, if a patent license would +not permit royalty-free redistribution of the Program by all those who +receive copies directly or indirectly through you, then the only way you +could satisfy both it and this License would be to refrain entirely from +distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is implemented +by public license practices. Many people have made generous +contributions to the wide range of software distributed through that +system in reliance on consistent application of that system; it is up to +the author/donor to decide if he or she is willing to distribute +software through any other system and a licensee cannot impose that choice. + +This section is intended to make thoroughly clear what is believed to be +a consequence of the rest of this License. + +8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License may +add an explicit geographical distribution limitation excluding those +countries, so that distribution is permitted only in or among countries +not thus excluded. In such case, this License incorporates the +limitation as if written in the body of this License. + +9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and +conditions either of that version or of any later version published by +the Free Software Foundation. If the Program does not specify a version +number of this License, you may choose any version ever published by the +Free Software Foundation. + +10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the +author to ask for permission. For software which is copyrighted by the +Free Software Foundation, write to the Free Software Foundation; we +sometimes make exceptions for this. Our decision will be guided by the +two goals of preserving the free status of all derivatives of our free +software and of promoting the sharing and reuse of software generally. + +NO WARRANTY + +11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER +EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE +ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH +YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL +NECESSARY SERVICING, REPAIR OR CORRECTION. + +12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN +WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY +AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR +DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL +DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM +(INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED +INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF +THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR +OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. + From 53a6042e38b4c2ef0e96bdc935a38768c3aa50fc Mon Sep 17 00:00:00 2001 From: Martin Trigaux Date: Tue, 14 May 2013 15:52:40 +0200 Subject: [PATCH 41/74] [IMP] remove empty line bzr revid: mat@openerp.com-20130514135240-66zvm1uv91snpbnm --- addons/l10n_ro/res_partner.py | 1 - 1 file changed, 1 deletion(-) diff --git a/addons/l10n_ro/res_partner.py b/addons/l10n_ro/res_partner.py index 4720c6f8157..4835f75bb40 100644 --- a/addons/l10n_ro/res_partner.py +++ b/addons/l10n_ro/res_partner.py @@ -1,4 +1,3 @@ - # -*- encoding: utf-8 -*- ############################################################################## # From 46210a930db79fd3f1a8ee2b032b0d993ccc7985 Mon Sep 17 00:00:00 2001 From: Martin Trigaux Date: Tue, 14 May 2013 15:55:53 +0200 Subject: [PATCH 42/74] [IMP] fix EOL : CRLF to unix bzr revid: mat@openerp.com-20130514135553-50jrqn7dkg77hhe6 --- .../static/lib/dhtmlxGantt/index.html | 214 +++++++++--------- 1 file changed, 107 insertions(+), 107 deletions(-) diff --git a/addons/web_gantt/static/lib/dhtmlxGantt/index.html b/addons/web_gantt/static/lib/dhtmlxGantt/index.html index 5196d426ca6..d35c33ca747 100644 --- a/addons/web_gantt/static/lib/dhtmlxGantt/index.html +++ b/addons/web_gantt/static/lib/dhtmlxGantt/index.html @@ -1,107 +1,107 @@ - - - Gantt Chart - - - - - - - - - - - -
DHTML Gantt sample
- -

Initialize object on page

-

You can place this JavaScript Gantt Chart anywhere on your web page, attaching it - to any div object.
-

- - - -<div style="width:950px;height:620px;position:absolute" id="GanttDiv"></div> -<script> - var gantt = new GanttChart(); - gantt.setImagePath("codebase/imgs/"); - gantt.setEditable(true); - ... - gantt.addProject(project_1); - ... - gantt.create("GanttDiv"); -</script> - - -
-
- - - - + + + Gantt Chart + + + + + + + + + + + +
DHTML Gantt sample
+ +

Initialize object on page

+

You can place this JavaScript Gantt Chart anywhere on your web page, attaching it + to any div object.
+

+ + + +<div style="width:950px;height:620px;position:absolute" id="GanttDiv"></div> +<script> + var gantt = new GanttChart(); + gantt.setImagePath("codebase/imgs/"); + gantt.setEditable(true); + ... + gantt.addProject(project_1); + ... + gantt.create("GanttDiv"); +</script> + + +
+
+ + + + From 3c11652facfe1c540b005fb961e20a48b7a1b3d9 Mon Sep 17 00:00:00 2001 From: Martin Trigaux Date: Tue, 14 May 2013 16:11:32 +0200 Subject: [PATCH 43/74] [IMP] trmove double space in fsf address bzr revid: mat@openerp.com-20130514141132-610k885sxtcr8vpb --- addons/account/report/account_general_ledger.py | 2 +- addons/account_test/account_test.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 +- .../openerp_report_designer/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/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/modify.py | 2 +- addons/document_webdav/__openerp__.py | 2 +- addons/document_webdav/test_davclient.py | 2 +- addons/document_webdav/webdav_server.py | 2 +- addons/l10n_ar/__init__.py | 2 +- addons/l10n_bo/__init__.py | 2 +- addons/l10n_cl/__init__.py | 2 +- addons/l10n_fr/__init__.py | 2 +- addons/l10n_fr/__openerp__.py | 2 +- addons/l10n_fr/report/__init__.py | 2 +- addons/l10n_fr/report/base_report.py | 2 +- addons/l10n_fr/report/bilan_report.py | 2 +- addons/l10n_fr/report/compute_resultant_report.py | 2 +- addons/l10n_fr/wizard/__init__.py | 2 +- addons/l10n_fr/wizard/fr_report_bilan.py | 2 +- addons/l10n_fr/wizard/fr_report_compute_resultant.py | 2 +- addons/l10n_nl/__init__.py | 2 +- addons/l10n_nl/__openerp__.py | 2 +- addons/l10n_pa/__init__.py | 2 +- addons/l10n_pe/__init__.py | 2 +- addons/report_webkit/__init__.py | 2 +- addons/report_webkit/__openerp__.py | 2 +- addons/report_webkit/company.py | 2 +- addons/report_webkit/convert.py | 2 +- addons/report_webkit/header.py | 2 +- addons/report_webkit/ir_report.py | 2 +- addons/report_webkit/report_helper.py | 2 +- addons/report_webkit/webkit_report.py | 2 +- addons/report_webkit/wizard/__init__.py | 2 +- addons/report_webkit/wizard/report_webkit_actions.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 +- 60 files changed, 60 insertions(+), 60 deletions(-) diff --git a/addons/account/report/account_general_ledger.py b/addons/account/report/account_general_ledger.py index 50ab732ea5f..e0f24c432e9 100644 --- a/addons/account/report/account_general_ledger.py +++ b/addons/account/report/account_general_ledger.py @@ -23,7 +23,7 @@ # # 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # ############################################################################## diff --git a/addons/account_test/account_test.py b/addons/account_test/account_test.py index 3ed26556fd9..0a5f6ce5617 100644 --- a/addons/account_test/account_test.py +++ b/addons/account_test/account_test.py @@ -24,7 +24,7 @@ # # 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # ############################################################################## diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/About.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/About.py index e412a714f61..5d6bea06b9c 100644 --- a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/About.py +++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/About.py @@ -15,7 +15,7 @@ # # You should have received a copy of the GNU Lesser General Public # License along with this library; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-13017 USA +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-13017 USA # # See: http://www.gnu.org/licenses/lgpl.html # 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 353be998710..a820b38ad35 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 @@ -15,7 +15,7 @@ # # You should have received a copy of the GNU Lesser General Public # License along with this library; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-13017 USA +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-13017 USA # # See: http://www.gnu.org/licenses/lgpl.html # 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 82db7426b40..0448a1ebda4 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 @@ -15,7 +15,7 @@ # # You should have received a copy of the GNU Lesser General Public # License along with this library; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-13017 USA +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-13017 USA # # See: http://www.gnu.org/licenses/lgpl.html # 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 9753592562b..3115f2435ee 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 @@ -15,7 +15,7 @@ # # You should have received a copy of the GNU Lesser General Public # License along with this library; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-13017 USA +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-13017 USA # # See: http://www.gnu.org/licenses/lgpl.html # 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 24db3a9ef82..24efa36c8b2 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 @@ -15,7 +15,7 @@ # # You should have received a copy of the GNU Lesser General Public # License along with this library; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-13017 USA +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-13017 USA # # See: http://www.gnu.org/licenses/lgpl.html # 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 ffc74f91796..4ed19466ed2 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 @@ -15,7 +15,7 @@ # # You should have received a copy of the GNU Lesser General Public # License along with this library; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-13017 USA +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-13017 USA # # See: http://www.gnu.org/licenses/lgpl.html # 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 aae838ea302..1ec7c8c3cde 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 @@ -15,7 +15,7 @@ # # You should have received a copy of the GNU Lesser General Public # License along with this library; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-13017 USA +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-13017 USA # # See: http://www.gnu.org/licenses/lgpl.html # 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 45695757799..6edb8165dfa 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 @@ -15,7 +15,7 @@ # # You should have received a copy of the GNU Lesser General Public # License along with this library; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-13017 USA +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-13017 USA # # See: http://www.gnu.org/licenses/lgpl.html # 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 f16ed3eb8b2..e1d3bd05b20 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 @@ -15,7 +15,7 @@ # # You should have received a copy of the GNU Lesser General Public # License along with this library; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-13017 USA +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-13017 USA # # See: http://www.gnu.org/licenses/lgpl.html # 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 a70271f9285..d91333a6445 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 @@ -15,7 +15,7 @@ # # You should have received a copy of the GNU Lesser General Public # License along with this library; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-13017 USA +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-13017 USA # # See: http://www.gnu.org/licenses/lgpl.html # 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 df339c771d7..86d1beff331 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 @@ -15,7 +15,7 @@ # # You should have received a copy of the GNU Lesser General Public # License along with this library; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-13017 USA +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-13017 USA # # See: http://www.gnu.org/licenses/lgpl.html # 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 4acca9e8e04..086a55f1a81 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 @@ -15,7 +15,7 @@ # # You should have received a copy of the GNU Lesser General Public # License along with this library; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-13017 USA +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-13017 USA # # See: http://www.gnu.org/licenses/lgpl.html # 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 f8f088ec181..17a6049049b 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 @@ -15,7 +15,7 @@ # # You should have received a copy of the GNU Lesser General Public # License along with this library; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-13017 USA +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-13017 USA # # See: http://www.gnu.org/licenses/lgpl.html # 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 2c763907a72..0b5d452ebfd 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 @@ -15,7 +15,7 @@ # # You should have received a copy of the GNU Lesser General Public # License along with this library; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-13017 USA +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-13017 USA # # See: http://www.gnu.org/licenses/lgpl.html # 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 b2c863e7395..5fc3b9f6bc7 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 @@ -15,7 +15,7 @@ # # You should have received a copy of the GNU Lesser General Public # License along with this library; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-13017 USA +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-13017 USA # # See: http://www.gnu.org/licenses/lgpl.html # 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 fdb0c078d7c..352099df61c 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 @@ -15,7 +15,7 @@ # # You should have received a copy of the GNU Lesser General Public # License along with this library; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-13017 USA +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-13017 USA # # See: http://www.gnu.org/licenses/lgpl.html # 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 9dd6ea68295..bdfb9c8564b 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 @@ -15,7 +15,7 @@ # # You should have received a copy of the GNU Lesser General Public # License along with this library; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-13017 USA +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-13017 USA # # See: http://www.gnu.org/licenses/lgpl.html # 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 03c632aeaa9..5dda402b2d7 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 @@ -15,7 +15,7 @@ # # You should have received a copy of the GNU Lesser General Public # License along with this library; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA # # See: http://www.gnu.org/licenses/lgpl.html # 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 fd2bd7d2195..f8e22ea33d5 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 @@ -15,7 +15,7 @@ # # You should have received a copy of the GNU Lesser General Public # License along with this library; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA # # See: http://www.gnu.org/licenses/lgpl.html # 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 4b863405a4d..2e1f45cf0df 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 @@ -15,7 +15,7 @@ # # You should have received a copy of the GNU Lesser General Public # License along with this library; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA # # See: http://www.gnu.org/licenses/lgpl.html # 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 6c3b7d4c11d..df2171ce22e 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 @@ -15,7 +15,7 @@ # # You should have received a copy of the GNU Lesser General Public # License along with this library; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA # # See: http://www.gnu.org/licenses/lgpl.html # 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 7ea486a2f03..3687a34ee3a 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 @@ -15,7 +15,7 @@ # # You should have received a copy of the GNU Lesser General Public # License along with this library; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-13017 USA +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-13017 USA # # See: http://www.gnu.org/licenses/lgpl.html # diff --git a/addons/document_webdav/__openerp__.py b/addons/document_webdav/__openerp__.py index faf943cc4e3..b2aacc9593a 100644 --- a/addons/document_webdav/__openerp__.py +++ b/addons/document_webdav/__openerp__.py @@ -24,7 +24,7 @@ # # 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # ############################################################################## diff --git a/addons/document_webdav/test_davclient.py b/addons/document_webdav/test_davclient.py index bd9296ec94e..5ee02819e09 100644 --- a/addons/document_webdav/test_davclient.py +++ b/addons/document_webdav/test_davclient.py @@ -23,7 +23,7 @@ # # 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ############################################################################### """ A trivial HTTP/WebDAV client, used for testing the server diff --git a/addons/document_webdav/webdav_server.py b/addons/document_webdav/webdav_server.py index 351b71b3a14..4284f25d1c0 100644 --- a/addons/document_webdav/webdav_server.py +++ b/addons/document_webdav/webdav_server.py @@ -30,7 +30,7 @@ # # 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ############################################################################### diff --git a/addons/l10n_ar/__init__.py b/addons/l10n_ar/__init__.py index 4bfa5fda319..bef6fa84279 100644 --- a/addons/l10n_ar/__init__.py +++ b/addons/l10n_ar/__init__.py @@ -23,7 +23,7 @@ # # 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # ############################################################################## diff --git a/addons/l10n_bo/__init__.py b/addons/l10n_bo/__init__.py index 4bfa5fda319..bef6fa84279 100644 --- a/addons/l10n_bo/__init__.py +++ b/addons/l10n_bo/__init__.py @@ -23,7 +23,7 @@ # # 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # ############################################################################## diff --git a/addons/l10n_cl/__init__.py b/addons/l10n_cl/__init__.py index 4bfa5fda319..bef6fa84279 100644 --- a/addons/l10n_cl/__init__.py +++ b/addons/l10n_cl/__init__.py @@ -23,7 +23,7 @@ # # 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # ############################################################################## diff --git a/addons/l10n_fr/__init__.py b/addons/l10n_fr/__init__.py index 8631b775662..fda93f21bd5 100644 --- a/addons/l10n_fr/__init__.py +++ b/addons/l10n_fr/__init__.py @@ -22,7 +22,7 @@ # # 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # ############################################################################## diff --git a/addons/l10n_fr/__openerp__.py b/addons/l10n_fr/__openerp__.py index 7d7ef3dbd65..9a956a9b284 100644 --- a/addons/l10n_fr/__openerp__.py +++ b/addons/l10n_fr/__openerp__.py @@ -22,7 +22,7 @@ # # 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # ############################################################################## { diff --git a/addons/l10n_fr/report/__init__.py b/addons/l10n_fr/report/__init__.py index 2608e4f397e..c6881fdac81 100644 --- a/addons/l10n_fr/report/__init__.py +++ b/addons/l10n_fr/report/__init__.py @@ -22,7 +22,7 @@ # # 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # ############################################################################## diff --git a/addons/l10n_fr/report/base_report.py b/addons/l10n_fr/report/base_report.py index 0e85f4b8536..0bc139196f1 100644 --- a/addons/l10n_fr/report/base_report.py +++ b/addons/l10n_fr/report/base_report.py @@ -22,7 +22,7 @@ # # 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # ############################################################################## diff --git a/addons/l10n_fr/report/bilan_report.py b/addons/l10n_fr/report/bilan_report.py index 559074e12f4..9c477e17813 100644 --- a/addons/l10n_fr/report/bilan_report.py +++ b/addons/l10n_fr/report/bilan_report.py @@ -22,7 +22,7 @@ # # 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # ############################################################################## diff --git a/addons/l10n_fr/report/compute_resultant_report.py b/addons/l10n_fr/report/compute_resultant_report.py index f67e00495c4..94f2d275fbb 100644 --- a/addons/l10n_fr/report/compute_resultant_report.py +++ b/addons/l10n_fr/report/compute_resultant_report.py @@ -22,7 +22,7 @@ # # 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # ############################################################################## diff --git a/addons/l10n_fr/wizard/__init__.py b/addons/l10n_fr/wizard/__init__.py index f1ccf013477..a4640d111da 100644 --- a/addons/l10n_fr/wizard/__init__.py +++ b/addons/l10n_fr/wizard/__init__.py @@ -22,7 +22,7 @@ # # 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # ############################################################################## diff --git a/addons/l10n_fr/wizard/fr_report_bilan.py b/addons/l10n_fr/wizard/fr_report_bilan.py index 0fc1ac0e39d..c2c851785d9 100644 --- a/addons/l10n_fr/wizard/fr_report_bilan.py +++ b/addons/l10n_fr/wizard/fr_report_bilan.py @@ -22,7 +22,7 @@ # # 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # ############################################################################## diff --git a/addons/l10n_fr/wizard/fr_report_compute_resultant.py b/addons/l10n_fr/wizard/fr_report_compute_resultant.py index 4d7069f8440..35f5e296185 100644 --- a/addons/l10n_fr/wizard/fr_report_compute_resultant.py +++ b/addons/l10n_fr/wizard/fr_report_compute_resultant.py @@ -22,7 +22,7 @@ # # 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # ############################################################################## diff --git a/addons/l10n_nl/__init__.py b/addons/l10n_nl/__init__.py index 45c8387f5e8..af15e1b315d 100644 --- a/addons/l10n_nl/__init__.py +++ b/addons/l10n_nl/__init__.py @@ -22,7 +22,7 @@ # # 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # ############################################################################## diff --git a/addons/l10n_nl/__openerp__.py b/addons/l10n_nl/__openerp__.py index c85ee24f74c..39a9c70080f 100644 --- a/addons/l10n_nl/__openerp__.py +++ b/addons/l10n_nl/__openerp__.py @@ -22,7 +22,7 @@ # # 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # ############################################################################## # diff --git a/addons/l10n_pa/__init__.py b/addons/l10n_pa/__init__.py index 4bfa5fda319..bef6fa84279 100644 --- a/addons/l10n_pa/__init__.py +++ b/addons/l10n_pa/__init__.py @@ -23,7 +23,7 @@ # # 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # ############################################################################## diff --git a/addons/l10n_pe/__init__.py b/addons/l10n_pe/__init__.py index 4bfa5fda319..bef6fa84279 100644 --- a/addons/l10n_pe/__init__.py +++ b/addons/l10n_pe/__init__.py @@ -23,7 +23,7 @@ # # 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # ############################################################################## diff --git a/addons/report_webkit/__init__.py b/addons/report_webkit/__init__.py index d548f4edebe..aa091570540 100644 --- a/addons/report_webkit/__init__.py +++ b/addons/report_webkit/__init__.py @@ -25,7 +25,7 @@ # # 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # ############################################################################## diff --git a/addons/report_webkit/__openerp__.py b/addons/report_webkit/__openerp__.py index c494c252a75..fff9dafd81a 100644 --- a/addons/report_webkit/__openerp__.py +++ b/addons/report_webkit/__openerp__.py @@ -25,7 +25,7 @@ # # 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # ############################################################################## diff --git a/addons/report_webkit/company.py b/addons/report_webkit/company.py index 0b2069b9ef5..26578d80fd5 100644 --- a/addons/report_webkit/company.py +++ b/addons/report_webkit/company.py @@ -25,7 +25,7 @@ # # 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # ############################################################################## diff --git a/addons/report_webkit/convert.py b/addons/report_webkit/convert.py index 0a394c47adb..3c6163528c1 100644 --- a/addons/report_webkit/convert.py +++ b/addons/report_webkit/convert.py @@ -25,7 +25,7 @@ # # 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # ############################################################################## diff --git a/addons/report_webkit/header.py b/addons/report_webkit/header.py index 5363f2e9951..b1ced68609f 100644 --- a/addons/report_webkit/header.py +++ b/addons/report_webkit/header.py @@ -25,7 +25,7 @@ # # 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # ############################################################################## diff --git a/addons/report_webkit/ir_report.py b/addons/report_webkit/ir_report.py index 7f5dae3ff88..5121ffc866c 100644 --- a/addons/report_webkit/ir_report.py +++ b/addons/report_webkit/ir_report.py @@ -25,7 +25,7 @@ # # 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # ############################################################################## diff --git a/addons/report_webkit/report_helper.py b/addons/report_webkit/report_helper.py index 35a38718254..5cfa431f74e 100644 --- a/addons/report_webkit/report_helper.py +++ b/addons/report_webkit/report_helper.py @@ -25,7 +25,7 @@ # # 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # ############################################################################## diff --git a/addons/report_webkit/webkit_report.py b/addons/report_webkit/webkit_report.py index b552769fe8e..aeb48cfb975 100644 --- a/addons/report_webkit/webkit_report.py +++ b/addons/report_webkit/webkit_report.py @@ -26,7 +26,7 @@ # # 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # ############################################################################## diff --git a/addons/report_webkit/wizard/__init__.py b/addons/report_webkit/wizard/__init__.py index f14ff575845..a53b21220c5 100644 --- a/addons/report_webkit/wizard/__init__.py +++ b/addons/report_webkit/wizard/__init__.py @@ -25,7 +25,7 @@ # # 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # ############################################################################## diff --git a/addons/report_webkit/wizard/report_webkit_actions.py b/addons/report_webkit/wizard/report_webkit_actions.py index f471ab67e98..130c2212e62 100644 --- a/addons/report_webkit/wizard/report_webkit_actions.py +++ b/addons/report_webkit/wizard/report_webkit_actions.py @@ -25,7 +25,7 @@ # # 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # ############################################################################## diff --git a/addons/resource/faces/observer.py b/addons/resource/faces/observer.py index 4d2a3790796..08ac8de217e 100644 --- a/addons/resource/faces/observer.py +++ b/addons/resource/faces/observer.py @@ -22,7 +22,7 @@ # 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., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ############################################################################ #@-node:<< Copyright >> diff --git a/addons/resource/faces/pcalendar.py b/addons/resource/faces/pcalendar.py index 231cb21fbef..e4c42894429 100644 --- a/addons/resource/faces/pcalendar.py +++ b/addons/resource/faces/pcalendar.py @@ -22,7 +22,7 @@ # 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., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ############################################################################ #@-node:<< Copyright >> diff --git a/addons/resource/faces/plocale.py b/addons/resource/faces/plocale.py index 75478dc538a..b2fd3c2721b 100644 --- a/addons/resource/faces/plocale.py +++ b/addons/resource/faces/plocale.py @@ -17,7 +17,7 @@ # 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., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ############################################################################ import gettext diff --git a/addons/resource/faces/resource.py b/addons/resource/faces/resource.py index 48e74290ff5..fd10a65b764 100644 --- a/addons/resource/faces/resource.py +++ b/addons/resource/faces/resource.py @@ -22,7 +22,7 @@ # 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., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ############################################################################ #@-node:<< Copyright >> diff --git a/addons/resource/faces/task.py b/addons/resource/faces/task.py index 2a7ec4f271f..cd9a12e986f 100644 --- a/addons/resource/faces/task.py +++ b/addons/resource/faces/task.py @@ -22,7 +22,7 @@ # 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., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ############################################################################ #@-node:<< Copyright >> diff --git a/addons/resource/faces/timescale.py b/addons/resource/faces/timescale.py index 0c4dedcd9b3..2ed516f7f3f 100644 --- a/addons/resource/faces/timescale.py +++ b/addons/resource/faces/timescale.py @@ -17,7 +17,7 @@ # 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., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ############################################################################ import faces.pcalendar as pcal diff --git a/addons/resource/faces/utils.py b/addons/resource/faces/utils.py index 9412f045a38..fa9be096e65 100644 --- a/addons/resource/faces/utils.py +++ b/addons/resource/faces/utils.py @@ -17,7 +17,7 @@ # 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., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ############################################################################ import observer From f95fd751df6c5947020e73ad45005abfe4635c2f Mon Sep 17 00:00:00 2001 From: Martin Trigaux Date: Tue, 14 May 2013 16:17:23 +0200 Subject: [PATCH 44/74] [IMP] remove double space in fsf address bzr revid: mat@openerp.com-20130514141723-xvtiru2fvhp6enbq --- addons/web_calendar/static/lib/dhtmlxScheduler/license.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/web_calendar/static/lib/dhtmlxScheduler/license.txt b/addons/web_calendar/static/lib/dhtmlxScheduler/license.txt index d273d6c65a8..aa990f0d035 100644 --- a/addons/web_calendar/static/lib/dhtmlxScheduler/license.txt +++ b/addons/web_calendar/static/lib/dhtmlxScheduler/license.txt @@ -5,7 +5,7 @@ Version 2, June 1991 Copyright (C) 1989, 1991 Free Software Foundation, Inc. -51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA +51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA Everyone is permitted to copy and distribute verbatim copies From 8fd6cb92e7308ebd8e2bf7711fe4db3d90313b32 Mon Sep 17 00:00:00 2001 From: Martin Trigaux Date: Tue, 14 May 2013 16:28:37 +0200 Subject: [PATCH 45/74] [IMP] use exact writing for fsf address bzr revid: mat@openerp.com-20130514142837-jt65d8xjd1eozqst --- addons/account/report/account_general_ledger.py | 2 +- addons/account_test/account_test.py | 2 +- addons/document_webdav/__openerp__.py | 2 +- addons/document_webdav/test_davclient.py | 2 +- addons/document_webdav/webdav_server.py | 2 +- addons/l10n_ar/__init__.py | 2 +- addons/l10n_bo/__init__.py | 2 +- addons/l10n_cl/__init__.py | 2 +- addons/l10n_fr/__init__.py | 2 +- addons/l10n_fr/__openerp__.py | 2 +- addons/l10n_fr/report/__init__.py | 2 +- addons/l10n_fr/report/base_report.py | 2 +- addons/l10n_fr/report/bilan_report.py | 2 +- addons/l10n_fr/report/compute_resultant_report.py | 2 +- addons/l10n_fr/wizard/__init__.py | 2 +- addons/l10n_fr/wizard/fr_report_bilan.py | 2 +- addons/l10n_fr/wizard/fr_report_compute_resultant.py | 2 +- addons/l10n_nl/__init__.py | 2 +- addons/l10n_nl/__openerp__.py | 2 +- addons/l10n_pa/__init__.py | 2 +- addons/l10n_pe/__init__.py | 2 +- addons/report_webkit/__init__.py | 2 +- addons/report_webkit/__openerp__.py | 2 +- addons/report_webkit/company.py | 2 +- addons/report_webkit/convert.py | 2 +- addons/report_webkit/header.py | 2 +- addons/report_webkit/ir_report.py | 2 +- addons/report_webkit/report_helper.py | 2 +- addons/report_webkit/webkit_report.py | 2 +- addons/report_webkit/wizard/__init__.py | 2 +- addons/report_webkit/wizard/report_webkit_actions.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 +- 38 files changed, 38 insertions(+), 38 deletions(-) diff --git a/addons/account/report/account_general_ledger.py b/addons/account/report/account_general_ledger.py index e0f24c432e9..4f712ad58cc 100644 --- a/addons/account/report/account_general_ledger.py +++ b/addons/account/report/account_general_ledger.py @@ -23,7 +23,7 @@ # # 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA # ############################################################################## diff --git a/addons/account_test/account_test.py b/addons/account_test/account_test.py index 0a5f6ce5617..4542511e726 100644 --- a/addons/account_test/account_test.py +++ b/addons/account_test/account_test.py @@ -24,7 +24,7 @@ # # 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA # ############################################################################## diff --git a/addons/document_webdav/__openerp__.py b/addons/document_webdav/__openerp__.py index b2aacc9593a..befb87829ed 100644 --- a/addons/document_webdav/__openerp__.py +++ b/addons/document_webdav/__openerp__.py @@ -24,7 +24,7 @@ # # 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA # ############################################################################## diff --git a/addons/document_webdav/test_davclient.py b/addons/document_webdav/test_davclient.py index 5ee02819e09..f3a8b35b582 100644 --- a/addons/document_webdav/test_davclient.py +++ b/addons/document_webdav/test_davclient.py @@ -23,7 +23,7 @@ # # 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ############################################################################### """ A trivial HTTP/WebDAV client, used for testing the server diff --git a/addons/document_webdav/webdav_server.py b/addons/document_webdav/webdav_server.py index 4284f25d1c0..1ee89eb04c3 100644 --- a/addons/document_webdav/webdav_server.py +++ b/addons/document_webdav/webdav_server.py @@ -30,7 +30,7 @@ # # 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ############################################################################### diff --git a/addons/l10n_ar/__init__.py b/addons/l10n_ar/__init__.py index bef6fa84279..25e7e337165 100644 --- a/addons/l10n_ar/__init__.py +++ b/addons/l10n_ar/__init__.py @@ -23,7 +23,7 @@ # # 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA # ############################################################################## diff --git a/addons/l10n_bo/__init__.py b/addons/l10n_bo/__init__.py index bef6fa84279..25e7e337165 100644 --- a/addons/l10n_bo/__init__.py +++ b/addons/l10n_bo/__init__.py @@ -23,7 +23,7 @@ # # 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA # ############################################################################## diff --git a/addons/l10n_cl/__init__.py b/addons/l10n_cl/__init__.py index bef6fa84279..25e7e337165 100644 --- a/addons/l10n_cl/__init__.py +++ b/addons/l10n_cl/__init__.py @@ -23,7 +23,7 @@ # # 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA # ############################################################################## diff --git a/addons/l10n_fr/__init__.py b/addons/l10n_fr/__init__.py index fda93f21bd5..592068eedda 100644 --- a/addons/l10n_fr/__init__.py +++ b/addons/l10n_fr/__init__.py @@ -22,7 +22,7 @@ # # 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA # ############################################################################## diff --git a/addons/l10n_fr/__openerp__.py b/addons/l10n_fr/__openerp__.py index 9a956a9b284..9a563eeb197 100644 --- a/addons/l10n_fr/__openerp__.py +++ b/addons/l10n_fr/__openerp__.py @@ -22,7 +22,7 @@ # # 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA # ############################################################################## { diff --git a/addons/l10n_fr/report/__init__.py b/addons/l10n_fr/report/__init__.py index c6881fdac81..c73179a9023 100644 --- a/addons/l10n_fr/report/__init__.py +++ b/addons/l10n_fr/report/__init__.py @@ -22,7 +22,7 @@ # # 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA # ############################################################################## diff --git a/addons/l10n_fr/report/base_report.py b/addons/l10n_fr/report/base_report.py index 0bc139196f1..bc2cd308bf8 100644 --- a/addons/l10n_fr/report/base_report.py +++ b/addons/l10n_fr/report/base_report.py @@ -22,7 +22,7 @@ # # 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA # ############################################################################## diff --git a/addons/l10n_fr/report/bilan_report.py b/addons/l10n_fr/report/bilan_report.py index 9c477e17813..2ffbd24cc4f 100644 --- a/addons/l10n_fr/report/bilan_report.py +++ b/addons/l10n_fr/report/bilan_report.py @@ -22,7 +22,7 @@ # # 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA # ############################################################################## diff --git a/addons/l10n_fr/report/compute_resultant_report.py b/addons/l10n_fr/report/compute_resultant_report.py index 94f2d275fbb..5eb62d7e82d 100644 --- a/addons/l10n_fr/report/compute_resultant_report.py +++ b/addons/l10n_fr/report/compute_resultant_report.py @@ -22,7 +22,7 @@ # # 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA # ############################################################################## diff --git a/addons/l10n_fr/wizard/__init__.py b/addons/l10n_fr/wizard/__init__.py index a4640d111da..1bbaf351ea4 100644 --- a/addons/l10n_fr/wizard/__init__.py +++ b/addons/l10n_fr/wizard/__init__.py @@ -22,7 +22,7 @@ # # 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA # ############################################################################## diff --git a/addons/l10n_fr/wizard/fr_report_bilan.py b/addons/l10n_fr/wizard/fr_report_bilan.py index c2c851785d9..046161befd8 100644 --- a/addons/l10n_fr/wizard/fr_report_bilan.py +++ b/addons/l10n_fr/wizard/fr_report_bilan.py @@ -22,7 +22,7 @@ # # 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA # ############################################################################## diff --git a/addons/l10n_fr/wizard/fr_report_compute_resultant.py b/addons/l10n_fr/wizard/fr_report_compute_resultant.py index 35f5e296185..d00d9165f6e 100644 --- a/addons/l10n_fr/wizard/fr_report_compute_resultant.py +++ b/addons/l10n_fr/wizard/fr_report_compute_resultant.py @@ -22,7 +22,7 @@ # # 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA # ############################################################################## diff --git a/addons/l10n_nl/__init__.py b/addons/l10n_nl/__init__.py index af15e1b315d..ee9f0292f12 100644 --- a/addons/l10n_nl/__init__.py +++ b/addons/l10n_nl/__init__.py @@ -22,7 +22,7 @@ # # 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA # ############################################################################## diff --git a/addons/l10n_nl/__openerp__.py b/addons/l10n_nl/__openerp__.py index 39a9c70080f..aec85016ea5 100644 --- a/addons/l10n_nl/__openerp__.py +++ b/addons/l10n_nl/__openerp__.py @@ -22,7 +22,7 @@ # # 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA # ############################################################################## # diff --git a/addons/l10n_pa/__init__.py b/addons/l10n_pa/__init__.py index bef6fa84279..25e7e337165 100644 --- a/addons/l10n_pa/__init__.py +++ b/addons/l10n_pa/__init__.py @@ -23,7 +23,7 @@ # # 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA # ############################################################################## diff --git a/addons/l10n_pe/__init__.py b/addons/l10n_pe/__init__.py index bef6fa84279..25e7e337165 100644 --- a/addons/l10n_pe/__init__.py +++ b/addons/l10n_pe/__init__.py @@ -23,7 +23,7 @@ # # 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA # ############################################################################## diff --git a/addons/report_webkit/__init__.py b/addons/report_webkit/__init__.py index aa091570540..3a3c6663d92 100644 --- a/addons/report_webkit/__init__.py +++ b/addons/report_webkit/__init__.py @@ -25,7 +25,7 @@ # # 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA # ############################################################################## diff --git a/addons/report_webkit/__openerp__.py b/addons/report_webkit/__openerp__.py index fff9dafd81a..84130728065 100644 --- a/addons/report_webkit/__openerp__.py +++ b/addons/report_webkit/__openerp__.py @@ -25,7 +25,7 @@ # # 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA # ############################################################################## diff --git a/addons/report_webkit/company.py b/addons/report_webkit/company.py index 26578d80fd5..b29354938de 100644 --- a/addons/report_webkit/company.py +++ b/addons/report_webkit/company.py @@ -25,7 +25,7 @@ # # 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA # ############################################################################## diff --git a/addons/report_webkit/convert.py b/addons/report_webkit/convert.py index 3c6163528c1..e30209a77dc 100644 --- a/addons/report_webkit/convert.py +++ b/addons/report_webkit/convert.py @@ -25,7 +25,7 @@ # # 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA # ############################################################################## diff --git a/addons/report_webkit/header.py b/addons/report_webkit/header.py index b1ced68609f..688517b91fb 100644 --- a/addons/report_webkit/header.py +++ b/addons/report_webkit/header.py @@ -25,7 +25,7 @@ # # 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA # ############################################################################## diff --git a/addons/report_webkit/ir_report.py b/addons/report_webkit/ir_report.py index 5121ffc866c..b95ee78dc10 100644 --- a/addons/report_webkit/ir_report.py +++ b/addons/report_webkit/ir_report.py @@ -25,7 +25,7 @@ # # 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA # ############################################################################## diff --git a/addons/report_webkit/report_helper.py b/addons/report_webkit/report_helper.py index 5cfa431f74e..884893a5eb7 100644 --- a/addons/report_webkit/report_helper.py +++ b/addons/report_webkit/report_helper.py @@ -25,7 +25,7 @@ # # 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA # ############################################################################## diff --git a/addons/report_webkit/webkit_report.py b/addons/report_webkit/webkit_report.py index aeb48cfb975..9cd509b0543 100644 --- a/addons/report_webkit/webkit_report.py +++ b/addons/report_webkit/webkit_report.py @@ -26,7 +26,7 @@ # # 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA # ############################################################################## diff --git a/addons/report_webkit/wizard/__init__.py b/addons/report_webkit/wizard/__init__.py index a53b21220c5..e95244cc7aa 100644 --- a/addons/report_webkit/wizard/__init__.py +++ b/addons/report_webkit/wizard/__init__.py @@ -25,7 +25,7 @@ # # 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA # ############################################################################## diff --git a/addons/report_webkit/wizard/report_webkit_actions.py b/addons/report_webkit/wizard/report_webkit_actions.py index 130c2212e62..713c2f80009 100644 --- a/addons/report_webkit/wizard/report_webkit_actions.py +++ b/addons/report_webkit/wizard/report_webkit_actions.py @@ -25,7 +25,7 @@ # # 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA # ############################################################################## diff --git a/addons/resource/faces/observer.py b/addons/resource/faces/observer.py index 08ac8de217e..28ae58eb2b6 100644 --- a/addons/resource/faces/observer.py +++ b/addons/resource/faces/observer.py @@ -22,7 +22,7 @@ # 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., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ############################################################################ #@-node:<< Copyright >> diff --git a/addons/resource/faces/pcalendar.py b/addons/resource/faces/pcalendar.py index e4c42894429..24c974233d8 100644 --- a/addons/resource/faces/pcalendar.py +++ b/addons/resource/faces/pcalendar.py @@ -22,7 +22,7 @@ # 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., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ############################################################################ #@-node:<< Copyright >> diff --git a/addons/resource/faces/plocale.py b/addons/resource/faces/plocale.py index b2fd3c2721b..908fd1252e9 100644 --- a/addons/resource/faces/plocale.py +++ b/addons/resource/faces/plocale.py @@ -17,7 +17,7 @@ # 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., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ############################################################################ import gettext diff --git a/addons/resource/faces/resource.py b/addons/resource/faces/resource.py index fd10a65b764..faee8174994 100644 --- a/addons/resource/faces/resource.py +++ b/addons/resource/faces/resource.py @@ -22,7 +22,7 @@ # 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., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ############################################################################ #@-node:<< Copyright >> diff --git a/addons/resource/faces/task.py b/addons/resource/faces/task.py index cd9a12e986f..961f6213d1d 100644 --- a/addons/resource/faces/task.py +++ b/addons/resource/faces/task.py @@ -22,7 +22,7 @@ # 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., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ############################################################################ #@-node:<< Copyright >> diff --git a/addons/resource/faces/timescale.py b/addons/resource/faces/timescale.py index 2ed516f7f3f..818c031b7d5 100644 --- a/addons/resource/faces/timescale.py +++ b/addons/resource/faces/timescale.py @@ -17,7 +17,7 @@ # 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., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ############################################################################ import faces.pcalendar as pcal diff --git a/addons/resource/faces/utils.py b/addons/resource/faces/utils.py index fa9be096e65..6568c314fb5 100644 --- a/addons/resource/faces/utils.py +++ b/addons/resource/faces/utils.py @@ -17,7 +17,7 @@ # 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., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ############################################################################ import observer From 8c08d178d25be7daa5a68cdac17a19f0b676f9a6 Mon Sep 17 00:00:00 2001 From: Martin Trigaux Date: Tue, 14 May 2013 16:34:02 +0200 Subject: [PATCH 46/74] [IMP] use exact writing for fsf address bzr revid: mat@openerp.com-20130514143402-amqukyz9mpeq5y95 --- addons/web_calendar/static/lib/dhtmlxScheduler/license.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/web_calendar/static/lib/dhtmlxScheduler/license.txt b/addons/web_calendar/static/lib/dhtmlxScheduler/license.txt index aa990f0d035..f695d8ecb2c 100644 --- a/addons/web_calendar/static/lib/dhtmlxScheduler/license.txt +++ b/addons/web_calendar/static/lib/dhtmlxScheduler/license.txt @@ -5,7 +5,7 @@ Version 2, June 1991 Copyright (C) 1989, 1991 Free Software Foundation, Inc. -51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA +51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA Everyone is permitted to copy and distribute verbatim copies From 66544243880e9c37752afb9d38e54673a83c96c4 Mon Sep 17 00:00:00 2001 From: Martin Trigaux Date: Tue, 14 May 2013 16:37:28 +0200 Subject: [PATCH 47/74] [IMP] use exact writing for fsf address bzr revid: mat@openerp.com-20130514143728-s341hmkw5dw9l7o1 --- .../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 +- .../openerp_report_designer/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/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/modify.py | 2 +- 22 files changed, 22 insertions(+), 22 deletions(-) diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/About.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/About.py index 5d6bea06b9c..9fb6cd11219 100644 --- a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/About.py +++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/About.py @@ -15,7 +15,7 @@ # # You should have received a copy of the GNU Lesser General Public # License along with this library; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-13017 USA +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA # # See: http://www.gnu.org/licenses/lgpl.html # 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 a820b38ad35..2dce1750e34 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 @@ -15,7 +15,7 @@ # # You should have received a copy of the GNU Lesser General Public # License along with this library; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-13017 USA +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA # # See: http://www.gnu.org/licenses/lgpl.html # 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 0448a1ebda4..e0b66780e8b 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 @@ -15,7 +15,7 @@ # # You should have received a copy of the GNU Lesser General Public # License along with this library; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-13017 USA +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA # # See: http://www.gnu.org/licenses/lgpl.html # 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 3115f2435ee..17cc25687b1 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 @@ -15,7 +15,7 @@ # # You should have received a copy of the GNU Lesser General Public # License along with this library; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-13017 USA +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA # # See: http://www.gnu.org/licenses/lgpl.html # 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 24efa36c8b2..b8abcb1dc6c 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 @@ -15,7 +15,7 @@ # # You should have received a copy of the GNU Lesser General Public # License along with this library; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-13017 USA +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA # # See: http://www.gnu.org/licenses/lgpl.html # 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 4ed19466ed2..a12becdc68c 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 @@ -15,7 +15,7 @@ # # You should have received a copy of the GNU Lesser General Public # License along with this library; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-13017 USA +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA # # See: http://www.gnu.org/licenses/lgpl.html # 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 1ec7c8c3cde..896a5954c7d 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 @@ -15,7 +15,7 @@ # # You should have received a copy of the GNU Lesser General Public # License along with this library; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-13017 USA +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA # # See: http://www.gnu.org/licenses/lgpl.html # 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 6edb8165dfa..8ed4d2c25e8 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 @@ -15,7 +15,7 @@ # # You should have received a copy of the GNU Lesser General Public # License along with this library; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-13017 USA +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA # # See: http://www.gnu.org/licenses/lgpl.html # 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 e1d3bd05b20..11c74555447 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 @@ -15,7 +15,7 @@ # # You should have received a copy of the GNU Lesser General Public # License along with this library; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-13017 USA +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA # # See: http://www.gnu.org/licenses/lgpl.html # 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 d91333a6445..ef1d3548a6e 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 @@ -15,7 +15,7 @@ # # You should have received a copy of the GNU Lesser General Public # License along with this library; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-13017 USA +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA # # See: http://www.gnu.org/licenses/lgpl.html # 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 86d1beff331..3c6316d9fdb 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 @@ -15,7 +15,7 @@ # # You should have received a copy of the GNU Lesser General Public # License along with this library; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-13017 USA +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA # # See: http://www.gnu.org/licenses/lgpl.html # 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 086a55f1a81..b6edaecdc44 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 @@ -15,7 +15,7 @@ # # You should have received a copy of the GNU Lesser General Public # License along with this library; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-13017 USA +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA # # See: http://www.gnu.org/licenses/lgpl.html # 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 17a6049049b..dbd0a51d66d 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 @@ -15,7 +15,7 @@ # # You should have received a copy of the GNU Lesser General Public # License along with this library; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-13017 USA +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA # # See: http://www.gnu.org/licenses/lgpl.html # 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 0b5d452ebfd..b09b02699b0 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 @@ -15,7 +15,7 @@ # # You should have received a copy of the GNU Lesser General Public # License along with this library; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-13017 USA +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA # # See: http://www.gnu.org/licenses/lgpl.html # 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 5fc3b9f6bc7..132882e0932 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 @@ -15,7 +15,7 @@ # # You should have received a copy of the GNU Lesser General Public # License along with this library; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-13017 USA +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA # # See: http://www.gnu.org/licenses/lgpl.html # 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 352099df61c..d7f93351fac 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 @@ -15,7 +15,7 @@ # # You should have received a copy of the GNU Lesser General Public # License along with this library; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-13017 USA +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA # # See: http://www.gnu.org/licenses/lgpl.html # 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 bdfb9c8564b..897f9abd00c 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 @@ -15,7 +15,7 @@ # # You should have received a copy of the GNU Lesser General Public # License along with this library; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-13017 USA +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA # # See: http://www.gnu.org/licenses/lgpl.html # 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 5dda402b2d7..cf82d0e1a76 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 @@ -15,7 +15,7 @@ # # You should have received a copy of the GNU Lesser General Public # License along with this library; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA # # See: http://www.gnu.org/licenses/lgpl.html # 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 f8e22ea33d5..f44404eaa16 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 @@ -15,7 +15,7 @@ # # You should have received a copy of the GNU Lesser General Public # License along with this library; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA # # See: http://www.gnu.org/licenses/lgpl.html # 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 2e1f45cf0df..52af0821790 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 @@ -15,7 +15,7 @@ # # You should have received a copy of the GNU Lesser General Public # License along with this library; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA # # See: http://www.gnu.org/licenses/lgpl.html # 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 df2171ce22e..92b5ab750ca 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 @@ -15,7 +15,7 @@ # # You should have received a copy of the GNU Lesser General Public # License along with this library; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA # # See: http://www.gnu.org/licenses/lgpl.html # 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 3687a34ee3a..f8d90c30d75 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 @@ -15,7 +15,7 @@ # # You should have received a copy of the GNU Lesser General Public # License along with this library; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-13017 USA +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA # # See: http://www.gnu.org/licenses/lgpl.html # From b4bc1a38bf4e389f2bd2ea3027af82daf84c5e20 Mon Sep 17 00:00:00 2001 From: Launchpad Translations on behalf of openerp <> Date: Wed, 15 May 2013 06:07:47 +0000 Subject: [PATCH 48/74] Launchpad automatic translations update. bzr revid: launchpad_translations_on_behalf_of_openerp-20130515060747-d8cgvt2npsgcihpk --- addons/account/i18n/ko.po | 2 +- addons/hr/i18n/ru.po | 10 +++++----- addons/portal/i18n/ko.po | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/addons/account/i18n/ko.po b/addons/account/i18n/ko.po index 36b61c2ea77..3ce33e32685 100644 --- a/addons/account/i18n/ko.po +++ b/addons/account/i18n/ko.po @@ -14,7 +14,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-05-14 06:25+0000\n" +"X-Launchpad-Export-Date: 2013-05-15 06:07+0000\n" "X-Generator: Launchpad (build 16617)\n" #. module: account diff --git a/addons/hr/i18n/ru.po b/addons/hr/i18n/ru.po index 56f4d34c8ea..19dca6ea133 100644 --- a/addons/hr/i18n/ru.po +++ b/addons/hr/i18n/ru.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2013-03-07 08:37+0000\n" -"PO-Revision-Date: 2012-12-21 23:00+0000\n" -"Last-Translator: FULL NAME \n" +"PO-Revision-Date: 2013-05-14 12:42+0000\n" +"Last-Translator: Paul Korotkov \n" "Language-Team: Russian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-03-28 05:40+0000\n" -"X-Generator: Launchpad (build 16546)\n" +"X-Launchpad-Export-Date: 2013-05-15 06:07+0000\n" +"X-Generator: Launchpad (build 16617)\n" #. module: hr #: model:process.node,name:hr.process_node_openerpuser0 @@ -69,7 +69,7 @@ msgstr "" #: view:hr.employee:0 #: view:hr.job:0 msgid "Group By..." -msgstr "Объеденить по..." +msgstr "Группировать по ..." #. module: hr #: model:ir.actions.act_window,name:hr.view_department_form_installer diff --git a/addons/portal/i18n/ko.po b/addons/portal/i18n/ko.po index f6325669652..6aee5f9a5c8 100644 --- a/addons/portal/i18n/ko.po +++ b/addons/portal/i18n/ko.po @@ -14,7 +14,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-05-14 06:25+0000\n" +"X-Launchpad-Export-Date: 2013-05-15 06:07+0000\n" "X-Generator: Launchpad (build 16617)\n" #. module: portal From b1338a1c8fb32cbd66a9b5b78bc573c0a32af68f Mon Sep 17 00:00:00 2001 From: niv-openerp Date: Wed, 15 May 2013 10:56:18 +0200 Subject: [PATCH 49/74] fix bzr revid: nicolas.vanhoren@openerp.com-20130515085618-m72mahjie4iguwhy --- addons/web/controllers/main.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py index 01624ceb1ce..64df4a95ecf 100644 --- a/addons/web/controllers/main.py +++ b/addons/web/controllers/main.py @@ -281,8 +281,9 @@ def concat_files(file_list, reader=None, intersperse=""): if reader is None: def reader(f): - with open(f, 'rb') as fp: - return fp.read() + import codecs + with codecs.open(f, 'r', "utf-8-sig") as fp: + return fp.read().encode("utf-8") files_content = [] for fname in file_list: From f77cf1b6036401b46c80e76b06b22d01f3726cc3 Mon Sep 17 00:00:00 2001 From: niv-openerp Date: Wed, 15 May 2013 11:02:31 +0200 Subject: [PATCH 50/74] wip bzr revid: nicolas.vanhoren@openerp.com-20130515090231-pj7q042poo2183sp --- addons/web/controllers/main.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py index 64df4a95ecf..c0117043b43 100644 --- a/addons/web/controllers/main.py +++ b/addons/web/controllers/main.py @@ -282,7 +282,7 @@ def concat_files(file_list, reader=None, intersperse=""): if reader is None: def reader(f): import codecs - with codecs.open(f, 'r', "utf-8-sig") as fp: + with codecs.open(f, 'rb', "utf-8-sig") as fp: return fp.read().encode("utf-8") files_content = [] From 90d278a6a6249da0dba3bf7a4f7fc84e7fe3b015 Mon Sep 17 00:00:00 2001 From: niv-openerp Date: Wed, 15 May 2013 11:54:13 +0200 Subject: [PATCH 51/74] changed encodings bzr revid: nicolas.vanhoren@openerp.com-20130515095413-tdvyurv8dwgvj0vd --- addons/web/static/lib/datejs/date.js | 4 +- .../static/lib/flotr2/lib/canvastext.js | 110 +++++++++--------- 2 files changed, 57 insertions(+), 57 deletions(-) diff --git a/addons/web/static/lib/datejs/date.js b/addons/web/static/lib/datejs/date.js index eda450113bb..96b96924da4 100644 --- a/addons/web/static/lib/datejs/date.js +++ b/addons/web/static/lib/datejs/date.js @@ -7,7 +7,7 @@ * date.js // English (United States) * date-en-US.js // English (United States) * date-de-DE.js // Deutsch (Deutschland) - * date-es-MX.js // franais (France) + * date-es-MX.js // français (France) */ alert( @@ -17,5 +17,5 @@ alert( " date.js // English (United States)\n" + " date-en-US.js // English (United States)\n" + " date-de-DE.js // Deutsch (Deutschland)\n" + - " date-es-MX.js // franais (France)\n" + " date-es-MX.js // français (France)\n" ); \ No newline at end of file diff --git a/addons/web_graph/static/lib/flotr2/lib/canvastext.js b/addons/web_graph/static/lib/flotr2/lib/canvastext.js index 3266729f6a6..2df45bae0d8 100644 --- a/addons/web_graph/static/lib/flotr2/lib/canvastext.js +++ b/addons/web_graph/static/lib/flotr2/lib/canvastext.js @@ -1,7 +1,7 @@ /** * This code is released to the public domain by Jim Studt, 2007. * He may keep some sort of up to date copy at http://www.federated.com/~jim/canvastext/ - * It as been modified by Fabien Mnager to handle font style like size, weight, color and rotation. + * It as been modified by Fabien Ménager to handle font style like size, weight, color and rotation. * A partial support for special characters has been added too. */ var CanvasText = { @@ -108,71 +108,71 @@ var CanvasText = { '~': { width: 24, points: [[3,6],[3,8],[4,11],[6,12],[8,12],[10,11],[14,8],[16,7],[18,7],[20,8],[21,10],null,[3,8],[4,10],[6,11],[8,11],[10,10],[14,7],[16,6],[18,6],[20,7],[21,10],[21,12]] }, // Lower case Latin-1 - '': { diacritic: '`', letter: 'a' }, - '': { diacritic: '', letter: 'a' }, - '': { diacritic: '^', letter: 'a' }, - '': { diacritic: '', letter: 'a' }, - '': { diacritic: '~', letter: 'a' }, + 'à': { diacritic: '`', letter: 'a' }, + 'á': { diacritic: '´', letter: 'a' }, + 'â': { diacritic: '^', letter: 'a' }, + 'ä': { diacritic: '¨', letter: 'a' }, + 'ã': { diacritic: '~', letter: 'a' }, - '': { diacritic: '`', letter: 'e' }, - '': { diacritic: '', letter: 'e' }, - '': { diacritic: '^', letter: 'e' }, - '': { diacritic: '', letter: 'e' }, + 'è': { diacritic: '`', letter: 'e' }, + 'é': { diacritic: '´', letter: 'e' }, + 'ê': { diacritic: '^', letter: 'e' }, + 'ë': { diacritic: '¨', letter: 'e' }, - '': { diacritic: '`', letter: 'i' }, - '': { diacritic: '', letter: 'i' }, - '': { diacritic: '^', letter: 'i' }, - '': { diacritic: '', letter: 'i' }, + 'ì': { diacritic: '`', letter: 'i' }, + 'í': { diacritic: '´', letter: 'i' }, + 'î': { diacritic: '^', letter: 'i' }, + 'ï': { diacritic: '¨', letter: 'i' }, - '': { diacritic: '`', letter: 'o' }, - '': { diacritic: '', letter: 'o' }, - '': { diacritic: '^', letter: 'o' }, - '': { diacritic: '', letter: 'o' }, - '': { diacritic: '~', letter: 'o' }, + 'ò': { diacritic: '`', letter: 'o' }, + 'ó': { diacritic: '´', letter: 'o' }, + 'ô': { diacritic: '^', letter: 'o' }, + 'ö': { diacritic: '¨', letter: 'o' }, + 'õ': { diacritic: '~', letter: 'o' }, - '': { diacritic: '`', letter: 'u' }, - '': { diacritic: '', letter: 'u' }, - '': { diacritic: '^', letter: 'u' }, - '': { diacritic: '', letter: 'u' }, + 'ù': { diacritic: '`', letter: 'u' }, + 'ú': { diacritic: '´', letter: 'u' }, + 'û': { diacritic: '^', letter: 'u' }, + 'ü': { diacritic: '¨', letter: 'u' }, - '': { diacritic: '', letter: 'y' }, - '': { diacritic: '', letter: 'y' }, + 'ý': { diacritic: '´', letter: 'y' }, + 'ÿ': { diacritic: '¨', letter: 'y' }, - '': { diacritic: '', letter: 'c' }, - '': { diacritic: '~', letter: 'n' }, + 'ç': { diacritic: '¸', letter: 'c' }, + 'ñ': { diacritic: '~', letter: 'n' }, // Upper case Latin-1 - '': { diacritic: '`', letter: 'A' }, - '': { diacritic: '', letter: 'A' }, - '': { diacritic: '^', letter: 'A' }, - '': { diacritic: '', letter: 'A' }, - '': { diacritic: '~', letter: 'A' }, + 'À': { diacritic: '`', letter: 'A' }, + 'Á': { diacritic: '´', letter: 'A' }, + 'Â': { diacritic: '^', letter: 'A' }, + 'Ä': { diacritic: '¨', letter: 'A' }, + 'Ã': { diacritic: '~', letter: 'A' }, - '': { diacritic: '`', letter: 'E' }, - '': { diacritic: '', letter: 'E' }, - '': { diacritic: '^', letter: 'E' }, - '': { diacritic: '', letter: 'E' }, + 'È': { diacritic: '`', letter: 'E' }, + 'É': { diacritic: '´', letter: 'E' }, + 'Ê': { diacritic: '^', letter: 'E' }, + 'Ë': { diacritic: '¨', letter: 'E' }, - '': { diacritic: '`', letter: 'I' }, - '': { diacritic: '', letter: 'I' }, - '': { diacritic: '^', letter: 'I' }, - '': { diacritic: '', letter: 'I' }, + 'Ì': { diacritic: '`', letter: 'I' }, + 'Í': { diacritic: '´', letter: 'I' }, + 'Î': { diacritic: '^', letter: 'I' }, + 'Ï': { diacritic: '¨', letter: 'I' }, - '': { diacritic: '`', letter: 'O' }, - '': { diacritic: '', letter: 'O' }, - '': { diacritic: '^', letter: 'O' }, - '': { diacritic: '', letter: 'O' }, - '': { diacritic: '~', letter: 'O' }, + 'Ò': { diacritic: '`', letter: 'O' }, + 'Ó': { diacritic: '´', letter: 'O' }, + 'Ô': { diacritic: '^', letter: 'O' }, + 'Ö': { diacritic: '¨', letter: 'O' }, + 'Õ': { diacritic: '~', letter: 'O' }, - '': { diacritic: '`', letter: 'U' }, - '': { diacritic: '', letter: 'U' }, - '': { diacritic: '^', letter: 'U' }, - '': { diacritic: '', letter: 'U' }, + 'Ù': { diacritic: '`', letter: 'U' }, + 'Ú': { diacritic: '´', letter: 'U' }, + 'Û': { diacritic: '^', letter: 'U' }, + 'Ü': { diacritic: '¨', letter: 'U' }, - '': { diacritic: '', letter: 'Y' }, + 'Ý': { diacritic: '´', letter: 'Y' }, - '': { diacritic: '', letter: 'C' }, - '': { diacritic: '~', letter: 'N' } + 'Ç': { diacritic: '¸', letter: 'C' }, + 'Ñ': { diacritic: '~', letter: 'N' } }, specialchars: { @@ -181,11 +181,11 @@ var CanvasText = { /** Diacritics, used to draw accentuated letters */ diacritics: { - '': { entity: 'cedil', points: [[6,-4],[4,-6],[2,-7],[1,-7]] }, - '': { entity: 'acute', points: [[8,19],[13,22]] }, + '¸': { entity: 'cedil', points: [[6,-4],[4,-6],[2,-7],[1,-7]] }, + '´': { entity: 'acute', points: [[8,19],[13,22]] }, '`': { entity: 'grave', points: [[7,22],[12,19]] }, '^': { entity: 'circ', points: [[5.5,19],[9.5,23],[12.5,19]] }, - '': { entity: 'trema', points: [[5,21],[6,20],[7,21],[6,22],[5,21],null,[12,21],[13,20],[14,21],[13,22],[12,21]] }, + '¨': { entity: 'trema', points: [[5,21],[6,20],[7,21],[6,22],[5,21],null,[12,21],[13,20],[14,21],[13,22],[12,21]] }, '~': { entity: 'tilde', points: [[4,18],[7,22],[10,18],[13,22]] } }, From 8a0adc0f33a273a2e4cae600c25bbdcf9cbeffb5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Wed, 15 May 2013 15:33:32 +0200 Subject: [PATCH 52/74] [FIX] mail: notification email: notification sent for private discussions now have a correct subject, aka the subject of the original email. bzr revid: tde@openerp.com-20130515133332-g3wtttsnasfz0y8b --- addons/mail/mail_mail.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/addons/mail/mail_mail.py b/addons/mail/mail_mail.py index 351ff0130e5..2cbfec2f72a 100644 --- a/addons/mail/mail_mail.py +++ b/addons/mail/mail_mail.py @@ -157,8 +157,10 @@ class mail_mail(osv.Model): :param browse_record mail: mail.mail browse_record :param browse_record partner: specific recipient partner """ - if force or (not mail.subject and mail.model and mail.res_id): + if (force or not mail.subject) and mail.record_name: return 'Re: %s' % (mail.record_name) + elif (force or not mail.subject) and mail.parent_id and mail.parent_id.subject: + return 'Re: %s' % (mail.parent_id.subject) return mail.subject def send_get_mail_body(self, cr, uid, mail, partner=None, context=None): From 50da4f37ab493acae529ed8ca301fceb5e2251fc Mon Sep 17 00:00:00 2001 From: Launchpad Translations on behalf of openerp <> Date: Thu, 16 May 2013 05:55:22 +0000 Subject: [PATCH 53/74] Launchpad automatic translations update. bzr revid: launchpad_translations_on_behalf_of_openerp-20130516055522-vvzc9h3p43b3zkwb --- addons/account_asset/i18n/th.po | 758 ++++++++++ addons/account_cancel/i18n/th.po | 23 + addons/account_voucher/i18n/nl.po | 8 +- addons/contacts/i18n/th.po | 37 + addons/project/i18n/th.po | 2153 +++++++++++++++++++++++++++++ addons/warning/i18n/th.po | 215 +++ 6 files changed, 3190 insertions(+), 4 deletions(-) create mode 100644 addons/account_asset/i18n/th.po create mode 100644 addons/account_cancel/i18n/th.po create mode 100644 addons/contacts/i18n/th.po create mode 100644 addons/project/i18n/th.po create mode 100644 addons/warning/i18n/th.po diff --git a/addons/account_asset/i18n/th.po b/addons/account_asset/i18n/th.po new file mode 100644 index 00000000000..8e3cbfda27b --- /dev/null +++ b/addons/account_asset/i18n/th.po @@ -0,0 +1,758 @@ +# Thai translation for openobject-addons +# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013 +# This file is distributed under the same license as the openobject-addons package. +# FIRST AUTHOR , 2013. +# +msgid "" +msgstr "" +"Project-Id-Version: openobject-addons\n" +"Report-Msgid-Bugs-To: FULL NAME \n" +"POT-Creation-Date: 2013-03-07 08:37+0000\n" +"PO-Revision-Date: 2013-05-15 10:09+0000\n" +"Last-Translator: FULL NAME \n" +"Language-Team: Thai \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2013-05-16 05:55+0000\n" +"X-Generator: Launchpad (build 16626)\n" + +#. module: account_asset +#: view:account.asset.asset:0 +msgid "Assets in draft and open states" +msgstr "" + +#. module: account_asset +#: field:account.asset.category,method_end:0 +#: field:account.asset.history,method_end:0 +#: field:asset.modify,method_end:0 +msgid "Ending date" +msgstr "" + +#. module: account_asset +#: field:account.asset.asset,value_residual:0 +msgid "Residual Value" +msgstr "" + +#. module: account_asset +#: field:account.asset.category,account_expense_depreciation_id:0 +msgid "Depr. Expense Account" +msgstr "" + +#. module: account_asset +#: view:asset.asset.report:0 +msgid "Group By..." +msgstr "" + +#. module: account_asset +#: field:asset.asset.report,gross_value:0 +msgid "Gross Amount" +msgstr "" + +#. module: account_asset +#: view:account.asset.asset:0 +#: field:account.asset.depreciation.line,asset_id:0 +#: field:account.asset.history,asset_id:0 +#: field:account.move.line,asset_id:0 +#: view:asset.asset.report:0 +#: field:asset.asset.report,asset_id:0 +#: model:ir.model,name:account_asset.model_account_asset_asset +msgid "Asset" +msgstr "" + +#. module: account_asset +#: help:account.asset.asset,prorata:0 +#: help:account.asset.category,prorata:0 +msgid "" +"Indicates that the first depreciation entry for this asset have to be done " +"from the purchase date instead of the first January" +msgstr "" + +#. module: account_asset +#: selection:account.asset.asset,method:0 +#: selection:account.asset.category,method:0 +msgid "Linear" +msgstr "" + +#. module: account_asset +#: field:account.asset.asset,company_id:0 +#: field:account.asset.category,company_id:0 +#: view:asset.asset.report:0 +#: field:asset.asset.report,company_id:0 +msgid "Company" +msgstr "" + +#. module: account_asset +#: view:asset.modify:0 +msgid "Modify" +msgstr "" + +#. module: account_asset +#: selection:account.asset.asset,state:0 +#: view:asset.asset.report:0 +#: selection:asset.asset.report,state:0 +msgid "Running" +msgstr "" + +#. module: account_asset +#: view:account.asset.asset:0 +msgid "Set to Draft" +msgstr "" + +#. module: account_asset +#: view:asset.asset.report:0 +#: model:ir.actions.act_window,name:account_asset.action_asset_asset_report +#: model:ir.model,name:account_asset.model_asset_asset_report +#: model:ir.ui.menu,name:account_asset.menu_action_asset_asset_report +msgid "Assets Analysis" +msgstr "" + +#. module: account_asset +#: field:asset.modify,name:0 +msgid "Reason" +msgstr "" + +#. module: account_asset +#: field:account.asset.asset,method_progress_factor:0 +#: field:account.asset.category,method_progress_factor:0 +msgid "Degressive Factor" +msgstr "" + +#. module: account_asset +#: model:ir.actions.act_window,name:account_asset.action_account_asset_asset_list_normal +#: model:ir.ui.menu,name:account_asset.menu_action_account_asset_asset_list_normal +msgid "Asset Categories" +msgstr "" + +#. module: account_asset +#: view:account.asset.asset:0 +#: field:account.asset.asset,account_move_line_ids:0 +#: field:account.move.line,entry_ids:0 +#: model:ir.actions.act_window,name:account_asset.act_entries_open +msgid "Entries" +msgstr "" + +#. module: account_asset +#: view:account.asset.asset:0 +#: field:account.asset.asset,depreciation_line_ids:0 +msgid "Depreciation Lines" +msgstr "" + +#. module: account_asset +#: help:account.asset.asset,salvage_value:0 +msgid "It is the amount you plan to have that you cannot depreciate." +msgstr "" + +#. module: account_asset +#: help:account.asset.asset,method_period:0 +msgid "The amount of time between two depreciations, in months" +msgstr "" + +#. module: account_asset +#: field:account.asset.depreciation.line,depreciation_date:0 +#: view:asset.asset.report:0 +#: field:asset.asset.report,depreciation_date:0 +msgid "Depreciation Date" +msgstr "" + +#. module: account_asset +#: constraint:account.asset.asset:0 +msgid "Error ! You cannot create recursive assets." +msgstr "" + +#. module: account_asset +#: field:asset.asset.report,posted_value:0 +msgid "Posted Amount" +msgstr "" + +#. module: account_asset +#: view:account.asset.asset:0 +#: view:asset.asset.report:0 +#: model:ir.actions.act_window,name:account_asset.action_account_asset_asset_form +#: model:ir.ui.menu,name:account_asset.menu_action_account_asset_asset_form +#: model:ir.ui.menu,name:account_asset.menu_finance_assets +#: model:ir.ui.menu,name:account_asset.menu_finance_config_assets +msgid "Assets" +msgstr "" + +#. module: account_asset +#: field:account.asset.category,account_depreciation_id:0 +msgid "Depreciation Account" +msgstr "" + +#. module: account_asset +#: view:account.asset.asset:0 +#: view:account.asset.category:0 +#: view:account.asset.history:0 +#: view:asset.modify:0 +#: field:asset.modify,note:0 +msgid "Notes" +msgstr "" + +#. module: account_asset +#: field:account.asset.depreciation.line,move_id:0 +msgid "Depreciation Entry" +msgstr "" + +#. module: account_asset +#: code:addons/account_asset/account_asset.py:82 +#, python-format +msgid "Error!" +msgstr "" + +#. module: account_asset +#: view:asset.asset.report:0 +#: field:asset.asset.report,nbr:0 +msgid "# of Depreciation Lines" +msgstr "" + +#. module: account_asset +#: field:account.asset.asset,method_period:0 +msgid "Number of Months in a Period" +msgstr "" + +#. module: account_asset +#: view:asset.asset.report:0 +msgid "Assets in draft state" +msgstr "" + +#. module: account_asset +#: field:account.asset.asset,method_end:0 +#: selection:account.asset.asset,method_time:0 +#: selection:account.asset.category,method_time:0 +#: selection:account.asset.history,method_time:0 +msgid "Ending Date" +msgstr "" + +#. module: account_asset +#: field:account.asset.asset,code:0 +msgid "Reference" +msgstr "" + +#. module: account_asset +#: view:account.asset.asset:0 +msgid "Account Asset" +msgstr "" + +#. module: account_asset +#: model:ir.actions.act_window,name:account_asset.action_asset_depreciation_confirmation_wizard +#: model:ir.ui.menu,name:account_asset.menu_asset_depreciation_confirmation_wizard +msgid "Compute Assets" +msgstr "" + +#. module: account_asset +#: field:account.asset.category,method_period:0 +#: field:account.asset.history,method_period:0 +#: field:asset.modify,method_period:0 +msgid "Period Length" +msgstr "" + +#. module: account_asset +#: selection:account.asset.asset,state:0 +#: view:asset.asset.report:0 +#: selection:asset.asset.report,state:0 +msgid "Draft" +msgstr "" + +#. module: account_asset +#: view:asset.asset.report:0 +msgid "Date of asset purchase" +msgstr "" + +#. module: account_asset +#: view:account.asset.asset:0 +msgid "Change Duration" +msgstr "" + +#. module: account_asset +#: help:account.asset.asset,method_number:0 +#: help:account.asset.category,method_number:0 +#: help:account.asset.history,method_number:0 +msgid "The number of depreciations needed to depreciate your asset" +msgstr "" + +#. module: account_asset +#: view:account.asset.category:0 +msgid "Analytic Information" +msgstr "" + +#. module: account_asset +#: field:account.asset.category,account_analytic_id:0 +msgid "Analytic account" +msgstr "" + +#. module: account_asset +#: field:account.asset.asset,method:0 +#: field:account.asset.category,method:0 +msgid "Computation Method" +msgstr "" + +#. module: account_asset +#: constraint:account.asset.asset:0 +msgid "" +"Prorata temporis can be applied only for time method \"number of " +"depreciations\"." +msgstr "" + +#. module: account_asset +#: field:account.asset.depreciation.line,remaining_value:0 +msgid "Next Period Depreciation" +msgstr "" + +#. module: account_asset +#: help:account.asset.history,method_period:0 +msgid "Time in month between two depreciations" +msgstr "" + +#. module: account_asset +#: view:asset.modify:0 +#: model:ir.actions.act_window,name:account_asset.action_asset_modify +#: model:ir.model,name:account_asset.model_asset_modify +msgid "Modify Asset" +msgstr "" + +#. module: account_asset +#: field:account.asset.asset,salvage_value:0 +msgid "Salvage Value" +msgstr "" + +#. module: account_asset +#: field:account.asset.asset,category_id:0 +#: view:account.asset.category:0 +#: field:account.invoice.line,asset_category_id:0 +#: view:asset.asset.report:0 +msgid "Asset Category" +msgstr "" + +#. module: account_asset +#: view:account.asset.asset:0 +msgid "Assets in closed state" +msgstr "" + +#. module: account_asset +#: field:account.asset.asset,parent_id:0 +msgid "Parent Asset" +msgstr "" + +#. module: account_asset +#: view:account.asset.history:0 +#: model:ir.model,name:account_asset.model_account_asset_history +msgid "Asset history" +msgstr "" + +#. module: account_asset +#: view:account.asset.category:0 +msgid "Search Asset Category" +msgstr "" + +#. module: account_asset +#: view:asset.modify:0 +msgid "months" +msgstr "" + +#. module: account_asset +#: model:ir.model,name:account_asset.model_account_invoice_line +msgid "Invoice Line" +msgstr "" + +#. module: account_asset +#: view:account.asset.asset:0 +msgid "Depreciation Board" +msgstr "" + +#. module: account_asset +#: field:asset.asset.report,unposted_value:0 +msgid "Unposted Amount" +msgstr "" + +#. module: account_asset +#: field:account.asset.asset,method_time:0 +#: field:account.asset.category,method_time:0 +#: field:account.asset.history,method_time:0 +msgid "Time Method" +msgstr "" + +#. module: account_asset +#: view:asset.depreciation.confirmation.wizard:0 +#: view:asset.modify:0 +msgid "or" +msgstr "" + +#. module: account_asset +#: field:account.asset.asset,note:0 +#: field:account.asset.category,note:0 +#: field:account.asset.history,note:0 +msgid "Note" +msgstr "" + +#. module: account_asset +#: help:account.asset.history,method_time:0 +msgid "" +"The method to use to compute the dates and number of depreciation lines.\n" +"Number of Depreciations: Fix the number of depreciation lines and the time " +"between 2 depreciations.\n" +"Ending Date: Choose the time between 2 depreciations and the date the " +"depreciations won't go beyond." +msgstr "" + +#. module: account_asset +#: help:account.asset.asset,method_time:0 +#: help:account.asset.category,method_time:0 +msgid "" +"Choose the method to use to compute the dates and number of depreciation " +"lines.\n" +" * Number of Depreciations: Fix the number of depreciation lines and the " +"time between 2 depreciations.\n" +" * Ending Date: Choose the time between 2 depreciations and the date the " +"depreciations won't go beyond." +msgstr "" + +#. module: account_asset +#: view:asset.asset.report:0 +msgid "Assets in running state" +msgstr "" + +#. module: account_asset +#: view:account.asset.asset:0 +msgid "Closed" +msgstr "" + +#. module: account_asset +#: help:account.asset.asset,state:0 +msgid "" +"When an asset is created, the status is 'Draft'.\n" +"If the asset is confirmed, the status goes in 'Running' and the depreciation " +"lines can be posted in the accounting.\n" +"You can manually close an asset when the depreciation is over. If the last " +"line of depreciation is posted, the asset automatically goes in that status." +msgstr "" + +#. module: account_asset +#: field:account.asset.asset,state:0 +#: field:asset.asset.report,state:0 +msgid "Status" +msgstr "" + +#. module: account_asset +#: field:account.asset.asset,partner_id:0 +#: field:asset.asset.report,partner_id:0 +msgid "Partner" +msgstr "" + +#. module: account_asset +#: view:asset.asset.report:0 +msgid "Posted depreciation lines" +msgstr "" + +#. module: account_asset +#: field:account.asset.asset,child_ids:0 +msgid "Children Assets" +msgstr "" + +#. module: account_asset +#: view:asset.asset.report:0 +msgid "Date of depreciation" +msgstr "" + +#. module: account_asset +#: field:account.asset.history,user_id:0 +msgid "User" +msgstr "" + +#. module: account_asset +#: field:account.asset.category,account_asset_id:0 +msgid "Asset Account" +msgstr "" + +#. module: account_asset +#: view:asset.asset.report:0 +msgid "Extended Filters..." +msgstr "" + +#. module: account_asset +#: view:account.asset.asset:0 +#: view:asset.depreciation.confirmation.wizard:0 +msgid "Compute" +msgstr "" + +#. module: account_asset +#: view:account.asset.history:0 +msgid "Asset History" +msgstr "" + +#. module: account_asset +#: model:ir.model,name:account_asset.model_asset_depreciation_confirmation_wizard +msgid "asset.depreciation.confirmation.wizard" +msgstr "" + +#. module: account_asset +#: field:account.asset.asset,active:0 +msgid "Active" +msgstr "" + +#. module: account_asset +#: field:account.asset.depreciation.line,parent_state:0 +msgid "State of Asset" +msgstr "" + +#. module: account_asset +#: field:account.asset.depreciation.line,name:0 +msgid "Depreciation Name" +msgstr "" + +#. module: account_asset +#: view:account.asset.asset:0 +#: field:account.asset.asset,history_ids:0 +msgid "History" +msgstr "" + +#. module: account_asset +#: view:asset.depreciation.confirmation.wizard:0 +msgid "Compute Asset" +msgstr "" + +#. module: account_asset +#: field:asset.depreciation.confirmation.wizard,period_id:0 +msgid "Period" +msgstr "" + +#. module: account_asset +#: view:account.asset.asset:0 +msgid "General" +msgstr "" + +#. module: account_asset +#: field:account.asset.asset,prorata:0 +#: field:account.asset.category,prorata:0 +msgid "Prorata Temporis" +msgstr "" + +#. module: account_asset +#: model:ir.model,name:account_asset.model_account_invoice +msgid "Invoice" +msgstr "" + +#. module: account_asset +#: view:account.asset.asset:0 +msgid "Set to Close" +msgstr "" + +#. module: account_asset +#: view:asset.depreciation.confirmation.wizard:0 +#: view:asset.modify:0 +msgid "Cancel" +msgstr "" + +#. module: account_asset +#: selection:account.asset.asset,state:0 +#: selection:asset.asset.report,state:0 +msgid "Close" +msgstr "" + +#. module: account_asset +#: model:ir.model,name:account_asset.model_account_move_line +msgid "Journal Items" +msgstr "" + +#. module: account_asset +#: view:asset.modify:0 +msgid "Asset Durations to Modify" +msgstr "" + +#. module: account_asset +#: field:account.asset.asset,purchase_date:0 +#: view:asset.asset.report:0 +#: field:asset.asset.report,purchase_date:0 +msgid "Purchase Date" +msgstr "" + +#. module: account_asset +#: selection:account.asset.asset,method:0 +#: selection:account.asset.category,method:0 +msgid "Degressive" +msgstr "" + +#. module: account_asset +#: help:asset.depreciation.confirmation.wizard,period_id:0 +msgid "" +"Choose the period for which you want to automatically post the depreciation " +"lines of running assets" +msgstr "" + +#. module: account_asset +#: view:account.asset.asset:0 +msgid "Current" +msgstr "" + +#. module: account_asset +#: code:addons/account_asset/account_asset.py:82 +#, python-format +msgid "You cannot delete an asset that contains posted depreciation lines." +msgstr "" + +#. module: account_asset +#: view:account.asset.category:0 +msgid "Depreciation Method" +msgstr "" + +#. module: account_asset +#: field:account.asset.depreciation.line,amount:0 +msgid "Current Depreciation" +msgstr "" + +#. module: account_asset +#: field:account.asset.asset,name:0 +msgid "Asset Name" +msgstr "" + +#. module: account_asset +#: field:account.asset.category,open_asset:0 +msgid "Skip Draft State" +msgstr "" + +#. module: account_asset +#: view:account.asset.category:0 +msgid "Depreciation Dates" +msgstr "" + +#. module: account_asset +#: field:account.asset.asset,currency_id:0 +msgid "Currency" +msgstr "" + +#. module: account_asset +#: field:account.asset.category,journal_id:0 +msgid "Journal" +msgstr "" + +#. module: account_asset +#: field:account.asset.history,name:0 +msgid "History name" +msgstr "" + +#. module: account_asset +#: field:account.asset.depreciation.line,depreciated_value:0 +msgid "Amount Already Depreciated" +msgstr "" + +#. module: account_asset +#: help:account.asset.asset,method:0 +#: help:account.asset.category,method:0 +msgid "" +"Choose the method to use to compute the amount of depreciation lines.\n" +" * Linear: Calculated on basis of: Gross Value / Number of Depreciations\n" +" * Degressive: Calculated on basis of: Residual Value * Degressive Factor" +msgstr "" + +#. module: account_asset +#: field:account.asset.depreciation.line,move_check:0 +#: view:asset.asset.report:0 +#: field:asset.asset.report,move_check:0 +msgid "Posted" +msgstr "" + +#. module: account_asset +#: model:ir.actions.act_window,help:account_asset.action_asset_asset_report +msgid "" +"

\n" +" From this report, you can have an overview on all depreciation. " +"The\n" +" tool search can also be used to personalise your Assets reports " +"and\n" +" so, match this analysis to your needs;\n" +"

\n" +" " +msgstr "" + +#. module: account_asset +#: field:account.asset.asset,purchase_value:0 +msgid "Gross Value" +msgstr "" + +#. module: account_asset +#: field:account.asset.category,name:0 +msgid "Name" +msgstr "" + +#. module: account_asset +#: help:account.asset.category,open_asset:0 +msgid "" +"Check this if you want to automatically confirm the assets of this category " +"when created by invoices." +msgstr "" + +#. module: account_asset +#: field:asset.asset.report,name:0 +msgid "Year" +msgstr "" + +#. module: account_asset +#: model:ir.model,name:account_asset.model_account_asset_depreciation_line +msgid "Asset depreciation line" +msgstr "" + +#. module: account_asset +#: view:account.asset.category:0 +#: field:asset.asset.report,asset_category_id:0 +#: model:ir.model,name:account_asset.model_account_asset_category +msgid "Asset category" +msgstr "" + +#. module: account_asset +#: view:asset.asset.report:0 +#: field:asset.asset.report,depreciation_value:0 +msgid "Amount of Depreciation Lines" +msgstr "" + +#. module: account_asset +#: code:addons/account_asset/wizard/wizard_asset_compute.py:49 +#, python-format +msgid "Created Asset Moves" +msgstr "" + +#. module: account_asset +#: view:account.asset.asset:0 +msgid "Add an internal note here..." +msgstr "" + +#. module: account_asset +#: field:account.asset.depreciation.line,sequence:0 +msgid "Sequence" +msgstr "" + +#. module: account_asset +#: help:account.asset.category,method_period:0 +msgid "State here the time between 2 depreciations, in months" +msgstr "" + +#. module: account_asset +#: field:account.asset.history,date:0 +msgid "Date" +msgstr "" + +#. module: account_asset +#: field:account.asset.asset,method_number:0 +#: selection:account.asset.asset,method_time:0 +#: field:account.asset.category,method_number:0 +#: selection:account.asset.category,method_time:0 +#: field:account.asset.history,method_number:0 +#: selection:account.asset.history,method_time:0 +#: field:asset.modify,method_number:0 +msgid "Number of Depreciations" +msgstr "" + +#. module: account_asset +#: view:account.asset.asset:0 +msgid "Create Move" +msgstr "" + +#. module: account_asset +#: view:account.asset.asset:0 +msgid "Confirm Asset" +msgstr "" + +#. module: account_asset +#: model:ir.actions.act_window,name:account_asset.action_account_asset_asset_tree +#: model:ir.ui.menu,name:account_asset.menu_action_account_asset_asset_tree +msgid "Asset Hierarchy" +msgstr "" diff --git a/addons/account_cancel/i18n/th.po b/addons/account_cancel/i18n/th.po new file mode 100644 index 00000000000..69466eca258 --- /dev/null +++ b/addons/account_cancel/i18n/th.po @@ -0,0 +1,23 @@ +# Thai translation for openobject-addons +# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013 +# This file is distributed under the same license as the openobject-addons package. +# FIRST AUTHOR , 2013. +# +msgid "" +msgstr "" +"Project-Id-Version: openobject-addons\n" +"Report-Msgid-Bugs-To: FULL NAME \n" +"POT-Creation-Date: 2013-03-07 08:37+0000\n" +"PO-Revision-Date: 2013-05-15 07:04+0000\n" +"Last-Translator: FULL NAME \n" +"Language-Team: Thai \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2013-05-16 05:55+0000\n" +"X-Generator: Launchpad (build 16626)\n" + +#. module: account_cancel +#: view:account.invoice:0 +msgid "Cancel Invoice" +msgstr "" diff --git a/addons/account_voucher/i18n/nl.po b/addons/account_voucher/i18n/nl.po index 5dab67c2ef8..a5a979874c3 100644 --- a/addons/account_voucher/i18n/nl.po +++ b/addons/account_voucher/i18n/nl.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2013-03-07 08:37+0000\n" -"PO-Revision-Date: 2013-05-01 18:15+0000\n" +"PO-Revision-Date: 2013-05-15 17:31+0000\n" "Last-Translator: Erwin van der Ploeg (Endian Solutions) \n" "Language-Team: Dutch \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-05-02 06:08+0000\n" -"X-Generator: Launchpad (build 16580)\n" +"X-Launchpad-Export-Date: 2013-05-16 05:55+0000\n" +"X-Generator: Launchpad (build 16626)\n" #. module: account_voucher #: field:account.bank.statement.line,voucher_id:0 @@ -526,7 +526,7 @@ msgstr "Weet u zeker dat u het afletteren van deze regel wilt afbreken?" #. module: account_voucher #: view:account.voucher:0 msgid "Sales Receipt" -msgstr "Verkoopbon" +msgstr "Betaalbewijs" #. module: account_voucher #: field:account.voucher,is_multi_currency:0 diff --git a/addons/contacts/i18n/th.po b/addons/contacts/i18n/th.po new file mode 100644 index 00000000000..31afb7a52e3 --- /dev/null +++ b/addons/contacts/i18n/th.po @@ -0,0 +1,37 @@ +# Thai translation for openobject-addons +# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013 +# This file is distributed under the same license as the openobject-addons package. +# FIRST AUTHOR , 2013. +# +msgid "" +msgstr "" +"Project-Id-Version: openobject-addons\n" +"Report-Msgid-Bugs-To: FULL NAME \n" +"POT-Creation-Date: 2013-03-07 08:38+0000\n" +"PO-Revision-Date: 2013-05-15 07:10+0000\n" +"Last-Translator: FULL NAME \n" +"Language-Team: Thai \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2013-05-16 05:55+0000\n" +"X-Generator: Launchpad (build 16626)\n" + +#. module: contacts +#: model:ir.actions.act_window,help:contacts.action_contacts +msgid "" +"

\n" +" Click to add a contact in your address book.\n" +"

\n" +" OpenERP helps you easily track all activities related to\n" +" a customer; discussions, history of business opportunities,\n" +" documents, etc.\n" +"

\n" +" " +msgstr "" + +#. module: contacts +#: model:ir.actions.act_window,name:contacts.action_contacts +#: model:ir.ui.menu,name:contacts.menu_contacts +msgid "Contacts" +msgstr "" diff --git a/addons/project/i18n/th.po b/addons/project/i18n/th.po new file mode 100644 index 00000000000..5543150aae3 --- /dev/null +++ b/addons/project/i18n/th.po @@ -0,0 +1,2153 @@ +# Thai translation for openobject-addons +# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013 +# This file is distributed under the same license as the openobject-addons package. +# FIRST AUTHOR , 2013. +# +msgid "" +msgstr "" +"Project-Id-Version: openobject-addons\n" +"Report-Msgid-Bugs-To: FULL NAME \n" +"POT-Creation-Date: 2013-03-07 08:37+0000\n" +"PO-Revision-Date: 2013-05-15 07:02+0000\n" +"Last-Translator: FULL NAME \n" +"Language-Team: Thai \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2013-05-16 05:55+0000\n" +"X-Generator: Launchpad (build 16626)\n" + +#. module: project +#: view:project.project:0 +msgid "Email Interface" +msgstr "" + +#. module: project +#: help:account.analytic.account,use_tasks:0 +msgid "" +"If checked, this contract will be available in the project menu and you will " +"be able to manage tasks or track issues" +msgstr "" + +#. module: project +#: field:project.project,progress_rate:0 +#: view:report.project.task.user:0 +#: field:report.project.task.user,progress:0 +msgid "Progress" +msgstr "" + +#. module: project +#: model:process.node,name:project.process_node_taskbydelegate0 +msgid "Task by delegate" +msgstr "" + +#. module: project +#: view:project.project:0 +msgid "Parent" +msgstr "" + +#. module: project +#: model:ir.actions.act_window,name:project.dblc_proj +msgid "Project's tasks" +msgstr "" + +#. module: project +#: field:project.task.type,name:0 +msgid "Stage Name" +msgstr "" + +#. module: project +#: model:process.transition.action,name:project.process_transition_action_openpendingtask0 +msgid "Set pending" +msgstr "" + +#. module: project +#: view:project.project:0 +msgid "New Project Based on Template" +msgstr "" + +#. module: project +#: view:report.project.task.user:0 +#: field:report.project.task.user,day:0 +msgid "Day" +msgstr "" + +#. module: project +#: model:project.task.type,name:project.project_tt_merge +msgid "Merge" +msgstr "" + +#. module: project +#: view:res.partner:0 +msgid "Start Task" +msgstr "" + +#. module: project +#: code:addons/project/project.py:932 +#, python-format +msgid "Warning !" +msgstr "" + +#. module: project +#: help:project.project,message_unread:0 +#: help:project.task,message_unread:0 +msgid "If checked new messages require your attention." +msgstr "" + +#. module: project +#: model:process.node,name:project.process_node_donetask0 +msgid "Done task" +msgstr "" + +#. module: project +#: model:process.node,note:project.process_node_donetask0 +msgid "Task is Completed" +msgstr "" + +#. module: project +#: view:res.partner:0 +msgid "False" +msgstr "" + +#. module: project +#: model:project.task.type,name:project.project_tt_testing +msgid "Testing" +msgstr "" + +#. module: project +#: model:ir.model,name:project.model_account_analytic_account +msgid "Analytic Account" +msgstr "" + +#. module: project +#: field:project.config.settings,group_time_work_estimation_tasks:0 +msgid "Manage time estimation on tasks" +msgstr "" + +#. module: project +#: help:project.project,message_summary:0 +#: help:project.task,message_summary:0 +msgid "" +"Holds the Chatter summary (number of messages, ...). This summary is " +"directly in html format in order to be inserted in kanban views." +msgstr "" + +#. module: project +#: code:addons/project/project.py:432 +#: code:addons/project/project.py:1318 +#, python-format +msgid "Warning!" +msgstr "" + +#. module: project +#: model:ir.model,name:project.model_res_partner +msgid "Partner" +msgstr "" + +#. module: project +#: field:project.config.settings,group_manage_delegation_task:0 +msgid "Allow task delegation" +msgstr "" + +#. module: project +#: field:project.task.delegate,planned_hours:0 +#: view:report.project.task.user:0 +#: field:report.project.task.user,hours_planned:0 +msgid "Planned Hours" +msgstr "" + +#. module: project +#: view:project.project:0 +msgid "Reset as Project" +msgstr "" + +#. module: project +#: view:report.project.task.user:0 +msgid "In progress tasks" +msgstr "" + +#. module: project +#: help:project.project,progress_rate:0 +msgid "Percent of tasks closed according to the total of tasks todo." +msgstr "" + +#. module: project +#: model:ir.actions.client,name:project.action_client_project_menu +msgid "Open Project Menu" +msgstr "" + +#. module: project +#: model:ir.actions.act_window,help:project.action_project_task_user_tree +msgid "" +"This report allows you to analyse the performance of your projects and " +"users. You can analyse the quantities of tasks, the hours spent compared to " +"the planned hours, the average number of days to open or close a task, etc." +msgstr "" + +#. module: project +#: view:project.task.delegate:0 +msgid "Validation Task Title" +msgstr "" + +#. module: project +#: model:res.groups,name:project.group_delegate_task +msgid "Task Delegation" +msgstr "" + +#. module: project +#: field:project.project,planned_hours:0 +#: field:project.task.history,planned_hours:0 +#: field:project.task.history.cumulative,planned_hours:0 +msgid "Planned Time" +msgstr "" + +#. module: project +#: selection:project.project,privacy_visibility:0 +msgid "Public" +msgstr "" + +#. module: project +#: view:project.task:0 +#: selection:project.task,state:0 +#: selection:project.task.delegate,state:0 +#: selection:project.task.history,state:0 +#: selection:project.task.history.cumulative,state:0 +#: model:project.task.type,name:project.project_tt_deployment +#: selection:project.task.type,state:0 +#: view:report.project.task.user:0 +#: selection:report.project.task.user,state:0 +#: view:res.partner:0 +msgid "Done" +msgstr "" + +#. module: project +#: model:project.category,name:project.project_category_01 +msgid "Contact's suggestion" +msgstr "" + +#. module: project +#: help:project.config.settings,group_time_work_estimation_tasks:0 +msgid "Allows you to compute Time Estimation on tasks." +msgstr "" + +#. module: project +#: field:report.project.task.user,user_id:0 +msgid "Assigned To" +msgstr "" + +#. module: project +#: model:mail.message.subtype,name:project.mt_project_task_closed +#: model:mail.message.subtype,name:project.mt_task_closed +msgid "Task Done" +msgstr "" + +#. module: project +#: view:project.project:0 +#: view:report.project.task.user:0 +#: field:report.project.task.user,partner_id:0 +msgid "Contact" +msgstr "" + +#. module: project +#: model:process.transition,name:project.process_transition_delegate0 +#: view:project.task:0 +msgid "Delegate" +msgstr "" + +#. module: project +#: model:ir.actions.act_window,name:project.open_view_template_project +#: view:project.project:0 +msgid "Templates of Projects" +msgstr "" + +#. module: project +#: field:project.project,analytic_account_id:0 +msgid "Contract/Analytic" +msgstr "" + +#. module: project +#: view:project.config.settings:0 +msgid "Project Management" +msgstr "" + +#. module: project +#: model:ir.actions.act_window,name:project.action_project_task_delegate +#: view:project.task.delegate:0 +msgid "Project Task Delegate" +msgstr "" + +#. module: project +#: model:mail.message.subtype,name:project.mt_project_task_started +#: model:mail.message.subtype,name:project.mt_task_started +msgid "Task Started" +msgstr "" + +#. module: project +#: view:project.task:0 +msgid "Very Important" +msgstr "" + +#. module: project +#: view:project.config.settings:0 +msgid "Support" +msgstr "" + +#. module: project +#: view:project.project:0 +msgid "Member" +msgstr "" + +#. module: project +#: view:project.task:0 +msgid "Cancel Task" +msgstr "" + +#. module: project +#: help:project.project,members:0 +msgid "" +"Project's members are users who can have an access to the tasks related to " +"this project." +msgstr "" + +#. module: project +#: view:project.project:0 +#: field:project.task,manager_id:0 +msgid "Project Manager" +msgstr "" + +#. module: project +#: field:project.project,state:0 +#: field:project.task,state:0 +#: field:project.task.history,state:0 +#: field:project.task.history.cumulative,state:0 +#: field:report.project.task.user,state:0 +msgid "Status" +msgstr "" + +#. module: project +#: selection:report.project.task.user,month:0 +msgid "August" +msgstr "" + +#. module: project +#: view:project.project:0 +#: field:project.project,complete_name:0 +msgid "Project Name" +msgstr "" + +#. module: project +#: selection:report.project.task.user,month:0 +msgid "June" +msgstr "" + +#. module: project +#: view:project.task:0 +msgid "Gantt View" +msgstr "" + +#. module: project +#: selection:report.project.task.user,month:0 +msgid "October" +msgstr "" + +#. module: project +#: help:project.project,total_hours:0 +msgid "" +"Sum of total hours of all tasks related to this project and its child " +"projects." +msgstr "" + +#. module: project +#: help:project.project,active:0 +msgid "" +"If the active field is set to False, it will allow you to hide the project " +"without removing it." +msgstr "" + +#. module: project +#: model:process.transition,note:project.process_transition_opendonetask0 +msgid "When task is completed, it will come into the done state." +msgstr "" + +#. module: project +#: field:project.project,message_summary:0 +#: field:project.task,message_summary:0 +msgid "Summary" +msgstr "" + +#. module: project +#: view:project.task:0 +msgid "Task summary..." +msgstr "" + +#. module: project +#: view:project.project:0 +msgid "Append this project to another one using analytic accounts hierarchy" +msgstr "" + +#. module: project +#: view:project.task:0 +#: view:project.task.history.cumulative:0 +msgid "In Progress Tasks" +msgstr "" + +#. module: project +#: help:res.company,project_time_mode_id:0 +msgid "" +"This will set the unit of measure used in projects and tasks.\n" +"If you use the timesheet linked to projects (project_timesheet module), " +"don't forget to setup the right unit of measure in your employees." +msgstr "" + +#. module: project +#: field:project.task,user_id:0 +#: view:report.project.task.user:0 +msgid "Assigned to" +msgstr "" + +#. module: project +#: code:addons/project/project.py:1021 +#, python-format +msgid "Delegated User should be specified" +msgstr "" + +#. module: project +#: view:project.project:0 +msgid "Project(s) Manager" +msgstr "" + +#. module: project +#: selection:project.project,state:0 +#: view:project.task:0 +#: selection:project.task,state:0 +#: selection:project.task.history,state:0 +#: selection:project.task.history.cumulative,state:0 +#: selection:project.task.type,state:0 +#: selection:report.project.task.user,state:0 +msgid "In Progress" +msgstr "" + +#. module: project +#: view:project.task:0 +msgid "Reactivate" +msgstr "" + +#. module: project +#: field:project.project,resource_calendar_id:0 +msgid "Working Time" +msgstr "" + +#. module: project +#: model:ir.actions.act_window,name:project.action_project_task_reevaluate +msgid "Re-evaluate Task" +msgstr "" + +#. module: project +#: view:project.task:0 +msgid "Validate planned time" +msgstr "" + +#. module: project +#: field:project.config.settings,module_pad:0 +msgid "Use integrated collaborative note pads on task" +msgstr "" + +#. module: project +#: model:mail.message.subtype,name:project.mt_project_task_blocked +#: model:mail.message.subtype,name:project.mt_task_blocked +msgid "Task Blocked" +msgstr "" + +#. module: project +#: model:process.node,note:project.process_node_opentask0 +msgid "Encode your working hours." +msgstr "" + +#. module: project +#: field:project.project,alias_id:0 +msgid "Alias" +msgstr "" + +#. module: project +#: view:project.task:0 +msgid "oe_kanban_text_red" +msgstr "" + +#. module: project +#: model:mail.message.subtype,description:project.mt_task_blocked +msgid "Task blocked" +msgstr "" + +#. module: project +#: view:project.task:0 +msgid "Delegation" +msgstr "" + +#. module: project +#: field:project.task,create_date:0 +msgid "Create Date" +msgstr "" + +#. module: project +#: view:project.task:0 +msgid "Add a Description..." +msgstr "" + +#. module: project +#: view:res.partner:0 +msgid "For changing to open state" +msgstr "" + +#. module: project +#: view:project.config.settings:0 +msgid "Apply" +msgstr "" + +#. module: project +#: model:ir.model,name:project.model_project_task_delegate +msgid "Task Delegate" +msgstr "" + +#. module: project +#: help:project.task.delegate,new_task_description:0 +msgid "Reinclude the description of the task in the task of the user" +msgstr "" + +#. module: project +#: view:project.project:0 +msgid "Project Settings" +msgstr "" + +#. module: project +#: view:report.project.task.user:0 +msgid "My tasks" +msgstr "" + +#. module: project +#: model:process.transition,name:project.process_transition_opendonetask0 +msgid "Open Done Task" +msgstr "" + +#. module: project +#: field:project.task.delegate,planned_hours_me:0 +msgid "Hours to Validate" +msgstr "" + +#. module: project +#: help:project.task,remaining_hours:0 +msgid "" +"Total remaining time, can be re-estimated periodically by the assignee of " +"the task." +msgstr "" + +#. module: project +#: selection:report.project.task.user,month:0 +msgid "March" +msgstr "" + +#. module: project +#: view:board.board:0 +#: model:ir.actions.act_window,name:project.my_open_tasks_action +#: view:project.task:0 +#: view:project.task.history.cumulative:0 +msgid "My Tasks" +msgstr "" + +#. module: project +#: constraint:project.task:0 +msgid "Error ! You cannot create recursive tasks." +msgstr "" + +#. module: project +#: view:report.project.task.user:0 +msgid "Pending tasks" +msgstr "" + +#. module: project +#: view:project.task.reevaluate:0 +msgid "_Evaluate" +msgstr "" + +#. module: project +#: view:report.project.task.user:0 +#: field:report.project.task.user,opening_days:0 +msgid "Days to Open" +msgstr "" + +#. module: project +#: selection:report.project.task.user,priority:0 +msgid "Very urgent" +msgstr "" + +#. module: project +#: help:project.task.delegate,project_id:0 +#: help:project.task.delegate,user_id:0 +msgid "User you want to delegate this task to" +msgstr "" + +#. module: project +#: view:project.project:0 +msgid "Set as Template" +msgstr "" + +#. module: project +#: model:ir.model,name:project.model_project_task +#: view:project.config.settings:0 +#: view:project.project:0 +#: view:project.task:0 +#: field:project.task.history,task_id:0 +#: field:project.task.history.cumulative,task_id:0 +#: field:project.task.work,task_id:0 +#: view:report.project.task.user:0 +msgid "Task" +msgstr "" + +#. module: project +#: help:project.config.settings,group_tasks_work_on_tasks:0 +msgid "Allows you to compute work on tasks." +msgstr "" + +#. module: project +#: view:project.project:0 +msgid "Administration" +msgstr "" + +#. module: project +#: field:project.config.settings,group_tasks_work_on_tasks:0 +msgid "Log work activities on tasks" +msgstr "" + +#. module: project +#: model:project.task.type,name:project.project_tt_analysis +msgid "Analysis" +msgstr "" + +#. module: project +#: field:project.task,name:0 +#: field:report.project.task.user,name:0 +msgid "Task Summary" +msgstr "" + +#. module: project +#: field:project.task,active:0 +msgid "Not a Template Task" +msgstr "" + +#. module: project +#: field:project.task,planned_hours:0 +msgid "Initially Planned Hours" +msgstr "" + +#. module: project +#: model:process.transition,note:project.process_transition_delegate0 +msgid "Delegates tasks to the other user" +msgstr "" + +#. module: project +#: help:project.task,effective_hours:0 +msgid "Computed using the sum of the task work done." +msgstr "" + +#. module: project +#: model:ir.actions.act_window,help:project.open_view_project_all +msgid "" +"

\n" +" Click to start a new project.\n" +"

\n" +" Projects are used to organize your activities; plan\n" +" tasks, track issues, invoice timesheets. You can define\n" +" internal projects (R&D, Improve Sales Process),\n" +" private projects (My Todos) or customer ones.\n" +"

\n" +" You will be able collaborate with internal users on\n" +" projects or invite customers to share your activities.\n" +"

\n" +" " +msgstr "" + +#. module: project +#: view:project.config.settings:0 +msgid "Planning" +msgstr "" + +#. module: project +#: view:project.task:0 +#: field:project.task,date_deadline:0 +#: field:report.project.task.user,date_deadline:0 +msgid "Deadline" +msgstr "" + +#. module: project +#: view:project.task.history.cumulative:0 +msgid "Ready" +msgstr "" + +#. module: project +#: view:project.task:0 +msgid "New Tasks" +msgstr "" + +#. module: project +#: field:project.config.settings,module_project_issue_sheet:0 +msgid "Invoice working time on issues" +msgstr "" + +#. module: project +#: view:project.project:0 +#: view:project.task:0 +#: field:project.task.history,end_date:0 +#: field:project.task.history.cumulative,end_date:0 +msgid "End Date" +msgstr "" + +#. module: project +#: model:project.task.type,name:project.project_tt_specification +msgid "Specification" +msgstr "" + +#. module: project +#: model:process.transition,note:project.process_transition_draftopentask0 +msgid "From draft state, it will come into the open state." +msgstr "" + +#. module: project +#: view:project.task.history.cumulative:0 +msgid "Task's Analysis" +msgstr "" + +#. module: project +#: view:project.task.delegate:0 +#: field:project.task.delegate,new_task_description:0 +msgid "New Task Description" +msgstr "" + +#. module: project +#: field:report.project.task.user,delay_endings_days:0 +msgid "Overpassed Deadline" +msgstr "" + +#. module: project +#: view:report.project.task.user:0 +msgid "New tasks" +msgstr "" + +#. module: project +#: selection:project.task,priority:0 +#: selection:report.project.task.user,priority:0 +msgid "Medium" +msgstr "" + +#. module: project +#: field:project.project,total_hours:0 +msgid "Total Time" +msgstr "" + +#. module: project +#: view:report.project.task.user:0 +msgid "Creation Date" +msgstr "" + +#. module: project +#: view:project.project:0 +msgid "Miscellaneous" +msgstr "" + +#. module: project +#: view:project.task:0 +#: field:project.task,stage_id:0 +#: field:project.task.history,type_id:0 +#: field:project.task.history.cumulative,type_id:0 +msgid "Stage" +msgstr "" + +#. module: project +#: model:process.transition,name:project.process_transition_draftopentask0 +msgid "Draft Open task" +msgstr "" + +#. module: project +#: field:project.project,alias_model:0 +msgid "Alias Model" +msgstr "" + +#. module: project +#: help:report.project.task.user,closing_days:0 +msgid "Number of Days to close the task" +msgstr "" + +#. module: project +#: view:board.board:0 +msgid "My Board" +msgstr "" + +#. module: project +#: model:ir.actions.act_window,name:project.open_task_type_form +msgid "Stages" +msgstr "" + +#. module: project +#: view:project.project:0 +#: view:project.task:0 +msgid "Delete" +msgstr "" + +#. module: project +#: view:report.project.task.user:0 +msgid "In progress" +msgstr "" + +#. module: project +#: selection:report.project.task.user,month:0 +msgid "September" +msgstr "" + +#. module: project +#: selection:report.project.task.user,priority:0 +msgid "Urgent" +msgstr "" + +#. module: project +#: model:project.category,name:project.project_category_02 +msgid "Feature request" +msgstr "" + +#. module: project +#: view:project.task:0 +msgid "Delegated tasks" +msgstr "" + +#. module: project +#: model:ir.model,name:project.model_project_task_work +msgid "Project Task Work" +msgstr "" + +#. module: project +#: code:addons/project/wizard/project_task_delegate.py:81 +#, python-format +msgid "CHECK: %s" +msgstr "" + +#. module: project +#: view:project.project:0 +msgid "Close Project" +msgstr "" + +#. module: project +#: field:project.project,tasks:0 +msgid "Task Activities" +msgstr "" + +#. module: project +#: field:project.project,effective_hours:0 +#: field:project.task.work,hours:0 +msgid "Time Spent" +msgstr "" + +#. module: project +#: view:project.project:0 +#: view:project.task:0 +msgid "í" +msgstr "" + +#. module: project +#: field:account.analytic.account,company_uom_id:0 +msgid "unknown" +msgstr "" + +#. module: project +#: field:project.project,message_is_follower:0 +#: field:project.task,message_is_follower:0 +msgid "Is a Follower" +msgstr "" + +#. module: project +#: field:project.task.history,date:0 +#: field:project.task.history.cumulative,date:0 +#: field:project.task.work,date:0 +msgid "Date" +msgstr "" + +#. module: project +#: view:report.project.task.user:0 +msgid "Extended Filters..." +msgstr "" + +#. module: project +#: model:ir.ui.menu,name:project.menu_tasks_config +msgid "GTD" +msgstr "" + +#. module: project +#: view:project.project:0 +msgid "Project Stages" +msgstr "" + +#. module: project +#: help:project.task,state:0 +msgid "" +"The status is set to 'Draft', when a case is created. " +"If the case is in progress the status is set to 'Open'. " +"When the case is over, the status is set to 'Done'. If " +"the case needs to be reviewed then the status is set " +"to 'Pending'." +msgstr "" + +#. module: project +#: model:ir.model,name:project.model_res_company +msgid "Companies" +msgstr "" + +#. module: project +#: field:project.task.type,fold:0 +msgid "Folded by Default" +msgstr "" + +#. module: project +#: field:project.task,work_ids:0 +msgid "Work done" +msgstr "" + +#. module: project +#: help:project.config.settings,module_project_issue:0 +msgid "" +"Provides management of issues/bugs in projects.\n" +" This installs the module project_issue." +msgstr "" + +#. module: project +#: help:project.task,kanban_state:0 +msgid "" +"A task's kanban state indicates special situations affecting it:\n" +" * Normal is the default situation\n" +" * Blocked indicates something is preventing the progress of this task\n" +" * Ready for next stage indicates the task is ready to be pulled to the next " +"stage" +msgstr "" + +#. module: project +#: view:project.task:0 +msgid "10" +msgstr "" + +#. module: project +#: view:project.project:0 +msgid "Cancel Project" +msgstr "" + +#. module: project +#: help:project.project,analytic_account_id:0 +msgid "" +"Link this project to an analytic account if you need financial management on " +"projects. It enables you to connect projects with budgets, planning, cost " +"and revenue analysis, timesheets on projects, etc." +msgstr "" + +#. module: project +#: model:process.transition.action,name:project.process_transition_action_draftcanceltask0 +#: model:process.transition.action,name:project.process_transition_action_opencanceltask0 +#: view:project.config.settings:0 +#: view:project.task.delegate:0 +#: view:project.task.reevaluate:0 +msgid "Cancel" +msgstr "" + +#. module: project +#: view:project.project:0 +msgid "Other Info" +msgstr "" + +#. module: project +#: view:project.task.delegate:0 +msgid "_Delegate" +msgstr "" + +#. module: project +#: selection:project.task,priority:0 +#: selection:report.project.task.user,priority:0 +msgid "Very Low" +msgstr "" + +#. module: project +#: help:project.project,effective_hours:0 +msgid "" +"Sum of spent hours of all tasks related to this project and its child " +"projects." +msgstr "" + +#. module: project +#: view:project.project:0 +msgid "" +"Follow this project to automatically track the events associated to tasks " +"and issues of this project." +msgstr "" + +#. module: project +#: view:project.task:0 +msgid "Users" +msgstr "" + +#. module: project +#: model:mail.message.subtype,name:project.mt_task_stage +msgid "Stage Changed" +msgstr "" + +#. module: project +#: view:project.project:0 +#: model:res.groups,name:project.group_project_manager +msgid "Manager" +msgstr "" + +#. module: project +#: model:ir.actions.act_window,help:project.project_category_action +msgid "" +"

\n" +" Click to add a new tag.\n" +"

\n" +" " +msgstr "" + +#. module: project +#: model:ir.ui.menu,name:project.menu_task_types_view +msgid "Task Stages" +msgstr "" + +#. module: project +#: field:project.category,name:0 +msgid "Name" +msgstr "" + +#. module: project +#: selection:report.project.task.user,month:0 +msgid "November" +msgstr "" + +#. module: project +#: view:project.task.reevaluate:0 +msgid "Reevaluate Task" +msgstr "" + +#. module: project +#: model:ir.model,name:project.model_project_task_type +#: view:project.task.type:0 +msgid "Task Stage" +msgstr "" + +#. module: project +#: view:project.task.type:0 +msgid "Common" +msgstr "" + +#. module: project +#: help:project.project,message_ids:0 +#: help:project.task,message_ids:0 +msgid "Messages and communication history" +msgstr "" + +#. module: project +#: view:project.project:0 +msgid "" +"To invoice or setup invoicing and renewal options, go to the related " +"contract:" +msgstr "" + +#. module: project +#: field:project.task.delegate,state:0 +msgid "Validation State" +msgstr "" + +#. module: project +#: field:project.task.work,name:0 +msgid "Work summary" +msgstr "" + +#. module: project +#: view:project.project:0 +#: view:project.task:0 +#: view:report.project.task.user:0 +msgid "Group By..." +msgstr "" + +#. module: project +#: view:project.project:0 +#: selection:project.project,state:0 +msgid "Template" +msgstr "" + +#. module: project +#: view:project.project:0 +msgid "Re-open project" +msgstr "" + +#. module: project +#: help:project.project,priority:0 +msgid "Gives the sequence order when displaying the list of projects" +msgstr "" + +#. module: project +#: constraint:project.project:0 +msgid "Error! project start-date must be lower then project end-date." +msgstr "" + +#. module: project +#: field:project.project,members:0 +msgid "Project Members" +msgstr "" + +#. module: project +#: field:project.task,child_ids:0 +msgid "Delegated Tasks" +msgstr "" + +#. module: project +#: view:project.project:0 +#: field:project.project,message_unread:0 +#: view:project.task:0 +#: field:project.task,message_unread:0 +msgid "Unread Messages" +msgstr "" + +#. module: project +#: view:project.task:0 +#: field:project.task,parent_ids:0 +msgid "Parent Tasks" +msgstr "" + +#. module: project +#: model:process.node,name:project.process_node_opentask0 +msgid "Open task" +msgstr "" + +#. module: project +#: view:project.task.type:0 +msgid "Stages common to all projects" +msgstr "" + +#. module: project +#: model:process.node,name:project.process_node_drafttask0 +msgid "Draft task" +msgstr "" + +#. module: project +#: field:project.task,notes:0 +msgid "Notes" +msgstr "" + +#. module: project +#: view:project.task:0 +#: view:project.task.history.cumulative:0 +msgid "Pending Tasks" +msgstr "" + +#. module: project +#: view:project.task:0 +msgid "Show only tasks having a deadline" +msgstr "" + +#. module: project +#: model:project.category,name:project.project_category_04 +msgid "Usability" +msgstr "" + +#. module: project +#: view:report.project.task.user:0 +#: field:report.project.task.user,hours_delay:0 +msgid "Avg. Plan.-Eff." +msgstr "" + +#. module: project +#: field:project.task.work,user_id:0 +msgid "Done by" +msgstr "" + +#. module: project +#: code:addons/project/project.py:181 +#, python-format +msgid "Invalid Action!" +msgstr "" + +#. module: project +#: help:project.task.type,state:0 +msgid "" +"The status of your document is automatically changed regarding the selected " +"stage. For example, if a stage is related to the status 'Close', when your " +"document reaches this stage, it is automatically closed." +msgstr "" + +#. module: project +#: view:project.task:0 +msgid "Extra Info" +msgstr "" + +#. module: project +#: view:project.task:0 +msgid "Edit..." +msgstr "" + +#. module: project +#: view:report.project.task.user:0 +#: field:report.project.task.user,nbr:0 +msgid "# of tasks" +msgstr "" + +#. module: project +#: field:project.project,doc_count:0 +msgid "Number of documents attached" +msgstr "" + +#. module: project +#: field:project.task,priority:0 +#: field:report.project.task.user,priority:0 +msgid "Priority" +msgstr "" + +#. module: project +#: view:project.project:0 +msgid "Open Projects" +msgstr "" + +#. module: project +#: help:project.project,alias_id:0 +msgid "" +"Internal email associated with this project. Incoming emails are " +"automatically synchronizedwith Tasks (or optionally Issues if the Issue " +"Tracker module is installed)." +msgstr "" + +#. module: project +#: model:ir.actions.act_window,help:project.open_task_type_form +msgid "" +"

\n" +" Click to add a stage in the task pipeline.\n" +"

\n" +" Define the steps that will be used in the project from the\n" +" creation of the task, up to the closing of the task or " +"issue.\n" +" You will use these stages in order to track the progress in\n" +" solving a task or an issue.\n" +"

\n" +" " +msgstr "" + +#. module: project +#: help:project.task,total_hours:0 +msgid "Computed as: Time Spent + Remaining Time." +msgstr "" + +#. module: project +#: code:addons/project/project.py:356 +#: code:addons/project/project.py:377 +#: code:addons/project/project.py:709 +#, python-format +msgid "%s (copy)" +msgstr "" + +#. module: project +#: model:mail.message.subtype,name:project.mt_project_task_stage +msgid "Task Stage Changed" +msgstr "" + +#. module: project +#: view:project.task:0 +#: field:project.task.history,remaining_hours:0 +#: field:project.task.history.cumulative,remaining_hours:0 +msgid "Remaining Time" +msgstr "" + +#. module: project +#: field:project.task.delegate,name:0 +msgid "Delegated Title" +msgstr "" + +#. module: project +#: selection:report.project.task.user,month:0 +msgid "July" +msgstr "" + +#. module: project +#: model:ir.model,name:project.model_project_task_reevaluate +msgid "project.task.reevaluate" +msgstr "" + +#. module: project +#: field:project.task,delay_hours:0 +msgid "Delay Hours" +msgstr "" + +#. module: project +#: view:project.task.type:0 +msgid "Add a description..." +msgstr "" + +#. module: project +#: view:project.project:0 +msgid "Team" +msgstr "" + +#. module: project +#: help:project.config.settings,time_unit:0 +msgid "This will set the unit of measure used in projects and tasks." +msgstr "" + +#. module: project +#: selection:project.task,priority:0 +msgid "Very important" +msgstr "" + +#. module: project +#: view:report.project.task.user:0 +#: field:report.project.task.user,month:0 +msgid "Month" +msgstr "" + +#. module: project +#: model:project.task.type,name:project.project_tt_design +msgid "Design" +msgstr "" + +#. module: project +#: view:project.task:0 +msgid "Start Date" +msgstr "" + +#. module: project +#: view:project.task:0 +#: selection:project.task,kanban_state:0 +#: selection:project.task.history,kanban_state:0 +#: view:project.task.history.cumulative:0 +#: selection:project.task.history.cumulative,kanban_state:0 +msgid "Blocked" +msgstr "" + +#. module: project +#: help:project.task,progress:0 +msgid "" +"If the task has a progress of 99.99% you should close the task if it's " +"finished or reevaluate the time" +msgstr "" + +#. module: project +#: field:project.task,user_email:0 +msgid "User Email" +msgstr "" + +#. module: project +#: help:project.task.delegate,prefix:0 +msgid "Title for your validation task" +msgstr "" + +#. module: project +#: field:project.config.settings,time_unit:0 +msgid "Working time unit" +msgstr "" + +#. module: project +#: view:project.project:0 +msgid "Projects in which I am a member." +msgstr "" + +#. module: project +#: selection:project.task,priority:0 +#: selection:report.project.task.user,priority:0 +msgid "Low" +msgstr "" + +#. module: project +#: selection:project.project,state:0 +msgid "Closed" +msgstr "" + +#. module: project +#: view:project.project:0 +#: selection:project.project,state:0 +#: view:project.task:0 +#: selection:project.task,state:0 +#: selection:project.task.delegate,state:0 +#: selection:project.task.history,state:0 +#: selection:project.task.history.cumulative,state:0 +#: selection:project.task.type,state:0 +#: view:report.project.task.user:0 +#: selection:report.project.task.user,state:0 +msgid "Pending" +msgstr "" + +#. module: project +#: model:ir.actions.act_window,name:project.project_category_action +#: model:ir.ui.menu,name:project.menu_project_category_act +#: view:project.category:0 +#: field:project.task,categ_ids:0 +msgid "Tags" +msgstr "" + +#. module: project +#: model:ir.model,name:project.model_project_task_history +#: model:ir.model,name:project.model_project_task_history_cumulative +msgid "History of Tasks" +msgstr "" + +#. module: project +#: help:project.task.delegate,state:0 +msgid "" +"New state of your own task. Pending will be reopened automatically when the " +"delegated task is closed" +msgstr "" + +#. module: project +#: help:project.config.settings,group_manage_delegation_task:0 +msgid "Allows you to delegate tasks to other users." +msgstr "" + +#. module: project +#: field:project.project,active:0 +msgid "Active" +msgstr "" + +#. module: project +#: model:ir.model,name:project.model_project_category +msgid "Category of project's task, issue, ..." +msgstr "" + +#. module: project +#: help:project.project,resource_calendar_id:0 +msgid "Timetable working hours to adjust the gantt diagram report" +msgstr "" + +#. module: project +#: help:project.task,delay_hours:0 +msgid "" +"Computed as difference between planned hours by the project manager and the " +"total hours of the task." +msgstr "" + +#. module: project +#: view:project.config.settings:0 +msgid "Helpdesk & Support" +msgstr "" + +#. module: project +#: help:report.project.task.user,opening_days:0 +msgid "Number of Days to Open the task" +msgstr "" + +#. module: project +#: field:project.task,delegated_user_id:0 +msgid "Delegated To" +msgstr "" + +#. module: project +#: help:project.task,planned_hours:0 +msgid "" +"Estimated time to do the task, usually set by the project manager when the " +"task is in draft state." +msgstr "" + +#. module: project +#: code:addons/project/project.py:220 +#, python-format +msgid "Attachments" +msgstr "" + +#. module: project +#: view:project.category:0 +msgid "Issue Version" +msgstr "" + +#. module: project +#: code:addons/project/project.py:182 +#, python-format +msgid "" +"You cannot delete a project containing tasks. You can either delete all the " +"project's tasks and then delete the project or simply deactivate the project." +msgstr "" + +#. module: project +#: model:process.transition.action,name:project.process_transition_action_draftopentask0 +#: view:project.project:0 +msgid "Open" +msgstr "" + +#. module: project +#: field:project.project,privacy_visibility:0 +msgid "Privacy / Visibility" +msgstr "" + +#. module: project +#: view:project.task:0 +#: field:project.task,remaining_hours:0 +#: field:project.task.reevaluate,remaining_hours:0 +#: view:report.project.task.user:0 +#: field:report.project.task.user,remaining_hours:0 +msgid "Remaining Hours" +msgstr "" + +#. module: project +#: model:mail.message.subtype,description:project.mt_task_stage +msgid "Stage changed" +msgstr "" + +#. module: project +#: constraint:project.task:0 +msgid "Error ! Task end-date must be greater then task start-date" +msgstr "" + +#. module: project +#: field:project.task.history,user_id:0 +#: field:project.task.history.cumulative,user_id:0 +msgid "Responsible" +msgstr "" + +#. module: project +#: view:project.project:0 +msgid "Search Project" +msgstr "" + +#. module: project +#: view:project.task.delegate:0 +msgid "Delegated Task" +msgstr "" + +#. module: project +#: view:report.project.task.user:0 +#: field:report.project.task.user,total_hours:0 +msgid "Total Hours" +msgstr "" + +#. module: project +#: model:ir.model,name:project.model_project_config_settings +msgid "project.config.settings" +msgstr "" + +#. module: project +#: model:project.task.type,name:project.project_tt_development +msgid "Development" +msgstr "" + +#. module: project +#: help:project.task,active:0 +msgid "" +"This field is computed automatically and have the same behavior than the " +"boolean 'active' field: if the task is linked to a template or unactivated " +"project, it will be hidden unless specifically asked." +msgstr "" + +#. module: project +#: model:res.request.link,name:project.req_link_task +msgid "Project task" +msgstr "" + +#. module: project +#: field:project.task,effective_hours:0 +msgid "Hours Spent" +msgstr "" + +#. module: project +#: help:project.config.settings,module_pad:0 +msgid "" +"Lets the company customize which Pad installation should be used to link to " +"new pads\n" +" (by default, http://ietherpad.com/).\n" +" This installs the module pad." +msgstr "" + +#. module: project +#: field:project.task,id:0 +msgid "ID" +msgstr "" + +#. module: project +#: model:ir.actions.act_window,name:project.action_view_task_overpassed_draft +msgid "Overpassed Tasks" +msgstr "" + +#. module: project +#: code:addons/project/project.py:932 +#, python-format +msgid "" +"Child task still open.\n" +"Please cancel or complete child task first." +msgstr "" + +#. module: project +#: field:project.task.delegate,user_id:0 +msgid "Assign To" +msgstr "" + +#. module: project +#: model:res.groups,name:project.group_time_work_estimation_tasks +msgid "Time Estimation on Tasks" +msgstr "" + +#. module: project +#: field:project.task,total_hours:0 +msgid "Total" +msgstr "" + +#. module: project +#: model:process.node,note:project.process_node_taskbydelegate0 +msgid "Delegate your task to the other user" +msgstr "" + +#. module: project +#: model:mail.message.subtype,description:project.mt_task_started +msgid "Task started" +msgstr "" + +#. module: project +#: help:project.task.reevaluate,remaining_hours:0 +msgid "Put here the remaining hours required to close the task." +msgstr "" + +#. module: project +#: help:project.task.type,fold:0 +msgid "" +"This stage is not visible, for example in status bar or kanban view, when " +"there are no records in that stage to display." +msgstr "" + +#. module: project +#: view:project.task:0 +msgid "Deadlines" +msgstr "" + +#. module: project +#: code:addons/project/wizard/project_task_delegate.py:69 +#: code:addons/project/wizard/project_task_delegate.py:70 +#: code:addons/project/wizard/project_task_delegate.py:77 +#: code:addons/project/wizard/project_task_delegate.py:78 +#, python-format +msgid "CHECK: " +msgstr "" + +#. module: project +#: code:addons/project/project.py:432 +#, python-format +msgid "You must assign members on the project '%s' !" +msgstr "" + +#. module: project +#: view:project.project:0 +msgid "Pending Projects" +msgstr "" + +#. module: project +#: view:project.task:0 +msgid "Remaining" +msgstr "" + +#. module: project +#: field:project.task,progress:0 +msgid "Progress (%)" +msgstr "" + +#. module: project +#: field:project.task,company_id:0 +#: field:project.task.work,company_id:0 +#: view:report.project.task.user:0 +#: field:report.project.task.user,company_id:0 +msgid "Company" +msgstr "" + +#. module: project +#: help:project.config.settings,module_project_timesheet:0 +msgid "" +"This allows you to transfer the entries under tasks defined for Project " +"Management to\n" +" the timesheet line entries for particular date and user, " +"with the effect of creating,\n" +" editing and deleting either ways.\n" +" This installs the module project_timesheet." +msgstr "" + +#. module: project +#: field:project.config.settings,module_project_issue:0 +msgid "Track issues and bugs" +msgstr "" + +#. module: project +#: field:project.config.settings,module_project_mrp:0 +msgid "Generate tasks from sale orders" +msgstr "" + +#. module: project +#: selection:project.task,priority:0 +msgid "Important" +msgstr "" + +#. module: project +#: model:process.node,note:project.process_node_drafttask0 +msgid "Define the Requirements and Set Planned Hours." +msgstr "" + +#. module: project +#: field:project.project,message_ids:0 +#: field:project.task,message_ids:0 +msgid "Messages" +msgstr "" + +#. module: project +#: field:project.project,color:0 +#: field:project.task,color:0 +msgid "Color Index" +msgstr "" + +#. module: project +#: model:ir.actions.act_window,name:project.open_board_project +#: model:ir.model,name:project.model_project_project +#: model:ir.ui.menu,name:project.menu_project_dashboard +#: model:ir.ui.menu,name:project.menu_project_management +#: view:project.project:0 +#: view:project.task:0 +#: field:project.task,project_id:0 +#: field:project.task.delegate,project_id:0 +#: field:project.task.history.cumulative,project_id:0 +#: view:report.project.task.user:0 +#: field:report.project.task.user,project_id:0 +#: model:res.request.link,name:project.req_link_project +msgid "Project" +msgstr "" + +#. module: project +#: selection:project.project,state:0 +#: selection:project.task,state:0 +#: selection:project.task.history,state:0 +#: selection:project.task.history.cumulative,state:0 +#: model:project.task.type,name:project.project_tt_cancel +#: selection:project.task.type,state:0 +#: selection:report.project.task.user,state:0 +msgid "Cancelled" +msgstr "" + +#. module: project +#: model:ir.actions.act_window,help:project.act_project_project_2_project_task_all +#: model:ir.actions.act_window,help:project.action_view_task +msgid "" +"

\n" +" Click to create a new task.\n" +"

\n" +" OpenERP's project management allows you to manage the " +"pipeline\n" +" of tasks in order to get things done efficiently. You can\n" +" track progress, discuss on tasks, attach documents, etc.\n" +"

\n" +" " +msgstr "" + +#. module: project +#: field:project.task,date_end:0 +#: field:report.project.task.user,date_end:0 +msgid "Ending Date" +msgstr "" + +#. module: project +#: field:project.task.type,state:0 +msgid "Related Status" +msgstr "" + +#. module: project +#: view:project.project:0 +msgid "Documents" +msgstr "" + +#. module: project +#: model:mail.message.subtype,description:project.mt_task_new +msgid "Task created" +msgstr "" + +#. module: project +#: view:report.project.task.user:0 +#: field:report.project.task.user,no_of_days:0 +msgid "# of Days" +msgstr "" + +#. module: project +#: field:project.project,message_follower_ids:0 +#: field:project.task,message_follower_ids:0 +msgid "Followers" +msgstr "" + +#. module: project +#: selection:project.project,state:0 +#: view:project.task:0 +#: selection:project.task,state:0 +#: selection:project.task.history,state:0 +#: selection:project.task.history.cumulative,state:0 +#: selection:project.task.type,state:0 +#: view:report.project.task.user:0 +msgid "New" +msgstr "" + +#. module: project +#: model:ir.actions.act_window,name:project.action_view_task_history_cumulative +#: model:ir.ui.menu,name:project.menu_action_view_task_history_cumulative +msgid "Cumulative Flow" +msgstr "" + +#. module: project +#: view:report.project.task.user:0 +#: field:report.project.task.user,hours_effective:0 +msgid "Effective Hours" +msgstr "" + +#. module: project +#: view:report.project.task.user:0 +msgid "OverPass delay" +msgstr "" + +#. module: project +#: view:project.task.delegate:0 +msgid "Validation Task" +msgstr "" + +#. module: project +#: field:project.config.settings,module_project_long_term:0 +msgid "Manage resources planning on gantt view" +msgstr "" + +#. module: project +#: view:project.task:0 +#: view:project.task.history.cumulative:0 +msgid "Unassigned Tasks" +msgstr "" + +#. module: project +#: help:project.project,planned_hours:0 +msgid "" +"Sum of planned hours of all tasks related to this project and its child " +"projects." +msgstr "" + +#. module: project +#: view:res.partner:0 +msgid "For changing to done state" +msgstr "" + +#. module: project +#: view:report.project.task.user:0 +msgid "My Task" +msgstr "" + +#. module: project +#: view:project.task:0 +#: view:project.task.history.cumulative:0 +#: view:report.project.task.user:0 +msgid "My Projects" +msgstr "" + +#. module: project +#: help:project.task,sequence:0 +msgid "Gives the sequence order when displaying a list of tasks." +msgstr "" + +#. module: project +#: field:project.task,date_start:0 +#: field:report.project.task.user,date_start:0 +msgid "Starting Date" +msgstr "" + +#. module: project +#: code:addons/project/project.py:398 +#: model:ir.actions.act_window,name:project.open_view_project_all +#: model:ir.ui.menu,name:project.menu_projects +#: view:project.project:0 +#: field:project.task.type,project_ids:0 +#: view:res.company:0 +#, python-format +msgid "Projects" +msgstr "" + +#. module: project +#: model:res.groups,name:project.group_tasks_work_on_tasks +msgid "Task's Work on Tasks" +msgstr "" + +#. module: project +#: help:project.task.delegate,name:0 +msgid "New title of the task delegated to the user" +msgstr "" + +#. module: project +#: model:ir.actions.act_window,name:project.action_project_task_user_tree +#: model:ir.ui.menu,name:project.menu_project_task_user_tree +#: view:report.project.task.user:0 +msgid "Tasks Analysis" +msgstr "" + +#. module: project +#: view:project.task:0 +#: view:project.task.history.cumulative:0 +msgid "Project Tasks" +msgstr "" + +#. module: project +#: field:account.analytic.account,use_tasks:0 +#: model:ir.actions.act_window,name:project.act_project_project_2_project_task_all +#: model:ir.actions.act_window,name:project.action_view_task +#: model:ir.ui.menu,name:project.menu_action_view_task +#: model:process.process,name:project.process_process_tasksprocess0 +#: view:project.project:0 +#: view:project.task:0 +#: view:res.partner:0 +#: field:res.partner,task_ids:0 +msgid "Tasks" +msgstr "" + +#. module: project +#: selection:report.project.task.user,month:0 +msgid "December" +msgstr "" + +#. module: project +#: view:project.config.settings:0 +#: view:project.task.delegate:0 +#: view:project.task.reevaluate:0 +msgid "or" +msgstr "" + +#. module: project +#: help:project.config.settings,module_project_mrp:0 +msgid "" +"This feature automatically creates project tasks from service products in " +"sale orders.\n" +" More precisely, tasks are created for procurement lines with " +"product of type 'Service',\n" +" procurement method 'Make to Order', and supply method " +"'Manufacture'.\n" +" This installs the module project_mrp." +msgstr "" + +#. module: project +#: help:project.task.delegate,planned_hours:0 +msgid "Estimated time to close this task by the delegated user" +msgstr "" + +#. module: project +#: model:project.category,name:project.project_category_03 +msgid "Experiment" +msgstr "" + +#. module: project +#: model:process.transition.action,name:project.process_transition_action_opendrafttask0 +#: selection:report.project.task.user,state:0 +msgid "Draft" +msgstr "" + +#. module: project +#: field:project.task,kanban_state:0 +#: field:project.task.history,kanban_state:0 +#: field:project.task.history.cumulative,kanban_state:0 +msgid "Kanban State" +msgstr "" + +#. module: project +#: field:project.config.settings,module_project_timesheet:0 +msgid "Record timesheet lines per tasks" +msgstr "" + +#. module: project +#: model:ir.model,name:project.model_report_project_task_user +msgid "Tasks by user and project" +msgstr "" + +#. module: project +#: field:res.company,project_time_mode_id:0 +msgid "Project Time Unit" +msgstr "" + +#. module: project +#: view:project.task:0 +#: selection:project.task,kanban_state:0 +#: selection:project.task.history,kanban_state:0 +#: selection:project.task.history.cumulative,kanban_state:0 +msgid "Normal" +msgstr "" + +#. module: project +#: view:report.project.task.user:0 +#: field:report.project.task.user,closing_days:0 +msgid "Days to Close" +msgstr "" + +#. module: project +#: model:res.groups,name:project.group_project_user +msgid "User" +msgstr "" + +#. module: project +#: help:project.project,alias_model:0 +msgid "" +"The kind of document created when an email is received on this project's " +"email alias" +msgstr "" + +#. module: project +#: model:ir.actions.act_window,name:project.action_config_settings +#: view:project.config.settings:0 +msgid "Configure Project" +msgstr "" + +#. module: project +#: view:project.task.history.cumulative:0 +msgid "Tasks's Cumulative Flow" +msgstr "" + +#. module: project +#: selection:report.project.task.user,month:0 +msgid "January" +msgstr "" + +#. module: project +#: field:project.task.delegate,prefix:0 +msgid "Your Task Title" +msgstr "" + +#. module: project +#: view:project.task.reevaluate:0 +msgid "Reevaluation Task" +msgstr "" + +#. module: project +#: code:addons/project/project.py:1318 +#, python-format +msgid "Please delete the project linked with this account first." +msgstr "" + +#. module: project +#: model:mail.message.subtype,name:project.mt_project_task_new +#: model:mail.message.subtype,name:project.mt_task_new +msgid "Task Created" +msgstr "" + +#. module: project +#: view:report.project.task.user:0 +msgid "Non Assigned Tasks to users" +msgstr "" + +#. module: project +#: view:project.project:0 +msgid "Projects in which I am a manager" +msgstr "" + +#. module: project +#: view:project.task:0 +#: selection:project.task,kanban_state:0 +#: selection:project.task.history,kanban_state:0 +#: selection:project.task.history.cumulative,kanban_state:0 +msgid "Ready for next stage" +msgstr "" + +#. module: project +#: field:project.task.type,case_default:0 +msgid "Default for New Projects" +msgstr "" + +#. module: project +#: view:project.task:0 +#: field:project.task,description:0 +#: field:project.task.type,description:0 +msgid "Description" +msgstr "" + +#. module: project +#: selection:report.project.task.user,month:0 +msgid "May" +msgstr "" + +#. module: project +#: help:project.task.type,case_default:0 +msgid "" +"If you check this field, this stage will be proposed by default on each new " +"project. It will not assign this stage to existing projects." +msgstr "" + +#. module: project +#: field:project.task,partner_id:0 +msgid "Customer" +msgstr "" + +#. module: project +#: selection:report.project.task.user,month:0 +msgid "February" +msgstr "" + +#. module: project +#: help:project.config.settings,module_project_long_term:0 +msgid "" +"A long term project management module that tracks planning, scheduling, and " +"resource allocation.\n" +" This installs the module project_long_term." +msgstr "" + +#. module: project +#: model:mail.message.subtype,description:project.mt_task_closed +msgid "Task closed" +msgstr "" + +#. module: project +#: selection:report.project.task.user,month:0 +msgid "April" +msgstr "" + +#. module: project +#: view:project.task:0 +msgid "Spent Hours" +msgstr "" + +#. module: project +#: help:project.project,sequence:0 +msgid "Gives the sequence order when displaying a list of Projects." +msgstr "" + +#. module: project +#: model:ir.actions.act_window,name:project.act_res_users_2_project_task_opened +msgid "Assigned Tasks" +msgstr "" + +#. module: project +#: help:project.config.settings,module_project_issue_sheet:0 +msgid "" +"Provides timesheet support for the issues/bugs management in project.\n" +" This installs the module project_issue_sheet." +msgstr "" + +#. module: project +#: selection:project.project,privacy_visibility:0 +msgid "Followers Only" +msgstr "" + +#. module: project +#: view:board.board:0 +#: field:project.project,task_count:0 +msgid "Open Tasks" +msgstr "" + +#. module: project +#: field:project.project,priority:0 +#: field:project.project,sequence:0 +#: field:project.task,sequence:0 +#: field:project.task.type,sequence:0 +msgid "Sequence" +msgstr "" + +#. module: project +#: view:project.task:0 +#: view:project.task.work:0 +msgid "Task Work" +msgstr "" + +#. module: project +#: help:project.task.delegate,planned_hours_me:0 +msgid "" +"Estimated time for you to validate the work done by the user to whom you " +"delegate this task" +msgstr "" + +#. module: project +#: view:report.project.task.user:0 +#: field:report.project.task.user,year:0 +msgid "Year" +msgstr "" + +#. module: project +#: field:project.project,type_ids:0 +#: view:project.task.type:0 +msgid "Tasks Stages" +msgstr "" diff --git a/addons/warning/i18n/th.po b/addons/warning/i18n/th.po new file mode 100644 index 00000000000..a790bcd9700 --- /dev/null +++ b/addons/warning/i18n/th.po @@ -0,0 +1,215 @@ +# Thai translation for openobject-addons +# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013 +# This file is distributed under the same license as the openobject-addons package. +# FIRST AUTHOR , 2013. +# +msgid "" +msgstr "" +"Project-Id-Version: openobject-addons\n" +"Report-Msgid-Bugs-To: FULL NAME \n" +"POT-Creation-Date: 2013-03-07 08:39+0000\n" +"PO-Revision-Date: 2013-05-15 07:12+0000\n" +"Last-Translator: FULL NAME \n" +"Language-Team: Thai \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2013-05-16 05:55+0000\n" +"X-Generator: Launchpad (build 16626)\n" + +#. module: warning +#: model:ir.model,name:warning.model_purchase_order_line +#: field:product.product,purchase_line_warn:0 +msgid "Purchase Order Line" +msgstr "" + +#. module: warning +#: model:ir.model,name:warning.model_stock_picking_in +msgid "Incoming Shipments" +msgstr "" + +#. module: warning +#: field:product.product,purchase_line_warn_msg:0 +msgid "Message for Purchase Order Line" +msgstr "" + +#. module: warning +#: model:ir.model,name:warning.model_stock_picking +msgid "Picking List" +msgstr "" + +#. module: warning +#: view:product.product:0 +msgid "Warning when Purchasing this Product" +msgstr "" + +#. module: warning +#: model:ir.model,name:warning.model_product_product +msgid "Product" +msgstr "" + +#. module: warning +#: view:product.product:0 +#: view:res.partner:0 +msgid "Warnings" +msgstr "" + +#. module: warning +#: selection:product.product,purchase_line_warn:0 +#: selection:product.product,sale_line_warn:0 +#: selection:res.partner,invoice_warn:0 +#: selection:res.partner,picking_warn:0 +#: selection:res.partner,purchase_warn:0 +#: selection:res.partner,sale_warn:0 +msgid "Blocking Message" +msgstr "" + +#. module: warning +#: view:res.partner:0 +msgid "Warning on the Invoice" +msgstr "" + +#. module: warning +#: selection:product.product,purchase_line_warn:0 +#: selection:product.product,sale_line_warn:0 +#: selection:res.partner,invoice_warn:0 +#: selection:res.partner,picking_warn:0 +#: selection:res.partner,purchase_warn:0 +#: selection:res.partner,sale_warn:0 +msgid "No Message" +msgstr "" + +#. module: warning +#: model:ir.model,name:warning.model_account_invoice +#: field:res.partner,invoice_warn:0 +msgid "Invoice" +msgstr "" + +#. module: warning +#: view:product.product:0 +msgid "Warning when Selling this Product" +msgstr "" + +#. module: warning +#: field:res.partner,picking_warn:0 +msgid "Stock Picking" +msgstr "" + +#. module: warning +#: model:ir.model,name:warning.model_purchase_order +#: field:res.partner,purchase_warn:0 +msgid "Purchase Order" +msgstr "" + +#. module: warning +#: field:res.partner,purchase_warn_msg:0 +msgid "Message for Purchase Order" +msgstr "" + +#. module: warning +#: code:addons/warning/warning.py:32 +#: help:product.product,purchase_line_warn:0 +#: help:product.product,sale_line_warn:0 +#: help:res.partner,invoice_warn:0 +#: help:res.partner,picking_warn:0 +#: help:res.partner,purchase_warn:0 +#: help:res.partner,sale_warn:0 +#, python-format +msgid "" +"Selecting the \"Warning\" option will notify user with the message, " +"Selecting \"Blocking Message\" will throw an exception with the message and " +"block the flow. The Message has to be written in the next field." +msgstr "" + +#. module: warning +#: code:addons/warning/warning.py:67 +#: code:addons/warning/warning.py:96 +#: code:addons/warning/warning.py:130 +#: code:addons/warning/warning.py:162 +#: code:addons/warning/warning.py:192 +#: code:addons/warning/warning.py:218 +#: code:addons/warning/warning.py:266 +#: code:addons/warning/warning.py:299 +#, python-format +msgid "Alert for %s !" +msgstr "" + +#. module: warning +#: view:res.partner:0 +msgid "Warning on the Sales Order" +msgstr "" + +#. module: warning +#: field:res.partner,invoice_warn_msg:0 +msgid "Message for Invoice" +msgstr "" + +#. module: warning +#: field:res.partner,sale_warn_msg:0 +msgid "Message for Sales Order" +msgstr "" + +#. module: warning +#: view:res.partner:0 +msgid "Warning on the Picking" +msgstr "" + +#. module: warning +#: view:res.partner:0 +msgid "Warning on the Purchase Order" +msgstr "" + +#. module: warning +#: code:addons/warning/warning.py:68 +#: code:addons/warning/warning.py:97 +#: code:addons/warning/warning.py:132 +#: code:addons/warning/warning.py:163 +#: code:addons/warning/warning.py:193 +#: code:addons/warning/warning.py:219 +#: code:addons/warning/warning.py:267 +#: code:addons/warning/warning.py:300 +#, python-format +msgid "Warning for %s" +msgstr "" + +#. module: warning +#: field:product.product,sale_line_warn_msg:0 +msgid "Message for Sales Order Line" +msgstr "" + +#. module: warning +#: selection:product.product,purchase_line_warn:0 +#: selection:product.product,sale_line_warn:0 +#: selection:res.partner,invoice_warn:0 +#: selection:res.partner,picking_warn:0 +#: selection:res.partner,purchase_warn:0 +#: selection:res.partner,sale_warn:0 +msgid "Warning" +msgstr "" + +#. module: warning +#: field:res.partner,picking_warn_msg:0 +msgid "Message for Stock Picking" +msgstr "" + +#. module: warning +#: model:ir.model,name:warning.model_res_partner +msgid "Partner" +msgstr "" + +#. module: warning +#: model:ir.model,name:warning.model_sale_order +#: field:res.partner,sale_warn:0 +msgid "Sales Order" +msgstr "" + +#. module: warning +#: model:ir.model,name:warning.model_stock_picking_out +msgid "Delivery Orders" +msgstr "" + +#. module: warning +#: model:ir.model,name:warning.model_sale_order_line +#: field:product.product,sale_line_warn:0 +msgid "Sales Order Line" +msgstr "" From 5ceb9a84daf9af1bee2982ba78a02b051ab24b21 Mon Sep 17 00:00:00 2001 From: "Quentin (OpenERP)" Date: Thu, 16 May 2013 10:52:54 +0200 Subject: [PATCH 54/74] [FIX] account: validation of an invoice from another company was not allowed because of default value of company_id field on account.move lp bug: https://launchpad.net/bugs/810548 fixed bzr revid: qdp-launchpad@openerp.com-20130516085254-it0ff5oqlnodt5mm --- addons/account/account_invoice.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/addons/account/account_invoice.py b/addons/account/account_invoice.py index 2d09753e584..09b18da6e31 100644 --- a/addons/account/account_invoice.py +++ b/addons/account/account_invoice.py @@ -980,7 +980,8 @@ class account_invoice(osv.osv): 'line_id': line, 'journal_id': journal_id, 'date': date, - 'narration':inv.comment + 'narration': inv.comment, + 'company_id': inv.company_id.id, } period_id = inv.period_id and inv.period_id.id or False ctx.update(company_id=inv.company_id.id, From 231103feebb4d233e26abbc8b3019c923b8a5ae3 Mon Sep 17 00:00:00 2001 From: Cedric Snauwaert Date: Thu, 16 May 2013 12:16:16 +0200 Subject: [PATCH 55/74] [FIX]project: show tasks of project that are in template state when clicking on the show task button from the project. bzr revid: csn@openerp.com-20130516101616-g4unvwc2e1dxb5dc --- addons/project/project.py | 3 ++- addons/project/project_view.xml | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/addons/project/project.py b/addons/project/project.py index a5e540c8be7..0e86ed1399d 100644 --- a/addons/project/project.py +++ b/addons/project/project.py @@ -199,7 +199,8 @@ class project(osv.osv): def _task_count(self, cr, uid, ids, field_name, arg, context=None): res = dict.fromkeys(ids, 0) - task_ids = self.pool.get('project.task').search(cr, uid, [('project_id', 'in', ids)]) + context['active_test'] = False + task_ids = self.pool.get('project.task').search(cr, uid, [('project_id', 'in', ids)], context=context) for task in self.pool.get('project.task').browse(cr, uid, task_ids, context): res[task.project_id.id] += 1 return res diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml index f0092a1dd33..85e8d513b42 100644 --- a/addons/project/project_view.xml +++ b/addons/project/project_view.xml @@ -50,7 +50,7 @@ Tasks project.task kanban,tree,form,calendar,gantt,graph - {'search_default_project_id': [active_id], 'default_project_id': active_id} + {'search_default_project_id': [active_id], 'default_project_id': active_id, 'active_test': False}

From 4bb3995680cf8f43e2496c9526f5b6e909ffe97b Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Thu, 16 May 2013 13:03:35 +0200 Subject: [PATCH 56/74] [IMP] replace literal values by symbolic ones for node types dispatching bzr revid: xmo@openerp.com-20130516110335-dk803tjn1qpqd0ro --- addons/web/static/src/js/coresetup.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/addons/web/static/src/js/coresetup.js b/addons/web/static/src/js/coresetup.js index fd1ace312a9..6fc837333b6 100644 --- a/addons/web/static/src/js/coresetup.js +++ b/addons/web/static/src/js/coresetup.js @@ -555,8 +555,8 @@ instance.web.qweb.default_dict = { instance.web.qweb.preprocess_node = function() { // Note that 'this' is the Qweb Node switch (this.node.nodeType) { - case 3: - case 4: + case Node.TEXT_NODE: + case Node.CDATA_SECTION_NODE: // Text and CDATAs var translation = this.node.parentNode.attributes['t-translation']; if (translation && translation.value === 'off') { @@ -567,7 +567,7 @@ instance.web.qweb.preprocess_node = function() { this.node.data = match[1] + instance.web._t(match[2]) + match[3]; } break; - case 1: + case Node.ELEMENT_NODE: // Element var attr, attrs = ['label', 'title', 'alt', 'placeholder']; while (attr = attrs.pop()) { From 54ef169ce31df13a274168c21320f893b907dca9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Thu, 16 May 2013 14:02:27 +0200 Subject: [PATCH 57/74] [FIX] mail_alias, hr_job: when migrating to aliases, allow to have aliases creating records from a different model than the parent model; for example hr_job create hr_applicant records. bzr revid: tde@openerp.com-20130516120227-z819lxy30mghc1hv --- addons/hr_recruitment/hr_recruitment.py | 7 +++++-- addons/mail/mail_alias.py | 14 ++++++++------ 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/addons/hr_recruitment/hr_recruitment.py b/addons/hr_recruitment/hr_recruitment.py index c2ee322bda9..daca2188a2b 100644 --- a/addons/hr_recruitment/hr_recruitment.py +++ b/addons/hr_recruitment/hr_recruitment.py @@ -503,8 +503,11 @@ class hr_job(osv.osv): def _auto_init(self, cr, context=None): """Installation hook to create aliases for all jobs and avoid constraint errors.""" - self.pool.get('mail.alias').migrate_to_alias(cr, self._name, self._table, super(hr_job,self)._auto_init, - self._columns['alias_id'], 'name', alias_prefix='job+', alias_defaults={'job_id': 'id'}, context=context) + if context is None: + context = {} + alias_context = dict(context, alias_model_name='hr.applicant') + self.pool.get('mail.alias').migrate_to_alias(cr, self._name, self._table, super(hr_job, self)._auto_init, + self._columns['alias_id'], 'name', alias_prefix='job+', alias_defaults={'job_id': 'id'}, context=alias_context) def create(self, cr, uid, vals, context=None): mail_alias = self.pool.get('mail.alias') diff --git a/addons/mail/mail_alias.py b/addons/mail/mail_alias.py index d5e3b675b56..987ac32c76c 100644 --- a/addons/mail/mail_alias.py +++ b/addons/mail/mail_alias.py @@ -134,7 +134,7 @@ class mail_alias(osv.Model): return new_name def migrate_to_alias(self, cr, child_model_name, child_table_name, child_model_auto_init_fct, - alias_id_column, alias_key, alias_prefix = '', alias_force_key = '', alias_defaults = {}, context=None): + alias_id_column, alias_key, alias_prefix='', alias_force_key='', alias_defaults={}, context=None): """ Installation hook to create aliases for all users and avoid constraint errors. :param child_model_name: model name of the child class (i.e. res.users) @@ -149,8 +149,10 @@ class mail_alias(osv.Model): :param alias_defaults: dict, keys = mail.alias columns, values = child model column name used for default values (i.e. {'job_id': 'id'}) """ + if context is None: + context = {} - # disable the unique alias_id not null constraint, to avoid spurious warning during + # disable the unique alias_id not null constraint, to avoid spurious warning during # super.auto_init. We'll reinstall it afterwards. alias_id_column.required = False @@ -160,14 +162,14 @@ class mail_alias(osv.Model): registry = RegistryManager.get(cr.dbname) mail_alias = registry.get('mail.alias') child_class_model = registry.get(child_model_name) - no_alias_ids = child_class_model.search(cr, SUPERUSER_ID, [('alias_id', '=', False)], context={'active_test':False}) + no_alias_ids = child_class_model.search(cr, SUPERUSER_ID, [('alias_id', '=', False)], context={'active_test': False}) # Use read() not browse(), to avoid prefetching uninitialized inherited fields for obj_data in child_class_model.read(cr, SUPERUSER_ID, no_alias_ids, [alias_key]): - alias_vals = {'alias_name': '%s%s' % (alias_prefix, obj_data[alias_key]) } + alias_vals = {'alias_name': '%s%s' % (alias_prefix, obj_data[alias_key])} if alias_force_key: alias_vals['alias_force_thread_id'] = obj_data[alias_force_key] - alias_vals['alias_defaults'] = dict( (k, obj_data[v]) for k, v in alias_defaults.iteritems()) - alias_id = mail_alias.create_unique_alias(cr, SUPERUSER_ID, alias_vals, model_name=child_model_name) + alias_vals['alias_defaults'] = dict((k, obj_data[v]) for k, v in alias_defaults.iteritems()) + alias_id = mail_alias.create_unique_alias(cr, SUPERUSER_ID, alias_vals, model_name=context.get('alias_model_name', child_model_name)) child_class_model.write(cr, SUPERUSER_ID, obj_data['id'], {'alias_id': alias_id}) _logger.info('Mail alias created for %s %s (uid %s)', child_model_name, obj_data[alias_key], obj_data['id']) From 655e36bc5047173740493d4ae69681553c1ca9f9 Mon Sep 17 00:00:00 2001 From: Cedric Snauwaert Date: Thu, 16 May 2013 17:12:55 +0200 Subject: [PATCH 58/74] [FIX]sale_crm: when validating a SO with a sale team associated, information was not in associated invoice. bzr revid: csn@openerp.com-20130516151255-azu6a3x6les0tzu6 --- addons/sale_crm/sale_crm.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/addons/sale_crm/sale_crm.py b/addons/sale_crm/sale_crm.py index c6aad296d76..3e3c445e474 100644 --- a/addons/sale_crm/sale_crm.py +++ b/addons/sale_crm/sale_crm.py @@ -29,6 +29,12 @@ class sale_order(osv.osv): domain="['|',('section_id','=',section_id),('section_id','=',False), ('object_id.model', '=', 'crm.lead')]") } + def _prepare_invoice(self, cr, uid, order, lines, context=None): + invoice_vals = super(sale_order, self)._prepare_invoice(cr, uid, order, lines, context=context) + if order.section_id and order.section_id.id: + invoice_vals['section_id'] = order.section_id.id + return invoice_vals + class res_users(osv.Model): _inherit = 'res.users' From f97439e0cebbd7ef5178ec53a9662b76a43528e0 Mon Sep 17 00:00:00 2001 From: Olivier Dony Date: Thu, 16 May 2013 18:19:49 +0200 Subject: [PATCH 59/74] [FIX] portal_hr_employee: use dedicated employee kanban view, avoids leaking undesired employee information in case parent view is inherited lp bug: https://launchpad.net/bugs/1179349 fixed bzr revid: odo@openerp.com-20130516161949-0wvysc20f9m1vn63 --- .../portal_hr_employees/hr_employee_view.xml | 32 ++++++++++++++++--- 1 file changed, 28 insertions(+), 4 deletions(-) diff --git a/addons/portal_hr_employees/hr_employee_view.xml b/addons/portal_hr_employees/hr_employee_view.xml index a3182cd5b1c..ace0daaff87 100644 --- a/addons/portal_hr_employees/hr_employee_view.xml +++ b/addons/portal_hr_employees/hr_employee_view.xml @@ -35,11 +35,35 @@ HR - Employess Kanban hr.employee - - - - + + + + +

+
+ +
+
+

+ +

+
    +
    • +
    • +
  • Tel:
    • +
  • Mobile:
    • +
    • +
    • +
+
+
+ + + + From 3a7a4f7d5e908e5d099e5f1da07ca179c4859359 Mon Sep 17 00:00:00 2001 From: Paramjit Singh Sahota Date: Fri, 17 May 2013 11:31:33 +0530 Subject: [PATCH 60/74] [IMP] Removed 'cursor on '.openerp .oe_searchview .oe_searchview_drawer .oe_searchview_advanced li' and then added 'cursor:default' on '.openerp .oe_searchview .oe_searchview_drawer'. bzr revid: psa@tinyerp.com-20130517060133-zw7zpuvxhc459s5e --- addons/web/static/src/css/base.css | 6 +----- addons/web/static/src/css/base.sass | 6 +----- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 66997040bde..4c1a9ff65bd 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -1812,6 +1812,7 @@ display: block; } .openerp .oe_searchview .oe_searchview_drawer { + cursor: default; position: absolute; z-index: 2; margin-top: 4px; @@ -1958,7 +1959,6 @@ padding: 0; } .openerp .oe_searchview .oe_searchview_drawer .oe_searchview_advanced li { - cursor: pointer; position: relative; list-style: none; margin: 0; @@ -1970,10 +1970,6 @@ .openerp .oe_searchview .oe_searchview_drawer .oe_searchview_advanced .searchview_extended_prop_or { opacity: 0.5; margin-left: -14px; - cursor: cell; - position: absolute; - width: 16px; - top: 5px; } .openerp .oe_searchview .oe_searchview_drawer .oe_opened h4:before { content: "▾ "; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 3f4f3e58bbe..88566b02d38 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1441,6 +1441,7 @@ $sheet-padding: 16px display: block .oe_searchview_drawer + cursor: default position: absolute z-index: 2 // detach drawer from field slightly @@ -1554,7 +1555,6 @@ $sheet-padding: 16px list-style: none padding: 0 li - cursor: pointer position: relative list-style: none margin: 0 @@ -1564,10 +1564,6 @@ $sheet-padding: 16px .searchview_extended_prop_or opacity: 0.5 margin-left: -14px - cursor: cell - position: absolute - width: 16px - top: 5px .oe_opened h4:before content: "▾ " From 8bdccc5cd26cea8a6b180b8953414cc4f55e1ff8 Mon Sep 17 00:00:00 2001 From: Alexandre Fayolle Date: Fri, 17 May 2013 09:35:16 +0200 Subject: [PATCH 61/74] [FIX] work around bug preventing to validate invoices in multicompany setting lp bug: https://launchpad.net/bugs/1111298 fixed bzr revid: alexandre.fayolle@camptocamp.com-20130517073516-yko5zp0j8zlopq2d --- addons/account/account_invoice.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/addons/account/account_invoice.py b/addons/account/account_invoice.py index 09b18da6e31..79ee5b3fe88 100644 --- a/addons/account/account_invoice.py +++ b/addons/account/account_invoice.py @@ -764,6 +764,8 @@ class account_invoice(osv.osv): return move_lines def check_tax_lines(self, cr, uid, inv, compute_taxes, ait_obj): + # work around bug lp:1111298 : problem in multicompany setting when accessing inv.company_id.currency_id + company_currency = self.pool['res.company'].browse(cr, uid, inv.company_id.id).currency_id if not inv.tax_line: for tax in compute_taxes.values(): ait_obj.create(cr, uid, tax) @@ -777,7 +779,7 @@ class account_invoice(osv.osv): if not key in compute_taxes: raise osv.except_osv(_('Warning!'), _('Global taxes defined, but they are not in invoice lines !')) base = compute_taxes[key]['base'] - if abs(base - tax.base) > inv.company_id.currency_id.rounding: + if abs(base - tax.base) > company_currency.rounding: raise osv.except_osv(_('Warning!'), _('Tax base different!\nClick on compute to update the tax base.')) for key in compute_taxes: if not key in tax_key: @@ -864,7 +866,8 @@ class account_invoice(osv.osv): ctx.update({'lang': inv.partner_id.lang}) if not inv.date_invoice: self.write(cr, uid, [inv.id], {'date_invoice': fields.date.context_today(self,cr,uid,context=context)}, context=ctx) - company_currency = inv.company_id.currency_id.id + # work around bug lp:1111298 : problem in multicompany setting when accessing inv.company_id.currency_id + company_currency = self.pool['res.company'].browse(cr, uid, inv.company_id.id).currency_id.id # create the analytical lines # one move line per invoice line iml = self._get_analytic_lines(cr, uid, inv.id, context=ctx) From b0ee634dec85e2513430b567559e52b9e4d60026 Mon Sep 17 00:00:00 2001 From: Alexandre Fayolle Date: Fri, 17 May 2013 10:00:31 +0200 Subject: [PATCH 62/74] [FIX] some missed access to currency_id through company_id bzr revid: alexandre.fayolle@camptocamp.com-20130517080031-7j72snb9mdv91cto --- addons/account/account_invoice.py | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/addons/account/account_invoice.py b/addons/account/account_invoice.py index 79ee5b3fe88..057947205f0 100644 --- a/addons/account/account_invoice.py +++ b/addons/account/account_invoice.py @@ -717,7 +717,7 @@ class account_invoice(osv.osv): inv = self.browse(cr, uid, id) cur_obj = self.pool.get('res.currency') - company_currency = inv.company_id.currency_id.id + company_currency = self.pool['res.company'].browse(cr, uid, inv.company_id.id).currency_id.id if inv.type in ('out_invoice', 'in_refund'): sign = 1 else: @@ -764,7 +764,6 @@ class account_invoice(osv.osv): return move_lines def check_tax_lines(self, cr, uid, inv, compute_taxes, ait_obj): - # work around bug lp:1111298 : problem in multicompany setting when accessing inv.company_id.currency_id company_currency = self.pool['res.company'].browse(cr, uid, inv.company_id.id).currency_id if not inv.tax_line: for tax in compute_taxes.values(): @@ -866,7 +865,6 @@ class account_invoice(osv.osv): ctx.update({'lang': inv.partner_id.lang}) if not inv.date_invoice: self.write(cr, uid, [inv.id], {'date_invoice': fields.date.context_today(self,cr,uid,context=context)}, context=ctx) - # work around bug lp:1111298 : problem in multicompany setting when accessing inv.company_id.currency_id company_currency = self.pool['res.company'].browse(cr, uid, inv.company_id.id).currency_id.id # create the analytical lines # one move line per invoice line @@ -1517,8 +1515,7 @@ class account_invoice_line(osv.osv): if context is None: context = {} inv = self.pool.get('account.invoice').browse(cr, uid, invoice_id, context=context) - company_currency = inv.company_id.currency_id.id - + company_currency = self.pool['res.company'].browse(cr, uid, inv.company_id.id).currency_id.id for line in inv.invoice_line: mres = self.move_line_get_item(cr, uid, line, context) if not mres: @@ -1663,8 +1660,7 @@ class account_invoice_tax(osv.osv): cur_obj = self.pool.get('res.currency') inv = self.pool.get('account.invoice').browse(cr, uid, invoice_id, context=context) cur = inv.currency_id - company_currency = inv.company_id.currency_id.id - + company_currency = self.pool['res.company'].browse(cr, uid, inv.company_id.id).currency_id.id for line in inv.invoice_line: for tax in tax_obj.compute_all(cr, uid, line.invoice_line_tax_id, (line.price_unit* (1-(line.discount or 0.0)/100.0)), line.quantity, line.product_id, inv.partner_id)['taxes']: val={} From 3d9c8b0513627cfa516e46e06907a11b4a19965e Mon Sep 17 00:00:00 2001 From: "cbi@openerp.my.openerp.com" <> Date: Fri, 17 May 2013 10:02:46 +0200 Subject: [PATCH 63/74] [FIX] missing multi company currency access rules, set currency.company_id to False by default lp bug: https://launchpad.net/bugs/1111298 fixed bzr revid: alexandre.fayolle@camptocamp.com-20130517080246-k23d8hd0ks36cr5l --- openerp/addons/base/res/res_currency.py | 1 + openerp/addons/base/security/base_security.xml | 8 ++++++++ 2 files changed, 9 insertions(+) diff --git a/openerp/addons/base/res/res_currency.py b/openerp/addons/base/res/res_currency.py index 98dd6ed00d8..4756cdbe01a 100644 --- a/openerp/addons/base/res/res_currency.py +++ b/openerp/addons/base/res/res_currency.py @@ -73,6 +73,7 @@ class res_currency(osv.osv): 'position' : 'after', 'rounding': 0.01, 'accuracy': 4, + 'company_id': False, } _sql_constraints = [ # this constraint does not cover all cases due to SQL NULL handling for company_id, diff --git a/openerp/addons/base/security/base_security.xml b/openerp/addons/base/security/base_security.xml index b0de06078af..6bddd57d4b3 100644 --- a/openerp/addons/base/security/base_security.xml +++ b/openerp/addons/base/security/base_security.xml @@ -87,6 +87,14 @@ ['|','|',('company_id.child_ids','child_of',[user.company_id.id]),('company_id','child_of',[user.company_id.id]),('company_id','=',False)] + + + currency rule + + + ['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])] + + From 89efc89651c2cb00242c6699a75d403bcb643598 Mon Sep 17 00:00:00 2001 From: Alexandre Fayolle Date: Fri, 17 May 2013 10:03:19 +0200 Subject: [PATCH 64/74] [FIX] remove company_id from currencies in currency_data.xml lp bug: https://launchpad.net/bugs/1111298 fixed bzr revid: alexandre.fayolle@camptocamp.com-20130517080319-ct4j81mc01dr1e2v --- openerp/addons/base/currency_data.xml | 174 -------------------------- 1 file changed, 174 deletions(-) diff --git a/openerp/addons/base/currency_data.xml b/openerp/addons/base/currency_data.xml index 7173b8492ab..96ff81cc0d1 100644 --- a/openerp/addons/base/currency_data.xml +++ b/openerp/addons/base/currency_data.xml @@ -9,7 +9,6 @@ 0.01 4 before - 1.2834 @@ -23,7 +22,6 @@ Bs.F 0.0001 4 - 5.864 @@ -36,7 +34,6 @@ $ 0.01 4 - 1.3388 @@ -50,7 +47,6 @@ CHF 0.01 4 - 1.3086 @@ -63,7 +59,6 @@ R$ 0.01 4 - 2.2344 @@ -76,7 +71,6 @@ ¥ 0.01 4 - 8.7556 @@ -90,7 +84,6 @@ $ 0.01 4 - 2933.8378 @@ -103,7 +96,6 @@ Kč 0.01 4 - 26.5634 @@ -116,7 +108,6 @@ kr 0.01 4 - 7.4445 @@ -130,7 +121,6 @@ Ft 0.01 4 - 271.5621 @@ -143,7 +133,6 @@ Rp 0.01 4 - 14352.00 @@ -161,7 +150,6 @@ Ls 0.01 4 - 0.7086 @@ -174,7 +162,6 @@ kr 0.01 4 - 7.8668 @@ -187,7 +174,6 @@ XPF 1.00 4 - 119.331742 @@ -200,7 +186,6 @@ B/. 0.01 4 - 1.2676 @@ -213,7 +198,6 @@ zł 0.01 4 - 4.1005 @@ -226,7 +210,6 @@ kr 0.01 4 - 10.3004 @@ -239,7 +222,6 @@ $ 0.01 4 - 5.0881 @@ -252,7 +234,6 @@ ₹ 0.01 4 - 59.9739 @@ -265,7 +246,6 @@ $ 0.01 4 - 1.4070 @@ -278,7 +258,6 @@ ₴ 0.01 4 - 10.1969 @@ -291,7 +270,6 @@ ₫ 0.01 4 - 26330.01 @@ -304,7 +282,6 @@ $ 0.01 4 - 11.1608 @@ -317,7 +294,6 @@ ¥ 0.01 4 - 133.62 @@ -330,7 +306,6 @@ лв 0.01 4 - 1.9558 @@ -343,7 +318,6 @@ Lt 0.01 4 - 3.4528 @@ -356,7 +330,6 @@ lei 0.01 4 - 4.2253 @@ -369,7 +342,6 @@ kn 0.01 4 - 7.2936 @@ -382,7 +354,6 @@ руб 0.01 4 - 43.16 @@ -395,7 +366,6 @@ TL 0.01 4 - 2.1411 @@ -408,7 +378,6 @@ ₩ 0.01 4 - 1662.37 @@ -421,7 +390,6 @@ $ 0.01 4 - 18.6664 @@ -434,7 +402,6 @@ RM 0.01 4 - 4.8887 @@ -447,7 +414,6 @@ $ 0.01 4 - 1.9764 @@ -460,7 +426,6 @@ Php 0.01 4 - 66.1 @@ -473,7 +438,6 @@ $ 0.01 4 - 2.0126 @@ -486,7 +450,6 @@ R 0.01 4 - 10.5618 @@ -515,7 +478,6 @@ Rs 0.01 4 - 40.28 @@ -528,7 +490,6 @@ CFA 1 4 - 655.957 @@ -541,7 +502,6 @@ FCFA 1 4 - 655.957 @@ -554,7 +514,6 @@ USh 1 4 - 3401.91388 @@ -567,7 +526,6 @@ L 0.01 4 - 25 @@ -580,7 +538,6 @@ $ 0.01 4 - 710 @@ -593,7 +550,6 @@ $ 0.01 4 - @@ -606,7 +562,6 @@ Afs 0.01 4 - @@ -619,7 +574,6 @@ Kz 0.01 4 - @@ -632,7 +586,6 @@ $ 0.01 4 - @@ -645,7 +598,6 @@ դր. 0.01 4 - @@ -658,7 +610,6 @@ Afl. 0.01 4 - @@ -671,7 +622,6 @@ m 0.01 4 - @@ -684,7 +634,6 @@ B$ 0.01 4 - @@ -697,7 +646,6 @@ BD 0.01 4 - @@ -710,7 +658,6 @@ ৳ 0.01 4 - @@ -723,7 +670,6 @@ Bds$ 0.01 4 - @@ -736,7 +682,6 @@ BR 0.01 4 - @@ -749,7 +694,6 @@ BZ$ 0.01 4 - @@ -762,7 +706,6 @@ BD$ 0.01 4 - @@ -775,7 +718,6 @@ Nu. 0.01 4 - @@ -788,7 +730,6 @@ Bs. 0.01 4 - @@ -801,7 +742,6 @@ KM 0.01 4 - @@ -814,7 +754,6 @@ P 0.01 4 - @@ -827,7 +766,6 @@ FBu 0.01 4 - @@ -840,7 +778,6 @@ ៛ 0.01 4 - @@ -853,7 +790,6 @@ $ 0.01 4 - @@ -866,7 +802,6 @@ CF 0.01 4 - @@ -879,7 +814,6 @@ Fr 0.01 4 - @@ -892,7 +826,6 @@ $ 0.01 4 - @@ -905,7 +838,6 @@ ƒ 0.01 4 - @@ -918,7 +850,6 @@ £ 0.01 4 - @@ -931,7 +862,6 @@ Fdj 0.01 4 - @@ -944,7 +874,6 @@ RD$ 0.01 4 - @@ -957,7 +886,6 @@ TPE 0.01 4 - @@ -970,7 +898,6 @@ S/. 0.01 4 - @@ -983,7 +910,6 @@ E£ 0.01 4 - @@ -996,7 +922,6 @@ ¢ 0.01 4 - @@ -1009,7 +934,6 @@ Nfk 0.01 4 - @@ -1022,7 +946,6 @@ kr 0.01 4 - @@ -1035,7 +958,6 @@ Br 0.01 4 - @@ -1048,7 +970,6 @@ £ 0.01 4 - @@ -1061,7 +982,6 @@ FJ$ 0.01 4 - @@ -1074,7 +994,6 @@ ლ 0.01 4 - @@ -1087,7 +1006,6 @@ £ 0.01 4 - @@ -1100,7 +1018,6 @@ Q 0.01 4 - @@ -1113,7 +1030,6 @@ FG 0.01 4 - @@ -1125,7 +1041,6 @@ GWP 0.01 4 - @@ -1138,7 +1053,6 @@ $ 0.01 4 - @@ -1151,7 +1065,6 @@ G 0.01 4 - @@ -1164,7 +1077,6 @@ kr 0.01 4 - @@ -1177,7 +1089,6 @@ ﷼ 0.01 4 - @@ -1190,7 +1101,6 @@ ع.د 0.01 4 - @@ -1203,7 +1113,6 @@ ₪ 0.01 4 - @@ -1216,7 +1125,6 @@ $ 0.01 4 - @@ -1229,7 +1137,6 @@ د.ا 0.01 4 - @@ -1242,7 +1149,6 @@ лв 0.01 4 - @@ -1255,7 +1161,6 @@ KSh 0.01 4 - @@ -1268,7 +1173,6 @@ د.ك 0.01 4 - @@ -1281,7 +1185,6 @@ лв 0.01 4 - @@ -1294,7 +1197,6 @@ ₭ 0.01 4 - @@ -1307,7 +1209,6 @@ ل.ل 0.01 4 - @@ -1320,7 +1221,6 @@ L 0.01 4 - @@ -1333,7 +1233,6 @@ L$ 0.01 4 - @@ -1346,7 +1245,6 @@ ل.د 0.01 4 - @@ -1359,7 +1257,6 @@ MOP$ 0.01 4 - @@ -1372,7 +1269,6 @@ ден 0.01 4 - @@ -1385,7 +1281,6 @@ Ar 0.01 4 - @@ -1398,7 +1293,6 @@ MK 0.01 4 - @@ -1411,7 +1305,6 @@ .ރ 0.01 4 - @@ -1424,7 +1317,6 @@ UM 0.01 4 - @@ -1437,7 +1329,6 @@ L 0.01 4 - @@ -1450,7 +1341,6 @@ ₮ 0.01 4 - @@ -1463,7 +1353,6 @@ د.م. 0.01 4 - @@ -1476,7 +1365,6 @@ $ 0.01 4 - @@ -1489,7 +1377,6 @@ DZ 0.01 4 - @@ -1502,7 +1389,6 @@ GH¢ 0.01 4 - @@ -1515,7 +1401,6 @@ D 0.01 4 - @@ -1528,7 +1413,6 @@ Ƶ 0.01 4 - @@ -1541,7 +1425,6 @@ MT 0.01 4 - @@ -1554,7 +1437,6 @@ K 0.01 4 - @@ -1567,7 +1449,6 @@ $ 0.01 4 - @@ -1580,7 +1461,6 @@ ₨ 0.01 4 - @@ -1593,7 +1473,6 @@ L 0.01 4 - @@ -1606,7 +1485,6 @@ C$ 0.01 4 - @@ -1619,7 +1497,6 @@ ₦ 0.01 4 - @@ -1632,7 +1509,6 @@ ₩ 0.01 4 - @@ -1645,7 +1521,6 @@ Z$ 0.01 4 - @@ -1658,7 +1533,6 @@ ZK 0.01 4 - @@ -1671,7 +1545,6 @@ ﷼ 0.01 4 - @@ -1684,7 +1557,6 @@ Bs 0.01 4 - @@ -1697,7 +1569,6 @@ € 0.01 4 - @@ -1710,7 +1581,6 @@ VT 0.01 4 - @@ -1723,7 +1593,6 @@ лв 0.01 4 - @@ -1736,7 +1605,6 @@ $U 0.01 4 - @@ -1749,7 +1617,6 @@ د.إ 0.01 4 - @@ -1762,7 +1629,6 @@ ₴ 0.01 4 - @@ -1775,7 +1641,6 @@ m 0.01 4 - @@ -1788,7 +1653,6 @@ TL 0.01 4 - @@ -1801,7 +1665,6 @@ DT 0.01 4 - @@ -1814,7 +1677,6 @@ $ 0.01 4 - @@ -1827,7 +1689,6 @@ T$ 0.01 4 - @@ -1840,7 +1701,6 @@ ฿ 0.01 4 - @@ -1853,7 +1713,6 @@ x/y 0.01 4 - @@ -1865,7 +1724,6 @@ TJR 0.01 4 - @@ -1878,7 +1736,6 @@ NT$ 0.01 4 - @@ -1891,7 +1748,6 @@ £ 0.01 4 - @@ -1904,7 +1760,6 @@ E 0.01 4 - @@ -1917,7 +1772,6 @@ $ 0.01 4 - @@ -1930,7 +1784,6 @@ £Sd 0.01 4 - @@ -1943,7 +1796,6 @@ Rs 0.01 4 - @@ -1956,7 +1808,6 @@ £ 0.01 4 - @@ -1970,7 +1821,6 @@ 0.01 4 before - @@ -1983,7 +1833,6 @@ Sh. 0.01 4 - @@ -1996,7 +1845,6 @@ SI$ 0.01 4 - @@ -2009,7 +1857,6 @@ Le 0.01 4 - @@ -2022,7 +1869,6 @@ SR 0.01 4 - @@ -2035,7 +1881,6 @@ din. 0.01 4 - @@ -2048,7 +1893,6 @@ SR 0.01 4 - @@ -2061,7 +1905,6 @@ Db 0.01 4 - @@ -2074,7 +1917,6 @@ ₤ 0.01 4 - @@ -2087,7 +1929,6 @@ WS$ 0.01 4 - @@ -2100,7 +1941,6 @@ £ 0.01 4 - @@ -2113,7 +1953,6 @@ RF 0.01 4 - @@ -2126,7 +1965,6 @@ R 0.01 4 - @@ -2139,7 +1977,6 @@ L 0.01 4 - @@ -2152,7 +1989,6 @@ QR 0.01 4 - @@ -2165,7 +2001,6 @@ zł 0.01 4 - @@ -2178,7 +2013,6 @@ S/. 0.01 4 - @@ -2191,7 +2025,6 @@ ₲ 0.01 4 - @@ -2204,7 +2037,6 @@ K 0.01 4 - @@ -2217,7 +2049,6 @@ Rs. 0.01 4 - @@ -2230,7 +2061,6 @@ ر.ع. 0.01 4 - @@ -2243,7 +2073,6 @@ $ 0.01 4 - @@ -2256,7 +2085,6 @@ Sk 0.01 4 - @@ -2268,7 +2096,6 @@ SIT 0.01 4 - @@ -2281,7 +2108,6 @@ дин. 0.01 4 - From ce5c5557a383beec75650778462d0b6126cf8dcb Mon Sep 17 00:00:00 2001 From: Cedric Snauwaert Date: Fri, 17 May 2013 11:04:21 +0200 Subject: [PATCH 65/74] [FIX]ir_sequence: fix cryptic error message when prefix/suffix is not in a valid format and update number_next in order for it to have same value as the sql sequence preventing the sql sequence to restart from one if a write is done. bzr revid: csn@openerp.com-20130517090421-kik3215az48lg02f --- openerp/addons/base/ir/ir_sequence.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/openerp/addons/base/ir/ir_sequence.py b/openerp/addons/base/ir/ir_sequence.py index 44c9e57af32..9ab74bc3302 100644 --- a/openerp/addons/base/ir/ir_sequence.py +++ b/openerp/addons/base/ir/ir_sequence.py @@ -200,18 +200,22 @@ class ir_sequence(openerp.osv.osv.osv): force_company = context.get('force_company') if not force_company: force_company = self.pool.get('res.users').browse(cr, uid, uid).company_id.id - sequences = self.read(cr, uid, seq_ids, ['company_id','implementation','number_next','prefix','suffix','padding']) + sequences = self.read(cr, uid, seq_ids, ['name','company_id','implementation','number_next','prefix','suffix','padding']) preferred_sequences = [s for s in sequences if s['company_id'] and s['company_id'][0] == force_company ] seq = preferred_sequences[0] if preferred_sequences else sequences[0] if seq['implementation'] == 'standard': cr.execute("SELECT nextval('ir_sequence_%03d')" % seq['id']) seq['number_next'] = cr.fetchone() + cr.execute("UPDATE ir_sequence SET number_next=%s WHERE id=%s ", (seq['number_next'], seq['id'],)) else: cr.execute("SELECT number_next FROM ir_sequence WHERE id=%s FOR UPDATE NOWAIT", (seq['id'],)) cr.execute("UPDATE ir_sequence SET number_next=number_next+number_increment WHERE id=%s ", (seq['id'],)) d = self._interpolation_dict() - interpolated_prefix = self._interpolate(seq['prefix'], d) - interpolated_suffix = self._interpolate(seq['suffix'], d) + try: + interpolated_prefix = self._interpolate(seq['prefix'], d) + interpolated_suffix = self._interpolate(seq['suffix'], d) + except ValueError: + raise osv.except_osv(_('Warning'), _('Invalid prefix or suffix for sequence \'%s\'') % (seq.get('name'))) return interpolated_prefix + '%%0%sd' % seq['padding'] % seq['number_next'] + interpolated_suffix def next_by_id(self, cr, uid, sequence_id, context=None): From e60802725634166854e190353ca01ae37969ddd8 Mon Sep 17 00:00:00 2001 From: Olivier Dony Date: Fri, 17 May 2013 12:29:33 +0200 Subject: [PATCH 66/74] [FIX] openerp/tests/test_mail.py marked executable as it should lp bug: https://launchpad.net/bugs/993414 fixed bzr revid: odo@openerp.com-20130517102933-u1u4n2ad5jxnndw5 --- openerp/tests/test_mail.py | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 openerp/tests/test_mail.py diff --git a/openerp/tests/test_mail.py b/openerp/tests/test_mail.py old mode 100644 new mode 100755 From fb3835e8dca4190bae097be8117b8c415d70096b Mon Sep 17 00:00:00 2001 From: Olivier Dony Date: Fri, 17 May 2013 12:35:02 +0200 Subject: [PATCH 67/74] [FIX] l10n_vn: removed incorrect exec bit on files that have no reason to have it lp bug: https://launchpad.net/bugs/993414 fixed bzr revid: odo@openerp.com-20130517103502-llfmq8m9hk1tjz6c --- addons/l10n_vn/__init__.py | 0 addons/l10n_vn/__openerp__.py | 0 2 files changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 addons/l10n_vn/__init__.py mode change 100755 => 100644 addons/l10n_vn/__openerp__.py diff --git a/addons/l10n_vn/__init__.py b/addons/l10n_vn/__init__.py old mode 100755 new mode 100644 diff --git a/addons/l10n_vn/__openerp__.py b/addons/l10n_vn/__openerp__.py old mode 100755 new mode 100644 From 913a7a6e5c45ba2b9f4011e1aff83989fb127752 Mon Sep 17 00:00:00 2001 From: Cedric Snauwaert Date: Fri, 17 May 2013 14:43:28 +0200 Subject: [PATCH 68/74] [FIX]ir_sequence: only execute a change on postgresql sequence when really needed and add a field to get an approximation of the current next_number. bzr revid: csn@openerp.com-20130517124328-kex5katw2tgpgdty --- openerp/addons/base/ir/ir_sequence.py | 47 ++++++++++++++++++--- openerp/addons/base/ir/ir_sequence_view.xml | 4 +- 2 files changed, 43 insertions(+), 8 deletions(-) diff --git a/openerp/addons/base/ir/ir_sequence.py b/openerp/addons/base/ir/ir_sequence.py index 9ab74bc3302..5ac126ebfed 100644 --- a/openerp/addons/base/ir/ir_sequence.py +++ b/openerp/addons/base/ir/ir_sequence.py @@ -54,6 +54,34 @@ class ir_sequence(openerp.osv.osv.osv): """ _name = 'ir.sequence' _order = 'name' + + def _get_number_next_actual(self, cr, user, ids, field_name, arg, context=None): + '''Return number from ir_sequence row when no_gap implementation, + and number from postgres sequence when standard implementation.''' + res = dict.fromkeys(ids) + for element in self.browse(cr, user, ids, context=context): + if element.implementation != 'standard': + res[element.id] = element.number_next + else: + # get number from postgres sequence. Cannot use + # currval, because that might give an error when + # not having used nextval before. + statement = ( + "SELECT last_value, increment_by, is_called" + " FROM ir_sequence_%03d" + % element.id) + cr.execute(statement) + (last_value, increment_by, is_called) = cr.fetchone() + if is_called: + res[element.id] = last_value + increment_by + else: + res[element.id] = last_value + return res + + def _set_number_next_actual(self, cr, uid, id, name, value, args=None, context=None): + return self.write(cr, uid, id, {'number_next': value or 0}, context=context) + + _columns = { 'name': openerp.osv.fields.char('Name', size=64, required=True), 'code': openerp.osv.fields.selection(_code_get, 'Code', size=64), @@ -67,6 +95,7 @@ class ir_sequence(openerp.osv.osv.osv): 'prefix': openerp.osv.fields.char('Prefix', size=64, help="Prefix value of the record for the sequence"), 'suffix': openerp.osv.fields.char('Suffix', size=64, help="Suffix value of the record for the sequence"), 'number_next': openerp.osv.fields.integer('Next Number', required=True, help="Next number of this sequence"), + 'number_next_actual': openerp.osv.fields.function(_get_number_next_actual, fnct_inv=_set_number_next_actual, type='integer', required=True, string='Actual Next Number', help='Next number that will be used. Number is only informative and can differ from real number'), 'number_increment': openerp.osv.fields.integer('Increment Number', required=True, help="The next number of the sequence will be incremented by this number"), 'padding' : openerp.osv.fields.integer('Number Padding', required=True, help="OpenERP will automatically adds some '0' on the left of the 'Next Number' to get the required padding size."), 'company_id': openerp.osv.fields.many2one('res.company', 'Company'), @@ -121,7 +150,7 @@ class ir_sequence(openerp.osv.osv.osv): # object depends on it. cr.execute("DROP SEQUENCE IF EXISTS %s RESTRICT " % names) - def _alter_sequence(self, cr, id, number_increment, number_next): + def _alter_sequence(self, cr, id, number_increment, number_next=0): """ Alter a PostreSQL sequence. There is no access rights check. @@ -129,9 +158,10 @@ class ir_sequence(openerp.osv.osv.osv): if number_increment == 0: raise osv.except_osv(_('Warning!'),_("Increment number must not be zero.")) assert isinstance(id, (int, long)) - cr.execute(""" - ALTER SEQUENCE ir_sequence_%03d INCREMENT BY %%s RESTART WITH %%s - """ % id, (number_increment, number_next)) + statement = ("ALTER SEQUENCE ir_sequence_%03d INCREMENT BY %d" % (id, number_increment)) + if number_next: + statement += " RESTART WITH %d" % (number_next, ) + cr.execute(statement) def create(self, cr, uid, values, context=None): """ Create a sequence, in implementation == standard a fast gaps-allowed PostgreSQL sequence is used. @@ -160,7 +190,13 @@ class ir_sequence(openerp.osv.osv.osv): n = values.get('number_next', row['number_next']) if row['implementation'] == 'standard': if new_implementation in ('standard', None): - self._alter_sequence(cr, row['id'], i, n) + # Implementation has NOT changed. + # Only change sequence if really requested. + if row['number_next'] != n: + self._alter_sequence(cr, row['id'], i, n) + else: + # Just in case only increment changed + self._alter_sequence(cr, row['id'], i) else: self._drop_sequence(cr, row['id']) else: @@ -206,7 +242,6 @@ class ir_sequence(openerp.osv.osv.osv): if seq['implementation'] == 'standard': cr.execute("SELECT nextval('ir_sequence_%03d')" % seq['id']) seq['number_next'] = cr.fetchone() - cr.execute("UPDATE ir_sequence SET number_next=%s WHERE id=%s ", (seq['number_next'], seq['id'],)) else: cr.execute("SELECT number_next FROM ir_sequence WHERE id=%s FOR UPDATE NOWAIT", (seq['id'],)) cr.execute("UPDATE ir_sequence SET number_next=number_next+number_increment WHERE id=%s ", (seq['id'],)) diff --git a/openerp/addons/base/ir/ir_sequence_view.xml b/openerp/addons/base/ir/ir_sequence_view.xml index 0fa46d61957..050eb9e2333 100644 --- a/openerp/addons/base/ir/ir_sequence_view.xml +++ b/openerp/addons/base/ir/ir_sequence_view.xml @@ -20,7 +20,7 @@ - + @@ -57,7 +57,7 @@ - + From 8d639576f070807e7b5ad6e746be1e55ec59b333 Mon Sep 17 00:00:00 2001 From: Olivier Dony Date: Fri, 17 May 2013 16:17:26 +0200 Subject: [PATCH 69/74] [FIX] modify domain evaluation tests to avoid relying on res.currency entries assigned to companies, as demo data was modified for bug 1111298 lp bug: https://launchpad.net/bugs/1111298 fixed bzr revid: odo@openerp.com-20130517141726-67utxubzdflsgsnx --- .../addons/base/test/test_osv_expression.yml | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/openerp/addons/base/test/test_osv_expression.yml b/openerp/addons/base/test/test_osv_expression.yml index f1610e8b3a4..1516f090e94 100644 --- a/openerp/addons/base/test/test_osv_expression.yml +++ b/openerp/addons/base/test/test_osv_expression.yml @@ -291,22 +291,22 @@ assert res_101 == [], 'res_101: expected %r, got %r' % ([], res_101) assert res_102 == company_ids, 'res_102: expected %r, got %r' % (company_ids, res_102) - - Property of the query (one2many != False). + Verify domain evaluation for `one2many != False` - - !python {model: res.currency }: | - ids = self.search(cr, uid, []) - referenced_companies = set([x.company_id.id for x in self.browse(cr, uid, ids)]) - companies = set(self.pool.get('res.company').search(cr, uid, [('currency_ids', '!=', False)])) - assert referenced_companies == companies + !python {model: res.partner.category }: | + all_ids = self.search(cr, uid, []) + parent_categs = set([c.parent_id.id for c in self.browse(cr, uid, all_ids) if c.parent_id]) + result = set(self.search(cr, uid, [('child_ids', '!=', False)])) + assert result and result == parent_categs, "Got %r, expected %r" % (result, parent_categs) - - Property of the query (one2many = False). + Verify domain evaluation for `one2many == False` - - !python {model: res.currency }: | - ids = self.search(cr, uid, []) - referenced_companies = set([x.company_id.id for x in self.browse(cr, uid, ids)]) - unreferenced_companies = set(self.pool.get('res.company').search(cr, uid, [])).difference(referenced_companies) - companies = set(self.pool.get('res.company').search(cr, uid, [('currency_ids', '=', False)])) - assert unreferenced_companies == companies + !python {model: res.partner.category }: | + all_ids = self.search(cr, uid, []) + parent_categs = set([c.parent_id.id for c in self.browse(cr, uid, all_ids) if c.parent_id]) + leaf_categs = set(all_ids) - parent_categs + result = set(self.search(cr, uid, [('child_ids', '=', False)])) + assert result and result == leaf_categs, "Got %r, expected %r" % (result, leaf_categs) - Equivalent queries. - From 33ec8239d1d2595e6fce651f3aad19c431ca8102 Mon Sep 17 00:00:00 2001 From: Cedric Snauwaert Date: Fri, 17 May 2013 17:45:44 +0200 Subject: [PATCH 70/74] [FIX]ir_sequence: better args definition bzr revid: csn@openerp.com-20130517154544-c9jywavo9pnfn4rt --- openerp/addons/base/ir/ir_sequence.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/openerp/addons/base/ir/ir_sequence.py b/openerp/addons/base/ir/ir_sequence.py index 5ac126ebfed..1254f73e664 100644 --- a/openerp/addons/base/ir/ir_sequence.py +++ b/openerp/addons/base/ir/ir_sequence.py @@ -150,7 +150,7 @@ class ir_sequence(openerp.osv.osv.osv): # object depends on it. cr.execute("DROP SEQUENCE IF EXISTS %s RESTRICT " % names) - def _alter_sequence(self, cr, id, number_increment, number_next=0): + def _alter_sequence(self, cr, id, number_increment, number_next=None): """ Alter a PostreSQL sequence. There is no access rights check. @@ -159,7 +159,7 @@ class ir_sequence(openerp.osv.osv.osv): raise osv.except_osv(_('Warning!'),_("Increment number must not be zero.")) assert isinstance(id, (int, long)) statement = ("ALTER SEQUENCE ir_sequence_%03d INCREMENT BY %d" % (id, number_increment)) - if number_next: + if number_next is not None: statement += " RESTART WITH %d" % (number_next, ) cr.execute(statement) From c694837a645cb43287ad1af1a033ee09bb8faf53 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Fri, 17 May 2013 18:22:15 +0200 Subject: [PATCH 71/74] [FIX] parsing of domains with non-ascii unicode literals update py.js to support parsing of escape sequences in string literals bzr revid: xmo@openerp.com-20130517162215-4afen1mdzbfx1mxi --- addons/web/static/lib/py.js/.hg_archival.txt | 4 +- addons/web/static/lib/py.js/lib/py.js | 142 ++++++++++++++++--- 2 files changed, 125 insertions(+), 21 deletions(-) diff --git a/addons/web/static/lib/py.js/.hg_archival.txt b/addons/web/static/lib/py.js/.hg_archival.txt index 1d47dff4445..94f4a9ad6e8 100644 --- a/addons/web/static/lib/py.js/.hg_archival.txt +++ b/addons/web/static/lib/py.js/.hg_archival.txt @@ -1,5 +1,5 @@ repo: 076b192d0d8ab2b92d1dbcfa3da055382f30eaea -node: 142c22b230636674a0cee6bc29e6975f0f1600a5 +node: 7ee0bc7b4e9138f485cdc9ec791961d8ef452f17 branch: default latesttag: 0.7 -latesttagdistance: 9 +latesttagdistance: 11 diff --git a/addons/web/static/lib/py.js/lib/py.js b/addons/web/static/lib/py.js/lib/py.js index 8d6443b7753..2c738dc95d1 100644 --- a/addons/web/static/lib/py.js/lib/py.js +++ b/addons/web/static/lib/py.js/lib/py.js @@ -273,7 +273,7 @@ var py = {}; var Special = '[:;.,`@]'; var Funny = group(Operator, Bracket, Special); - var ContStr = group("[uU]?'([^']*)'", '[uU]?"([^"]*)"'); + var ContStr = group("([uU])?'([^']*)'", '([uU])?"([^"]*)"'); var PseudoToken = Whitespace + group(Number, Funny, ContStr, Name); @@ -311,7 +311,8 @@ var py = {}; } else if (string_pattern.test(token)) { var m = string_pattern.exec(token); tokens.push(create(symbols['(string)'], { - value: (m[2] !== undefined ? m[2] : m[3]) + unicode: !!(m[2] || m[4]), + value: (m[3] !== undefined ? m[3] : m[5]) })); } else if (token in symbols) { var symbol; @@ -393,13 +394,14 @@ var py = {}; switch(val.constructor) { case Object: - var out = py.PY_call(py.object); - for(var k in val) { - if (val.hasOwnProperty(k)) { - out[k] = val[k]; + // TODO: why py.object instead of py.dict? + var o = py.PY_call(py.object); + for (var prop in val) { + if (val.hasOwnProperty(prop)) { + o[prop] = val[prop]; } } - return out; + return o; case Array: return py.list.fromJSON(val); } @@ -521,7 +523,7 @@ var py = {}; } }; py.PY_getAttr = function (o, attr_name) { - return PY_ensurepy(o.__getattribute__(attr_name),attr_name); + return PY_ensurepy(o.__getattribute__(attr_name)); }; py.PY_str = function (o) { var v = o.__str__(); @@ -762,14 +764,7 @@ var py = {}; // Conversion toJSON: function () { - var out = {}; - for(var k in this) { - if (this.hasOwnProperty(k) && !/^__/.test(k)) { - var val = this[k]; - out[k] = val.toJSON ? val.toJSON() : val; - } - } - return out; + throw new Error(this.constructor.name + ' can not be converted to JSON'); } }); var NoneType = py.type('NoneType', null, { @@ -998,7 +993,7 @@ var py = {}; } var t = py.PY_call(py.tuple); for(var i=0; i Date: Fri, 17 May 2013 20:15:14 +0200 Subject: [PATCH 72/74] [FIX] ir.sequence: add a proper default value for number_next_actual (0 is disallowed by default) + avoid error when trying to alter a sequence during creation lp bug: https://launchpad.net/bugs/960201 fixed bzr revid: odo@openerp.com-20130517181514-xcy83yakpuqa3oik --- openerp/addons/base/ir/ir_sequence.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/openerp/addons/base/ir/ir_sequence.py b/openerp/addons/base/ir/ir_sequence.py index a479d1e9023..0f505814c0c 100644 --- a/openerp/addons/base/ir/ir_sequence.py +++ b/openerp/addons/base/ir/ir_sequence.py @@ -106,6 +106,7 @@ class ir_sequence(openerp.osv.osv.osv): 'company_id': lambda s,cr,uid,c: s.pool.get('res.company')._company_default_get(cr, uid, 'ir.sequence', context=c), 'number_increment': 1, 'number_next': 1, + 'number_next_actual': 1, 'padding' : 0, } @@ -158,7 +159,12 @@ class ir_sequence(openerp.osv.osv.osv): if number_increment == 0: raise osv.except_osv(_('Warning!'),_("Increment number must not be zero.")) assert isinstance(id, (int, long)) - statement = ("ALTER SEQUENCE ir_sequence_%03d INCREMENT BY %d" % (id, number_increment)) + seq_name = 'ir_sequence_%03d' % (id,) + cr.execute("SELECT relname FROM pg_class WHERE relkind = %s AND relname=%s", ('S', seq_name)) + if not cr.fetchone(): + # sequence is not created yet, we're inside create() so ignore it, will be set later + return + statement = "ALTER SEQUENCE %s INCREMENT BY %d" % (seq_name, number_increment) if number_next is not None: statement += " RESTART WITH %d" % (number_next, ) cr.execute(statement) From c8136cee66098709db68c41d275b14d83f6ecfd1 Mon Sep 17 00:00:00 2001 From: Launchpad Translations on behalf of openerp <> Date: Sun, 19 May 2013 06:13:01 +0000 Subject: [PATCH 73/74] Launchpad automatic translations update. bzr revid: launchpad_translations_on_behalf_of_openerp-20130519061301-tarop35lwadoymxh --- addons/web/i18n/lt.po | 28 ++--- addons/web_view_editor/i18n/lv.po | 184 ++++++++++++++++++++++++++++++ 2 files changed, 198 insertions(+), 14 deletions(-) create mode 100644 addons/web_view_editor/i18n/lv.po diff --git a/addons/web/i18n/lt.po b/addons/web/i18n/lt.po index 1a38635acb0..52252cde9c5 100644 --- a/addons/web/i18n/lt.po +++ b/addons/web/i18n/lt.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openerp-web\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2013-03-07 08:39+0000\n" -"PO-Revision-Date: 2013-04-30 16:22+0000\n" -"Last-Translator: Giedrius Slavinskas - inovera.lt \n" +"PO-Revision-Date: 2013-05-18 07:51+0000\n" +"Last-Translator: Mantas Kriaučiūnas \n" "Language-Team: Lithuanian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-05-01 05:15+0000\n" -"X-Generator: Launchpad (build 16580)\n" +"X-Launchpad-Export-Date: 2013-05-19 06:13+0000\n" +"X-Generator: Launchpad (build 16626)\n" #. module: web #. openerp-web @@ -685,7 +685,7 @@ msgstr "Žiūrėti" #: code:addons/web/static/src/xml/base.xml:1473 #, python-format msgid "Save Filter" -msgstr "Išsaugoti filtrą" +msgstr "Įrašyti filtrą" #. module: web #. openerp-web @@ -750,7 +750,7 @@ msgstr "Taikyti" #: code:addons/web/static/src/xml/base.xml:1395 #, python-format msgid "Save & New" -msgstr "Išsaugoti ir kurti naują" +msgstr "Įrašyti ir kurti naują" #. module: web #. openerp-web @@ -758,7 +758,7 @@ msgstr "Išsaugoti ir kurti naują" #: code:addons/web/static/src/xml/base.xml:1234 #, python-format msgid "Save As" -msgstr "Išsaugoti kaip" +msgstr "Įrašyti kaip" #. module: web #. openerp-web @@ -786,7 +786,7 @@ msgstr "prieš dieną" #: code:addons/web/static/src/xml/base.xml:1787 #, python-format msgid "Does your file have titles?" -msgstr "Ar jūsų fails turi antraštes?" +msgstr "Ar jūsų failas turi antraštes?" #. module: web #. openerp-web @@ -939,7 +939,7 @@ msgstr "Pašalinti šį priedą" #: code:addons/web/static/src/xml/base.xml:1610 #, python-format msgid "Save" -msgstr "Išsaugoti" +msgstr "Įrašyti" #. module: web #. openerp-web @@ -1023,7 +1023,7 @@ msgstr "Neteisingas duomenų bazės pavadinimas" #: code:addons/web/static/src/xml/base.xml:1691 #, python-format msgid "Save fields list" -msgstr "Saugoti laukų sarašą" +msgstr "Įrašyti laukų sarašą" #. module: web #. openerp-web @@ -1378,7 +1378,7 @@ msgstr "Keisti įmonės duomenis" #: code:addons/web/static/src/js/view_form.js:4923 #, python-format msgid "Save As..." -msgstr "Išsaugoti kaip..." +msgstr "Įrašyti kaip..." #. module: web #. openerp-web @@ -1686,7 +1686,7 @@ msgstr "" #: code:addons/web/static/src/js/view_form.js:1064 #, python-format msgid "Save default" -msgstr "Išsaugoti numatytąją reikšmę" +msgstr "Įrašyti numatytąją reikšmę" #. module: web #. openerp-web @@ -1787,7 +1787,7 @@ msgstr "" #: code:addons/web/static/src/xml/base.xml:1748 #, python-format msgid "Save as:" -msgstr "Išsaugoti kaip:" +msgstr "Įrašyti kaip:" #. module: web #. openerp-web @@ -2567,7 +2567,7 @@ msgstr "Ar tikrai norite ištrinti šį įrašą?" #: code:addons/web/static/src/xml/base.xml:1394 #, python-format msgid "Save & Close" -msgstr "Tik Išsaugoti" +msgstr "Tik įrašyti" #. module: web #. openerp-web diff --git a/addons/web_view_editor/i18n/lv.po b/addons/web_view_editor/i18n/lv.po new file mode 100644 index 00000000000..f9a8160e88b --- /dev/null +++ b/addons/web_view_editor/i18n/lv.po @@ -0,0 +1,184 @@ +# Latvian translation for openerp-web +# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013 +# This file is distributed under the same license as the openerp-web package. +# FIRST AUTHOR , 2013. +# +msgid "" +msgstr "" +"Project-Id-Version: openerp-web\n" +"Report-Msgid-Bugs-To: FULL NAME \n" +"POT-Creation-Date: 2013-03-07 08:39+0000\n" +"PO-Revision-Date: 2013-05-17 11:15+0000\n" +"Last-Translator: sieks \n" +"Language-Team: Latvian \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2013-05-19 06:13+0000\n" +"X-Generator: Launchpad (build 16626)\n" + +#. module: web_view_editor +#. openerp-web +#: code:addons/web_view_editor/static/src/js/view_editor.js:164 +#, python-format +msgid "The following fields are invalid :" +msgstr "" + +#. module: web_view_editor +#. openerp-web +#: code:addons/web_view_editor/static/src/js/view_editor.js:63 +#, python-format +msgid "Create" +msgstr "Izveidot" + +#. module: web_view_editor +#. openerp-web +#: code:addons/web_view_editor/static/src/js/view_editor.js:986 +#, python-format +msgid "New Field" +msgstr "Jauns lauks" + +#. module: web_view_editor +#. openerp-web +#: code:addons/web_view_editor/static/src/js/view_editor.js:386 +#, python-format +msgid "Do you really wants to create an inherited view here?" +msgstr "" + +#. module: web_view_editor +#. openerp-web +#: code:addons/web_view_editor/static/src/js/view_editor.js:396 +#, python-format +msgid "Preview" +msgstr "" + +#. module: web_view_editor +#. openerp-web +#: code:addons/web_view_editor/static/src/js/view_editor.js:183 +#, python-format +msgid "Do you really want to remove this view?" +msgstr "" + +#. module: web_view_editor +#. openerp-web +#: code:addons/web_view_editor/static/src/js/view_editor.js:90 +#, python-format +msgid "Save" +msgstr "Saglabāt" + +#. module: web_view_editor +#. openerp-web +#: code:addons/web_view_editor/static/src/js/view_editor.js:393 +#, python-format +msgid "Select an element" +msgstr "" + +#. module: web_view_editor +#. openerp-web +#: code:addons/web_view_editor/static/src/js/view_editor.js:828 +#: code:addons/web_view_editor/static/src/js/view_editor.js:954 +#, python-format +msgid "Update" +msgstr "" + +#. module: web_view_editor +#. openerp-web +#: code:addons/web_view_editor/static/src/js/view_editor.js:263 +#, python-format +msgid "Please select view in list :" +msgstr "" + +#. module: web_view_editor +#. openerp-web +#: code:addons/web_view_editor/static/src/js/view_editor.js:37 +#, python-format +msgid "Manage Views (%s)" +msgstr "Pārvaldīt skatus (%s)" + +#. module: web_view_editor +#. openerp-web +#: code:addons/web_view_editor/static/src/js/view_editor.js:13 +#, python-format +msgid "Manage Views" +msgstr "" + +#. module: web_view_editor +#. openerp-web +#: code:addons/web_view_editor/static/src/js/view_editor.js:825 +#: code:addons/web_view_editor/static/src/js/view_editor.js:951 +#, python-format +msgid "Properties" +msgstr "Īpašības" + +#. module: web_view_editor +#. openerp-web +#: code:addons/web_view_editor/static/src/js/view_editor.js:64 +#, python-format +msgid "Edit" +msgstr "Labot" + +#. module: web_view_editor +#. openerp-web +#: code:addons/web_view_editor/static/src/js/view_editor.js:14 +#, python-format +msgid "Could not find current view declaration" +msgstr "" + +#. module: web_view_editor +#. openerp-web +#: code:addons/web_view_editor/static/src/js/view_editor.js:382 +#, python-format +msgid "Inherited View" +msgstr "" + +#. module: web_view_editor +#. openerp-web +#: code:addons/web_view_editor/static/src/js/view_editor.js:65 +#, python-format +msgid "Remove" +msgstr "" + +#. module: web_view_editor +#. openerp-web +#: code:addons/web_view_editor/static/src/js/view_editor.js:516 +#, python-format +msgid "Do you really want to remove this node?" +msgstr "" + +#. module: web_view_editor +#. openerp-web +#: code:addons/web_view_editor/static/src/js/view_editor.js:390 +#, python-format +msgid "Can't Update View" +msgstr "" + +#. module: web_view_editor +#. openerp-web +#: code:addons/web_view_editor/static/src/js/view_editor.js:379 +#, python-format +msgid "View Editor %d - %s" +msgstr "" + +#. module: web_view_editor +#. openerp-web +#: code:addons/web_view_editor/static/src/js/view_editor.js:112 +#: code:addons/web_view_editor/static/src/js/view_editor.js:846 +#: code:addons/web_view_editor/static/src/js/view_editor.js:974 +#, python-format +msgid "Cancel" +msgstr "" + +#. module: web_view_editor +#. openerp-web +#: code:addons/web_view_editor/static/src/js/view_editor.js:66 +#: code:addons/web_view_editor/static/src/js/view_editor.js:413 +#, python-format +msgid "Close" +msgstr "" + +#. module: web_view_editor +#. openerp-web +#: code:addons/web_view_editor/static/src/js/view_editor.js:88 +#, python-format +msgid "Create a view (%s)" +msgstr "" From 1647391acc19c67fb0b62dea247b16c7d6627f33 Mon Sep 17 00:00:00 2001 From: Launchpad Translations on behalf of openerp <> Date: Tue, 21 May 2013 05:43:52 +0000 Subject: [PATCH 74/74] Launchpad automatic translations update. bzr revid: launchpad_translations_on_behalf_of_openerp-20130519061236-r4zubxtanesjqld0 bzr revid: launchpad_translations_on_behalf_of_openerp-20130520063148-0crtjtoieit1g5k8 bzr revid: launchpad_translations_on_behalf_of_openerp-20130521054352-g6yw7uvuietnscm6 --- openerp/addons/base/i18n/ko.po | 26 ++++++++++++++++++++++---- openerp/addons/base/i18n/sl.po | 13 ++++++++----- openerp/addons/base/i18n/tr.po | 8 +++++--- 3 files changed, 35 insertions(+), 12 deletions(-) diff --git a/openerp/addons/base/i18n/ko.po b/openerp/addons/base/i18n/ko.po index cdde048b78b..f4dc8d4a714 100644 --- a/openerp/addons/base/i18n/ko.po +++ b/openerp/addons/base/i18n/ko.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-server\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2013-03-07 08:36+0000\n" -"PO-Revision-Date: 2013-03-29 04:45+0000\n" -"Last-Translator: Josh Kim \n" +"PO-Revision-Date: 2013-05-18 23:13+0000\n" +"Last-Translator: AhnJD \n" "Language-Team: Korean \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-03-30 06:08+0000\n" -"X-Generator: Launchpad (build 16546)\n" +"X-Launchpad-Export-Date: 2013-05-19 06:12+0000\n" +"X-Generator: Launchpad (build 16626)\n" #. module: base #: model:ir.module.module,description:base.module_account_check_writing @@ -129,6 +129,16 @@ msgid "" " * Product Attributes\n" " " msgstr "" +"\n" +"제품양식에 특성과 제조회사를 추가하는 모듈\n" +"====================================================================\n" +"제품에 아래 내용을 정의할 수 있습니다.\n" +"-----------------------------------------------\n" +" * 제조회사\n" +" * 제조회사 제품명칭\n" +" * 제조회사 제품코드\n" +" * 제품 특성\n" +" " #. module: base #: field:ir.actions.client,params:0 @@ -551,6 +561,14 @@ msgid "" "that have no counterpart in the general financial accounts.\n" " " msgstr "" +"\n" +"관리회계 객체를 지정하기 위한 모듈\n" +"===============================================\n" +"\n" +"OpenERP에서는 관리회계가 일반회계와 연계되지만 완전히\n" +"독립적으로 취급됩니다. 따라서, 일반 재무회계에는 영향을 주지\n" +"않으면서 다양하고 차별화된 분석 작업을 수행할 수 있습니다.\n" +" " #. module: base #: model:ir.module.module,shortdesc:base.module_idea diff --git a/openerp/addons/base/i18n/sl.po b/openerp/addons/base/i18n/sl.po index 53c64f2527e..675e887f1c6 100644 --- a/openerp/addons/base/i18n/sl.po +++ b/openerp/addons/base/i18n/sl.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-server\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2013-03-07 08:36+0000\n" -"PO-Revision-Date: 2013-04-01 12:25+0000\n" +"PO-Revision-Date: 2013-05-20 14:30+0000\n" "Last-Translator: Dušan Laznik (Mentis) \n" "Language-Team: Slovenian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-04-02 05:47+0000\n" -"X-Generator: Launchpad (build 16546)\n" +"X-Launchpad-Export-Date: 2013-05-21 05:43+0000\n" +"X-Generator: Launchpad (build 16626)\n" #. module: base #: model:ir.module.module,description:base.module_account_check_writing @@ -11374,9 +11374,12 @@ msgid "" "Thank you in advance for your cooperation.\n" "Best Regards," msgstr "" -"Spoštovani,\n" +"Iz naših poslovnih knjig je razvidno,da imate zapadle obveznosti do našega " +"podjetja.\n" "\n" -"Naši podatki kažejo , da nam dolgujete spodaj navedeni znesek." +"Prosimo, da svoj dolg takoj poravnate na naš račun.\n" +"\n" +"Če ste svoj dolg že poravnali, upoštevajte opomin za brezpredmeten." #. module: base #: view:ir.module.category:0 diff --git a/openerp/addons/base/i18n/tr.po b/openerp/addons/base/i18n/tr.po index 0247b63ce8e..ae049182a83 100644 --- a/openerp/addons/base/i18n/tr.po +++ b/openerp/addons/base/i18n/tr.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-server\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2013-03-07 08:36+0000\n" -"PO-Revision-Date: 2013-05-05 17:30+0000\n" +"PO-Revision-Date: 2013-05-19 13:35+0000\n" "Last-Translator: Ayhan KIZILTAN \n" "Language-Team: Turkish \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-05-06 06:35+0000\n" -"X-Generator: Launchpad (build 16598)\n" +"X-Launchpad-Export-Date: 2013-05-20 06:31+0000\n" +"X-Generator: Launchpad (build 16626)\n" #. module: base #: model:ir.module.module,description:base.module_account_check_writing @@ -2104,6 +2104,8 @@ msgid "" "Check this box if this contact is a supplier. If it's not checked, purchase " "people will not see it when encoding a purchase order." msgstr "" +"Bu kişi bir tedarikçi ise bu kutuyu işaretleyin. Eğer işaretlenmemişse, " +"satınalma elemanı sipariş kodlarken bunu göremezler." #. module: base #: model:ir.module.module,shortdesc:base.module_hr_evaluation