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

[MERGE] Merge with main branch 

bzr revid: mra@tinyerp.com-20100416143724-d55j0eergsuf5xy8
This commit is contained in:
mra (Open ERP) 2010-04-16 20:07:24 +05:30
parent 78daf747a7 198e247a18
commit 5f27223ca1
86 changed files with 4669 additions and 4699 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
addons/account/account_bank_statement.py
View File

@ -373,6 +373,15 @@ class account_bank_statement(osv.osv):
osv.osv.unlink(self, cr, uid, unlink_ids, context=context)
return True
def copy(self, cr, uid, id, default=None, context=None):
if default is None:
default = {}
if context is None:
context = {}
default = default.copy()
default['move_line_ids'] = []
return super(account_bank_statement, self).copy(cr, uid, id, default, context)
account_bank_statement()

88
addons/account/account_invoice_view.xml
View File

@ -54,13 +54,13 @@
<page string="Line">
<field name="product_id" on_change="product_id_change(product_id, uos_id, quantity, name, parent.type, parent.partner_id, parent.fiscal_position, price_unit, parent.address_invoice_id, parent.currency_id, {'company_id': parent.company_id})"/>
<field name="uos_id"/>
<field name="quantity" select="1"/>
<field name="price_unit" select="1"/>
<field name="quantity"/>
<field name="price_unit"/>
<field name="discount"/>
<field colspan="4" name="name" select="1"/>
<field colspan="4" name="origin" select="1"/>
<field colspan="4" name="name"/>
<field colspan="4" name="origin" groups="base.group_extended"/>
<field domain="[('company_id', '=', parent.company_id), ('journal_id', '=', parent.journal_id), ('type', '&lt;&gt;', 'view')]" name="account_id" on_change="onchange_account_id(parent.fiscal_position,account_id)" groups="base.group_user"/>
<field domain="[('type','&lt;&gt;','view'), ('company_id', '=', parent.company_id)]" name="account_analytic_id" groups="base.group_user"/>
<field domain="[('type','&lt;&gt;','view'), ('company_id', '=', parent.company_id)]" name="account_analytic_id" groups="base.group_user,base.group_extended"/>
<newline/>
<field name="price_subtotal"/>
<field name="company_id" groups="base.group_multi_company" widget="selection"/>
@ -94,11 +94,11 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Manual Invoice Taxes">
<field name="name" select="1"/>
<field name="name"/>
<field name="sequence"/>
<field name="account_id" select="1" groups="base.group_user"/>
<field name="manual" select="1"/>
<field name="amount" select="1"/>
<field name="account_id" groups="base.group_user"/>
<field name="manual"/>
<field name="amount"/>
<field name="base" readonly="0"/>
<separator colspan="4" string="Tax codes"/>
<field name="base_code_id"/>
@ -115,7 +115,7 @@
<field name="type">tree</field>
<field name="arch" type="xml">
<tree colors="blue:state in ('draft');black:state not in ('draft')" string="Invoice">
<field name="date_invoice" select="1"/>
<field name="date_invoice"/>
<field name="number"/>
<field name="partner_id" groups="base.group_user"/>
<field name="name"/>
@ -142,14 +142,16 @@
<field name="arch" type="xml">
<form string="Supplier invoice">
<group col="6" colspan="4">
<field domain="[('type', '=', 'purchase')]" name="journal_id" select="2"/>
<field name="type" readonly="1" select="2"/>
<field name="number" select="1" readonly="1"/>
<field name="partner_id" domain="[('supplier','=', 1)]" on_change="onchange_partner_id(type,partner_id,date_invoice,payment_term, partner_bank,company_id)" select="1" context="{'default_customer': 0}"/>
<field domain="[('type', '=', 'purchase')]" name="journal_id"/>
<field name="number" readonly="1"/>
<field name="type" invisible="1"/>
<field name="currency_id" domain="[('company_id','=', company_id)]" on_change="onchange_currency_id(currency_id, company_id)"/>
<newline/>
<field name="partner_id" domain="[('supplier','=', 1)]" on_change="onchange_partner_id(type,partner_id,date_invoice,payment_term, partner_bank,company_id)" context="{'default_customer': 0}"/>
<field domain="[('partner_id','=',partner_id)]" name="address_invoice_id"/>
<field name="currency_id" domain="[('company_id','=', company_id)]" on_change="onchange_currency_id(currency_id, company_id)" select="2"/>
<field name="date_invoice" select="1"/>
<field name="fiscal_position" groups="base.group_extended" widget="selection"/>
<newline/>
<field name="date_invoice"/>
<field name="period_id" groups="base.group_user"/>
<group colspan="2" col="1" groups="base.group_user">
<label align="0.0" string="(keep empty to use the current period)"/>
@ -158,9 +160,9 @@
<notebook colspan="4">
<page string="Invoice">
<field domain="[('type','&lt;&gt;','view'), ('company_id', '=', company_id),('journal_id','=',journal_id)]" name="account_id" groups="base.group_user"/>
<field name="reference_type" nolabel="1" select="2" size="0"/>
<field name="reference" nolabel="1" select="1"/>
<field name="date_due" select="1"/>
<field name="reference_type" nolabel="1" size="0"/>
<field name="reference" nolabel="1"/>
<field name="date_due"/>
<field name="check_total" required="2"/>
<field colspan="4" default_get="{'check_total': check_total, 'invoice_line': invoice_line, 'address_invoice_id': address_invoice_id, 'partner_id': partner_id, 'price_type': 'price_type' in dir() and price_type or False}" name="invoice_line" nolabel="1">
<tree string="Invoice lines">
@ -195,7 +197,7 @@
<field name="amount_tax"/>
<field name="reconciled"/>
<field name="amount_total"/>
<field name="state" select="2"/>
<field name="state"/>
<field name="residual"/>
<group col="3" colspan="4">
<button name="invoice_open" states="draft,proforma2" string="Validate" icon="gtk-apply"/>
@ -206,21 +208,20 @@
</group>
</page>
<page string="Other Info">
<field domain="[('partner_id', '=', partner_id)]" name="partner_bank" on_change="onchange_partner_bank(partner_bank)" select="2"/>
<field domain="[('partner_id', '=', partner_id)]" name="partner_bank" on_change="onchange_partner_bank(partner_bank)"/>
<field name="company_id" on_change="onchange_company_id(company_id,partner_id,type,invoice_line,currency_id)" widget="selection" groups="base.group_multi_company"/>
<field name="fiscal_position" groups="base.group_extended" widget="selection"/>
<newline/>
<field name="payment_term" widget="selection"/>
<field name="name" select="2"/>
<field name="name"/>
<newline/>
<field name="origin" select="2"/>
<field colspan="4" domain="[('partner_id','=',partner_id)]" name="address_contact_id"/>
<field name="origin" groups="base.group_extended"/>
<field colspan="4" domain="[('partner_id','=',partner_id)]" name="address_contact_id" groups="base.group_extended"/>
<field name="move_id"/>
<separator colspan="4" string="Additional Information"/>
<field colspan="4" name="comment" nolabel="1"/>
</page>
<page string="Payments">
<page string="Payments" groups="base.group_extended">
<field name="payment_ids" colspan="4" nolabel="1" >
<tree string="Payments">
<field name="date"/>
@ -247,13 +248,17 @@
<field name="arch" type="xml">
<form string="Invoice">
<group colspan="4" col="6">
<field name="journal_id" select="2" groups="base.group_user"/>
<field name="type" readonly="1" select="2"/>
<field name="number" select="1"/>
<field name="partner_id" on_change="onchange_partner_id(type,partner_id,date_invoice,payment_term, partner_bank,company_id)" select="1" groups="base.group_user"/>
<field name="journal_id" groups="base.group_user"/>
<field name="number"/>
<field name="type" invisible="1"/>
<field name="currency_id" domain="[('company_id','=', company_id)]" on_change="onchange_currency_id(currency_id, company_id)"/>
<newline/>
<field name="partner_id" on_change="onchange_partner_id(type,partner_id,date_invoice,payment_term, partner_bank,company_id)" groups="base.group_user"/>
<field domain="[('partner_id','=',partner_id)]" name="address_invoice_id"/>
<field name="currency_id" domain="[('company_id','=', company_id)]" on_change="onchange_currency_id(currency_id, company_id)" select="2"/>
<field name="date_invoice" select="1"/>
<field name="fiscal_position" groups="base.group_extended" widget="selection"/>
<newline/>
<field name="date_invoice"/>
<field name="period_id" groups="base.group_user"/>
<group colspan="2" col="1" groups="base.group_user">
<label align="0.0" string="(keep empty to use the current period)"/>
@ -262,7 +267,7 @@
<notebook colspan="4">
<page string="Invoice">
<field domain="[('type','&lt;&gt;','view'), ('company_id', '=', company_id),('journal_id','=',journal_id)]" name="account_id" groups="base.group_user"/>
<field name="name" select="2"/>
<field name="name"/>
<field name="payment_term" widget="selection"/>
<field colspan="4" name="invoice_line" nolabel="1" widget="one2many_list"/>
<group col="1" colspan="2">
@ -283,7 +288,7 @@
<field name="amount_tax"/>
<field name="reconciled"/>
<field name="amount_total"/>
<field name="state" select="2"/>
<field name="state"/>
<field name="residual"/>
<group col="3" colspan="4" groups="base.group_user">
<button name="invoice_proforma2" states="draft" string="PRO-FORMA" icon="gtk-print"/>
@ -296,14 +301,15 @@
</page>
<page string="Other Info">
<field name="company_id" on_change="onchange_company_id(company_id,partner_id,type,invoice_line,currency_id)" widget="selection" groups="base.group_multi_company"/>
<field name="fiscal_position" groups="base.group_extended,base.group_user" widget="selection"/>
<newline/>
<field name="date_due"/>
<field name="user_id"/>
<newline/>
<field domain="[('partner_id.ref_companies', 'in', [company_id])]" name="partner_bank" select="2"/>
<field name="origin" select="2"/>
<field colspan="4" domain="[('partner_id','=',partner_id)]" name="address_contact_id"/>
<field domain="[('partner_id.ref_companies', 'in', [company_id])]" name="partner_bank"
groups="base.group_extended"/>
<field name="origin"/>
<field colspan="4" domain="[('partner_id','=',partner_id)]" name="address_contact_id"
groups="base.group_extended"/>
<field name="move_id" groups="base.group_user"/>
<separator colspan="4" string="Additionnal Information"/>
<field colspan="4" name="comment" nolabel="1"/>
@ -340,9 +346,7 @@
<separator orientation="vertical"/>
<field name="number"/>
<field name="partner_id"/>
<field name="user_id">
<filter string="My Invoices" icon="terp-account" domain="[('user_id','=',uid)]"/>
</field>
<field name="user_id" default="uid"/>
<field name="origin"/>
<field name="amount_total"/>
</group>

2
addons/account/account_view.xml
View File

@ -17,7 +17,7 @@
<field name="date_start"/>
<field name="date_stop"/>
<field name="company_id" groups="base.group_multi_company"/>
<field name="end_journal_period_id"/>
<field name="end_journal_period_id" groups="base.group_extended"/>
<separator colspan="4" string="Periods"/>
<field colspan="4" name="period_ids" nolabel="1" widget="one2many_list">
<form string="Period">

2
addons/account/partner_view.xml
View File

@ -85,7 +85,7 @@
<group col="2" colspan="2">
<separator string="Customer Credit" colspan="2"/>
<field name="credit" select="2"/>
<field name="credit_limit" select="2"/>
<field name="credit_limit" select="2" groups="base.group_extended"/>
</group>
<group col="2" colspan="2">
<separator string="Supplier Debit" colspan="2"/>

2
addons/account/sequence_view.xml
View File

@ -8,7 +8,7 @@
<field name="inherit_id" ref="base.sequence_view"/>
<field name="arch" type="xml">
<page position="after">
<page string="Fiscal Years">
<page string="Fiscal Years" groups="base.group_extended">
<field name="fiscal_ids" nolabel="1" colspan="4">
<tree string="Fiscal Year Sequences" editable="bottom">
<field name="fiscalyear_id"/>

20
addons/account_analytic_default/account_analytic_default_view.xml
View File

@ -7,14 +7,14 @@
<field name="type">tree</field>
<field name="arch" type="xml">
<tree string="Analytic Defaults" editable="bottom">
<field name="sequence" string="Seq"/>
<field name="analytic_id" select="1" required="1"/>
<field name="product_id" select="2"/>
<field name="partner_id" select="2"/>
<field name="user_id" select="2"/>
<field name="company_id" select="2" groups="base.group_multi_company"/>
<field name="sequence"/>
<field name="analytic_id" required="1"/>
<field name="product_id"/>
<field name="partner_id"/>
<field name="user_id"/>
<field name="date_start"/>
<field name="date_stop"/>
<field name="company_id" groups="base.group_multi_company"/>
</tree>
</field>
</record>
@ -27,10 +27,10 @@
<field name="analytic_id" select="1" required="1"/>
<field name="sequence"/>
<separator string="Conditions" colspan="4"/>
<field name="product_id" select="2"/>
<field name="partner_id" select="2"/>
<field name="user_id" select="2"/>
<field name="company_id" select="2" widget="selection" groups="base.group_multi_company"/>
<field name="product_id" select="1"/>
<field name="partner_id" select="1"/>
<field name="user_id"/>
<field name="company_id" widget="selection" groups="base.group_multi_company"/>
<field name="date_start"/>
<field name="date_stop"/>
</form>

10
addons/account_analytic_plans/account_analytic_plans_view.xml
View File

@ -87,8 +87,8 @@
<form string="Analytic Distribution">
<field name="name" select="1"/>
<field name="code" select="1"/>
<field name="plan_id" select="2" required="True"/>
<field name="journal_id" select="2"/>
<field name="plan_id" required="True"/>
<field name="journal_id"/>
<field name="account_ids" string="Analytic Distribution" colspan="4">
<tree string="Analytic Distribution" editable="bottom">
<field name="rate"/>
@ -107,8 +107,8 @@
<tree string="Analytic Distribution">
<field name="name" select="1"/>
<field name="code" select="1"/>
<field name="plan_id" select="2"/>
<field name="journal_id" select="2"/>
<field name="plan_id"/>
<field name="journal_id"/>
</tree>
</field>
</record>
@ -222,7 +222,7 @@
<tree string="Analytic Plan Lines">
<field name="name" select="1"/>
<field name="sequence"/>
<field name="root_analytic_id" select="2"/>
<field name="root_analytic_id"/>
<field name="min_required"/>
<field name="max_required"/>
</tree>

6
addons/account_budget/crossovered_budget_view.xml
View File

@ -70,7 +70,7 @@
<field name="name" select="1"/>
<field name="code" select="1"/>
<field name="company_id" groups="base.group_multi_company"/>
<field name="sequence" select="2"/>
<field name="sequence"/>
<notebook colspan="4">
<page string="Accounts">
<field name="account_ids" colspan="4" nolabel="1"/>
@ -127,8 +127,8 @@
<field name="code" colspan="1" select="1" />
<field name="creating_user_id" />
<field name="validating_user_id" readonly="True"/>
<field name="date_from" select="2"/>
<field name="date_to" select="2"/>
<field name="date_from"/>
<field name="date_to"/>
<field name="crossovered_budget_line" colspan="4" nolabel="1">
<tree string="Budget Lines">
<field name="analytic_account_id"/>

8
addons/account_followup/followup_report_view.xml
View File

@ -9,12 +9,12 @@
<field name="arch" type="xml">
<form string="Follow-Up lines">
<field name="name" select="1"/>
<field name="account_type" select="2"/>
<field name="account_type"/>
<field name="date_move" select="1"/>
<field name="date_move_last" select="1"/>
<field name="date_followup" select="2"/>
<field name="followup_id" select="2"/>
<field name="balance" select="2"/>
<field name="date_followup"/>
<field name="followup_id"/>
<field name="balance"/>
<field name="debit"/>
<field name="credit"/>
</form>

20
addons/account_payment/payment_view.xml
View File

@ -10,7 +10,7 @@
<field name="inherit_id" ref="account.view_move_line_form"/>
<field name="arch" type="xml">
<field name="reconcile_partial_id" position="after">
<field name="amount_to_pay" select="2"/>
<field name="amount_to_pay"/>
</field>
</field>
</record>
@ -106,7 +106,7 @@
<field name="mode"/>
<field name="date_prefered"/>
<field name="date_planned" select="1"/>
<field name="user_id" select="2"/>
<field name="user_id"/>
<button colspan="2" name="%(wizard_populate_payment)d" string="Select Invoices to Pay" type="action" attrs="{'invisible':[('state','=','done')]}" icon="gtk-find"/>
<field name="line_ids" colspan="4" widget="one2many_list" nolabel="1">
<form string="Payment Line">
@ -116,7 +116,7 @@
<separator colspan="4" string="Transaction Information"/>
<field name="date"/>
<group colspan="2">
<field name="amount_currency" select="2" on_change="onchange_amount(amount_currency,currency,company_currency)"/>
<field name="amount_currency" on_change="onchange_amount(amount_currency,currency,company_currency)"/>
<field name="currency" nolabel="1"/>
</group>
<field name="partner_id" on_change="onchange_partner(partner_id,parent.mode)" select="1"/>
@ -150,14 +150,14 @@
<field name="bank_id" domain="[('partner_id', '=', partner_id)]"/>
<field name="ml_maturity_date"/>
<field name="date"/>
<field name="amount_currency" select="2" string="Amount"/>
<field name="amount_currency" string="Amount"/>
<field name="currency"/>
<field name="name"/>
<field name="amount" sum="Total in Company Currency" invisible="1"/>
</tree>
</field>
<field name="date_created" select="2"/>
<field name="date_done" select="2"/>
<field name="date_created"/>
<field name="date_done"/>
<field name="state" readonly="1" select="1"/>
<group col="4" colspan="2">
<button name="cancel" states="draft,open" string="Cancel" icon="gtk-cancel"/>
@ -179,8 +179,8 @@
<field name="reference"/>
<field name="mode"/>
<field name="date_planned"/>
<field name="date_created" select="2"/>
<field name="date_done" select="2"/>
<field name="date_created"/>
<field name="date_done"/>
<field name="total"/>
<field name="state"/>
</tree>
@ -232,7 +232,7 @@
<separator colspan="4" string="Transaction Information"/>
<field name="date"/>
<group colspan="2">
<field name="amount_currency" select="2" on_change="onchange_amount(amount_currency,currency,comapny_currency)"/>
<field name="amount_currency" on_change="onchange_amount(amount_currency,currency,comapny_currency)"/>
<field name="currency" nolabel="1"/>
</group>
<field name="partner_id" on_change="onchange_partner(partner_id, False)" select="1"/>
@ -275,7 +275,7 @@
<field name="ml_maturity_date"/>
<field name="partner_id" select="1"/>
<field name="amount" sum="Amount Total"/>
<field name="amount_currency" sum="Currency Amount Total" select="2" />
<field name="amount_currency" sum="Currency Amount Total"/>
<field name="currency"/>
<field name="bank_id" domain="[('partner_id', '=', partner_id)]"/>
<field name="move_line_id" on_change="onchange_move_line(move_line_id,parent.mode)"/>

2
addons/account_report/account_view.xml
View File

@ -166,7 +166,7 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Account Report History">
<field name="period_id" select="2"/>
<field name="period_id"/>
<field name="fiscalyear_id" select="1"/>
<field name="name" select="1"/>
<field name="val"/>

6
addons/account_voucher/account_view.xml
View File

@ -9,9 +9,9 @@
<field name="type">form</field>
<field name="arch" type="xml">
<field name="user_type" position="after">
<field name="balance" string="Closing Balance" select="2"/>
<field name="type1" select="2" />
<field name="open_bal" select="2"/>
<field name="balance" string="Closing Balance"/>
<field name="type1" />
<field name="open_bal"/>
<field name="journal_id"/>
</field>
</field>

8
addons/account_voucher/voucher_view.xml
View File

@ -26,11 +26,11 @@
<group col="6" colspan="4">
<field name="name" select="1" colspan="4"/>
<field name="journal_id" select="1" on_change="onchange_journal(journal_id,type)"/>
<field name="account_id" select="2" on_change="onchange_account(account_id)"/>
<field name="type" select="2" on_change="onchange_journal(journal_id,type)"/>
<field name="account_id" on_change="onchange_account(account_id)"/>
<field name="type" on_change="onchange_journal(journal_id,type)"/>
<field name="number"/>
<!--field name="amount" select="1" invisible="1"/-->
<!--field name="partner_id" select="2"/-->
<!--field name="partner_id"/-->
</group>
<notebook colspan="4">
<page string="Entry Lines">
@ -60,7 +60,7 @@
<field name="currency_id" select="1" />
<field name="period_id"/>
<field name="date" select="1"/>
<!--field name="reference_type" select="2" nolabel="1" size="0"/>
<!--field name="reference_type" nolabel="1" size="0"/>
<field name="reference" select="1" nolabel="1"/-->
<separator string="General Entries" colspan="4"/>
<field name="move_ids" colspan="4" nolabel="1" readonly="1"/>

50
addons/auction/auction_view.xml
View File

@ -66,7 +66,7 @@
<field name="aie_categ" colspan="4"/>
<field name="priority"/>
<newline/>
<field name="active" select="2"/>
<field name="active"/>
</form>
</field>
</record>
@ -261,24 +261,24 @@
<group colspan="2" col="2">
<field name="obj_num" select="1"/>
<field name="name" select="1"/>
<field name="name2" select="2"/>
<field name="artist_id" select="2"/>
<field name="name2"/>
<field name="artist_id"/>
<field name="artist2_id"/>
<field name="product_id"/>
</group>
<field widget="image" name="image" nolabel="1" colspan="2"/>
<field name="lot_est1" select="2"/>
<field name="lot_est1"/>
<field name="lot_est2"/>
<field name="auction_id" colspan="2" select="1"/>
<field name="lot_type" select="2"/>
<field name="lot_type"/>
<field name="lot_local"/>
<field name="bord_vnd_id" select="1"/>
<field name="lot_num"/>
<separator string="Description" colspan="4"/>
<field name="obj_desc" colspan="4" nolabel="1" select="2"/>
<field name="state" colspan="1" select="2"/>
<field name="obj_desc" colspan="4" nolabel="1"/>
<field name="state" colspan="1"/>
<group col="8" colspan="2">
<button name="button_bought" string="Sold" states="draft" type="object" icon="gtk-jump-to"/>
<button name="button_not_bought" string="Not sold" states="draft" type="object" icon="gtk-undo"/>
@ -306,10 +306,10 @@
</page>
<page string="Buyer">
<separator string="Buyer information" colspan="4"/>
<field name="ach_uid" select="2"/>
<field name="ach_uid" />
<field name="ach_login" select="1" />
<field name="obj_price" select="2"/>
<field name="obj_comm" select="2"/>
<field name="obj_price"/>
<field name="obj_comm"/>
<field name="obj_ret"/>
<field name="ach_emp"/>
<field name="author_right" domain="[('domain','=','sabam'),('parent_id','=',False),('type_tax_use','&lt;&gt;','sale')]"/>
@ -323,7 +323,7 @@
<newline/>
<field name="ach_inv_id"/>
<field name="paid_ach"/>
<field name="is_ok" select="2"/>
<field name="is_ok"/>
<field name="statement_id" domain="[('state','=','draft')]" colspan="4" nolabel="1"
widget="one2many_list">
<tree string="Payment's history">
@ -405,7 +405,7 @@
<notebook>
<page string="Auction">
<field name="obj_num" readonly="1" select="1"/>
<field name="auction_id" select="2"/>
<field name="auction_id"/>
<field name="obj_price" select="1"/>
<field name="ach_login" select="1" comparator="="/>
<field name="ach_emp"/>
@ -638,7 +638,7 @@
<field name="name" select="1"/>
<newline/>
<field name="partner_id" select="1" on_change="onchange_contact(partner_id)"/>
<field name="contact_tel" select="2"/>
<field name="contact_tel"/>
<field name="auction_id" select="1"/>
<field name="bid_lines" colspan="4">
<tree string="Bids" editable="bottom">
@ -823,10 +823,10 @@
<field name="auction" />
<!--field name="date" /-->
<field name="seller" select="1"/>
<field name="object_number" select="2"/>
<field name="total_price" select="2"/>
<field name="avg_price" select="2" />
<field name="avg_estimation" select="2" />
<field name="object_number"/>
<field name="total_price"/>
<field name="avg_price" />
<field name="avg_estimation" />
</tree>
</field>
</record>
@ -1023,11 +1023,11 @@
<field name="depos" select="1"/>
<field name="lot" select="1"/>
<field name="product_l" select="1"/>
<field name="lot_est1_l" select="2"/>
<field name="lot_est1_l"/>
<field name="lot_est2_l" select="1"/>
<field name="artist_id_l" select="1"/>
<field name="name_l" select="1"/>
<field name="obj_desc_l" select="2"/>
<field name="obj_desc_l"/>
</tree>
</field>
</record>
@ -1061,9 +1061,9 @@ estimation.adj.category
<!--field name="date" select="1"/-->
<field name="lot_type" select="1"/>
<field name="user_id" select="1"/>
<field name="lot_est1" select="2"/>
<field name="lot_est2" select="2"/>
<field name="adj_total" select="2"/>
<field name="lot_est1"/>
<field name="lot_est2"/>
<field name="adj_total"/>
<field name="date" select="1"/>
</form>
</field>
@ -1430,9 +1430,9 @@ Object encoded
<field name="date" select="1"/>
<field name="state" select="1"/>
<field name="user_id" select="1"/>
<field name="estimation" select="2"/>
<field name="obj_ret" select="2"/>
<field name="obj_num" select="2" sum="# objects"/>
<field name="estimation"/>
<field name="obj_ret"/>
<field name="obj_num" sum="# objects"/>
</form>
</field>
</record>

1
addons/audittrail/audittrail_view.xml
View File

@ -59,6 +59,7 @@
</record>
<menuitem name="Audittrails" id="menu_action_audittrail"
groups="base.group_extended"
parent="base.menu_administration" />
<menuitem name="Rules" id="menu_action_audittrail_rule_tree"
action="action_audittrail_rule_tree" parent="menu_action_audittrail" />

9
addons/base_action_rule/base_action_rule_view.xml
View File

@ -2,6 +2,7 @@
<openerp>
<data>
<menuitem id="menu_base_action_rule" name="Action Rule"
groups="base.group_extended"
parent="base.menu_base_config" sequence="0" />
<!--
@ -60,13 +61,13 @@
<field name="arch" type="xml">
<form string="Action Rule Line">
<field name="name" select="1"/>
<field name="active" select="2"/>
<field name="active"/>
<notebook colspan="4">
<page string="Conditions">
<group col="2" colspan="2" name="model">
<separator colspan="4" string="Conditions on Model Fields"/>
<field name="regex_name" string="Regex on Model Name" colspan="2"/>
<field name="trg_user_id" select="2"/>
<field name="trg_user_id"/>
</group>
<group col="2" colspan="2" name="partner">
<separator colspan="4" string="Conditions on Model Partner"/>
@ -75,8 +76,8 @@
</group>
<group col="2" colspan="2">
<separator colspan="4" string="Conditions on States"/>
<field name="trg_state_from" select="2"/>
<field name="trg_state_to" select="2"/>
<field name="trg_state_from"/>
<field name="trg_state_to"/>
</group>
<group col="2" colspan="2">
<separator colspan="4" string="Conditions on Priority Range"/>

3
addons/base_calendar/base_calendar_view.xml
View File

@ -147,7 +147,8 @@
<menuitem id="base.menu_calendar_configuration" name="Calendar"
parent="base.menu_base_config" sequence="10" />
<menuitem name="Available Alarms" id="menu_crm_meeting_avail_alarm"
<menuitem id="menu_crm_meeting_avail_alarm"
groups="base.group_extended"
action="base_calendar.action_res_alarm_view"
parent="base.menu_calendar_configuration" />

28
addons/base_contact/base_contact_view.xml
View File

@ -38,7 +38,7 @@
<group string="Partner" colspan="2" col="2">
<field name="partner_id" invisible="1" select="1"/>
<field name="title" select="1"/>
<field name="function_id" invisible="1" select="2"/>
<field name="function_id" invisible="1"/>
<field name="email"/>
<field name="lang_id"/>
<field name="active"/>
@ -135,13 +135,13 @@
<field name="address" mode="form,tree" colspan="4" nolabel="1" select="1">
<form string="Address">
<group string="Postal Address" colspan="2" col="2">
<field name="type" select="2" />
<field name="street" select="2"/>
<field name="type" />
<field name="street"/>
<field name="street2"/>
<field name="zip" select="2"/>
<field name="city" select="2"/>
<field name="country_id" select="2" completion="1"/>
<field name="state_id" select="2"/>
<field name="zip"/>
<field name="city"/>
<field name="country_id" completion="1"/>
<field name="state_id"/>
</group>
<group string="Communication" colspan="2" col="2">
<field name="phone"/>
@ -226,7 +226,7 @@
<notebook position="inside">
<page string="Categories">
<separator colspan="4" string="Categories"/>
<field colspan="4" name="category_id" nolabel="1" select="2"/>
<field colspan="4" name="category_id" nolabel="1"/>
</page>
</notebook>
</field>
@ -311,7 +311,7 @@
<field name="partner_id" position="replace">
<field name='partner_id' select='1'/>
<field name='type' select='2'/>
<field name='job_id' invisible="1" select="2"/>
<field name='job_id' invisible="1"/>
</field>
</field>
</record>
@ -363,15 +363,15 @@
<field name="address_id" select="1" context="{'address_partner_id': name}"/>
<field name="contact_id" select="1"/>
<field name="function_id" select="1"/>
<field name="email" select="2" widget="email"/>
<field name="phone" select="2"/>
<field name="email" widget="email"/>
<field name="phone"/>
<field name="fax"/>
<field name="extension"/>
<field name="sequence_contact" select="2" groups="base.group_user"/>
<field name="sequence_partner" select="2" groups="base.group_user"/>
<field name="sequence_contact" groups="base.group_user"/>
<field name="sequence_partner" groups="base.group_user"/>
<field name="date_start" groups="base.group_user"/>
<field name="date_stop" groups="base.group_user"/>
<field name="state" select="2" />
<field name="state" />
</page>
</notebook>
</form>

5
addons/base_report_creator/base_report_creator.py
View File

@ -21,6 +21,7 @@
from osv import fields, osv
from tools.translate import _
from tools import ustr
class report_creator(osv.osv):
"""
@ -45,9 +46,9 @@ class report_creator(osv.osv):
if key not in fields_to_export:
continue
if isinstance(value, tuple):
datas.append(str(value[1]))
datas.append(ustr(value[1]))
else:
datas.append(str(value))
datas.append(ustr(value))
final_datas += [datas]
#End Loop
return {'datas': final_datas}

5
addons/base_report_creator/base_report_creator_view.xml
View File

@ -115,7 +115,7 @@
<!-- Action for Report creator form -->
<record model="ir.actions.act_window" id="base_report_creator_action">
<field name="name">Custom Report</field>
<field name="name">Custom Reports</field>
<field name="res_model">base_report_creator.report</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
@ -123,10 +123,11 @@
<menuitem
name="Custom Reports" id="base.menu_custom_reports"
groups="base.group_extended"
action="base_report_creator_action" parent="base.reporting_menu" sequence="1"/>
<menuitem
name="Custom Reports" parent="base.next_id_50"
parent="base.next_id_50"
id="menu_base_report_creator_action_config"
action="base_report_creator_action"/>

38
addons/event/event_view.xml
View File

@ -58,10 +58,10 @@
<form string="Events">
<group col="6" colspan="4">
<field name="name" string="Event" select="1"/>
<field name="type" select="2"/>
<field name="type"/>
<field name="user_id" select="1"/>
<field name="date_begin" select="1"/>
<field name="date_end" select="2"/>
<field name="date_end"/>
<field name="product_id"/>
</group>
<notebook colspan="4">
@ -69,8 +69,8 @@
<separator string="Event description" colspan="4"/>
<field name="parent_id" domain="[('parent_id','child_of','Event')]" string="Parent Category"/>
<field name="active"/>
<field name="register_min" select="2"/>
<field name="register_max" select="2"/>
<field name="register_min"/>
<field name="register_max"/>
<separator string="Status" colspan="4"/>
<field name="state" select="1"/>
<group col="4" colspan="2">
@ -186,18 +186,18 @@
</group>
<field name="partner_id" required="1" select="1" on_change="onchange_partner_id(partner_id,event_id)" />
<field name="partner_invoice_id" on_change="onchange_partner_invoice_id(event_id, partner_invoice_id)"/>
<field name="unit_price" select="2"/>
<field name="unit_price"/>
</group>
<notebook colspan="4">
<page string="General">
<field name="contact_id" select="2" on_change="onchange_contact_id(contact_id, partner_id)" /><newline/>
<field name="email_from" select="2"/>
<field name="contact_id" on_change="onchange_contact_id(contact_id, partner_id)" /><newline/>
<field name="email_from"/>
<button name="remind_partner" string="Send Reminder" states="open,pending" type="object" colspan="2" icon="gtk-go-forward"/>
<newline/>
<separator string="Badge" colspan="4"/>
<field name="badge_title" select="2"/>
<field name="badge_name" select="2" on_change="onchange_badge_name(badge_name)"/>
<field name="badge_partner" select="2"/>
<field name="badge_title"/>
<field name="badge_name" on_change="onchange_badge_name(badge_name)"/>
<field name="badge_partner"/>
<newline/>
<separator string="Status" colspan="4"/>
<group col="8" colspan="4">
@ -210,9 +210,9 @@
<page string="Extra Info">
<field name="name" select="1" colspan="4"/>
<field name="id" select="1"/>
<field name="active" select="2"/>
<field name="active"/>
<field name="email_cc" colspan="4"/>
<field name="categ_id" select="2" on_change="onchange_categ_id(categ_id)"/>
<field name="categ_id" on_change="onchange_categ_id(categ_id)"/>
<separator colspan="4" string="Dates"/>
<field name="create_date"/>
<field name="date_closed"/>
@ -249,8 +249,8 @@
<form string="Actions">
<separator string="Action Information" colspan="4"/>
<field name="name" colspan="4"/>
<field name="date" select="2"/>
<field name="user_id" select="2"/>
<field name="date"/>
<field name="user_id"/>
</form>
</field>
</page>
@ -309,9 +309,9 @@
<field name="name" select="1"/>
<field name="date_begin" select="1"/>
<field name="date_end"/>
<field name="draft_state" select="2"/>
<field name="confirm_state" select="2"/>
<field name="register_max" select="2"/>
<field name="draft_state"/>
<field name="confirm_state"/>
<field name="register_max"/>
</tree>
</field>
</record>
@ -351,8 +351,8 @@
<tree string="Registration By Event Types">
<field name="name" select="1"/>
<field name="nbevent"/>
<field name="draft_state" select="2"/>
<field name="confirm_state" select="2"/>
<field name="draft_state"/>
<field name="confirm_state"/>
</tree>
</field>
</record>

4
addons/hr/hr_department_view.xml
View File

@ -15,7 +15,7 @@
<form string="department">
<group col="6" colspan="4">
<field colspan="4" name="name" select="1"/>
<field name="parent_id" select="2"/>
<field name="parent_id"/>
<field colspan="4" name="manager_id" select="1"/>
<field name="company_id" select="1" widget="selection" groups="base.group_multi_company"/>
</group>
@ -82,7 +82,7 @@
<field name="inherit_id" ref="base.view_users_form"/>
<field name="arch" type="xml">
<notebook position="inside">
<page string="Departements Informations">
<page string="Departements Informations" groups="base.group_extended">
<field name="context_department_id" completion="1" widget="selection" string="Department"/>
<separator string="Managers" colspan="4"/>
<field name="parent_id" nolabel="1" colspan="4"/>

51
addons/hr/hr_view.xml
View File

@ -3,22 +3,13 @@
<data>
<menuitem icon="terp-hr" id="menu_hr_root" name="Human Resources" sequence="6"/>
<menuitem id="menu_hr_human_resources" sequence="1" name="Human Resources" parent="menu_hr_root"/>
<!-- <menuitem
id="menu_hr_reporting"
name="Reporting"
parent="hr.menu_hr_root"
sequence="40" /> -->
<menuitem
id="menu_hr_configuration"
name="Configuration"
parent="hr.menu_hr_root"
sequence="50" />
<!-- <menuitem
id="menu_hr_time"
name="Time Tracking"
parent="hr.menu_hr_root"/>
-->
<menuitem id="menu_view_employee_category_configuration_form" parent="hr.menu_hr_configuration" name="Employees" sequence="1"/>
<!--
==========
Employee
@ -33,7 +24,7 @@
<group colspan="4" col="6">
<field name="name" select="1"/>
<field name="user_id"/>
<field name="active"/>
<field name="active" groups="base.group_extended"/>
<field name="company_id" widget="selection" groups="base.group_multi_company"/>
</group>
<notebook colspan="4">
@ -52,7 +43,7 @@
<separator colspan="2" string="Social IDs"/>
<field name="ssnid"/>
<field name="sinid" groups="base.group_extended"/>
<field name="otherid"/>
<field name="otherid" groups="base.group_extended"/>
</group>
<group col="2" colspan="2">
@ -102,16 +93,18 @@
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Employees">
<filter icon="terp-partner" domain="[('parent_id','child_of',uid),('id', '!=', uid)]" string ="My Employees"/>
<filter icon="terp-partner" domain="[('active','=',False)]" string="Unactive"
groups="base.group_extended"/>
<separator orientation="vertical" />
<field name="name"/>
<field name="department_id" widget="selection"/>
<field name="job_id" widget="selection"/>
<field name="parent_id" widget="selection" />
<newline />
<group expand="1" string="Group By..." colspan="11" col="11">
<filter string="Manager" icon="terp-sale" domain="[]" context="{'group_by':'parent_id'}"/>
<filter string="Coach" icon="terp-sale" domain="[]" context="{'group_by':'coach_id'}"/>
<separator orientation="vertical" />
<filter string="Department" icon="terp-sale" domain="[]" context="{'group_by':'department_id'}"/>
<filter string="Job" icon="terp-sale" domain="[]" context="{'group_by':'job_id'}"/>
</group>
@ -136,17 +129,6 @@
<field name="view_id" eval="False"/>
<field name="search_view_id" ref="view_employee_filter"/>
</record>
<!-- <menuitem
id="menu_open_view_employee_list"
name="Employees"
action="open_view_employee_list"
groups="group_hr_manager"
parent="menu_hr_human_resources"/>
<menuitem
action="open_view_employee_tree"
id="menu_open_view_employee_tree"
parent="menu_open_view_employee_list"/>-->
<record id="open_view_employee_list_my" model="ir.actions.act_window">
<field name="name">Employees</field>
<field name="res_model">hr.employee</field>
@ -156,12 +138,7 @@
<field name="view_id" ref="view_employee_tree"/>
<field name="search_view_id" ref="view_employee_filter"/>
</record>
<!--<menuitem
action="open_view_employee_list_my"
id="menu_open_view_employee_list_my"
parent="menu_open_view_employee_list"/>-->
<menuitem
name="Employees"
action="open_view_employee_list_my"
id="menu_open_view_employee_list_my"
parent="menu_hr_human_resources"/>
@ -280,7 +257,9 @@
<field name="view_mode">tree,form</field>
</record>
<menuitem action="open_view_categ_form" id="menu_view_employee_category_form" parent="menu_view_employee_category_configuration_form" sequence="1"/>
<menuitem action="open_view_categ_form"
id="menu_view_employee_category_form"
parent="menu_view_employee_category_configuration_form" sequence="1"/>
<record id="open_view_categ_tree" model="ir.actions.act_window">
<field name="name">Categories structure</field>
@ -308,7 +287,10 @@
<field eval="True" name="object"/>
</record>
<menuitem action="open_view_categ_tree" id="menu_view_employee_category_tree" parent="hr.menu_view_employee_category_form"/>
<menuitem
action="open_view_categ_tree"
groups="base.group_extended"
id="menu_view_employee_category_tree" parent="hr.menu_view_employee_category_form"/>
<record id="view_hr_job_form" model="ir.ui.view">
<field name="name">hr.job.form</field>
@ -393,7 +375,10 @@
name="Recruitment"
id="base.menu_crm_case_job_req_main"
parent="menu_hr_root"/>
<menuitem parent="base.menu_crm_case_job_req_main" id="menu_hr_job" action="action_hr_job" sequence="2"/>
<menuitem
parent="base.menu_crm_case_job_req_main"
id="menu_hr_job"
action="action_hr_job" sequence="2"/>
</data>
</openerp>

1
addons/hr_evaluation/hr_evaluation_view.xml
View File

@ -345,6 +345,5 @@
<!-- Evaluation Interviews Button on Employee Form -->
<act_window domain="[('user_to_review_id', '=', active_id)]" id="act_hr_employee_2_hr__evaluation_interview" name="Evaluation Interviews" res_model="hr.evaluation.interview" src_model="hr.employee"/>
</data>
</openerp>

41
addons/hr_expense/hr_expense_view.xml
View File

@ -26,11 +26,10 @@
<field name="model">hr.expense.expense</field>
<field name="type">tree</field>
<field name="arch" type="xml">
<tree string="Expenses"
colors="blue:state == 'draft'">
<tree string="Expenses" colors="blue:state=='draft'">
<field name="date"/>
<field name="employee_id"/>
<field name="department_id"/>
<field name="department_id" groups="base.group_extended"/>
<field name="name"/>
<field name="ref"/>
<field name="amount"/>
@ -49,7 +48,7 @@
<tree string="Expenses" editable="top">
<field name="date"/>
<field name="employee_id"/>
<field name="department_id"/>
<field name="department_id" groups="base.group_extended"/>
<field name="name"/>
<field name="ref"/>
<field name="amount"/>
@ -69,32 +68,32 @@
<group colspan="4" col="6">
<field name="name" select="1"/>
<field name="employee_id" select="1"/>
<field name="ref" select="2"/>
<field name="ref"/>
<field name="date" select="1"/>
<field name="amount"/>
<field name="currency_id"/>
<field name="department_id"/>
<field name="company_id"/>
<field name="department_id" groups="base.group_extended"/>
<field name="company_id" groups="base.group_multi_company"/>
</group>
<notebook colspan="4">
<page string="Expense Sheet">
<newline/>
<field colspan="4" name="line_ids" nolabel="1">
<form string="Expense Lines">
<field name="product_id" on_change="onchange_product_id(product_id, uom_id, parent.employee_id)" select="2"/>
<field name="uom_id" on_change="onchange_product_id(product_id, uom_id, parent.employee_id)" select="2"/>
<field name="product_id" on_change="onchange_product_id(product_id, uom_id, parent.employee_id)"/>
<field name="uom_id" on_change="onchange_product_id(product_id, uom_id, parent.employee_id)"/>
<field name="name" select="1"/>
<field name="date_value" select="1"/>
<field name="unit_quantity" select="2"/>
<field name="unit_amount" select="2"/>
<field name="ref" select="2"/>
<field name="sequence"/>
<field domain="[('type','=','normal')]" name="analytic_account"/>
<field name="unit_quantity"/>
<field name="unit_amount"/>
<field name="ref"/>
<field name="sequence" groups="base.group_extended"/>
<field domain="[('type','=','normal')]" name="analytic_account" groups="base.group_extended"/>
<newline/>
<field name="total_amount"/>
</form>
</field>
<field name="state" select="2"/>
<field name="state"/>
<group col="6" colspan="2">
<button name="confirm" states="draft" string="Confirm" type="workflow" icon="gtk-apply"/>
<button name="cancel" states="cancel" string="Cancel" type="workflow" icon="gtk-cancel"/>
@ -104,14 +103,14 @@
<button name="refuse" states="confirm,draft,accepted" string="Refuse" type="workflow" icon="gtk-no"/>
</group>
</page>
<page string="Other Info">
<page string="Other Info" groups="base.group_extended">
<separator colspan="4" string="Accounting data"/>
<field name="journal_id"/>
<separator colspan="4" string="Validation"/>
<field name="date_confirm" select="2" readonly = "1"/>
<field name="date_valid" select="2" readonly = "1"/>
<field name="user_valid" select="2"/>
<field name="invoice_id" select="2"/>
<field name="date_confirm" readonly = "1"/>
<field name="date_valid" readonly = "1"/>
<field name="user_valid"/>
<field name="invoice_id"/>
<separator colspan="4" string="Notes"/>
<field colspan="4" name="note" nolabel="1"/>
</page>
@ -155,7 +154,7 @@
domain="[('department_id','=',context.get('department_id',False))]"
string="Expenses of My Department"/>
</field>
<field name="department_id" widget="selection" />
<field name="department_id" widget="selection" groups="base.group_extended"/>
</group>
<newline />
<group expand="1" string="Group By..." colspan="11" col="11">

4
addons/hr_holidays/hr_holidays_view.xml
View File

@ -12,9 +12,7 @@
<filter icon="terp-hr" domain="[('state','=','confirm')]" string="To Validate"/>
<filter icon="terp-hr" domain="[('state','=','validate')]" string="Validated"/>
<separator orientation="vertical"/>
<filter icon="terp-hr" help="My Leaves" domain="[('user_id','=',uid)]" string="My Leaves"/>
<separator orientation="vertical"/>
<field name="user_id" widget="selection" />
<field name="user_id" widget="selection" default="uid"/>
<field name="department_id" widget="selection">
<filter icon="terp-hr"
domain="[('department_id.manager_id','=',uid)]"

8
addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
View File

@ -27,8 +27,8 @@
<field name="inherit_id" ref="account.view_account_analytic_account_form"/>
<field name="type">form</field>
<field name="arch" type="xml">
<field name="company_currency_id" select="2" position="replace">
<field name="currency_id" select="2"/>
<field name="company_currency_id" position="replace">
<field name="currency_id"/>
</field>
</field>
</record>
@ -40,7 +40,7 @@
<field name="inherit_id" ref="hr_timesheet.hr_timesheet_line_form"/>
<field name="arch" type="xml">
<field name="journal_id" position="after">
<field name="to_invoice" select="2"/>
<field name="to_invoice"/>
<field name="invoice_id"/>
</field>
</field>
@ -154,7 +154,7 @@
<field name="arch" type="xml">
<form string="Type of invoicing">
<field colspan="1" name="name" select="1"/>
<field colspan="1" name="customer_name" select="2"/>
<field colspan="1" name="customer_name"/>
<field colspan="2" name="factor"/>
</form>
</field>

4
addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
View File

@ -30,7 +30,7 @@
<field name="sheet_id" select="1"/>
<field name="name" select="1"/>
<field name="total" sum="Total"/>
<field name="invoice_rate" select="2"/>
<field name="invoice_rate"/>
</form>
</field>
</record>
@ -280,7 +280,7 @@
<field name="inherit_id" ref="hr_attendance.view_attendance_form"/>
<field name="arch" type="xml">
<field name="action_desc" position="after">
<field name="sheet_id" select="2"/>
<field name="sheet_id"/>
</field>
</field>
</record>

10
addons/idea/idea_view.xml
View File

@ -14,7 +14,7 @@
<field name="name" select="1"/>
<field name="parent_id" select="1"/>
<newline/>
<field name="summary" select="2" colspan="4"/>
<field name="summary" colspan="4"/>
</form>
</field>
</record>
@ -124,7 +124,7 @@
<form string="Votes">
<field name="idea_id" select="1" />
<field name="user_id" select="1" />
<field name="score" select="2"/>
<field name="score"/>
</form>
</field>
</record>
@ -143,8 +143,8 @@
<field name="category_id" select="1"/>
<field name="user_id" select="1"/>
<field name="vote_avg" />
<field name="description" colspan="4" select="2" widget="text_wiki"/>
<field name="state" select="2"/>
<field name="description" colspan="4" widget="text_wiki"/>
<field name="state"/>
<group colspan="2" col="3">
<button name="idea_open" string="Open" states="draft" icon="gtk-go-forward"/>
<button name="idea_close" string="Close" states="open" icon="gtk-close"/>
@ -286,7 +286,7 @@
<form string="vote_stat of ideas">
<field name="idea_id" select="1"/>
<field name="score" select="1"/>
<field name="nbr" select="2"/>
<field name="nbr" />
</form>
</field>
</record>

10
addons/l10n_ch/bank_view.xml
View File

@ -8,7 +8,7 @@
<field name="inherit_id" ref="base.view_res_bank_form"/>
<field name="arch" type="xml">
<field name="bic" position="after">
<field name="clearing" select="2"/>
<field name="clearing"/>
</field>
</field>
</record>
@ -32,8 +32,8 @@
<field name="inherit_id" ref="base.view_partner_bank_form"/>
<field name="arch" type="xml">
<field name="country_id" position="after">
<field name="print_bank" select="2"/>
<field name="print_account" select="2"/>
<field name="print_bank"/>
<field name="print_account"/>
</field>
</field>
</record>
@ -45,8 +45,8 @@
<field name="arch" type="xml">
<field name="bank" position="after">
<newline />
<field name="print_bank" select="2"/>
<field name="print_account" select="2"/>
<field name="print_bank"/>
<field name="print_account"/>
</field>
</field>
</record>

4
addons/lunch/lunch_view.xml
View File

@ -32,7 +32,7 @@
<field name="price"/>
<field name="descript"/>
<field name="cashmove"/>
<field name="state" select="2"/>
<field name="state"/>
</group>
</form>
</field>
@ -117,7 +117,7 @@
<form string="CashMove">
<field name="name" select="1"/>
<field name="user_cashmove" select="1"/>
<field name="amount" select="2"/>
<field name="amount"/>
<field name="box" select="1"/>
<field name="create_date" select="1"/>
<field name="active" select="1"/>

12
addons/membership/membership_view.xml
View File

@ -180,13 +180,13 @@
<field name="arch" type="xml">
<notebook position="inside">
<page string="Membership">
<field name="membership_state" select="2"/>
<field name="membership_amount" select="2"/>
<field name="membership_state"/>
<field name="membership_amount"/>
<field name="associate_member"/>
<field name="free_member" select="2"/>
<field name="membership_start" select="2"/>
<field name="membership_stop" select="2"/>
<field name="membership_cancel" select="2"/>
<field name="free_member"/>
<field name="membership_start"/>
<field name="membership_stop"/>
<field name="membership_cancel"/>
<field name="member_lines" nolabel="1" colspan="4">
<tree string="Membership">
<field name="date_from"/>

76
addons/mrp/mrp_view.xml
View File

@ -115,7 +115,7 @@
<group col="6" colspan="4">
<field name="name" select="1"/>
<field name="code" select="1"/>
<field name="active" select="2"/>
<field name="active"/>
<field name="company_id" select="1" groups="base.group_multi_company" widget="selection"/>
</group>
<notebook colspan="4">
@ -134,7 +134,7 @@
<field name="time_stop"/>
</group>
</page>
<page string="Analytic Accounting">
<page string="Analytic Accounting" groups="base.group_extended">
<field name="costs_hour"/>
<field name="costs_hour_account_id"/>
<field name="costs_cycle"/>
@ -197,7 +197,7 @@
<form string="Routing">
<separator colspan="4" string="General Information"/>
<field name="name" select="1"/>
<field name="active" select="1"/>
<field name="active" select="1" groups="base.group_extended"/>
<field name="code" select="1"/>
<field name="location_id"/>
<separator colspan="4" string="Description"/>
@ -244,11 +244,11 @@
<group colspan="4" col="6">
<field name="product_id" on_change="onchange_product_id(product_id, name)" select="1"/>
<field name="name" select="1"/>
<field name="code" select="1"/>
<field name="code" select="1" groups="base.group_extended"/>
<newline/>
<field name="product_uom"/>
<field name="product_qty"/>
<field name="routing_id" select="2" groups="base.group_extended"/>
<field name="routing_id" groups="base.group_extended"/>
<newline/>
<field name="product_uos" groups="product.group_uos"/>
<field name="product_uos_qty" groups="product.group_uos"/>
@ -264,14 +264,14 @@
<page string="Revisions" groups="base.group_extended">
<field colspan="4" name="revision_ids" nolabel="1" widget="one2many_list"/>
</page>
<page string="Properties">
<field name="position" select="2"/>
<field name="active" select="2"/>
<page string="Properties" groups="base.group_extended">
<field name="position"/>
<field name="active"/>
<field name="sequence"/>
<field name="bom_id"/>
<field name="date_start" select="2"/>
<field name="date_stop" select="2"/>
<field name="date_start"/>
<field name="date_stop"/>
<field name="product_rounding"/>
<field name="product_efficiency"/>
<field colspan="4" name="property_ids" nolabel="2" groups="base.group_extended"/>
@ -471,9 +471,9 @@
<notebook colspan="4">
<page string="Consumed Products">
<field name="bom_id" select="2" domain="[('product_id','=',product_id),('bom_id','=',False)]" on_change="bom_id_change(bom_id)"/>
<field name="bom_id" domain="[('product_id','=',product_id),('bom_id','=',False)]" on_change="bom_id_change(bom_id)"/>
<field name="routing_id" groups="base.group_extended" select="1"/>
<field name="location_src_id" select="2" domain="[('usage','=','internal')]" on_change="location_id_change(location_src_id,location_dest_id)"/>
<field name="location_src_id" domain="[('usage','=','internal')]" on_change="location_id_change(location_src_id,location_dest_id)"/>
<field name="location_dest_id" domain="[('usage','=','internal')]"/>
<separator string="" colspan="4"/>
@ -484,7 +484,6 @@
<field name="product_qty" string="Qty"/>
<field name="product_uom" string="UOM"/>
<field name="location_id" string="Source Loc."/>
<field name="state" invisible="1"/>
<button name="%(stock.move_consume)d"
string="Consume Products" type="action"
@ -517,12 +516,11 @@
string="Scrap Products" type="action"
icon="gtk-convert"
states="done,cancel"/>
</tree>
</field>
<group col="9" colspan="4">
<field name="state" select="2"/>
<field name="state"/>
<button name="action_compute" states="draft" string="Compute Data" type="object" icon="gtk-execute"/>
<button name="button_confirm" states="draft" string="Confirm Production" icon="gtk-apply"/>
<button name="button_produce" states="ready" string="Mark as Started" icon="gtk-execute"/>
@ -570,7 +568,7 @@
</tree>
</field>
</page>
<page string="Work Orders">
<page string="Work Orders" groups="base.group_extended">
<field colspan="4" name="workcenter_lines" nolabel="1">
<form string="Production Work Centers">
<field colspan="4" name="name" select="1"/>
@ -587,7 +585,6 @@
<field name="hour"/>
</tree>
</field>
</page>
<page string="Scheduled Products">
<field colspan="4" name="product_lines" nolabel="1" widget="one2many_list"/>
@ -596,12 +593,12 @@
<field name="company_id" select="1" groups="base.group_multi_company" widget="selection"/>
<field name="priority" groups="base.group_extended"/>
<newline/>
<field name="date_start" select="2"/>
<field name="date_start"/>
<field name="date_finnished"/>
<field name="picking_id"/>
<field name="move_prod_id"/>
<field name="sale_name"/>
<field name="sale_ref"/>
<field name="picking_id" groups="base.group_extended"/>
<field name="move_prod_id" groups="base.group_extended"/>
<field name="sale_name" groups="base.group_extended"/>
<field name="sale_ref" groups="base.group_extended"/>
</page>
</notebook>
</form>
@ -634,14 +631,14 @@
<separator orientation="vertical"/>
<field name="name"/>
<field name="product_id"/>
<field name="routing_id"/>
<field name="routing_id" groups="base.group_extended"/>
<field name="origin"/>
</group>
<newline/>
<group expand="1" string="Group By" colspan="10" col="8">
<filter string="Product" icon="terp-mrp" domain="[]" context="{'group_by':'product_id'}"/>
<filter string="State" icon="terp-mrp" domain="[]" context="{'group_by':'state'}"/>
<filter string="Routing" icon="terp-mrp" domain="[]" context="{'group_by':'routing_id'}"/>
<filter string="Routing" icon="terp-mrp" domain="[]" context="{'group_by':'routing_id'}" groups="base.group_extended"/>
<separator orientation="vertical"/>
<filter string="Date" icon="terp-mrp" domain="[]" context="{'group_by':'date_planned'}"/>
</group>
@ -714,8 +711,8 @@
<field name="product_id"/>
<field name="product_qty"/>
<field name="product_uom"/>
<field name="product_uos_qty"/>
<field name="product_uos"/>
<field name="product_uos_qty" groups="product.group_uos"/>
<field name="product_uos" groups="product.group_uos"/>
<field name="tracking_id"/>
</form>
</field>
@ -729,8 +726,8 @@
<field name="product_id"/>
<field name="product_qty"/>
<field name="product_uom"/>
<field name="product_uos_qty"/>
<field name="product_uos"/>
<field name="product_uos_qty" groups="product.group_uos"/>
<field name="product_uos" groups="product.group_uos"/>
<field name="tracking_id"/>
</tree>
</field>
@ -746,8 +743,8 @@
<field name="product_id"/>
<field name="product_qty"/>
<field name="product_uom"/>
<field name="product_uos_qty"/>
<field name="product_uos"/>
<field name="product_uos_qty" groups="product.group_uos"/>
<field name="product_uos" groups="product.group_uos"/>
</form>
</field>
</record>
@ -760,8 +757,8 @@
<field name="product_id"/>
<field name="product_qty"/>
<field name="product_uom"/>
<field name="product_uos_qty"/>
<field name="product_uos"/>
<field name="product_uos_qty" groups="product.group_uos"/>
<field name="product_uos" groups="product.group_uos"/>
</tree>
</field>
</record>
@ -795,20 +792,20 @@
<group col="2" colspan="2">
<separator colspan="2" string="References"/>
<field name="name" select="1" string="Procurement Reason"/>
<field name="origin" select="2"/>
<field name="origin"/>
<field name="company_id" select="1" groups="base.group_multi_company" widget="selection"/>
</group>
<group col="2" colspan="2">
<separator colspan="2" string="Planification"/>
<field name="date_planned" select="1"/>
<field name="procure_method" select="2"/>
<field name="procure_method"/>
<field name="priority" groups="base.group_extended"/>
</group>
<notebook colspan="4">
<page string="Procurement Details">
<separator colspan="4" string="Product &amp; Location"/>
<field name="product_id" select="1" on_change="onchange_product_id(product_id)"/>
<field name="location_id" select="2" domain="[('usage','=','internal')]"/>
<field name="location_id" domain="[('usage','=','internal')]"/>
<field name="product_qty"/>
<field name="product_uom"/>
@ -817,7 +814,7 @@
<separator colspan="4" string="Status"/>
<field colspan="4" name="message" readonly="1"/>
<field name="state" readonly="1" select="2"/>
<field name="state" readonly="1"/>
<group col="7" colspan="2">
<button name="button_confirm" states="draft" string="Confirm" icon="gtk-apply"/>
<button name="button_restart" states="exception" string="Retry" icon="gtk-convert"/>
@ -827,9 +824,9 @@
</page>
<page string="Extra Information">
<separator colspan="4" string="Details"/>
<field name="bom_id" select="2" domain="[('product_id','=',product_id),('bom_id','=',False)]"/>
<field name="bom_id" domain="[('product_id','=',product_id),('bom_id','=',False)]"/>
<field name="move_id" groups="base.group_extended"/>
<field name="date_close" select="2"/>
<field name="date_close"/>
<field name="close_move" groups="base.group_extended"/>
<field name="purchase_id"/>
<group colspan="4" groups="base.group_extended">
@ -989,7 +986,7 @@
<field name="product_max_qty"/>
<field name="qty_multiple"/>
</group>
<group col="2" colspan="2">
<group col="2" colspan="2" groups="base.group_extended">
<separator string="Misc" colspan="2" />
<field name="procurement_id" readonly="1"/>
<field name="active" />
@ -997,6 +994,7 @@
</form>
</field>
</record>
<record id="action_orderpoint_form" model="ir.actions.act_window">
<field name="name">Minimum Stock Rules</field>
<field name="res_model">stock.warehouse.orderpoint</field>

46
addons/mrp_operations/mrp_operations_view.xml
View File

@ -1,7 +1,9 @@
<?xml version="1.0"?>
<openerp>
<data>
<menuitem id="menu_mrp_planning" name="Planning" parent="base.menu_mrp_root" sequence="2"/>
<menuitem id="menu_mrp_planning" name="Planning"
parent="base.menu_mrp_root" sequence="2"
groups="base.group_extended"/>
<record model="ir.ui.view" id="mrp_production_workcenter_tree_view_inherit">
<field name="name">mrp.production.workcenter.line.tree</field>
<field name="model">mrp.production.workcenter.line</field>
@ -175,10 +177,19 @@
</record>
<menuitem action="mrp.mrp_production_action" id="menu_mrp_production_order_action" parent="menu_mrp_planning" sequence="1"/>
<menuitem name="Work Orders" parent="mrp.menu_mrp_manufacturing" id="menu_mrp_production_wc_order" action="mrp_production_wc_action_form"/>
<menuitem name="Work Orders" parent="menu_mrp_planning" id="menu_mrp_production_wc_action_planning" action="mrp_production_wc_action_planning" sequence="2"/>
<!-- <menuitem name="All Work Orders" parent="menu_mrp_planning" id="menu_mrp_production_wc_action" action="mrp_production_wc_action"/>-->
<menuitem action="mrp.mrp_production_action"
id="menu_mrp_production_order_action"
parent="menu_mrp_planning" sequence="1"
groups="base.group_extended"/>
<menuitem name="Work Orders" parent="mrp.menu_mrp_manufacturing"
id="menu_mrp_production_wc_order"
action="mrp_production_wc_action_form"
groups="base.group_extended"/>
<menuitem name="Work Orders" parent="menu_mrp_planning"
id="menu_mrp_production_wc_action_planning"
action="mrp_production_wc_action_planning"
sequence="2"
groups="base.group_extended"/>
<!-- Operation codes -->
@ -194,7 +205,6 @@
</tree>
</field>
</record>
<record model="ir.ui.view" id="mrp_production_code_form_view">
<field name="name">mrp.production.code.form</field>
<field name="model">mrp_operations.operation.code</field>
@ -217,8 +227,6 @@
<field name="view_id" ref="mrp_production_code_tree_view"/>
</record>
<!-- <menuitem name="Start - Stop Codes" parent="menu_mrp_planning" id="menu_mrp_production_code_action" action="mrp_production_code_action"/>-->
<!-- Operations -->
<record model="ir.ui.view" id="mrp_production_operation_tree_view">
@ -250,21 +258,6 @@
</field>
</record>
<!--<record model="ir.ui.view" id="mrp_production_operation_form_view">
<field name="name">mrp.production.operation.form</field>
<field name="model">mrp_operations.operation</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Production Operation">
<field name="production_id" select="1"/>
<field name="workcenter_id" select="1"/>
<field name="code_id" select="1"/>
</form>
</field>
</record>
-->
<record model="ir.actions.act_window" id="mrp_production_operation_action">
<field name="name">Operations</field>
<field name="type">ir.actions.act_window</field>
@ -273,13 +266,6 @@
<field name="view_mode">tree,calendar,form</field>
<field name="view_id" ref="mrp_production_operation_tree_view"/>
</record>
<!-- <menuitem-->
<!-- name="Work Order Events Using Bar Codes"-->
<!-- parent="menu_mrp_planning"-->
<!-- id="menu_mrp_production_operation_action"-->
<!-- action="mrp_production_operation_action"/>-->
<record id="mrp_production_reorder_form_view" model="ir.ui.view">
<field name="name">mrp.production.allow_reorder.form</field>
<field name="inherit_id" ref="mrp.mrp_production_form_view"/>

4
addons/mrp_repair/mrp_repair_view.xml
View File

@ -94,7 +94,9 @@
</page>
<page string="Invoicing">
<field name="invoice_method" colspan="4"/>
<field name="pricelist_id" context="product_id=product_id" attrs="{'readonly':[('invoice_method','=', 'none')]}"/>
<field
name="pricelist_id" context="product_id=product_id"
attrs="{'readonly':[('invoice_method','=', 'none')]}"/>
<field name="partner_invoice_id" attrs="{'readonly':[('invoice_method','=', 'none')]}"/>
<!-- <field name="invoice_id"/> -->
<field colspan="4" mode="tree,form" name="fees_lines" nolabel="1" widget="one2many_list">

3
addons/point_of_sale/pos_view.xml
View File

@ -13,7 +13,7 @@
<group colspan="4" col="6">
<field name="user_id1" />
<field name="partner_id" on_change="onchange_partner_pricelist(partner_id)"/>
<field name="contract_number" select="1" />
<field name="contract_number" select="1" groups="base.group_extended"/>
</group>
<field name="lines" colspan="4" nolabel="1">
<tree string="Order lines" editable="bottom">
@ -1001,7 +1001,6 @@ invoiced
<menuitem icon="STOCK_PRINT" action="action_report_pos_sales_user_today_current_user"
id="menu_pos_sales_user_today_current_user" parent="menu_cashboxes_by_day" sequence="7"/>
<menuitem icon="STOCK_PRINT" action="action_report_pos_details"
id="menu_pos_details" parent="menu_cashboxes_by_day" />

13
addons/product/pricelist_view.xml
View File

@ -44,7 +44,9 @@
<field name="view_type">form</field>
<field name="view_id" ref="product_pricelist_version_tree_view"/>
</record>
<menuitem action="product_pricelist_action" id="menu_product_pricelist_action" parent="product.menu_product_pricelist_main" sequence="2"/>
<menuitem
action="product_pricelist_action" id="menu_product_pricelist_action"
parent="product.menu_product_pricelist_main" sequence="2"/>
<record id="product_pricelist_item_tree_view" model="ir.ui.view">
<field name="name">product.pricelist.item.tree</field>
@ -147,7 +149,9 @@
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
</record>
<menuitem action="product_pricelist_action2" id="menu_product_pricelist_action2" parent="product.menu_product_pricelist_main" sequence="1"/>
<menuitem
action="product_pricelist_action2" id="menu_product_pricelist_action2"
parent="product.menu_product_pricelist_main" sequence="1"/>
<record id="product_price_type_view" model="ir.ui.view">
<field name="name">product.price.type.form</field>
@ -169,9 +173,6 @@
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
</record>
<!-- <menuitem name="Prices Computations" id="menu_price" parent="product.menu_config_product"/>-->
<!-- <menuitem action="product_price_type_action" groups="base.group_extended" id="menu_product_price_type_action" parent="menu_price"/>-->
<record id="product_pricelist_type_view" model="ir.ui.view">
<field name="name">product.pricelist.type.form</field>
<field name="model">product.pricelist.type</field>
@ -190,7 +191,5 @@
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
</record>
<!-- <menuitem action="product_pricelist_type_action" groups="base.group_extended" id="menu_product_pricelist_type_action" parent="menu_price"/>-->
</data>
</openerp>

13
addons/product/product_view.xml
View File

@ -196,7 +196,6 @@
<menuitem id="base.menu_product" name="Products" parent="base.menu_base_partner" sequence="4"/>
<menuitem action="product.product_normal_action" id="product.menu_products" parent="base.menu_product" sequence="1"/>
<!-- <menuitem action="product_normal_action" id="menu_products" parent="product.menu_main_product" sequence="1"/>-->
<record id="product_normal_action_puchased" model="ir.actions.act_window">
<field name="name">Products</field>
@ -252,8 +251,6 @@
<field name="view_type">tree</field>
<field name="view_id" ref="product_category_tree_view"/>
</record>
<!-- <menuitem action="product_category_action" id="menu_product_category_action" parent="product.menu_main_product" sequence="3"/>-->
<record id="product_category_action_form" model="ir.actions.act_window">
<field name="name">Products Categories</field>
<field name="type">ir.actions.act_window</field>
@ -261,8 +258,10 @@
<field name="view_type">form</field>
<field name="view_id" ref="product_category_list_view"/>
</record>
<!-- <menuitem action="product_category_action_form" id="menu_product_category_action_form" parent="product.menu_config_product" sequence="1"/>-->
<menuitem action="product_category_action_form" id="menu_product_category_action_form" parent="prod_config_main" sequence="60"/>
<menuitem action="product_category_action_form"
groups="base.group_extended"
id="menu_product_category_action_form"
parent="prod_config_main" sequence="60"/>
<record id="product_normal_action_tree" model="ir.actions.act_window">
@ -375,8 +374,8 @@
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
</record>
<!-- <menuitem action="product_ul_form_action" groups="base.group_extended" id="menu_product_ul_form_action" parent="product.menu_config_product" sequence="4"/>-->
<menuitem action="product_ul_form_action" groups="base.group_extended" id="menu_product_ul_form_action" parent="prod_config_main" sequence="65"/>
<menuitem
action="product_ul_form_action" groups="base.group_extended" id="menu_product_ul_form_action" parent="prod_config_main" sequence="65"/>
<record id="product_packaging_tree_view" model="ir.ui.view">
<field name="name">product.packaging.tree.view</field>

1
addons/product_margin/product_margin_view.xml
View File

@ -1,7 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data>
<record model="ir.ui.view" id="view_product_margin_graph">
<field name="name">product.margin.graph</field>
<field name="model">product.product</field>

1
addons/project/project_view.xml
View File

@ -630,7 +630,6 @@
<field name="search_view_id" ref="view_project_message_search"/>
</record>
<!--<menuitem id="menu_message_main" name="Message" parent="base.menu_main_pm"/>-->
<menuitem action="action_view_project_messages_tree" id="menu_message_tree" parent="menu_project_management" sequence="11"/>
<act_window domain="[('user_id', '=', active_id),('state', '&lt;&gt;', 'cancelled'),('state', '&lt;&gt;', 'done')]" id="act_res_users_2_project_task_opened" name="Assigned tasks" res_model="project.task" src_model="res.users" view_mode="tree,form,gantt,calendar,graph" view_type="form"/>

8
addons/project_long_term/project_long_term_view.xml
View File

@ -296,9 +296,13 @@
# Menu Items
# ------------------------------------------------------
<menuitem action="act_project_phase" id="menu_project_phase" parent="project.menu_project_management" sequence="4"/>
<menuitem action="act_project_phase"
groups="base.group_extended"
id="menu_project_phase" parent="project.menu_project_management" sequence="4"/>
<menuitem icon="terp-project" id="base.menu_main_pm" name="Project Management" sequence="1"/>
<menuitem id="menu_pm_resources_project1" name="Resources" parent="base.menu_main_pm" sequence="2"/>
<menuitem id="menu_pm_resources_project1"
groups="base.group_extended"
name="Resources" parent="base.menu_main_pm" sequence="2"/>
<menuitem action="resource.action_resource_resource_tree" id="menu_view_resource" parent="menu_pm_resources_project1" sequence="1"/>
<menuitem action="resource.action_resource_calendar_form" id="menu_view_resource_calendar" parent="menu_pm_resources_project1" sequence="1"/>
<menuitem action="resource.action_resource_calendar_leave_tree" id="menu_view_resource_calendar_leaves" parent="menu_pm_resources_project1" sequence="1"/>

12
addons/project_planning/project_planning_view.xml
View File

@ -90,7 +90,7 @@
<field name="project_id" required="1" select="1" domain="[('category_id','=',parent.account_id)]"/>
</group>
<group colspan="4" col="4">
<field name="date_deadline" select="2"/>
<field name="date_deadline"/>
<field name="user_id" select="1" domain="[('id','=',parent.user_id)]"/>
</group>
<notebook colspan="4">
@ -101,10 +101,10 @@
widget="float_time"
attrs="{'readonly':[('state','!=','draft')]}"
on_change="onchange_planned(planned_hours,effective_hours)"/>
<field name="remaining_hours" select="2" widget="float_time" attrs="{'readonly':[('state','!=','draft')]}"/>
<field name="remaining_hours" widget="float_time" attrs="{'readonly':[('state','!=','draft')]}"/>
<button name="%(project.action_config_compute_remaining)d" string="Review" type="action" colspan="1" target="new" states="open,pending" icon="gtk-edit"/>
</group>
<field colspan="4" name="description" nolabel="1" select="2" attrs="{'readonly':[('state','=','done')]}" widget="text_wiki"/>
<field colspan="4" name="description" nolabel="1" attrs="{'readonly':[('state','=','done')]}" widget="text_wiki"/>
<group col="11" colspan="4">
<field name="state" select="1"/>
<button name="do_draft" states="open" string="Draft" type="object" icon="gtk-indent"/>
@ -124,8 +124,8 @@
</group>
<separator string="Miscelleanous" colspan="4"/>
<field name="type"/>
<field name="active" select="2"/>
<field name="partner_id" select="2"/>
<field name="active"/>
<field name="partner_id"/>
<separator colspan="4" string="Notes"/>
<field colspan="4" name="notes" nolabel="1"/>
</page>
@ -349,7 +349,7 @@
<field name="inherit_id" ref="project.view_task_form2"/>
<field name="arch" type="xml">
<field name="priority" position="before">
<field name="planning_line_id" select="2" domain="['|', ('user_id','=',user_id), ('user_id','=', False)]"/>
<field name="planning_line_id" domain="['|', ('user_id','=',user_id), ('user_id','=', False)]"/>
</field>
</field>
</record>

20
addons/purchase/purchase_view.xml
View File

@ -69,12 +69,12 @@
<form string="Purchase Order">
<group col="6" colspan="4">
<field name="name" select="1"/>
<field name="date_order" select="2"/>
<field name="invoiced" select="2"/>
<field name="date_order"/>
<field name="invoiced"/>
<newline/>
<field name="warehouse_id" on_change="onchange_warehouse_id(warehouse_id)" widget="selection"/>
<field name="origin" select="2"/>
<field name="shipped" select="2"/>
<field name="origin"/>
<field name="shipped"/>
<field name="company_id" groups="base.group_multi_company" widget="selection"/>
</group>
<notebook colspan="4">
@ -82,7 +82,7 @@
<field name="partner_id" on_change="onchange_partner_id(partner_id)" select="1" domain="[('supplier','=', 1)]"/>
<field name="partner_address_id"/>
<field domain="[('type','=','purchase')]" name="pricelist_id"/>
<field name="partner_ref" select="2"/>
<field name="partner_ref"/>
<newline/>
<field colspan="4" name="order_line" nolabel="1" mode="tree,form">
<tree colors="red:date_planned&lt;=current_date;black:date_planned&gt;current_date" string="Purchase Order Lines">
@ -289,15 +289,5 @@
name="Product purchases"
res_model="purchase.order.line"
src_model="product.product"/>
<!--
<record model="ir.values" id="action_merge_purchase_order">
<field name="object" eval="1" />
<field name="name">Purchase Order</field>
<field name="key2">client_action_multi</field>
<field name="value" eval="'ir.actions.act_window,' + str(ref('action_view_purchase_order_group'))" />
<field name="key">action</field>
<field name="model">purchase.order</field>
</record>
-->
</data>
</openerp>

2
addons/purchase_manual/purchase_manual_view.xml
View File

@ -77,7 +77,6 @@
<field name="view_id" ref="purchase_order_line_form"/>
<field name="act_window_id" ref="purchase_line_form_action"/>
</record>
<!-- <menuitem action="purchase_line_form_action" id="menu_purchase_line_form_action" parent="base.menu_purchase_root"/>-->
<record id="purchase_line_form_action2" model="ir.actions.act_window">
<field name="name">Uninvoiced Purchase Order Lines</field>
@ -99,7 +98,6 @@
<field name="view_id" ref="purchase_order_line_form"/>
<field name="act_window_id" ref="purchase_line_form_action2"/>
</record>
<!-- <menuitem action="purchase_line_form_action2" id="menu_purchase_line_order_draft" parent="menu_purchase_line_form_action"/>-->
</data>
</openerp>

5
addons/purchase_requisition/purchase_requisition_view.xml
View File

@ -9,7 +9,7 @@
<field name="inherit_id" ref="purchase.purchase_order_tree"/>
<field name="arch" type="xml">
<field name="name" position="after">
<field name="requisition_id"/>
<field name="requisition_id" groups="base.group_extended"/>
</field>
</field>
</record>
@ -21,7 +21,7 @@
<field name="inherit_id" ref="purchase.purchase_order_form"/>
<field name="arch" type="xml">
<field name="partner_ref" position="after">
<field name="requisition_id"/>
<field name="requisition_id" groups="base.group_extended"/>
</field>
</field>
</record>
@ -91,6 +91,7 @@
<menuitem
id="menu_purchase_requisition_pro_mgt"
sequence="0"
groups="base.group_extended"
parent="purchase.menu_procurement_management"
action="action_purchase_requisition"/>

14
addons/sale/sale_view.xml
View File

@ -1,8 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data>
<!-- <menuitem icon="terp-sale" id="menu_sale_root" name="Sales Management"-->
<!-- groups="group_sale_user"/>-->
<menuitem id="base.menu_sales" name="Sales" parent="base.menu_base_partner" sequence="1"/>
<menuitem id="base.menu_product" name="Products" parent="base.menu_base_partner" sequence="4"/>
@ -45,7 +43,9 @@
<field name="view_mode">tree,form</field>
<field name="view_id" ref="view_shop_tree"/>
</record>
<menuitem action="action_shop_form" id="menu_action_shop_form" parent="base.menu_base_config" sequence="70"/>
<menuitem action="action_shop_form" id="menu_action_shop_form"
parent="base.menu_base_config" sequence="70"
groups="base.group_extended"/>
<record id="view_sale_order_calendar" model="ir.ui.view">
<field name="name">sale.order.calendar</field>
@ -76,8 +76,8 @@
<field name="type">tree</field>
<field name="arch" type="xml">
<tree string="Sales orders">
<field name="date_order" string="Order date"/>
<field name="name" string="Reference"/>
<field name="date_order"/>
<field name="name"/>
<field name="partner_id"/>
<field name="partner_shipping_id"/>
<field name="user_id" />
@ -100,8 +100,8 @@
<field name="name" select="1"/>
<field name="client_order_ref"/>
<field name="shipped"/>
<field name="shop_id" on_change="onchange_shop_id(shop_id)" widget="selection"/>
<field name="date_order" select="1" string="Order date" />
<field name="date_order" select="1"/>
<field name="shop_id" on_change="onchange_shop_id(shop_id)" widget="selection" groups="base.group_extended"/>
<field name="invoiced"/>
</group>
<notebook colspan="4">

1
addons/sale/stock_view.xml
View File

@ -12,6 +12,5 @@
</field>
</field>
</record>
</data>
</openerp>

2
addons/sale_analytic_plans/sale_analytic_plans_view.xml
View File

@ -8,7 +8,7 @@
<field name="type">form</field>
<field name="inherit_id" ref="sale.view_order_form"/>
<field name="arch" type="xml">
<field name="project_id" select="2" position="replace"/>
<field name="project_id" position="replace"/>
</field>
</record>

111
addons/stock/stock_view.xml
View File

@ -17,9 +17,9 @@
<field name="product_id"/>
<field name="product_qty"/>
<field name="product_uom"/>
<field name="prod_lot_id"/>
<field name="prod_lot_id" groups="base.group_extended"/>
<button name="%(stock.action_view_stock_inventory_line_split)d"
string="Split inventory lines"
string="Split inventory lines" groups="base.group_extended"
type="action" icon="gtk-justify-fill"/>
<field name="location_id"/>
</tree>
@ -34,10 +34,10 @@
<field context="location=location_id,uom=product_uom" name="product_id" on_change="on_change_product_id(location_id,product_id,product_uom)" select="1" domain="[('type','&lt;&gt;','service')]"/>
<field name="product_qty"/>
<field name="product_uom"/>
<field name="prod_lot_id"/>
<field name="prod_lot_id" groups="base.group_extended"/>
<field colspan="4" domain="[('usage','=','internal')]" name="location_id" select="1"/>
<button name="%(stock.action_view_stock_inventory_line_split)d"
string="Split inventory lines"
string="Split inventory lines" groups="base.group_extended"
type="action" icon="gtk-justify-fill"/>
</form>
</field>
@ -88,11 +88,11 @@
<field context="location=location_id,uom=product_uom" name="product_id" on_change="on_change_product_id(location_id,product_id,product_uom)" select="1" domain="[('type','&lt;&gt;','service')]"/>
<field name="product_qty"/>
<field name="product_uom"/>
<field name="prod_lot_id"/>
<field name="prod_lot_id" groups="base.group_extended"/>
<field colspan="4" domain="[('usage','=','internal')]" name="location_id" select="1"/>
<field name="state" invisible="1"/>
<button name="%(stock.action_view_stock_inventory_line_split)d"
string="Split inventory lines"
string="Split inventory lines" groups="base.group_extended"
type="action" icon="gtk-justify-fill" states="draft"/>
</tree>
<form string="Inventory Lines">
@ -100,10 +100,10 @@
<field name="product_qty"/>
<field name="product_uom"/>
<field domain="[('usage','=','internal')]" name="location_id" select="1"/>
<field name="prod_lot_id"/>
<field name="prod_lot_id" groups="base.group_extended"/>
<group colspan="2" col="3">
<button name="%(stock.action_view_stock_inventory_line_split)d"
string="Split inventory lines"
string="Split inventory lines" groups="base.group_extended"
type="action" icon="gtk-justify-fill"/>
</group>
</form>
@ -230,11 +230,11 @@
<notebook colspan="4">
<page string="Production Lot">
<field name="name" select="1"/>
<field name="ref" select="2"/>
<field name="ref"/>
<field name="prefix" select="1"/>
<field name="product_id" select="1"/>
<field name="stock_available"/>
<field name="date" select="2"/>
<field name="date"/>
<field colspan="4" name="revisions" nolabel="1"/>
</page>
</notebook>
@ -289,7 +289,7 @@
<field name="search_view_id" ref="search_product_lot_filter" />
<field name="context">{'full':'1',"search_default_available":1}</field>
</record>
<menuitem action="action_production_lot_form" id="menu_action_production_lot_form" parent="menu_traceability"/>
<menuitem action="action_production_lot_form" id="menu_action_production_lot_form" parent="menu_traceability" groups="base.group_extended"/>
#
# Lot composition (history)
@ -305,7 +305,7 @@
<field name="product_qty" select="1"/>
<field name="product_uom" select="1" string="UOM"/>
<field name="prodlot_id" select="1" groups="base.group_extended"/>
<field name="product_packaging" domain="[('product_id','=',product_id)]"/>
<field name="product_packaging" domain="[('product_id','=',product_id)]" groups="base.group_extended"/>
<field name="picking_id"/>
<field name="location_id" select="1"/>
<field name="location_dest_id" select="1"/>
@ -327,7 +327,7 @@
<field name="product_qty" select="1"/>
<field name="product_uom" select="1" string="UOM"/>
<field name="prodlot_id" select="1" groups="base.group_extended"/>
<field name="product_packaging" domain="[('product_id','=',product_id)]"/>
<field name="product_packaging" domain="[('product_id','=',product_id)]" groups="base.group_extended"/>
<field name="picking_id"/>
<field name="location_id" select="1"/>
<field name="location_dest_id" select="1"/>
@ -400,15 +400,16 @@
<field name="arch" type="xml">
<form string="Stock location">
<field name="name" select="1"/>
<field name="active" select="2"/>
<field name="active" groups="base.group_extended"/>
<newline/>
<field name="usage" select="1"/>
<field name="company_id" select="1" groups="base.group_multi_company" widget="selection"/>
<field name="account_id" select="1"/>
<field name="account_id" select="1" groups="base.group_extended"/>
<field name="location_id"/>
<field name="address_id" context="{'contact_display':'partner'}"/>
<field name="icon"/>
<newline/>
<group col="2" colspan="2">
<group col="2" colspan="2" groups="base.group_extended">
<separator string="Chained Locations" colspan="2"/>
<field name="chained_location_type"/>
<field name="chained_location_id"/>
@ -579,8 +580,8 @@
<group colspan="4" col="6">
<field name="name" select="1" readonly="1"/>
<field name="address_id" select="1" context="{'contact_display' : 'partner'}"/>
<field name="origin" select="2"/>
<field name="backorder_id" select="2" readonly="1"/>
<field name="origin"/>
<field name="backorder_id" readonly="1"/>
<field name="date" />
<field name="min_date" select="1"/>
<field name="type"/>
@ -639,11 +640,11 @@
<field name="date_planned"/>
<field name="address_id" select="1" context="{'contact_display':'partner'}"/>
<field groups="base.group_extended" name="product_packaging"/>
<field name="prodlot_id" select="2" groups="base.group_extended"
<field name="prodlot_id" groups="base.group_extended"
context="{'location_id':location_id, 'product_id':product_id}"
domain="[('product_id','=?',product_id)]"
on_change="onchange_lot_id(prodlot_id,product_qty, location_id, product_id)"/>
<field groups="base.group_extended" name="tracking_id" select="2"/>
<field groups="base.group_extended" name="tracking_id"/>
<newline/>
<label/>
<button name="%(track_line)d" string="Split in production lots" type="action" icon="gtk-justify-fill"/>
@ -676,10 +677,10 @@
<field colspan="4" name="note" nolabel="1"/>
</page>
<page string="Other info" groups="base.group_extended">
<field name="active" select="2"/>
<field name="active"/>
<field name="auto_picking"/>
<field name="invoice_state" select="2"/>
<field name="date_done" select="2"/>
<field name="invoice_state"/>
<field name="date_done"/>
<newline/>
<field name="move_type"/>
</page>
@ -742,8 +743,8 @@
<group col="6" colspan="4">
<field name="name" select="1" readonly="1"/>
<field name="address_id" select="1"/>
<field name="origin" select="2"/>
<field name="backorder_id" select="2" readonly="1"/>
<field name="origin"/>
<field name="backorder_id" readonly="1"/>
<field name="date" />
<field name="min_date" select="1"/>
<field name="company_id" select="1" groups="base.group_multi_company" widget="selection"/>
@ -800,7 +801,7 @@
<field invisible="1" name="date"/>
<field name="date_planned"/>
<field groups="base.group_extended" name="product_packaging"/>
<field name="prodlot_id" select="2" groups="base.group_extended"
<field name="prodlot_id" groups="base.group_extended"
context="{'location_id':location_id, 'product_id':product_id}"
domain="[('product_id','=?',product_id)]"
on_change="onchange_lot_id(prodlot_id,product_qty, location_id, product_id)"/>
@ -834,10 +835,10 @@
</page>
<page string="Other info" groups="base.group_extended">
<field name="auto_picking"/>
<field name="active" select="2"/>
<field name="active"/>
<newline/>
<field name="date" select="1"/>
<field name="date_done" select="2"/>
<field name="date_done"/>
<field name="move_type"/>
</page>
</notebook>
@ -930,12 +931,12 @@
<field name="arch" type="xml">
<form string="Picking list">
<group col="6" colspan="4">
<field name="address_id" select="2"/>
<field name="min_date" select="2"/>
<field name="address_id"/>
<field name="min_date"/>
<field name="name" select="1" readonly="1"/>
<field name="invoice_state"/>
<field name="backorder_id" select="2" readonly="1"/>
<field name="origin" select="2" readonly="1"/>
<field name="backorder_id" readonly="1"/>
<field name="origin" readonly="1"/>
<field name="company_id" select="1" groups="base.group_multi_company" widget="selection"/>
<button name="%(act_stock_make_picking_wizard)d"
states="assigned"
@ -1025,11 +1026,11 @@
<field colspan="4" name="note" nolabel="1"/>
</page>
<page string="Other info" groups="base.group_extended">
<field name="active" select="2"/>
<field name="active"/>
<field name="auto_picking"/>
<newline/>
<field name="date" select="2"/>
<field name="date_done" select="2"/>
<field name="date"/>
<field name="date_done"/>
<field name="move_type"/>
</page>
</notebook>
@ -1117,12 +1118,12 @@
<form string="Input Picking List">
<group colspan="4" col="6">
<field name="name" readonly="1" select="1"/>
<field name="address_id" on_change="onchange_partner_in(address_id)" select="2" context="{'contact_display':'partner'}"/>
<field name="origin" select="2"/>
<field name="backorder_id" select="2" readonly="1"/>
<field name="address_id" on_change="onchange_partner_in(address_id)" context="{'contact_display':'partner'}"/>
<field name="origin"/>
<field name="backorder_id" readonly="1"/>
<field name="date"/>
<field name="min_date" select="2" readonly="1"/>
<field name="invoice_state" select="2" string="Invoice Control"/>
<field name="min_date" readonly="1"/>
<field name="invoice_state" string="Invoice Control"/>
<field name="company_id" select="1" groups="base.group_multi_company" widget="selection"/>
<button name="%(act_stock_make_picking_wizard)d"
states="confirmed,assigned"
@ -1343,19 +1344,19 @@
<page string="General Information">
<group colspan="2" col="2">
<separator colspan="2" string="Move Information"/>
<field name="name" select="2"/>
<field name="name"/>
<field name="product_id" select="1" on_change="onchange_product_id(product_id,location_id,location_dest_id)"/>
<field name="product_qty" select="2" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
<field name="product_uom" select="2"/>
<field name="product_uos" select="2"/>
<field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
<field name="product_uom"/>
<field name="product_uos"/>
</group>
<group colspan="2" col="2">
<separator string="Locations &amp; Picking" colspan="2" />
<field name="location_id" select="1"/>
<field name="location_dest_id" select="1"/>
<field name="picking_id" select="2"/>
<field name="address_id" select="2" context="{'contact_display':'partner'}"/>
<field name="picking_id"/>
<field name="address_id" context="{'contact_display':'partner'}"/>
<field name="company_id" select="1" groups="base.group_multi_company" widget="selection"/>
</group>
@ -1369,7 +1370,7 @@
<group colspan="2" col="4">
<separator string="Traceability" colspan="4" />
<field name="tracking_id" select="1" colspan="4" />
<field name="prodlot_id" select="2" groups="base.group_extended"
<field name="prodlot_id" groups="base.group_extended"
context="{'location_id':location_id, 'product_id':product_id}"
domain="[('product_id','=?',product_id)]"
on_change="onchange_lot_id(prodlot_id,product_qty, location_id, product_id)"/>
@ -1467,23 +1468,23 @@
<field name="location_id"/>
<field name="location_dest_id"/>
<field colspan="4" name="product_id" on_change="onchange_product_id(product_id,location_id,location_dest_id)"/>
<field name="product_qty" select="2" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
<field name="product_uom" select="2"/>
<field name="product_uos" select="2"/>
<field colspan="4" name="name" select="2"/>
<field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
<field name="product_uom"/>
<field name="product_uos"/>
<field colspan="4" name="name"/>
<field name="date"/>
<field name="company_id" groups="base.group_multi_company" widget="selection"/>
<field name="date_planned"/>
<field name="priority"/>
<field name="address_id" select="2" context="{'contact_display':'partner'}"/>
<field name="address_id" context="{'contact_display':'partner'}"/>
<newline/>
<field name="picking_id" select="2"/>
<field name="picking_id"/>
<newline/>
<field name="prodlot_id" select="2" groups="base.group_extended"
<field name="prodlot_id" groups="base.group_extended"
context="{'location_id':location_id, 'product_id':product_id}"
domain="[('product_id','=?',product_id)]"
on_change="onchange_lot_id(prodlot_id,product_qty, location_id, product_id)"/>
<field name="tracking_id" select="2"/>
<field name="tracking_id"/>
<newline/>
<label/>
<button name="%(track_line)d" string="Split in production lots" type="action" icon="gtk-justify-fill"/>

2
addons/stock_location/stock_view.xml
View File

@ -41,7 +41,7 @@
<field name="inherit_id" ref="product.product_normal_form_view"/>
<field name="arch" type="xml">
<page string="Procurement &amp; Locations">
<field name="path_ids" editable="bottom" colspan="4" nolabel="1">
<field name="path_ids" editable="bottom" colspan="4" nolabel="1" groups="base.group_extended">
<tree string="Location Paths" editable="bottom">
<field name="location_from_id"/>
<field name="location_dest_id"/>

7
addons/subscription/subscription_view.xml
View File

@ -2,9 +2,8 @@
<openerp>
<data>
<menuitem icon="STOCK_PREFERENCES" id="base.menu_tools" name="Tools" sequence="15"/>
<!-- <menuitem icon="STOCK_PREFERENCES" id="menu_tools" name="Tools"/>-->
<menuitem id="next_id_45" name="Recurring Events" parent="base.menu_tools" sequence="2"/>
<!-- <menuitem id="menu_subscription_config" name="Configuration" parent="next_id_45"/>-->
<!--
=======================================================
Subscription Views
@ -18,7 +17,7 @@
<form string="Subscriptions">
<group colspan="4">
<field name="name" select="1"/>
<field name="active" select="1"/>
<field name="active" select="1" groups="base.group_extended"/>
<field name="user_id" select="1"/>
<field name="partner_id" select="1"/>
</group>
@ -55,7 +54,7 @@
<field name="arch" type="xml">
<tree string="Subscriptions">
<field name="name"/>
<field name="active"/>
<field name="active" groups="base.group_extended"/>
<field name="user_id"/>
<field name="partner_id"/>
<field name="state"/>

5
addons/survey/survey_view.xml
View File

@ -2,18 +2,17 @@
<openerp>
<data>
<!-- <menuitem name="Survey Management" id="main_menu_survey" icon="terp-crm" sequence="1" groups="group_survey_manager,group_survey_user"/>-->
<menuitem icon="STOCK_PREFERENCES" id="base.menu_tools" name="Tools" sequence="15"/>
<menuitem name="Define Surveys" id="menu_define_survey"
groups="group_survey_manager"
parent="base.menu_tools" />
<menuitem id="menu_answer_surveys" name="Answer Surveys" parent="base.menu_tools" groups="group_survey_manager,group_survey_user"/>
<!-- <menuitem name="Configuration" id="menu_survey_config" parent="main_menu_survey" groups="group_survey_manager"/>-->
<menuitem name="Reporting" parent="base.menu_tools"
id="menu_reporting" groups="group_survey_manager"/>
<!--
Survey
-->
<record model="ir.ui.view" id="survey_form">
<field name="name">survey_form</field>
<field name="model">survey</field>
@ -36,7 +35,7 @@
<field name="page_ids" colspan="4" nolabel="1" mode="form,tree" context="{'line_order': page_ids}">
<form string="Survey Page">
<field name="title" select="1"/>
<field name="sequence"/>
<field name="sequence" groups="base.group_extended"/>
<field name="note" colspan="4" nolabel="1"/>
<field name="question_ids" colspan="4" nolabel="1" context="{'line_order': question_ids}">
<form string="Survey Question">

1
addons/warning/warning_view.xml
View File

@ -34,7 +34,6 @@
<field name="invoice_warn_msg" colspan="3" nolabel="1"
attrs="{'required':[('invoice_warn','!=','no-message')],'readonly':[('invoice_warn','=','no-message')]}"/>
</group>
</page>
</notebook>
</field>