[IMP] account: common wizard dev
bzr revid: qdp-launchpad@tinyerp.com-20100614115548-amilfzdb88teqgu5
This commit is contained in:
qdp-launchpad@tinyerp.com
parent
d61f1b3c3e
commit
cc4688f481
|
|
@ -73,7 +73,7 @@ module named account_voucherss
|
|||
'wizard/account_validate_move_view.xml',
|
||||
'wizard/account_pay_invoice_view.xml',
|
||||
'wizard/account_unreconcile_view.xml',
|
||||
'wizard/account_general_ledger_report_view.xml',
|
||||
'wizard/account_report_general_ledger_view.xml',
|
||||
'wizard/account_invoice_state_view.xml',
|
||||
'wizard/account_partner_balance_report_view.xml',
|
||||
'wizard/account_balance_report_view.xml',
|
||||
|
|
|
|||
|
|
@ -33,7 +33,8 @@ import account_journal_select
|
|||
import account_move_bank_reconcile
|
||||
import account_subscription_generate
|
||||
import account_aged_trial_balance
|
||||
import account_general_ledger_report
|
||||
#import account_general_ledger_report
|
||||
import account_report_general_ledger
|
||||
import account_third_party_ledger
|
||||
import account_partner_balance_report
|
||||
import account_balance_report
|
||||
|
|
|
|||
|
|
@ -112,6 +112,8 @@ class account_common_report(osv.osv_memory):
|
|||
raise _('not implemented')
|
||||
|
||||
def check_report(self, cr, uid, ids, context=None):
|
||||
import pdb
|
||||
pdb.set_trace()
|
||||
used_context = self._build_context(cr, uid, ids, data, context)
|
||||
query_line = obj_acc_move_line._query_get(cr, uid,
|
||||
obj='account_move_line', context=used_context)
|
||||
|
|
|
|||
|
|
@ -50,6 +50,6 @@ class account_report_general_ledger(osv.osv_memory):
|
|||
return { 'type': 'ir.actions.report.xml', 'report_name': 'account.general.ledger', 'datas': data, 'nodestroy':True, }
|
||||
|
||||
|
||||
account_general_ledger_report()
|
||||
account_report_general_ledger()
|
||||
|
||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
|
|
|
|||
|
|
@ -2,91 +2,48 @@
|
|||
<openerp>
|
||||
<data>
|
||||
|
||||
<record id="account_general_ledger_report_view" model="ir.ui.view">
|
||||
<record id="account_report_general_ledger_view" model="ir.ui.view">
|
||||
<field name="name">General Ledger</field>
|
||||
<field name="model">account.general.ledger.report</field>
|
||||
<field name="model">account.report.general.ledger</field>
|
||||
<field name="type">form</field>
|
||||
<field name="inherit_id" ref="account_common_report_view" />
|
||||
<field name="arch" type="xml">
|
||||
<form string="Select Date-Period">
|
||||
<field name="company_id" colspan="4" groups="base.group_multi_company"/>
|
||||
<newline/>
|
||||
<field name="fiscalyear"/>
|
||||
<label colspan="2" string="(Keep empty for all open fiscal years)" align="0.0"/>
|
||||
<newline/>
|
||||
|
||||
<field name="display_account" required="True"/>
|
||||
<field name="sortbydate" required="True"/>
|
||||
|
||||
<field name="soldeinit" invisible="1"/>
|
||||
|
||||
<field name="landscape"/>
|
||||
<field name="amount_currency"/>
|
||||
<newline/>
|
||||
<separator string="Filters" colspan="4"/>
|
||||
<field name="state" required="True"/>
|
||||
<newline/>
|
||||
<group attrs="{'invisible':[('state','=','none')]}" colspan="4">
|
||||
<group attrs="{'invisible':[('state','=','byperiod')]}" colspan="4">
|
||||
<separator string="Date Filter" colspan="4"/>
|
||||
<field name="date_from"/>
|
||||
<field name="date_to"/>
|
||||
</group>
|
||||
<group attrs="{'invisible':[('state','=','bydate')]}" colspan="4">
|
||||
<separator string="Filter on Periods" colspan="4"/>
|
||||
<field name="periods" colspan="4" nolabel="1"/>
|
||||
</group>
|
||||
</group>
|
||||
<newline/>
|
||||
<group colspan="4" col="6">
|
||||
<separator colspan="4"/>
|
||||
<button special="cancel" string="Cancel" icon="gtk-cancel"/>
|
||||
<button name="check_report" string="Print" type="object" icon="gtk-print"/>
|
||||
</group>
|
||||
</form>
|
||||
<field name="journal_ids" position="after">
|
||||
<field name="display_account"/>
|
||||
<field name="landscape"/>
|
||||
<field name="soldeinit"/>
|
||||
<field name="amount_currency"/>
|
||||
</field>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
<record id="action_account_general_ledger_report" model="ir.actions.act_window">
|
||||
<!-- <record id="action_account_report_general_ledger" model="ir.actions.act_window">
|
||||
<field name="name">General Ledger</field>
|
||||
<field name="type">ir.actions.act_window</field>
|
||||
<field name="res_model">account.general.ledger.report</field>
|
||||
<field name="res_model">account.report.general.ledger</field>
|
||||
<field name="view_type">form</field>
|
||||
<field name="view_mode">form</field>
|
||||
<field name="view_id" ref="account_general_ledger_report_view"/>
|
||||
<field name="view_id" ref="account_report_general_ledger_view"/>
|
||||
<field name="target">new</field>
|
||||
</record>
|
||||
|
||||
<record model="ir.values" id="account_general_ledger_report_values">
|
||||
<record model="ir.values" id="account_report_general_ledger_values">
|
||||
<field name="model_id" ref="account.model_account_account" />
|
||||
<field name="object" eval="1" />
|
||||
<field name="name">Account General Ledger</field>
|
||||
<field name="key2">client_print_multi</field>
|
||||
<field name="value" eval="'ir.actions.act_window,' + str(ref('action_account_general_ledger_report'))" />
|
||||
<field name="value" eval="'ir.actions.act_window,' + str(ref('action_account_report_general_ledger'))" />
|
||||
<field name="key">action</field>
|
||||
<field name="model">account.account</field>
|
||||
</record>
|
||||
|
||||
<record id="account_general_ledger_report_view1" model="ir.ui.view">
|
||||
<field name="name">General Ledger</field>
|
||||
<field name="model">account.general.ledger.report</field>
|
||||
<field name="type">form</field>
|
||||
<field name="arch" type="xml">
|
||||
<form string="Select Chart">
|
||||
<field name="Account_list"/>
|
||||
<separator colspan="4"/>
|
||||
<button icon="gtk-cancel" special="cancel" string="Cancel"/>
|
||||
<button name="next_view" string="Next" type="object" icon="gtk-go-forward" default_focus="1"/>
|
||||
</form>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
<record id="action_account_general_ledger_menu" model="ir.actions.act_window">
|
||||
<field name="name">Select Chart</field>
|
||||
-->
|
||||
<record id="action_account_general_ledger_menu" model="ir.actions.act_window">
|
||||
<field name="name">Account General Ledger</field>
|
||||
<field name="type">ir.actions.act_window</field>
|
||||
<field name="res_model">account.general.ledger.report</field>
|
||||
<field name="res_model">account.report.general.ledger</field>
|
||||
<field name="view_type">form</field>
|
||||
<field name="view_mode">form</field>
|
||||
<field name="view_id" ref="account_general_ledger_report_view1"/>
|
||||
<field name="view_id" ref="account_report_general_ledger_view"/>
|
||||
<field name="target">new</field>
|
||||
</record>
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue