[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
commit 5f27223ca1
86 changed files with 4669 additions and 4699 deletions

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()

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>

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

View File

@ -71,7 +71,7 @@
<field name="inherit_id" ref="base.view_partner_form"/>
<field name="arch" type="xml">
<notebook>
<page string="Accounting" position="inside">
<page string="Accounting" position="inside">
<group col="2" colspan="2">
<separator string="Customer Accounting Properties" colspan="2"/>
<field name="property_account_receivable"/>
@ -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"/>

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

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>

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>

View File

@ -1,6 +1,6 @@
<?xml version="1.0"?>
<openerp>
<data>
<data>
<record id="product_normal_form_view" model="ir.ui.view">
<field name="name">product.normal.form.inherit.stock</field>
<field name="model">product.product</field>
@ -10,8 +10,8 @@
<xpath expr="/form/notebook/page/field[@name='property_account_expense']" position="after">
<field name="property_account_creditor_price_difference" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]" attrs="{'readonly':[('purchase_ok','=',0)]}" />
<newline/>
<!-- <field name="property_account_sending_goods" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]" attrs="{'readonly':[('sale_ok','=',0)]}" />-->
<!-- <field name="property_account_received_goods" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]" attrs="{'readonly':[('purchase_ok','=',0)]}" />-->
<!-- <field name="property_account_sending_goods" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]" attrs="{'readonly':[('sale_ok','=',0)]}" />-->
<!-- <field name="property_account_received_goods" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]" attrs="{'readonly':[('purchase_ok','=',0)]}" />-->
</xpath>
</field>
</record>
@ -22,11 +22,11 @@
<field name="type">form</field>
<field name="inherit_id" ref="product.product_template_form_view"/>
<field name="arch" type="xml">
<xpath expr="/form/notebook/page/field[@name='property_account_expense']" position="after">
<xpath expr="/form/notebook/page/field[@name='property_account_expense']" position="after">
<field name="property_account_creditor_price_difference" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]" attrs="{'readonly':[('purchase_ok','=',0)]}" />
<newline/>
<!-- <field name="property_account_sending_goods" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]" attrs="{'readonly':[('sale_ok','=',0)]}" />-->
<!-- <field name="property_account_received_goods" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]" attrs="{'readonly':[('purchase_ok','=',0)]}" />-->
<!-- <field name="property_account_sending_goods" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]" attrs="{'readonly':[('sale_ok','=',0)]}" />-->
<!-- <field name="property_account_received_goods" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]" attrs="{'readonly':[('purchase_ok','=',0)]}" />-->
</xpath>
</field>
</record>
@ -41,13 +41,13 @@
<group col="2" colspan="2">
<separator string=" Accounting Property" colspan="2"/>
<field name="property_account_creditor_price_difference_categ" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]" attrs="{'readonly':[('purchase_ok','=',0)]}" />
<!-- <field name="property_account_sending_goods_categ" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]" attrs="{'readonly':[('sale_ok','=',0)]}" />-->
<!-- <field name="property_account_received_goods_categ" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]" attrs="{'readonly':[('purchase_ok','=',0)]}" />-->
<!-- <field name="property_account_sending_goods_categ" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]" attrs="{'readonly':[('sale_ok','=',0)]}" />-->
<!-- <field name="property_account_received_goods_categ" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]" attrs="{'readonly':[('purchase_ok','=',0)]}" />-->
</group>
</form>
</field>
</record>
</data>
</data>
</openerp>

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"/>
@ -294,9 +294,9 @@
auto="False"
menu="False"/>-->
<!--Menu for project management-->
<menuitem icon="terp-project" id="base.menu_main_pm" name="Project Management" sequence="1"/>
<menuitem id="base.menu_pm_invoicing" name="Invoicing" parent="base.menu_main_pm" sequence="7"/>
<!--Menu for project management-->
<menuitem icon="terp-project" id="base.menu_main_pm" name="Project Management" sequence="1"/>
<menuitem id="base.menu_pm_invoicing" name="Invoicing" parent="base.menu_main_pm" sequence="7"/>
<menuitem id="menu_pm_budget" name="Budgets" parent="base.menu_pm_invoicing"/>
<menuitem action="open_budget_post_form" id="menu_pm_budget_post_form" parent="menu_pm_budget"/>
<menuitem parent="menu_pm_budget"

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>

View File

@ -135,16 +135,16 @@
<menuitem action="act_account_partner_account_move_payable_all" id="menu_account_move_open_unreconcile_payable" parent="account_followup.menu_action_followup_stat"/>
<record model="ir.ui.view" id="view_company_inherit_followup_form">
<field name="name">res.company.followup.form.inherit</field>
<field name="inherit_id" ref="account.view_company_inherit_form"/>
<field name="model">res.company</field>
<field name="type">form</field>
<field name="arch" type="xml">
<field name="overdue_msg" nolabel="1" colspan ="4" position="after">
<separator string="Follow-up Message" colspan="4"/>
<field name="name">res.company.followup.form.inherit</field>
<field name="inherit_id" ref="account.view_company_inherit_form"/>
<field name="model">res.company</field>
<field name="type">form</field>
<field name="arch" type="xml">
<field name="overdue_msg" nolabel="1" colspan ="4" position="after">
<separator string="Follow-up Message" colspan="4"/>
<field name="follow_up_msg" nolabel="1" colspan ="4"/>
</field>
</field>
</record>
</record>
</data>
</openerp>

View File

@ -1,92 +1,92 @@
<?xml version="1.0"?>
<openerp>
<data>
<data>
<record model="ir.ui.view" id="view_invoice_line_form_inherit_1">
<field name="name">account.invoice.line.form.inherit_1</field>
<field name="model">account.invoice.line</field>
<field name="inherit_id" ref="account.view_invoice_line_form"/>
<field name="type">form</field>
<field name="arch" type="xml">
<xpath expr="/form/notebook/page/field[@name='name']" position="before">
<field name="state" select="1" on_change="onchange_invoice_line_view(state)" />
<field name="sequence"/>
</xpath>
</field>
</record>
<record model="ir.ui.view" id="view_invoice_line_form_inherit_1">
<field name="name">account.invoice.line.form.inherit_1</field>
<field name="model">account.invoice.line</field>
<field name="inherit_id" ref="account.view_invoice_line_form"/>
<field name="type">form</field>
<field name="arch" type="xml">
<xpath expr="/form/notebook/page/field[@name='name']" position="before">
<field name="state" select="1" on_change="onchange_invoice_line_view(state)" />
<field name="sequence"/>
</xpath>
</field>
</record>
<record model="ir.ui.view" id="view_invoice_line_tree_inherit_1">
<field name="name">account.invoice.line.tree.inherit_1</field>
<field name="model">account.invoice.line</field>
<field name="inherit_id" ref="account.view_invoice_line_tree"/>
<field name="type">tree</field>
<field name="arch" type="xml">
<xpath expr="/tree/field[@name='name']" position="before">
<field name="sequence" string="Seq."/>
</xpath>
</field>
</record>
<record model="ir.ui.view" id="view_invoice_line_tree_inherit_1">
<field name="name">account.invoice.line.tree.inherit_1</field>
<field name="model">account.invoice.line</field>
<field name="inherit_id" ref="account.view_invoice_line_tree"/>
<field name="type">tree</field>
<field name="arch" type="xml">
<xpath expr="/tree/field[@name='name']" position="before">
<field name="sequence" string="Seq."/>
</xpath>
</field>
</record>
<record model="ir.ui.view" id="view_invoice_line_tree_inherit_2">
<field name="name">account.invoice.line.tree.inherit_2</field>
<field name="model">account.invoice.line</field>
<field name="inherit_id" ref="view_invoice_line_tree_inherit_1"/>
<field name="type">tree</field>
<field name="arch" type="xml">
<xpath expr="/tree/field[@name='account_id']" position="replace">
<field name="functional_field"/>
</xpath>
</field>
</record>
<record model="ir.ui.view" id="view_invoice_line_tree_inherit_2">
<field name="name">account.invoice.line.tree.inherit_2</field>
<field name="model">account.invoice.line</field>
<field name="inherit_id" ref="view_invoice_line_tree_inherit_1"/>
<field name="type">tree</field>
<field name="arch" type="xml">
<xpath expr="/tree/field[@name='account_id']" position="replace">
<field name="functional_field"/>
</xpath>
</field>
</record>
<record model="ir.ui.view" id="account_invoice_form_inherit_1">
<field name="name">account.invoice.form.inherit_1</field>
<field name="model">account.invoice</field>
<field name="inherit_id" ref="account.invoice_form"/>
<field name="type">form</field>
<field name="arch" type="xml">
<xpath expr="/form/notebook/page/field[@name='invoice_line']" position="replace">
<!-- keep the original fields, because other views position on that, too -->
<field name="invoice_line" invisible="True"/>
<field name="abstract_line_ids" colspan="4" nolabel="1"/>
</xpath>
</field>
</record>
<record model="ir.ui.view" id="account_invoice_form_inherit_1">
<field name="name">account.invoice.form.inherit_1</field>
<field name="model">account.invoice</field>
<field name="inherit_id" ref="account.invoice_form"/>
<field name="type">form</field>
<field name="arch" type="xml">
<xpath expr="/form/notebook/page/field[@name='invoice_line']" position="replace">
<!-- keep the original fields, because other views position on that, too -->
<field name="invoice_line" invisible="True"/>
<field name="abstract_line_ids" colspan="4" nolabel="1"/>
</xpath>
</field>
</record>
<!-- notification message views -->
<record model="ir.ui.view" id="view_notify_message_tree">
<field name="name">notify.message.tree</field>
<field name="model">notify.message</field>
<field name="type">tree</field>
<field name="arch" type="xml">
<tree string="Messages">
<field name="name"/>
<field name="msg"/>
</tree>
</field>
</record>
<record model="ir.ui.view" id="view_notify_message_form">
<field name="name">notify.message.form</field>
<field name="model">notify.message</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Messages">
<separator string="Write a notification or a wishful message." colspan="4"/>
<field name="name" select="1" colspan="2" />
<field name="msg" select="1" colspan="2"/>
</form>
</field>
</record>
<record model="ir.actions.act_window" id="notify_mesage_tree_form">
<field name="name">Write Messages</field>
<field name="res_model">notify.message</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
</record>
<menuitem name="Notification Message" id="menu_finan_config_notify_message" parent="account.menu_finance_configuration"/>
<menuitem name="All Notification Messages" id="menu_notify_mesage_tree_form" action="notify_mesage_tree_form" parent="menu_finan_config_notify_message"/>
<record model="ir.ui.view" id="view_notify_message_tree">
<field name="name">notify.message.tree</field>
<field name="model">notify.message</field>
<field name="type">tree</field>
<field name="arch" type="xml">
<tree string="Messages">
<field name="name"/>
<field name="msg"/>
</tree>
</field>
</record>
<record model="ir.ui.view" id="view_notify_message_form">
<field name="name">notify.message.form</field>
<field name="model">notify.message</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Messages">
<separator string="Write a notification or a wishful message." colspan="4"/>
<field name="name" select="1" colspan="2" />
<field name="msg" select="1" colspan="2"/>
</form>
</field>
</record>
<record model="ir.actions.act_window" id="notify_mesage_tree_form">
<field name="name">Write Messages</field>
<field name="res_model">notify.message</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
</record>
<menuitem name="Notification Message" id="menu_finan_config_notify_message" parent="account.menu_finance_configuration"/>
<menuitem name="All Notification Messages" id="menu_notify_mesage_tree_form" action="notify_mesage_tree_form" parent="menu_finan_config_notify_message"/>
</data>
</data>
</openerp>

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>
@ -90,7 +90,7 @@
<field name="view_mode">tree,form</field>
</record>
<menuitem id="next_id_44" name="Payment" parent="account.menu_finance_configuration"/>
<menuitem id="next_id_44" name="Payment" parent="account.menu_finance_configuration"/>
<menuitem action="action_payment_mode_form" id="menu_action_payment_mode_form" parent="next_id_44"/>
@ -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)"/>

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

View File

@ -1,76 +1,76 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data>
<data>
<record model="ir.ui.view" id="account_form1">
<field name="name">account.form1</field>
<field name="inherit_id" ref="account.view_account_form"/>
<field name="model">account.account</field>
<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="journal_id"/>
</field>
</field>
</record>
<record model="ir.ui.view" id="account_form2">
<field name="name">account.form2</field>
<field name="inherit_id" ref="account.view_account_form"/>
<field name="model">account.account</field>
<field name="type">form</field>
<field name="arch" type="xml">
<field name="user_type" position="replace">
<field name="user_type" select="1" on_change="onchange_type(user_type,type1)"/>
</field>
</field>
</record>
<record model="ir.ui.view" id="account_tree1">
<field name="name">account.tree1</field>
<field name="inherit_id" ref="account.view_account_tree"/>
<field name="model">account.account</field>
<field name="type">tree</field>
<field name="arch" type="xml">
<field name="name" position="after">
<field name="open_bal" select="1"/>
</field>
</field>
</record>
<record model="ir.ui.view" id="account_tree2">
<field name="name">account.tree2</field>
<field name="inherit_id" ref="account.view_account_tree"/>
<field name="model">account.account</field>
<field name="type">tree</field>
<field name="arch" type="xml">
<field name="company_currency_id" position="before">
<field name="type1"/>
</field>
</field>
</record>
<!-- sub_currency -->
<record model="ir.ui.view" id="sub_currency_form">
<field name="name">sub.currency.form</field>
<field name="inherit_id" ref="base.view_currency_form" />
<field name="model">res.currency</field>
<field name="type">form</field>
<field name="arch" type="xml">
<field name="name" position="after">
<field name="sub_name" />
</field>
</field>
</record>
<act_window name="Opening Balance Entry"
domain="[('journal_id', '=', journal_id)]"
res_model="account.move.line"
src_model="account.account"
id="act_account_acount_move_line_open1"/>
<record model="ir.ui.view" id="account_form1">
<field name="name">account.form1</field>
<field name="inherit_id" ref="account.view_account_form"/>
<field name="model">account.account</field>
<field name="type">form</field>
<field name="arch" type="xml">
<field name="user_type" position="after">
<field name="balance" string="Closing Balance"/>
<field name="type1" />
<field name="open_bal"/>
<field name="journal_id"/>
</field>
</field>
</record>
<record model="ir.ui.view" id="account_form2">
<field name="name">account.form2</field>
<field name="inherit_id" ref="account.view_account_form"/>
<field name="model">account.account</field>
<field name="type">form</field>
<field name="arch" type="xml">
<field name="user_type" position="replace">
<field name="user_type" select="1" on_change="onchange_type(user_type,type1)"/>
</field>
</field>
</record>
<record model="ir.ui.view" id="account_tree1">
<field name="name">account.tree1</field>
<field name="inherit_id" ref="account.view_account_tree"/>
<field name="model">account.account</field>
<field name="type">tree</field>
<field name="arch" type="xml">
<field name="name" position="after">
<field name="open_bal" select="1"/>
</field>
</field>
</record>
<record model="ir.ui.view" id="account_tree2">
<field name="name">account.tree2</field>
<field name="inherit_id" ref="account.view_account_tree"/>
<field name="model">account.account</field>
<field name="type">tree</field>
<field name="arch" type="xml">
<field name="company_currency_id" position="before">
<field name="type1"/>
</field>
</field>
</record>
<!-- sub_currency -->
<record model="ir.ui.view" id="sub_currency_form">
<field name="name">sub.currency.form</field>
<field name="inherit_id" ref="base.view_currency_form" />
<field name="model">res.currency</field>
<field name="type">form</field>
<field name="arch" type="xml">
<field name="name" position="after">
<field name="sub_name" />
</field>
</field>
</record>
<act_window name="Opening Balance Entry"
domain="[('journal_id', '=', journal_id)]"
res_model="account.move.line"
src_model="account.account"
id="act_account_acount_move_line_open1"/>
</data>
</data>
</openerp>

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

File diff suppressed because it is too large Load Diff

View File

@ -1,160 +1,161 @@
<?xml version="1.0" ?>
<openerp>
<data>
<!-- Audittrail Rule form -->
<record model="ir.ui.view" id="view_audittrail_rule_form">
<field name="name">audittrail.rule.form</field>
<field name="model">audittrail.rule</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="AuditTrail Rule">
<field name="name" select="1" required="1"/>
<field name="object_id" select="1"/>
<field name="log_read" />
<field name="log_write" />
<field name="log_unlink" />
<field name="log_create" />
<field name="action_id" colspan="4" readonly="1"/>
<field name="user_id" select="1" colspan="4"/>
<field name="state" select="1" readonly="1" />
<group colspan="2" col="2">
<button string="Subscribe" name="subscribe"
type="object" states="draft" />
<button string="UnSubscribe" name="unsubscribe"
type="object" states="subscribed" />
</group>
</form>
</field>
</record>
<record model="ir.ui.view" id="view_audittrail_rule_tree">
<field name="name">audittrail.rule.tree</field>
<field name="model">audittrail.rule</field>
<field name="type">tree</field>
<field name="arch" type="xml">
<tree string="AuditTrail Rules">
<field name="name" />
<field name="object_id"/>
<field name="user_id" />
<field name="log_read" />
<field name="log_write" />
<field name="log_unlink" />
<field name="log_create" />
<field name="state" />
</tree>
</field>
</record>
<!-- Action for audittrail rule -->
<record model="ir.actions.act_window" id="action_audittrail_rule_tree">
<field name="name">Rules</field>
<field name="res_model">audittrail.rule</field>
<field name="type">ir.actions.act_window</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<!--<field name="view_id" ref="view_audittrail_rule_form" />-->
</record>
<menuitem name="Audittrails" id="menu_action_audittrail"
parent="base.menu_administration" />
<menuitem name="Rules" id="menu_action_audittrail_rule_tree"
action="action_audittrail_rule_tree" parent="menu_action_audittrail" />
<data>
<!-- Audittrail Rule form -->
<record model="ir.ui.view" id="view_audittrail_rule_form">
<field name="name">audittrail.rule.form</field>
<field name="model">audittrail.rule</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="AuditTrail Rule">
<field name="name" select="1" required="1"/>
<field name="object_id" select="1"/>
<field name="log_read" />
<field name="log_write" />
<field name="log_unlink" />
<field name="log_create" />
<field name="action_id" colspan="4" readonly="1"/>
<field name="user_id" select="1" colspan="4"/>
<field name="state" select="1" readonly="1" />
<group colspan="2" col="2">
<button string="Subscribe" name="subscribe"
type="object" states="draft" />
<button string="UnSubscribe" name="unsubscribe"
type="object" states="subscribed" />
</group>
</form>
</field>
</record>
<record model="ir.ui.view" id="view_audittrail_rule_tree">
<field name="name">audittrail.rule.tree</field>
<field name="model">audittrail.rule</field>
<field name="type">tree</field>
<field name="arch" type="xml">
<tree string="AuditTrail Rules">
<field name="name" />
<field name="object_id"/>
<field name="user_id" />
<field name="log_read" />
<field name="log_write" />
<field name="log_unlink" />
<field name="log_create" />
<field name="state" />
</tree>
</field>
</record>
<!-- Action for audittrail rule -->
<record model="ir.actions.act_window" id="action_audittrail_rule_tree">
<field name="name">Rules</field>
<field name="res_model">audittrail.rule</field>
<field name="type">ir.actions.act_window</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<!--<field name="view_id" ref="view_audittrail_rule_form" />-->
</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" />
<record model="ir.actions.act_window" id="action_audittrail_rule_tree_sub">
<field name="name">Subscribed Rules</field>
<field name="res_model">audittrail.rule</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="domain">[('state','=','subscribed')]</field>
<field name="filter" eval="True"/>
</record>
<!-- AuditTrail Log form -->
<record model="ir.actions.act_window" id="action_audittrail_rule_tree_sub">
<field name="name">Subscribed Rules</field>
<field name="res_model">audittrail.rule</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="domain">[('state','=','subscribed')]</field>
<field name="filter" eval="True"/>
</record>
<record model="ir.ui.view" id="view_audittrail_log_form">
<field name="name">audittrail.log.form</field>
<field name="model">audittrail.log</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="AuditTrail Logs">
<field name="timestamp" select="1" required="1" readonly="1"/>
<field name="object_id" select="1" readonly="1"/>
<field name="method" select="1" readonly="1"/>
<field name="user_id" select="1" readonly="1"/>
<field name="res_id" readonly="1"/>
<field name="name" readonly="1" select="1"/>
<field name="line_ids" colspan="4" mode="tree,form"
widget="one2many_list" readonly="1">
<form string="Log Lines">
<field name="field_id" colspan="4"
readonly="1" />
<newline />
<field name="field_description" colspan="4"
readonly="1" />
<newline />
<separator string="Old Value : "
colspan="2" />
<separator string="New Value : "
colspan="2" />
<newline />
<field name="old_value" nolabel="1"
colspan="2" readonly="1" />
<field name="new_value" nolabel="1"
colspan="2" readonly="1" />
<newline />
<separator string="Old Value Text : "
colspan="2" />
<separator string="New Value Text: "
colspan="2" />
<newline />
<field name="old_value_text" nolabel="1"
colspan="2" readonly="1" />
<field name="new_value_text" nolabel="1"
colspan="2" readonly="1" />
</form>
<!-- AuditTrail Log form -->
<tree string="Log Lines">
<field name="field_description" />
<field name="old_value_text" />
<field name="new_value_text" />
</tree>
</field>
</form>
</field>
</record>
<record model="ir.ui.view" id="view_audittrail_log_form">
<field name="name">audittrail.log.form</field>
<field name="model">audittrail.log</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="AuditTrail Logs">
<field name="timestamp" select="1" required="1" readonly="1"/>
<field name="object_id" select="1" readonly="1"/>
<field name="method" select="1" readonly="1"/>
<field name="user_id" select="1" readonly="1"/>
<field name="res_id" readonly="1"/>
<field name="name" readonly="1" select="1"/>
<field name="line_ids" colspan="4" mode="tree,form"
widget="one2many_list" readonly="1">
<form string="Log Lines">
<field name="field_id" colspan="4"
readonly="1" />
<newline />
<field name="field_description" colspan="4"
readonly="1" />
<newline />
<separator string="Old Value : "
colspan="2" />
<separator string="New Value : "
colspan="2" />
<newline />
<field name="old_value" nolabel="1"
colspan="2" readonly="1" />
<field name="new_value" nolabel="1"
colspan="2" readonly="1" />
<newline />
<separator string="Old Value Text : "
colspan="2" />
<separator string="New Value Text: "
colspan="2" />
<newline />
<field name="old_value_text" nolabel="1"
colspan="2" readonly="1" />
<field name="new_value_text" nolabel="1"
colspan="2" readonly="1" />
</form>
<record model="ir.ui.view" id="view_audittrail_log_tree">
<field name="name">audittrail.log.tree</field>
<field name="model">audittrail.log</field>
<field name="type">tree</field>
<field name="arch" type="xml">
<tree string="AuditTrail Logs">
<field name="timestamp" />
<field name="name" />
<field name="object_id" />
<field name="method" />
<field name="user_id" />
</tree>
</field>
</record>
<tree string="Log Lines">
<field name="field_description" />
<field name="old_value_text" />
<field name="new_value_text" />
</tree>
</field>
</form>
</field>
</record>
<record model="ir.ui.view" id="view_audittrail_log_tree">
<field name="name">audittrail.log.tree</field>
<field name="model">audittrail.log</field>
<field name="type">tree</field>
<field name="arch" type="xml">
<tree string="AuditTrail Logs">
<field name="timestamp" />
<field name="name" />
<field name="object_id" />
<field name="method" />
<field name="user_id" />
</tree>
</field>
</record>
<!-- Action for Audittrail Log -->
<record model="ir.actions.act_window" id="action_audittrail_log_tree">
<field name="name">Logs</field>
<field name="res_model">audittrail.log</field>
<field name="view_type">form</field>
</record>
<menuitem name="Logs" id="menu_action_audittrail_log_tree"
action="action_audittrail_log_tree" parent="menu_action_audittrail" />
<record model="ir.actions.act_window" id="action_audittrail_log_tree">
<field name="name">Logs</field>
<field name="res_model">audittrail.log</field>
<field name="view_type">form</field>
</record>
<menuitem name="Logs" id="menu_action_audittrail_log_tree"
action="action_audittrail_log_tree" parent="menu_action_audittrail" />
<!-- <wizard string="View log" menu="False" model="audittrail.log" name="audittrail.view.log" id="wizard_audittrail_log"/>-->
<menuitem name="View Logs" id="menu_action_log_tree2"
action="action_audittrail_view_log" parent="menu_action_audittrail" />
<!-- <wizard string="View log" menu="False" model="audittrail.log" name="audittrail.view.log" id="wizard_audittrail_log"/>-->
<menuitem name="View Logs" id="menu_action_log_tree2"
action="action_audittrail_view_log" parent="menu_action_audittrail" />
</data>
</data>
</openerp>

View File

@ -1,45 +1,46 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data>
<menuitem id="menu_base_action_rule" name="Action Rule"
parent="base.menu_base_config" sequence="0" />
<menuitem id="menu_base_action_rule" name="Action Rule"
groups="base.group_extended"
parent="base.menu_base_config" sequence="0" />
<!--
Action Rule Form View
-->
<record id="view_base_action_rule_form" model="ir.ui.view">
<field name="name">base.action.rule.form</field>
<!--
Action Rule Form View
-->
<record id="view_base_action_rule_form" model="ir.ui.view">
<field name="name">base.action.rule.form</field>
<field name="model">base.action.rule</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Action Rule">
<field name="name" select="1"/>
<field name="name" select="1"/>
<field name="active"/>
<field name="max_level" />
<field name="max_level" />
<separator colspan="4" string="Rule lines"/>
<field name="rule_lines" colspan="4" nolabel="1"/>
<field name="rule_lines" colspan="4" nolabel="1"/>
</form>
</field>
</record>
</record>
<!-- Action Rule Tree View -->
<record id="view_base_action_rule_tree" model="ir.ui.view">
<field name="name">base.action.rule.tree</field>
<record id="view_base_action_rule_tree" model="ir.ui.view">
<field name="name">base.action.rule.tree</field>
<field name="model">base.action.rule</field>
<field name="type">tree</field>
<field name="arch" type="xml">
<tree string="Action Rule">
<field name="name" colspan="4"/>
<field name="max_level"/>
<field name="rule_lines" colspan="4" nolabel="1"/>
<field name="name" colspan="4"/>
<field name="max_level"/>
<field name="rule_lines" colspan="4" nolabel="1"/>
</tree>
</field>
</record>
</record>
<!-- Action Rule Action -->
<record id="base_action_rule_act" model="ir.actions.act_window">
<record id="base_action_rule_act" model="ir.actions.act_window">
<field name="name">Action Rules</field>
<field name="res_model">base.action.rule</field>
<field name="view_type">form</field>
@ -47,11 +48,11 @@
<field name="view_id" ref="view_base_action_rule_tree"/>
</record>
<menuitem id="menu_base_action_rule_form"
parent="menu_base_action_rule" action="base_action_rule_act" />
<menuitem id="menu_base_action_rule_form"
parent="menu_base_action_rule" action="base_action_rule_act" />
<!--
Action Rule Lines Form View
<!--
Action Rule Lines Form View
-->
<record id="view_base_action_rule_line_form" model="ir.ui.view">
<field name="name">base.action.rule.line.form</field>
@ -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"/>
@ -105,7 +106,7 @@
<field name="act_remind_attach"/>
<field name="act_remind_user"/>
<group col="2" colspan="2" attrs="{'invisible': [('act_remind_user','=',False)]}">
<field name="act_reply_to" attrs="{'required':[('act_remind_user','=',True)]}"/>
<field name="act_reply_to" attrs="{'required':[('act_remind_user','=',True)]}"/>
</group>
<field colspan="4" name="act_email_cc"/>
<separator colspan="4" string="Server Action to be Triggered"/>

View File

@ -8,7 +8,7 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Invitation details">
<field name="email" string="Invitation To"/>
<field name="email" string="Invitation To"/>
<field name="sent_by_uid" string="Invitation From" />
<notebook colspan="4">
<page string="Invitation">
@ -70,7 +70,7 @@
<field name="type">tree</field>
<field name="arch" type="xml">
<tree string="Invitation details">
<field name="email" string="Invitation To"/>
<field name="email" string="Invitation To"/>
<field name="partner_id" string="Partner" />
<field name="partner_address_id" string="Contact" />
<field name="role" />
@ -136,7 +136,7 @@
</field>
</record>
<record id="action_res_alarm_view" model="ir.actions.act_window">
<field name="name">Available Alarms</field>
<field name="name">Available Alarms</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">res.alarm</field>
<field name="view_type">form</field>
@ -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" />

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"/>
@ -51,13 +51,13 @@
<field name="job_ids" colspan="4" nolabel="1" mode="tree,form">
<form string="Functions and Addresses">
<group string="Partner" colspan="2" col="4">
<field name="function_id"/>
<field name="address_id" context="{'address_partner_id': name}"/>
<field name="name"/>
<field name="date_start" />
<field name="date_stop" />
<field name="state" />
<field name="sequence_contact" />
<field name="function_id"/>
<field name="address_id" context="{'address_partner_id': name}"/>
<field name="name"/>
<field name="date_start" />
<field name="date_stop" />
<field name="state" />
<field name="sequence_contact" />
</group>
<group string="Communication" colspan="2" col="2">
<field name="phone"/>
@ -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>
@ -393,7 +393,7 @@
src_model="res.partner"
/>
<!-- Act window defining a shorcut on partner address to open all his jobs -->
<!-- Act window defining a shorcut on partner address to open all his jobs -->
<act_window
id="act_res_partner_jobs" name="Open Jobs"
@ -403,12 +403,12 @@
/>
<menuitem icon="terp-purchase" id="base.menu_purchase_root"
name="Procurement Management" sequence="7" />
name="Procurement Management" sequence="7" />
<menuitem id="base.menu_procurement_management_supplier"
name="Suppliers" parent="base.menu_purchase_root" sequence="3" />
name="Suppliers" parent="base.menu_purchase_root" sequence="3" />
<menuitem name="Contacts" id="menu_partner_contact_supplier_form"
action="action_partner_contact_form"
parent="base.menu_procurement_management_supplier" sequence="2" />
action="action_partner_contact_form"
parent="base.menu_procurement_management_supplier" sequence="2" />
</data>
</openerp>

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}

View File

@ -29,7 +29,7 @@
</record>
<!-- Report Creator form -->
<record model="ir.ui.view" id="base_report_creator_form">
<field name="name">base_report_creator.report.form</field>
<field name="model">base_report_creator.report</field>
@ -42,12 +42,12 @@
<notebook colspan="4">
<page string="General Configuration">
<field name="model_ids" colspan="4"
context="{'model_ids':model_ids}" />
context="{'model_ids':model_ids}" />
<separator string="State" colspan="4"/>
<field name="state"/>
<button string="Create Menu"
name="%(action_report_menu_create)d" type="action"
colspan="2" icon="gtk-justify-fill" />
name="%(action_report_menu_create)d" type="action"
colspan="2" icon="gtk-justify-fill" />
</page><page string="View parameters">
<separator string="Used View" colspan="4"/>
<field name="view_type1"/>
@ -61,12 +61,12 @@
<form string="Fields">
<field name="sequence"/>
<field name="field_id"
domain="parent.model_ids and [('model_id','in',parent.model_ids[0][2]),('ttype','&lt;&gt;','many2many'),('ttype','&lt;&gt;','one2many')] or []">
<tree string="Field List">
<field name="model_id" />
<field name="name" />
<field name="field_description" />
</tree>
domain="parent.model_ids and [('model_id','in',parent.model_ids[0][2]),('ttype','&lt;&gt;','many2many'),('ttype','&lt;&gt;','one2many')] or []">
<tree string="Field List">
<field name="model_id" />
<field name="name" />
<field name="field_description" />
</tree>
</field>
<field name="group_method"/>
<field name="graph_mode"/>
@ -75,8 +75,8 @@
<tree editable="bottom" string="Fields to Display">
<field name="sequence"/>
<field name="field_id"
domain="parent.model_ids and [('model_id','in',parent.model_ids[0][2]),('ttype','&lt;&gt;','many2many'),('ttype','&lt;&gt;','one2many')] or []"
attrs="{'required':[('group_method','!=','count')]}" />
domain="parent.model_ids and [('model_id','in',parent.model_ids[0][2]),('ttype','&lt;&gt;','many2many'),('ttype','&lt;&gt;','one2many')] or []"
attrs="{'required':[('group_method','!=','count')]}" />
<field name="group_method"/>
<field name="graph_mode"/>
<field name="calendar_mode"/>
@ -84,8 +84,8 @@
</field>
</page><page string="Filters on Fields">
<button string="Add filter"
name="%(wizard_set_filter_fields)d" type="action"
icon="gtk-add" />
name="%(wizard_set_filter_fields)d" type="action"
icon="gtk-add" />
<field name="filter_ids" nolabel="1" colspan="4">
<tree string="Filters">
<field name="name"/>
@ -99,8 +99,8 @@
</field>
<separator string="Legend" colspan="4"/>
<label
string="Use %%(uid)s to filter by the connected user"
align="0.0" />
string="Use %%(uid)s to filter by the connected user"
align="0.0" />
</page><page string="Security">
<separator string="Authorized Groups (empty for all)" colspan="4"/>
<field name="group_ids" colspan="4" nolabel="1"/>
@ -111,22 +111,23 @@
</form>
</field>
</record>
<!-- 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>
</record>
<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"/>
@ -140,22 +141,22 @@
</tree>
</field>
</record>
<record model="ir.actions.act_window" id="base_report_creator_action_tree">
<field name="res_model">base_report_creator.report</field>
<field name="view_type">tree</field>
</record>
<menuitem
name="Custom Reports" parent="base.menu_custom_reports"
id="menu_base_report_creator_action"
action="base_report_creator_action_tree"/>
<act_window id="action_report_open"
key2="client_action_multi" name="Open Report"
res_model="report.open" src_model="base_report_creator.report"
view_mode="form" target="new" view_type="form" />
key2="client_action_multi" name="Open Report"
res_model="report.open" src_model="base_report_creator.report"
view_mode="form" target="new" view_type="form" />
</data>
</openerp>

View File

@ -2,7 +2,7 @@
<openerp>
<data>
<menuitem icon="terp-graph" id="base.reporting_menu"
name="Reporting" sequence="8" />
name="Reporting" sequence="8" />
<!--Board Note Tree View -->
@ -67,9 +67,9 @@
<form string="Dashboard">
<field name="name" select="1"/>
<button colspan="2"
name="%(action_board_menu_create)d"
string="Create Menu" type="action"
icon="gtk-justify-fill" />
name="%(action_board_menu_create)d"
string="Create Menu" type="action"
icon="gtk-justify-fill" />
<field colspan="4" name="line_ids">
<tree string="Dashboard View">
<field name="name"/>
@ -83,7 +83,7 @@
<field name="width"/>
<field name="height"/>
<field name="action_id"
domain="[('view_type','!=','tree')]" />
domain="[('view_type','!=','tree')]" />
<field name="position"/>
</form>
</field>
@ -112,12 +112,12 @@
parent="base.next_id_50" sequence="1"/>
<menuitem action="action_view_board_note_form"
id="menu_view_board_note_form" parent="base.next_id_50"
sequence="3" groups="base.group_system" />
id="menu_view_board_note_form" parent="base.next_id_50"
sequence="3" groups="base.group_system" />
<act_window context="{'view': active_id}" id="dashboard_open"
multi="True" name="Open Dashboard" res_model="board.board"
src_model="board.board" />
multi="True" name="Open Dashboard" res_model="board.board"
src_model="board.board" />
</data>
</openerp>

View File

@ -71,8 +71,8 @@
<field name="usage">menu</field>
<field name="view_id" ref="board_account_form"/>
</record>
<menuitem icon="terp-graph" id="base.dashboard" name="Dashboards" sequence="2" parent="base.reporting_menu"/>
<menuitem id="next_id_68" name="Accounting" parent="base.dashboard"
<menuitem icon="terp-graph" id="base.dashboard" name="Dashboards" sequence="2" parent="base.reporting_menu"/>
<menuitem id="next_id_68" name="Accounting" parent="base.dashboard"
groups="account.group_account_manager"/>
<menuitem action="open_board_account" icon="terp-graph" id="menu_board_account" parent="next_id_68" sequence="1"/>
</data>

View File

@ -53,8 +53,8 @@
<field name="view_mode">form</field>
<field name="view_id" ref="board_associations_manager_form"/>
</record>
<menuitem icon="terp-graph" id="base.dashboard" name="Dashboards" sequence="2" parent="base.reporting_menu"/>
<menuitem id="board_associations" name="Associations" parent="base.dashboard" />
<menuitem icon="terp-graph" id="base.dashboard" name="Dashboards" sequence="2" parent="base.reporting_menu"/>
<menuitem id="board_associations" name="Associations" parent="base.dashboard" />
<menuitem
name="Associations" parent="board_associations"
action="open_board_associations_manager"

View File

@ -1,81 +1,81 @@
<?xml version="1.0"?>
<openerp>
<data>
<record model="board.note.type" id="note_auction_type1">
<field name="name">Auction manager</field>
</record>
<data>
<record model="board.note.type" id="note_auction_type1">
<field name="name">Auction manager</field>
</record>
<record model="ir.ui.view" id="board_auction_manager_form1">
<field name="name">board.auction.manager.form</field>
<field name="model">board.board</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Auction manager ">
<hpaned position="100">
<child1>
<record model="ir.ui.view" id="board_auction_manager_form1">
<field name="name">board.auction.manager.form</field>
<field name="model">board.board</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Auction manager ">
<hpaned position="100">
<child1>
<action
string="Latest objects"
name="%(auction.action_report_latest_objects_manager_tree)d"
height="200"
width="510" />
<action string="Latest deposits"
name="%(auction.action_report_latest_doposit_manager_tree)d"/>
<action
string="Summary pointing by user"
name="%(auction.action_report_auction_sign_in_out_manager_tree1)d"
view_mode="tree,graph"
/>
<action string="Objects statistics"
name="%(auction.action_report_object_encoded_manager_tree)d"
/>
</child1>
<action
string="Latest objects"
name="%(auction.action_report_latest_objects_manager_tree)d"
height="200"
width="510" />
<action string="Latest deposits"
name="%(auction.action_report_latest_doposit_manager_tree)d"/>
<action
string="Summary pointing by user"
name="%(auction.action_report_auction_sign_in_out_manager_tree1)d"
view_mode="tree,graph"
/>
<action string="Objects statistics"
name="%(auction.action_report_object_encoded_manager_tree)d"
/>
</child1>
<child2>
<button
string="My board"
name="%(open_board_auction)d"
icon="terp-partner"
type="action"
colspan="4"
/>
<action
string="Total Adjudications"
name="%(auction.action_report_auction_adjudication_tree)d"
view_mode="graph,tree"
colspan="4"/>
<action
string="Min/Adj/Max"
name="%(auction.action_report_auction_estimation_adj_category_manager_tree)d"
view_mode="graph,tree" colspan="4" />
<child2>
<button
string="My board"
name="%(open_board_auction)d"
icon="terp-partner"
type="action"
colspan="4"
/>
<action
string="Total Adjudications"
name="%(auction.action_report_auction_adjudication_tree)d"
view_mode="graph,tree"
colspan="4"/>
<action
string="Min/Adj/Max"
name="%(auction.action_report_auction_estimation_adj_category_manager_tree)d"
view_mode="graph,tree" colspan="4" />
<action
string="Objects by day"
name="%(auction.action_report_auction_object_date_tree)d"
view_mode="graph,tree" colspan="4" />
<action
string="Objects by day"
name="%(auction.action_report_auction_object_date_tree)d"
view_mode="graph,tree" colspan="4" />
</child2>
</hpaned>
</form>
</field>
</record>
</child2>
</hpaned>
</form>
</field>
</record>
<record model="ir.actions.act_window" id="open_board_auction_manager">
<field name="name">Auction manager board</field>
<field name="res_model">board.board</field>
<field name="view_type">form</field>
<field name="view_mode">form</field>
<field name="usage">menu</field>
<field name="view_id" ref="board_auction_manager_form1"/>
</record>
<menuitem icon="terp-graph" id="base.dashboard" name="Dashboards" sequence="2" parent="base.reporting_menu"/>
<menuitem name="Auction Manager" id="board_menu_auction_manager" parent="base.dashboard" />
<menuitem
name="Auction Manager"
action="open_board_auction_manager"
sequence="1"
id="menu_board_auction_manager" parent="board_menu_auction_manager"/>
<record model="ir.actions.act_window" id="open_board_auction_manager">
<field name="name">Auction manager board</field>
<field name="res_model">board.board</field>
<field name="view_type">form</field>
<field name="view_mode">form</field>
<field name="usage">menu</field>
<field name="view_id" ref="board_auction_manager_form1"/>
</record>
<menuitem icon="terp-graph" id="base.dashboard" name="Dashboards" sequence="2" parent="base.reporting_menu"/>
<menuitem name="Auction Manager" id="board_menu_auction_manager" parent="base.dashboard" />
<menuitem
name="Auction Manager"
action="open_board_auction_manager"
sequence="1"
id="menu_board_auction_manager" parent="board_menu_auction_manager"/>
</data>
</data>
</openerp>

View File

@ -1,70 +1,70 @@
<?xml version="1.0"?>
<openerp>
<data>
<record model="board.note.type" id="note_auction_type">
<field name="name">Auction</field>
</record>
<record model="board.note.type" id="note_auction_type">
<field name="name">Auction</field>
</record>
<record model="ir.ui.view" id="board_auction_manager_form">
<field name="name">board.auction.manager.form</field>
<field name="model">board.board</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Auction manager ">
<hpaned position="100">
<child1>
<action
string="My Latest Objects"
name="%(auction.action_report_latest_objects_tree)d"
height="200"
width="510"/>
<action string="My Latest Deposits"
name="%(auction.action_report_latest_doposit_manager_tree)d"
domain="[('create_uid','=',uid)]"
/>
<action string="Objects statistics"
name="%(auction.action_report_object_encoded_member_tree)d"
/>
</child1>
<record model="ir.ui.view" id="board_auction_manager_form">
<field name="name">board.auction.manager.form</field>
<field name="model">board.board</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Auction manager ">
<hpaned position="100">
<child1>
<action
string="My Latest Objects"
name="%(auction.action_report_latest_objects_tree)d"
height="200"
width="510"/>
<action string="My Latest Deposits"
name="%(auction.action_report_latest_doposit_manager_tree)d"
domain="[('create_uid','=',uid)]"
/>
<action string="Objects statistics"
name="%(auction.action_report_object_encoded_member_tree)d"
/>
</child1>
<child2>
<button
string="Menu"
name="%(base.action_menu_admin)d"
icon="gtk-justify-fill"
type="action"
colspan="4"/>
<child2>
<button
string="Menu"
name="%(base.action_menu_admin)d"
icon="gtk-justify-fill"
type="action"
colspan="4"/>
<action
string="My Objects By Day"
name="%(auction.action_report_auction_object_date_tree)d"
view_mode="graph,tree" colspan="4"
domain="[('user_id','=',uid),('month','=',time.strftime('%%Y-%%m-01'))]"/>
<action
string="Estimations/Adjudication"
name="%(auction.action_report_auction_estimation_adj_category_member_tree)d"
view_mode="graph,tree" colspan="4"/>
</child2>
</hpaned>
</form>
</field>
</record>
<action
string="My Objects By Day"
name="%(auction.action_report_auction_object_date_tree)d"
view_mode="graph,tree" colspan="4"
domain="[('user_id','=',uid),('month','=',time.strftime('%%Y-%%m-01'))]"/>
<action
string="Estimations/Adjudication"
name="%(auction.action_report_auction_estimation_adj_category_member_tree)d"
view_mode="graph,tree" colspan="4"/>
</child2>
</hpaned>
</form>
</field>
</record>
<record model="ir.actions.act_window" id="open_board_auction">
<field name="name">Auction member board</field>
<field name="res_model">board.board</field>
<field name="view_type">form</field>
<field name="view_mode">form</field>
<field name="usage">menu</field>
<field name="view_id" ref="board_auction_manager_form"/>
</record>
<menuitem icon="terp-graph" id="base.dashboard" name="Dashboards" sequence="2" parent="base.reporting_menu"/>
<menuitem name="Auction Member" id="board_menu_auction_member" parent="base.dashboard" />
<menuitem
name="Auction Member"
action="open_board_auction"
sequence="1"
id="menu_board_auction" parent="board_menu_auction_member" />
<record model="ir.actions.act_window" id="open_board_auction">
<field name="name">Auction member board</field>
<field name="res_model">board.board</field>
<field name="view_type">form</field>
<field name="view_mode">form</field>
<field name="usage">menu</field>
<field name="view_id" ref="board_auction_manager_form"/>
</record>
<menuitem icon="terp-graph" id="base.dashboard" name="Dashboards" sequence="2" parent="base.reporting_menu"/>
<menuitem name="Auction Member" id="board_menu_auction_member" parent="base.dashboard" />
<menuitem
name="Auction Member"
action="open_board_auction"
sequence="1"
id="menu_board_auction" parent="board_menu_auction_member" />
</data>
</openerp>

View File

@ -98,7 +98,7 @@
<field name="view_id" ref="board_crm_statistical_form"/>
</record>
<menuitem icon="terp-graph" id="base.dashboard" name="Dashboards" sequence="2" parent="base.reporting_menu"/>
<menuitem icon="terp-graph" id="base.dashboard" name="Dashboards" sequence="2" parent="base.reporting_menu"/>
<menuitem
name="CRM Configuration" parent="base.dashboard"
id="menu_board_crm_config"

View File

@ -1,123 +1,123 @@
<?xml version="1.0"?>
<openerp>
<data>
<record model="board.note.type" id="note_crm_type">
<field name="name">CRM Configuration</field>
</record>
<record model="ir.ui.view" id="view_crm_opportunity_user_graph1">
<field name="name">crm.opportunity.user.graph1</field>
<field name="model">report.crm.opportunity.user</field>
<field name="type">graph</field>
<field name="arch" type="xml">
<graph string="Opportunities by User and Section" type="pie">
<field name="state"/>
<field name="nbr" operator="+"/>
</graph>
</field>
</record>
<data>
<record model="board.note.type" id="note_crm_type">
<field name="name">CRM Configuration</field>
</record>
<record model="ir.actions.act_window" id="act_my_leads">
<field name="res_model">crm.lead</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="view_id" ref="crm.crm_case_tree_view_leads"/>
<record model="ir.ui.view" id="view_crm_opportunity_user_graph1">
<field name="name">crm.opportunity.user.graph1</field>
<field name="model">report.crm.opportunity.user</field>
<field name="type">graph</field>
<field name="arch" type="xml">
<graph string="Opportunities by User and Section" type="pie">
<field name="state"/>
<field name="nbr" operator="+"/>
</graph>
</field>
</record>
<record model="ir.actions.act_window" id="act_my_leads">
<field name="res_model">crm.lead</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="view_id" ref="crm.crm_case_tree_view_leads"/>
<field name="domain">[('user_id','=',uid),('state','!=','pending'),('state','!=','cancel')]</field>
</record>
</record>
<record model="ir.actions.act_window" id="act_my_meetings">
<field name="res_model">crm.meeting</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="view_id" ref="crm.crm_case_tree_view_meet"/>
<field name="domain">[('user_id','=',uid),('state','!=','pending'),('state','!=','cancel')]</field>
</record>
<act_window name="My Cases"
domain="[('user_id','=',uid),('state','!=','pending'),('state','!=','cancel')]"
res_model="crm.case"
view_type="form"
view_mode="tree,form"
id="act_my_cases"/>
<record model="ir.actions.act_window" id="act_my_leads_stage">
<field name="res_model">report.crm.lead.section.stage</field>
<field name="view_type">form</field>
<field name="view_mode">graph,tree,form</field>
<field name="view_id" ref="view_crm_lead_stage_graph1"/>
<record model="ir.actions.act_window" id="act_my_meetings">
<field name="res_model">crm.meeting</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="view_id" ref="crm.crm_case_tree_view_meet"/>
<field name="domain">[('user_id','=',uid),('state','!=','pending'),('state','!=','cancel')]</field>
</record>
</record>
<record model="ir.actions.act_window" id="act_sales_pipeline">
<field name="res_model">report.crm.opportunity.user</field>
<field name="view_type">form</field>
<field name="view_mode">graph,tree,form</field>
<field name="view_id" ref="view_crm_opportunity_user_graph1"/>
<field name="domain">[('user_id','=',uid),('state','!=','pending'),('state','!=','cancel')]</field>
</record>
<act_window name="My Cases"
domain="[('user_id','=',uid),('state','!=','pending'),('state','!=','cancel')]"
res_model="crm.case"
view_type="form"
view_mode="tree,form"
id="act_my_cases"/>
<record model="ir.ui.view" id="board_crm_form">
<field name="name">CRM - Dashboard Form</field>
<field name="model">board.board</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Connecting Dashboard">
<hpaned>
<record model="ir.actions.act_window" id="act_my_leads_stage">
<field name="res_model">report.crm.lead.section.stage</field>
<field name="view_type">form</field>
<field name="view_mode">graph,tree,form</field>
<field name="view_id" ref="view_crm_lead_stage_graph1"/>
<field name="domain">[('user_id','=',uid),('state','!=','pending'),('state','!=','cancel')]</field>
</record>
<child1>
<record model="ir.actions.act_window" id="act_sales_pipeline">
<field name="res_model">report.crm.opportunity.user</field>
<field name="view_type">form</field>
<field name="view_mode">graph,tree,form</field>
<field name="view_id" ref="view_crm_opportunity_user_graph1"/>
<field name="domain">[('user_id','=',uid),('state','!=','pending'),('state','!=','cancel')]</field>
</record>
<action
<record model="ir.ui.view" id="board_crm_form">
<field name="name">CRM - Dashboard Form</field>
<field name="model">board.board</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Connecting Dashboard">
<hpaned>
<child1>
<action
string="My Leads"
name="%(act_my_leads)d"
colspan="4"
height="150"
width="510"/>
name="%(act_my_leads)d"
colspan="4"
height="150"
width="510"/>
<action
string="My Meetings"
name="%(act_my_meetings)d"
height="150"
colspan="4"/>
<action
string="My Cases"
name="%(act_my_cases)d"
colspan="4"
height="200"/>
<action
string="My Meetings"
name="%(act_my_meetings)d"
height="150"
colspan="4"/>
</child1>
<action
string="My Cases"
name="%(act_my_cases)d"
colspan="4"
height="200"/>
<child2>
<action
</child1>
<child2>
<action
string="My Leads By Stage"
name="%(act_my_leads_stage)d"
colspan="4"/>
name="%(act_my_leads_stage)d"
colspan="4"/>
<action
string="My Sales Pipeline"
name="%(act_sales_pipeline)d"
colspan="4"/>
<action
string="My Sales Pipeline"
name="%(act_sales_pipeline)d"
colspan="4"/>
</child2>
</hpaned>
</form>
</field>
</record>
<record model="ir.actions.act_window" id="open_board_crm">
<field name="name">CRM Dashboard</field>
<field name="res_model">board.board</field>
<field name="view_type">form</field>
<field name="view_mode">form</field>
<field name="usage">menu</field>
<field name="view_id" ref="board_crm_form"/>
</record>
</child2>
</hpaned>
</form>
</field>
</record>
<record model="ir.actions.act_window" id="open_board_crm">
<field name="name">CRM Dashboard</field>
<field name="res_model">board.board</field>
<field name="view_type">form</field>
<field name="view_mode">form</field>
<field name="usage">menu</field>
<field name="view_id" ref="board_crm_form"/>
</record>
<menuitem
name="Connecting Dashboard" parent="menu_board_crm_config"
action="open_board_crm"
sequence="1"
id="menu_board_crm" icon="terp-graph"/>
<menuitem
name="Connecting Dashboard" parent="menu_board_crm_config"
action="open_board_crm"
sequence="1"
id="menu_board_crm" icon="terp-graph"/>
</data>
</data>
</openerp>

View File

@ -50,7 +50,7 @@
<field name="view_id" ref="board_document_manager_form"/>
</record>
<menuitem icon="terp-graph" id="base.dashboard" name="Dashboards" sequence="2" parent="base.reporting_menu"/>
<menuitem icon="terp-graph" id="base.dashboard" name="Dashboards" sequence="2" parent="base.reporting_menu"/>
<menuitem
name="Document"
id="menu_board_document"

View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data>
<menuitem icon="terp-graph" id="base.dashboard" name="Dashboards" sequence="2" parent="base.reporting_menu"/>
<menuitem icon="terp-graph" id="base.dashboard" name="Dashboards" sequence="2" parent="base.reporting_menu"/>
<menuitem
id="menu_hr_deshboard"
name="Human Resources"

View File

@ -7,8 +7,8 @@
</record>
<!--
Board for project managers
-->
Board for project managers
-->
<act_window domain="[('manager', '=', uid)]" id="act_my_project" name="My projects" res_model="project.project" view_mode="tree,form" view_type="form"/>
<act_window domain="[('user_id','=',uid),('state','&lt;&gt;','close')]" id="act_my_account" name="My accounts to invoice" res_model="account.analytic.account" view_id="view_account_analytic_simplified" view_mode="tree,form" view_type="form"/>

View File

@ -64,7 +64,7 @@
<field name="domain">[('type','=','Project')]</field>
</record>
<!--Actions for deshboard -->
<!--Actions for deshboard -->
<record id="action_view_project_editable_messages_tree" model="ir.actions.act_window">
<field name="name">Messages</field>
@ -112,7 +112,7 @@
<field name="usage">menu</field>
<field name="view_id" ref="board_project_form"/>
</record>
<menuitem icon="terp-graph" id="base.dashboard" name="Dashboards" sequence="2" parent="base.reporting_menu"/>
<menuitem icon="terp-graph" id="base.dashboard" name="Dashboards" sequence="2" parent="base.reporting_menu"/>
<menuitem
id="next_id_86"
name="Project"

View File

@ -5,24 +5,24 @@
<field name="name">Sales</field>
</record>
<record model="ir.actions.act_window" id="board_crm_case_categ_phone_incoming0">
<field name="res_model">crm.phonecall</field>
<field name="view_type">form</field>
<field name="view_mode">tree,calendar</field>
<field name="view_id" ref="crm.crm_case_phone_tree_view"/>
<field name="domain">[('user_id','=',uid)]</field>
<field name="context" eval="{'default_state':'open'}"/>
<field name="search_view_id" ref="crm.view_crm_case_phonecalls_filter"/>
</record>
<record model="ir.actions.act_window" id="board_crm_case_categ_phone_incoming0">
<field name="res_model">crm.phonecall</field>
<field name="view_type">form</field>
<field name="view_mode">tree,calendar</field>
<field name="view_id" ref="crm.crm_case_phone_tree_view"/>
<field name="domain">[('user_id','=',uid)]</field>
<field name="context" eval="{'default_state':'open'}"/>
<field name="search_view_id" ref="crm.view_crm_case_phonecalls_filter"/>
</record>
<record model="ir.actions.act_window" id="board_crm_case_categ_meet">
<field name="res_model">crm.meeting</field>
<field name="view_mode">tree,form,gantt</field>
<field name="view_id" ref="crm.crm_case_tree_view_meet"/>
<field name="domain">[('user_id','=',uid)]</field>
<field name="domain">[('date','&gt;=',time.strftime('%Y-%m-%d')),('date','&lt;=',(datetime.datetime.today() + datetime.timedelta(days=2)).strftime('%Y-%m-%d'))]</field>
<field name="context" eval="{'default_state':'open'}"/>
</record>
<record model="ir.actions.act_window" id="board_crm_case_categ_meet">
<field name="res_model">crm.meeting</field>
<field name="view_mode">tree,form,gantt</field>
<field name="view_id" ref="crm.crm_case_tree_view_meet"/>
<field name="domain">[('user_id','=',uid)]</field>
<field name="domain">[('date','&gt;=',time.strftime('%Y-%m-%d')),('date','&lt;=',(datetime.datetime.today() + datetime.timedelta(days=2)).strftime('%Y-%m-%d'))]</field>
<field name="context" eval="{'default_state':'open'}"/>
</record>
<record id="board_sales_manager_form" model="ir.ui.view">
<field name="name">board.sales.manager.form</field>
<field name="model">board.board</field>
@ -36,8 +36,8 @@
</child1>
<child2>
<action colspan="4" name="%(crm.crm_case_category_act_oppor11)d" string="My Opportunities" width="510" domain="[('user_id','=',uid)]"/>
<action colspan="4" name="%(board_crm_case_categ_meet)d" String="My Meetings" domain="[('state','=','open')]" width="510"/>
<action colspan="4" name="%(crm.crm_case_category_act_oppor11)d" string="My Opportunities" width="510" domain="[('user_id','=',uid)]"/>
<action colspan="4" name="%(board_crm_case_categ_meet)d" String="My Meetings" domain="[('state','=','open')]" width="510"/>
</child2>
</hpaned>
</form>
@ -52,7 +52,7 @@
<field name="view_id" ref="board_sales_manager_form"/>
</record>
<menuitem icon="terp-graph" id="base.dashboard" name="Dashboards" sequence="2" parent="base.reporting_menu"/>
<menuitem icon="terp-graph" id="base.dashboard" name="Dashboards" sequence="2" parent="base.reporting_menu"/>
<menuitem id="next_id_88" name="Sales" parent="base.dashboard"/><menuitem action="open_board_sales_manager" icon="terp-graph" id="menu_board_sales_manager" parent="next_id_88" sequence="1"/>
</data>

View File

@ -1,48 +1,48 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data>
<data>
<record id="view_calendar_form" model="ir.ui.view">
<field name="name">Basic Calendar</field>
<field name="model">basic.calendar</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Basic Calendar">
<field name="name" required="1" select="1" />
<field name="active" select="1" />
<record id="view_calendar_form" model="ir.ui.view">
<field name="name">Basic Calendar</field>
<field name="model">basic.calendar</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Basic Calendar">
<field name="name" required="1" select="1" />
<field name="active" select="1" />
<field name="line_ids" mode="form,tree" colspan="4" nolabel="1">
<form string="Calendar Lines">
<field name="name" required="1" select="1" />
<field name="object_id" required="1" select="1" />
<field name="domain" select="1" />
<field name="mapping_ids" select="1" colspan="4" nolabel="1">
<tree string="Attributes Mapping" editable="bottom">
<field name="name" required="1" domain="[('type', '=', parent.name)]"/>
<field name="fn" select="1" />
<field name="field_id" select="1" required="1" domain="[('model_id', '=', parent.object_id)]" />
<field name="expr" />
</tree>
<form string="Attributes Mapping">
<field name="name" select="1" required="1" domain="[('type', '=', parent.name)]"/>
<field name="field_id" select="1" domain="[('model_id', '=', parent.object_id)]"
required="1" />
<field name="fn" select="1" required="1" />
<field name="expr" />
<separator string="Value Mapping" colspan="4" />
<field name="mapping" select="1" colspan="4" nolabel="1" />
</form>
</field>
</form>
<form string="Calendar Lines">
<field name="name" required="1" select="1" />
<field name="object_id" required="1" select="1" />
<field name="domain" select="1" />
<field name="mapping_ids" select="1" colspan="4" nolabel="1">
<tree string="Attributes Mapping" editable="bottom">
<field name="name" required="1" domain="[('type', '=', parent.name)]"/>
<field name="fn" select="1" />
<field name="field_id" select="1" required="1" domain="[('model_id', '=', parent.object_id)]" />
<field name="expr" />
</tree>
<form string="Attributes Mapping">
<field name="name" select="1" required="1" domain="[('type', '=', parent.name)]"/>
<field name="field_id" select="1" domain="[('model_id', '=', parent.object_id)]"
required="1" />
<field name="fn" select="1" required="1" />
<field name="expr" />
<separator string="Value Mapping" colspan="4" />
<field name="mapping" select="1" colspan="4" nolabel="1" />
</form>
</field>
</form>
<tree string="Attributes Mapping" editable="bottom">
<field name="name" select="1" />
<field name="object_id" select="1" />
</tree>
<field name="name" select="1" />
<field name="object_id" select="1" />
</tree>
</field>
</form>
</field>
</record>
</form>
</field>
</record>
<record id="action_view_calendar" model="ir.actions.act_window">
<record id="action_view_calendar" model="ir.actions.act_window">
<field name="name">Calendar</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">basic.calendar</field>
@ -50,12 +50,12 @@
<field name="view_mode">tree,form</field>
</record>
<menuitem id="base.menu_calendar_configuration" name="Calendar"
parent="base.menu_base_config" sequence="10" />
<menuitem id="base.menu_calendar_configuration" name="Calendar"
parent="base.menu_base_config" sequence="10" />
<menuitem id="menu_calendar"
name="Calendar" parent="base.menu_calendar_configuration"
sequence="5" action="action_view_calendar" />
<menuitem id="menu_calendar"
name="Calendar" parent="base.menu_calendar_configuration"
sequence="5" action="action_view_calendar" />
</data>
</data>
</openerp>

View File

@ -8,14 +8,14 @@
<field name="inherit_id" ref="base_action_rule.view_base_action_rule_line_form"/>
<field name="type">form</field>
<field name="arch" type="xml">
<group name="partner" position="after">
<group col="2" colspan="2">
<separator colspan="4" string="Condition on Communication History"/>
<field name="regex_history"/>
<field name="trg_max_history"/>
</group>
</group>
</field>
<group name="partner" position="after">
<group col="2" colspan="2">
<separator colspan="4" string="Condition on Communication History"/>
<field name="regex_history"/>
<field name="trg_max_history"/>
</group>
</group>
</field>
</record>
<record id="view_base_action_rule_line_form2" model="ir.ui.view">
@ -24,14 +24,14 @@
<field name="inherit_id" ref="base_action_rule.view_base_action_rule_line_form"/>
<field name="type">form</field>
<field name="arch" type="xml">
<group name="partner" position="after">
<group col="2" colspan="2">
<separator colspan="4" string="Condition Case Fields"/>
<field name="trg_section_id" select="1" widget="selection"/>
<field name="trg_categ_id"/>
</group>
</group>
</field>
<group name="partner" position="after">
<group col="2" colspan="2">
<separator colspan="4" string="Condition Case Fields"/>
<field name="trg_section_id" select="1" widget="selection"/>
<field name="trg_categ_id"/>
</group>
</group>
</field>
</record>
<record id="view_base_action_rule_line_form3" model="ir.ui.view">
@ -40,12 +40,12 @@
<field name="inherit_id" ref="base_action_rule.view_base_action_rule_line_form"/>
<field name="type">form</field>
<field name="arch" type="xml">
<field name="act_user_id" position="after">
<field name="act_section_id"/>
<field name="act_categ_id"/>
<field name="act_user_id" position="after">
<field name="act_section_id"/>
<field name="act_categ_id"/>
<field name="act_mail_to_partner"/>
</field>
</field>
</field>
</field>
</record>
</data>
</openerp>

View File

@ -14,7 +14,7 @@
</record>
<menuitem action="crm_meeting_categ_action"
id="menu_crm_case_meeting-act" parent="crm.menu_crm_case_categ" />
id="menu_crm_case_meeting-act" parent="crm.menu_crm_case_categ" />
<!-- CRM Meetings Form View -->
@ -28,26 +28,26 @@
<field name="name" select="1" string="Summary"
colspan="4" />
<field name="categ_id" widget="selection"
string="Meeting Type"
domain="[('object_id.model', '=', 'crm.meeting')]" />
string="Meeting Type"
domain="[('object_id.model', '=', 'crm.meeting')]" />
<field name="date" string="Start Date" required="1"
on_change="onchange_dates(date,duration,False)" />
on_change="onchange_dates(date,duration,False)" />
<field name="duration" widget="float_time"
on_change="onchange_dates(date,duration,False)" />
on_change="onchange_dates(date,duration,False)" />
<field name="date_deadline" string="End Date"
required="1"
on_change="onchange_dates(date,False,date_deadline)" />
required="1"
on_change="onchange_dates(date,False,date_deadline)" />
<field name="location" />
<field name="alarm_id" string="Reminder"
widget="selection" />
widget="selection" />
<group colspan="2" col="4" >
<field name="rrule_type" string="Recurrency"
colspan="1" attrs="{'readonly':[('recurrent_uid','!=',False)]}"/>
<button string="Edit All"
help="Edit all Ourrences of recurrent Meeting"
attrs="{'invisible':[('rrule_type','in', ('none', False))]}"
name="open_meeting" icon="gtk-edit"
type="object" />
help="Edit all Ourrences of recurrent Meeting"
attrs="{'invisible':[('rrule_type','in', ('none', False))]}"
name="open_meeting" icon="gtk-edit"
type="object" />
</group>
</group>
<group col="4" colspan="4" name="rrule" attrs="{'invisible': [('rrule_type','!=','custom')]}">
@ -157,27 +157,27 @@
<group col="6" colspan="4">
<field name="state" select="2" />
<button name="do_tentative"
states="needs-action,declined,accepted"
string="Uncertain"
type="object"
icon="terp-crm" />
states="needs-action,declined,accepted"
string="Uncertain"
type="object"
icon="terp-crm" />
<button name="do_accept"
string="Accept"
states="needs-action,tentative,declined"
type="object"
icon="gtk-apply" />
string="Accept"
states="needs-action,tentative,declined"
type="object"
icon="gtk-apply" />
<button name="do_decline"
string="Decline"
states="needs-action,tentative,accepted"
type="object"
icon="gtk-cancel" />
string="Decline"
states="needs-action,tentative,accepted"
type="object"
icon="gtk-cancel" />
<button
name="%(base_calendar.action_view_calendar_invite_attendee_wizard)d"
string="Delegate"
type="action"
icon="gtk-sort-descending"
states="needs-action,tentative,declined,accepted"
context="{'model' : 'calendar.attendee', 'attendee_field' : 'child_ids'}" />
name="%(base_calendar.action_view_calendar_invite_attendee_wizard)d"
string="Delegate"
type="action"
icon="gtk-sort-descending"
states="needs-action,tentative,declined,accepted"
context="{'model' : 'calendar.attendee', 'attendee_field' : 'child_ids'}" />
</group>
</page>
<page string="Other">
@ -202,15 +202,15 @@
<field name="type">tree</field>
<field name="arch" type="xml">
<tree string="Meetings"
colors="red:state=='open';black:state in ('draft', 'cancel','done','pending')">
<field name="id" widget="char" />
<field name="name" string="Subject" />
<field name="partner_id" string="Partner" />
<field name="section_id" />
<field name="date" string="Meeting Date" />
<field name="categ_id" />
<field name="user_id" />
<field name="state" />
colors="red:state=='open';black:state in ('draft', 'cancel','done','pending')">
<field name="id" widget="char" />
<field name="name" string="Subject" />
<field name="partner_id" string="Partner" />
<field name="section_id" />
<field name="date" string="Meeting Date" />
<field name="categ_id" />
<field name="user_id" />
<field name="state" />
</tree>
</field>
</record>
@ -257,19 +257,19 @@
<search string="Search Meetings">
<group col="12" colspan="4">
<filter icon="terp-crm" string="My Meetings"
domain="[('user_id','=',uid)]"
help="My Meetings" />
<filter icon="terp-crm" name="current" string="Current"
domain="[('state','in',('draft', 'open'))]"
help="Current Meetings"/>
domain="[('user_id','=',uid)]"
help="My Meetings" />
<filter icon="terp-crm" name="current" string="Current"
domain="[('state','in',('draft', 'open'))]"
help="Current Meetings"/>
<separator orientation="vertical"/>
<field name="name" select="1" string="Subject"/>
<field name="partner_id" select="1" />
<field name="section_id"
select="1" widget="selection">
<filter icon="terp-crm"
domain="[('section_id','=',context.get('section_id',False))]"
help="My section" />
select="1" widget="selection">
<filter icon="terp-crm"
domain="[('section_id','=',context.get('section_id',False))]"
help="My section" />
</field>
<field name="user_id" select="1" widget="selection"/>
</group>

View File

@ -70,18 +70,18 @@
<field name="arch" type="xml">
<search string="Cases by Section and Type">
<group col="10" colspan="4">
<filter string="This Year" icon="terp-hr"
domain="[('name','=',time.localtime()[0])]"
help="Cases by Section and Type for this year" />
<filter string="This Month" icon="terp-hr"
domain="[('month','=',time.localtime()[1])]"
help="Cases by Section and Type for this month" />
<separator orientation="vertical"/>
<field name="section_id"
select="1" widget="selection" />
<field name="category2_id" select="1"/>
<field name="nbr" select="1"/>
<field name="state" select="1"/>
<filter string="This Year" icon="terp-hr"
domain="[('name','=',time.localtime()[0])]"
help="Cases by Section and Type for this year" />
<filter string="This Month" icon="terp-hr"
domain="[('month','=',time.localtime()[1])]"
help="Cases by Section and Type for this month" />
<separator orientation="vertical"/>
<field name="section_id"
select="1" widget="selection" />
<field name="category2_id" select="1"/>
<field name="nbr" select="1"/>
<field name="state" select="1"/>
</group>
</search>
</field>
@ -155,23 +155,23 @@
<!-- Cases by section and stage Search View -->
<record id="view_crm_case_section_stage_filter" model="ir.ui.view">
<record id="view_crm_case_section_stage_filter" model="ir.ui.view">
<field name="name">CRM Report - Sections and Stage(Select)</field>
<field name="model">report.crm.case.section.stage</field>
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Cases by Section and Stage">
<group col="8" colspan="4">
<filter string="This Year" icon="terp-hr"
domain="[('name','=',time.localtime()[0])]"
help="Cases by Section and Stage for this year" />
<filter string="This Month" icon="terp-hr"
domain="[('month','=',time.localtime()[1])]"
help="Cases by Section and Stage for this month" />
<separator orientation="vertical"/>
<field name="section_id" select="1" widget="selection"/>
<field name="nbr" select="1"/>
<field name="state" select="1"/>
<filter string="This Year" icon="terp-hr"
domain="[('name','=',time.localtime()[0])]"
help="Cases by Section and Stage for this year" />
<filter string="This Month" icon="terp-hr"
domain="[('month','=',time.localtime()[1])]"
help="Cases by Section and Stage for this month" />
<separator orientation="vertical"/>
<field name="section_id" select="1" widget="selection"/>
<field name="nbr" select="1"/>
<field name="state" select="1"/>
</group>
</search>
</field>
@ -237,16 +237,16 @@
<field name="arch" type="xml">
<search string="Cases by Section, Category and Stage">
<group col='8' colspan='4'>
<filter string="This Year" icon="terp-hr"
domain="[('name','=',time.localtime()[0])]"
help="Cases by Section, Category and Stage for this year" />
<filter string="This Month" icon="terp-hr"
domain="[('month','=',time.localtime()[1])]"
help="Cases by Section, Category and Stage for this month" />
<separator orientation="vertical"/>
<field name="section_id" select="1" widget="selection"/>
<field name="nbr" select="1"/>
<field name="state" select="1"/>
<filter string="This Year" icon="terp-hr"
domain="[('name','=',time.localtime()[0])]"
help="Cases by Section, Category and Stage for this year" />
<filter string="This Month" icon="terp-hr"
domain="[('month','=',time.localtime()[1])]"
help="Cases by Section, Category and Stage for this month" />
<separator orientation="vertical"/>
<field name="section_id" select="1" widget="selection"/>
<field name="nbr" select="1"/>
<field name="state" select="1"/>
</group>
</search>
@ -255,7 +255,7 @@
<!-- Cases by section, category and stage Graph View -->
<record model="ir.ui.view" id="view_crm_case_section_categ_stage_graph">
<record model="ir.ui.view" id="view_crm_case_section_categ_stage_graph">
<field name="name">CRM Report - Section, Category and Stage(Select)</field>
<field name="model">report.crm.case.section.categ.stage</field>
<field name="type">graph</field>
@ -323,23 +323,23 @@
<!-- Cases by section, category and category2 Search View -->
<record id="view_crm_case_section_categ_categ2_filter" model="ir.ui.view">
<record id="view_crm_case_section_categ_categ2_filter" model="ir.ui.view">
<field name="name">CRM Report - Section, Category and Type(Select)</field>
<field name="model">report.crm.case.section.categ.categ2</field>
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Search Cases by User">
<group col='12' colspan='4'>
<filter string="This Year" icon="terp-hr"
domain="[('name','=',time.localtime()[0])]"
help="Cases by User for this year" />
<filter string="This Month" icon="terp-hr"
domain="[('month','=',time.localtime()[1])]"
help="Cases by User for this month" />
<separator orientation="vertical"/>
<field name="section_id" select="1" widget="selection"/>
<field name="nbr" select="1"/>
<field name="state" select="1"/>
<filter string="This Year" icon="terp-hr"
domain="[('name','=',time.localtime()[0])]"
help="Cases by User for this year" />
<filter string="This Month" icon="terp-hr"
domain="[('month','=',time.localtime()[1])]"
help="Cases by User for this month" />
<separator orientation="vertical"/>
<field name="section_id" select="1" widget="selection"/>
<field name="nbr" select="1"/>
<field name="state" select="1"/>
</group>
</search>
</field>

View File

@ -1,218 +1,218 @@
<?xml version="1.0" ?>
<openerp>
<data>
<data>
<wizard
string="Using a questionnaire"
model="crm_profiling.questionnaire"
name="open_questionnaire"
menu="False"
id="wizard_open_questionnaire"/>
<wizard
string="Using a questionnaire"
model="crm_profiling.questionnaire"
name="open_questionnaire"
menu="False"
id="wizard_open_questionnaire"/>
<record model="ir.actions.act_window" id="open_questionnaires">
<field name="name">Questionnaires</field>
<field name="res_model">crm_profiling.questionnaire</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
</record>
<menuitem parent="crm.menu_crm_configuration" id="menu_segm_questionnaire"
action="open_questionnaires" />
<record model="ir.actions.act_window" id="open_questionnaires">
<field name="name">Questionnaires</field>
<field name="res_model">crm_profiling.questionnaire</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
</record>
<menuitem parent="crm.menu_crm_configuration" id="menu_segm_questionnaire"
action="open_questionnaires" />
<record model="ir.actions.act_window" id="open_questions">
<field name="name">Questions</field>
<field name="res_model">crm_profiling.question</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
</record>
<menuitem parent="crm.menu_crm_configuration" id="menu_segm_answer"
action="open_questions" />
<record model="ir.actions.act_window" id="open_questions">
<field name="name">Questions</field>
<field name="res_model">crm_profiling.question</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
</record>
<menuitem parent="crm.menu_crm_configuration" id="menu_segm_answer"
action="open_questions" />
<!-- Profiling Questionnaire Tree view -->
<record model="ir.ui.view" id="view_questionnaire_tree">
<field name="name">Questionnaires</field>
<field name="model">crm_profiling.questionnaire</field>
<field name="type">tree</field>
<field name="arch" type="xml">
<tree string="Questionnaires">
<field name="name" select="1" colspan="4"/>
<field name="description" select="1" colspan="4"/>
<field name="questions_ids" colspan="4" nolabel="1"/>
</tree>
</field>
</record>
<record model="ir.ui.view" id="view_questionnaire_tree">
<field name="name">Questionnaires</field>
<field name="model">crm_profiling.questionnaire</field>
<field name="type">tree</field>
<field name="arch" type="xml">
<tree string="Questionnaires">
<field name="name" select="1" colspan="4"/>
<field name="description" select="1" colspan="4"/>
<field name="questions_ids" colspan="4" nolabel="1"/>
</tree>
</field>
</record>
<!-- Profiling Questionnaire Form view -->
<record model="ir.ui.view" id="view_questionnaire_form">
<field name="name">Questionnaires</field>
<field name="model">crm_profiling.questionnaire</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Questionnaires">
<field name="name" select="1" />
<newline/>
<separator string="Questions List" colspan="4"/>
<field name="questions_ids" colspan="4" nolabel="1"/>
<newline/>
<separator string="Description" colspan="4"/>
<field name="description" colspan="4" select="1" nolabel="1"/>
</form>
</field>
</record>
<record model="ir.ui.view" id="view_questionnaire_form">
<field name="name">Questionnaires</field>
<field name="model">crm_profiling.questionnaire</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Questionnaires">
<field name="name" select="1" />
<newline/>
<separator string="Questions List" colspan="4"/>
<field name="questions_ids" colspan="4" nolabel="1"/>
<newline/>
<separator string="Description" colspan="4"/>
<field name="description" colspan="4" select="1" nolabel="1"/>
</form>
</field>
</record>
<!-- Profiling Answer Tree view -->
<record model="ir.ui.view" id="view_answer">
<field name="name">Answers</field>
<field name="model">crm_profiling.answer</field>
<field name="type">tree</field>
<field name="arch" type="xml">
<tree string="Answers">
<field name="question_id" select="1"/>
<field name="name" select="1"/>
</tree>
</field>
</record>
<record model="ir.ui.view" id="view_answer">
<field name="name">Answers</field>
<field name="model">crm_profiling.answer</field>
<field name="type">tree</field>
<field name="arch" type="xml">
<tree string="Answers">
<field name="question_id" select="1"/>
<field name="name" select="1"/>
</tree>
</field>
</record>
<!-- Profiling Answer Form view -->
<record model="ir.ui.view" id="view_answer_form">
<field name="name">Answers</field>
<field name="model">crm_profiling.answer</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Answers">
<field name="question_id" select="1"/>
<field name="name" select="1"/>
</form>
</field>
</record>
<record model="ir.ui.view" id="view_answer_form">
<field name="name">Answers</field>
<field name="model">crm_profiling.answer</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Answers">
<field name="question_id" select="1"/>
<field name="name" select="1"/>
</form>
</field>
</record>
<!-- Profiling Questions Tree view -->
<record model="ir.ui.view" id="view_question_tree">
<field name="name">Questions</field>
<field name="model">crm_profiling.question</field>
<field name="type">tree</field>
<field name="arch" type="xml">
<tree string="Questions">
<field name="name" select="1" colspan="4"/>
<field name="answers_ids" colspan="4" nolabel="1"/>
</tree>
</field>
</record>
<record model="ir.ui.view" id="view_question_tree">
<field name="name">Questions</field>
<field name="model">crm_profiling.question</field>
<field name="type">tree</field>
<field name="arch" type="xml">
<tree string="Questions">
<field name="name" select="1" colspan="4"/>
<field name="answers_ids" colspan="4" nolabel="1"/>
</tree>
</field>
</record>
<!-- Profiling Questions Form view -->
<record model="ir.ui.view" id="view_question_form">
<field name="name">Questions</field>
<field name="model">crm_profiling.question</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Questions">
<newline/>
<field name="name" select="1" />
<newline/>
<separator string="Avalaible answers" colspan="4"/>
<field name="answers_ids" colspan="4" nolabel="1" editable="bottom">
<tree string="Answers" editable="bottom">
<field name="name" select="1"/>
</tree>
<form string="Answers">
<field name="name" select="1"/>
</form>
</field>
</form>
</field>
</record>
<record model="ir.ui.view" id="view_question_form">
<field name="name">Questions</field>
<field name="model">crm_profiling.question</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Questions">
<newline/>
<field name="name" select="1" />
<newline/>
<separator string="Avalaible answers" colspan="4"/>
<field name="answers_ids" colspan="4" nolabel="1" editable="bottom">
<tree string="Answers" editable="bottom">
<field name="name" select="1"/>
</tree>
<form string="Answers">
<field name="name" select="1"/>
</form>
</field>
</form>
</field>
</record>
<record model="ir.ui.view" id="view_partner_form">
<field name="name">res.partner.profile.form</field>
<field name="model">res.partner</field>
<field name="type">form</field>
<field name="inherit_id" ref="base.view_partner_form"/>
<field name="arch" type="xml">
<notebook position="inside">
<page string="Profiling">
<button string="Use a questionnaire"
name="%(wizard_open_questionnaire)d" type="action" colspan="1"
icon="gtk-justify-fill" />
<newline/>
<field name="answers_ids" colspan="4" nolabel="1"/>
</page>
</notebook>
</field>
</record>
<record model="ir.ui.view" id="view_partner_form">
<field name="name">res.partner.profile.form</field>
<field name="model">res.partner</field>
<field name="type">form</field>
<field name="inherit_id" ref="base.view_partner_form"/>
<field name="arch" type="xml">
<notebook position="inside">
<page string="Profiling">
<button string="Use a questionnaire"
name="%(wizard_open_questionnaire)d" type="action" colspan="1"
icon="gtk-justify-fill" />
<newline/>
<field name="answers_ids" colspan="4" nolabel="1"/>
</page>
</notebook>
</field>
</record>
<!-- CRM Segmentation Form view -->
<record model="ir.ui.view" id="crm.crm_segmentation-view">
<field name="name">crm.segmentation.form</field>
<field name="model">crm.segmentation</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Partner Segmentation">
<notebook>
<page string="Segmentation">
<separator string="Segmentation Description" colspan="4"/>
<field name="name" select="1"/>
<field name="exclusif"/>
<newline/>
<field name="categ_id" select="2" colspan="2"/>
<newline/>
<field name="description" select="2" colspan="4"/>
<field name="state"/>
<group col="3" colspan="2">
<button name="process_start"
states="not running" string="Compute Segmentation" type="object"
icon="gtk-apply" />
<button name="process_stop" states="running"
string="Stop Process" type="object" icon="gtk-stop" />
<button name="process_continue" states="running"
string="Continue Process" type="object" icon="gtk-go-forward" />
</group>
</page>
<page string="Sales Purchase">
<field name="sales_purchase_active"/>
<separator string="State of Mind Computation" colspan="4"/>
<field name="som_interval"/>
<field name="som_interval_max"/>
<field name="som_interval_decrease"/>
<field name="som_interval_default"/>
<separator string="Segmentation Test" colspan="4"/>
<field name="segmentation_line" widget="one2many_list" colspan="4"/>
</page>
<page string="Profiling">
<field name="profiling_active" colspan="2"/>
<separator string="Profiling Options" colspan="4"/>
<field name="parent_id" colspan="2"/><newline/>
<separator string="Included Answers :" colspan="2" />
<separator string="Excluded Answers :" colspan="2"/>
<field name="answer_yes" nolabel="1" colspan="2"/>
<field name="answer_no" nolabel="1" colspan="2"/>
</page>
</notebook>
</form>
</field>
</record>
<record model="ir.ui.view" id="crm.crm_segmentation-view">
<field name="name">crm.segmentation.form</field>
<field name="model">crm.segmentation</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Partner Segmentation">
<notebook>
<page string="Segmentation">
<separator string="Segmentation Description" colspan="4"/>
<field name="name" select="1"/>
<field name="exclusif"/>
<newline/>
<field name="categ_id" select="2" colspan="2"/>
<newline/>
<field name="description" select="2" colspan="4"/>
<field name="state"/>
<group col="3" colspan="2">
<button name="process_start"
states="not running" string="Compute Segmentation" type="object"
icon="gtk-apply" />
<button name="process_stop" states="running"
string="Stop Process" type="object" icon="gtk-stop" />
<button name="process_continue" states="running"
string="Continue Process" type="object" icon="gtk-go-forward" />
</group>
</page>
<page string="Sales Purchase">
<field name="sales_purchase_active"/>
<separator string="State of Mind Computation" colspan="4"/>
<field name="som_interval"/>
<field name="som_interval_max"/>
<field name="som_interval_decrease"/>
<field name="som_interval_default"/>
<separator string="Segmentation Test" colspan="4"/>
<field name="segmentation_line" widget="one2many_list" colspan="4"/>
</page>
<page string="Profiling">
<field name="profiling_active" colspan="2"/>
<separator string="Profiling Options" colspan="4"/>
<field name="parent_id" colspan="2"/><newline/>
<separator string="Included Answers :" colspan="2" />
<separator string="Excluded Answers :" colspan="2"/>
<field name="answer_yes" nolabel="1" colspan="2"/>
<field name="answer_no" nolabel="1" colspan="2"/>
</page>
</notebook>
</form>
</field>
</record>
<!-- CRM Segmentation Tree view -->
<record model="ir.ui.view" id="view_partner_crm_segmentation_tree">
<field name="name">crm.segmentation.tree</field>
<field name="model">crm.segmentation</field>
<field name="type">tree</field>
<field name="arch" type="xml">
<tree string="Partner Segmentations">
<field name="name"/>
<field name="description"/>
<field name="categ_id"/>
</tree>
</field>
</record>
<record model="ir.ui.view" id="view_partner_crm_segmentation_tree">
<field name="name">crm.segmentation.tree</field>
<field name="model">crm.segmentation</field>
<field name="type">tree</field>
<field name="arch" type="xml">
<tree string="Partner Segmentations">
<field name="name"/>
<field name="description"/>
<field name="categ_id"/>
</tree>
</field>
</record>
</data>
</data>
</openerp>

View File

@ -143,7 +143,7 @@
</field>
</field>
</record>
<record id="view_picking_withweight_in_form" model="ir.ui.view">
<field name="name">stock.picking_withweight.in.form.view</field>
<field name="type">form</field>
@ -166,7 +166,7 @@
<field name="weight"/>
</field>
</field>
</record>
</record>
<record id="view_picking_withcarrier_delivery_form" model="ir.ui.view">
<field name="name">delivery.stock.picking_withcarrier.delivery.form.view</field>
@ -192,7 +192,7 @@
<field name="context">{'contact_display': 'partner'}</field>
<field name="search_view_id" ref="stock.view_picking_out_search"/>
</record>
<record id="view_picking_withcarrier_out_move_form" model="ir.ui.view">
<field name="name">delivery.stock.picking_withcarrier.out.move.form.view</field>
<field name="type">form</field>
@ -204,7 +204,7 @@
</xpath>
</field>
</record>
<record id="view_picking_withweight_in_move_form" model="ir.ui.view">
<field name="name">stock.picking_withweight.in.move.form.view</field>
<field name="type">form</field>
@ -227,7 +227,7 @@
<field name="weight"/>
</xpath>
</field>
</record>
</record>
<record id="view_picking_withcarrier_delivery_move_form" model="ir.ui.view">
<field name="name">delivery.stock.picking_withcarrier.delivery.move.form.view</field>
@ -240,7 +240,7 @@
</xpath>
</field>
</record>
<record id="view_move_withweight_tree" model="ir.ui.view">
<field name="name">stock.move.tree.weight</field>
<field name="type">tree</field>
@ -252,7 +252,7 @@
</field>
</field>
</record>
<record id="view_move_withweight_form" model="ir.ui.view">
<field name="name">stock.move.form.weight</field>
<field name="type">form</field>
@ -264,7 +264,7 @@
</field>
</field>
</record>
<record id="view_move_reception_picking_withweight_tree" model="ir.ui.view">
<field name="name">stock.move.reception.packing.tree.weight</field>
<field name="type">tree</field>
@ -276,7 +276,7 @@
</field>
</field>
</record>
<record id="view_move_reception_picking_withweight_form" model="ir.ui.view">
<field name="name">stock.move.reception.packing.form.weight</field>
<field name="type">form</field>
@ -288,6 +288,6 @@
</field>
</field>
</record>
</data>
</openerp>

View File

@ -1,12 +1,12 @@
<openerp>
<data>
<record model="res.groups" id="group_compta_user">
<field name="name">grcompta</field>
</record>
<record model="res.groups" id="group_compta_admin">
<field name="name">grcomptaadmin</field>
</record>
<menuitem name="Administration" groups="admin,grcomptaadmin" icon="terp-stock" id="menu_admin_compta"/>
<record model="res.groups" id="group_compta_user">
<field name="name">grcompta</field>
</record>
<record model="res.groups" id="group_compta_admin">
<field name="name">grcomptaadmin</field>
</record>
<menuitem name="Administration" groups="admin,grcomptaadmin" icon="terp-stock" id="menu_admin_compta"/>
</data>
</openerp>

View File

@ -179,7 +179,7 @@
<field name="title" select="1"/>
<field name="partner_id"/>
<field name="user_id"/>
<field name="parent_id" select="2"/>
<field name="parent_id" select="2"/>
</group>
<notebook colspan="4">
<page string="Attachment">
@ -207,18 +207,18 @@
<field name="index_content" nolabel="1" colspan="4" select="1"/>
</page><page string="Security">
<field name="group_ids" colspan="4" nolabel="1"/>
</page><page string="Others Info">
<group colspan="4" col="4">
<separator string="File Information" colspan="4"/>
<field name="file_size" readonly="1"/>
</page><page string="Others Info">
<group colspan="4" col="4">
<separator string="File Information" colspan="4"/>
<field name="file_size" readonly="1"/>
<newline/>
<separator string="History" colspan="4"/>
<separator string="History" colspan="4"/>
<field name="create_uid"/>
<field name="create_date"/>
<field name="write_uid"/>
<field name="write_date"/>
</group>
<field name="write_date"/>
</group>
</page><page string="Notes">
<field colspan="4" name="description" nolabel="1"/>
</page>

View File

@ -1,146 +1,146 @@
<?xml version="1.0"?>
<openerp>
<data>
<menuitem name="Marketing" id="menu_marketing_event_main" icon="terp-calendar" sequence="9"/>
<menuitem name="Events Organisation" id="menu_event_main" parent="menu_marketing_event_main" />
<!-- EVENTS -->
<!--<menuitem name="Events Organisation" id="menu_event_main" icon="terp-calendar" />-->
<data>
<menuitem name="Marketing" id="menu_marketing_event_main" icon="terp-calendar" sequence="9"/>
<menuitem name="Events Organisation" id="menu_event_main" parent="menu_marketing_event_main" />
<!-- EVENTS -->
<!--<menuitem name="Events Organisation" id="menu_event_main" icon="terp-calendar" />-->
<!-- EVENTS/CONFIGURATION/TYPE OF EVENTS -->
<record model="ir.ui.view" id="view_event_type_form">
<field name="name">Event type</field>
<field name="model">event.type</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Event Type">
<field name="name" select="1"/>
</form>
</field>
</record>
<!-- EVENTS/CONFIGURATION/TYPE OF EVENTS -->
<record model="ir.ui.view" id="view_event_type_form">
<field name="name">Event type</field>
<field name="model">event.type</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Event Type">
<field name="name" select="1"/>
</form>
</field>
</record>
<record model="ir.ui.view" id="view_event_type_tree">
<field name="name">Event type</field>
<field name="model">event.type</field>
<field name="type">tree</field>
<field name="arch" type="xml">
<tree string="Event Type">
<field name="name"/>
</tree>
</field>
</record>
<record model="ir.ui.view" id="view_event_type_tree">
<field name="name">Event type</field>
<field name="model">event.type</field>
<field name="type">tree</field>
<field name="arch" type="xml">
<tree string="Event Type">
<field name="name"/>
</tree>
</field>
</record>
<record model="ir.actions.act_window" id="action_event_type">
<field name="res_model">event.type</field>
<field name="view_type">form</field>
</record>
<menuitem name="Configuration" id="menu_event_config" parent="menu_marketing_event_main" sequence="30"/>
<menuitem name="Types of Events" id="menu_event_type" action="action_event_type" parent="menu_event_config"/>
<record model="ir.actions.act_window" id="action_event_type">
<field name="res_model">event.type</field>
<field name="view_type">form</field>
</record>
<menuitem name="Configuration" id="menu_event_config" parent="menu_marketing_event_main" sequence="30"/>
<menuitem name="Types of Events" id="menu_event_type" action="action_event_type" parent="menu_event_config"/>
<!-- The base section for all events -->
<!-- The base section for all events -->
<record model="ir.actions.act_window" id="action_event_categories">
<field name="name">Events by section</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">crm.case.section</field>
<field name="domain" eval="[('parent_id','=',False)]" />
<field name="view_type">tree</field>
</record>
<menuitem name="Events by Categories" id="menu_action_event_categories" action="action_event_categories" parent="menu_event_main"/>
<record model="ir.actions.act_window" id="action_event_categories">
<field name="name">Events by section</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">crm.case.section</field>
<field name="domain" eval="[('parent_id','=',False)]" />
<field name="view_type">tree</field>
</record>
<menuitem name="Events by Categories" id="menu_action_event_categories" action="action_event_categories" parent="menu_event_main"/>
<!-- Events Organisation/CONFIGURATION/EVENTS -->
<!-- Events Organisation/CONFIGURATION/EVENTS -->
<record model="ir.ui.view" id="view_event_form">
<field name="name">Events</field>
<field name="model">event.event</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Events">
<group col="6" colspan="4">
<field name="name" string="Event" select="1"/>
<field name="type" select="2"/>
<field name="user_id" select="1"/>
<field name="date_begin" select="1"/>
<field name="date_end" select="2"/>
<field name="product_id"/>
</group>
<notebook colspan="4">
<page string="General">
<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"/>
<separator string="Status" colspan="4"/>
<field name="state" select="1"/>
<group col="4" colspan="2">
<record model="ir.ui.view" id="view_event_form">
<field name="name">Events</field>
<field name="model">event.event</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Events">
<group col="6" colspan="4">
<field name="name" string="Event" select="1"/>
<field name="type"/>
<field name="user_id" select="1"/>
<field name="date_begin" select="1"/>
<field name="date_end"/>
<field name="product_id"/>
</group>
<notebook colspan="4">
<page string="General">
<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"/>
<field name="register_max"/>
<separator string="Status" colspan="4"/>
<field name="state" select="1"/>
<group col="4" colspan="2">
<button string="Confirm Event" name="button_confirm" states="draft" type="object" icon="gtk-apply"/>
<button string="Cancel Event" name="button_cancel" states="draft,confirm" type="object" icon="gtk-cancel"/>
<button string="Event Done" name="button_done" states="confirm" type="object" icon="gtk-jump-to"/>
<button string="Set To Draft" name="button_draft" states="confirm,cancel,done" type="object" icon="gtk-convert"/>
</group>
</page>
<page string="Mailing">
<field name="reply_to"/>
<separator string="Auto Registration Email" colspan="4"/>
<field name="mail_auto_registr"/>
<newline/>
<field name="mail_registr" colspan="4"/>
<separator string="Auto Confirmation Email" colspan="4"/>
<field name="mail_auto_confirm"/>
<newline/>
<field name="mail_confirm" colspan="4"/>
<newline/>
</page>
<page string="Statistics">
<separator string="Registrations" colspan="4"/>
<field name="register_current"/>
<field name="register_prospect"/>
</page>
</notebook>
</form>
</field>
</record>
</group>
</page>
<page string="Mailing">
<field name="reply_to"/>
<separator string="Auto Registration Email" colspan="4"/>
<field name="mail_auto_registr"/>
<newline/>
<field name="mail_registr" colspan="4"/>
<separator string="Auto Confirmation Email" colspan="4"/>
<field name="mail_auto_confirm"/>
<newline/>
<field name="mail_confirm" colspan="4"/>
<newline/>
</page>
<page string="Statistics">
<separator string="Registrations" colspan="4"/>
<field name="register_current"/>
<field name="register_prospect"/>
</page>
</notebook>
</form>
</field>
</record>
<!-- event.event tree view -->
<record model="ir.ui.view" id="view_event_tree">
<field name="name">event.event.tree</field>
<field name="model">event.event</field>
<field name="type">tree</field>
<field name="arch" type="xml">
<tree string="Events" colors="red:register_min>register_current;black:register_min&lt;=register_current">
<field name="name" string="Name"/>
<field name="user_id"/>
<field name="date_begin"/>
<field name="register_min"/>
<field name="register_current"/>
<field name="state"/>
</tree>
</field>
</record>
<!-- event.event tree view -->
<record model="ir.ui.view" id="view_event_tree">
<field name="name">event.event.tree</field>
<field name="model">event.event</field>
<field name="type">tree</field>
<field name="arch" type="xml">
<tree string="Events" colors="red:register_min>register_current;black:register_min&lt;=register_current">
<field name="name" string="Name"/>
<field name="user_id"/>
<field name="date_begin"/>
<field name="register_min"/>
<field name="register_current"/>
<field name="state"/>
</tree>
</field>
</record>
<record model="ir.ui.view" id="view_event_search">
<field name="name">Events</field>
<field name="model">event.event</field>
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Events">
<group col="10" colspan="4">
<filter icon="gtk-execute" string="My Events" domain="[('user_id','=',uid)]" help="My Events"/>
<separator orientation="vertical"/>
<filter icon="terp-calendar" string="Draft" domain="[('state','=','draft')]" help="Draft Events"/>
<filter icon="terp-calendar" string="Confirmed" domain="[('state','=','confirm')]" help="Confirmed Events"/>
<separator orientation="vertical"/>
<field name="name" string="Event" select="1"/>
<field name="user_id" select="1"/>
<field name="date_begin" select="1"/>
<field name="state" select="1"/>
</group>
</search>
</field>
</record>
<record model="ir.ui.view" id="view_event_search">
<field name="name">Events</field>
<field name="model">event.event</field>
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Events">
<group col="10" colspan="4">
<filter icon="gtk-execute" string="My Events" domain="[('user_id','=',uid)]" help="My Events"/>
<separator orientation="vertical"/>
<filter icon="terp-calendar" string="Draft" domain="[('state','=','draft')]" help="Draft Events"/>
<filter icon="terp-calendar" string="Confirmed" domain="[('state','=','confirm')]" help="Confirmed Events"/>
<separator orientation="vertical"/>
<field name="name" string="Event" select="1"/>
<field name="user_id" select="1"/>
<field name="date_begin" select="1"/>
<field name="state" select="1"/>
</group>
</search>
</field>
</record>
<!-- Events Organisation/CONFIGURATION/EVENTS -->
<!-- Events Organisation/CONFIGURATION/EVENTS -->
<record model="ir.actions.act_window" id="action_event_view">
<field name="name">Events</field>
<field name="type">ir.actions.act_window</field>
@ -152,232 +152,232 @@
<menuitem name="Events" id="menu_event_event" action="action_event_view" parent="menu_event_main" />
<!-- EVENTS/REGISTRATIONS/EVENTS -->
<!-- EVENTS/REGISTRATIONS/EVENTS -->
<!-- Registration view (form) by _inherits .................. -->
<record model="ir.ui.view" id="event_registration_tree">
<field name="name">event.registration.tree</field>
<field name="model">event.registration</field>
<field name="type">tree</field>
<field name="arch" type="xml">
<tree string="Registration">
<field name="id"/>
<field name="create_date"/>
<field name="event_id"/>
<field name="partner_id"/>
<field name="nb_register"/>
<field name="state"/>
</tree>
</field>
</record>
<!-- Registration view (form) by _inherits .................. -->
<record model="ir.ui.view" id="event_registration_tree">
<field name="name">event.registration.tree</field>
<field name="model">event.registration</field>
<field name="type">tree</field>
<field name="arch" type="xml">
<tree string="Registration">
<field name="id"/>
<field name="create_date"/>
<field name="event_id"/>
<field name="partner_id"/>
<field name="nb_register"/>
<field name="state"/>
</tree>
</field>
</record>
<record model="ir.ui.view" id="event_registration_form">
<field name="name">event.registration.form</field>
<field name="model">event.registration</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Registration">
<group col="6" colspan="4">
<field name="event_id" select="1" on_change="onchange_event(event_id, partner_invoice_id)" domain="[('state','in',('draft','confirm'))]"/>
<field name="nb_register"/>
<group colspan="2">
<field name="user_id" select="1"/>
<record model="ir.ui.view" id="event_registration_form">
<field name="name">event.registration.form</field>
<field name="model">event.registration</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Registration">
<group col="6" colspan="4">
<field name="event_id" select="1" on_change="onchange_event(event_id, partner_invoice_id)" domain="[('state','in',('draft','confirm'))]"/>
<field name="nb_register"/>
<group colspan="2">
<field name="user_id" select="1"/>
<button name="remind_user" string="Send Reminder" states="open,pending" type="object" colspan="2" icon="gtk-go-forward"/>
</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"/>
</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"/>
</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"/>
</group>
<notebook colspan="4">
<page string="General">
<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"/>
<newline/>
<separator string="Status" colspan="4"/>
<group col="8" colspan="4">
<field name="state" select="1" colspan="2"/>
<newline/>
<separator string="Badge" colspan="4"/>
<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">
<field name="state" select="1" colspan="2"/>
<button name="button_reg_close" string="Registration Invoiced" states="open" type="object" icon="gtk-print"/>
<button name="check_confirm" string="Confirm Registration" states="draft" type="object" icon="gtk-apply"/>
<button name="button_reg_cancel" string="Cancel Registration" states="draft,open" type="object" icon="gtk-cancel"/>
</group>
</page>
<page string="Extra Info">
<field name="name" select="1" colspan="4"/>
<field name="id" select="1"/>
<field name="active" select="2"/>
<field name="email_cc" colspan="4"/>
<field name="categ_id" select="2" on_change="onchange_categ_id(categ_id)"/>
<separator colspan="4" string="Dates"/>
<field name="create_date"/>
<field name="date_closed"/>
<separator colspan="4" string="References"/>
<field name="ref" colspan="4"/>
<field name="ref2" colspan="4"/>
</page>
<page string="History">
</group>
</page>
<page string="Extra Info">
<field name="name" select="1" colspan="4"/>
<field name="id" select="1"/>
<field name="active"/>
<field name="email_cc" colspan="4"/>
<field name="categ_id" on_change="onchange_categ_id(categ_id)"/>
<separator colspan="4" string="Dates"/>
<field name="create_date"/>
<field name="date_closed"/>
<separator colspan="4" string="References"/>
<field name="ref" colspan="4"/>
<field name="ref2" colspan="4"/>
</page>
<page string="History">
<field name="history_line" colspan="4" nolabel="1" mode="tree,form">
<form string="Communication history">
<field name="date"/>
<field name="som"/>
<newline/>
<field name="canal_id"/>
<field name="email"/>
<newline/>
<field name="description" colspan="4"/>
</form>
<tree string="Communication history">
<field name="date"/>
<field name="description"/>
<field name="som"/>
<field name="user_id"/>
<field name="canal_id"/>
</tree>
</field>
<field name="log_ids" nolabel="1" colspan="4" mode="tree,form" readonly="1">
<tree string="Actions">
<separator string="Action Information" colspan="4"/>
<field name="name"/>
<field name="date"/>
<field name="user_id"/>
</tree>
<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"/>
</form>
</field>
</page>
<page string="Payments">
<field name="invoice_label" select="1"/>
<field name="tobe_invoiced" select="1"/>
<field name="invoice_id"/>
</page>
</notebook>
</form>
</field>
</record>
<field name="date"/>
<field name="som"/>
<newline/>
<field name="canal_id"/>
<field name="email"/>
<newline/>
<field name="description" colspan="4"/>
</form>
<tree string="Communication history">
<field name="date"/>
<field name="description"/>
<field name="som"/>
<field name="user_id"/>
<field name="canal_id"/>
</tree>
</field>
<field name="log_ids" nolabel="1" colspan="4" mode="tree,form" readonly="1">
<tree string="Actions">
<separator string="Action Information" colspan="4"/>
<field name="name"/>
<field name="date"/>
<field name="user_id"/>
</tree>
<form string="Actions">
<separator string="Action Information" colspan="4"/>
<field name="name" colspan="4"/>
<field name="date"/>
<field name="user_id"/>
</form>
</field>
</page>
<page string="Payments">
<field name="invoice_label" select="1"/>
<field name="tobe_invoiced" select="1"/>
<field name="invoice_id"/>
</page>
</notebook>
</form>
</field>
</record>
<record model="ir.ui.view" id="view_registration_search">
<field name="name">Registrations</field>
<field name="model">event.registration</field>
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Event Registration">
<group col="12" colspan="4">
<filter icon="gtk-execute" string="My" domain="[('user_id','=',uid)]" help="My Registrations"/>
<separator orientation="vertical"/>
<filter icon="terp-calendar" string="Draft" domain="[('state','=','draft')]" help="Draft Registrations"/>
<filter icon="terp-calendar" string="Confirmed" domain="[('state','in',('open','done'))]" help="Confirmed Registrations"/>
<separator orientation="vertical"/>
<field name="event_id" select="1"/>
<field name="user_id" select="1"/>
<field name="partner_id" select="1"/>
<field name="state" select="1"/>
<field name="invoice_label" select="1"/>
</group>
</search>
</field>
</record>
<record model="ir.ui.view" id="view_registration_search">
<field name="name">Registrations</field>
<field name="model">event.registration</field>
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Event Registration">
<group col="12" colspan="4">
<filter icon="gtk-execute" string="My" domain="[('user_id','=',uid)]" help="My Registrations"/>
<separator orientation="vertical"/>
<filter icon="terp-calendar" string="Draft" domain="[('state','=','draft')]" help="Draft Registrations"/>
<filter icon="terp-calendar" string="Confirmed" domain="[('state','in',('open','done'))]" help="Confirmed Registrations"/>
<separator orientation="vertical"/>
<field name="event_id" select="1"/>
<field name="user_id" select="1"/>
<field name="partner_id" select="1"/>
<field name="state" select="1"/>
<field name="invoice_label" select="1"/>
</group>
</search>
</field>
</record>
<record model="ir.actions.act_window" id="action_registration">
<field name="name">Registrations</field>
<field name="res_model">event.registration</field>
<field name="view_type">form</field>
<field name="domain"></field>
<field name="view_mode">tree,form</field>
<field name="search_view_id" ref="view_registration_search"/>
</record>
<menuitem
name="Registrations"
id="menu_action_registration" parent="menu_event_main"
action="action_registration"/>
<record model="ir.actions.act_window" id="action_registration">
<field name="name">Registrations</field>
<field name="res_model">event.registration</field>
<field name="view_type">form</field>
<field name="domain"></field>
<field name="view_mode">tree,form</field>
<field name="search_view_id" ref="view_registration_search"/>
</record>
<menuitem
name="Registrations"
id="menu_action_registration" parent="menu_event_main"
action="action_registration"/>
<!-- report , event on registration... start -->
<record model="ir.ui.view" id="report_event_registration_tree">
<field name="name">report.event.registration.tree</field>
<field name="model">report.event.registration</field>
<field name="type">tree</field>
<field name="arch" type="xml">
<tree string="Event on Registration">
<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"/>
</tree>
</field>
</record>
<!-- report , event on registration... start -->
<record model="ir.ui.view" id="report_event_registration_tree">
<field name="name">report.event.registration.tree</field>
<field name="model">report.event.registration</field>
<field name="type">tree</field>
<field name="arch" type="xml">
<tree string="Event on Registration">
<field name="name" select="1"/>
<field name="date_begin" select="1"/>
<field name="date_end"/>
<field name="draft_state"/>
<field name="confirm_state"/>
<field name="register_max"/>
</tree>
</field>
</record>
<record model ="ir.ui.view" id="report_event_registration_graph">
<field name="name">report.event.registration.graph</field>
<field name="model">report.event.registration</field>
<field name="type">graph</field>
<field name="arch" type="xml">
<graph string="Event on Registration" type="bar">
<field name="name"/>
<field name="draft_state" operator="+"/>
<field name="confirm_state" operator="+"/>
<field name="register_max" operator="+"/>
</graph>
</field>
</record>
<record model ="ir.ui.view" id="report_event_registration_graph">
<field name="name">report.event.registration.graph</field>
<field name="model">report.event.registration</field>
<field name="type">graph</field>
<field name="arch" type="xml">
<graph string="Event on Registration" type="bar">
<field name="name"/>
<field name="draft_state" operator="+"/>
<field name="confirm_state" operator="+"/>
<field name="register_max" operator="+"/>
</graph>
</field>
</record>
<record model="ir.actions.act_window" id="action_event_registration">
<field name="name">Events On Registrations</field>
<field name="res_model">report.event.registration</field>
<field name="view_type">form</field>
<field name="view_mode">tree,graph</field>
</record>
<menuitem name="Reporting" id="menu_report_event" parent="menu_marketing_event_main" sequence="20"/>
<!--<menuitem parent="menu_report_event" action="action_event_registration" id="menu_report_event_registration"/>-->
<menuitem parent="menu_report_event" action="action_event_registration" id="menu_report_event_registration" />
<!-- end... -->
<record model="ir.actions.act_window" id="action_event_registration">
<field name="name">Events On Registrations</field>
<field name="res_model">report.event.registration</field>
<field name="view_type">form</field>
<field name="view_mode">tree,graph</field>
</record>
<menuitem name="Reporting" id="menu_report_event" parent="menu_marketing_event_main" sequence="20"/>
<!--<menuitem parent="menu_report_event" action="action_event_registration" id="menu_report_event_registration"/>-->
<menuitem parent="menu_report_event" action="action_event_registration" id="menu_report_event_registration" />
<!-- end... -->
<!-- report , event type on registration... start -->
<record model="ir.ui.view" id="report_event_type_registration_tree">
<field name="name">report.event.type.registration.tree</field>
<field name="model">report.event.type.registration</field>
<field name="type">tree</field>
<field name="arch" type="xml">
<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"/>
</tree>
</field>
</record>
<!-- report , event type on registration... start -->
<record model="ir.ui.view" id="report_event_type_registration_tree">
<field name="name">report.event.type.registration.tree</field>
<field name="model">report.event.type.registration</field>
<field name="type">tree</field>
<field name="arch" type="xml">
<tree string="Registration By Event Types">
<field name="name" select="1"/>
<field name="nbevent"/>
<field name="draft_state"/>
<field name="confirm_state"/>
</tree>
</field>
</record>
<record model="ir.ui.view" id="report_event_type_registration_graph">
<field name="name">report.event.type.registration.graph</field>
<field name="model">report.event.type.registration</field>
<field name="type">graph</field>
<field name="arch" type="xml">
<graph string="Registration By Event Types" type="bar">
<field name="name"/>
<field name="draft_state" operator="+"/>
<field name="confirm_state" operator="+"/>
</graph>
</field>
</record>
<record model="ir.ui.view" id="report_event_type_registration_graph">
<field name="name">report.event.type.registration.graph</field>
<field name="model">report.event.type.registration</field>
<field name="type">graph</field>
<field name="arch" type="xml">
<graph string="Registration By Event Types" type="bar">
<field name="name"/>
<field name="draft_state" operator="+"/>
<field name="confirm_state" operator="+"/>
</graph>
</field>
</record>
<record model="ir.actions.act_window" id="action_event_type_registration">
<field name="name">Registration By Event Types</field>
<field name="res_model">report.event.type.registration</field>
<field name="view_type">form</field>
<field name="view_mode">graph,tree</field>
</record>
<menuitem parent="menu_report_event" action="action_event_type_registration" id="menu_report_event_type_registration"/>
<record model="ir.actions.act_window" id="action_event_type_registration">
<field name="name">Registration By Event Types</field>
<field name="res_model">report.event.type.registration</field>
<field name="view_type">form</field>
<field name="view_mode">graph,tree</field>
</record>
<menuitem parent="menu_report_event" action="action_event_type_registration" id="menu_report_event_type_registration"/>
<!-- end... -->
</data>
<!-- end... -->
</data>
</openerp>

View File

@ -1,44 +1,44 @@
<?xml version="1.0"?>
<openerp>
<data>
<data>
<!-- EVENTS -->
<!-- EVENTS -->
<record model="ir.ui.view" id="view_event_form_inherited">
<field name="name">Events</field>
<field name="model">event.event</field>
<field name="inherit_id" ref="event.view_event_form"/>
<field name="type">form</field>
<field name="arch" type="xml">
<field name="register_max" position="after">
<separator string="Tasks management" colspan="4"/>
<field name="project_id"/>
<record model="ir.ui.view" id="view_event_form_inherited">
<field name="name">Events</field>
<field name="model">event.event</field>
<field name="inherit_id" ref="event.view_event_form"/>
<field name="type">form</field>
<field name="arch" type="xml">
<field name="register_max" position="after">
<separator string="Tasks management" colspan="4"/>
<field name="project_id"/>
<button string="Create Retro-Planning" name="%(event_wiz)d" type="action" icon="gtk-execute"/>
</field>
</field>
</record>
</field>
</field>
</record>
<record model="ir.ui.view" id="view_event_form_inherited2">
<field name="name">Events</field>
<field name="model">event.event</field>
<field name="inherit_id" ref="event.view_event_form"/>
<field name="type">form</field>
<field name="arch" type="xml">
<field name="register_prospect" position="after">
<field name="task_ids" colspan="4" nolabel="1" widget="one2many_list" >
<tree string="All tasks" colors="red:date_deadline&lt;current_date and state=='draft';blue:date_deadline==current_date and state=='draft';grey:state in ('cancel','done');black:state not in ('cancel','done')">
<field name="sequence"/>
<field name="name"/>
<field name="user_id" />
<field name="date_deadline" />
<field name="planned_hours" widget="float_time"/>
<field name="effective_hours" widget="float_time"/>
<field name="state" />
</tree>
</field>
</field>
</field>
</record>
<record model="ir.ui.view" id="view_event_form_inherited2">
<field name="name">Events</field>
<field name="model">event.event</field>
<field name="inherit_id" ref="event.view_event_form"/>
<field name="type">form</field>
<field name="arch" type="xml">
<field name="register_prospect" position="after">
<field name="task_ids" colspan="4" nolabel="1" widget="one2many_list" >
<tree string="All tasks" colors="red:date_deadline&lt;current_date and state=='draft';blue:date_deadline==current_date and state=='draft';grey:state in ('cancel','done');black:state not in ('cancel','done')">
<field name="sequence"/>
<field name="name"/>
<field name="user_id" />
<field name="date_deadline" />
<field name="planned_hours" widget="float_time"/>
<field name="effective_hours" widget="float_time"/>
<field name="state" />
</tree>
</field>
</field>
</field>
</record>
</data>
</data>
</openerp>

View File

@ -1,57 +1,57 @@
<?xml version="1.0"?>
<openerp>
<data>
<data>
<record model="ir.ui.view" id="view_partner_address_form1_inheritg">
<field name="name">res.partner.address.form1.inheritg</field>
<field name="model">res.partner.address</field>
<field name="inherit_id" ref="base.view_partner_address_form1"/>
<field name="type">form</field>
<field name="arch" type="xml">
<field name="street2" position="replace">
<label string="Street2 : " align="1.0"/>
<group colspan="1" col="2">
<field name="street2" nolabel="1"/>
<button name="%(wizard_google_map)d"
<record model="ir.ui.view" id="view_partner_address_form1_inheritg">
<field name="name">res.partner.address.form1.inheritg</field>
<field name="model">res.partner.address</field>
<field name="inherit_id" ref="base.view_partner_address_form1"/>
<field name="type">form</field>
<field name="arch" type="xml">
<field name="street2" position="replace">
<label string="Street2 : " align="1.0"/>
<group colspan="1" col="2">
<field name="street2" nolabel="1"/>
<button name="%(wizard_google_map)d"
string="Map" type="action" icon="gtk-zoom-in"/>
</group>
</field>
</field>
</record>
</group>
</field>
</field>
</record>
<record model="ir.ui.view" id="view_partner_address_form2_inheritg">
<field name="name">res.partner.address.form2.inheritg</field>
<field name="model">res.partner.address</field>
<field name="inherit_id" ref="base.view_partner_address_form2"/>
<field name="type">form</field>
<field name="arch" type="xml">
<field name="street2" position="replace">
<label string="Street2 : " align="1.0"/>
<group colspan="1" col="2">
<field name="street2" nolabel="1"/>
<record model="ir.ui.view" id="view_partner_address_form2_inheritg">
<field name="name">res.partner.address.form2.inheritg</field>
<field name="model">res.partner.address</field>
<field name="inherit_id" ref="base.view_partner_address_form2"/>
<field name="type">form</field>
<field name="arch" type="xml">
<field name="street2" position="replace">
<label string="Street2 : " align="1.0"/>
<group colspan="1" col="2">
<field name="street2" nolabel="1"/>
<button name="%(wizard_google_map)d" string="Map" type="action" icon="gtk-zoom-in"/>
</group>
</field>
</field>
</record>
</group>
</field>
</field>
</record>
<record model="ir.ui.view" id="view_partner_form_inheritg">
<field name="name">res.partner.form.inheritg</field>
<field name="model">res.partner</field>
<field name="inherit_id" ref="base.view_partner_form"/>
<field name="type">form</field>
<field name="arch" type="xml">
<field name="street2" position="replace">
<label string="Street2 : " align="1.0"/>
<group colspan="1" col="2">
<field name="street2" nolabel="1"/>
<button name="%(wizard_google_map)d"
<record model="ir.ui.view" id="view_partner_form_inheritg">
<field name="name">res.partner.form.inheritg</field>
<field name="model">res.partner</field>
<field name="inherit_id" ref="base.view_partner_form"/>
<field name="type">form</field>
<field name="arch" type="xml">
<field name="street2" position="replace">
<label string="Street2 : " align="1.0"/>
<group colspan="1" col="2">
<field name="street2" nolabel="1"/>
<button name="%(wizard_google_map)d"
string="Map" type="action" icon="gtk-zoom-in"/>
</group>
</field>
</field>
</record>
</group>
</field>
</field>
</record>
</data>
</data>
</openerp>

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>
@ -44,17 +44,17 @@
</field>
</record>
<record id="view_department_filter" model="ir.ui.view">
<field name="name">Departments</field>
<field name="model">hr.department</field>
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Departments">
<group col='4' colspan='2'>
<field name="name" />
<field name="manager_id" widget="selection"/>
</group>
</search>
</field>
<field name="name">Departments</field>
<field name="model">hr.department</field>
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Departments">
<group col='4' colspan='2'>
<field name="name" />
<field name="manager_id" widget="selection"/>
</group>
</search>
</field>
</record>
<record id="open_module_tree_department_tree" model="ir.actions.act_window">
<field name="name">Departments</field>
@ -75,14 +75,14 @@
<menuitem action="open_module_tree_department" id="menu_department_def" parent="hr.menu_department_tree"/>
<menuitem action="open_module_tree_department" id="menu_hr_department_tree" parent="menu_hr_human_resources"/>
<record model="ir.ui.view" id="view_users_form_inherit">
<record model="ir.ui.view" id="view_users_form_inherit">
<field name="name">res.users.form</field>
<field name="type">form</field>
<field name="model">res.users</field>
<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"/>
@ -92,7 +92,7 @@
</notebook>
</field>
</record>
<record model="ir.ui.view" id="view_department_form_simple_modif_inherited1">
<record model="ir.ui.view" id="view_department_form_simple_modif_inherited1">
<field name="name">view.department.form.hr.inherited1</field>
<field name="model">res.users</field>
<field name="inherit_id" ref="base.view_users_form_simple_modif" />

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"/>
@ -191,9 +168,9 @@
</record>
<menuitem
action="action_hr_marital_status"
id="hr_menu_marital_status"
parent="hr.menu_view_employee_category_configuration_form" sequence="3"/>
action="action_hr_marital_status"
id="hr_menu_marital_status"
parent="hr.menu_view_employee_category_configuration_form" sequence="3"/>
<!--
=======================
@ -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>

View File

@ -226,8 +226,8 @@
<separator orientation="vertical"/>
<field name="employee_id" widget="selection" select="1"/>
<field name="plan_id" widget="selection" select="1"/>
</group>
<newline/>
</group>
<newline/>
<group expand='1' string='Group by...'>
<filter string='Employee' icon="terp-stock" domain="[]" context="{'group_by' : 'employee_id'}" />
<filter string='Plan' icon="terp-stock" domain="[]" context="{'group_by' : 'plan_id'}" />
@ -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>

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>
@ -127,7 +126,7 @@
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Expense">
<group>
<group>
<filter
icon="terp-hr"
domain="[('state','=','draft')]"
@ -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">

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)]"

View File

@ -73,7 +73,7 @@
<label string="Stage: " align="1.0"/>
<group colspan="1" col="3">
<field name="stage_id" nolabel="1"/>
<button name="stage_previous" string="" type="object" icon="gtk-go-back"/>
<button name="stage_previous" string="" type="object" icon="gtk-go-back"/>
<button icon="gtk-go-forward" string="" name="stage_next" type="object"/>
</group>
<field name="user_id"/>
@ -87,9 +87,9 @@
<field name="department_id" widget="selection"/>
<button name="action_makeMeeting" type="object"
string="Schedule Meeting" icon="terp-hr" />
<button name="action_print_survey" string="Print Interview" type="object"
icon="gtk-print" attrs="{'readonly':[('survey','=',False)]}"/>
</group>
<button name="action_print_survey" string="Print Interview" type="object"
icon="gtk-print" attrs="{'readonly':[('survey','=',False)]}"/>
</group>
<notebook colspan="4">
<page string="Job Info">
<group col="2" colspan="2">

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>

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>

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>

View File

@ -1,54 +1,54 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data>
<record model="ir.ui.view" id="view_res_bank_form">
<field name="name">res.bank.form</field>
<field name="model">res.bank</field>
<field name="type">form</field>
<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>
</field>
</record>
<record model="ir.ui.view" id="l10nch_view_res_bank_tree">
<field name="name">res.bank.tree</field>
<field name="model">res.bank</field>
<field name="type">tree</field>
<field name="inherit_id" ref="base.view_res_bank_tree"/>
<field name="arch" type="xml">
<field name="code" position="after">
<field name="clearing" select="1"/>
</field>
</field>
</record>
<data>
<record model="ir.ui.view" id="view_res_bank_form">
<field name="name">res.bank.form</field>
<field name="model">res.bank</field>
<field name="type">form</field>
<field name="inherit_id" ref="base.view_res_bank_form"/>
<field name="arch" type="xml">
<field name="bic" position="after">
<field name="clearing"/>
</field>
</field>
</record>
<record model="ir.ui.view" id="l10nch_view_res_bank_tree">
<field name="name">res.bank.tree</field>
<field name="model">res.bank</field>
<field name="type">tree</field>
<field name="inherit_id" ref="base.view_res_bank_tree"/>
<field name="arch" type="xml">
<field name="code" position="after">
<field name="clearing" select="1"/>
</field>
</field>
</record>
<record model="ir.ui.view" id="l10nch_view_res_partner_bank">
<field name="name">res.partner_bank.form</field>
<field name="model">res.partner.bank</field>
<field name="type">form</field>
<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>
</field>
</record>
<field name="name">res.partner_bank.form</field>
<field name="model">res.partner.bank</field>
<field name="type">form</field>
<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"/>
<field name="print_account"/>
</field>
</field>
</record>
<record model="ir.ui.view" id="l10nch_view_res_partner_bank">
<field name="name">res.partner_partner_bank.form</field>
<field name="model">res.partner</field>
<field name="type">form</field>
<field name="inherit_id" ref="account.view_partner_property_form"/>
<field name="arch" type="xml">
<field name="bank" position="after">
<field name="name">res.partner_partner_bank.form</field>
<field name="model">res.partner</field>
<field name="type">form</field>
<field name="inherit_id" ref="account.view_partner_property_form"/>
<field name="arch" type="xml">
<field name="bank" position="after">
<newline />
<field name="print_bank" select="2"/>
<field name="print_account" select="2"/>
</field>
</field>
</record>
</data>
<field name="print_bank"/>
<field name="print_account"/>
</field>
</field>
</record>
</data>
</openerp>

View File

@ -1,39 +1,39 @@
<?xml version="1.0"?>
<openerp>
<data>
<data>
<!-- Inherit both bank view -->
<record model="ir.ui.view" id="view_partner_bank_form">
<field name="name">partner - bank inherit</field>
<field name="model">res.partner</field>
<field name="type">form</field>
<field name="inherit_id" ref="base.view_partner_form"/>
<field name="arch" type="xml">
<field name="acc_number" position="after">
<newline/>
<field name="bvr_number"/>
<field name="bvr_adherent_num"/>
<field name="post_number"/>
<field name="dta_code"/>
</field>
</field>
</record>
<!-- Inherit both bank view -->
<record model="ir.ui.view" id="view_partner_bank_form">
<field name="name">partner - bank inherit</field>
<field name="model">res.partner</field>
<field name="type">form</field>
<field name="inherit_id" ref="base.view_partner_form"/>
<field name="arch" type="xml">
<field name="acc_number" position="after">
<newline/>
<field name="bvr_number"/>
<field name="bvr_adherent_num"/>
<field name="post_number"/>
<field name="dta_code"/>
</field>
</field>
</record>
<record model="ir.ui.view" id="view_partner_bank_form2">
<field name="name">partner - bank inherit</field>
<field name="model">res.partner.bank</field>
<field name="type">form</field>
<field name="inherit_id" ref="base.view_partner_bank_form"/>
<field name="arch" type="xml">
<field name="acc_number" position="after">
<newline/>
<field name="bvr_number"/>
<field name="bvr_adherent_num"/>
<field name="post_number"/>
<field name="dta_code"/>
</field>
</field>
</record>
<record model="ir.ui.view" id="view_partner_bank_form2">
<field name="name">partner - bank inherit</field>
<field name="model">res.partner.bank</field>
<field name="type">form</field>
<field name="inherit_id" ref="base.view_partner_bank_form"/>
<field name="arch" type="xml">
<field name="acc_number" position="after">
<newline/>
<field name="bvr_number"/>
<field name="bvr_adherent_num"/>
<field name="post_number"/>
<field name="dta_code"/>
</field>
</field>
</record>
</data>
</data>
</openerp>

View File

@ -3,20 +3,20 @@
<data>
<menuitem icon="STOCK_PREFERENCES" id="base.menu_tools" name="Tools" sequence="15"/>
<menuitem name="Lunch Order" parent="base.menu_tools"
id="menu_lunch" sequence="1" />
id="menu_lunch" sequence="1" />
<menuitem name="Reporting" parent="base.menu_tools"
id="base.menu_lunch_reporting" sequence="5" />
id="base.menu_lunch_reporting" sequence="5" />
<menuitem name="Lunch Orders"
parent="base.menu_lunch_reporting"
id="menu_lunch_reporting_order" sequence="1" />
parent="base.menu_lunch_reporting"
id="menu_lunch_reporting_order" sequence="1" />
<menuitem name="Configuration" parent="base.menu_tools"
id="base.menu_lunch_survey_root" sequence="6" />
id="base.menu_lunch_survey_root" sequence="6" />
<menuitem name="Lunch" parent="base.menu_lunch_survey_root"
id="menu_lunch_category_root_configuration" sequence="1" />
id="menu_lunch_category_root_configuration" sequence="1" />
<!-- Lunch order Form view -->
@ -32,7 +32,7 @@
<field name="price"/>
<field name="descript"/>
<field name="cashmove"/>
<field name="state" select="2"/>
<field name="state"/>
</group>
</form>
</field>
@ -66,7 +66,7 @@
</record>
<menuitem name="Lunch Order" parent="menu_lunch"
id="menu_lunch_order_form" action="action_lunch_order_form" />
id="menu_lunch_order_form" action="action_lunch_order_form" />
<!-- Cash Box Form view -->
@ -104,9 +104,9 @@
</record>
<menuitem name="CashBox"
parent="menu_lunch_category_root_configuration"
id="menu_lunch_cashbox_form"
action="action_lunch_cashbox_form" />
parent="menu_lunch_category_root_configuration"
id="menu_lunch_cashbox_form"
action="action_lunch_cashbox_form" />
<!-- Cash Move Form view -->
@ -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"/>
@ -150,8 +150,8 @@
</record>
<menuitem name="Cash Moves" parent="menu_lunch"
id="menu_lunch_cashmove_form"
action="action_lunch_cashmove_form" />
id="menu_lunch_cashmove_form"
action="action_lunch_cashmove_form" />
<!-- Lunch Category Form view -->
@ -227,18 +227,18 @@
</record>
<menuitem name="Tools/Lunch/Configuration/Products"
id="menu_lunch_product_form" action="action_lunch_product_form"
sequence="1" />
id="menu_lunch_product_form" action="action_lunch_product_form"
sequence="1" />
<menuitem name="Products"
parent="menu_lunch_category_root_configuration"
id="menu_lunch_product_form" action="action_lunch_product_form"
sequence="2" />
parent="menu_lunch_category_root_configuration"
id="menu_lunch_product_form" action="action_lunch_product_form"
sequence="2" />
<menuitem name="Category of product"
parent="menu_lunch_category_root_configuration"
id="menu_lunch_category_form"
action="action_lunch_category_form" sequence="1" />
parent="menu_lunch_category_root_configuration"
id="menu_lunch_category_form"
action="action_lunch_category_form" sequence="1" />
<!-- Lunch Amount Tree view -->
@ -281,9 +281,9 @@
</record>
<menuitem name="Cash Position by User"
parent="menu_lunch_reporting_order"
action="action_report_lunch_amount_tree"
id="menu_lunch_report_amount_tree" />
parent="menu_lunch_reporting_order"
action="action_report_lunch_amount_tree"
id="menu_lunch_report_amount_tree" />
</data>
</openerp>

View File

@ -111,22 +111,22 @@
</field>
</record>
<record id="view_res_partner_member_filter" model="ir.ui.view">
<field name="name">res.partner.select</field>
<field name="model">res.partner</field>
<field name="type">search</field>
<field name="arch" type="xml">
<field name="category_id" position="after">
<field name="membership_state" select="1">
<filter icon="terp-partner" domain="[('membership_state', '=', 'paid')]" help="Paid Members"/>
<filter icon="terp-partner" domain="[('membership_state', '=', 'free')]" help="Free Members"/>
<filter icon="terp-partner" domain="[('associate_member', '!=', False), ('membership_state', '!=', 'none')]" help="Associated Members"/>
<filter icon="terp-partner" domain="[('membership_state', '=', 'invoiced')]" help="Invoiced Members"/>
<filter icon="terp-partner" domain="[('membership_state', '=', 'waiting')]" help="Future Members"/>
<filter icon="terp-partner" domain="[('membership_state', '=', 'old')]" help="Old Members"/>
</field>
</field>
</field>
</record>
<field name="name">res.partner.select</field>
<field name="model">res.partner</field>
<field name="type">search</field>
<field name="arch" type="xml">
<field name="category_id" position="after">
<field name="membership_state" select="1">
<filter icon="terp-partner" domain="[('membership_state', '=', 'paid')]" help="Paid Members"/>
<filter icon="terp-partner" domain="[('membership_state', '=', 'free')]" help="Free Members"/>
<filter icon="terp-partner" domain="[('associate_member', '!=', False), ('membership_state', '!=', 'none')]" help="Associated Members"/>
<filter icon="terp-partner" domain="[('membership_state', '=', 'invoiced')]" help="Invoiced Members"/>
<filter icon="terp-partner" domain="[('membership_state', '=', 'waiting')]" help="Future Members"/>
<filter icon="terp-partner" domain="[('membership_state', '=', 'old')]" help="Old Members"/>
</field>
</field>
</field>
</record>
<record model="ir.actions.act_window" id="action_membership_members">
<field name="name">Members</field>
@ -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"/>

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"/>
@ -441,7 +441,7 @@
<field name="cycle_total" operator="+"/>
</graph>
</field>
</record>
</record>
<record id="mrp_production_form_view" model="ir.ui.view">
<field name="name">mrp.production.form</field>
@ -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"
@ -493,7 +492,7 @@
<button name="%(stock.move_scrap)d"
string="Scrap Products" type="action"
icon="gtk-convert" context="{'scrap': True}"
states="draft,waiting,confirmed,assigned" />
states="draft,waiting,confirmed,assigned"/>
</tree>
</field>
@ -502,7 +501,7 @@
<tree string="Consumed Products" editable="bottom" colors="red:scraped==True">
<field name="product_id" readonly="1"/>
<field name="product_qty" readonly="1" string="Qty"/>
<field name="product_uom" readonly="1" string="UOM"/>
<field name="product_uom" readonly="1" string="UOM"/>
<field name="location_dest_id" readonly="1" string="Destination Loc."/>
<field name="prodlot_id" />
<field name="state" invisible="1"/>
@ -516,22 +515,21 @@
name="%(stock.move_scrap)d"
string="Scrap Products" type="action"
icon="gtk-convert"
states="done,cancel" />
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"/>
<button name="button_produce" states="ready" string="Mark as Started" icon="gtk-execute"/>
<button name="%(act_mrp_product_produce)d" states="in_production" string="Produce" icon="gtk-ok" type="action"/>
<button name="force_production" states="confirmed,picking_except" string="Force Reservation" type="object" icon="gtk-jump-to"/>
<button name="button_cancel" states="draft,ready,confirmed,in_production,picking_except" string="Cancel" icon="gtk-cancel"/>
<button name="button_recreate" states="picking_except" string="Recreate Picking" icon="gtk-convert"/>
</group>
</page>
</page>
<page string="Finished Products">
<field colspan="2" name="move_created_ids" nolabel="1" widget="one2many_list"
mode="tree,form" height="275" domain="[('state','&lt;&gt;', ('done', 'cancel'))]">
@ -548,7 +546,7 @@
<button name="%(stock.move_scrap)d"
string="Scrap Products" type="action"
icon="gtk-convert" context="{'scrap': True}"
states="draft,waiting,confirmed,assigned" />
states="draft,waiting,confirmed,assigned" />
</tree>
</field>
@ -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">
@ -974,7 +971,7 @@
<group col="2" colspan="2">
<separator string="General Information" colspan="2" />
<field name="name" />
<field name="product_id" on_change="onchange_product_id(product_id)" />
<field name="product_id" on_change="onchange_product_id(product_id)"/>
<field name="product_uom"/>
</group>
<group col="2" colspan="2">
@ -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>

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,12 +177,21 @@
</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 -->
<!-- Operation codes -->
<record model="ir.ui.view" id="mrp_production_code_tree_view">
<field name="name">mrp.production.code.tree</field>
@ -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,9 +227,7 @@
<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 -->
<!-- Operations -->
<record model="ir.ui.view" id="mrp_production_operation_tree_view">
<field name="name">mrp.production.operation.tree</field>
@ -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"/>

View File

@ -9,17 +9,17 @@
<field name="arch" type="xml">
<form string="Repairs order">
<group col="6" colspan="4">
<field name="name"/>
<field name="name"/>
<field name="product_id" select="1" on_change="onchange_product_id(product_id)"/>
<field name="deliver_bool"/>
<newline/>
<newline/>
<field name="prodlot_id" select="2" on_change="onchange_lot_id(prodlot_id,product_id)"/>
<field name="move_id" on_change="onchange_move_id(product_id, move_id)"/>
<field name="repaired"/>
<newline/>
<newline/>
<field name="partner_id" select="2" on_change="onchange_partner_id(partner_id,address_id)"/>
<field name="address_id" attrs="{'readonly':[('deliver_bool','=', False)]}"/>
<field name="invoiced"/>
<field name="invoiced"/>
</group>
<notebook colspan="4">
<page string="Operations">
@ -29,25 +29,25 @@
<form string="Operations">
<notebook>
<page string="Repair Line">
<field name="name" colspan="4"/>
<field name="product_id" on_change="product_id_change(parent.pricelist_id,product_id,product_uom,product_uom_qty, parent.partner_id)" colspan="4"/>
<field name="product_uom_qty" string="Qty" />
<field name="product_uom" string="UoM"/>
<field name="price_unit"/>
<field name="price_subtotal"/>
<field name="location_id"/>
<field name="location_dest_id"/>
<field name="name" colspan="4"/>
<field name="product_id" on_change="product_id_change(parent.pricelist_id,product_id,product_uom,product_uom_qty, parent.partner_id)" colspan="4"/>
<field name="product_uom_qty" string="Qty" />
<field name="product_uom" string="UoM"/>
<field name="price_unit"/>
<field name="price_subtotal"/>
<field name="location_id"/>
<field name="location_dest_id"/>
<newline/>
<field name="type" on_change="onchange_operation_type(type,parent.guarantee_limit)"/>
<group colspan="2">
<field name="to_invoice"/>
<field name="invoiced"/>
<field name="invoiced"/>
</group>
<newline/>
<field colspan="4" name="tax_id" domain="[('parent_id','=',False),('type_tax_use','&lt;&gt;','purchase')]"/>
<separator colspan="4" string="States"/>
<field name="state"/>
</page>
</page>
<page string="History" groups="base.group_extended">
<field colspan="4" name="move_id" />
<field colspan="4" name="invoice_line_id"/>
@ -93,10 +93,12 @@
</group>
</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="invoice_method" colspan="4"/>
<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 name="invoice_id"/> -->
<field colspan="4" mode="tree,form" name="fees_lines" nolabel="1" widget="one2many_list">
<form string="Fees">
<notebook>
@ -115,7 +117,7 @@
<newline/>
<field colspan="4" name="tax_id" domain="[('parent_id','=',False),('type_tax_use','&gt;&gt;','purchase')]"/>
</page>
<page string="History" groups="base.group_extended">
<page string="History" groups="base.group_extended">
<field colspan="4" name="invoice_line_id" />
</page>
</notebook>
@ -154,7 +156,7 @@
<field name="type">tree</field>
<field name="arch" type="xml">
<tree string="Repairs order">
<field name="name" select="1" />
<field name="name" select="1" />
<field name="product_id" select="1" />
<field name="prodlot_id" select="2"/>
<field name="partner_id" select="2"/>
@ -191,7 +193,7 @@
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="domain">[('state','=','draft')]</field>
<field name="filter" eval="True"/>
<field name="filter" eval="True"/>
</record>
<record id="action_repair_progress_tree" model="ir.actions.act_window">
@ -201,7 +203,7 @@
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="domain">[('state','=','under_repair')]</field>
<field name="filter" eval="True"/>
<field name="filter" eval="True"/>
</record>
<record id="action_repair_ready_tree" model="ir.actions.act_window">
@ -211,7 +213,7 @@
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="domain">[('state','!=','draft'),('state','!=','under_repair'),('state','!=','2binvoiced'),('state','!=','invoice_except'),('state','!=','done'),('state','!=','cancel'),]</field>
<field name="filter" eval="True"/>
<field name="filter" eval="True"/>
</record>
<record id="action_repair_2binvoiced_tree" model="ir.actions.act_window">

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">
@ -52,11 +52,11 @@
<newline/>
<field name="state_2" select="2" />
<button name="button_validate"
string="Accept"
type="object"
string="Accept"
type="object"
icon="gtk-ok"
states="paid, draft"
attrs="{'invisible':[('state_2','=','accepted')]}"/>
attrs="{'invisible':[('state_2','=','accepted')]}"/>
</group>
<separator colspan="4" string="Actions"/>
@ -168,7 +168,7 @@
<menuitem name="Point of Sale" id="menu_point_root" sequence="10"/>
<menuitem name="Point of Sale" id="menu_point_of_sale" parent="menu_point_root" sequence="1" />
<menuitem name="Sales Order" parent="menu_point_of_sale" id="menu_point_ofsale" action="action_pos_pos_form" sequence="1"/>
<menuitem action="product.product_normal_action" id="menu_pos_products" parent="menu_point_of_sale" sequence="2" name="Products"/>
<menuitem action="product.product_normal_action" id="menu_pos_products" parent="menu_point_of_sale" sequence="2" name="Products"/>
<!-- POS Order view (date_payment) -->
<record model="ir.actions.act_window" id="action_pos_pos_form_user">
@ -181,7 +181,7 @@
</record>
invoiced
<record model="ir.actions.act_window" id="action_pos_order_tobinvoiced">
<record model="ir.actions.act_window" id="action_pos_order_tobinvoiced">
<field name="name">Sales to Invoice</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">pos.order</field>
@ -191,7 +191,7 @@ invoiced
<field name="domain">[('state','!=', 'invoiced')]</field>
</record>
<menuitem name="Invoicing" id="menu_point_of_sale_invoicing" parent="menu_point_root" sequence="4" />
<menuitem name="Sales to Invoice" action="action_pos_order_tobinvoiced" id="menu_point_of_sale_tobinvoiced" parent="menu_point_of_sale_invoicing"/>
<menuitem name="Sales to Invoice" action="action_pos_order_tobinvoiced" id="menu_point_of_sale_tobinvoiced" parent="menu_point_of_sale_invoicing"/>
<record model="ir.actions.act_window" id="action_pos_order_accepted">
<field name="name">Accepted Sales</field>
<field name="type">ir.actions.act_window</field>
@ -273,7 +273,7 @@ invoiced
<field name="view_id" ref="view_pos_order_line"/>
</record>
<record model="ir.actions.act_window" id="action_pos_order_line_form">
<record model="ir.actions.act_window" id="action_pos_order_line_form">
<field name="name">Sale line</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">pos.order.line</field>
@ -334,31 +334,31 @@ invoiced
</record>
<record model="ir.ui.view" id="view_report_transaction_pos_calendar">
<field name="name">report.transaction.pos.calendar</field>
<field name="model">report.transaction.pos</field>
<field name="type">calendar</field>
<field eval="2" name="priority"/>
<field name="arch" type="xml">
<calendar color="user_id" date_start="date_create" string="POS Report">
<field name="journal_id"/>
<field name="amount"/>
</calendar>
</field>
</record>
<field name="name">report.transaction.pos.calendar</field>
<field name="model">report.transaction.pos</field>
<field name="type">calendar</field>
<field eval="2" name="priority"/>
<field name="arch" type="xml">
<calendar color="user_id" date_start="date_create" string="POS Report">
<field name="journal_id"/>
<field name="amount"/>
</calendar>
</field>
</record>
<record model="ir.ui.view" id="view_report_transaction_pos_graph">
<field name="name">report.transaction.pos.graph</field>
<field name="model">report.transaction.pos</field>
<field name="type">graph</field>
<field eval="2" name="priority"/>
<field name="arch" type="xml">
<graph type="bar" string="POS Report">
<field name="user_id" />
<field name="amount"/>
<field group="True" name="journal_id"/>
</graph>
</field>
</record>
<record model="ir.ui.view" id="view_report_transaction_pos_graph">
<field name="name">report.transaction.pos.graph</field>
<field name="model">report.transaction.pos</field>
<field name="type">graph</field>
<field eval="2" name="priority"/>
<field name="arch" type="xml">
<graph type="bar" string="POS Report">
<field name="user_id" />
<field name="amount"/>
<field group="True" name="journal_id"/>
</graph>
</field>
</record>
<record model="ir.actions.act_window" id="action_trans_pos_tree_today">
<field name="name">Sales by day</field>
@ -387,7 +387,7 @@ invoiced
</record>
<record model="ir.ui.view" id="view_report_sales_by_user_pos_form">
<record model="ir.ui.view" id="view_report_sales_by_user_pos_form">
<field name="name">report.sales.by.user.pos.form</field>
<field name="model">report.sales.by.user.pos</field>
<field name="type">form</field>
@ -417,43 +417,43 @@ invoiced
</record>
<record model="ir.ui.view" id="view_report_sales_by_user_pos_calendar">
<field name="name">report.sales.by.user.pos.calendar</field>
<field name="model">report.sales.by.user.pos</field>
<field name="type">calendar</field>
<field eval="2" name="priority"/>
<field name="arch" type="xml">
<calendar color="user_id" date_start="date_order" string="POS Report">
<field name="qty" select="2"/>
<field name="amount" />
</calendar>
</field>
</record>
<field name="name">report.sales.by.user.pos.calendar</field>
<field name="model">report.sales.by.user.pos</field>
<field name="type">calendar</field>
<field eval="2" name="priority"/>
<field name="arch" type="xml">
<calendar color="user_id" date_start="date_order" string="POS Report">
<field name="qty" select="2"/>
<field name="amount" />
</calendar>
</field>
</record>
<record model="ir.ui.view" id="view_report_sales_by_user_pos_graph">
<field name="name">report.sales.by.user.pos.graph</field>
<field name="model">report.sales.by.user.pos</field>
<field name="type">graph</field>
<field eval="2" name="priority"/>
<field name="arch" type="xml">
<graph type="bar" string="Sales by User">
<field name="user_id" />
<field name="amount"/>
</graph>
</field>
</record>
<record model="ir.ui.view" id="view_report_sales_by_user_pos_graph">
<field name="name">report.sales.by.user.pos.graph</field>
<field name="model">report.sales.by.user.pos</field>
<field name="type">graph</field>
<field eval="2" name="priority"/>
<field name="arch" type="xml">
<graph type="bar" string="Sales by User">
<field name="user_id" />
<field name="amount"/>
</graph>
</field>
</record>
<record model="ir.actions.act_window" id="action_report_sales_by_user_pos_today">
<record model="ir.actions.act_window" id="action_report_sales_by_user_pos_today">
<field name="name">Sales by User</field>
<field name="res_model">report.sales.by.user.pos</field>
<field name="view_type">form</field>
<field name="view_mode">tree,calendar,form,graph</field>
<field name="domain">[('date_order','=',time.strftime('%Y-%m-%d'))]</field>
</record>
</record>
<!-- Sales of user by month -->
<!-- Sales of user by month -->
<record model="ir.ui.view" id="view_report_sales_by_user_pos_month_form">
<record model="ir.ui.view" id="view_report_sales_by_user_pos_month_form">
<field name="name">report.sales.by.user.pos.month.form</field>
<field name="model">report.sales.by.user.pos.month</field>
<field name="type">form</field>
@ -483,50 +483,50 @@ invoiced
</record>
<record model="ir.ui.view" id="view_report_sales_by_user_pos_month_calendar">
<field name="name">report.sales.by.user.pos.month.calendar</field>
<field name="model">report.sales.by.user.pos.month</field>
<field name="type">calendar</field>
<field eval="2" name="priority"/>
<field name="arch" type="xml">
<calendar color="user_id" date_start="date_order" string="POS Report">
<field name="qty" select="2"/>
<field name="amount" />
</calendar>
</field>
</record>
<field name="name">report.sales.by.user.pos.month.calendar</field>
<field name="model">report.sales.by.user.pos.month</field>
<field name="type">calendar</field>
<field eval="2" name="priority"/>
<field name="arch" type="xml">
<calendar color="user_id" date_start="date_order" string="POS Report">
<field name="qty" select="2"/>
<field name="amount" />
</calendar>
</field>
</record>
<record model="ir.ui.view" id="view_report_sales_by_user_pos_month_graph">
<field name="name">report.sales.by.user.pos.month.graph</field>
<field name="model">report.sales.by.user.pos.month</field>
<field name="type">graph</field>
<field eval="2" name="priority"/>
<field name="arch" type="xml">
<graph type="bar" string="Sales by User">
<field name="user_id" />
<field name="amount"/>
</graph>
</field>
</record>
<record model="ir.ui.view" id="view_report_sales_by_user_pos_month_graph">
<field name="name">report.sales.by.user.pos.month.graph</field>
<field name="model">report.sales.by.user.pos.month</field>
<field name="type">graph</field>
<field eval="2" name="priority"/>
<field name="arch" type="xml">
<graph type="bar" string="Sales by User">
<field name="user_id" />
<field name="amount"/>
</graph>
</field>
</record>
<record model="ir.actions.act_window" id="action_report_sales_by_user_pos_month">
<record model="ir.actions.act_window" id="action_report_sales_by_user_pos_month">
<field name="name">Sales by User Monthly</field>
<field name="res_model">report.sales.by.user.pos.month</field>
<field name="view_type">form</field>
<field name="view_mode">tree,calendar,form,graph</field>
<field name="domain">[('date_order','like',time.strftime('%Y-%m'))]</field>
</record>
</record>
<!-- Sales by margin -->
<!-- Sales by margin -->
<record model="ir.ui.view" id="view_report_sales_by_margin_pos_form">
<record model="ir.ui.view" id="view_report_sales_by_margin_pos_form">
<field name="name">report.sales.by.margin.pos.form</field>
<field name="model">report.sales.by.margin.pos</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="POS ">
<field name="user_id" select="2"/>
<field name="product_name" select="2"/>
<field name="user_id" select="2"/>
<field name="product_name" select="2"/>
<field name="date_order" select="1" widget="date"/>
<field name="qty" select="2"/>
<field name="net_margin_per_qty" select="2"/>
@ -543,7 +543,7 @@ invoiced
<field name="arch" type="xml">
<tree string="POS">
<field name="user_id" select="2"/>
<field name="product_name" select="2"/>
<field name="product_name" select="2"/>
<field name="date_order" select="1" widget="date"/>
<field name="qty" select="2"/>
<field name="net_margin_per_qty" select="2"/>
@ -553,30 +553,30 @@ invoiced
</record>
<record model="ir.ui.view" id="view_report_sales_by_margin_pos_calendar">
<field name="name">report.sales.by.margin.pos.calendar</field>
<field name="model">report.sales.by.margin.pos</field>
<field name="type">calendar</field>
<field eval="2" name="priority"/>
<field name="arch" type="xml">
<calendar color="user_id" date_start="date_order" string="Sales by User Margin">
<field name="product_name" select="2"/>
<field name="total" />
</calendar>
</field>
</record>
<field name="name">report.sales.by.margin.pos.calendar</field>
<field name="model">report.sales.by.margin.pos</field>
<field name="type">calendar</field>
<field eval="2" name="priority"/>
<field name="arch" type="xml">
<calendar color="user_id" date_start="date_order" string="Sales by User Margin">
<field name="product_name" select="2"/>
<field name="total" />
</calendar>
</field>
</record>
<record model="ir.ui.view" id="view_report_sales_by_margin_pos_graph">
<field name="name">report.sales.by.margin.pos.graph</field>
<field name="model">report.sales.by.margin.pos</field>
<field name="type">graph</field>
<field eval="2" name="priority"/>
<field name="arch" type="xml">
<graph type="bar" string="Sales by User Margin" orientation="horizontal">
<field name="product_name" />
<field name="total" operator="+"/>
</graph>
</field>
</record>
<record model="ir.ui.view" id="view_report_sales_by_margin_pos_graph">
<field name="name">report.sales.by.margin.pos.graph</field>
<field name="model">report.sales.by.margin.pos</field>
<field name="type">graph</field>
<field eval="2" name="priority"/>
<field name="arch" type="xml">
<graph type="bar" string="Sales by User Margin" orientation="horizontal">
<field name="product_name" />
<field name="total" operator="+"/>
</graph>
</field>
</record>
<record model="ir.actions.act_window" id="action_report_sales_by_margin_pos_today">
<field name="name">Sales by User Daily margin</field>
@ -584,16 +584,16 @@ invoiced
<field name="view_type">form</field>
<field name="view_mode">tree,calendar,form,graph</field>
<field name="domain">[('date_order','=',time.strftime('%Y-%m-%d'))]</field>
</record>
</record>
<record model="ir.ui.view" id="view_report_sales_by_margin_pos_month_form">
<record model="ir.ui.view" id="view_report_sales_by_margin_pos_month_form">
<field name="name">report.sales.by.margin.pos.month.form</field>
<field name="model">report.sales.by.margin.pos.month</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="POS ">
<field name="user_id" select="2"/>
<field name="product_name" select="2"/>
<field name="user_id" select="2"/>
<field name="product_name" select="2"/>
<field name="date_order" select="1" widget="date"/>
<field name="qty" select="2"/>
<field name="net_margin_per_qty" select="2"/>
@ -610,7 +610,7 @@ invoiced
<field name="arch" type="xml">
<tree string="POS">
<field name="user_id" select="2"/>
<field name="product_name" select="2"/>
<field name="product_name" select="2"/>
<field name="date_order" select="1" widget="date"/>
<field name="qty" select="2"/>
<field name="net_margin_per_qty" select="2"/>
@ -620,54 +620,54 @@ invoiced
</record>
<record model="ir.ui.view" id="view_report_sales_by_margin_pos_month_calendar">
<field name="name">report.sales.by.margin.pos.month.calendar</field>
<field name="model">report.sales.by.margin.pos.month</field>
<field name="type">calendar</field>
<field eval="2" name="priority"/>
<field name="arch" type="xml">
<calendar color="user_id" date_start="date_order" string="Sales by User Margin">
<field name="product_name" select="2"/>
<field name="total" />
</calendar>
</field>
</record>
<field name="name">report.sales.by.margin.pos.month.calendar</field>
<field name="model">report.sales.by.margin.pos.month</field>
<field name="type">calendar</field>
<field eval="2" name="priority"/>
<field name="arch" type="xml">
<calendar color="user_id" date_start="date_order" string="Sales by User Margin">
<field name="product_name" select="2"/>
<field name="total" />
</calendar>
</field>
</record>
<record model="ir.ui.view" id="view_report_sales_by_margin_pos_month_graph">
<field name="name">report.sales.by.margin.pos.month.graph</field>
<field name="model">report.sales.by.margin.pos.month</field>
<field name="type">graph</field>
<field eval="2" name="priority"/>
<field name="arch" type="xml">
<graph type="bar" string="Sales by User Margin" orientation="horizontal">
<field name="product_name" />
<field name="total" operator="+"/>
</graph>
</field>
</record>
<record model="ir.ui.view" id="view_report_sales_by_margin_pos_month_graph">
<field name="name">report.sales.by.margin.pos.month.graph</field>
<field name="model">report.sales.by.margin.pos.month</field>
<field name="type">graph</field>
<field eval="2" name="priority"/>
<field name="arch" type="xml">
<graph type="bar" string="Sales by User Margin" orientation="horizontal">
<field name="product_name" />
<field name="total" operator="+"/>
</graph>
</field>
</record>
<record model="ir.actions.act_window" id="action_report_sales_by_margin_pos_month">
<record model="ir.actions.act_window" id="action_report_sales_by_margin_pos_month">
<field name="name">Sales by User Monthly margin</field>
<field name="res_model">report.sales.by.margin.pos.month</field>
<field name="view_type">form</field>
<field name="view_mode">tree,calendar,form,graph</field>
<field name="domain">[('date_order','like',time.strftime('%Y-%m'))]</field>
</record>
<!-- Sales by margin ends -->
<record model="ir.ui.view" id="view_company_form_pos">
</record>
<!-- Sales by margin ends -->
<record model="ir.ui.view" id="view_company_form_pos">
<field name="name">view.company.form.pos</field>
<field name="model">res.company</field>
<field name="type">form</field>
<field name="inherit_id" ref="base.view_company_form"/>
<field name="arch" type="xml">
<notebook position="inside">
<notebook position="inside">
<page string="Other">
<field name="company_discount" colspan="4"/>
<field name="max_diff" colspan="4"/>
<field name="account_receivable" required="1" colspan="4"/>
</page>
</notebook>
</field>
</record>
</field>
</record>
<record model="ir.ui.view" id="form_mode_p_contact">
@ -736,8 +736,8 @@ invoiced
<field name="model">product.product</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Product">
<group colspan="4" col="6">
<form string="Product">
<group colspan="4" col="6">
<group colspan="4" col="2">
<separator string="Product Description" colspan="4"/>
<field name="name" select="1" />
@ -754,30 +754,30 @@ invoiced
<page string="Information">
<group colspan="2" col="2" name="Type">
<separator string="Product Type" colspan="2"/>
<field name="categ_id" select="1"/>
<field name="property_account_income" select="1" string="Account" required="1"/>
<field name="type" select="2"/>
</group>
<group colspan="2" col="2" name="Miscelleanous">
<separator string="Miscelleanous" colspan="2"/>
<field name="income_pdt"/>
<field name="expense_pdt"/>
<field name="categ_id" select="1"/>
<field name="property_account_income" select="1" string="Account" required="1"/>
<field name="type" select="2"/>
</group>
<group colspan="2" col="2" name="Miscelleanous">
<separator string="Miscelleanous" colspan="2"/>
<field name="income_pdt"/>
<field name="expense_pdt"/>
<field name="am_out"/>
<field name="disc_controle"/>
<field name="company_id" select="2" groups="base.group_extended"/>
</group>
<group colspan="2" col="2" name="Prices">
<separator string="Prices" colspan="2"/>
<field name="lst_price"/>
<field name="standard_price"/>
</group>
<field name="company_id" select="2" groups="base.group_extended"/>
</group>
<group colspan="2" col="2" name="Prices">
<separator string="Prices" colspan="2"/>
<field name="lst_price"/>
<field name="standard_price"/>
</group>
</page>
</notebook>
</form>
</field>
</record>
<menuitem name="Configuration" parent="menu_point_root"
<menuitem name="Configuration" parent="menu_point_root"
id="menu_point_config_product" sequence="6"/>
<record model="ir.actions.act_window" id="action_product_input">
@ -789,23 +789,23 @@ invoiced
<field name="domain">[('income_pdt','=',True)]</field>
</record>
<record model="ir.actions.act_window.view" id="action_product_input_tree_tag">
<field name="sequence" eval="1"/>
<field name="view_mode">tree</field>
<field name="view_id" ref="product.product_product_tree_view"/>
<field name="act_window_id" ref="action_product_input"/>
</record>
<field name="sequence" eval="1"/>
<field name="view_mode">tree</field>
<field name="view_id" ref="product.product_product_tree_view"/>
<field name="act_window_id" ref="action_product_input"/>
</record>
<record model="ir.actions.act_window.view" id="action_product_input_form_tag">
<field name="sequence" eval="2"/>
<field name="view_mode">form</field>
<field name="view_id" ref="product_input_output_form_view"/>
<field name="act_window_id" ref="action_product_input"/>
</record>
<menuitem name="Products for Input Operations"
parent="menu_point_config_product"
action="action_product_input"
id="products_for_input_operations"/>
<field name="sequence" eval="2"/>
<field name="view_mode">form</field>
<field name="view_id" ref="product_input_output_form_view"/>
<field name="act_window_id" ref="action_product_input"/>
</record>
<menuitem name="Products for Input Operations"
parent="menu_point_config_product"
action="action_product_input"
id="products_for_input_operations"/>
<record model="ir.actions.act_window" id="action_product_output">
<record model="ir.actions.act_window" id="action_product_output">
<field name="name">Products</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">product.product</field>
@ -814,21 +814,21 @@ invoiced
<field name="domain">[('expense_pdt','=',True)]</field>
</record>
<record model="ir.actions.act_window.view" id="action_product_output_tree_tag">
<field name="sequence" eval="1"/>
<field name="view_mode">tree</field>
<field name="view_id" ref="product.product_product_tree_view"/>
<field name="act_window_id" ref="action_product_output"/>
</record>
<field name="sequence" eval="1"/>
<field name="view_mode">tree</field>
<field name="view_id" ref="product.product_product_tree_view"/>
<field name="act_window_id" ref="action_product_output"/>
</record>
<record model="ir.actions.act_window.view" id="action_product_output_form_tag">
<field name="sequence" eval="2"/>
<field name="view_mode">form</field>
<field name="view_id" ref="product_input_output_form_view"/>
<field name="act_window_id" ref="action_product_output"/>
</record>
<menuitem name="Products for Output Operations"
parent="menu_point_config_product"
action="action_product_output"
id="products_for_output_operations"/>
<field name="sequence" eval="2"/>
<field name="view_mode">form</field>
<field name="view_id" ref="product_input_output_form_view"/>
<field name="act_window_id" ref="action_product_output"/>
</record>
<menuitem name="Products for Output Operations"
parent="menu_point_config_product"
action="action_product_output"
id="products_for_output_operations"/>
<!-- <wizard
string="Refloat Box entries"
@ -915,95 +915,94 @@ invoiced
<!-- <menuitem name="Toutes les lignes de ventes" parent="menu_point_root" id="menu_pos_all_sales_lines" action="action_pos_all_sales_lines" sequence="5" />-->
<!-- Miscelleanous Operations/Reporting -->
<menuitem name="Reporting" parent="menu_point_root" id="menu_point_rep" sequence="5"/>
<menuitem name="Registers" parent="menu_point_rep" id="menu_point_report_register" sequence="0" />
<menuitem name="Sales" parent="menu_point_rep" id="menu_point_report_sale" sequence="1" />
<menuitem name="Reporting" parent="menu_point_root" id="menu_point_rep" sequence="5"/>
<menuitem name="Registers" parent="menu_point_rep" id="menu_point_report_register" sequence="0" />
<menuitem name="Sales" parent="menu_point_rep" id="menu_point_report_sale" sequence="1" />
<menuitem name="Details Of Operations" parent="menu_point_report_sale" id="menu_details_of_oper" sequence="1" groups="base.group_extended"/>
<menuitem name="All Sales" parent="menu_details_of_oper"
id="menu_action_all_sales_tree3" action="action_pos_order_tree3" sequence="1" groups="base.group_extended"/>
<menuitem name="Sales of the day" parent="menu_action_all_sales_tree3"
id="menu_action_sale_of_day_tree2" action="action_trans_pos_tree_today"/>
<menuitem name="Accepted Sales" parent="menu_action_all_sales_tree3"
id="menu_action_sale_of_day_accept" action="action_pos_order_accepted"/>
<!-- <menuitem name="Open Sales" parent="menu_action_all_sales_tree3"
id="menu_action_open_sales_treeop" action="action_pos_order_tree_open"/-->
<menuitem name="Details Of Operations" parent="menu_point_report_sale" id="menu_details_of_oper" sequence="1" groups="base.group_extended"/>
<menuitem name="All Sales" parent="menu_details_of_oper"
id="menu_action_all_sales_tree3" action="action_pos_order_tree3" sequence="1" groups="base.group_extended"/>
<menuitem name="Sales of the day" parent="menu_action_all_sales_tree3"
id="menu_action_sale_of_day_tree2" action="action_trans_pos_tree_today"/>
<menuitem name="Accepted Sales" parent="menu_action_all_sales_tree3"
id="menu_action_sale_of_day_accept" action="action_pos_order_accepted"/>
<!-- <menuitem name="Open Sales" parent="menu_action_all_sales_tree3"
id="menu_action_open_sales_treeop" action="action_pos_order_tree_open"/-->
<menuitem name="Sales Reports" parent="menu_point_report_sale" id="menu_sales_report" sequence="2"/>
<menuitem name="Sales Reports" parent="menu_point_report_sale" id="menu_sales_report" sequence="2"/>
<menuitem name="Sales of the day" parent="menu_sales_report"
action="action_trans_pos_tree_today" id="menu_trans_pos_tree_today"/>
action="action_trans_pos_tree_today" id="menu_trans_pos_tree_today"/>
<menuitem name="Sales of the month" parent="menu_sales_report"
action="action_trans_pos_tree_month" id="menu_trans_pos_tree_month"/>
<menuitem name="Sales of the month" parent="menu_sales_report"
action="action_trans_pos_tree_month" id="menu_trans_pos_tree_month"/>
<menuitem name="All the sales" parent="menu_sales_report"
action="action_trans_pos_tree" id="menu_trans_pos_tree"/>
<menuitem name="All the sales" parent="menu_sales_report"
action="action_trans_pos_tree" id="menu_trans_pos_tree"/>
<menuitem name="Sales by User" parent="menu_sales_report"
action="action_report_sales_by_user_pos_today" id="menu_report_sales_by_user_pos_tree"/>
<menuitem name="Sales by User" parent="menu_sales_report"
action="action_report_sales_by_user_pos_today" id="menu_report_sales_by_user_pos_tree"/>
<menuitem name="Sales by User Monthly" parent="menu_sales_report"
action="action_report_sales_by_user_pos_month" id="menu_report_sales_by_user_pos_month_tree"/>
<menuitem name="Sales by User Monthly" parent="menu_sales_report"
action="action_report_sales_by_user_pos_month" id="menu_report_sales_by_user_pos_month_tree"/>
<menuitem name="Sales by User Daily Margin" parent="menu_sales_report"
action="action_report_sales_by_margin_pos_today" id="menu_report_sales_by_user_margin_daily_pos_tree"/>
<menuitem name="Sales by User Daily Margin" parent="menu_sales_report"
action="action_report_sales_by_margin_pos_today" id="menu_report_sales_by_user_margin_daily_pos_tree"/>
<menuitem name="Sales by User Monthly Margin" parent="menu_sales_report"
action="action_report_sales_by_margin_pos_month" id="menu_report_sales_by_user_pos_month_margin_tree"/>
<!-- Invoice -->
<menuitem name="Sales by User Monthly Margin" parent="menu_sales_report"
action="action_report_sales_by_margin_pos_month" id="menu_report_sales_by_user_pos_month_margin_tree"/>
<!-- Invoice -->
<record model="ir.actions.act_window" id="action_pos_invoice">
<record model="ir.actions.act_window" id="action_pos_invoice">
<field name="name">Invoices</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">account.invoice</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="domain">[('origin','like','POS')]</field>
<field name="domain">[('origin','like','POS')]</field>
</record>
<menuitem name="All Invoices" parent="menu_details_of_oper"
action="action_pos_invoice" id="menu_pos_invoice_tree"/>
<menuitem name="All Invoices" parent="menu_details_of_oper"
action="action_pos_invoice" id="menu_pos_invoice_tree"/>
<menuitem name="Payments and Sales" parent="menu_point_report_sale"
id="menu_cashboxes_closing_tree" sequence="1"/>
<menuitem name="Today" parent="menu_cashboxes_closing_tree"
id="menu_cashboxes_by_day" sequence="1"/>
<menuitem name="Payments and Sales" parent="menu_point_report_sale"
id="menu_cashboxes_closing_tree" sequence="1"/>
<menuitem name="Today" parent="menu_cashboxes_closing_tree"
id="menu_cashboxes_by_day" sequence="1"/>
<menuitem name="All Sales Lines" parent="menu_details_of_oper"
id="menu_action_pos_order_line" action="action_pos_order_line" sequence="2"/>
<menuitem name="All Sales Lines" parent="menu_details_of_oper"
id="menu_action_pos_order_line" action="action_pos_order_line" sequence="2"/>
<menuitem name="Sales Lines of the day" parent="menu_action_pos_order_line"
id="menu_action_pos_order_line_day" action="action_pos_order_line_day"/>
<menuitem name="Sales Lines of the day" parent="menu_action_pos_order_line"
id="menu_action_pos_order_line_day" action="action_pos_order_line_day"/>
<!-- <menuitem name="Open Sales Line" parent="menu_action_pos_order_line"
id="menu_action_open_sales_line" action="action_pos_order_line_form"/-->
<!-- <menuitem name="Open Sales Line" parent="menu_action_pos_order_line"
id="menu_action_open_sales_line" action="action_pos_order_line_form"/-->
<!-- <menuitem icon="STOCK_PRINT" action="wizard_pos_payment_report"
id="menu_pos_payment_report" parent="menu_cashboxes_by_day" type="wizard" sequence="4"/-->
<!-- <menuitem icon="STOCK_PRINT" action="wizard_pos_payment_report"
id="menu_pos_payment_report" parent="menu_cashboxes_by_day" type="wizard" sequence="4"/-->
<menuitem icon="STOCK_PRINT" action="action_report_pos_sale_user"
id="menu_pos_sales_user" parent="menu_trans_pos_tree" sequence="3" groups="base.group_extended" />
<menuitem icon="STOCK_PRINT" action="action_report_pos_sale_user"
id="menu_pos_sales_user" parent="menu_trans_pos_tree" sequence="3" groups="base.group_extended" />
<menuitem icon="STOCK_PRINT" action="action_report_pos_payment_repport_date"
id="menu_pos_payment_report_date" parent="menu_trans_pos_tree" sequence="5" groups="base.group_extended"/>
<menuitem icon="STOCK_PRINT" action="action_report_pos_payment_repport_date"
id="menu_pos_payment_report_date" parent="menu_trans_pos_tree" sequence="5" groups="base.group_extended"/>
<menuitem icon="STOCK_PRINT" action="action_report_pos_payment_report_user"
id="menu_pos_payment_report_user" parent="menu_trans_pos_tree_today" sequence="6" groups="base.group_extended"/>
<menuitem icon="STOCK_PRINT" action="action_pos_sales_user_today"
id="menu_pos_sales_user_today" parent="menu_trans_pos_tree_today" sequence="2" groups="base.group_extended"/>
<menuitem icon="STOCK_PRINT" action="action_report_pos_payment_report_user"
id="menu_pos_payment_report_user" parent="menu_trans_pos_tree_today" sequence="6" groups="base.group_extended"/>
<menuitem icon="STOCK_PRINT" action="action_pos_sales_user_today"
id="menu_pos_sales_user_today" parent="menu_trans_pos_tree_today" sequence="2" groups="base.group_extended"/>
<menuitem icon="STOCK_PRINT" action="action_report_pos_payment_repport_date"
id="menu_pos_payment_report_date" parent="menu_trans_pos_tree" sequence="5" groups="base.group_extended"/>
<menuitem icon="STOCK_PRINT" action="action_report_pos_payment_repport_date"
id="menu_pos_payment_report_date" parent="menu_trans_pos_tree" sequence="5" groups="base.group_extended"/>
<menuitem icon="STOCK_PRINT" action="action_report_pos_payment_report_user"
id="menu_pos_payment_report_user" parent="menu_trans_pos_tree_today" sequence="6" groups="base.group_extended"/>
<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_payment_report_user"
id="menu_pos_payment_report_user" parent="menu_trans_pos_tree_today" sequence="6" groups="base.group_extended"/>
<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" />
<menuitem icon="STOCK_PRINT" action="action_report_pos_details"
id="menu_pos_details" parent="menu_cashboxes_by_day" />
</data>

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>

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>

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>

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

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

View File

@ -1,187 +1,187 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data>
<data>
<!-- Planning -->
<record id="account_analytic_planning_view_tree" model="ir.ui.view">
<field name="name">report.account.analytic.planning.tree</field>
<field name="model">report_account_analytic.planning</field>
<field name="type">tree</field>
<field name="arch" type="xml">
<tree string="Planning">
<field name="name" />
<field name="user_id" />
<field name="date_from" />
<field name="date_to" />
<field name="business_days" />
<field name="total_planned" />
<field name="total_free" />
<field name="state" />
</tree>
</field>
</record>
<record id="account_analytic_planning_view_tree" model="ir.ui.view">
<field name="name">report.account.analytic.planning.tree</field>
<field name="model">report_account_analytic.planning</field>
<field name="type">tree</field>
<field name="arch" type="xml">
<tree string="Planning">
<field name="name" />
<field name="user_id" />
<field name="date_from" />
<field name="date_to" />
<field name="business_days" />
<field name="total_planned" />
<field name="total_free" />
<field name="state" />
</tree>
</field>
</record>
<record id="account_analytic_planning_view_form" model="ir.ui.view">
<field name="name">report.account.analytic.planning.form</field>
<field name="model">report_account_analytic.planning</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Planning by Account">
<group col="6" colspan="4">
<field name="name" select="1" />
<field name="code" select="1" />
<field name="user_id" select="1" />
<field name="business_days" />
<field name="date_from" />
<field name="date_to" />
</group>
<notebook colspan="4">
<page string="Planning by User">
<field colspan="4" name="planning_user_ids"
nolabel="1" widget="one2many_list" readonly="1">
<tree string="Planning By User (in Days)">
<field name="user_id"/>
<field name="tasks" sum="Total Remaining Tasks"/>
<field name="plan_tasks" sum="Total Time Allocation of Tasks"/>
<field name="plan_open" sum="Total Time Allocation without Tasks"/>
<field name="holiday" />
<field name="free" sum="Total Unallocated Time"/>
<field name="timesheet"/>
</tree>
</field>
</page>
<page string="Planning by Account">
<field colspan="4" name="planning_account"
nolabel="1" widget="one2many_list" readonly="1">
<tree string="Planning By Account (in Days)">
<field name="account_id" />
<field name="tasks" sum="Total Remaining Tasks"/>
<field name="plan_tasks" sum="Total Time Allocation of Tasks"/>
<field name="plan_open" sum="Total Time Allocation without Tasks"/>
<field name="timesheet" />
</tree>
</field>
</page>
<page string="Time Encoding">
<field colspan="4" name="line_ids"
nolabel="1">
<tree editable="bottom"
string="Planning Lines">
<field name="user_id"/>
<field name="account_id" />
<field name="amount" />
<field name="amount_unit" />
<field name="task_ids" />
<field name="note" />
<field name="amount_in_base_uom" invisible="1" sum="Total Planned (in Days)"/>
<record id="account_analytic_planning_view_form" model="ir.ui.view">
<field name="name">report.account.analytic.planning.form</field>
<field name="model">report_account_analytic.planning</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Planning by Account">
<group col="6" colspan="4">
<field name="name" select="1" />
<field name="code" select="1" />
<field name="user_id" select="1" />
<field name="business_days" />
<field name="date_from" />
<field name="date_to" />
</group>
<notebook colspan="4">
<page string="Planning by User">
<field colspan="4" name="planning_user_ids"
nolabel="1" widget="one2many_list" readonly="1">
<tree string="Planning By User (in Days)">
<field name="user_id"/>
<field name="tasks" sum="Total Remaining Tasks"/>
<field name="plan_tasks" sum="Total Time Allocation of Tasks"/>
<field name="plan_open" sum="Total Time Allocation without Tasks"/>
<field name="holiday" />
<field name="free" sum="Total Unallocated Time"/>
<field name="timesheet"/>
</tree>
</field>
</page>
<page string="Planning by Account">
<field colspan="4" name="planning_account"
nolabel="1" widget="one2many_list" readonly="1">
<tree string="Planning By Account (in Days)">
<field name="account_id" />
<field name="tasks" sum="Total Remaining Tasks"/>
<field name="plan_tasks" sum="Total Time Allocation of Tasks"/>
<field name="plan_open" sum="Total Time Allocation without Tasks"/>
<field name="timesheet" />
</tree>
</field>
</page>
<page string="Time Encoding">
<field colspan="4" name="line_ids"
nolabel="1">
<tree editable="bottom"
string="Planning Lines">
<field name="user_id"/>
<field name="account_id" />
<field name="amount" />
<field name="amount_unit" />
<field name="task_ids" />
<field name="note" />
<field name="amount_in_base_uom" invisible="1" sum="Total Planned (in Days)"/>
</tree>
<form string="Planning Lines">
<field name="user_id" domain="[('id','child_of',[parent.user_id])]"/>
<field name="account_id" />
<field name="amount" />
<field name="amount_unit" />
<!-- WIDGET MANY2MANY GIVES ERROR-->
<!-- <field name="task_ids" colspan="4" nolabel="1" widget="many2many"/>-->
<field name="task_ids" colspan="4" nolabel="1" mode="tree,form">
<form string="Tasks">
<group colspan="4" col="2">
<field name="name" select="1"/>
<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="user_id" select="1" domain="[('id','=',parent.user_id)]"/>
</group>
<notebook colspan="4">
<page string="Information">
<group col="3" colspan="4">
<field name="effective_hours" widget="float_time" invisible="True" />
<field name="planned_hours"
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')]}"/>
<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"/>
<group col="11" colspan="4">
<field name="state" select="1"/>
<button name="do_draft" states="open" string="Draft" type="object" icon="gtk-indent"/>
<button name="do_open" states="pending,draft" string="Start Task" type="object" icon="gtk-execute"/>
<button name="do_reopen" states="done,cancelled" string="Reactivate" type="object" icon="gtk-convert"/>
<button name="do_pending" states="open" string="Pending" type="object" icon="gtk-media-pause"/>
<button groups="base.group_extended" name="%(project.wizard_delegate_task)d" states="pending,open" string="Delegate" type="action" icon="gtk-sort-descending"/>
<button name="%(project.wizard_close_task)d" states="pending,open" string="Done" type="action" icon="gtk-jump-to"/>
<button name="do_cancel" states="draft,open,pending" string="Cancel" type="object" icon="gtk-cancel"/>
</tree>
<form string="Planning Lines">
<field name="user_id" domain="[('id','child_of',[parent.user_id])]"/>
<field name="account_id" />
<field name="amount" />
<field name="amount_unit" />
<!-- WIDGET MANY2MANY GIVES ERROR-->
<!-- <field name="task_ids" colspan="4" nolabel="1" widget="many2many"/>-->
<field name="task_ids" colspan="4" nolabel="1" mode="tree,form">
<form string="Tasks">
<group colspan="4" col="2">
<field name="name" select="1"/>
<field name="project_id" required="1" select="1" domain="[('category_id','=',parent.account_id)]"/>
</group>
<group colspan="4" col="4">
<field name="date_deadline"/>
<field name="user_id" select="1" domain="[('id','=',parent.user_id)]"/>
</group>
<notebook colspan="4">
<page string="Information">
<group col="3" colspan="4">
<field name="effective_hours" widget="float_time" invisible="True" />
<field name="planned_hours"
widget="float_time"
attrs="{'readonly':[('state','!=','draft')]}"
on_change="onchange_planned(planned_hours,effective_hours)"/>
<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" 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"/>
<button name="do_open" states="pending,draft" string="Start Task" type="object" icon="gtk-execute"/>
<button name="do_reopen" states="done,cancelled" string="Reactivate" type="object" icon="gtk-convert"/>
<button name="do_pending" states="open" string="Pending" type="object" icon="gtk-media-pause"/>
<button groups="base.group_extended" name="%(project.wizard_delegate_task)d" states="pending,open" string="Delegate" type="action" icon="gtk-sort-descending"/>
<button name="%(project.wizard_close_task)d" states="pending,open" string="Done" type="action" icon="gtk-jump-to"/>
<button name="do_cancel" states="draft,open,pending" string="Cancel" type="object" icon="gtk-cancel"/>
</group>
</page>
<page groups="base.group_extended" string="Extra Info" attrs="{'readonly':[('state','=','done')]}">
<group colspan="2" col="2">
<field name="priority"/>
<field name="sequence"/>
</group>
<separator string="Miscelleanous" colspan="4"/>
<field name="type"/>
<field name="active" select="2"/>
<field name="partner_id" select="2"/>
<separator colspan="4" string="Notes"/>
<field colspan="4" name="notes" nolabel="1"/>
</page>
</notebook>
</form>
</field>
<separator string="Notes" colspan="4" />
<field name="note" colspan="4"
nolabel="1" />
</form>
</field>
</page>
</notebook>
<group col="6" colspan="4">
<field name="state" select="1"
readonly="1" />
<button name="action_open" states="draft"
string="Open" type="object" icon="gtk-yes" />
<button name="action_done" states="open"
string="Done" type="object" icon="gtk-jump-to" />
<button name="action_cancel" states="draft,open"
string="Cancel" type="object" icon="gtk-cancel" />
<button name="action_draft" states="done,cancel"
string="Reset to Draft" type="object" icon="gtk-convert" />
</group>
</form>
</field>
</record>
</group>
</page>
<page groups="base.group_extended" string="Extra Info" attrs="{'readonly':[('state','=','done')]}">
<group colspan="2" col="2">
<field name="priority"/>
<field name="sequence"/>
</group>
<separator string="Miscelleanous" colspan="4"/>
<field name="type"/>
<field name="active"/>
<field name="partner_id"/>
<separator colspan="4" string="Notes"/>
<field colspan="4" name="notes" nolabel="1"/>
</page>
</notebook>
</form>
</field>
<separator string="Notes" colspan="4" />
<field name="note" colspan="4"
nolabel="1" />
</form>
</field>
</page>
</notebook>
<group col="6" colspan="4">
<field name="state" select="1"
readonly="1" />
<button name="action_open" states="draft"
string="Open" type="object" icon="gtk-yes" />
<button name="action_done" states="open"
string="Done" type="object" icon="gtk-jump-to" />
<button name="action_cancel" states="draft,open"
string="Cancel" type="object" icon="gtk-cancel" />
<button name="action_draft" states="done,cancel"
string="Reset to Draft" type="object" icon="gtk-convert" />
</group>
</form>
</field>
</record>
<record id="account_analytic_planning_view_search" model="ir.ui.view">
<field name="name">report.account.analytic.planning.search</field>
<field name="model">report_account_analytic.planning</field>
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Planning by Account">
<group col="8" colspan="4">
<filter icon="gtk-execute" string="My" domain="[('user_id','=',uid)]" help="My Plannings"/>
<filter icon="terp-project" string="Current Plannings" domain="[('date_from','&lt;=',time.strftime('%%Y-%%m-%%d')),('date_to','&gt;=',time.strftime('%%Y-%%m-%%d'))]" help="Current Plannings"/>
<separator orientation="vertical"/>
<field name="name" select="1"/>
<field name="code" select="1"/>
<field name="user_id" select="1"/>
<field name="state" select="1"/>
</group>
</search>
</field>
</record>
<record id="account_analytic_planning_view_search" model="ir.ui.view">
<field name="name">report.account.analytic.planning.search</field>
<field name="model">report_account_analytic.planning</field>
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Planning by Account">
<group col="8" colspan="4">
<filter icon="gtk-execute" string="My" domain="[('user_id','=',uid)]" help="My Plannings"/>
<filter icon="terp-project" string="Current Plannings" domain="[('date_from','&lt;=',time.strftime('%%Y-%%m-%%d')),('date_to','&gt;=',time.strftime('%%Y-%%m-%%d'))]" help="Current Plannings"/>
<separator orientation="vertical"/>
<field name="name" select="1"/>
<field name="code" select="1"/>
<field name="user_id" select="1"/>
<field name="state" select="1"/>
</group>
</search>
</field>
</record>
<!-- Planning Line -->
<record id="account_analytic_planning_line_view_tree" model="ir.ui.view">
<field name="name">report.account.analytic.planning.line.tree</field>
<field name="model">report_account_analytic.planning.line</field>
<field name="type">tree</field>
<field name="arch" type="xml">
<tree string="Planning Line">
<record id="account_analytic_planning_line_view_tree" model="ir.ui.view">
<field name="name">report.account.analytic.planning.line.tree</field>
<field name="model">report_account_analytic.planning.line</field>
<field name="type">tree</field>
<field name="arch" type="xml">
<tree string="Planning Line">
<field name="planning_id"/>
<field name="user_id"/>
<field name="account_id" />
@ -189,16 +189,16 @@
<field name="amount_unit" />
<field name="note" select="1"/>
<field name="amount_in_base_uom" invisible="1" sum="Total Planned (in Days)"/>
</tree>
</field>
</record>
</tree>
</field>
</record>
<record id="account_analytic_planning_line_view_form" model="ir.ui.view">
<field name="name">report.account.analytic.planning.line.form</field>
<field name="model">report_account_analytic.planning.line</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Planning Line">
<record id="account_analytic_planning_line_view_form" model="ir.ui.view">
<field name="name">report.account.analytic.planning.line.form</field>
<field name="model">report_account_analytic.planning.line</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Planning Line">
<field name="planning_id" select="1"/>
<field name="user_id" select="1"/>
<field name="account_id" select="1"/>
@ -206,104 +206,104 @@
<field name="amount_unit" />
<separator string="Notes" colspan="4" />
<field name="note" colspan="4" nolabel="1" />
</form>
</field>
</record>
</form>
</field>
</record>
<record id="action_account_analytic_planning_form" model="ir.actions.act_window">
<field name="name">Plannings</field>
<field name="res_model">report_account_analytic.planning</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="search_view_id" ref="account_analytic_planning_view_search"/>
</record>
<menuitem id="base.menu_pm_planning" name="Planning" parent="base.menu_main_pm" sequence="5"/>
<menuitem id="planning_main" name="Long Term Planning"
parent="base.menu_pm_planning" />
<record id="action_account_analytic_planning_form" model="ir.actions.act_window">
<field name="name">Plannings</field>
<field name="res_model">report_account_analytic.planning</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="search_view_id" ref="account_analytic_planning_view_search"/>
</record>
<menuitem id="base.menu_pm_planning" name="Planning" parent="base.menu_main_pm" sequence="5"/>
<menuitem id="planning_main" name="Long Term Planning"
parent="base.menu_pm_planning" />
<menuitem action="action_account_analytic_planning_form"
id="menu_report_account_analytic_planning" parent="planning_main" />
<menuitem action="action_account_analytic_planning_form"
id="menu_report_account_analytic_planning" parent="planning_main" />
<!--
Planning statistics
-->
<record id="account_analytic_planning_stat_view_form" model="ir.ui.view">
<field name="name">report.account.analytic.planning.stat.form</field>
<field name="model">report_account_analytic.planning.stat</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Planning statistics">
<field name="planning_id" select="1" />
<field name="user_id" select="1" />
<field name="account_id" select="1" />
</form>
</field>
</record>
<!--
Planning statistics
-->
<record id="account_analytic_planning_stat_view_form" model="ir.ui.view">
<field name="name">report.account.analytic.planning.stat.form</field>
<field name="model">report_account_analytic.planning.stat</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Planning statistics">
<field name="planning_id" select="1" />
<field name="user_id" select="1" />
<field name="account_id" select="1" />
</form>
</field>
</record>
<record id="account_analytic_planning_stat_view_tree" model="ir.ui.view">
<field name="name">report.account.analytic.planning.stat.tree</field>
<field name="model">report_account_analytic.planning.stat</field>
<field name="type">tree</field>
<field name="arch" type="xml">
<tree string="Planning statistics">
<field name="planning_id" />
<field name="user_id" />
<field name="manager_id" />
<field name="account_id" />
<field name="sum_amount" />
<field name="sum_amount_real" />
<field name="sum_amount_tasks" />
</tree>
</field>
</record>
<record id="account_analytic_planning_stat_view_tree" model="ir.ui.view">
<field name="name">report.account.analytic.planning.stat.tree</field>
<field name="model">report_account_analytic.planning.stat</field>
<field name="type">tree</field>
<field name="arch" type="xml">
<tree string="Planning statistics">
<field name="planning_id" />
<field name="user_id" />
<field name="manager_id" />
<field name="account_id" />
<field name="sum_amount" />
<field name="sum_amount_real" />
<field name="sum_amount_tasks" />
</tree>
</field>
</record>
<record id="account_analytic_planning_stat_view_graph" model="ir.ui.view">
<field name="name">report.account.analytic.planning.stat.graph</field>
<field name="model">report_account_analytic.planning.stat</field>
<field name="type">graph</field>
<field name="arch" type="xml">
<graph string="Planning statistics" type="bar">
<field name="account_id" />
<field name="sum_amount" operator="+" />
<field name="sum_amount_real" operator="+" />
<field name="sum_amount_tasks" operator="+" />
</graph>
</field>
</record>
<record id="account_analytic_planning_stat_view_graph" model="ir.ui.view">
<field name="name">report.account.analytic.planning.stat.graph</field>
<field name="model">report_account_analytic.planning.stat</field>
<field name="type">graph</field>
<field name="arch" type="xml">
<graph string="Planning statistics" type="bar">
<field name="account_id" />
<field name="sum_amount" operator="+" />
<field name="sum_amount_real" operator="+" />
<field name="sum_amount_tasks" operator="+" />
</graph>
</field>
</record>
<record id="account_analytic_planning_stat_view_search" model="ir.ui.view">
<field name="name">report_account_analytic.planning.stat.search</field>
<field name="model">report_account_analytic.planning.stat</field>
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Planning statistics">
<group col="10" colspan="4">
<filter icon="gtk-execute" string="My" domain="[('user_id','=',uid),('planning_id.state','&lt;&gt;','cancel')]" help="My Plannings Statistics"/>
<filter icon="gtk-execute" string="My Project" domain="[('manager_id','=',uid),('planning_id.state','&lt;&gt;','cancel')]" help="Planning Statistics of My Projects"/>
<separator orientation="vertical"/>
<field name="planning_id" select="1"/>
<field name="user_id" select="1"/>
<field name="account_id" select="1"/>
</group>
</search>
</field>
</record>
<record id="account_analytic_planning_stat_view_search" model="ir.ui.view">
<field name="name">report_account_analytic.planning.stat.search</field>
<field name="model">report_account_analytic.planning.stat</field>
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Planning statistics">
<group col="10" colspan="4">
<filter icon="gtk-execute" string="My" domain="[('user_id','=',uid),('planning_id.state','&lt;&gt;','cancel')]" help="My Plannings Statistics"/>
<filter icon="gtk-execute" string="My Project" domain="[('manager_id','=',uid),('planning_id.state','&lt;&gt;','cancel')]" help="Planning Statistics of My Projects"/>
<separator orientation="vertical"/>
<field name="planning_id" select="1"/>
<field name="user_id" select="1"/>
<field name="account_id" select="1"/>
</group>
</search>
</field>
</record>
<record id="action_account_analytic_planning_stat_form" model="ir.actions.act_window">
<field name="name">Planning Statistics</field>
<field name="res_model">report_account_analytic.planning.stat</field>
<field name="view_type">form</field>
<field name="view_mode">graph,tree</field>
<field name="search_view_id" ref="account_analytic_planning_stat_view_search"/>
</record>
<menuitem id="next_id_85" name="Planning"
parent="hr.menu_hr_reporting" />
<menuitem action="action_account_analytic_planning_stat_form"
id="menu_report_account_analytic_planning_stat" parent="next_id_85" />
<record id="action_account_analytic_planning_stat_form" model="ir.actions.act_window">
<field name="name">Planning Statistics</field>
<field name="res_model">report_account_analytic.planning.stat</field>
<field name="view_type">form</field>
<field name="view_mode">graph,tree</field>
<field name="search_view_id" ref="account_analytic_planning_stat_view_search"/>
</record>
<menuitem id="next_id_85" name="Planning"
parent="hr.menu_hr_reporting" />
<menuitem action="action_account_analytic_planning_stat_form"
id="menu_report_account_analytic_planning_stat" parent="next_id_85" />
<!-- Analytic account Form -->
<!-- Analytic account Form -->
<record id="view_project_planning_form" model="ir.ui.view">
<field name="name">planning.account.analytic.account.form</field>
@ -312,35 +312,35 @@
<field name="inherit_id" ref="account.view_account_analytic_account_form"/>
<field name="arch" type="xml">
<notebook position="inside">
<page string="Planning" >
<separator string="Planning lines"/>
<field name="planning_ids" colspan="4" nolabel="1">
<form string="Planning Lines">
<field name="planning_id" select="1"/>
<field name="user_id"/>
<field name="amount" />
<field name="amount_unit" />
<separator string="Notes" colspan="4" />
<field name="note" colspan="4" nolabel="1" />
</form>
<tree editable="bottom"
string="Planning Lines">
<field name="user_id"/>
<field name="account_id" />
<field name="amount" />
<field name="amount_unit" />
<field name="task_ids" />
<field name="note" />
<field name="amount_in_base_uom" invisible="1" sum="Total Planned (in Days)"/>
</tree>
</field>
</page>
<page string="Planning" >
<separator string="Planning lines"/>
<field name="planning_ids" colspan="4" nolabel="1">
<form string="Planning Lines">
<field name="planning_id" select="1"/>
<field name="user_id"/>
<field name="amount" />
<field name="amount_unit" />
<separator string="Notes" colspan="4" />
<field name="note" colspan="4" nolabel="1" />
</form>
<tree editable="bottom"
string="Planning Lines">
<field name="user_id"/>
<field name="account_id" />
<field name="amount" />
<field name="amount_unit" />
<field name="task_ids" />
<field name="note" />
<field name="amount_in_base_uom" invisible="1" sum="Total Planned (in Days)"/>
</tree>
</field>
</page>
</notebook>
</field>
</record>
<!-- Task Form -->
<!-- Task Form -->
<record id="view_task_planning_form" model="ir.ui.view">
<field name="name">planning.task.form</field>
@ -349,18 +349,18 @@
<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>
<!--Added link to open the list of all tasks planned on all lines of this planning.-->
<act_window context="{'planning': active_id}"
id="act_task_of_lines" name="Tasks" res_model="project.task"
src_model="report_account_analytic.planning"
/>
<act_window context="{'planning': active_id}"
id="act_task_of_lines" name="Tasks" res_model="project.task"
src_model="report_account_analytic.planning"
/>
<!-- company form -->
<!-- company form -->
<record id="planning_company" model="ir.ui.view">
<field name="name">res.company.planning.config</field>
<field name="model">res.company</field>
@ -374,5 +374,5 @@
</field>
</record>
</data>
</data>
</openerp>

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>

View File

@ -2,17 +2,17 @@
<openerp>
<data>
<record model="ir.ui.view" id="purchase_order_line_form_inherit">
<field name="name">purchase.order.line.form.inherit</field>
<field name="model">purchase.order.line</field>
<field name="type">form</field>
<field name="inherit_id" ref="purchase.purchase_order_line_form"/>
<field name="arch" type="xml">
<field name="account_analytic_id" position="replace">
<field name="analytics_id" domain="[('plan_id','&lt;&gt;',False)]"/>
</field>
</field>
</record>
<record model="ir.ui.view" id="purchase_order_line_form_inherit">
<field name="name">purchase.order.line.form.inherit</field>
<field name="model">purchase.order.line</field>
<field name="type">form</field>
<field name="inherit_id" ref="purchase.purchase_order_line_form"/>
<field name="arch" type="xml">
<field name="account_analytic_id" position="replace">
<field name="analytics_id" domain="[('plan_id','&lt;&gt;',False)]"/>
</field>
</field>
</record>
</data>
</openerp>

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>

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

View File

@ -77,7 +77,7 @@
<field name="arch" type="xml">
<tree string="Intrastat Data">
<field name="name" />
<field name="month"/>
<field name="month"/>
<field name="code"/>
<field name="ref"/>
<field name="intrastat_id"/>
@ -96,16 +96,16 @@
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Intrastat Data">
<group col="10" colspan="4">
<filter string="This Year" icon="terp-stock" domain="[('name','=',time.localtime()[0])]"/>
<filter string="This Month" icon="terp-stock" domain="[('month','=',time.localtime()[1])]"/>
<separator orientation="vertical"/>
<field name="name" select="1"/>
<field name="month" select="1"/>
<field name="code" select="1"/>
<field name="intrastat_id" select="1"/>
<field name="type" select="1"/>
</group>
<group col="10" colspan="4">
<filter string="This Year" icon="terp-stock" domain="[('name','=',time.localtime()[0])]"/>
<filter string="This Month" icon="terp-stock" domain="[('month','=',time.localtime()[1])]"/>
<separator orientation="vertical"/>
<field name="name" select="1"/>
<field name="month" select="1"/>
<field name="code" select="1"/>
<field name="intrastat_id" select="1"/>
<field name="type" select="1"/>
</group>
</search>
</field>
</record>
@ -119,6 +119,6 @@
<field name="search_view_id" ref="view_report_intrastat_search"/>
</record>
<menuitem action="action_report_intrastat_tree_all" id="menu_report_intrastat_all" parent="stock.next_id_61"/>
<menuitem action="action_report_intrastat_tree_all" id="menu_report_intrastat_all" parent="stock.next_id_61"/>
</data>
</openerp>

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

View File

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

View File

@ -2,39 +2,39 @@
<openerp>
<data>
<record model="ir.ui.view" id="view_order_form_inherit">
<field name="name">sale.order.form.inherit</field>
<field name="model">sale.order</field>
<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>
</record>
<record model="ir.ui.view" id="view_order_form_inherit">
<field name="name">sale.order.form.inherit</field>
<field name="model">sale.order</field>
<field name="type">form</field>
<field name="inherit_id" ref="sale.view_order_form"/>
<field name="arch" type="xml">
<field name="project_id" position="replace"/>
</field>
</record>
<record model="ir.ui.view" id="view_order_form_inherit2">
<field name="name">sale.order.form.inherit2</field>
<field name="model">sale.order</field>
<field name="type">form</field>
<field name="inherit_id" ref="sale.view_order_form"/>
<field name="arch" type="xml">
<field name="product_id" position="after">
<field name="analytics_id" domain="[('plan_id','&lt;&gt;',False)]"/>
</field>
</field>
</record>
<record model="ir.ui.view" id="view_order_form_inherit2">
<field name="name">sale.order.form.inherit2</field>
<field name="model">sale.order</field>
<field name="type">form</field>
<field name="inherit_id" ref="sale.view_order_form"/>
<field name="arch" type="xml">
<field name="product_id" position="after">
<field name="analytics_id" domain="[('plan_id','&lt;&gt;',False)]"/>
</field>
</field>
</record>
<record model="ir.ui.view" id="view_order_line_form2_inherit">
<field name="name">sale.order.line.form2.inherit</field>
<field name="model">sale.order.line</field>
<field name="type">form</field>
<field name="inherit_id" ref="sale.view_order_line_form2"/>
<field name="arch" type="xml">
<field name="product_id" readonly="1" select="1" position="after">
<field name="analytics_id" domain="[('plan_id','&lt;&gt;',False)]"/>
</field>
</field>
</record>
<record model="ir.ui.view" id="view_order_line_form2_inherit">
<field name="name">sale.order.line.form2.inherit</field>
<field name="model">sale.order.line</field>
<field name="type">form</field>
<field name="inherit_id" ref="sale.view_order_line_form2"/>
<field name="arch" type="xml">
<field name="product_id" readonly="1" select="1" position="after">
<field name="analytics_id" domain="[('plan_id','&lt;&gt;',False)]"/>
</field>
</field>
</record>
</data>
</openerp>

View File

@ -1,110 +1,110 @@
<openerp>
<data>
<record model="ir.ui.view" id="view_picking_journal_form">
<field name="name">sale_journal.picking.journal.form</field>
<field name="model">sale_journal.picking.journal</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Picking Journal">
<notebook>
<page string="Journal">
<separator string="Journal Information" colspan="4"/>
<field name="name" select="1"/>
<field name="code" select="1"/>
<field name="user_id" select="1"/>
<field name="date" select="1"/>
<field name="date_created" select="1"/>
<field name="date_validation" select="1"/>
<separator string="States" colspan="4"/>
<field name="state"/>
<group col="3" colspan="2">
<record model="ir.ui.view" id="view_picking_journal_form">
<field name="name">sale_journal.picking.journal.form</field>
<field name="model">sale_journal.picking.journal</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Picking Journal">
<notebook>
<page string="Journal">
<separator string="Journal Information" colspan="4"/>
<field name="name" select="1"/>
<field name="code" select="1"/>
<field name="user_id" select="1"/>
<field name="date" select="1"/>
<field name="date_created" select="1"/>
<field name="date_validation" select="1"/>
<separator string="States" colspan="4"/>
<field name="state"/>
<group col="3" colspan="2">
<button name="button_open" string="Open Journal" states="draft" type="object" icon="gtk-open"/>
<button name="button_close" string="Close Journal" states="open" type="object" icon="gtk-close"/>
<button name="button_draft" string="Set to Draft" states="close,open" type="object" icon="gtk-convert"/>
</group>
</page>
<page string="Picking">
</group>
</page>
<page string="Picking">
<button string="Cancel Picking" name="button_picking_cancel" states="draft,open" type="object" icon="gtk-cancel"/>
<newline/>
<field name="picking_stats_ids" colspan="4" nolabel="1"/>
</page><page string="Notes">
<field name="note" colspan="4" nolabel="1"/>
</page>
</notebook>
</form>
</field>
</record>
<record model="ir.ui.view" id="view_picking_journal_tree">
<field name="name">sale_journal.picking.journal.tree</field>
<field name="model">sale_journal.picking.journal</field>
<field name="type">tree</field>
<field name="arch" type="xml">
<tree string="Picking Journal">
<field name="name" select="1"/>
<field name="code" select="1"/>
<field name="user_id" select="1"/>
<field name="date" select="1"/>
<field name="state"/>
</tree>
</field>
</record>
<newline/>
<field name="picking_stats_ids" colspan="4" nolabel="1"/>
</page><page string="Notes">
<field name="note" colspan="4" nolabel="1"/>
</page>
</notebook>
</form>
</field>
</record>
<record model="ir.ui.view" id="view_picking_journal_tree">
<field name="name">sale_journal.picking.journal.tree</field>
<field name="model">sale_journal.picking.journal</field>
<field name="type">tree</field>
<field name="arch" type="xml">
<tree string="Picking Journal">
<field name="name" select="1"/>
<field name="code" select="1"/>
<field name="user_id" select="1"/>
<field name="date" select="1"/>
<field name="state"/>
</tree>
</field>
</record>
<record model="ir.ui.view" id="view_picking_journal_search">
<field name="name">sale_journal.picking.journal.search</field>
<field name="model">sale_journal.picking.journal</field>
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Picking Journal">
<group col="8" colspan="4">
<filter icon="terp-hr" string="My Picking Journals" domain="[('user_id','=',uid)]" help="My Picking Journals"/>
<filter icon="terp-hr" string="Open" domain="[('state','=','open')]" help="Open Picking Journals"/>
<separator orientation="vertical"/>
<field name="name" select="1"/>
<field name="code" select="1"/>
<field name="user_id" select="1" widget="selection"/>
<field name="date" select="1"/>
</group>
</search>
</field>
</record>
<record model="ir.actions.act_window" id="action_definition_picking_journal">
<field name="name">Picking journals</field>
<field name="res_model">sale_journal.picking.journal</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="search_view_id" ref="view_picking_journal_search"/>
</record>
<record model="ir.ui.view" id="view_picking_journal_search">
<field name="name">sale_journal.picking.journal.search</field>
<field name="model">sale_journal.picking.journal</field>
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Picking Journal">
<group col="8" colspan="4">
<filter icon="terp-hr" string="My Picking Journals" domain="[('user_id','=',uid)]" help="My Picking Journals"/>
<filter icon="terp-hr" string="Open" domain="[('state','=','open')]" help="Open Picking Journals"/>
<separator orientation="vertical"/>
<field name="name" select="1"/>
<field name="code" select="1"/>
<field name="user_id" select="1" widget="selection"/>
<field name="date" select="1"/>
</group>
</search>
</field>
</record>
<record model="ir.actions.act_window" id="action_definition_picking_journal">
<field name="name">Picking journals</field>
<field name="res_model">sale_journal.picking.journal</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="search_view_id" ref="view_picking_journal_search"/>
</record>
<menuitem name="Picking Journals" id="menu_definition_journal_picking" parent="stock.menu_stock_configuration" action="action_definition_picking_journal"/>
<menuitem name="Picking Journals" id="menu_definition_journal_picking" parent="stock.menu_stock_configuration" action="action_definition_picking_journal"/>
<record model="ir.actions.act_window" id="action_invoice_type_tree">
<field name="name">Picking by invoice_method</field>
<field name="name">sale_journal.invoice.type.tree</field>
<field name="res_model">sale_journal.invoice.type</field>
<field name="type">ir.actions.act_window</field>
<field name="view_type">tree</field>
</record>
<record model="ir.actions.act_window" id="action_invoice_type_tree">
<field name="name">Picking by invoice_method</field>
<field name="name">sale_journal.invoice.type.tree</field>
<field name="res_model">sale_journal.invoice.type</field>
<field name="type">ir.actions.act_window</field>
<field name="view_type">tree</field>
</record>
<!--<menuitem name="Picking to Invoice" id="menu_definition_journal_picking_invoice" parent="stock.menu_action_picking_tree"/>-->
<!--<menuitem name="Picking by Invoice Method" id="menu_definition_journal_picking_invoice_method" parent="menu_definition_journal_picking_invoice" action="action_invoice_type_tree"/>-->
<!--<menuitem name="Picking to Invoice" id="menu_definition_journal_picking_invoice" parent="stock.menu_action_picking_tree"/>-->
<!--<menuitem name="Picking by Invoice Method" id="menu_definition_journal_picking_invoice_method" parent="menu_definition_journal_picking_invoice" action="action_invoice_type_tree"/>-->
<record model="ir.actions.act_window" id="action_invoice_type_picking_open">
<field name="name">Picking to invoice</field>
<field name="res_model">stock.picking</field>
<field name="type">ir.actions.act_window</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="domain">[('state','=','done'),('invoice_state','=','2binvoiced'),('invoice_type_id','=',active_id)]</field>
</record>
<record model="ir.values" id="ir_open_invoice_type">
<field name="key2">tree_but_open</field>
<field name="model">sale_journal.invoice.type</field>
<field name="name">Picking to invoice</field>
<field name="value" eval="'ir.actions.act_window,%d'%action_invoice_type_picking_open"/>
<field name="object" eval="True"/>
</record>
<record model="ir.actions.act_window" id="action_invoice_type_picking_open">
<field name="name">Picking to invoice</field>
<field name="res_model">stock.picking</field>
<field name="type">ir.actions.act_window</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="domain">[('state','=','done'),('invoice_state','=','2binvoiced'),('invoice_type_id','=',active_id)]</field>
</record>
<record model="ir.values" id="ir_open_invoice_type">
<field name="key2">tree_but_open</field>
<field name="model">sale_journal.invoice.type</field>
<field name="name">Picking to invoice</field>
<field name="value" eval="'ir.actions.act_window,%d'%action_invoice_type_picking_open"/>
<field name="object" eval="True"/>
</record>
</data>
</openerp>

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

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

View File

@ -1,18 +1,18 @@
<?xml version="1.0" ?>
<openerp>
<data>
<data>
<record model="ir.ui.view" id="view_product_form_auto_pick">
<field name="name">product.normal.auto_pick.form</field>
<field name="model">product.product</field>
<field name="inherit_id" ref="product.product_normal_form_view" />
<field name="type">form</field>
<field name="arch" type="xml">
<field name="product_manager" position="after">
<field name="auto_pick" />
</field>
</field>
</record>
<record model="ir.ui.view" id="view_product_form_auto_pick">
<field name="name">product.normal.auto_pick.form</field>
<field name="model">product.product</field>
<field name="inherit_id" ref="product.product_normal_form_view" />
<field name="type">form</field>
<field name="arch" type="xml">
<field name="product_manager" position="after">
<field name="auto_pick" />
</field>
</field>
</record>
</data>
</data>
</openerp>

View File

@ -2,14 +2,13 @@
<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
=======================================================
-->
=======================================================
Subscription Views
=======================================================
-->
<record id="view_subscription_form" model="ir.ui.view">
<field name="name">subscription.subscription.form</field>
<field name="model">subscription.subscription</field>
@ -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"/>

File diff suppressed because it is too large Load Diff

View File

@ -1,35 +1,35 @@
<?xml version="1.0"?>
<openerp>
<data>
<record model="ir.ui.view" id="company_form_view">
<field name="name">res.company.form.inherit.users_ldap</field>
<field name="model">res.company</field>
<field name="type">form</field>
<field name="inherit_id" ref="base.view_company_form"/>
<field name="arch" type="xml">
<xpath expr="/form/notebook/page[@string='Configuration']" position="inside">
<field name="ldaps" nolabel="1" colspan="4">
<form string="LDAP Configuration">
<data>
<record model="ir.ui.view" id="company_form_view">
<field name="name">res.company.form.inherit.users_ldap</field>
<field name="model">res.company</field>
<field name="type">form</field>
<field name="inherit_id" ref="base.view_company_form"/>
<field name="arch" type="xml">
<xpath expr="/form/notebook/page[@string='Configuration']" position="inside">
<field name="ldaps" nolabel="1" colspan="4">
<form string="LDAP Configuration">
<field name="ldap_server"/>
<field name="ldap_server_port"/>
<field name="ldap_binddn"/>
<field name="ldap_password"/>
<field name="ldap_base"/>
<field name="ldap_filter"/>
<field name="create_user"/>
<field name="ldap_binddn"/>
<field name="ldap_password"/>
<field name="ldap_base"/>
<field name="ldap_filter"/>
<field name="create_user"/>
<field name="user"/>
<newline/>
<field name="sequence"/>
</form>
<tree string="LDAP Configuration">
<field name="sequence"/>
</form>
<tree string="LDAP Configuration">
<field name="sequence"/>
<field name="ldap_server"/>
<field name="ldap_server_port"/>
<field name="ldap_base"/>
</tree>
</field>
</xpath>
</field>
</record>
</data>
<field name="ldap_base"/>
</tree>
</field>
</xpath>
</field>
</record>
</data>
</openerp>

View File

@ -10,31 +10,30 @@
<field name="arch" type="xml">
<notebook position="inside">
<page string="Warnings">
<group colspan="2" col="2">
<separator string="Warning on the Sale Order" colspan="4"/>
<field name="sale_warn" nolabel="1" />
<field name="sale_warn_msg" colspan="3" nolabel="1"
attrs="{'required':[('sale_warn','!=','no-message')],'readonly':[('sale_warn','=','no-message')]}"/>
</group>
<group colspan="2" col="2">
<separator string="Warning on the Purchase Order" colspan="4"/>
<field name="purchase_warn" nolabel="1" />
<field name="purchase_warn_msg" colspan="3" nolabel="1"
attrs="{'required':[('purchase_warn','!=','no-message')],'readonly':[('purchase_warn','=','no-message')]}"/>
</group>
<group colspan="2" col="2">
<separator string="Warning on the Picking" colspan="4"/>
<field name="picking_warn" nolabel="1" />
<field name="picking_warn_msg" colspan="3" nolabel="1"
attrs="{'required':[('picking_warn','!=','no-message')],'readonly':[('picking_warn','=','no-message')]}"/>
</group>
<group colspan="2" col="2">
<separator string="Warning on the Invoice" colspan="4"/>
<field name="invoice_warn" nolabel="1" />
<field name="invoice_warn_msg" colspan="3" nolabel="1"
attrs="{'required':[('invoice_warn','!=','no-message')],'readonly':[('invoice_warn','=','no-message')]}"/>
</group>
<separator string="Warning on the Sale Order" colspan="4"/>
<field name="sale_warn" nolabel="1" />
<field name="sale_warn_msg" colspan="3" nolabel="1"
attrs="{'required':[('sale_warn','!=','no-message')],'readonly':[('sale_warn','=','no-message')]}"/>
</group>
<group colspan="2" col="2">
<separator string="Warning on the Purchase Order" colspan="4"/>
<field name="purchase_warn" nolabel="1" />
<field name="purchase_warn_msg" colspan="3" nolabel="1"
attrs="{'required':[('purchase_warn','!=','no-message')],'readonly':[('purchase_warn','=','no-message')]}"/>
</group>
<group colspan="2" col="2">
<separator string="Warning on the Picking" colspan="4"/>
<field name="picking_warn" nolabel="1" />
<field name="picking_warn_msg" colspan="3" nolabel="1"
attrs="{'required':[('picking_warn','!=','no-message')],'readonly':[('picking_warn','=','no-message')]}"/>
</group>
<group colspan="2" col="2">
<separator string="Warning on the Invoice" colspan="4"/>
<field name="invoice_warn" nolabel="1" />
<field name="invoice_warn_msg" colspan="3" nolabel="1"
attrs="{'required':[('invoice_warn','!=','no-message')],'readonly':[('invoice_warn','=','no-message')]}"/>
</group>
</page>
</notebook>
</field>
@ -48,18 +47,18 @@
<field name="arch" type="xml">
<notebook position="inside">
<page string="Warnings">
<group colspan="2" col="2">
<separator string="Warning when Selling this Product" colspan="4"/>
<field name="sale_line_warn" nolabel="1" />
<field name="sale_line_warn_msg" colspan="3" nolabel="1"
attrs="{'required':[('sale_line_warn','!=','no-message')],'readonly':[('sale_line_warn','=','no-message')]}"/>
</group>
<group colspan="2" col="2">
<separator string="Warning when Purchasing this Product" colspan="4" />
<field name="purchase_line_warn" nolabel="1" />
<field name="purchase_line_warn_msg" colspan="3" nolabel="1"
attrs="{'required':[('purchase_line_warn','!=','no-message')],'readonly':[('purchase_line_warn','=','no-message')]}"/>
</group>
<separator string="Warning when Selling this Product" colspan="4"/>
<field name="sale_line_warn" nolabel="1" />
<field name="sale_line_warn_msg" colspan="3" nolabel="1"
attrs="{'required':[('sale_line_warn','!=','no-message')],'readonly':[('sale_line_warn','=','no-message')]}"/>
</group>
<group colspan="2" col="2">
<separator string="Warning when Purchasing this Product" colspan="4" />
<field name="purchase_line_warn" nolabel="1" />
<field name="purchase_line_warn_msg" colspan="3" nolabel="1"
attrs="{'required':[('purchase_line_warn','!=','no-message')],'readonly':[('purchase_line_warn','=','no-message')]}"/>
</group>
</page>
</notebook>
</field>

View File

@ -2,17 +2,17 @@
<openerp>
<data>
<menuitem name="Knowledge Management" icon="terp-stock"
id="base.menu_document" sequence="4" />
id="base.menu_document" sequence="4" />
<menuitem name="Configuration"
id="base.menu_document_configuration"
parent="base.menu_document" sequence="50" />
id="base.menu_document_configuration"
parent="base.menu_document" sequence="50" />
<menuitem name="Wiki" id="menu_wiki_configuration"
parent="base.menu_document_configuration" sequence="2" />
parent="base.menu_document_configuration" sequence="2" />
<menuitem id="base.menu_document2" name="Collaborative Content"
parent="base.menu_document" />
parent="base.menu_document" />
<!-- Wiki Groups Tree view -->
@ -40,7 +40,7 @@
<field name="create_date" readonly="2"/>
<field name="method" select="1"/>
<field name="home" select="1"
attrs="{'required':[('method','=','page')], 'readonly':[('method','!=','page')]}" />
attrs="{'required':[('method','=','page')], 'readonly':[('method','!=','page')]}" />
</group>
<notebook colspan="4">
<page string="Notes">
@ -51,10 +51,10 @@
</page>
</notebook>
<button
name="%(wiki.action_wiki_create_menu)d"
string="Create Menu"
type="action"
icon="gtk-justify-fill" />
name="%(wiki.action_wiki_create_menu)d"
string="Create Menu"
type="action"
icon="gtk-justify-fill" />
</form>
</field>
</record>
@ -145,7 +145,7 @@
<!-- wiki Search view -->
<record id="view_wiki_filter" model="ir.ui.view">
<record id="view_wiki_filter" model="ir.ui.view">
<field name="name">wiki.wiki.search</field>
<field name="model">wiki.wiki</field>
<field name="type">search</field>
@ -176,8 +176,8 @@
</record>
<menuitem parent="base.menu_document2"
id="menu_action_wiki_wiki" name="Wiki Pages"
action="action_wiki" />
id="menu_action_wiki_wiki" name="Wiki Pages"
action="action_wiki" />
<!-- Pages Waiting Review -->