From 28f0b0f658a145c52ef96f171d788784adda6290 Mon Sep 17 00:00:00 2001
From: pinky <>
Date: Tue, 19 Dec 2006 14:55:46 +0000
Subject: [PATCH] ACCOUNT : * invoice.py : partner_id is now required for an
invoice. * __terp__.py: bug in loading order corrected
L10N_CH:
* DTA / V11 : simplified gui for the wizards and better log mesages.
BASE:
* New object : res.partner.bank.type
bzr revid: pinky-5454f6c3dde166b0c8fd74b2dd15a590a72f62d6
---
addons/account/__terp__.py | 3 +-
addons/account/data/account_data1.xml | 47 +++++++++++++
.../{account_data.xml => account_data2.xml} | 44 ------------
addons/account/invoice.py | 4 +-
addons/l10n_ch/__terp__.py | 15 ++--
addons/l10n_ch/dta/dta_demo.xml | 6 --
addons/l10n_ch/dta/dta_wizard.py | 52 +++++++++-----
addons/l10n_ch/dta/sample/README | 1 +
addons/l10n_ch/dta/sample/sample.dta | 1 +
addons/l10n_ch/v11/sample/sample.v11 | 2 +-
addons/l10n_ch/v11/v11_import.py | 69 +++++++++----------
addons/l10n_ch/v11/v11_view.xml | 32 +--------
addons/l10n_ch/v11/v11_wizard.xml | 3 -
13 files changed, 131 insertions(+), 148 deletions(-)
create mode 100644 addons/account/data/account_data1.xml
rename addons/account/data/{account_data.xml => account_data2.xml} (85%)
create mode 100644 addons/l10n_ch/dta/sample/README
create mode 100644 addons/l10n_ch/dta/sample/sample.dta
diff --git a/addons/account/__terp__.py b/addons/account/__terp__.py
index 99374566b1b..b8e2841c473 100644
--- a/addons/account/__terp__.py
+++ b/addons/account/__terp__.py
@@ -28,8 +28,9 @@
"account_report.xml",
"partner_view.xml",
"data/account_invoice.xml",
- "data/account_data.xml",
+ "data/account_data1.xml",
"data/account_minimal.xml",
+ "data/account_data2.xml",
"account_invoice_workflow.xml",
"project/project_view.xml",
"project/project_report.xml",
diff --git a/addons/account/data/account_data1.xml b/addons/account/data/account_data1.xml
new file mode 100644
index 00000000000..81857a37e84
--- /dev/null
+++ b/addons/account/data/account_data1.xml
@@ -0,0 +1,47 @@
+
+
+
+
+
+
+ Receivable
+ receivable
+ True
+
+
+ Payable
+ payable
+ True
+
+
+ View
+ view
+
+
+ Income
+ income
+
+
+ Expense
+ expense
+
+
+ Tax
+ tax
+
+
+ Cash
+ cash
+
+
+ Asset
+ asset
+
+
+ Equity
+ equity
+
+
+
diff --git a/addons/account/data/account_data.xml b/addons/account/data/account_data2.xml
similarity index 85%
rename from addons/account/data/account_data.xml
rename to addons/account/data/account_data2.xml
index ea3cdd067a2..15666d3adeb 100644
--- a/addons/account/data/account_data.xml
+++ b/addons/account/data/account_data2.xml
@@ -1,49 +1,5 @@
-
-
-
-
- Receivable
- receivable
- True
-
-
- Payable
- payable
- True
-
-
- View
- view
-
-
- Income
- income
-
-
- Expense
- expense
-
-
- Tax
- tax
-
-
- Cash
- cash
-
-
- Asset
- asset
-
-
- Equity
- equity
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
diff --git a/addons/l10n_ch/v11/v11_wizard.xml b/addons/l10n_ch/v11/v11_wizard.xml
index ed971d50fdb..f51180f6b87 100644
--- a/addons/l10n_ch/v11/v11_wizard.xml
+++ b/addons/l10n_ch/v11/v11_wizard.xml
@@ -9,8 +9,5 @@
id="wizard_account_v11_import"
/>
-
-
-