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

[IMP]: improve account module, account followup, voucher 

[FIX]: convert TAB -> SPACE in some files

bzr revid: mga@tinyerp.com-20100728210827-rgd0r2w8wmvmmrz1
This commit is contained in:
Mantavya Gajjar 2010-07-29 02:38:27 +05:30
parent f90ce504a4
commit 3a1dd3dafd
11 changed files with 48 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
addons/account/account_view.xml
View File

@ -266,14 +266,7 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Journal Column">
<field colspan="4" name="name" select="1"/><field name="name"/>
<field name="date"/>
<field name="period_id"/>
<field name="journal_id"/>
<field name="balance_start"/>
<field name="balance_end_real"/>
<field name="balance_end"/>
<field name="state"/>
<field colspan="4" name="name" select="1"/>
<field name="field" select="1"/>
<field name="sequence"/>
<!-- <newline/>-->
@ -1651,7 +1644,7 @@
</field>
</record>
<record id="action_model_form" model="ir.actions.act_window">
<field name="name">Define Recurring</field>
<field name="name">Recurring Models</field>
<field name="res_model">account.model</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
@ -1916,11 +1909,11 @@
<act_window domain="[('journal_id', '=', active_id)]" id="act_account_journal_2_account_bank_statement" name="Bank statements" res_model="account.bank.statement" src_model="account.journal"/>
<act_window domain="[('journal_id', '=', active_id)]" id="act_account_journal_2_account_move_line" name="Entry lines" res_model="account.move.line" src_model="account.journal"/>
<act_window domain="[('journal_id', '=', active_id)]" id="act_account_journal_2_account_move_line" name="Journal Items" res_model="account.move.line" src_model="account.journal"/>
<act_window domain="[('partner_id', '=', active_id), ('account_id.type', 'in', ['receivable', 'payable'])]" id="act_account_partner_account_move_all" name="Receivables &amp; Payables" res_model="account.move.line" src_model="res.partner"/>
<act_window context="{'search_default_reconcile_id':False}" domain="[('partner_id', '=', active_id),('reconcile_id','=',False),('account_id.reconcile', '=', True),('account_id.type', 'in', ['receivable', 'payable'])]" id="act_account_partner_account_move_all" name="Receivables &amp; Payables" res_model="account.move.line" src_model="res.partner"/>
<act_window domain="[('partner_id', '=', active_id)]" id="act_account_partner_account_move" name="All Account Entries" res_model="account.move.line" src_model="res.partner"/>
<act_window domain="[('partner_id', '=', active_id)]" id="act_account_partner_account_move" name="Journal Items" res_model="account.move.line" src_model="res.partner"/>
<record id="view_account_addtmpl_wizard_form" model="ir.ui.view">
<field name="name">Create Account</field>

6
addons/account/data/account_data2.xml
View File

@ -74,12 +74,6 @@
<field name="field">credit</field>
<field eval="11" name="sequence"/>
</record>
<record id="bank_col12" model="account.journal.column">
<field name="view_id" ref="account_journal_bank_view"/>
<field name="name">Analytic Account</field>
<field name="field">analytic_account_id</field>
<field eval="13" name="sequence"/>
</record>
<record id="bank_col3" model="account.journal.column">
<field name="view_id" ref="account_journal_bank_view"/>
<field name="name">Ref</field>

2
addons/account/partner_view.xml
View File

@ -10,7 +10,7 @@
<form string="Fiscal Position">
<field name="name" select="1"/>
<field name="company_id" widget="selection" groups="base.group_multi_company"/>
<separator string="Mapping" colspan="4"/>
<separator string="Mapping" colspan="4"/>
<newline/>
<field name="tax_ids" colspan="2" widget="one2many_list" nolabel="1">
<tree string="Tax Mapping" editable="bottom">

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

@ -113,7 +113,7 @@
<field name="search_view_id" ref="account.view_account_analytic_account_search"/>
</record>
<!--<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"/>
<menuitem action="action_account_analytic_account_form" id="account_analytic_def_account" parent="menu_analytic_accounting"/>
<record id="act_account_renew_view" model="ir.actions.act_window">
<field name="name">Accounts to Renew</field>
@ -335,7 +335,7 @@
<field name="view_type">form</field>
<field name="view_mode">tree,form,search</field>
</record>
<menuitem action="action_account_analytic_journal_form" id="account_def_analytic_journal" parent="menu_analytic"/>
<menuitem action="action_account_analytic_journal_form" id="account_def_analytic_journal" parent="menu_analytic_accounting"/>
#
# Open journal entries
@ -469,7 +469,7 @@
<field name="view_mode">tree,graph</field>
<field name="search_view_id" ref="report_hr_timesheet_invoice_journal_search"/>
</record>
<menuitem action="report_account_analytic_journal_tree" id="report_account_analytic_journal_print" parent="account.next_id_40"/>
<!-- <menuitem action="report_account_analytic_journal_tree" id="report_account_analytic_journal_print" parent="account.next_id_40"/>-->
<act_window domain="[('account_id', '=', active_id)]" id="act_acc_analytic_acc_5_report_hr_timesheet_invoice_journal" name="All Analytic Entries" res_model="account.analytic.line" src_model="account.analytic.account" view_mode="tree,form" view_type="form"/>

20
addons/account/wizard/account_subscription_generate_view.xml
View File

@ -2,34 +2,34 @@
<openerp>
<data>
<record id="view_account_subscription_generate" model="ir.ui.view">
<record id="view_account_subscription_generate" model="ir.ui.view">
<field name="name">account.subscription.generate.form</field>
<field name="model">account.subscription.generate</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Subscription Compute">
<group colspan="4" >
<separator string="Generate entries before:" colspan="4"/>
<field name="date"/>
<separator string="Generate entries before:" colspan="4"/>
<field name="date"/>
</group>
<separator string="" colspan="4" />
<separator string="" colspan="4" />
<group colspan="4" col="6">
<label string ="" colspan="2"/>
<label string ="" colspan="2"/>
<button icon="gtk-cancel" special="cancel" string="Cancel" />
<button icon="gtk-execute" string="Compute Entry Dates"
name="action_generate" type="object" />
name="action_generate" type="object" />
</group>
</form>
</field>
</record>
</record>
<record id="action_account_subscription_generate" model="ir.actions.act_window">
<field name="name">Automatic Recurring</field>
<field name="name">Generate Entries</field>
<field name="res_model">account.subscription.generate</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="view_id" ref="view_account_subscription_generate"/>
<field name="target">new</field>
<field name="view_id" ref="view_account_subscription_generate"/>
<field name="target">new</field>
</record>
<menuitem action="action_account_subscription_generate" id="menu_generate_subscription" parent="account.menu_finance_recurrent_entries" />

4
addons/account/wizard/account_use_model_view.xml
View File

@ -42,8 +42,8 @@
<field name="model">account.move.line</field>
</record>
<menuitem action="action_view_account_use_model"
parent="account.menu_finance_recurrent_entries" id="menu_account_use_model"/>
<!-- <menuitem action="action_view_account_use_model"-->
<!-- parent="account.menu_finance_recurrent_entries" id="menu_account_use_model"/>-->
<record id="view_account_use_model_open_entry" model="ir.ui.view">
<field name="name">account.use.model.open.entry.form</field>

4
addons/account_analytic_plans/account_analytic_plans_view.xml
View File

@ -192,8 +192,8 @@
<field name="view_mode">tree,form</field>
</record>
<menuitem
parent="account.menu_analytic"
<menuitem
parent="account.menu_analytic_accounting"
name="Multi Plans"
id="menu_account_analytic_multi_plan_action"
/>

2
addons/account_followup/account_followup_view.xml
View File

@ -136,7 +136,7 @@
</field>
</record>
<act_window domain="[('partner_id', '=', active_id),('reconcile_id','=',False),('account_id.reconcile', '=', True),('account_id.type', 'in', ['receivable', 'payable'])]" id="account.act_account_partner_account_move_unreconciled" name="Receivables &amp; Payables" res_model="account.move.line" view="account_move_line_partner_tree"/>
<!-- <act_window context="{'search_default_reconcile_id':False}" domain="[('partner_id', '=', active_id),('reconcile_id','=',False),('account_id.reconcile', '=', True),('account_id.type', 'in', ['receivable', 'payable'])]" id="account.act_account_partner_account_move_unreconciled" name="Receivables &amp; Payables" res_model="account.move.line" view="account_move_line_partner_tree"/>-->
<act_window domain="[('reconcile_id', '=', False),('account_id.type','=','receivable')]" id="act_account_partner_account_move_all" name="All receivable entries" res_model="account.move.line" src_model="" view="account_move_line_partner_tree"/>

12
addons/account_report/account_view.xml
View File

@ -90,8 +90,12 @@
<field name="domain"/>
<field name="view_id" ref="view_account_report_tree_simple"/>
</record>
<menuitem
parent="account.menu_finance_generic_reporting"
id="menu_menu_finance_generic_reporting"
name="Reporting"/>
<menuitem action="action_account_report_tree" id="menu_action_account_report_tree_define" parent="account.menu_finance_configuration" sequence="20"/>
<menuitem action="action_account_report_tree" id="menu_action_account_report_tree_define" parent="menu_menu_finance_generic_reporting" sequence="20"/>
<record id="view_account_report_tree" model="ir.ui.view">
<field name="name">account.report.report.tree</field>
@ -110,14 +114,14 @@
</record>
<record id="action_account_report_tree_view" model="ir.actions.act_window">
<field name="name">Custom reporting</field>
<field name="name">Custom Reporting</field>
<field name="res_model">account.fiscalyear</field>
<field name="view_type">tree</field>
<field name="view_id" ref="view_account_report_tree"/>
<field name="domain">[('parent_id','=',False)]</field>
</record>
<menuitem action="action_account_report_tree_view" id="menu_action_account_report_tree_view" parent="account.menu_finance_generic_reporting" sequence="5"/>
<menuitem action="action_account_report_tree_view" id="menu_action_account_report_tree_view" parent="menu_menu_finance_generic_reporting" sequence="5"/>
<record id="action_account_report_tree_view_fiscal" model="ir.actions.act_window">
<field name="name">Fiscal Statements reporting</field>

8
addons/account_voucher/voucher_view.xml
View File

@ -9,6 +9,7 @@
<tree colors="blue:state in ('draft');gray:state in ('cancel','done');black:state in ('open','proforma','posted','recheck','audit')" string="Voucher Entries">
<field name="date"/>
<field name="number"/>
<field name="reference"/>
<field name="name"/>
<field name="journal_id"/>
<field name="type" invisible=" not context.get('set_visible',True)"/>
@ -105,8 +106,11 @@
</group>
<newline/>
<group expand="0" string="Extended options...">
<field name="journal_id" widget="selection" context="{'journal_id': self, 'set_visible':False}" />
<field name="period_id" widget="selection" context="{'period_id': self}" groups="base.group_extended"/>
<field name="journal_id" widget="selection" context="{'journal_id': self, 'set_visible':False}" />
<field name="period_id" widget="selection" context="{'period_id': self}" groups="base.group_extended"/>
<separator orientation="vertical"/>
<field name="narration" select="1"/>
<field name="date" select='1'/>
</group>
</search>
</field>

21
addons/hr_timesheet_invoice/report/report_analytic_view.xml
View File

@ -57,8 +57,7 @@
<field name="view_mode">tree,graph</field>
<field name="domain">[('state','=','open')]</field>
</record>
<menuitem action="action_analytic_account_tree" id="menu_action_analytic_account_tree" parent="account.next_id_40"/>
<!-- <menuitem action="action_analytic_account_tree" id="menu_action_analytic_account_tree" parent="account.next_id_40"/>-->
<record id="account_analytic_line_to_invoice_view_form" model="ir.ui.view">
<field name="name">report.account.analytic.line.to.invoice</field>
@ -109,20 +108,20 @@
</field>
</record>
<record id="account_analytic_line_to_invoice_view_filter" model="ir.ui.view">
<record id="account_analytic_line_to_invoice_view_filter" model="ir.ui.view">
<field name="name">report.account.analytic.line.to.invoice.select</field>
<field name="model">report.account.analytic.line.to.invoice</field>
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Analytic Lines to Invoice">
<group col="12" colspan="4">
<filter string="This Year" icon="terp-go-year" domain="[('name','=',time.localtime()[0])]"/>
<filter string="This Month" icon="terp-go-month" domain="[('month','=',time.localtime()[1])]"/>
<separator orientation="vertical"/>
<field name="name" select="1"/>
<field name="month" select="1"/>
<field name="product_id" select="1"/>
<field name="account_id" select="1"/>
<filter string="This Year" icon="terp-go-year" domain="[('name','=',time.localtime()[0])]"/>
<filter string="This Month" icon="terp-go-month" domain="[('month','=',time.localtime()[1])]"/>
<separator orientation="vertical"/>
<field name="name" select="1"/>
<field name="month" select="1"/>
<field name="product_id" select="1"/>
<field name="account_id" select="1"/>
</group>
</search>
</field>
@ -135,7 +134,7 @@
<field name="view_mode">tree,graph</field>
<field name="search_view_id" ref="account_analytic_line_to_invoice_view_filter"/>
</record>
<menuitem action="action_account_analytic_line_to_invoice" id="account_analytic_lines_to_invoice_report" parent="account.next_id_40"/>
<!-- <menuitem action="action_account_analytic_line_to_invoice" id="account_analytic_lines_to_invoice_report" parent="account.next_id_40"/>-->
<act_window domain="[('account_id', '=', active_id),('invoice_id','=',False),('to_invoice','&lt;&gt;',False)]" id="act_acc_analytic_acc_2_report_acc_analytic_line_to_invoice" name="Lines to Invoice" res_model="account.analytic.line" src_model="account.analytic.account"/>