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

[IMP] Analytic account with group extended with all modules where it refrence 

bzr revid: mra@mra-laptop-20100817111335-8zu0l0tqno8dj5u9
This commit is contained in:
PSI(OpenERP) 2010-08-17 16:43:35 +05:30 committed by Mustufa Rangwala
parent 5dbdc3ccbe
commit 2f80a95c91
24 changed files with 233 additions and 222 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
addons/account/account_invoice_view.xml
View File

@ -62,7 +62,7 @@
<field colspan="4" name="name"/> <field colspan="4" name="name"/>
<field colspan="4" name="origin" groups="base.group_extended"/> <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="[('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="account.group_account_user"/> <field domain="[('type','&lt;&gt;','view'), ('company_id', '=', parent.company_id)]" name="account_analytic_id" groups="base.group_extended"/>
<newline/> <newline/>
<field name="price_subtotal"/> <field name="price_subtotal"/>
@ -154,7 +154,7 @@
<field name="number" readonly="1"/> <field name="number" readonly="1"/>
<field name="type" invisible="1"/> <field name="type" invisible="1"/>
<field name="currency_id" domain="[('company_id','=', company_id)]" on_change="onchange_currency_id(currency_id, company_id)" width="50"/> <field name="currency_id" domain="[('company_id','=', company_id)]" on_change="onchange_currency_id(currency_id, company_id)" width="50"/>
<button name="%(action_account_change_currency)d" type="action" icon="terp-stock_effects-object-colorize" string="Change" attrs="{'invisible':[('state','!=','draft')]}"/> <button name="%(action_account_change_currency)d" type="action" icon="terp-stock_effects-object-colorize" string="Change" attrs="{'invisible':[('state','!=','draft')]}" groups="account.group_account_user"/>
<newline/> <newline/>
<field name="partner_id" domain="[('supplier','=', 1)]" on_change="onchange_partner_id(type,partner_id,date_invoice,payment_term, partner_bank_id,company_id)" context="{'default_customer': 0}"/> <field name="partner_id" domain="[('supplier','=', 1)]" on_change="onchange_partner_id(type,partner_id,date_invoice,payment_term, partner_bank_id,company_id)" context="{'default_customer': 0}"/>
<field domain="[('partner_id','=',partner_id)]" name="address_invoice_id"/> <field domain="[('partner_id','=',partner_id)]" name="address_invoice_id"/>
@ -178,7 +178,7 @@
<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="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 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)"/> <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)"/>
<field name="invoice_line_tax_id" view_mode="2" context="{'type':parent.type}" domain="[('parent_id','=',False)]"/> <field name="invoice_line_tax_id" view_mode="2" context="{'type':parent.type}" domain="[('parent_id','=',False)]"/>
<field domain="[('type','&lt;&gt;','view'), ('company_id', '=', parent.company_id)]" name="account_analytic_id"/> <field domain="[('type','&lt;&gt;','view'), ('company_id', '=', parent.company_id)]" name="account_analytic_id" groups="base.group_extended"/>
<field name="quantity"/> <field name="quantity"/>
<field name="price_unit"/> <field name="price_unit"/>
<!-- Removed if subtotal is set --> <!-- Removed if subtotal is set -->
@ -263,7 +263,7 @@
<field name="number"/> <field name="number"/>
<field name="type" invisible="1"/> <field name="type" invisible="1"/>
<field name="currency_id" domain="[('company_id','=', company_id)]" on_change="onchange_currency_id(currency_id, company_id)" width="50"/> <field name="currency_id" domain="[('company_id','=', company_id)]" on_change="onchange_currency_id(currency_id, company_id)" width="50"/>
<button name="%(action_account_change_currency)d" type="action" icon="terp-stock_effects-object-colorize" string="Change" attrs="{'invisible':[('state','!=','draft')]}"/> <button name="%(action_account_change_currency)d" type="action" icon="terp-stock_effects-object-colorize" string="Change" attrs="{'invisible':[('state','!=','draft')]}" groups="account.group_account_user"/>
<newline/> <newline/>
<field name="partner_id" on_change="onchange_partner_id(type,partner_id,date_invoice,payment_term, partner_bank_id,company_id)" groups="base.group_user"/> <field name="partner_id" on_change="onchange_partner_id(type,partner_id,date_invoice,payment_term, partner_bank_id,company_id)" groups="base.group_user"/>
<field domain="[('partner_id','=',partner_id)]" name="address_invoice_id"/> <field domain="[('partner_id','=',partner_id)]" name="address_invoice_id"/>
@ -302,7 +302,7 @@
<field name="state"/> <field name="state"/>
<field name="residual"/> <field name="residual"/>
<group col="7" colspan="4" groups="base.group_user"> <group col="7" colspan="4" groups="base.group_user">
<button name="invoice_proforma2" states="draft" string="PRO-FORMA" icon="terp-check"/> <button name="invoice_proforma2" states="draft" string="PRO-FORMA" icon="terp-check" groups="account.group_account_user"/>
<button name="invoice_open" states="draft,proforma2" string="Create" icon="terp-document-new"/> <button name="invoice_open" states="draft,proforma2" string="Create" icon="terp-document-new"/>
<button name="%(action_account_invoice_refund)d" type='action' string='Refund' states='open,paid' icon="gtk-execute"/> <button name="%(action_account_invoice_refund)d" type='action' string='Refund' states='open,paid' icon="gtk-execute"/>
<button name="%(action_account_invoice_pay)d" type='action' string='Pay Invoice' states='open' icon="terp-dolar_ok!"/> <button name="%(action_account_invoice_pay)d" type='action' string='Pay Invoice' states='open' icon="terp-dolar_ok!"/>

6
addons/account/account_menuitem.xml
View File

@ -7,7 +7,7 @@
<menuitem id="menu_finance_payables" name="Payables" parent="menu_finance" sequence="2" groups="group_account_user,group_account_manager,base.group_system"/> <menuitem id="menu_finance_payables" name="Payables" parent="menu_finance" sequence="2" groups="group_account_user,group_account_manager,base.group_system"/>
<menuitem id="menu_finance_bank_and_cash" name="Bank and Cash" parent="menu_finance" sequence="3"/> <menuitem id="menu_finance_bank_and_cash" name="Bank and Cash" parent="menu_finance" sequence="3"/>
<!-- <menuitem id="menu_accounting" name="Accounting" parent="menu_finance" sequence="5"/>--> <!-- <menuitem id="menu_accounting" name="Accounting" parent="menu_finance" sequence="5"/>-->
<menuitem id="menu_finance_periodical_processing" name="Periodical Processing" parent="menu_finance" sequence="8"/> <menuitem id="menu_finance_periodical_processing" name="Periodical Processing" parent="menu_finance" sequence="8" groups="group_account_user,group_account_manager,base.group_system"/>
<menuitem id="periodical_processing_journal_entries_validation" name="Draft Entries" parent="menu_finance_periodical_processing" groups="group_account_user,group_account_manager,base.group_system"/> <menuitem id="periodical_processing_journal_entries_validation" name="Draft Entries" parent="menu_finance_periodical_processing" groups="group_account_user,group_account_manager,base.group_system"/>
<menuitem id="periodical_processing_reconciliation" name="Reconciliation" parent="menu_finance_periodical_processing"/> <menuitem id="periodical_processing_reconciliation" name="Reconciliation" parent="menu_finance_periodical_processing"/>
<!-- <menuitem id="periodical_processing_recurrent_entries" name="Recurrent Entries" parent="menu_finance_periodical_processing"/>--> <!-- <menuitem id="periodical_processing_recurrent_entries" name="Recurrent Entries" parent="menu_finance_periodical_processing"/>-->
@ -20,8 +20,8 @@
<menuitem id="menu_finance_management_belgian_reports" name="Belgian Reports" parent="menu_finance_reporting"/> <menuitem id="menu_finance_management_belgian_reports" name="Belgian Reports" parent="menu_finance_reporting"/>
<menuitem id="menu_finance_configuration" name="Configuration" parent="menu_finance" sequence="13" groups="base.group_system"/> <menuitem id="menu_finance_configuration" name="Configuration" parent="menu_finance" sequence="13" groups="base.group_system"/>
<menuitem id="menu_finance_accounting" name="Financial Accounting" parent="menu_finance_configuration"/> <menuitem id="menu_finance_accounting" name="Financial Accounting" parent="menu_finance_configuration"/>
<menuitem id="menu_analytic_accounting" name="Analytic Accounting" parent="menu_finance_configuration"/> <menuitem id="menu_analytic_accounting" name="Analytic Accounting" parent="menu_finance_configuration" groups="base.group_extended"/>
<menuitem id="menu_analytic" parent="menu_analytic_accounting" name="Accounts"/> <menuitem id="menu_analytic" parent="menu_analytic_accounting" name="Accounts" groups="base.group_extended"/>
<menuitem id="menu_low_level" name="Low Level" parent="menu_finance_accounting" groups="base.group_extended"/> <menuitem id="menu_low_level" name="Low Level" parent="menu_finance_accounting" groups="base.group_extended"/>
<menuitem id="menu_configuration_misc" name="Miscellaneous" parent="menu_finance_configuration"/> <menuitem id="menu_configuration_misc" name="Miscellaneous" parent="menu_finance_configuration"/>
<menuitem id="base.menu_action_currency_form" parent="menu_configuration_misc" sequence="20"/> <menuitem id="base.menu_action_currency_form" parent="menu_configuration_misc" sequence="20"/>

28
addons/account/account_view.xml
View File

@ -895,7 +895,7 @@
<field name="debit" sum="Total debit"/> <field name="debit" sum="Total debit"/>
<field name="credit" sum="Total credit"/> <field name="credit" sum="Total credit"/>
<field name="account_tax_id" groups="base.group_extended"/> <field name="account_tax_id" groups="base.group_extended"/>
<field name="analytic_account_id"/> <field name="analytic_account_id" groups="base.group_extended"/>
<field name="amount_currency" groups="base.group_extended"/> <field name="amount_currency" groups="base.group_extended"/>
<field name="currency_id" groups="base.group_extended"/> <field name="currency_id" groups="base.group_extended"/>
<field name="reconcile_partial_id" groups="base.group_extended"/> <field name="reconcile_partial_id" groups="base.group_extended"/>
@ -970,15 +970,15 @@
<field name="blocked"/> <field name="blocked"/>
</group> </group>
<group col="2" colspan="2"> <group col="2" colspan="2" groups="base.group_extended">
<separator colspan="2" string="Analytic"/> <separator colspan="2" string="Analytic"/>
<field name="analytic_account_id"/> <field name="analytic_account_id" groups="base.group_extended"/>
</group> </group>
<separator string="Narration" colspan="4"/> <separator string="Narration" colspan="4"/>
<field name="narration" colspan="4" nolabel="1"/> <field name="narration" colspan="4" nolabel="1"/>
</page> </page>
<page string="Analytic Lines"> <page string="Analytic Lines" groups="base.group_extended">
<field colspan="4" name="analytic_lines" nolabel="1" context="{'default_general_account_id':account_id, 'default_name': name, 'default_date':date, 'amount': (debit or 0.0)-(credit or 0.0)}"/> <field colspan="4" name="analytic_lines" nolabel="1" context="{'default_general_account_id':account_id, 'default_name': name, 'default_date':date, 'amount': (debit or 0.0)-(credit or 0.0)}" groups="base.group_extended"/>
</page> </page>
</notebook> </notebook>
</form> </form>
@ -1017,15 +1017,15 @@
<field name="blocked" select="3"/> <field name="blocked" select="3"/>
<newline/> <newline/>
<field name="account_tax_id" domain="[('parent_id','=',False)]"/> <field name="account_tax_id" domain="[('parent_id','=',False)]"/>
<field name="analytic_account_id"/> <field name="analytic_account_id" groups="base.group_extended"/>
<separator colspan="4" string="State"/> <separator colspan="4" string="State"/>
<newline/> <newline/>
<field name="reconcile_id"/> <field name="reconcile_id"/>
<field name="reconcile_partial_id"/> <field name="reconcile_partial_id"/>
<field name="state"/> <field name="state"/>
</page> </page>
<page string="Analytic Lines"> <page string="Analytic Lines" groups="base.group_extended">
<field colspan="4" name="analytic_lines" nolabel="1"/> <field colspan="4" name="analytic_lines" nolabel="1" groups="base.group_extended"/>
</page> </page>
</notebook> </notebook>
</form> </form>
@ -1243,15 +1243,15 @@
<field name="blocked"/> <field name="blocked"/>
</group> </group>
<group col="2" colspan="2"> <group col="2" colspan="2" groups="base.group_extended">
<separator colspan="2" string="Analytic"/> <separator colspan="2" string="Analytic"/>
<field name="analytic_account_id"/> <field name="analytic_account_id" groups="base.group_extended"/>
</group> </group>
<separator string="Narration" colspan="4"/> <separator string="Narration" colspan="4"/>
<field name="narration" colspan="4" nolabel="1"/> <field name="narration" colspan="4" nolabel="1"/>
</page> </page>
<page string="Analytic Lines"> <page string="Analytic Lines" groups="base.group_extended">
<field colspan="4" name="analytic_lines" nolabel="1" context="{'default_general_account_id':account_id, 'default_name': name, 'default_date':date, 'amount': (debit or 0.0)-(credit or 0.0)}"/> <field colspan="4" name="analytic_lines" nolabel="1" context="{'default_general_account_id':account_id, 'default_name': name, 'default_date':date, 'amount': (debit or 0.0)-(credit or 0.0)}" groups="base.group_extended"/>
</page> </page>
</notebook> </notebook>
</form> </form>
@ -1264,7 +1264,7 @@
<field name="date_maturity"/> <field name="date_maturity"/>
<field name="debit" sum="Total Debit"/> <field name="debit" sum="Total Debit"/>
<field name="credit" sum="Total Credit"/> <field name="credit" sum="Total Credit"/>
<field name="analytic_account_id"/> <field name="analytic_account_id" groups="base.group_extended"/>
<field name="amount_currency" groups="base.group_extended"/> <field name="amount_currency" groups="base.group_extended"/>
<field name="currency_id" groups="base.group_extended"/> <field name="currency_id" groups="base.group_extended"/>
<field name="tax_code_id"/> <field name="tax_code_id"/>
@ -1910,7 +1910,7 @@
<field name="debit" sum="Total debit"/> <field name="debit" sum="Total debit"/>
<field name="credit" sum="Total credit"/> <field name="credit" sum="Total credit"/>
<field name="account_tax_id"/> <field name="account_tax_id"/>
<field name="analytic_account_id"/> <field name="analytic_account_id" groups="base.group_extended"/>
<field name="state"/> <field name="state"/>
</tree> </tree>
</field> </field>

2
addons/account/board_account_view.xml
View File

@ -49,7 +49,7 @@
<field name="view_id" ref="board_account_form"/> <field name="view_id" ref="board_account_form"/>
</record> </record>
<menuitem id="menu_dashboard_acc" name="Dashboard" sequence="2" parent="account.menu_finance_reporting"/> <menuitem id="menu_dashboard_acc" name="Dashboard" sequence="2" parent="account.menu_finance_reporting" groups="group_account_user,group_account_manager,base.group_system"/>
<menuitem action="open_board_account" icon="terp-graph" id="menu_board_account" parent="menu_dashboard_acc" sequence="1"/> <menuitem action="open_board_account" icon="terp-graph" id="menu_board_account" parent="menu_dashboard_acc" sequence="1"/>
<menuitem icon="terp-account" id="account.menu_finance" name="Accounting" sequence="13" action="open_board_account"/> <menuitem icon="terp-account" id="account.menu_finance" name="Accounting" sequence="13" action="open_board_account"/>
</data> </data>

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

@ -78,7 +78,7 @@
<group colspan="4" col="6"> <group colspan="4" col="6">
<field name="name" select="1" colspan="4"/> <field name="name" select="1" colspan="4"/>
<field name="code" select="1"/> <field name="code" select="1"/>
<field name="parent_id" on_change="on_change_parent(parent_id)"/> <field name="parent_id" on_change="on_change_parent(parent_id)" groups="base.group_extended"/>
<field name="company_id" select="2" widget="selection" groups="base.group_multi_company"/> <field name="company_id" select="2" widget="selection" groups="base.group_multi_company"/>
<field name="type" select="2"/> <field name="type" select="2"/>
<field name="company_currency_id" select="2"/> <field name="company_currency_id" select="2"/>
@ -113,7 +113,7 @@
<field name="search_view_id" ref="account.view_account_analytic_account_search"/> <field name="search_view_id" ref="account.view_account_analytic_account_search"/>
</record> </record>
<!--<menuitem id="menu_analytic_account" name="Analytic Accounts" parent="account.menu_analytic_accounting"/>--> <!--<menuitem id="menu_analytic_account" name="Analytic Accounts" parent="account.menu_analytic_accounting"/>-->
<menuitem action="action_account_analytic_account_form" id="account_analytic_def_account" parent="menu_analytic_accounting"/> <menuitem action="action_account_analytic_account_form" id="account_analytic_def_account" parent="menu_analytic_accounting" groups="base.group_extended"/>
<record id="act_account_renew_view" model="ir.actions.act_window"> <record id="act_account_renew_view" model="ir.actions.act_window">
<field name="name">Accounts to Renew</field> <field name="name">Accounts to Renew</field>
@ -144,7 +144,7 @@
<!-- <wizard id="wizard_analytic_account_chart" menu="False" model="account.analytic.account" name="account.analytic.account.chart" string="Analytic Chart of Accounts"/> <!-- <wizard id="wizard_analytic_account_chart" menu="False" model="account.analytic.account" name="account.analytic.account.chart" string="Analytic Chart of Accounts"/>
<menuitem icon="STOCK_INDENT" action="wizard_analytic_account_chart" id="menu_action_analytic_account_tree2" parent="account.menu_finance_charts" type="wizard"/>--> <menuitem icon="STOCK_INDENT" action="wizard_analytic_account_chart" id="menu_action_analytic_account_tree2" parent="account.menu_finance_charts" type="wizard"/>-->
<menuitem id="next_id_40" name="Analytic" parent="account.menu_finance_generic_reporting" sequence="4"/> <menuitem id="next_id_40" name="Analytic" parent="account.menu_finance_generic_reporting" sequence="4" groups="base.group_extended"/>
<!-- <menuitem action="action_account_analytic_account_tree2" id="account_analytic_chart_balance" parent="next_id_40"/>--> <!-- <menuitem action="action_account_analytic_account_tree2" id="account_analytic_chart_balance" parent="next_id_40"/>-->
<record id="view_account_analytic_line_form" model="ir.ui.view"> <record id="view_account_analytic_line_form" model="ir.ui.view">
@ -157,7 +157,7 @@
<field colspan="4" name="name" select="1"/> <field colspan="4" name="name" select="1"/>
<field name="amount" select="2"/> <field name="amount" select="2"/>
<field name="date" select="1"/> <field name="date" select="1"/>
<field name="account_id" select="1"/> <field name="account_id" select="1" groups="base.group_extended"/>
<field name="journal_id" select="2"/> <field name="journal_id" select="2"/>
<field name="general_account_id" select="2"/> <field name="general_account_id" select="2"/>
<field name="move_id" select="2"/> <field name="move_id" select="2"/>
@ -183,7 +183,7 @@
<field name="name"/> <field name="name"/>
<field name="unit_amount" on_change="on_change_unit_amount(product_id, unit_amount, company_id, product_uom_id)" sum="Total quantity"/> <field name="unit_amount" on_change="on_change_unit_amount(product_id, unit_amount, company_id, product_uom_id)" sum="Total quantity"/>
<field name="product_id" on_change="on_change_unit_amount(product_id, unit_amount, company_id, product_uom_id)"/> <field name="product_id" on_change="on_change_unit_amount(product_id, unit_amount, company_id, product_uom_id)"/>
<field domain="[('type','=','normal')]" name="account_id"/> <field domain="[('type','=','normal')]" name="account_id" groups="base.group_extended"/>
<field invisible="True" name="product_uom_id" on_change="on_change_unit_amount(product_id, unit_amount, company_id, product_uom_id)"/> <field invisible="True" name="product_uom_id" on_change="on_change_unit_amount(product_id, unit_amount, company_id, product_uom_id)"/>
<field name="amount" sum="Total amount"/> <field name="amount" sum="Total amount"/>
<field name="general_account_id"/> <field name="general_account_id"/>
@ -203,7 +203,7 @@
<search string="Search Analytic Lines"> <search string="Search Analytic Lines">
<group col='6' colspan='4'> <group col='6' colspan='4'>
<field name="name" select="1"/> <field name="name" select="1"/>
<field name="account_id" select="1"/> <field name="account_id" select="1" groups="base.group_extended"/>
<field name="amount" select="1"/> <field name="amount" select="1"/>
<field name="date" select="1"/> <field name="date" select="1"/>
<field name="user_id" widget="selection"/> <field name="user_id" widget="selection"/>
@ -215,7 +215,7 @@
<newline/> <newline/>
<group string="Group By..." expand="0"> <group string="Group By..." expand="0">
<filter string="General Account" context="{'group_by':'general_account_id'}"/> <filter string="General Account" context="{'group_by':'general_account_id'}"/>
<filter string="Analytic Account" context="{'group_by':'account_id'}"/> <filter string="Analytic Account" context="{'group_by':'account_id'}" groups="base.group_extended"/>
<filter string="Analytic Journal" context="{'group_by':'journal_id'}"/> <filter string="Analytic Journal" context="{'group_by':'journal_id'}"/>
<filter string="Product" context="{'group_by':'product_id'}"/> <filter string="Product" context="{'group_by':'product_id'}"/>
</group> </group>
@ -263,7 +263,7 @@
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Project line"> <form string="Project line">
<field name="name"/> <field name="name"/>
<field name="account_id"/> <field name="account_id" groups="base.group_extended"/>
<field name="date" on_change="on_change_unit_amount(product_id, unit_amount, company_id, product_uom_id)"/> <field name="date" on_change="on_change_unit_amount(product_id, unit_amount, company_id, product_uom_id)"/>
<field name="journal_id"/> <field name="journal_id"/>
<field name="unit_amount" on_change="on_change_unit_amount(product_id, unit_amount, company_id, product_uom_id)"/> <field name="unit_amount" on_change="on_change_unit_amount(product_id, unit_amount, company_id, product_uom_id)"/>
@ -342,7 +342,7 @@
<field name="view_mode">tree,form,search</field> <field name="view_mode">tree,form,search</field>
<field name="search_view_id" ref="view_analytic_journal_search" /> <field name="search_view_id" ref="view_analytic_journal_search" />
</record> </record>
<menuitem action="action_account_analytic_journal_form" id="account_def_analytic_journal" parent="menu_analytic_accounting"/> <menuitem action="action_account_analytic_journal_form" id="account_def_analytic_journal" parent="menu_analytic_accounting" groups="base.group_extended"/>
# #
# Open journal entries # Open journal entries
@ -390,7 +390,7 @@
<field name="view_type">tree</field> <field name="view_type">tree</field>
<field name="help">To print an analytics (or costs) journal for a given period. The report give code, move name, account number, general amount and analytic amount.</field> <field name="help">To print an analytics (or costs) journal for a given period. The report give code, move name, account number, general amount and analytic amount.</field>
</record> </record>
<menuitem action="action_account_analytic_journal_tree" id="account_analytic_journal_print" parent="account.next_id_40"/> <menuitem action="action_account_analytic_journal_tree" id="account_analytic_journal_print" parent="account.next_id_40" groups="base.group_extended"/>
<!-- <record id="action_account_analytic_journal_tree2" model="ir.actions.act_window">--> <!-- <record id="action_account_analytic_journal_tree2" model="ir.actions.act_window">-->

3
addons/account/project/wizard/account_analytic_chart_view.xml
View File

@ -38,7 +38,8 @@
parent="account.menu_finance_charts" parent="account.menu_finance_charts"
action="action_account_analytic_chart" action="action_account_analytic_chart"
id="menu_action_analytic_account_tree2" id="menu_action_analytic_account_tree2"
icon="STOCK_INDENT"/> icon="STOCK_INDENT"
groups="base.group_extended"/>
</data> </data>
</openerp> </openerp>

2
addons/account/report/account_analytic_entries_report_view.xml
View File

@ -107,7 +107,7 @@
<field name="help">A tool search lets you know statistics on your analytics records that match your needs.</field> <field name="help">A tool search lets you know statistics on your analytics records that match your needs.</field>
</record> </record>
<menuitem action="action_analytic_entries_report" id="menu_action_analytic_entries_report" parent="account.menu_finance_statistic_report_statement" sequence="4"/> <menuitem action="action_analytic_entries_report" id="menu_action_analytic_entries_report" parent="account.menu_finance_statistic_report_statement" sequence="4" groups="base.group_extended"/>
</data> </data>
</openerp> </openerp>

8
addons/account/wizard/account_move_journal_view.xml
View File

@ -21,7 +21,7 @@
<field name="context">{'journal_type':'sale','view_mode':False}</field> <field name="context">{'journal_type':'sale','view_mode':False}</field>
<field name="target">new</field> <field name="target">new</field>
</record> </record>
<menuitem action="action_account_moves_sale" sequence="10" id="menu_eaction_account_moves_sale" parent="menu_finance_receivables" icon="STOCK_JUSTIFY_FILL"/> <menuitem action="action_account_moves_sale" sequence="10" id="menu_eaction_account_moves_sale" parent="menu_finance_receivables" icon="STOCK_JUSTIFY_FILL" groups="group_account_user,group_account_manager,base.group_system"/>
<!-- <record id="action_account_moves_purchase_refund" model="ir.actions.act_window">--> <!-- <record id="action_account_moves_purchase_refund" model="ir.actions.act_window">-->
<!-- <field name="name">Journal Refund Items</field>--> <!-- <field name="name">Journal Refund Items</field>-->
@ -42,7 +42,10 @@
<field name="target">new</field> <field name="target">new</field>
</record> </record>
<menuitem action="action_account_moves_purchase" sequence="10" <menuitem action="action_account_moves_purchase" sequence="10"
id="menu_eaction_account_moves_purchase" parent="menu_finance_payables" icon="STOCK_JUSTIFY_FILL"/> id="menu_eaction_account_moves_purchase"
parent="menu_finance_payables"
icon="STOCK_JUSTIFY_FILL"
groups="group_account_user,group_account_manager,base.group_system"/>
<!-- <record id="action_account_moves_sale_refund" model="ir.actions.act_window">--> <!-- <record id="action_account_moves_sale_refund" model="ir.actions.act_window">-->
<!-- <field name="name">Journal Refund Items</field>--> <!-- <field name="name">Journal Refund Items</field>-->
@ -69,6 +72,7 @@
id="menu_eaction_account_moves_all" id="menu_eaction_account_moves_all"
parent="account.menu_finance_entries" parent="account.menu_finance_entries"
sequence="4" sequence="4"
groups="group_account_user,group_account_manager,base.group_system"
/> />
</data> </data>
</openerp> </openerp>

6
addons/account_analytic_analysis/account_analytic_analysis_menu.xml
View File

@ -1,7 +1,7 @@
<openerp> <openerp>
<data> <data>
<menuitem icon="terp-project" id="base.menu_main_pm" name="Project" sequence="10"/> <menuitem icon="terp-project" id="base.menu_main_pm" name="Project" sequence="10"/>
<menuitem id="menu_invoicing" name="Billing" parent="base.menu_main_pm" sequence="4"/> <menuitem id="menu_invoicing" name="Billing" parent="base.menu_main_pm" sequence="4" groups="base.group_extended"/>
<record id="action_hr_tree_invoiced_all" model="ir.actions.act_window"> <record id="action_hr_tree_invoiced_all" model="ir.actions.act_window">
<field name="name">All Uninvoiced Entries</field> <field name="name">All Uninvoiced Entries</field>
@ -11,7 +11,7 @@
<field name="domain">[('invoice_id','=',False),('to_invoice','!=',False)]</field> <field name="domain">[('invoice_id','=',False),('to_invoice','!=',False)]</field>
<field name="search_view_id" ref="account.view_account_analytic_line_filter"/> <field name="search_view_id" ref="account.view_account_analytic_line_filter"/>
</record> </record>
<menuitem action="action_hr_tree_invoiced_all" id="menu_action_hr_tree_invoiced_all" parent="menu_invoicing"/> <menuitem action="action_hr_tree_invoiced_all" id="menu_action_hr_tree_invoiced_all" parent="menu_invoicing" groups="base.group_extended"/>
<record id="action_account_analytic_managed_overpassed" model="ir.actions.act_window"> <record id="action_account_analytic_managed_overpassed" model="ir.actions.act_window">
<field name="name">Overpassed Accounts</field> <field name="name">Overpassed Accounts</field>
@ -20,6 +20,6 @@
<field name="view_mode">tree,form,graph</field> <field name="view_mode">tree,form,graph</field>
<field name="domain">[('date','&lt;=',time.strftime('%Y-%m-%d')),('state','=','open')]</field> <field name="domain">[('date','&lt;=',time.strftime('%Y-%m-%d')),('state','=','open')]</field>
</record> </record>
<menuitem action="action_account_analytic_managed_overpassed" id="menu_action_account_analytic_managed_overpassed" sequence="50" parent="menu_invoicing"/> <menuitem action="action_account_analytic_managed_overpassed" id="menu_action_account_analytic_managed_overpassed" sequence="50" parent="menu_invoicing" groups="base.group_extended"/>
</data> </data>
</openerp> </openerp>

3
addons/account_analytic_default/account_analytic_default_view.xml
View File

@ -81,7 +81,8 @@
id="analytic_rule_action_user" id="analytic_rule_action_user"
res_model="account.analytic.default" res_model="account.analytic.default"
src_model="res.users" src_model="res.users"
domain="[('user_id','=',active_id)]"/> domain="[('user_id','=',active_id)]"
groups="base.group_extended"/>
<act_window <act_window
name="Analytic Rules" name="Analytic Rules"

2
addons/account_analytic_plans/account_analytic_plans.py
View File

@ -168,7 +168,7 @@ class account_analytic_plan_instance(osv.osv):
<field name="account%d_ids" string="%s" colspan="4"> <field name="account%d_ids" string="%s" colspan="4">
<tree string="%s" editable="bottom"> <tree string="%s" editable="bottom">
<field name="rate"/> <field name="rate"/>
<field name="analytic_account_id" domain="[('parent_id','child_of',[%d])]"/> <field name="analytic_account_id" domain="[('parent_id','child_of',[%d])]" groups="base.group_extended"/>
</tree> </tree>
</field> </field>
<newline/>"""%(i,tools.to_xml(line.name),tools.to_xml(line.name),line.root_analytic_id and line.root_analytic_id.id or 0) <newline/>"""%(i,tools.to_xml(line.name),tools.to_xml(line.name),line.root_analytic_id and line.root_analytic_id.id or 0)

14
addons/account_analytic_plans/account_analytic_plans_view.xml
View File

@ -24,7 +24,7 @@
<field name="inherit_id" ref="account.view_move_form"/> <field name="inherit_id" ref="account.view_move_form"/>
<field name="arch" type="xml"> <field name="arch" type="xml">
<field name="analytic_account_id" position="replace"> <field name="analytic_account_id" position="replace">
<field name="analytics_id" context="{'journal_id':journal_id}"/> <field name="analytics_id" context="{'journal_id':journal_id}" groups="base.group_extended"/>
</field> </field>
</field> </field>
</record> </record>
@ -60,7 +60,7 @@
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<field name="account_analytic_id" position="replace"> <field name="account_analytic_id" position="replace">
<field name="analytics_id" context="{'journal_id':parent.journal_id}" domain="[('plan_id','&lt;&gt;',False)]"/> <field name="analytics_id" context="{'journal_id':parent.journal_id}" domain="[('plan_id','&lt;&gt;',False)]" groups="base.group_extended"/>
</field> </field>
</field> </field>
</record> </record>
@ -73,7 +73,7 @@
<field name="priority">2</field> <field name="priority">2</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<field name="account_analytic_id" position="replace"> <field name="account_analytic_id" position="replace">
<field name="analytics_id" domain="[('plan_id','&lt;&gt;',False)]" context="{'journal_id':parent.journal_id}" /> <field name="analytics_id" domain="[('plan_id','&lt;&gt;',False)]" context="{'journal_id':parent.journal_id}" groups="base.group_extended"/>
</field> </field>
</field> </field>
</record> </record>
@ -92,11 +92,11 @@
<field name="account_ids" nolabel="1" colspan="4"> <field name="account_ids" nolabel="1" colspan="4">
<form string="Analytic Distribution"> <form string="Analytic Distribution">
<field name="rate"/> <field name="rate"/>
<field name="analytic_account_id"/> <field name="analytic_account_id" groups="base.group_extended"/>
</form> </form>
<tree string="Analytic Distribution" editable="bottom"> <tree string="Analytic Distribution" editable="bottom">
<field name="rate"/> <field name="rate"/>
<field name="analytic_account_id"/> <field name="analytic_account_id" groups="base.group_extended"/>
</tree> </tree>
</field> </field>
</form> </form>
@ -140,7 +140,7 @@
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Analytic Distribution Line"> <form string="Analytic Distribution Line">
<field name="plan_id"/> <field name="plan_id"/>
<field name="analytic_account_id"/> <field name="analytic_account_id" groups="base.group_extended"/>
<field name="rate"/> <field name="rate"/>
</form> </form>
</field> </field>
@ -153,7 +153,7 @@
<field name="arch" type="xml"> <field name="arch" type="xml">
<tree string="Analytic Distribution Lines"> <tree string="Analytic Distribution Lines">
<field name="plan_id" select="1"/> <field name="plan_id" select="1"/>
<field name="analytic_account_id" select="1"/> <field name="analytic_account_id" select="1" groups="base.group_extended"/>
<field name="rate"/> <field name="rate"/>
</tree> </tree>
</field> </field>

14
addons/account_budget/crossovered_budget_view.xml
View File

@ -78,14 +78,14 @@
<page string="Budget Lines"> <page string="Budget Lines">
<field name="crossovered_budget_line" widget="one2many_list" colspan="4" nolabel="1" mode="graph,tree"> <field name="crossovered_budget_line" widget="one2many_list" colspan="4" nolabel="1" mode="graph,tree">
<graph type="bar" string="Lines"> <graph type="bar" string="Lines">
<field name="analytic_account_id" /> <field name="analytic_account_id" groups="base.group_extended"/>
<!--<field name="general_budget_id" operator="+" />--> <!--<field name="general_budget_id" operator="+" />-->
<field name="planned_amount" operator="+"/> <field name="planned_amount" operator="+"/>
<field group="True" name="general_budget_id"/> <field group="True" name="general_budget_id"/>
</graph> </graph>
<tree string="Budget Lines" editable="top"> <tree string="Budget Lines" editable="top">
<field name="crossovered_budget_id"/> <field name="crossovered_budget_id"/>
<field name="analytic_account_id"/> <field name="analytic_account_id" groups="base.group_extended"/>
<field name="date_from"/> <field name="date_from"/>
<field name="date_to"/> <field name="date_to"/>
<field name="paid_date"/> <field name="paid_date"/>
@ -96,7 +96,7 @@
</tree> </tree>
<form string="Budget Lines"> <form string="Budget Lines">
<field name="crossovered_budget_id"/> <field name="crossovered_budget_id"/>
<field name="analytic_account_id"/> <field name="analytic_account_id" groups="base.group_extended"/>
<field name="date_from"/> <field name="date_from"/>
<field name="date_to"/> <field name="date_to"/>
<field name="paid_date"/> <field name="paid_date"/>
@ -126,7 +126,7 @@
<field name="date_to"/> <field name="date_to"/>
<field name="crossovered_budget_line" colspan="4" nolabel="1"> <field name="crossovered_budget_line" colspan="4" nolabel="1">
<tree string="Budget Lines"> <tree string="Budget Lines">
<field name="analytic_account_id"/> <field name="analytic_account_id" groups="base.group_extended"/>
<field name="general_budget_id"/> <field name="general_budget_id"/>
<field name="date_from"/> <field name="date_from"/>
<field name="date_to"/> <field name="date_to"/>
@ -137,7 +137,7 @@
<field name="percentage"/> <field name="percentage"/>
</tree> </tree>
<form string="Budget Lines"> <form string="Budget Lines">
<field name="analytic_account_id" select="1"/> <field name="analytic_account_id" select="1" groups="base.group_extended"/>
<field name="general_budget_id" select="1"/> <field name="general_budget_id" select="1"/>
<field name="date_from"/> <field name="date_from"/>
<field name="date_to"/> <field name="date_to"/>
@ -211,7 +211,7 @@
<field name="type">tree</field> <field name="type">tree</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<tree string="Budget Lines"> <tree string="Budget Lines">
<field name="analytic_account_id"/> <field name="analytic_account_id" groups="base.group_extended"/>
<field name="general_budget_id"/> <field name="general_budget_id"/>
<field name="date_from"/> <field name="date_from"/>
<field name="date_to"/> <field name="date_to"/>
@ -230,7 +230,7 @@
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Budget Lines"> <form string="Budget Lines">
<field name="crossovered_budget_id"/> <field name="crossovered_budget_id"/>
<field name="analytic_account_id" select="1"/> <field name="analytic_account_id" select="1" groups="base.group_extended"/>
<field name="general_budget_id" select="1"/> <field name="general_budget_id" select="1"/>
<field name="date_from"/> <field name="date_from"/>
<field name="date_to"/> <field name="date_to"/>

2
addons/auction/auction_view.xml
View File

@ -122,7 +122,7 @@
<separator string="Analytic" colspan="4"/> <separator string="Analytic" colspan="4"/>
<field name="journal_id"/> <field name="journal_id"/>
<field name="journal_seller_id"/> <field name="journal_seller_id"/>
<field name="account_analytic_id"/> <field name="account_analytic_id" groups="base.group_extended"/>
</page> </page>
<page string="Commissions"> <page string="Commissions">
<group col="4" colspan="4"> <group col="4" colspan="4">

13
addons/hr_expense/hr_expense_view.xml
View File

@ -13,7 +13,7 @@
<field name="date_value"/> <field name="date_value"/>
<field name="name"/> <field name="name"/>
<field name="ref"/> <field name="ref"/>
<field domain="[('type','=','normal')]" name="analytic_account"/> <field domain="[('type','=','normal')]" name="analytic_account" groups="base.group_extended"/>
<field name="unit_amount"/> <field name="unit_amount"/>
<field name="unit_quantity"/> <field name="unit_quantity"/>
<field name="total_amount"/> <field name="total_amount"/>
@ -67,6 +67,7 @@
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Expenses Sheet"> <form string="Expenses Sheet">
<group colspan="4" col="6"> <group colspan="4" col="6">
<field name="employee_id"/>
<field name="name" select="1"/> <field name="name" select="1"/>
<field name="ref" groups="base.group_extended"/> <field name="ref" groups="base.group_extended"/>
<field name="date" select="1"/> <field name="date" select="1"/>
@ -104,13 +105,17 @@
</group> </group>
</page> </page>
<page string="Other Info" groups="base.group_extended"> <page string="Other Info" groups="base.group_extended">
<separator colspan="4" string="Accounting data"/> <group col="2" colspan="2">
<separator colspan="2" string="Accounting data"/>
<field name="journal_id"/> <field name="journal_id"/>
<separator colspan="4" string="Validation"/> <field name="invoice_id"/>
</group>
<group col="2" colspan="2">
<separator colspan="2" string="Validation"/>
<field name="date_confirm" readonly = "1"/> <field name="date_confirm" readonly = "1"/>
<field name="date_valid" readonly = "1"/> <field name="date_valid" readonly = "1"/>
<field name="user_valid"/> <field name="user_valid"/>
<field name="invoice_id"/> </group>
<separator colspan="4" string="Notes"/> <separator colspan="4" string="Notes"/>
<field colspan="4" name="note" nolabel="1"/> <field colspan="4" name="note" nolabel="1"/>
</page> </page>

14
addons/hr_payroll/hr_payroll_view.xml
View File

@ -193,7 +193,7 @@
<field name="amount_type"/> <field name="amount_type"/>
<field name="amount" on_change="onchange_amount(amount, amount_type)"/> <field name="amount" on_change="onchange_amount(amount, amount_type)"/>
<field name="account_id"/> <field name="account_id"/>
<field name="analytic_account_id"/> <field name="analytic_account_id" groups="base.group_extended"/>
</tree> </tree>
</field> </field>
</page> </page>
@ -298,7 +298,7 @@
<group col="6" colspan="4"> <group col="6" colspan="4">
<field name="name" colspan="4" select="1"/> <field name="name" colspan="4" select="1"/>
<field name="code" select="1"/> <field name="code" select="1"/>
<field name="account_id" select="1"/> <field name="account_id" select="1" groups="base.group_extended"/>
<field name="company_id"/> <field name="company_id"/>
</group> </group>
<notebook colspan="4"> <notebook colspan="4">
@ -335,7 +335,7 @@
<separator colspan="4" string="Payroll Accounting"/> <separator colspan="4" string="Payroll Accounting"/>
<field name="company_id" widget="selection" select="2"/> <field name="company_id" widget="selection" select="2"/>
<field name="code"/> <field name="code"/>
<field name="analytic_account_id"/> <field name="analytic_account_id" groups="base.group_extended"/>
<field name="account_id"/> <field name="account_id"/>
</group> </group>
<group col="2" colspan="2"> <group col="2" colspan="2">
@ -363,7 +363,7 @@
<field name="amount_type"/> <field name="amount_type"/>
<field name="amount" on_change="onchange_amount(amount, amount_type)"/> <field name="amount" on_change="onchange_amount(amount, amount_type)"/>
<field name="account_id"/> <field name="account_id"/>
<field name="analytic_account_id"/> <field name="analytic_account_id" groups="base.group_extended"/>
</tree> </tree>
</field> </field>
</record> </record>
@ -391,7 +391,7 @@
<group col="2" colspan="2"> <group col="2" colspan="2">
<separator colspan="4" string="Accounting Informations"/> <separator colspan="4" string="Accounting Informations"/>
<field name="account_id"/> <field name="account_id"/>
<field name="analytic_account_id"/> <field name="analytic_account_id" groups="base.group_extended"/>
<separator colspan="4" string="Company contribution"/> <separator colspan="4" string="Company contribution"/>
<field name="company_contrib"/> <field name="company_contrib"/>
</group> </group>
@ -463,7 +463,7 @@
<field name="amount" on_change="onchange_amount(amount, amount_type)"/> <field name="amount" on_change="onchange_amount(amount, amount_type)"/>
<field name="total"/> <field name="total"/>
<field name="account_id"/> <field name="account_id"/>
<field name="analytic_account_id"/> <field name="analytic_account_id" groups="base.group_extended"/>
</tree> </tree>
</field> </field>
@ -956,7 +956,7 @@
<form string="Contribution"> <form string="Contribution">
<field name="name" select="1"/> <field name="name" select="1"/>
<field name="account_id"/> <field name="account_id"/>
<field name="analytic_account_id"/> <field name="analytic_account_id" groups="base.group_extended"/>
<field name="company_id" select="1"/> <field name="company_id" select="1"/>
<notebook colspan="4"> <notebook colspan="4">
<page string="Contribution Lines"> <page string="Contribution Lines">

2
addons/hr_timesheet/hr_timesheet_view.xml
View File

@ -34,7 +34,7 @@
<newline/> <newline/>
<field name="product_id" on_change="on_change_unit_amount(product_id, unit_amount, product_uom_id)" required="1" domain="[('type','=','service')]"/> <field name="product_id" on_change="on_change_unit_amount(product_id, unit_amount, product_uom_id)" required="1" domain="[('type','=','service')]"/>
<field name="product_uom_id" on_change="on_change_unit_amount(product_id, unit_amount, product_uom_id)"/> <field name="product_uom_id" on_change="on_change_unit_amount(product_id, unit_amount, product_uom_id)"/>
<field domain="[('type','=','normal'),('state', '&lt;&gt;', 'close')]" name="account_id" select="1"/> <field domain="[('type','=','normal'),('state', '&lt;&gt;', 'close')]" name="account_id" select="1" groups="base.group_extended"/>
<field name="amount"/> <field name="amount"/>
<field name="general_account_id"/> <field name="general_account_id"/>
<field name="journal_id"/> <field name="journal_id"/>

4
addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml
View File

@ -417,7 +417,7 @@
<field name="type">tree</field> <field name="type">tree</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<tree string="Random Timesheets"> <tree string="Random Timesheets">
<field name="analytic_account_id" select="1"/> <field name="analytic_account_id" select="1" groups="base.group_extended"/>
<field name="name" select="1"/> <field name="name" select="1"/>
<field name="quantity" select="2" /> <field name="quantity" select="2" />
<field name="date" select="1"/> <field name="date" select="1"/>
@ -470,7 +470,7 @@
<field name="name" select="1"/> <field name="name" select="1"/>
<field name="quantity" /> <field name="quantity" />
<field name="product_id" select="1"/> <field name="product_id" select="1"/>
<field name="analytic_account_id" select="1"/> <field name="analytic_account_id" select="1" groups="base.group_extended"/>
<field name="uom_id" /> <field name="uom_id" />
<field name="amount" /> <field name="amount" />
<field name="to_invoice" select="1"/> <field name="to_invoice" select="1"/>

4
addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
View File

@ -39,7 +39,7 @@
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Timesheet by Accounts"> <form string="Timesheet by Accounts">
<field name="sheet_id" select="1"/> <field name="sheet_id" select="1"/>
<field name="name" select="1"/> <field name="name" select="1" groups="base.group_extended"/>
<field name="total" sum="Total"/> <field name="total" sum="Total"/>
<field name="invoice_rate"/> <field name="invoice_rate"/>
</form> </form>
@ -53,7 +53,7 @@
<field name="arch" type="xml"> <field name="arch" type="xml">
<tree string="Timesheet by Accounts"> <tree string="Timesheet by Accounts">
<field name="sheet_id"/> <field name="sheet_id"/>
<field name="name"/> <field name="name" groups="base.group_extended"/>
<field name="total" sum="Total"/> <field name="total" sum="Total"/>
<field name="invoice_rate"/> <field name="invoice_rate"/>
</tree> </tree>

2
addons/project_issue_sheet/project_issue_sheet_view.xml
View File

@ -9,7 +9,7 @@
<field name="arch" type="xml"> <field name="arch" type="xml">
<notebook colspan="4"> <notebook colspan="4">
<page string="Worklogs"> <page string="Worklogs">
<field name="analytic_account_id" invisible="1"/> <field name="analytic_account_id" invisible="1" groups="base.group_extended"/>
<field name="timesheet_ids" colspan="4" nolabel="1" context="{'default_user_id' : user_id, 'default_account_id' : analytic_account_id}"> <field name="timesheet_ids" colspan="4" nolabel="1" context="{'default_user_id' : user_id, 'default_account_id' : analytic_account_id}">
<tree editable="top" string="Timesheet"> <tree editable="top" string="Timesheet">
<field name="name"/> <field name="name"/>

18
addons/project_planning/project_planning_view.xml
View File

@ -54,7 +54,7 @@
<field colspan="4" name="planning_account" <field colspan="4" name="planning_account"
nolabel="1" widget="one2many_list" readonly="1"> nolabel="1" widget="one2many_list" readonly="1">
<tree string="Planning By Account (in Days)"> <tree string="Planning By Account (in Days)">
<field name="account_id" /> <field name="account_id" groups="base.group_extended"/>
<field name="tasks" sum="Total Remaining Tasks"/> <field name="tasks" sum="Total Remaining Tasks"/>
<field name="plan_tasks" sum="Total Time Allocation of Tasks"/> <field name="plan_tasks" sum="Total Time Allocation of Tasks"/>
<field name="plan_open" sum="Total Time Allocation without Tasks"/> <field name="plan_open" sum="Total Time Allocation without Tasks"/>
@ -68,7 +68,7 @@
<tree editable="bottom" <tree editable="bottom"
string="Planning Lines"> string="Planning Lines">
<field name="user_id"/> <field name="user_id"/>
<field name="account_id" /> <field name="account_id" groups="base.group_extended"/>
<field name="amount" /> <field name="amount" />
<field name="amount_unit" /> <field name="amount_unit" />
<field name="task_ids" /> <field name="task_ids" />
@ -78,7 +78,7 @@
</tree> </tree>
<form string="Planning Lines"> <form string="Planning Lines">
<field name="user_id" domain="[('id','child_of',[parent.user_id])]"/> <field name="user_id" domain="[('id','child_of',[parent.user_id])]"/>
<field name="account_id"/> <field name="account_id" groups="base.group_extended"/>
<field name="amount" /> <field name="amount" />
<field name="amount_unit" /> <field name="amount_unit" />
<field name="task_ids" colspan="4" nolabel="1" mode="tree,form"> <field name="task_ids" colspan="4" nolabel="1" mode="tree,form">
@ -181,7 +181,7 @@
<tree string="Planning Line"> <tree string="Planning Line">
<field name="planning_id"/> <field name="planning_id"/>
<field name="user_id"/> <field name="user_id"/>
<field name="account_id" /> <field name="account_id" groups="base.group_extended"/>
<field name="amount" /> <field name="amount" />
<field name="amount_unit" /> <field name="amount_unit" />
<field name="note" select="1"/> <field name="note" select="1"/>
@ -198,7 +198,7 @@
<form string="Planning Line"> <form string="Planning Line">
<field name="planning_id" select="1"/> <field name="planning_id" select="1"/>
<field name="user_id" select="1"/> <field name="user_id" select="1"/>
<field name="account_id" select="1"/> <field name="account_id" select="1" groups="base.group_extended"/>
<field name="amount" /> <field name="amount" />
<field name="amount_unit" /> <field name="amount_unit" />
<separator string="Notes" colspan="4" /> <separator string="Notes" colspan="4" />
@ -234,7 +234,7 @@
<form string="Planning statistics"> <form string="Planning statistics">
<field name="planning_id" select="1" /> <field name="planning_id" select="1" />
<field name="user_id" select="1" /> <field name="user_id" select="1" />
<field name="account_id" select="1" /> <field name="account_id" select="1" groups="base.group_extended"/>
</form> </form>
</field> </field>
</record> </record>
@ -249,7 +249,7 @@
<field name="planning_id" /> <field name="planning_id" />
<field name="user_id" /> <field name="user_id" />
<field name="manager_id" /> <field name="manager_id" />
<field name="account_id" /> <field name="account_id" groups="base.group_extended"/>
<field name="sum_amount" /> <field name="sum_amount" />
<field name="sum_amount_real" /> <field name="sum_amount_real" />
<field name="sum_amount_tasks" /> <field name="sum_amount_tasks" />
@ -283,7 +283,7 @@
<separator orientation="vertical"/> <separator orientation="vertical"/>
<field name="planning_id" select="1"/> <field name="planning_id" select="1"/>
<field name="user_id" select="1"/> <field name="user_id" select="1"/>
<field name="account_id" select="1"/> <field name="account_id" select="1" groups="base.group_extended"/>
</group> </group>
</search> </search>
</field> </field>
@ -325,7 +325,7 @@
<tree editable="bottom" <tree editable="bottom"
string="Planning Lines"> string="Planning Lines">
<field name="user_id"/> <field name="user_id"/>
<field name="account_id" /> <field name="account_id" groups="base.group_extended"/>
<field name="amount" /> <field name="amount" />
<field name="amount_unit" /> <field name="amount_unit" />
<field name="task_ids" /> <field name="task_ids" />

2
addons/purchase_analytic_plans/purchase_analytic_plans_view.xml
View File

@ -9,7 +9,7 @@
<field name="inherit_id" ref="purchase.purchase_order_line_form"/> <field name="inherit_id" ref="purchase.purchase_order_line_form"/>
<field name="arch" type="xml"> <field name="arch" type="xml">
<field name="account_analytic_id" position="replace"> <field name="account_analytic_id" position="replace">
<field name="analytics_id" domain="[('plan_id','&lt;&gt;',False)]"/> <field name="analytics_id" domain="[('plan_id','&lt;&gt;',False)]" groups="base.group_extended"/>
</field> </field>
</field> </field>
</record> </record>

2
addons/sale/report/sale_report_view.xml
View File

@ -26,7 +26,7 @@
<field name="price_total" sum="Total Price"/> <field name="price_total" sum="Total Price"/>
<field name="delay" sum="Commitment Delay"/> <field name="delay" sum="Commitment Delay"/>
<field name="state" invisible="1"/> <field name="state" invisible="1"/>
<field name="analytic_account_id" invisible="1"/> <field name="analytic_account_id" invisible="1" groups="base.group_extended"/>
</tree> </tree>
</field> </field>
</record> </record>