From 2e19834df100bc79692454a9b796efbc086ce67d Mon Sep 17 00:00:00 2001
From: pinky <>
Date: Wed, 27 Dec 2006 11:56:48 +0000
Subject: [PATCH] Pricelist: 	relate button to version OSV/Fields: 	bugfix

bzr revid: pinky-38b06f5f65cdc4ddbc234645796a9e8baad2cb08
---
 addons/account/account_view.xml   |  4 +--
 addons/account/report/invoice.rml | 43 +++++++++++++++++++++++++++----
 addons/board/board_view.xml       |  3 +++
 addons/product/pricelist.py       |  2 +-
 addons/project/project.py         |  2 +-
 5 files changed, 45 insertions(+), 9 deletions(-)

diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index af92fb53232..546e6d61f59 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -105,8 +105,7 @@
 			<form string="Account Form">
 				<notebook>
 				<page string="General Information">
-					<field name="name" select="1"/>
-					<field name="active" select="1" />
+					<field name="name" select="1" colspan="3"/>
 					<field name="type" select="1"/>
 					<field name="code" select="1"/>
 					<field name="shortcut"/>
@@ -115,6 +114,7 @@
 					<field name="currency_id" select="1"/>
 					<field name="close_method"/>
 					<field name="reconcile"/>
+					<field name="active" select="1" />
 					<newline/>
 					<field name="parent_id" colspan="3"/>
 					<field name="tax_ids" colspan="3"/>
diff --git a/addons/account/report/invoice.rml b/addons/account/report/invoice.rml
index b0003baef5f..c13c32b5e91 100644
--- a/addons/account/report/invoice.rml
+++ b/addons/account/report/invoice.rml
@@ -19,10 +19,10 @@
       <blockValign value="TOP"/>
       <lineStyle kind="GRID" colorName="black"/>
       <blockBackground colorName="#e6e6e6" start="0,0" stop="0,0"/>
-      <blockBackground colorName="#e6e6e6" start="1,0" stop="1,0"/>
-      <blockBackground colorName="#e6e6e6" start="2,0" stop="2,0"/>
-      <blockBackground colorName="#e6e6e6" start="3,0" stop="3,0"/>
-      <blockBackground colorName="#e6e6e6" start="4,0" stop="4,0"/>
+      <blockBackground colorName="#ff0000" start="1,0" stop="1,0"/>
+      <blockBackground colorName="#ff0000" start="2,0" stop="2,0"/>
+      <blockBackground colorName="#ff0000" start="3,0" stop="3,0"/>
+      <blockBackground colorName="#ff0000" start="4,0" stop="4,0"/>
       <blockBackground colorName="#e6e6e6" start="5,0" stop="5,0"/>
     </blockTableStyle>
     <blockTableStyle id="Tableau7">
@@ -36,6 +36,9 @@
     <blockTableStyle id="Tableau3">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
+      <blockBackground colorName="#e6e6e6" start="0,1" stop="0,1"/>
+      <blockBackground colorName="#e6e6e6" start="1,1" stop="1,1"/>
+      <blockBackground colorName="#e6e6e6" start="2,1" stop="2,1"/>
     </blockTableStyle>
     <blockTableStyle id="Tableau4">
       <blockAlignment value="LEFT"/>
@@ -58,7 +61,7 @@
     <paraStyle name="P5" fontName="Times-Roman" fontSize="14.0" leading="17" alignment="CENTER"/>
     <paraStyle name="P6" fontName="Times-Roman" fontSize="11.0" leading="14"/>
     <paraStyle name="P7" fontName="Times-Roman" fontSize="11.0" leading="14"/>
-    <paraStyle name="P8" fontName="Times-Roman" fontSize="11.0" leading="14" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P8" fontName="Times-Roman" fontSize="11.0" leading="14" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
     <paraStyle name="P9" fontName="Times-Roman" fontSize="11.0" leading="14" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
     <paraStyle name="P10" fontName="Times-Roman" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="P11" fontName="Times-Roman" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
@@ -134,6 +137,36 @@
       <font face="Times-Roman">[[o.date_invoice]]</font>
     </para>
     <para style="P7"><font face="Times-Roman">Customer Ref:</font> [[ o.address_invoice_id.partner_id.ref or '/' ]]</para>
+    <illustration height="145.0" width="240.0">
+      <image x="0" y="0" file="100000000000023000000153586403AD.png" height="145.0" width="240.0"/>
+    </illustration>
+    <para style="Standard">
+      <font color="white"> </font>
+    </para>
+    <para style="Standard">
+      <font color="white"> </font>
+    </para>
+    <para style="Standard">
+      <font color="white"> </font>
+    </para>
+    <para style="Standard">
+      <font color="white"> </font>
+    </para>
+    <para style="Standard">
+      <font color="white"> </font>
+    </para>
+    <para style="Standard">
+      <font color="white"> </font>
+    </para>
+    <para style="Standard">
+      <font color="white"> </font>
+    </para>
+    <para style="Standard">
+      <font color="white"> </font>
+    </para>
+    <para style="Standard">
+      <font color="white"> </font>
+    </para>
     <para style="Standard">
       <font color="white"> </font>
     </para>
diff --git a/addons/board/board_view.xml b/addons/board/board_view.xml
index 6afad57ceca..07fdd491f83 100644
--- a/addons/board/board_view.xml
+++ b/addons/board/board_view.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0"?>
 <terp>
 	<data>
+		<menuitem name="Dashboards" icon="terp-account" id="dashboard_menu"/>
+
 		<record model="ir.ui.view" id="view_board_note_tree">
 			<field name="name">board.note.tree</field>
 			<field name="model">board.note</field>
@@ -31,6 +33,7 @@
 			<field name="view_type">form</field>
 			<field name="view_mode">form,tree</field>
 		</record>
+
 		<menuitem
 			name="Dashboards/Notes"
 			action="action_view_board_note_form"
diff --git a/addons/product/pricelist.py b/addons/product/pricelist.py
index 3f88a73911c..ffa09b349e0 100644
--- a/addons/product/pricelist.py
+++ b/addons/product/pricelist.py
@@ -185,7 +185,7 @@ class product_pricelist_version(osv.osv):
 	_name = "product.pricelist.version"
 	_description = "Pricelist Version"
 	_columns = {
-		'pricelist_id': fields.many2one('product.pricelist', 'Price List', required=True, select=True),
+		'pricelist_id': fields.many2one('product.pricelist', 'Price List', required=True, select=True, relate=True),
 		'name': fields.char('Name', size=64, required=True),
 		'active': fields.boolean('Active'),
 		'items_id': fields.one2many('product.pricelist.item', 'price_version_id', 'Price List Items', required=True),
diff --git a/addons/project/project.py b/addons/project/project.py
index d14aa9e15fa..1fff8432400 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -253,7 +253,7 @@ class project_work(osv.osv):
 	_description = "Task Work"
 	_columns = {
 		'name': fields.char('Work summary', size=128),
-		'date': fields.datetime('Date start'),
+		'date': fields.datetime('Date'),
 		'task_id': fields.many2one('project.task', 'Task', ondelete='cascade'),
 		'hours': fields.float('Hours spent'),
 		'user_id': fields.many2one('res.users', 'Done by', required=True, relate=True),