From 656ec315941363ec0449f8cb6ccbe62ef5498f0e Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Thu, 2 Aug 2007 11:37:40 +0000
Subject: [PATCH] Better view for sales and purchases

bzr revid: fp@tinyerp.com-e0c2864baec7b7a6e4150742e975a17a88c79eb4
---
 addons/account/account_invoice_view.xml | 4 ++--
 addons/profile_accounting/__terp__.py   | 2 +-
 addons/purchase/purchase_view.xml       | 3 +--
 addons/sale/sale.py                     | 2 +-
 4 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index b116c1fcf9b..787befad8aa 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -55,8 +55,8 @@
 						<field name="price_subtotal"/>
 						<field name="invoice_line_tax_id" colspan="4"/> 
 					</page>
-					<page string="Other">
-						<field name="note" colspan="4"/>
+					<page string="Notes">
+						<field name="note" colspan="4" nolabel="1"/>
 					</page>
 				</notebook>
 			</form>
diff --git a/addons/profile_accounting/__terp__.py b/addons/profile_accounting/__terp__.py
index 68f99ba2976..3b7a49f2426 100644
--- a/addons/profile_accounting/__terp__.py
+++ b/addons/profile_accounting/__terp__.py
@@ -3,7 +3,7 @@
 	"version":"1.0",
 	"author":"Tiny",
 	"category":"Profile",
-	"depends":["base", "account","report_analytic"],
+	"depends":["base", "account","report_analytic","board_account"],
 	"demo_xml":[],
 	"update_xml":[],
 	"active":False,
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index 3d4ef240977..f14a0535fe0 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -127,14 +127,13 @@
 			<form string="Purchase Order Line">
 				<notebook>
 					<page string="Order Line">
-						<field name="account_analytic_id"/>
-						<newline/>
 						<field name="product_qty"/>
 						<field name="product_uom" on_change="product_uom_change(parent.pricelist_id,product_id,product_qty,product_uom,parent.partner_id)"/>
 						<field name="product_id" colspan="4" on_change="product_id_change(parent.pricelist_id,product_id,product_qty,product_uom,parent.partner_id)" context="partner_id=parent.partner_id,quantity=product_qty,pricelist=parent.pricelist_id,uom=product_uom,warehouse=parent.warehouse_id"/>
 						<field name="name" colspan="4"/>
 						<field name="date_planned"/>
 						<field name="price_unit"/>
+						<field name="account_analytic_id"/>
 						<field name="price_subtotal" readonly="1" />
 						<field name="taxes_id" colspan="4"/>
 					</page><page string="Notes">
diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index 33701a2e7c9..45e72c3ea29 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -139,7 +139,7 @@ class sale_order(osv.osv):
   - The 'Invoice after delivery' choice will generate the draft invoice after the packing list have been finished.
   - The 'Invoice from the packings' choice is used to create an invoice during the packing process."""),
 		'pricelist_id':fields.many2one('product.pricelist', 'Pricelist', required=True, readonly=True, states={'draft':[('readonly',False)]}),
-		'project_id':fields.many2one('account.analytic.account', 'Profit/Cost Center', readonly=True, states={'draft':[('readonly', False)]}),
+		'project_id':fields.many2one('account.analytic.account', 'Analytic account', readonly=True, states={'draft':[('readonly', False)]}),
 
 		'order_line': fields.one2many('sale.order.line', 'order_id', 'Order Lines', readonly=True, states={'draft':[('readonly',False)]}),
 		'invoice_ids': fields.many2many('account.invoice', 'sale_order_invoice_rel', 'order_id', 'invoice_id', 'Invoice', help="This is the list of invoices that have been generated for this sale order. The same sale order may have been invoiced in several times (by line for example)."),