From 38c5bccab7af63fa8939c2d0b6ec8ae6ec421b7a Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Sat, 11 Aug 2007 12:57:36 +0000
Subject: [PATCH] Product 	Typos Account 	One view more for the Cash
 Journal in Multi-Currencies Wizard base 	Improved help string

bzr revid: fp@tinyerp.com-26f06a91c437f8731738297119340c039d825d56
---
 addons/account/data/account_data2.xml         | 81 +++++++++++++++++++
 addons/base_setup/wizard/wizard_base_setup.py |  4 +-
 addons/product/product.py                     |  4 +-
 3 files changed, 85 insertions(+), 4 deletions(-)

diff --git a/addons/account/data/account_data2.xml b/addons/account/data/account_data2.xml
index 6f479704580..fb38e756c3c 100644
--- a/addons/account/data/account_data2.xml
+++ b/addons/account/data/account_data2.xml
@@ -87,6 +87,87 @@
 		<field name="sequence" eval="12"/>
 	</record>
 
+	<record model="account.journal.view" id="account_journal_bank_view_multi">
+		<field name="name">Multi-Currency Cash Journal View</field>
+	</record>
+	<record model="account.journal.column" id="bank_col1_multi">
+		<field name="view_id" ref="account_journal_bank_view_multi"/>
+		<field name="name">Date</field>
+		<field name="field">date</field>
+		<field name="required" eval="True"/>
+		<field name="sequence" eval="1"/>
+	</record>
+	<record model="account.journal.column" id="bank_col2_multi">
+		<field name="view_id" ref="account_journal_bank_view_multi"/>
+		<field name="name">N. Piece</field>
+		<field name="field">move_id</field>
+		<field name="required" eval="False"/>
+		<field name="sequence" eval="2"/>
+	</record>
+	<record model="account.journal.column" id="bank_col7_multi">
+		<field name="view_id" ref="account_journal_bank_view_multi"/>
+		<field name="name">Name</field>
+		<field name="field">name</field>
+		<field name="sequence" eval="3"/>
+		<field name="required" eval="True"/>
+	</record>
+	<record model="account.journal.column" id="bank_col4_multi">
+		<field name="view_id" ref="account_journal_bank_view_multi"/>
+		<field name="name">Statement</field>
+		<field name="field">statement_id</field>
+		<field name="sequence" eval="4"/>
+	</record>
+	<record model="account.journal.column" id="bank_col6_multi">
+		<field name="view_id" ref="account_journal_bank_view_multi"/>
+		<field name="name">Partner</field>
+		<field name="field">partner_id</field>
+		<field name="sequence" eval="5"/>
+	</record>
+	<record model="account.journal.column" id="bank_col5_multi">
+		<field name="view_id" ref="account_journal_bank_view_multi"/>
+		<field name="name">Account</field>
+		<field name="field">account_id</field>
+		<field name="required" eval="True"/>
+		<field name="sequence" eval="6"/>
+	</record>
+	<record model="account.journal.column" id="bank_col9_multi">
+		<field name="view_id" ref="account_journal_bank_view_multi"/>
+		<field name="name">Debit</field>
+		<field name="field">debit</field>
+		<field name="sequence" eval="10"/>
+	</record>
+	<record model="account.journal.column" id="bank_col10_multi">
+		<field name="view_id" ref="account_journal_bank_view_multi"/>
+		<field name="name">Credit</field>
+		<field name="field">credit</field>
+		<field name="sequence" eval="11"/>
+	</record>
+	<record model="account.journal.column" id="bank_col17_multi">
+		<field name="view_id" ref="account_journal_bank_view_multi"/>
+		<field name="name">Currency Amt.</field>
+		<field name="field">amount_currency</field>
+		<field name="sequence" eval="12"/>
+	</record>
+	<record model="account.journal.column" id="bank_col18_multi">
+		<field name="view_id" ref="account_journal_bank_view_multi"/>
+		<field name="name">Currency</field>
+		<field name="field">currency_id</field>
+		<field name="sequence" eval="13"/>
+	</record>
+	<record model="account.journal.column" id="bank_col3_multi">
+		<field name="view_id" ref="account_journal_bank_view_multi"/>
+		<field name="name">Ref</field>
+		<field name="field">ref</field>
+		<field name="sequence" eval="7"/>
+	</record>
+	<record model="account.journal.column" id="bank_col23_multi">
+		<field name="view_id" ref="account_journal_bank_view_multi"/>
+		<field name="name">State</field>
+		<field name="field">state</field>
+		<field name="sequence" eval="14"/>
+	</record>
+
+
 	<record model="account.journal.view" id="account_journal_view">
 		<field name="name">Journal View</field>
 	</record>
diff --git a/addons/base_setup/wizard/wizard_base_setup.py b/addons/base_setup/wizard/wizard_base_setup.py
index 97a65fa4b05..18b5d6e11b7 100644
--- a/addons/base_setup/wizard/wizard_base_setup.py
+++ b/addons/base_setup/wizard/wizard_base_setup.py
@@ -54,9 +54,9 @@ view_form_charts = """<?xml version="1.0"?>
 		<newline/>
 		<field name="charts" align="0.0"/>
 		<newline/>
-		<label string="There is many other charts on http://www.tinyerp.com/" colspan="2" align="0.0"/>
+		<label string="There are many other chart of accounts available." colspan="2" align="0.0"/>
 		<newline/>
-		<label string="(If you don't select a chart of accounts, you'll need to set up one manually)." colspan="2" align="0.0"/>
+		<label string="If you don't select one now, you'll be able to install an other one through the Administration menu." colspan="2" align="0.0"/>
 	</group>
 </form>"""
 
diff --git a/addons/product/product.py b/addons/product/product.py
index 54f0e207fd3..f062bdc306c 100644
--- a/addons/product/product.py
+++ b/addons/product/product.py
@@ -453,8 +453,8 @@ class pricelist_partnerinfo(osv.osv):
 	_columns = {
 		'name': fields.char('Description', size=64),
 		'suppinfo_id': fields.many2one('product.supplierinfo', 'Partner Information', required=True, ondelete='cascade'),
-		'min_quantity': fields.float('Minimal quantity', required=True),
-		'price': fields.float('price', required=True, digits=(16, int(config['price_accuracy']))),
+		'min_quantity': fields.float('Quantity', required=True),
+		'price': fields.float('Price', required=True, digits=(16, int(config['price_accuracy']))),
 	}
 	_order = 'min_quantity asc'
 pricelist_partnerinfo()