odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

Pricelist: 

relate button to version
OSV/Fields:
	bugfix

bzr revid: pinky-38b06f5f65cdc4ddbc234645796a9e8baad2cb08
master
pinky 2006-12-27 11:56:48 +00:00
parent a230dfb364
commit 2e19834df1
5 changed files with 45 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
addons/account/account_view.xml
View File

@ -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"/>

43
addons/account/report/invoice.rml
View File

@ -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>

3
addons/board/board_view.xml
View File

@ -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"

2
addons/product/pricelist.py
View File

@ -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),

2
addons/project/project.py
View File

@ -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),