From bc438037fdef4e9e65462cbf15aecc95bc3246f0 Mon Sep 17 00:00:00 2001
From: pinky <>
Date: Mon, 18 Dec 2006 08:06:01 +0000
Subject: [PATCH] L10N_CH : DTA wizard added
bzr revid: pinky-41dc014b1293b7f02f5dd5b3f2c6a1d7f237aaad
---
addons/l10n_ch/__init__.py | 1 +
addons/l10n_ch/__terp__.py | 13 +++++-----
addons/l10n_ch/company.py | 42 +++++++++++++++++++++++++++++++
addons/l10n_ch/company_view.xml | 19 ++++++++++++++
addons/l10n_ch/dta/__init__.py | 4 ++-
addons/l10n_ch/dta/dta_view.xml | 42 ++++++++++++++++++++-----------
addons/l10n_ch/dta/dta_wizard.xml | 12 ++++++---
7 files changed, 107 insertions(+), 26 deletions(-)
create mode 100644 addons/l10n_ch/company.py
create mode 100644 addons/l10n_ch/company_view.xml
diff --git a/addons/l10n_ch/__init__.py b/addons/l10n_ch/__init__.py
index f0c82885192..070972c024e 100755
--- a/addons/l10n_ch/__init__.py
+++ b/addons/l10n_ch/__init__.py
@@ -29,3 +29,4 @@
import bvr
import dta
import v11
+import company
diff --git a/addons/l10n_ch/__terp__.py b/addons/l10n_ch/__terp__.py
index 873a6a05a25..4daaa9419bd 100755
--- a/addons/l10n_ch/__terp__.py
+++ b/addons/l10n_ch/__terp__.py
@@ -8,14 +8,13 @@
"category" : "Localisation/Europe",
"website": "http://www.tinyerp.com",
"depends" : ["base", "account"],
- #"init_xml" : ["zip_code_default.xml"],
- "init_xml" : [],#"zip_code_default.xml"
+# "init_xml" : [],
+ "init_xml" : ["zip_code_default.xml"],
"demo_xml" : ["vaudtax_data_demo.xml"],
- "update_xml" : [
- "vaudtax_data.xml","account_vat.xml","base_config.xml","account_config.xml",
- "bvr/bvr_report.xml", "bvr/company_view.xml",
- "dta/dta_view.xml","v11/v11_view.xml","v11/v11_wizard.xml"
- ],
+ "update_xml" : ["dta/dta_view.xml","dta/dta_wizard.xml","v11/v11_wizard.xml",
+ "account_vat.xml","base_config.xml","account_config.xml",
+ "company_view.xml"],
+
"active": False,
"installable": True,
}
diff --git a/addons/l10n_ch/company.py b/addons/l10n_ch/company.py
new file mode 100644
index 00000000000..01e51f72fa2
--- /dev/null
+++ b/addons/l10n_ch/company.py
@@ -0,0 +1,42 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+# Copyright (c) 2004-2006 TINY SPRL. (http://tiny.be) All Rights Reserved.
+#
+# $Id: account.py 1005 2005-07-25 08:41:42Z nicoe $
+#
+# WARNING: This program as such is intended to be used by professional
+# programmers who take the whole responsability of assessing all potential
+# consequences resulting from its eventual inadequacies and bugs
+# End users who are looking for a ready-to-use solution with commercial
+# garantees and support are strongly adviced to contract a Free Software
+# Service Company
+#
+# This program is Free Software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#
+##############################################################################
+
+import netsvc
+from osv import fields, osv
+
+class res_company(osv.osv):
+ _inherit = "res.company"
+ _columns = {
+ 'bvr_number': fields.char('BVR Number', size=9),
+ 'dta_number': fields.char('DTA Number', size=9),
+
+ }
+res_company()
+
diff --git a/addons/l10n_ch/company_view.xml b/addons/l10n_ch/company_view.xml
new file mode 100644
index 00000000000..1f1ad832121
--- /dev/null
+++ b/addons/l10n_ch/company_view.xml
@@ -0,0 +1,19 @@
+
+
+
+
+ res.company.form.inherit.bvr
+ res.company
+ form
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/addons/l10n_ch/dta/__init__.py b/addons/l10n_ch/dta/__init__.py
index be8faac5f52..95bad3db042 100755
--- a/addons/l10n_ch/dta/__init__.py
+++ b/addons/l10n_ch/dta/__init__.py
@@ -25,4 +25,6 @@
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#
##############################################################################
-import dta
+
+import dta_wizard
+import invoice
diff --git a/addons/l10n_ch/dta/dta_view.xml b/addons/l10n_ch/dta/dta_view.xml
index be27af79e6b..0a47e1270f7 100644
--- a/addons/l10n_ch/dta/dta_view.xml
+++ b/addons/l10n_ch/dta/dta_view.xml
@@ -2,27 +2,39 @@
-
- account.dta
- account.dta
- form
+
+ account.invoice.tree.inherit
+ account.invoice
+
+ tree
-
+
+
+
-
- account.dta
- account.dta
- form
- form,tree
+
+ account.invoice.form
+ account.invoice
+ form
+
+
+
+
+
+
+
+ account.invoice.dta
+ ir.actions.act_window
+ account.invoice
+ form
+ tree,form
+ [('state','!=','paid'),('dta_state','=','2bpaid') ]
+
-
+
diff --git a/addons/l10n_ch/dta/dta_wizard.xml b/addons/l10n_ch/dta/dta_wizard.xml
index a34b28a34e8..d10d7c7ad76 100644
--- a/addons/l10n_ch/dta/dta_wizard.xml
+++ b/addons/l10n_ch/dta/dta_wizard.xml
@@ -4,6 +4,12 @@
+ model="account.invoice"
+ name="account.dta_create"
+ id="wizard_account_dta_create"/>
+
+
+
+
+
+