From ea97d65e39d9618b477dddd43f6692ad31bc4d80 Mon Sep 17 00:00:00 2001 From: "Foram Katharotiya (OpenERP)" Date: Fri, 16 Nov 2012 15:42:25 +0530 Subject: [PATCH 001/277] [IMP] in messaging/Organizer/Categories rename Categories into Stage bzr revid: fka@tinyerp.com-20121116101225-p8atb8mb1gqkdak5 --- addons/note/note_view.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/note/note_view.xml b/addons/note/note_view.xml index 5aae6204d86..5becd36757e 100644 --- a/addons/note/note_view.xml +++ b/addons/note/note_view.xml @@ -193,7 +193,7 @@ - + From 878ca2e088d4381bfe7d6cdf59910b0bc0915e71 Mon Sep 17 00:00:00 2001 From: "Foram Katharotiya (OpenERP)" Date: Fri, 16 Nov 2012 16:33:33 +0530 Subject: [PATCH 002/277] [IMP] remove or lable & add close button in footer of embed form bzr revid: fka@tinyerp.com-20121116110333-yh5s9y8krdbx8a2h --- addons/share/wizard/share_wizard_view.xml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/addons/share/wizard/share_wizard_view.xml b/addons/share/wizard/share_wizard_view.xml index 859245b46a9..26e7fff0243 100644 --- a/addons/share/wizard/share_wizard_view.xml +++ b/addons/share/wizard/share_wizard_view.xml @@ -55,8 +55,7 @@
From 88312d20f3be0f55f35a47fccc9e9027f1a9969c Mon Sep 17 00:00:00 2001 From: "Foram Katharotiya (OpenERP)" Date: Fri, 16 Nov 2012 17:03:55 +0530 Subject: [PATCH 003/277] [IMP] improve code bzr revid: fka@tinyerp.com-20121116113355-adp2cnobjo9khimv --- addons/share/wizard/share_wizard_view.xml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/addons/share/wizard/share_wizard_view.xml b/addons/share/wizard/share_wizard_view.xml index 26e7fff0243..1cad761d936 100644 --- a/addons/share/wizard/share_wizard_view.xml +++ b/addons/share/wizard/share_wizard_view.xml @@ -55,7 +55,8 @@
@@ -83,7 +84,7 @@ - + @@ -95,6 +96,7 @@
+
From dc39953b9db3b38263346ef0ede80169bf0e6108 Mon Sep 17 00:00:00 2001 From: "Atul Patel (OpenERP)" Date: Fri, 16 Nov 2012 17:23:00 +0530 Subject: [PATCH 004/277] [IMP]: Improve string bzr revid: atp@tinyerp.com-20121116115300-at3bn1qx30xwnj5o --- addons/share/wizard/share_wizard_view.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/share/wizard/share_wizard_view.xml b/addons/share/wizard/share_wizard_view.xml index 1cad761d936..e0e800ab150 100644 --- a/addons/share/wizard/share_wizard_view.xml +++ b/addons/share/wizard/share_wizard_view.xml @@ -84,7 +84,7 @@ - + From 87312dca7f8414f73fde55061292b61122dce0c8 Mon Sep 17 00:00:00 2001 From: Stefan Rijnhart Date: Fri, 28 Dec 2012 16:14:53 +0100 Subject: [PATCH 005/277] [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 006/277] [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 5ff3ae203439dbd1d101cad5c88a298889ddf2c6 Mon Sep 17 00:00:00 2001 From: Phil Frost Date: Thu, 3 Jan 2013 18:10:05 -0500 Subject: [PATCH 007/277] kill the executable bit on things that are clearly not executables or scripts bzr revid: pfrost@openerpdev-20130103231005-56pglti6uss0jsm5 --- addons/account_asset/i18n/ca.po | 0 addons/account_asset/i18n/de.po | 0 addons/account_asset/i18n/es.po | 0 addons/account_asset/i18n/es_CR.po | 0 addons/account_asset/i18n/fr.po | 0 addons/account_asset/i18n/fr_BE.po | 0 addons/account_asset/i18n/pl.po | 0 addons/account_asset/i18n/pt.po | 0 addons/account_asset/i18n/sv.po | 0 addons/account_asset/security/ir.model.access.csv | 0 addons/account_asset/wizard/__init__.py | 0 .../wizard/account_asset_change_duration.py | 0 addons/account_asset/wizard/wizard_asset_compute.py | 0 .../lib/zocial/css/zocial-regular-webfont.eot | Bin .../lib/zocial/css/zocial-regular-webfont.svg | 0 .../lib/zocial/css/zocial-regular-webfont.ttf | Bin .../lib/zocial/css/zocial-regular-webfont.woff | Bin addons/base_import/static/lib/select2/README.md | 0 addons/base_import/static/lib/select2/select2.css | 0 addons/base_import/static/lib/select2/select2.js | 0 addons/base_import/static/lib/select2/spinner.gif | Bin addons/l10n_fr/l10n_fr_view.xml | 0 addons/l10n_fr_hr_payroll/__init__.py | 0 addons/l10n_fr_hr_payroll/__openerp__.py | 0 .../l10n_fr_hr_payroll/l10n_fr_hr_payroll_data.xml | 0 .../l10n_fr_hr_payroll/l10n_fr_hr_payroll_view.xml | 0 addons/l10n_hr/l10n_hr_chart_template.xml | 0 addons/l10n_ro/res_partner.py | 0 addons/mail/static/src/img/email_icon.png | Bin .../static/thunderbird_plugin/install.sh | 1 + .../lib/mousewheel/jquery.mousewheel-3.0.6.js | 0 addons/portal_event/portal_event_view.xml | 0 .../test/purchase_double_validation_test.yml | 0 .../test/purchase_requisition_demo.yml | 0 34 files changed, 1 insertion(+) mode change 100755 => 100644 addons/account_asset/i18n/ca.po mode change 100755 => 100644 addons/account_asset/i18n/de.po mode change 100755 => 100644 addons/account_asset/i18n/es.po mode change 100755 => 100644 addons/account_asset/i18n/es_CR.po mode change 100755 => 100644 addons/account_asset/i18n/fr.po mode change 100755 => 100644 addons/account_asset/i18n/fr_BE.po mode change 100755 => 100644 addons/account_asset/i18n/pl.po mode change 100755 => 100644 addons/account_asset/i18n/pt.po mode change 100755 => 100644 addons/account_asset/i18n/sv.po mode change 100755 => 100644 addons/account_asset/security/ir.model.access.csv mode change 100755 => 100644 addons/account_asset/wizard/__init__.py mode change 100755 => 100644 addons/account_asset/wizard/account_asset_change_duration.py mode change 100755 => 100644 addons/account_asset/wizard/wizard_asset_compute.py mode change 100755 => 100644 addons/auth_oauth/static/lib/zocial/css/zocial-regular-webfont.eot mode change 100755 => 100644 addons/auth_oauth/static/lib/zocial/css/zocial-regular-webfont.svg mode change 100755 => 100644 addons/auth_oauth/static/lib/zocial/css/zocial-regular-webfont.ttf mode change 100755 => 100644 addons/auth_oauth/static/lib/zocial/css/zocial-regular-webfont.woff mode change 100755 => 100644 addons/base_import/static/lib/select2/README.md mode change 100755 => 100644 addons/base_import/static/lib/select2/select2.css mode change 100755 => 100644 addons/base_import/static/lib/select2/select2.js mode change 100755 => 100644 addons/base_import/static/lib/select2/spinner.gif mode change 100755 => 100644 addons/l10n_fr/l10n_fr_view.xml mode change 100755 => 100644 addons/l10n_fr_hr_payroll/__init__.py mode change 100755 => 100644 addons/l10n_fr_hr_payroll/__openerp__.py mode change 100755 => 100644 addons/l10n_fr_hr_payroll/l10n_fr_hr_payroll_data.xml mode change 100755 => 100644 addons/l10n_fr_hr_payroll/l10n_fr_hr_payroll_view.xml mode change 100755 => 100644 addons/l10n_hr/l10n_hr_chart_template.xml mode change 100755 => 100644 addons/l10n_ro/res_partner.py mode change 100755 => 100644 addons/mail/static/src/img/email_icon.png mode change 100755 => 100644 addons/point_of_sale/static/lib/mousewheel/jquery.mousewheel-3.0.6.js mode change 100755 => 100644 addons/portal_event/portal_event_view.xml mode change 100755 => 100644 addons/purchase_double_validation/test/purchase_double_validation_test.yml mode change 100755 => 100644 addons/purchase_requisition/test/purchase_requisition_demo.yml diff --git a/addons/account_asset/i18n/ca.po b/addons/account_asset/i18n/ca.po old mode 100755 new mode 100644 diff --git a/addons/account_asset/i18n/de.po b/addons/account_asset/i18n/de.po old mode 100755 new mode 100644 diff --git a/addons/account_asset/i18n/es.po b/addons/account_asset/i18n/es.po old mode 100755 new mode 100644 diff --git a/addons/account_asset/i18n/es_CR.po b/addons/account_asset/i18n/es_CR.po old mode 100755 new mode 100644 diff --git a/addons/account_asset/i18n/fr.po b/addons/account_asset/i18n/fr.po old mode 100755 new mode 100644 diff --git a/addons/account_asset/i18n/fr_BE.po b/addons/account_asset/i18n/fr_BE.po old mode 100755 new mode 100644 diff --git a/addons/account_asset/i18n/pl.po b/addons/account_asset/i18n/pl.po old mode 100755 new mode 100644 diff --git a/addons/account_asset/i18n/pt.po b/addons/account_asset/i18n/pt.po old mode 100755 new mode 100644 diff --git a/addons/account_asset/i18n/sv.po b/addons/account_asset/i18n/sv.po old mode 100755 new mode 100644 diff --git a/addons/account_asset/security/ir.model.access.csv b/addons/account_asset/security/ir.model.access.csv old mode 100755 new mode 100644 diff --git a/addons/account_asset/wizard/__init__.py b/addons/account_asset/wizard/__init__.py old mode 100755 new mode 100644 diff --git a/addons/account_asset/wizard/account_asset_change_duration.py b/addons/account_asset/wizard/account_asset_change_duration.py old mode 100755 new mode 100644 diff --git a/addons/account_asset/wizard/wizard_asset_compute.py b/addons/account_asset/wizard/wizard_asset_compute.py old mode 100755 new mode 100644 diff --git a/addons/auth_oauth/static/lib/zocial/css/zocial-regular-webfont.eot b/addons/auth_oauth/static/lib/zocial/css/zocial-regular-webfont.eot old mode 100755 new mode 100644 diff --git a/addons/auth_oauth/static/lib/zocial/css/zocial-regular-webfont.svg b/addons/auth_oauth/static/lib/zocial/css/zocial-regular-webfont.svg old mode 100755 new mode 100644 diff --git a/addons/auth_oauth/static/lib/zocial/css/zocial-regular-webfont.ttf b/addons/auth_oauth/static/lib/zocial/css/zocial-regular-webfont.ttf old mode 100755 new mode 100644 diff --git a/addons/auth_oauth/static/lib/zocial/css/zocial-regular-webfont.woff b/addons/auth_oauth/static/lib/zocial/css/zocial-regular-webfont.woff old mode 100755 new mode 100644 diff --git a/addons/base_import/static/lib/select2/README.md b/addons/base_import/static/lib/select2/README.md old mode 100755 new mode 100644 diff --git a/addons/base_import/static/lib/select2/select2.css b/addons/base_import/static/lib/select2/select2.css old mode 100755 new mode 100644 diff --git a/addons/base_import/static/lib/select2/select2.js b/addons/base_import/static/lib/select2/select2.js old mode 100755 new mode 100644 diff --git a/addons/base_import/static/lib/select2/spinner.gif b/addons/base_import/static/lib/select2/spinner.gif old mode 100755 new mode 100644 diff --git a/addons/l10n_fr/l10n_fr_view.xml b/addons/l10n_fr/l10n_fr_view.xml old mode 100755 new mode 100644 diff --git a/addons/l10n_fr_hr_payroll/__init__.py b/addons/l10n_fr_hr_payroll/__init__.py old mode 100755 new mode 100644 diff --git a/addons/l10n_fr_hr_payroll/__openerp__.py b/addons/l10n_fr_hr_payroll/__openerp__.py old mode 100755 new mode 100644 diff --git a/addons/l10n_fr_hr_payroll/l10n_fr_hr_payroll_data.xml b/addons/l10n_fr_hr_payroll/l10n_fr_hr_payroll_data.xml old mode 100755 new mode 100644 diff --git a/addons/l10n_fr_hr_payroll/l10n_fr_hr_payroll_view.xml b/addons/l10n_fr_hr_payroll/l10n_fr_hr_payroll_view.xml old mode 100755 new mode 100644 diff --git a/addons/l10n_hr/l10n_hr_chart_template.xml b/addons/l10n_hr/l10n_hr_chart_template.xml old mode 100755 new mode 100644 diff --git a/addons/l10n_ro/res_partner.py b/addons/l10n_ro/res_partner.py old mode 100755 new mode 100644 diff --git a/addons/mail/static/src/img/email_icon.png b/addons/mail/static/src/img/email_icon.png old mode 100755 new mode 100644 diff --git a/addons/plugin_thunderbird/static/thunderbird_plugin/install.sh b/addons/plugin_thunderbird/static/thunderbird_plugin/install.sh index e1103b30acf..5ca7a5a934a 100755 --- a/addons/plugin_thunderbird/static/thunderbird_plugin/install.sh +++ b/addons/plugin_thunderbird/static/thunderbird_plugin/install.sh @@ -1,3 +1,4 @@ +#!/bin/sh make clean make cp ../openerp_plugin.xpi /home/openerp/ diff --git a/addons/point_of_sale/static/lib/mousewheel/jquery.mousewheel-3.0.6.js b/addons/point_of_sale/static/lib/mousewheel/jquery.mousewheel-3.0.6.js old mode 100755 new mode 100644 diff --git a/addons/portal_event/portal_event_view.xml b/addons/portal_event/portal_event_view.xml old mode 100755 new mode 100644 diff --git a/addons/purchase_double_validation/test/purchase_double_validation_test.yml b/addons/purchase_double_validation/test/purchase_double_validation_test.yml old mode 100755 new mode 100644 diff --git a/addons/purchase_requisition/test/purchase_requisition_demo.yml b/addons/purchase_requisition/test/purchase_requisition_demo.yml old mode 100755 new mode 100644 From 62a44180f64b19f1d428e9a47982be6edd0e573e Mon Sep 17 00:00:00 2001 From: ggh-openerp Date: Thu, 10 Jan 2013 18:18:16 +0530 Subject: [PATCH 008/277] [Fix]Fixed the space isuue in product label report lp bug: https://launchpad.net/bugs/1064691 fixed bzr revid: ggh@tinyerp.com-20130110124816-4xmp05eqgs00n3ef --- addons/product/report/product_label.xsl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/product/report/product_label.xsl b/addons/product/report/product_label.xsl index 641db73ea7d..5dbb2d64a28 100644 --- a/addons/product/report/product_label.xsl +++ b/addons/product/report/product_label.xsl @@ -67,7 +67,7 @@ - + From e6be210641bc58bc11117d8d55858e61c8469e7e Mon Sep 17 00:00:00 2001 From: Tien Tran Date: Fri, 18 Jan 2013 20:24:38 +0700 Subject: [PATCH 009/277] 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 010/277] 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 18599ffd701edd2cf5dd7e07bc87c6a1cfccb136 Mon Sep 17 00:00:00 2001 From: "Foram Katharotiya (OpenERP)" Date: Tue, 29 Jan 2013 14:43:15 +0530 Subject: [PATCH 011/277] [IMP] improve code bzr revid: fka@tinyerp.com-20130129091315-zrg45gu04ztkt5ve --- addons/share/wizard/share_wizard.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/share/wizard/share_wizard.py b/addons/share/wizard/share_wizard.py index aae13f66882..04f893936a2 100644 --- a/addons/share/wizard/share_wizard.py +++ b/addons/share/wizard/share_wizard.py @@ -660,7 +660,7 @@ class share_wizard(osv.TransientModel): self._assert(wizard_data.action_id and wizard_data.access_mode, _('Action and Access Mode are required to create a shared access.'), context=context) - self._assert(self.has_share(cr, uid, context=context), + self._assert(self.has_share(cr, uid, False, context=context), _('You must be a member of the Share/User group to use the share wizard.'), context=context) if wizard_data.user_type == 'emails': From e6f13c1f6ab29456e9e8c0f0fa9fbf395cd831de Mon Sep 17 00:00:00 2001 From: Tien Tran Date: Wed, 30 Jan 2013 23:24:38 +0700 Subject: [PATCH 012/277] 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 013/277] 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 014/277] [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 015/277] [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 016/277] [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 017/277] [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 018/277] [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 0cecdac970f884fcd2d65a1dea7880b27358fb51 Mon Sep 17 00:00:00 2001 From: Christophe Matthieu Date: Thu, 21 Mar 2013 13:49:52 +0100 Subject: [PATCH 019/277] [IMP] view_form: statusbar with folded selection bzr revid: chm@openerp.com-20130321124952-kwexraafd2681isg --- addons/web/static/src/css/base.css | 49 +++++++++++++++++++++------ addons/web/static/src/css/base.sass | 45 ++++++++++++------------ addons/web/static/src/js/view_form.js | 47 +++++++++++++------------ addons/web/static/src/xml/base.xml | 14 +++++++- 4 files changed, 99 insertions(+), 56 deletions(-) diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index be0bb19748c..ed32cbdbeaf 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -2158,6 +2158,7 @@ } .openerp .oe_form header { position: relative; + z-index: 1; border-bottom: 1px solid #cacaca; padding-left: 2px; background-color: #ededed; @@ -2630,17 +2631,17 @@ background-image: -o-linear-gradient(top, #fcfcfc, #dedede); background-image: linear-gradient(to bottom, #fcfcfc, #dedede); } -.openerp ul.oe_form_status li:first-child .label, .openerp ul.oe_form_status_clickable li:first-child .label { +.openerp ul.oe_form_status li:first-child .label, .openerp ul.oe_form_status_clickable li:first-child > .label { border-left: 1px solid #cacaca; padding-left: 14px; } .openerp ul.oe_form_status li:last-child, .openerp ul.oe_form_status_clickable li:last-child { border-right: 1px solid #cacaca; } -.openerp ul.oe_form_status li:last-child .label, .openerp ul.oe_form_status_clickable li:last-child .label { +.openerp ul.oe_form_status li:last-child .label, .openerp ul.oe_form_status_clickable li:last-child > .label { padding-right: 14px; } -.openerp ul.oe_form_status li:last-child .arrow, .openerp ul.oe_form_status_clickable li:last-child .arrow { +.openerp ul.oe_form_status li:last-child .arrow, .openerp ul.oe_form_status_clickable li:last-child > .arrow { display: none; } .openerp ul.oe_form_status li .label, .openerp ul.oe_form_status_clickable li .label { @@ -2690,18 +2691,18 @@ background-image: -o-linear-gradient(top, #729fcf, #3465a4); background-image: linear-gradient(to bottom, #729fcf, #3465a4); } -.openerp ul.oe_form_status li.oe_active .arrow span, .openerp ul.oe_form_status_clickable li.oe_active .arrow span { +.openerp ul.oe_form_status li.oe_active .arrow span, .openerp ul.oe_form_status_clickable li.oe_active > .arrow span { background-color: #3465a4; background: -moz-linear-gradient(135deg, #3465a4, #729fcf); background: -o-linear-gradient(135deg, #729fcf, #3465a4); background: -webkit-gradient(linear, left top, right bottom, from(#729fcf), to(#3465a4)); background: -ms-linear-gradient(top, #729fcf, #3465a4); } -.openerp ul.oe_form_status li.oe_active .label, .openerp ul.oe_form_status_clickable li.oe_active .label { +.openerp ul.oe_form_status li.oe_active .label, .openerp ul.oe_form_status_clickable li.oe_active > .label { color: white; text-shadow: 0 1px 1px #729fcf, 0 -1px 1px #3465a4; } -.openerp ul.oe_form_status_clickable li { +.openerp ul.oe_form_status_clickable > li { cursor: pointer; } .openerp ul.oe_form_status_clickable li:hover { @@ -2713,10 +2714,10 @@ background-image: -o-linear-gradient(top, #e8e8e8, #cacaca); background-image: linear-gradient(to bottom, #e8e8e8, #cacaca); } -.openerp ul.oe_form_status_clickable li:hover .label { +.openerp ul.oe_form_status_clickable li:hover > .label { text-shadow: 0 -1px 1px #fcfcfc, 0 1px 1px #dedede; } -.openerp ul.oe_form_status_clickable li:hover .arrow span { +.openerp ul.oe_form_status_clickable li:hover > .arrow span { background-color: #d9d9d9; background-image: -webkit-gradient(linear, left top, left bottom, from(#e8e8e8), to(#cacaca)); background-image: -webkit-linear-gradient(top, #e8e8e8, #cacaca); @@ -2725,7 +2726,7 @@ background-image: -o-linear-gradient(top, #e8e8e8, #cacaca); background-image: linear-gradient(to bottom, #e8e8e8, #cacaca); } -.openerp ul.oe_form_status_clickable li .label { +.openerp ul.oe_form_status_clickable li > .label { color: #7c7bad; } .openerp ul.oe_form_status_clickable li.oe_active:hover { @@ -2737,16 +2738,42 @@ background-image: -o-linear-gradient(top, #4c85c2, #284d7d); background-image: linear-gradient(to bottom, #4c85c2, #284d7d); } -.openerp ul.oe_form_status_clickable li.oe_active:hover .label { +.openerp ul.oe_form_status_clickable li.oe_active:hover > .label { text-shadow: 0 -1px 1px #729fcf, 0 1px 1px #3465a4; } -.openerp ul.oe_form_status_clickable li.oe_active:hover .arrow span { +.openerp ul.oe_form_status_clickable li.oe_active:hover > .arrow span { background-color: #284d7d; background: -moz-linear-gradient(135deg, #284d7d, #4c85c2); background: -o-linear-gradient(135deg, #4c85c2, #284d7d); background: -webkit-gradient(linear, left top, right bottom, from(#4c85c2), to(#284d7d)); background: -ms-linear-gradient(top, #4c85c2, #284d7d); } +.openerp ul.oe_form_field_status li.oe_folded .label{ + padding-bottom: 8px; +} +.openerp ul.oe_form_field_status li.oe_folded ul{ + position: absolute; + border-top: 1px solid #cacaca; + float: none; + top: 30px; + right: 0; + display: none; +} +.openerp ul.oe_form_field_status li.oe_folded:hover ul{ + display: block; +} +.openerp ul.oe_form_field_status li.oe_folded ul li{ + margin: 0; + border-left: 1px solid #cacaca; + display: block; +} +.openerp ul.oe_form_field_status li.oe_folded ul li .label{ + border: 0; + padding-left: 24px; +} +.openerp ul.oe_form_field_status li.oe_folded ul li:last-child { + border-bottom: 1px solid #cacaca; +} .openerp .oe_form .oe_form_field_one2many > .oe_view_manager .oe_list_pager_single_page { display: none; } diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index e2c047f11e1..90d576eb6a1 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1707,6 +1707,7 @@ $sheet-padding: 16px // FormView.header {{{ .oe_form header position: relative + z-index: 1 border-bottom: 1px solid #cacaca padding-left: 2px @include vertical-gradient(#fcfcfc, #dedede) @@ -2092,16 +2093,16 @@ $sheet-padding: 16px margin: 0 -18px 0 0 padding: 0 @include vertical-gradient(#fcfcfc, #dedede) - &:first-child .label + &:first-child > .label border-left: 1px solid #cacaca padding-left: 14px &:last-child border-right: 1px solid #cacaca - .label + > .label padding-right: 14px - .arrow + > .arrow display: none - .label + > .label color: #4c4c4c text-shadow: 0 1px 1px #fcfcfc, 0 -1px 1px #dedede padding: 7px @@ -2109,7 +2110,7 @@ $sheet-padding: 16px padding-left: 24px margin: 0 position: relative - .arrow + > .arrow width: 17px display: inline-block vertical-align: top @@ -2128,9 +2129,9 @@ $sheet-padding: 16px @include transform(rotate(45deg)) li.oe_active @include vertical-gradient(#729fcf, #3465a4) - .arrow span + > .arrow span @include skew-gradient(#729fcf, #3465a4) - .label + > .label color: white text-shadow: 0 1px 1px #729fcf, 0 -1px 1px #3465a4 ul.oe_form_status_clickable @@ -2138,18 +2139,18 @@ $sheet-padding: 16px cursor: pointer &:hover @include vertical-gradient(darken(#fcfcfc, 8%), darken(#dedede, 8%)) - .label + > .label text-shadow: 0 -1px 1px #fcfcfc, 0 1px 1px #dedede - .arrow span + > .arrow span @include vertical-gradient(darken(#fcfcfc, 8%), darken(#dedede, 8%)) - .label + > .label color: $link-color li.oe_active &:hover @include vertical-gradient(darken(#729fcf, 10%), darken(#3465a4, 10%)) - .label + > .label text-shadow: 0 -1px 1px #729fcf, 0 1px 1px #3465a4 - .arrow span + > .arrow span @include skew-gradient(darken(#729fcf, 10%), darken(#3465a4, 10%)) // }}} // FormView.one2many {{{ @@ -2609,26 +2610,26 @@ div.ui-widget-overlay &:last-child overflow: hidden border-right: 1px solid #cacaca - .label + > .label padding-right: 14px border-right: none - .arrow + > .arrow display: inline-block opacity: 0 filter: alpha(opacity = 0) border: none width: 0 border-right: none - .label - border-bottom: 1px solid #cacaca - background: transparent - .arrow - span - background-color: #fefefe !important + > .label + border-bottom: 1px solid #cacaca + background: transparent + > .arrow + span + background-color: #fefefe !important li.oe_active - .label + > .label border-bottom: 1px solid #729fcf - .arrow span + > .arrow span background-color: #729fcf !important // jquery ui for ie diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index b057616b6ab..a6ed212fbdc 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -5263,8 +5263,8 @@ instance.web.form.FieldStatus = instance.web.form.AbstractField.extend({ this.options.clickable = this.options.clickable || (this.node.attrs || {}).clickable || false; this.options.visible = this.options.visible || (this.node.attrs || {}).statusbar_visible || false; this.set({value: false}); - this.selection = []; - this.set("selection", []); + this.selection = {'unfolded': [], 'folded': []}; + this.set("selection", {'unfolded': [], 'folded': []}); this.selection_dm = new instance.web.DropMisordered(); }, start: function() { @@ -5278,7 +5278,7 @@ instance.web.form.FieldStatus = instance.web.form.AbstractField.extend({ }); this.get_selection(); if (this.options.clickable) { - this.$el.on('click','li',this.on_click_stage); + this.$el.on('click','li:not(.oe_folded)',this.on_click_stage); } if (this.$el.parent().is('header')) { this.$el.after('
'); @@ -5293,7 +5293,10 @@ instance.web.form.FieldStatus = instance.web.form.AbstractField.extend({ }, render_value: function() { var self = this; - var content = QWeb.render("FieldStatus.content", {widget: self}); + var content = QWeb.render("FieldStatus.content", { + 'widget': self, + 'value_folded': _.find(self.selection.folded, function(i){return i[0] === self.get('value')}) + }); self.$el.html(content); var colors = JSON.parse((self.node.attrs || {}).statusbar_colors || "{}"); var color = colors[self.get('value')]; @@ -5303,15 +5306,8 @@ instance.web.form.FieldStatus = instance.web.form.AbstractField.extend({ }, calc_domain: function() { var d = instance.web.pyeval.eval('domain', this.build_domain()); - var domain = []; //if there is no domain defined, fetch all the records - - if (d.length) { - domain = ['|',['id', '=', this.get('value')]].concat(d); - } - - if (! _.isEqual(domain, this.get("evaluated_selection_domain"))) { - this.set("evaluated_selection_domain", domain); - } + this.set("evaluated_selection_domain", ['&', ['fold', '=', false], '|', ['id', '=', this.get('value')]].concat(d)); + this.set("evaluated_selection_domain_folded", ['&', ['fold', '!=', false], '|', ['id', '=', this.get('value')]].concat(d)); }, /** Get the selection and render it * selection: [[identifier, value_to_display], ...] @@ -5320,18 +5316,24 @@ instance.web.form.FieldStatus = instance.web.form.AbstractField.extend({ */ get_selection: function() { var self = this; - var selection = []; + var selection_unfolded = []; + var selection_folded = []; var calculation = _.bind(function() { if (this.field.type == "many2one") { - var domain = []; - var ds = new instance.web.DataSetSearch(this, this.field.relation, - self.build_context(), this.get("evaluated_selection_domain")); - return ds.read_slice(['name'], {}).then(function (records) { - for(var i = 0; i < records.length; i++) { - selection.push([records[i].id, records[i].name]); - } - }); + var ds_unfold = new instance.web.DataSetSearch(self, self.field.relation, self.build_context(), this.get("evaluated_selection_domain")) + .read_slice(['name'], {}).then(function (records) { + _.each(records, function (record) { + selection_unfolded.push([record.id, record.name]); + }); + }); + var ds_fold = new instance.web.DataSetSearch(self, self.field.relation, self.build_context(), this.get("evaluated_selection_domain_folded")) + .read_slice(['name'], {}).then(function (records) { + _.each(records, function (record) { + selection_folded.push([record.id, record.name]); + }); + }); + return $.when(ds_unfold, ds_fold); } else { // For field type selection filter values according to // statusbar_visible attribute of the field. For example: @@ -5347,6 +5349,7 @@ instance.web.form.FieldStatus = instance.web.form.AbstractField.extend({ } }, this); this.selection_dm.add(calculation()).then(function () { + var selection = {'unfolded': selection_unfolded, 'folded': selection_folded}; if (! _.isEqual(selection, self.get("selection"))) { self.set("selection", selection); } diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index 5ac7e5c3ef6..623fdc2de53 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -1190,13 +1190,25 @@
    - +
    • + +
  • + ... +
      + +
    • + +
      • +       +
    +
    • +     From 809ec6e49f0eb328f318ce08e4baa2a87fa3db67 Mon Sep 17 00:00:00 2001 From: Christophe Matthieu Date: Thu, 21 Mar 2013 13:56:26 +0100 Subject: [PATCH 020/277] [IMP] view_form: statusbar with folded selection, remove fold = false bzr revid: chm@openerp.com-20130321125626-83cckp5vdb14t18u --- addons/crm/crm_lead.py | 2 +- addons/crm_claim/crm_claim.py | 2 +- addons/hr_recruitment/hr_recruitment.py | 2 +- addons/project/project.py | 2 +- addons/project_issue/project_issue.py | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py index 6c74ead0140..53fd7179c25 100644 --- a/addons/crm/crm_lead.py +++ b/addons/crm/crm_lead.py @@ -266,7 +266,7 @@ class crm_lead(base_stage, format_address, osv.osv): 'priority': fields.selection(crm.AVAILABLE_PRIORITIES, 'Priority', select=True), 'date_closed': fields.datetime('Closed', readonly=True), 'stage_id': fields.many2one('crm.case.stage', 'Stage', track_visibility='onchange', - domain="['&', '&', ('fold', '=', False), ('section_ids', '=', section_id), '|', ('type', '=', type), ('type', '=', 'both')]"), + domain="['&', ('section_ids', '=', section_id), '|', ('type', '=', type), ('type', '=', 'both')]"), 'user_id': fields.many2one('res.users', 'Salesperson', select=True, track_visibility='onchange'), 'referred': fields.char('Referred By', size=64), 'date_open': fields.datetime('Opened', readonly=True), diff --git a/addons/crm_claim/crm_claim.py b/addons/crm_claim/crm_claim.py index 275d9edaab4..774571b0314 100644 --- a/addons/crm_claim/crm_claim.py +++ b/addons/crm_claim/crm_claim.py @@ -105,7 +105,7 @@ class crm_claim(base_stage, osv.osv): 'email_from': fields.char('Email', size=128, help="Destination email for email gateway."), 'partner_phone': fields.char('Phone', size=32), 'stage_id': fields.many2one ('crm.claim.stage', 'Stage', track_visibility='onchange', - domain="['&',('fold', '=', False),'|', ('section_ids', '=', section_id), ('case_default', '=', True)]"), + domain="['|', ('section_ids', '=', section_id), ('case_default', '=', True)]"), 'cause': fields.text('Root Cause'), 'state': fields.related('stage_id', 'state', type="selection", store=True, selection=crm.AVAILABLE_STATES, string="Status", readonly=True, diff --git a/addons/hr_recruitment/hr_recruitment.py b/addons/hr_recruitment/hr_recruitment.py index deccf10619f..fa6b861ff3f 100644 --- a/addons/hr_recruitment/hr_recruitment.py +++ b/addons/hr_recruitment/hr_recruitment.py @@ -196,7 +196,7 @@ class hr_applicant(base_stage, osv.Model): 'create_date': fields.datetime('Creation Date', readonly=True, select=True), 'write_date': fields.datetime('Update Date', readonly=True), 'stage_id': fields.many2one ('hr.recruitment.stage', 'Stage', track_visibility='onchange', - domain="['&', ('fold', '=', False), '|', ('department_id', '=', department_id), ('department_id', '=', False)]"), + domain="['|', ('department_id', '=', department_id), ('department_id', '=', False)]"), 'state': fields.related('stage_id', 'state', type="selection", store=True, selection=AVAILABLE_STATES, string="Status", readonly=True, help='The status is set to \'Draft\', when a case is created.\ diff --git a/addons/project/project.py b/addons/project/project.py index 0751865d9c4..5263fea9166 100644 --- a/addons/project/project.py +++ b/addons/project/project.py @@ -732,7 +732,7 @@ class task(base_stage, osv.osv): 'priority': fields.selection([('4','Very Low'), ('3','Low'), ('2','Medium'), ('1','Important'), ('0','Very important')], 'Priority', select=True), 'sequence': fields.integer('Sequence', select=True, help="Gives the sequence order when displaying a list of tasks."), 'stage_id': fields.many2one('project.task.type', 'Stage', track_visibility='onchange', - domain="['&', ('fold', '=', False), ('project_ids', '=', project_id)]"), + domain="[('project_ids', '=', project_id)]"), 'state': fields.related('stage_id', 'state', type="selection", store=True, selection=_TASK_STATE, string="Status", readonly=True, help='The status is set to \'Draft\', when a case is created.\ diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py index 9233a95634c..a8f2ba28553 100644 --- a/addons/project_issue/project_issue.py +++ b/addons/project_issue/project_issue.py @@ -275,7 +275,7 @@ class project_issue(base_stage, osv.osv): 'version_id': fields.many2one('project.issue.version', 'Version'), 'stage_id': fields.many2one ('project.task.type', 'Stage', track_visibility='onchange', - domain="['&', ('fold', '=', False), ('project_ids', '=', project_id)]"), + domain="[('project_ids', '=', project_id)]"), 'project_id':fields.many2one('project.project', 'Project', track_visibility='onchange'), 'duration': fields.float('Duration'), 'task_id': fields.many2one('project.task', 'Task', domain="[('project_id','=',project_id)]"), From 4e43bccebcd414ee3c3aa436cea96926c22718cb Mon Sep 17 00:00:00 2001 From: Christophe Matthieu Date: Thu, 21 Mar 2013 16:21:56 +0100 Subject: [PATCH 021/277] [FIX] view_form: FieldStatus bzr revid: chm@openerp.com-20130321152156-3w3vnzn35effxji6 --- addons/web/static/src/js/view_form.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index a6ed212fbdc..28c31b80dd6 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -5342,7 +5342,7 @@ instance.web.form.FieldStatus = instance.web.form.AbstractField.extend({ for(var i=0; i < select.length; i++) { var key = select[i][0]; if(key == this.get('value') || !this.options.visible || this.options.visible.indexOf(key) != -1) { - selection.push(select[i]); + selection_unfolded.push(select[i]); } } return $.when(); From cc4b2bbb2729077eea4dde9282eb696ce83188d4 Mon Sep 17 00:00:00 2001 From: Christophe Matthieu Date: Thu, 21 Mar 2013 17:11:23 +0100 Subject: [PATCH 022/277] [IMP] view_form: fix FieldStatus bzr revid: chm@openerp.com-20130321161123-j2qc2ynchneibf1o --- addons/web/static/src/js/view_form.js | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index 28c31b80dd6..4f5d2e1cc47 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -5306,8 +5306,7 @@ instance.web.form.FieldStatus = instance.web.form.AbstractField.extend({ }, calc_domain: function() { var d = instance.web.pyeval.eval('domain', this.build_domain()); - this.set("evaluated_selection_domain", ['&', ['fold', '=', false], '|', ['id', '=', this.get('value')]].concat(d)); - this.set("evaluated_selection_domain_folded", ['&', ['fold', '!=', false], '|', ['id', '=', this.get('value')]].concat(d)); + this.set("evaluated_selection_domain", ['|', ['id', '=', this.get('value')]].concat(d)); }, /** Get the selection and render it * selection: [[identifier, value_to_display], ...] @@ -5321,19 +5320,16 @@ instance.web.form.FieldStatus = instance.web.form.AbstractField.extend({ var calculation = _.bind(function() { if (this.field.type == "many2one") { - var ds_unfold = new instance.web.DataSetSearch(self, self.field.relation, self.build_context(), this.get("evaluated_selection_domain")) - .read_slice(['name'], {}).then(function (records) { + return new instance.web.DataSetSearch(self, self.field.relation, self.build_context(), this.get("evaluated_selection_domain")) + .read_slice(['name', 'fold'], {}).then(function (records) { _.each(records, function (record) { - selection_unfolded.push([record.id, record.name]); + if (record.fold) { + selection_folded.push([record.id, record.name]); + } else { + selection_unfolded.push([record.id, record.name]); + } }); }); - var ds_fold = new instance.web.DataSetSearch(self, self.field.relation, self.build_context(), this.get("evaluated_selection_domain_folded")) - .read_slice(['name'], {}).then(function (records) { - _.each(records, function (record) { - selection_folded.push([record.id, record.name]); - }); - }); - return $.when(ds_unfold, ds_fold); } else { // For field type selection filter values according to // statusbar_visible attribute of the field. For example: From 34a425588516f824458209fabd7eab6f6e91fc80 Mon Sep 17 00:00:00 2001 From: "Turkesh Patel (Open ERP)" Date: Tue, 26 Mar 2013 14:22:12 +0530 Subject: [PATCH 023/277] [FIX] fix some usability issues bzr revid: tpa@tinyerp.com-20130326085212-05wtuqzf8g8t98p2 --- addons/l10n_ro/partner_view.xml | 1 - addons/point_of_sale/wizard/pos_payment.xml | 2 +- addons/portal/portal_demo.xml | 2 +- addons/project/project_view.xml | 15 ++++++++------- addons/sale_stock/stock_view.xml | 12 +----------- 5 files changed, 11 insertions(+), 21 deletions(-) diff --git a/addons/l10n_ro/partner_view.xml b/addons/l10n_ro/partner_view.xml index c03d5c9a1a6..102ba3d92f0 100644 --- a/addons/l10n_ro/partner_view.xml +++ b/addons/l10n_ro/partner_view.xml @@ -7,7 +7,6 @@ res.partner - diff --git a/addons/point_of_sale/wizard/pos_payment.xml b/addons/point_of_sale/wizard/pos_payment.xml index 3b1cde3e488..2e828521757 100644 --- a/addons/point_of_sale/wizard/pos_payment.xml +++ b/addons/point_of_sale/wizard/pos_payment.xml @@ -15,7 +15,7 @@
    diff --git a/addons/portal/portal_demo.xml b/addons/portal/portal_demo.xml index c05189fd2ab..3660754b4ad 100644 --- a/addons/portal/portal_demo.xml +++ b/addons/portal/portal_demo.xml @@ -40,7 +40,7 @@ Mr Demo Portal mail.group - As your first portal member, I am very pleased to be able to be able to communicate directly with you. Be sure I'll read all news carefully!

    ]]>     + As your first portal member, I am very pleased to be able to communicate directly with you. Be sure I'll read all news carefully!

    ]]>     comment diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml index 16dbe44ccc1..023bc6af00a 100644 --- a/addons/project/project_view.xml +++ b/addons/project/project_view.xml @@ -133,13 +133,6 @@ - -
    - -
    -     @@ -153,6 +146,13 @@ + +
    + +
    +     @@ -503,6 +503,7 @@
  • !
+
    • diff --git a/addons/sale_stock/stock_view.xml b/addons/sale_stock/stock_view.xml index d06526902fd..0f5b9c4f1e6 100644 --- a/addons/sale_stock/stock_view.xml +++ b/addons/sale_stock/stock_view.xml @@ -1,16 +1,6 @@ - - stock.picking.form - stock.picking - - - - - - - stock.move.form @@ -51,7 +41,7 @@ Outgoing picking Inherited - stock.picking + stock.picking.out From 876c7900775baa7a653983ba1049355497dcd439 Mon Sep 17 00:00:00 2001 From: bth Date: Tue, 26 Mar 2013 15:14:32 +0530 Subject: [PATCH 024/277] [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 025/277] [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 05f4331604031a62ba41a400e38fbeb1cf17cf23 Mon Sep 17 00:00:00 2001 From: "Turkesh Patel (Open ERP)" Date: Thu, 28 Mar 2013 12:29:03 +0530 Subject: [PATCH 026/277] [IMP] improved css to make alignment of expandable option in search box consistent bzr revid: tpa@tinyerp.com-20130328065903-a8mqd3a2k727v8i3 --- addons/web/static/src/css/base.css | 7 +++++-- addons/web/static/src/css/base.sass | 6 ++++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index be0bb19748c..a83a1d85c51 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -1838,12 +1838,12 @@ margin: 0; } .openerp .oe_searchview .oe_searchview_drawer h3 { - margin: 8px 4px 4px 12px; + margin: 8px 4px 4px 0px; color: #7c7bad; font-size: 13px; } .openerp .oe_searchview .oe_searchview_drawer h4, .openerp .oe_searchview .oe_searchview_drawer h4 * { - margin: 0; + margin: 0 0 0 2px; cursor: pointer; font-weight: normal; display: inline-block; @@ -1920,6 +1920,9 @@ .openerp .oe_searchview .oe_searchview_drawer .oe_searchview_custom { padding: 0 8px 8px 8px; } +.openerp .oe_searchview .oe_searchview_drawer .oe_searchview_custom div { + padding: 0; +} .openerp .oe_searchview .oe_searchview_drawer .oe_searchview_custom form { display: none; } diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index e2c047f11e1..794b4ac4580 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1460,11 +1460,11 @@ $sheet-padding: 16px border-top: none margin: 0 h3 - margin: 8px 4px 4px 12px + margin: 8px 4px 4px 0px color: $section-title-color font-size: 13px h4, h4 * - margin: 0 + margin: 0 0 0 2px cursor: pointer font-weight: normal display: inline-block @@ -1520,6 +1520,8 @@ $sheet-padding: 16px margin: 0 0 8px 0 .oe_searchview_custom padding: 0 8px 8px 8px + div + padding: 0 form display: none li From 0f1d7c9e9e65c19fa33e4144e6fd079eec8be88f Mon Sep 17 00:00:00 2001 From: "Turkesh Patel (Open ERP)" Date: Thu, 28 Mar 2013 12:38:56 +0530 Subject: [PATCH 027/277] [IMP] improved code to fix visibility related issue bzr revid: tpa@tinyerp.com-20130328070856-ohmghoo3bj1comx9 --- addons/mail/static/src/css/mail.css | 1 + addons/web_shortcuts/static/src/css/web_shortcuts.css | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/addons/mail/static/src/css/mail.css b/addons/mail/static/src/css/mail.css index 51306727a09..b4056ed320c 100644 --- a/addons/mail/static/src/css/mail.css +++ b/addons/mail/static/src/css/mail.css @@ -624,6 +624,7 @@ } .openerp .oe_followers .oe_partner { height: 32px; + margin-right: 8px; overflow: hidden; white-space: nowrap; } diff --git a/addons/web_shortcuts/static/src/css/web_shortcuts.css b/addons/web_shortcuts/static/src/css/web_shortcuts.css index 8424e146d06..73b2d449edc 100644 --- a/addons/web_shortcuts/static/src/css/web_shortcuts.css +++ b/addons/web_shortcuts/static/src/css/web_shortcuts.css @@ -54,4 +54,6 @@ border-left: none; padding-left: 0; } - +.openerp .oe_dropdown_menu > li > a:hover{ + overflow: visible; +} From 11ffa1be3bc41b79c3edb877164e6a7ed2912a81 Mon Sep 17 00:00:00 2001 From: Christophe Matthieu Date: Thu, 28 Mar 2013 11:41:16 +0100 Subject: [PATCH 028/277] [IMP] view_form: statusbar: see the folded stage where i am bzr revid: chm@openerp.com-20130328104116-gn6ve3g2p4d496ss --- addons/web/static/src/js/view_form.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index 4f5d2e1cc47..1e69df1e6d1 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -5323,7 +5323,7 @@ instance.web.form.FieldStatus = instance.web.form.AbstractField.extend({ return new instance.web.DataSetSearch(self, self.field.relation, self.build_context(), this.get("evaluated_selection_domain")) .read_slice(['name', 'fold'], {}).then(function (records) { _.each(records, function (record) { - if (record.fold) { + if (record.fold && record.id != self.get('value')) { selection_folded.push([record.id, record.name]); } else { selection_unfolded.push([record.id, record.name]); From bfe3b6d829da623dd56660446fabbf800bc3352a Mon Sep 17 00:00:00 2001 From: "Turkesh Patel (Open ERP)" Date: Fri, 29 Mar 2013 11:27:03 +0530 Subject: [PATCH 029/277] [IMP] improved code bzr revid: tpa@tinyerp.com-20130329055703-wrwwwdjvmrf4ghdn --- addons/web/static/src/css/base.css | 3 +++ addons/web/static/src/css/base.sass | 2 ++ 2 files changed, 5 insertions(+) diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index a83a1d85c51..439757eb5be 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -1923,6 +1923,9 @@ .openerp .oe_searchview .oe_searchview_drawer .oe_searchview_custom div { padding: 0; } +.openerp .oe_searchview .oe_searchview_drawer .oe_searchview_custom div h4 { + margin: 0; +} .openerp .oe_searchview .oe_searchview_drawer .oe_searchview_custom form { display: none; } diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 794b4ac4580..962b66d8d98 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1522,6 +1522,8 @@ $sheet-padding: 16px padding: 0 8px 8px 8px div padding: 0 + h4 + margin: 0 form display: none li From c4ef5d2f6cc801de0b5bf96b0a7b606506b001a0 Mon Sep 17 00:00:00 2001 From: "Turkesh Patel (Open ERP)" Date: Fri, 29 Mar 2013 16:44:51 +0530 Subject: [PATCH 030/277] [IMP] improved css and view bzr revid: tpa@tinyerp.com-20130329111451-49ouiym81aeh1np4 --- addons/mail/static/src/css/mail.css | 1 + addons/sale_crm/sale_crm_view.xml | 2 +- addons/web_shortcuts/static/src/css/web_shortcuts.css | 7 ++++--- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/addons/mail/static/src/css/mail.css b/addons/mail/static/src/css/mail.css index b4056ed320c..da2e5f1a3a0 100644 --- a/addons/mail/static/src/css/mail.css +++ b/addons/mail/static/src/css/mail.css @@ -627,6 +627,7 @@ margin-right: 8px; overflow: hidden; white-space: nowrap; + text-overflow: ellipsis; } .openerp .oe_followers .oe_partner img{ width: 32px; diff --git a/addons/sale_crm/sale_crm_view.xml b/addons/sale_crm/sale_crm_view.xml index 0b5fce2f5cd..81e6ee68076 100644 --- a/addons/sale_crm/sale_crm_view.xml +++ b/addons/sale_crm/sale_crm_view.xml @@ -106,7 +106,7 @@ - + diff --git a/addons/web_shortcuts/static/src/css/web_shortcuts.css b/addons/web_shortcuts/static/src/css/web_shortcuts.css index 73b2d449edc..5d4e34f53b9 100644 --- a/addons/web_shortcuts/static/src/css/web_shortcuts.css +++ b/addons/web_shortcuts/static/src/css/web_shortcuts.css @@ -54,6 +54,7 @@ border-left: none; padding-left: 0; } -.openerp .oe_dropdown_menu > li > a:hover{ - overflow: visible; -} +.oe_systray_shortcuts_items > li > a:hover { + overflow:visible; + white-space: normal; +} \ No newline at end of file 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 031/277] [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 8c67d4150b257f3338f3538fb874bcca6a00e287 Mon Sep 17 00:00:00 2001 From: Christophe Matthieu Date: Wed, 3 Apr 2013 16:22:06 +0200 Subject: [PATCH 032/277] [PROGRESS] bzr revid: chm@openerp.com-20130403142206-i4oirpl41usx4qg0 --- addons/mail/mail_thread.py | 30 ++++++++++++++++++++++++++++++ addons/mail/mail_thread_view.xml | 2 ++ addons/mail/static/src/js/mail.js | 1 + 3 files changed, 33 insertions(+) diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py index cb8da42ab47..23341ac148f 100644 --- a/addons/mail/mail_thread.py +++ b/addons/mail/mail_thread.py @@ -1078,6 +1078,36 @@ class mail_thread(osv.AbstractModel): self.message_subscribe(cr, uid, [thread_id], [message.author_id.id], context=context) return msg_id + def get_message_action_from_link(self, cr, uid, message_id, context=None): + action = None + msg_obj = self.pool.get('mail.message') + msg = msg_obj.browse(cr, uid, message_id, context=context) + if msg.model: + try: + self.pool.get(msg.model).check_access_rights(cr, uid, 'read') + action = { + 'type': 'ir.actions.act_window', + 'res_model': msg.model, + 'view_type': 'form', + 'view_mode': 'form', + 'views': [(msg.res_id, 'form')], + 'target': 'current', + 'res_id': msg.res_id, + } + except openerp.exceptions.AccessDenied: + mod_obj = self.pool.get('ir.model.data') + act_model, act_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'mail', 'action_mail_inbox_feeds') + action = self.pool.get(act_model).read(cr, uid, act_id, []) + action.update({ + 'context': { + 'default_model': 'res.users', + 'default_res_id': uid, + 'search_default_res_id': 1, + 'search_default_model': 1, + } + }) + return action + #------------------------------------------------------ # Compatibility methods: do not use # TDE TODO: remove me in 8.0 diff --git a/addons/mail/mail_thread_view.xml b/addons/mail/mail_thread_view.xml index 75c86e4645d..62fde0cf026 100644 --- a/addons/mail/mail_thread_view.xml +++ b/addons/mail/mail_thread_view.xml @@ -8,6 +8,8 @@ { 'default_model': 'res.users', 'default_res_id': uid, + 'search_default_model': context.get('params') and context.params.get('model'), + 'search_default_res_id': context.get('params') and context.params.get('res_id') } Date: Fri, 12 Apr 2013 12:35:48 +0530 Subject: [PATCH 036/277] [IMP] hide Storage Location entire group in the inventory for products of type service & move company_id after sale price in information tab bzr revid: fka@tinyerp.com-20130412070548-3wh0mi5k32la17yk --- addons/stock/product_view.xml | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/addons/stock/product_view.xml b/addons/stock/product_view.xml index dc80c0f950a..6348858b80c 100644 --- a/addons/stock/product_view.xml +++ b/addons/stock/product_view.xml @@ -72,6 +72,9 @@ + Add others
    From b5b6dfbbf0e3defc9a823ddb7ecc8aaeb9f07c0b Mon Sep 17 00:00:00 2001 From: Launchpad Translations on behalf of openerp <> Date: Thu, 16 May 2013 05:12:14 +0000 Subject: [PATCH 215/277] Launchpad automatic translations update. bzr revid: launchpad_translations_on_behalf_of_openerp-20130515051525-6h06w6secz3p61fv bzr revid: launchpad_translations_on_behalf_of_openerp-20130516051214-e3v0iwa7lh573r9b --- addons/account_asset/i18n/th.po | 741 +++++++++++ addons/account_cancel/i18n/th.po | 23 + addons/contacts/i18n/th.po | 37 + addons/portal/i18n/ko.po | 2 +- addons/project/i18n/th.po | 2109 ++++++++++++++++++++++++++++++ addons/warning/i18n/th.po | 215 +++ 6 files changed, 3126 insertions(+), 1 deletion(-) 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..fdc6c7b4754 --- /dev/null +++ b/addons/account_asset/i18n/th.po @@ -0,0 +1,741 @@ +# 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: 2012-12-21 17:04+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:12+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 +#: 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 +#: 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 +#: 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..eabcc0814dd --- /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: 2012-12-21 17:05+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:12+0000\n" +"X-Generator: Launchpad (build 16626)\n" + +#. module: account_cancel +#: view:account.invoice:0 +msgid "Cancel" +msgstr "" diff --git a/addons/contacts/i18n/th.po b/addons/contacts/i18n/th.po new file mode 100644 index 00000000000..a75ecac2237 --- /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: 2012-12-21 17:05+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:12+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/portal/i18n/ko.po b/addons/portal/i18n/ko.po index 252ca7d4dcc..b1d03cc0e7e 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 05:30+0000\n" +"X-Launchpad-Export-Date: 2013-05-15 05:15+0000\n" "X-Generator: Launchpad (build 16617)\n" #. module: portal diff --git a/addons/project/i18n/th.po b/addons/project/i18n/th.po new file mode 100644 index 00000000000..7dfd58eee63 --- /dev/null +++ b/addons/project/i18n/th.po @@ -0,0 +1,2109 @@ +# 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: 2012-12-21 17:04+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:12+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 +#: 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 +#: 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.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: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,work_ids:0 +msgid "Work done" +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 +#: 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.history,date:0 +#: field:project.task.history.cumulative,date:0 +#: field:project.task.work,date:0 +msgid "Date" +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 +#: 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 +#: selection:project.task,priority:0 +msgid "Important" +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.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.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 +#: 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 +#: model:ir.ui.menu,name:project.menu_task_types_view +msgid "Task Stages" +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..24ae791caae --- /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: 2012-12-21 17:06+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:12+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 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 216/277] 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 217/277] [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 218/277] [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 219/277] [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 220/277] [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 f4ad388635d57ebcb51bc98b00e6be295b814e12 Mon Sep 17 00:00:00 2001 From: "dle@openerp.com" <> Date: Thu, 16 May 2013 14:20:12 +0200 Subject: [PATCH 221/277] [ADD]crm: lead as mark as lost multi action bzr revid: dle@openerp.com-20130516122012-pc2sfojl59hs3y7x --- addons/crm/crm_lead_view.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml index 8c22a0a2e1c..e306758f6a7 100644 --- a/addons/crm/crm_lead_view.xml +++ b/addons/crm/crm_lead_view.xml @@ -608,5 +608,22 @@ + + Mark As Lost + + code + + if context.get('active_model') == 'crm.lead' and context.get('active_ids'): + self.case_mark_lost(cr, uid, context['active_ids'], context=context) + + + + + + + Mark As Lost + + + From 8adb904c2367de9f7b2c30ea6eb4724e32c90c86 Mon Sep 17 00:00:00 2001 From: Christophe Matthieu Date: Thu, 16 May 2013 14:33:04 +0200 Subject: [PATCH 222/277] [FIX] status: css bzr revid: chm@openerp.com-20130516123304-5asyucwqum8ys1me --- addons/web/static/src/css/base.css | 26 ++++++++++++++++++++++++++ addons/web/static/src/css/base.sass | 21 +++++++++++++++++++++ 2 files changed, 47 insertions(+) diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index fb6ab471132..5d586bc41d3 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -2711,6 +2711,32 @@ -o-transform: rotate(45deg); transform: rotate(45deg); } +.openerp ul.oe_form_status .oe_folded .label, .openerp ul.oe_form_status_clickable .oe_folded .label { + padding-bottom: 8px; +} +.openerp ul.oe_form_status .oe_folded ul, .openerp ul.oe_form_status_clickable .oe_folded ul { + position: absolute; + border-top: 1px solid #cacaca; + float: none; + top: 30px; + right: 0; + display: none; +} +.openerp ul.oe_form_status .oe_folded ul li, .openerp ul.oe_form_status_clickable .oe_folded ul li { + margin: 0; + border-left: 1px solid #cacaca; + display: block; +} +.openerp ul.oe_form_status .oe_folded ul li.label, .openerp ul.oe_form_status_clickable .oe_folded ul li.label { + border: 0; + padding-left: 24px; +} +.openerp ul.oe_form_status .oe_folded ul li:last-child, .openerp ul.oe_form_status_clickable .oe_folded ul li:last-child { + border-bottom: 1px solid #cacaca; +} +.openerp ul.oe_form_status .oe_folded:hover ul, .openerp ul.oe_form_status_clickable .oe_folded:hover ul { + display: block; +} .openerp ul.oe_form_status li.oe_active, .openerp ul.oe_form_status_clickable li.oe_active { background-color: #5382b9; background-image: -webkit-gradient(linear, left top, left bottom, from(#729fcf), to(#3465a4)); diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index dd73fe5b4c0..86664a86414 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -2155,6 +2155,27 @@ $sheet-padding: 16px @include skew-gradient(#fcfcfc, #dedede) @include radius(3px) @include transform(rotate(45deg)) + .oe_folded + .label + padding-bottom: 8px + ul + position: absolute + border-top: 1px solid #cacaca + float: none + top: 30px + right: 0 + display: none + li + margin: 0 + border-left: 1px solid #cacaca + display: block + li.label + border: 0 + padding-left: 24px + li:last-child + border-bottom: 1px solid #cacaca + &:hover ul + display: block li.oe_active @include vertical-gradient(#729fcf, #3465a4) > .arrow span From c3537fa2884f4100ab7cb7ad1e4766cf1998d098 Mon Sep 17 00:00:00 2001 From: "dle@openerp.com" <> Date: Thu, 16 May 2013 15:14:16 +0200 Subject: [PATCH 223/277] [FIX]web: radio widget name get using context bzr revid: dle@openerp.com-20130516131416-d02avqqigh4w0tw7 --- addons/web/static/src/js/view_form.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index 0996019eaaa..1d5c97532cc 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -2896,7 +2896,7 @@ instance.web.form.FieldRadio = instance.web.form.AbstractField.extend(instance.w var domain = instance.web.pyeval.eval('domain', this.build_domain()) || []; if (! _.isEqual(self.domain, domain)) { self.domain = domain; - var ds = new instance.web.DataSet(self, self.field.relation); + var ds = new instance.web.DataSetStatic(self, self.field.relation, self.build_context()); ds.call('search', [self.domain]) .then(function (records) { ds.name_get(records).then(function (records) { From a3949476992b25ce9d784eecdf68b43b2c1ac206 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Thu, 16 May 2013 16:04:29 +0200 Subject: [PATCH 224/277] [FIX] mail_message: fixed reference to a key not necessarily existing in a create dict. bzr revid: tde@openerp.com-20130516140429-vlfc0o56v7ryd69l --- addons/mail/mail_message.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/mail/mail_message.py b/addons/mail/mail_message.py index b961d18585d..0b6a4aebd18 100644 --- a/addons/mail/mail_message.py +++ b/addons/mail/mail_message.py @@ -747,7 +747,7 @@ class mail_message(osv.Model): default_starred = context.pop('default_starred', False) # generate message_id, to redirect answers to the right discussion thread if not values.get('message_id') and values.get('reply_to'): - values['message_id'] = tools.generate_tracking_message_id('reply_to-%(model)s' % values) + values['message_id'] = tools.generate_tracking_message_id('reply_to') elif not values.get('message_id') and values.get('res_id') and values.get('model'): values['message_id'] = tools.generate_tracking_message_id('%(res_id)s-%(model)s' % values) elif not values.get('message_id'): From bc4964de13f712188b7082148ea7630ed2b92e58 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Thu, 16 May 2013 17:09:00 +0200 Subject: [PATCH 225/277] [IMP] mail: now defines a catchall email alias, used to format the reply_to of notification emails when having a document without alias, or for private discussions using external mail readers. bzr revid: tde@openerp.com-20130516150900-khb1d1ygyuos1wrl --- addons/mail/mail_mail.py | 36 ++++++---- addons/mail/mail_message.py | 2 +- addons/mail/res_config.py | 18 ++++- addons/mail/res_config_view.xml | 4 ++ addons/mail/tests/test_mail_gateway.py | 99 ++++++++++++++++++++++++++ 5 files changed, 144 insertions(+), 15 deletions(-) diff --git a/addons/mail/mail_mail.py b/addons/mail/mail_mail.py index 3c30a950230..89392964ee5 100644 --- a/addons/mail/mail_mail.py +++ b/addons/mail/mail_mail.py @@ -93,31 +93,41 @@ class mail_mail(osv.Model): """ Return a specific reply_to: alias of the document through message_get_reply_to or take the email_from """ + # if value specified: directly return it if values.get('reply_to'): return values.get('reply_to') - email_reply_to = False - # model, res_id: comes from values OR related message - model = values.get('model') - res_id = values.get('res_id') - if values.get('mail_message_id') and (not model or not res_id): + mailgateway = True # tells whether the answer will go through the mailgateway, leading to the formatting of reply_to + ir_config_parameter = self.pool.get("ir.config_parameter") + catchall_domain = ir_config_parameter.get_param(cr, uid, "mail.catchall.domain", context=context) + + # model, res_id, email_from, reply_to: comes from values OR related message + message = None + if values.get('mail_message_id'): message = self.pool.get('mail.message').browse(cr, uid, values.get('mail_message_id'), context=context) - if not model: - model = message.model - if not res_id: - res_id = message.res_id + model = values.get('model', message and message.model or False) + res_id = values.get('res_id', message and message.res_id or False) + email_from = values.get('email_from', message and message.email_from or False) + email_reply_to = message and message.reply_to or False # if model and res_id: try to use ``message_get_reply_to`` that returns the document alias - if model and res_id and hasattr(self.pool[model], 'message_get_reply_to'): + if not email_reply_to and model and res_id and hasattr(self.pool[model], 'message_get_reply_to'): email_reply_to = self.pool[model].message_get_reply_to(cr, uid, [res_id], context=context)[0] + # no alias reply_to -> catchall alias + if not email_reply_to: + catchall_alias = ir_config_parameter.get_param(cr, uid, "mail.catchall.alias", context=context) + if catchall_domain and catchall_alias: + email_reply_to = '%s@%s' % (catchall_alias, catchall_domain) # no alias reply_to -> reply_to will be the email_from, only the email part - if not email_reply_to and values.get('email_from'): - emails = tools.email_split(values.get('email_from')) + if not email_reply_to and email_from: + emails = tools.email_split(email_from) if emails: email_reply_to = emails[0] + if emails[0].split('@')[1] != catchall_domain: + mailgateway = False # format 'Document name ' - if email_reply_to and model and res_id: + if email_reply_to and model and res_id and mailgateway: document_name = self.pool[model].name_get(cr, SUPERUSER_ID, [res_id], context=context)[0] if document_name: # sanitize document name diff --git a/addons/mail/mail_message.py b/addons/mail/mail_message.py index defc12a2f73..2febf96cd6d 100644 --- a/addons/mail/mail_message.py +++ b/addons/mail/mail_message.py @@ -743,7 +743,7 @@ class mail_message(osv.Model): default_starred = context.pop('default_starred', False) # generate message_id, to redirect answers to the right discussion thread if not values.get('message_id') and values.get('reply_to'): - values['message_id'] = tools.generate_tracking_message_id('reply_to-%(model)s' % values) + values['message_id'] = tools.generate_tracking_message_id('reply_to') elif not values.get('message_id') and values.get('res_id') and values.get('model'): values['message_id'] = tools.generate_tracking_message_id('%(res_id)s-%(model)s' % values) elif not values.get('message_id'): diff --git a/addons/mail/res_config.py b/addons/mail/res_config.py index 91606e1c720..b0aef50e76e 100644 --- a/addons/mail/res_config.py +++ b/addons/mail/res_config.py @@ -23,13 +23,18 @@ import urlparse from openerp.osv import osv, fields + class project_configuration(osv.TransientModel): _inherit = 'base.config.settings' _columns = { - 'alias_domain' : fields.char('Alias Domain', + 'alias_domain': fields.char('Alias Domain', help="If you have setup a catch-all email domain redirected to " "the OpenERP server, enter the domain name here."), + 'alias_catchall': fields.char('Catchall Email Alias', + help="Define the default email that will handle replies to document " + "not having their specific email alias defined. Only the left " + "part is required.") } def get_default_alias_domain(self, cr, uid, ids, context=None): @@ -46,3 +51,14 @@ class project_configuration(osv.TransientModel): config_parameters = self.pool.get("ir.config_parameter") for record in self.browse(cr, uid, ids, context=context): config_parameters.set_param(cr, uid, "mail.catchall.domain", record.alias_domain or '', context=context) + + def get_default_alias_catchall(self, cr, uid, ids, context=None): + alias_catchall = self.pool.get("ir.config_parameter").get_param(cr, uid, "mail.catchall.alias", context=context) + if not alias_catchall: + return {} + return {'alias_catchall': alias_catchall} + + def set_alias_catchall(self, cr, uid, ids, context=None): + config_parameters = self.pool.get("ir.config_parameter") + for record in self.browse(cr, uid, ids, context=context): + config_parameters.set_param(cr, uid, "mail.catchall.alias", record.alias_catchall or '', context=context) diff --git a/addons/mail/res_config_view.xml b/addons/mail/res_config_view.xml index d3797ba2dcc..6cbcf569067 100644 --- a/addons/mail/res_config_view.xml +++ b/addons/mail/res_config_view.xml @@ -11,6 +11,10 @@

    +
    diff --git a/addons/mail/tests/test_mail_gateway.py b/addons/mail/tests/test_mail_gateway.py index e4269d59d8b..0b5f133697e 100644 --- a/addons/mail/tests/test_mail_gateway.py +++ b/addons/mail/tests/test_mail_gateway.py @@ -123,6 +123,105 @@ class TestMailgateway(TestMailBase): self.assertEqual(partner_info['partner_id'], p_b_id, 'mail_thread: message_find_partner_from_emails wrong partner found') + def test_05_mail_message_mail_mail(self): + """ Tests designed for testing email values based on mail.message, aliases, ... """ + cr, uid = self.cr, self.uid + + # Data: clean catchall domain + param_ids = self.registry('ir.config_parameter').search(cr, uid, [('key', '=', 'mail.catchall.domain')]) + self.registry('ir.config_parameter').unlink(cr, uid, param_ids) + + # Do: create a mail_message with a reply_to, without message-id + msg_id = self.mail_message.create(cr, uid, {'subject': 'Subject', 'body': 'Body', 'reply_to': 'custom@example.com'}) + msg = self.mail_message.browse(cr, uid, msg_id) + # Test: message content + self.assertIn('reply_to', msg.message_id, + 'mail_message: message_id should be specific to a mail_message with a given reply_to') + self.assertEqual('custom@example.com', msg.reply_to, + 'mail_message: incorrect reply_to') + # Do: create a mail_mail with the previous mail_message and specified reply_to + mail_id = self.mail_mail.create(cr, uid, {'mail_message_id': msg_id, 'reply_to': 'other@example.com', 'state': 'cancel'}) + mail = self.mail_mail.browse(cr, uid, mail_id) + # Test: mail_mail content + self.assertEqual(mail.reply_to, 'other@example.com', + 'mail_mail: reply_to should be equal to the one coming from creation values') + # Do: create a mail_mail with the previous mail_message + mail_id = self.mail_mail.create(cr, uid, {'mail_message_id': msg_id, 'state': 'cancel'}) + mail = self.mail_mail.browse(cr, uid, mail_id) + # Test: mail_mail content + self.assertEqual(mail.reply_to, msg.reply_to, + 'mail_mail: reply_to should be equal to the one coming from the mail_message') + + # Do: create a mail_message without a reply_to + msg_id = self.mail_message.create(cr, uid, {'subject': 'Subject', 'body': 'Body', 'model': 'mail.group', 'res_id': self.group_pigs_id, 'email_from': False}) + msg = self.mail_message.browse(cr, uid, msg_id) + # Test: message content + self.assertIn('mail.group', msg.message_id, + 'mail_message: message_id should contain model') + self.assertIn('%s' % self.group_pigs_id, msg.message_id, + 'mail_message: message_id should contain res_id') + self.assertFalse(msg.reply_to, + 'mail_message: should not generate a reply_to address when not specified') + # Do: create a mail_mail based on the previous mail_message + mail_id = self.mail_mail.create(cr, uid, {'mail_message_id': msg_id, 'state': 'cancel'}) + mail = self.mail_mail.browse(cr, uid, mail_id) + # Test: mail_mail content + self.assertFalse(mail.reply_to, + 'mail_mail: reply_to should not have been guessed') + # Update message + self.mail_message.write(cr, uid, [msg_id], {'email_from': 'someone@example.com'}) + msg.refresh() + # Do: create a mail_mail based on the previous mail_message + mail_id = self.mail_mail.create(cr, uid, {'mail_message_id': msg_id, 'state': 'cancel'}) + mail = self.mail_mail.browse(cr, uid, mail_id) + # Test: mail_mail content + self.assertEqual(mail.reply_to, msg.email_from, + 'mail_mail: reply_to should equal to mail_message.email_from when having no document or default alias') + + # Data: set catchall domain + self.registry('ir.config_parameter').set_param(self.cr, self.uid, 'mail.catchall.domain', 'schlouby.fr') + + # Do: create a mail_mail based on the previous mail_message + mail_id = self.mail_mail.create(cr, uid, {'mail_message_id': msg_id, 'state': 'cancel'}) + mail = self.mail_mail.browse(cr, uid, mail_id) + # Test: mail_mail content + self.assertEqual(mail.reply_to, '"Followers of Pigs" ', + 'mail_mail: reply_to should equal the mail.group alias') + + # Update message + self.mail_message.write(cr, uid, [msg_id], {'res_id': False, 'email_from': 'someone@schlouby.fr'}) + msg.refresh() + # Do: create a mail_mail based on the previous mail_message + mail_id = self.mail_mail.create(cr, uid, {'mail_message_id': msg_id, 'state': 'cancel'}) + mail = self.mail_mail.browse(cr, uid, mail_id) + # Test: mail_mail content + self.assertEqual(mail.reply_to, msg.email_from, + 'mail_mail: reply_to should equal the mail_message email_from') + + # Data: set catchall alias + self.registry('ir.config_parameter').set_param(self.cr, self.uid, 'mail.catchall.alias', 'gateway') + + # Do: create a mail_mail based on the previous mail_message + mail_id = self.mail_mail.create(cr, uid, {'mail_message_id': msg_id, 'state': 'cancel'}) + mail = self.mail_mail.browse(cr, uid, mail_id) + # Test: mail_mail content + self.assertEqual(mail.reply_to, 'gateway@schlouby.fr', + 'mail_mail: reply_to should equal the catchall email alias') + + # Do: create a mail_mail + mail_id = self.mail_mail.create(cr, uid, {'state': 'cancel'}) + mail = self.mail_mail.browse(cr, uid, mail_id) + # Test: mail_mail content + self.assertEqual(mail.reply_to, 'gateway@schlouby.fr', + 'mail_mail: reply_to should equal the catchall email alias') + + # Do: create a mail_mail + mail_id = self.mail_mail.create(cr, uid, {'state': 'cancel', 'reply_to': 'someone@example.com'}) + mail = self.mail_mail.browse(cr, uid, mail_id) + # Test: mail_mail content + self.assertEqual(mail.reply_to, 'someone@example.com', + 'mail_mail: reply_to should equal the rpely_to given to create') + def test_10_message_process(self): """ Testing incoming emails processing. """ cr, uid, user_raoul = self.cr, self.uid, self.user_raoul From 655e36bc5047173740493d4ae69681553c1ca9f9 Mon Sep 17 00:00:00 2001 From: Cedric Snauwaert Date: Thu, 16 May 2013 17:12:55 +0200 Subject: [PATCH 226/277] [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 227/277] [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 22dc9518d487fe71e872fe5c4514152a41069e1c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Thu, 16 May 2013 18:22:48 +0200 Subject: [PATCH 228/277] [FIX] mail: tests: updated tests because of changes in mail_mail: now when having a reply_to that is not a catchall address, followers of X.. is not writen anymore. bzr revid: tde@openerp.com-20130516162248-leiq6j1ppp9n7g5b --- addons/mail/tests/test_mail_features.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/mail/tests/test_mail_features.py b/addons/mail/tests/test_mail_features.py index 7eea66b3b90..92119ccdad8 100644 --- a/addons/mail/tests/test_mail_features.py +++ b/addons/mail/tests/test_mail_features.py @@ -364,8 +364,8 @@ class test_mail(TestMailBase): 'message_post: notification email sent to more than one email address instead of a precise partner') self.assertIn(sent_email['email_to'][0], test_emailto, 'message_post: notification email email_to incorrect') - self.assertEqual(sent_email['reply_to'], '"Followers of Pigs" ', - 'message_post: notification email reply_to incorrect: should name Followers of Pigs, and have raoul email') + self.assertEqual(sent_email['reply_to'], 'r@r', # was '"Followers of Pigs" ', but makes no sense + 'message_post: notification email reply_to incorrect: should have raoul email') self.assertEqual(_mail_subject, sent_email['subject'], 'message_post: notification email subject incorrect') self.assertIn(html_sanitize(_body2), sent_email['body'], From 3a7a4f7d5e908e5d099e5f1da07ca179c4859359 Mon Sep 17 00:00:00 2001 From: Paramjit Singh Sahota Date: Fri, 17 May 2013 11:31:33 +0530 Subject: [PATCH 229/277] [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 afd7d799665465c2000a5fc5ee0e71764ee898ab Mon Sep 17 00:00:00 2001 From: Fabien Pinckaers Date: Fri, 17 May 2013 09:17:38 +0200 Subject: [PATCH 230/277] [IMP] medium images in pos bzr revid: fp@tinyerp.com-20130517071738-uw130g0sxbu14yrq --- addons/point_of_sale/static/src/js/models.js | 2 +- addons/point_of_sale/static/src/js/widgets.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/point_of_sale/static/src/js/models.js b/addons/point_of_sale/static/src/js/models.js index 98ba49c8856..13003bcf19f 100644 --- a/addons/point_of_sale/static/src/js/models.js +++ b/addons/point_of_sale/static/src/js/models.js @@ -323,7 +323,7 @@ function openerp_pos_models(instance, module){ //module is instance.point_of_sal module.Product = Backbone.Model.extend({ get_image_url: function(){ - return instance.session.url('/web/binary/image', {model: 'product.product', field: 'image', id: this.get('id')}); + return instance.session.url('/web/binary/image', {model: 'product.product', field: 'image_medium', id: this.get('id')}); }, }); diff --git a/addons/point_of_sale/static/src/js/widgets.js b/addons/point_of_sale/static/src/js/widgets.js index cec48dbe72f..e4bf004c00f 100644 --- a/addons/point_of_sale/static/src/js/widgets.js +++ b/addons/point_of_sale/static/src/js/widgets.js @@ -498,7 +498,7 @@ function openerp_pos_widgets(instance, module){ //module is instance.point_of_sa }, get_image_url: function(category){ - return instance.session.url('/web/binary/image', {model: 'pos.category', field: 'image', id: category.id}); + return instance.session.url('/web/binary/image', {model: 'pos.category', field: 'image_medium', id: category.id}); }, renderElement: function(){ From 8bdccc5cd26cea8a6b180b8953414cc4f55e1ff8 Mon Sep 17 00:00:00 2001 From: Alexandre Fayolle Date: Fri, 17 May 2013 09:35:16 +0200 Subject: [PATCH 231/277] [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 232/277] [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 233/277] [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 234/277] [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 235/277] [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 86610e3a3067d8eba805a68fe565c9bb1b1bb390 Mon Sep 17 00:00:00 2001 From: "dle@openerp.com" <> Date: Fri, 17 May 2013 11:46:29 +0200 Subject: [PATCH 236/277] [FIX]crm: mark as lost use now case_cancel instead of case_mark_lost because stage of lead were set to lost instead of dead bzr revid: dle@openerp.com-20130517094629-7l5tx1esj38ydc3u --- addons/crm/crm_lead_view.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml index e306758f6a7..62090dd0efc 100644 --- a/addons/crm/crm_lead_view.xml +++ b/addons/crm/crm_lead_view.xml @@ -614,7 +614,7 @@ code if context.get('active_model') == 'crm.lead' and context.get('active_ids'): - self.case_mark_lost(cr, uid, context['active_ids'], context=context) + self.case_cancel(cr, uid, context['active_ids'], context=context) From e60802725634166854e190353ca01ae37969ddd8 Mon Sep 17 00:00:00 2001 From: Olivier Dony Date: Fri, 17 May 2013 12:29:33 +0200 Subject: [PATCH 237/277] [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 238/277] [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 1cfd02f66d1321a92bb7a5350ff40e2d6c1f59e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Fri, 17 May 2013 12:55:29 +0200 Subject: [PATCH 239/277] =?UTF-8?q?[IMP]=20mail:=20default=20catchall=20al?= =?UTF-8?q?ias:=20improved=20settings=20form=20view=20and=20help=20message?= =?UTF-8?q?s.=C3=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit bzr revid: tde@openerp.com-20130517105529-16semc1ng1jbwmzq --- addons/base_setup/res_config_view.xml | 2 +- addons/fetchmail/fetchmail_view.xml | 20 +++++++++++--------- addons/mail/res_config.py | 7 ++++--- addons/mail/res_config_view.xml | 2 +- 4 files changed, 17 insertions(+), 14 deletions(-) diff --git a/addons/base_setup/res_config_view.xml b/addons/base_setup/res_config_view.xml index 9e026184c9d..8c48f5d7a6b 100644 --- a/addons/base_setup/res_config_view.xml +++ b/addons/base_setup/res_config_view.xml @@ -31,7 +31,7 @@