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

better_views 

bzr revid: fp@tinyerp.com-20081027152913-hbizvoble601g1l9
This commit is contained in:
Fabien Pinckaers 2008-10-27 16:29:13 +01:00
parent c4c5ef9f4f
commit cac4fe35ca
21 changed files with 1025 additions and 1013 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
addons/account/project/project.py
View File

@ -166,7 +166,9 @@ class account_analytic_account(osv.osv):
'type' : lambda *a : 'normal',
'company_id': _default_company,
'state' : lambda *a : 'draft',
'user_id' : lambda self,cr,uid,ctx : uid
'user_id' : lambda self,cr,uid,ctx : uid,
'partner_id': lambda self,cr, uid, ctx: ctx.get('partner_id', False),
'contact_id': lambda self,cr, uid, ctx: ctx.get('contact_id', False),
}
def check_recursion(self, cr, uid, ids, parent=None):

3
addons/account/project/project_view.xml
View File

@ -60,7 +60,8 @@
<newline/>
<field name="quantity_max"/>
<field name="user_id"/>
<separator colspan="4" string="Note"/>
</page>
<page string="Description">
<field colspan="4" name="description" nolabel="1"/>
</page>
</notebook>

2
addons/account_followup/followup_view.xml
View File

@ -72,8 +72,8 @@
<field name="inherit_id" ref="account.view_move_line_form"/>
<field name="arch" type="xml">
<field name="date_created" position="after">
<field name="followup_date"/>
<field name="followup_line_id"/>
<field name="followup_date"/>
</field>
</field>
</record>

2
addons/account_tax_include/invoice_tax_incl.xml
View File

@ -9,8 +9,8 @@
<field name="inherit_id" ref="account.view_tax_form"/>
<field name="arch" type="xml">
<field name="python_compute" position="after">
<field colspan="4" name="python_compute_inv" nolabel="1"/>
<separator colspan="4" string="Compute Code for Taxes included prices"/>
<field colspan="4" name="python_compute_inv" nolabel="1"/>
</field>
</field>
</record>

2
addons/base_vat/base_vat_data.xml
View File

@ -8,11 +8,11 @@
<field name="inherit_id" ref="base.view_partner_form"/>
<field name="arch" type="xml">
<field name="property_account_position" position="after">
<field name="vat" nolabel="1" on_change="vat_change(vat)" select="2"/>
<group colspan="1" col="2">
<label string="VAT :" align="1.0"/>
<field name="vat_subjected" nolabel="1"/>
</group>
<field name="vat" nolabel="1" on_change="vat_change(vat)" select="2"/>
</field>
</field>
</record>

4
addons/delivery/delivery_view.xml
View File

@ -137,8 +137,8 @@
<field name="inherit_id" ref="stock.view_picking_out_form"/>
<field name="arch" type="xml">
<field name="address_id" position="after">
<field name="weight"/>
<field name="carrier_id"/>
<field name="weight"/>
</field>
</field>
</record>
@ -150,8 +150,8 @@
<field name="inherit_id" ref="stock.view_picking_delivery_form"/>
<field name="arch" type="xml">
<field name="address_id" position="after">
<field name="weight"/>
<field name="carrier_id"/>
<field name="weight"/>
</field>
</field>
</record>

2
addons/hr_holidays/hr_view.xml
View File

@ -57,8 +57,8 @@
<field name="type">tree</field>
<field name="arch" type="xml">
<field name="name" position="after">
<field name="number_of_days" string="Number of Days"/>
<field name="employee_id"/>
<field name="number_of_days" string="Number of Days"/>
</field>
</field>
</record>

10
addons/hr_timesheet_invoice/hr_timesheet_invoice.py
View File

@ -65,8 +65,14 @@ class account_analytic_account(osv.osv):
_columns = {
'pricelist_id' : fields.many2one('product.pricelist', 'Sale Pricelist'),
'amount_max': fields.float('Max. Invoice Price'),
'amount_invoiced': fields.function(_invoiced_calc, method=True, string='Invoiced Amount'),
'to_invoice': fields.many2one('hr_timesheet_invoice.factor','Invoicing'),
'amount_invoiced': fields.function(_invoiced_calc, method=True, string='Invoiced Amount',
help="Total invoiced"),
'to_invoice': fields.many2one('hr_timesheet_invoice.factor','Reinvoice Costs',
help="Check this field if you plan to automatically generate invoices based " \
"on the costs in this analytic account: timesheets, expenses, ..."),
}
_defaults = {
'pricelist_id': lambda self,cr, uid, ctx: ctx.get('pricelist_id', False),
}
account_analytic_account()

5
addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
View File

@ -8,13 +8,16 @@
<field name="type">form</field>
<field name="inherit_id" ref="account.view_account_analytic_account_form"/>
<field name="arch" type="xml">
<field name="quantity_max" position="before">
<field name="user_id" position="after">
<group colspan="4" col="4">
<separator colspan="4" string="Invoicing Data"/>
<field name="pricelist_id"/>
<field name="to_invoice"/>
<field name="amount_max"/>
<field name="amount_invoiced"/>
<separator colspan="4" string="Status"/>
<field name="state"/>
</group>
</field>
</field>
</record>

2
addons/hr_timesheet_sheet/hr_timesheet_sheet.py
View File

@ -284,7 +284,7 @@ class hr_timesheet_sheet(osv.osv):
_constraints = [
(_sheet_date, 'You can not have 2 timesheets that overlaps !', ['date_from','date_to']),
(_sheet_date, 'You can not have 2 timesheets that overlaps !\nPlease use the menu \'My Current Timesheet\' to avoid this problem.', ['date_from','date_to']),
(_date_current_check, 'You must select a Current date wich is in the timesheet dates !', ['date_current']),
]

16
addons/mrp_operations/mrp_operations_view.xml
View File

@ -9,13 +9,13 @@
<field name="type">tree</field>
<field name="arch" type="xml">
<field name="hour" position="after">
<button name="button_done" string="Finished" states="startworking"/>
<button name="button_start_working" string="Start working" states="draft,pause"/>
<field name="uom"/>
<field name="qty"/>
<field name="product"/>
<field name="production_id"/>
<field name="state" />
<field name="production_id"/>
<field name="product"/>
<field name="qty"/>
<field name="uom"/>
<button name="button_start_working" string="Start working" states="draft,pause"/>
<button name="button_done" string="Finished" states="startworking"/>
</field>
</field>
</record>
@ -27,6 +27,8 @@
<field name="inherit_id" ref="mrp.mrp_production_workcenter_form_view"/>
<field name="arch" type="xml">
<field name="hour" position="after">
<field name="production_id"/>
<field name="delay"/>
<group colspan="8" col="8">
<field name="state" select="2"/>
<button name="button_draft" string="Set Draft" states="cancel"/>
@ -36,8 +38,6 @@
<button name="button_pause" string="Pause" states="startworking"/>
<button name="button_cancel" string="Cancel" states="draft,startworking"/>
</group>
<field name="delay"/>
<field name="production_id"/>
</field>
</field>
</record>

4
addons/project_gtd/project_gtd_view.xml
View File

@ -160,9 +160,9 @@
<field name="arch" type="xml">
<field name="partner_id" position="after">
<newline/>
<field name="timebox_id" select="1" domain="[('user_id', '=', uid)]"/>
<field name="context_id" select="2"/>
<separator string="Getting Things Done" colspan="4"/>
<field name="context_id" select="2"/>
<field name="timebox_id" select="1" domain="[('user_id', '=', uid)]"/>
<newline/>
</field>
</field>

2
addons/sale/sale_view.xml
View File

@ -107,7 +107,7 @@
<field domain="[('partner_id','=',partner_id)]" name="partner_invoice_id"/>
<field domain="[('partner_id','=',partner_id)]" name="partner_shipping_id"/>
<field domain="[('type','=','sale')]" name="pricelist_id"/>
<field name="project_id" select="2"/>
<field name="project_id" select="2" context="{'partner_id':partner_id, 'contact_id':partner_order_id, 'pricelist_id':pricelist_id}"/>
<newline/>
<field colspan="4" mode="tree,graph" name="order_line" nolabel="1" widget="one2many_list">
<form string="Sale Order Lines">

12
addons/sale_journal/sale_journal_view.xml
View File

@ -135,8 +135,8 @@
<field name="inherit_id" ref="sale.view_order_form" />
<field name="arch" type="xml">
<field name="client_order_ref" position="after">
<field name="journal_id" select="1"/>
<field name="invoice_type_id" select="1"/>
<field name="journal_id" select="1"/>
</field>
</field>
</record>
@ -147,8 +147,8 @@
<field name="inherit_id" ref="sale.view_order_tree" />
<field name="arch" type="xml">
<field name="state" position="after">
<field name="journal_id"/>
<field name="invoice_type_id"/>
<field name="journal_id"/>
</field>
</field>
</record>
@ -160,9 +160,9 @@
<field name="inherit_id" ref="stock.view_picking_form" />
<field name="arch" type="xml">
<field name="origin" position="after">
<field name="invoice_type_id" select="1"/>
<field name="sale_journal_id" select="1"/>
<field name="journal_id" select="1"/>
<field name="sale_journal_id" select="1"/>
<field name="invoice_type_id" select="1"/>
</field>
</field>
</record>
@ -174,9 +174,9 @@
<field name="inherit_id" ref="stock.vpicktree" />
<field name="arch" type="xml">
<field name="invoice_state" position="after">
<field name="sale_journal_id" select="1"/>
<field name="invoice_type_id" select="1"/>
<field name="journal_id" select="1"/>
<field name="invoice_type_id" select="1"/>
<field name="sale_journal_id" select="1"/>
</field>
</field>
</record>

6
addons/scrum/scrum_view.xml
View File

@ -17,10 +17,10 @@
<field name="inherit_id" ref="project.edit_project"/>
<field name="arch" type="xml">
<field name="state" position="after">
<newline/>
<field name="sprint_size"/>
<field name="product_owner_id" required="1" select="1"/>
<separator string="Scrum Data" colspan="4"/>
<field name="product_owner_id" required="1" select="1"/>
<field name="sprint_size"/>
<newline/>
</field>
</field>
</record>

2
addons/stock/product_view.xml
View File

@ -48,8 +48,8 @@
<field name="priority">26</field>
<field name="arch" type="xml">
<field name="property_account_expense" position="after">
<field name="property_stock_account_input"/>
<field name="property_stock_account_output"/>
<field name="property_stock_account_input"/>
</field>
</field>
</record>