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

[MERGE] 

bzr revid: hmo@tinyerp.com-20100820092348-74m7l04tdwvo336u
This commit is contained in:
Harry (OpenERP) 2010-08-20 14:53:48 +05:30
parent 1a25228545 408d9e326b
commit e459cec005
233 changed files with 710 additions and 3528 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
addons/account/__openerp__.py
View File

@ -45,7 +45,6 @@ module named account_voucher.
'init_xml': [],
"depends" : ["product", "analytic", "process","board"],
'update_xml': [
#'test/test_parent_structure.yml',
'security/account_security.xml',
'security/ir.model.access.csv',
'account_menuitem.xml',
@ -80,7 +79,6 @@ module named account_voucher.
'wizard/account_invoice_state_view.xml',
'wizard/account_report_partner_balance_view.xml',
'wizard/account_report_account_balance_view.xml',
# 'wizard/account_move_line_select_view.xml',
'wizard/account_report_aged_partner_balance_view.xml',
'wizard/account_compare_account_balance_report_view.xml',
'wizard/account_report_partner_ledger_view.xml',
@ -120,7 +118,6 @@ module named account_voucher.
"wizard/account_report_balance_sheet_view.xml"
],
'demo_xml': [
#'demo/price_accuracy00.yml',
'account_demo.xml',
'project/project_demo.xml',
'project/analytic_account_demo.xml',
@ -135,7 +132,6 @@ module named account_voucher.
'test/chart_of_account.yml',
'test/account_period_close.yml',
'test/account_fiscalyear_close_state.yml',
#'test/account_invoice_state.yml',
'test/account_use_model.yml',
'test/account_validate_account_move.yml',
'test/account_fiscalyear_close.yml',

29
addons/account/account.py
View File

@ -686,14 +686,6 @@ class account_journal(osv.osv):
'sequence_id':seq_id
})
# if journal.type in journal_type and not journal.invoice_sequence_id:
# res_ids = date_pool.search(cr, uid, [('model','=','ir.sequence'), ('name','=',journal_seq.get(journal.type, 'sale'))])
# inv_seq_id = date_pool.browse(cr, uid, res_ids[0]).res_id
# inv_seq_id
# res.update({
# 'invoice_sequence_id':inv_seq_id
# })
result = self.write(cr, uid, [journal.id], res)
return result
@ -701,16 +693,6 @@ class account_journal(osv.osv):
def create(self, cr, uid, vals, context={}):
journal_id = super(account_journal, self).create(cr, uid, vals, context)
self.create_sequence(cr, uid, [journal_id], context)
# journal_name = self.browse(cr, uid, [journal_id])[0].code
# periods = self.pool.get('account.period')
# ids = periods.search(cr, uid, [('date_stop','>=',time.strftime('%Y-%m-%d'))])
# for period in periods.browse(cr, uid, ids):
# self.pool.get('account.journal.period').create(cr, uid, {
# 'name': (journal_name or '')+':'+(period.code or ''),
# 'journal_id': journal_id,
# 'period_id': period.id
# })
return journal_id
def name_search(self, cr, user, name, args=None, operator='ilike', context=None, limit=100):
@ -724,7 +706,6 @@ class account_journal(osv.osv):
if name:
ids = self.search(cr, user, [('code', 'ilike', name)]+ args, limit=limit, context=context)
if not ids:
# ids = self.search(cr, user, [('name', operator, name)]+ args, limit=limit, context=context)
ids = self.search(cr, user, [('name', 'ilike', name)]+ args, limit=limit, context=context)#fix it ilike should be replace with operator
return self.name_get(cr, user, ids, context=context)
@ -1412,8 +1393,6 @@ class account_move(osv.osv):
self.pool.get('account.move.line').write(cr, uid, line_ids, {
'journal_id': move.journal_id.id,
'period_id': move.period_id.id,
#'tax_code_id': False,
#'tax_amount': False,
'state': 'draft'
}, context, check=False)
# Create analytic lines for the valid moves
@ -1896,8 +1875,6 @@ class account_tax(osv.osv):
amount = localdict['result']
elif tax.type=='balance':
amount = cur_price_unit - reduce(lambda x,y: y.get('amount',0.0)+x, res, 0.0)
# data['balance'] = cur_price_unit
if tax.include_base_amount:
cur_price_unit -= amount
@ -2250,12 +2227,8 @@ class account_add_tmpl_wizard(osv.osv_memory):
data= self.read(cr, uid, ids)
company_id = acc_obj.read(cr, uid, [data[0]['cparent_id']], ['company_id'])[0]['company_id'][0]
account_template = tmpl_obj.browse(cr, uid, context['tmpl_ids'])
#tax_ids = []
#for tax in account_template.tax_ids:
# tax_ids.append(tax_template_ref[tax.id])
vals={
'name': account_template.name,
#'sign': account_template.sign,
'currency_id': account_template.currency_id and account_template.currency_id.id or False,
'code': account_template.code,
'type': account_template.type,
@ -2264,7 +2237,6 @@ class account_add_tmpl_wizard(osv.osv_memory):
'shortcut': account_template.shortcut,
'note': account_template.note,
'parent_id': data[0]['cparent_id'],
# 'tax_ids': [(6,0,tax_ids)], todo!!
'company_id': company_id,
}
new_account = acc_obj.create(cr, uid, vals)
@ -2581,7 +2553,6 @@ class wizard_multi_charts_accounts(osv.osv_memory):
code_acc=str(code_acc) + (str('0'*(dig-code_main)))
vals={
'name': (obj_acc_root.id == account_template.id) and obj_multi.company_id.name or account_template.name,
#'sign': account_template.sign,
'currency_id': account_template.currency_id and account_template.currency_id.id or False,
'code': code_acc,
'type': account_template.type,

3
addons/account/account_analytic_line.py
View File

@ -42,7 +42,7 @@ class account_analytic_line(osv.osv):
_defaults = {
'date': lambda *a: time.strftime('%Y-%m-%d'),
'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'account.analytic.line', context=c),
}
}
_order = 'date'
def search(self, cr, uid, args, offset=0, limit=None, order=None, context=None, count=False):
@ -65,7 +65,6 @@ class account_analytic_line(osv.osv):
return False
return True
_constraints = [
# (_check_company, 'You can not create analytic line that is not in the same company than the account line', ['account_id'])
]
# Compute the cost based on the price type define into company

20
addons/account/account_assert_test.xml
View File

@ -4,25 +4,5 @@
<assert model="account.move" search="[]" string="For all Ledger Postings, the state is valid implies that the sum of credits equals the sum of debits">
<test expr="not len(line_id) or line_id[0].state != 'valid' or (sum([l.debit - l.credit for l in line_id]) &lt;= 0.00001)"/>
</assert>
<!-- <assert model="account.account" search="[]" string="For all accounts, the balance is equal to the sum of the balance of its childs">
<assert model="account.account" search="[]" string="For all accounts, the balance is equal to the sum of the balance of its childs">
<test expr="not len(child_id) or (balance - sum([c.balance for c in child_id]) &lt;= 0.00001)"/>
</assert>
<assert model="account.move.line" search="[('account_id.type', '=', 'view')]" string="Accounts of view type do not contain any move line">
<test expr="False"/>
</assert>
<assert model="account.invoice" search="[('state', 'in', ['paid', 'open'])]" string="The total amount of all paid or open invoices is correctly computed">
<test expr="sum([l.price_subtotal for l in invoice_line]) - amount_untaxed &lt;= 0.00001"/>
</assert>
<assert model="account.move.reconcile" search="[]" string="For each reconciliation, the sum of credits equals the sum of debits">
<test expr="sum([l.debit - l.credit for l in line_id]) &lt;= 0.00001"/>
</assert>
-->
</data>
</openerp>

2
addons/account/account_bank_statement.py
View File

@ -367,8 +367,6 @@ class account_bank_statement(osv.osv):
account_move_line_obj.reconcile(cr, uid, torec, 'statement', writeoff_acc_id=writeoff_acc_id, writeoff_period_id=st.period_id.id, writeoff_journal_id=st.journal_id.id, context=context)
else:
account_move_line_obj.reconcile_partial(cr, uid, torec, 'statement', context)
#except:
# raise osv.except_osv(_('Error !'), _('Unable to reconcile entry "%s": %.2f') % (move.name, move.amount))
if st.journal_id.entry_posted:
account_move_obj.write(cr, uid, [move_id], {'state': 'posted'})

17
addons/account/account_cash_statement.py
View File

@ -118,19 +118,6 @@ class account_cash_statement(osv.osv):
res2[statement.id]=encoding_total
return res2
# def _default_journal_id(self, cr, uid, context={}):
# """ To get default journal for the object"
# @param name: Names of fields.
# @return: journal
# """
# company_id = self.pool.get('res.users').browse(cr, uid, uid).company_id.id
# journal = self.pool.get('account.journal').search(cr, uid, [('type', '=', 'cash'), ('company_id', '=', company_id)])
# if journal:
# return journal[0]
# else:
# return False
def _end_balance(self, cursor, user, ids, name, attr, context=None):
res_currency_obj = self.pool.get('res.currency')
res_users_obj = self.pool.get('res.users')
@ -374,10 +361,6 @@ class account_cash_statement(osv.osv):
if not self._equal_balance(cr, uid, ids, st, context):
raise osv.except_osv(_('Error !'), _('CashBox Balance is not matching with Calculated Balance !'))
# if not (abs((st.balance_end or 0.0) - st.balance_end_real) < 0.0001):
# raise osv.except_osv(_('Error !'),
# _('The statement balance is incorrect !\n') +
# _('The expected balance (%.2f) is different than the computed one. (%.2f)') % (st.balance_end_real, st.balance_end))
if (not st.journal_id.default_credit_account_id) \
or (not st.journal_id.default_debit_account_id):
raise osv.except_osv(_('Configuration Error !'),

1
addons/account/account_invoice_view.xml
View File

@ -421,7 +421,6 @@
<field name="view_id" ref="invoice_form"/>
<field name="act_window_id" ref="action_invoice_tree"/>
</record>
<!-- <menuitem name="Invoices" id="menu_finance_invoice" parent="account.menu_finance" sequence="2"/>-->
<record id="action_invoice_tree1" model="ir.actions.act_window">
<field name="name">Customer Invoices</field>

46
addons/account/account_invoice_workflow.xml
View File

@ -12,19 +12,6 @@
<field name="flow_start">True</field>
<field name="name">draft</field>
</record>
<!-- <record model="workflow.activity" id="act_confirm">
<field name="wkf_id" ref="wkf"/>
<field name="name">confirm</field>
</record> -->
<!-- <record id="act_proforma" model="workflow.activity">-->
<!-- <field name="wkf_id" ref="wkf"/>-->
<!-- <field name="name">proforma</field>-->
<!-- <field name="action">action_move_create()-->
<!--write({'state':'proforma'})</field>-->
<!-- <field name="kind">function</field>-->
<!-- </record>-->
<record id="act_proforma2" model="workflow.activity">
<field name="wkf_id" ref="wkf"/>
@ -65,35 +52,11 @@ write({'state':'cancel'})</field>
<field name="kind">function</field>
</record>
<!--
<record model="workflow.transition" id="t1">
<field name="act_from" ref="act_draft"/>
<field name="act_to" ref="act_confirm"/>
</record>
-->
<!-- <record id="t3" model="workflow.transition">-->
<!-- <field name="act_from" ref="act_draft"/>-->
<!-- <field name="act_to" ref="act_proforma"/>-->
<!-- <field name="signal">invoice_proforma</field>-->
<!-- </record>-->
<record id="t4" model="workflow.transition">
<field name="act_from" ref="act_draft"/>
<field name="act_to" ref="act_open"/>
<field name="signal">invoice_open</field>
</record>
<!-- <record id="t5" model="workflow.transition">-->
<!-- <field name="act_from" ref="act_proforma"/>-->
<!-- <field name="act_to" ref="act_open"/>-->
<!-- <field name="signal">invoice_open</field>-->
<!-- </record>-->
<!-- <record id="t7" model="workflow.transition">-->
<!-- <field name="act_from" ref="act_proforma"/>-->
<!-- <field name="act_to" ref="act_paid"/>-->
<!-- <field name="trigger_model">account.move.line</field>-->
<!-- <field name="trigger_expr_id">move_line_id_payment_get()</field>-->
<!-- <field name="condition">test_paid()</field>-->
<!-- </record>-->
<record id="t8" model="workflow.transition">
<field name="act_from" ref="act_open"/>
<field name="act_to" ref="act_paid"/>
@ -106,11 +69,6 @@ write({'state':'cancel'})</field>
<field name="act_to" ref="act_cancel"/>
<field name="signal">invoice_cancel</field>
</record>
<!-- <record id="t11" model="workflow.transition">-->
<!-- <field name="act_from" ref="act_proforma"/>-->
<!-- <field name="act_to" ref="act_cancel"/>-->
<!-- <field name="signal">invoice_cancel</field>-->
<!-- </record>-->
<record id="t12" model="workflow.transition">
<field name="act_from" ref="act_open"/>
<field name="act_to" ref="act_cancel"/>
@ -126,7 +84,7 @@ write({'state':'cancel'})</field>
<field name="act_to" ref="act_cancel"/>
<field name="signal">invoice_cancel</field>
</record>
<record id="open_test_to_paid" model="workflow.transition">
<field name="act_from" ref="act_open_test"/>
<field name="act_to" ref="act_paid"/>
@ -134,7 +92,7 @@ write({'state':'cancel'})</field>
<field name="trigger_expr_id">move_line_id_payment_get()</field>
<field name="condition">test_paid()</field>
</record>
<record id="draft_to_pro2" model="workflow.transition">
<field name="act_from" ref="account.act_draft"/>
<field name="act_to" ref="act_proforma2"/>

14
addons/account/account_menuitem.xml
View File

@ -6,13 +6,10 @@
<menuitem id="menu_finance_receivables" name="Receivables" parent="menu_finance" sequence="1" 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_accounting" name="Accounting" parent="menu_finance" sequence="5"/>-->
<menuitem id="menu_finance_periodical_processing" name="Periodical Processing" parent="menu_finance" sequence="8" groups="group_account_user,group_account_manager,base.group_system,group_account_invoice"/>
<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_recurrent_entries" name="Recurrent Entries" parent="menu_finance_periodical_processing"/>-->
<menuitem id="periodical_processing_invoicing" name="Invoicing" parent="menu_finance_periodical_processing"/>
<!-- <menuitem id="periodical_processing_end_of_period" name="End of Period" parent="menu_finance_periodical_processing"/>-->
<menuitem id="menu_finance_charts" name="Charts" parent="menu_finance" sequence="5" groups="base.group_system"/>
<menuitem id="menu_finance_reporting" name="Reporting" parent="account.menu_finance" sequence="12" groups="base.group_system,group_account_manager,group_account_user"/>
<menuitem id="menu_finance_reporting_budgets" name="Budgets" parent="menu_finance_reporting"/>
@ -25,23 +22,12 @@
<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="base.menu_action_currency_form" parent="menu_configuration_misc" sequence="20"/>
<!-- <menuitem id="menu_finance_configuration1" name="Configuration" parent="menu_finance" sequence="80"/>-->
<!-- <menuitem id="base.menu_action_currency_form" parent="menu_finance_configuration" sequence="20"/>-->
<!-- <menuitem id="menu_finance_accounting1" name="Financial Accounting" parent="menu_finance_configuration" sequence="80"/>-->
<!-- <menuitem id="menu_analytic_accounting1" name="Analytic Accounting" parent="menu_finance_configuration" sequence="80"/>-->
<!-- <menuitem id="menu_finance_reporting11" name="Reporting" parent="account.menu_finance" sequence="80"/>-->
<menuitem id="menu_finance_generic_reporting" name="Generic Reporting" parent="menu_finance_reporting" sequence="100" groups="base.group_system,group_account_manager"/>
<!-- <menuitem id="menu_finance_legal_statement1" name="Legal Statements" parent="account.menu_finance_reporting" sequence="200"/>-->
<menuitem id="menu_finance_entries" name="Accounting" parent="menu_finance" sequence="4"
groups="group_account_user,group_account_manager,base.group_system"/>
<menuitem id="account.menu_finance_recurrent_entries" name="Recurring Entries" parent="menu_finance_periodical_processing" sequence="15"
groups="base.group_extended"/>
<!-- <menuitem id="menu_finance_periodical_processing11" name="Periodical Processing" parent="account.menu_finance"-->
<!-- sequence="3"-->
<!-- groups="group_account_user"/>-->
<menuitem id="menu_account_end_year_treatments" name="End of Period" parent="menu_finance_periodical_processing" groups="group_account_user,group_account_manager,base.group_system"/>
<menuitem id="menu_finance_statistic_report_statement" name="Statistic Reports" parent="menu_finance_reporting" sequence="300" groups="account.group_account_manager"/>

12
addons/account/account_move_line.py
View File

@ -572,7 +572,7 @@ class account_move_line(osv.osv):
if journal:
jt = self.pool.get('account.journal').browse(cr, uid, journal).type
#FIXME: Bank and cash journal are such a journal we can not assume a account based on this 2 journals
# Bank and cash journal can have a payment or receipt transection, and in both type partner account
# Bank and cash journal can have a payment or receipt transaction, and in both type partner account
# will not be same id payment then payable, and if receipt then receivable
#if jt in ('sale', 'purchase_refund', 'bank', 'cash'):
if jt in ('sale', 'purchase_refund'):
@ -1155,11 +1155,6 @@ class account_move_line(osv.osv):
'journal_id': journal.analytic_journal_id.id,
'ref': vals.get('ref', False),
})]
#else:
# raise osv.except_osv(_('No analytic journal !'), _('Please set an analytic journal on this financial journal !'))
#if not 'currency_id' in vals:
# vals['currency_id'] = account.company_id.currency_id.id
result = super(osv.osv, self).create(cr, uid, vals, context)
# CREATE Taxes
@ -1228,11 +1223,6 @@ class account_move_line(osv.osv):
self.create(cr, uid, data, context)
del vals['account_tax_id']
# No needed, related to the job
#if not is_new_move and 'date' in vals:
# if context and ('__last_update' in context):
# del context['__last_update']
# self.pool.get('account.move').write(cr, uid, [move_id], {'date':vals['date']}, context=context)
if check and ((not context.get('no_store_function')) or journal.entry_posted):
tmp = self.pool.get('account.move').validate(cr, uid, [vals['move_id']], context)
if journal.entry_posted and tmp:

25
addons/account/account_report.xml
View File

@ -47,20 +47,6 @@
name="Taxes"
parent="account.menu_finance_generic_reporting" sequence="3"/>
<!-- <wizard
id="wizard_vat_declaration"
menu="False"
model="account.tax.code"
name="account.vat.declaration"
string="Print Taxes Report"/> -->
<!-- <menuitem
icon="STOCK_PRINT"
action="wizard_vat_declaration"
id="menu_wizard_vat_declaration"
parent="menu_tax_report"
type="wizard"/> -->
<report id="account_account_balance_compare"
string="Account balance"
model="account.account"
@ -77,16 +63,5 @@
auto="False"
menu="False"/>
<!--
<report id="analytic_journal"
string="Analytic journal"
model="account.analytic.account"
name="account.analytic.journal"
xml="account/report/analytic_journal.rml"
auto="False" />
-->
</data>
</openerp>

136
addons/account/account_view.xml
View File

@ -160,7 +160,6 @@
<group col="2" colspan="2">
<separator string="Reconcile" colspan="2"/>
<field name="reconcile"/>
<!-- <field name="active"/>-->
</group>
<separator string="Default Taxes" colspan="4"/>
<field colspan="4" name="tax_ids" nolabel="1" domain="[('parent_id','=',False)]"/>
@ -256,7 +255,6 @@
<field name="view_id" ref="view_account_tree"/>
<field name="domain">[('parent_id','=',False)]</field>
</record>
<!-- <menuitem action="action_account_tree" id="menu_action_account_tree" parent="account.account_account_menu"/>-->
<!--
Journal
@ -576,13 +574,6 @@
<field name="filter" eval="True"/>
</record>
<!-- <record id="action_bank_statement_tree2" model="ir.actions.act_window">-->
<!-- <field name="name">New Statement</field>-->
<!-- <field name="res_model">account.bank.statement</field>-->
<!-- <field name="view_type">form</field>-->
<!-- <field name="view_mode">form,tree</field>-->
<!-- </record>-->
<record id="view_bank_statement_reconcile" model="ir.ui.view">
<field name="name">account.bank.statement.reconcile.form</field>
<field name="model">account.bank.statement.reconcile</field>
@ -872,7 +863,6 @@
id="menu_action_tax_code_tree"
parent="menu_finance_charts"
sequence="12"/>
<!-- <wizard id="action_move_journal_line_form" menu="False" model="account.move.line" name="account.move.journal" string="Entries by Line"/-->
<!--
Entries lines
@ -1362,59 +1352,6 @@
<field eval="[(6,0,[ref('account.group_accounting_accountant')])]" name="groups_id"/>
</record>
<!-- <record id="action_move_to_review" model="ir.actions.act_window">-->
<!-- <field name="name">Journal Entries</field>-->
<!-- <field name="type">ir.actions.act_window</field>-->
<!-- <field name="res_model">account.move</field>-->
<!-- <field name="view_type">form</field>-->
<!-- <field name="view_id" ref="view_move_tree"/>-->
<!-- <field name="search_view_id" ref="view_account_move_filter"/>-->
<!-- <field name="domain">[('to_check','=',True), ('state','=','draft')]</field>-->
<!-- </record>-->
<!-- <menuitem-->
<!-- action="action_move_to_review"-->
<!-- id="menu_action_move_to_review"-->
<!-- parent="periodical_processing_journal_entries_validation"-->
<!-- />-->
<!-- <menuitem id="next_id_29" name="Search Entries" parent="account.menu_finance_entries" sequence="40"/>-->
<!-- <menuitem action="action_move_line_form" id="menu_action_move_line_form" parent="next_id_29"/>-->
<!-- <record id="action_move_line_form_encode_by_move" model="ir.actions.act_window">
<field name="name">Journal Entries</field>
<field name="res_model">account.move</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="view_id" ref="view_move_tree"/>
<field name="search_view_id" ref="view_account_move_filter"/>
</record>
<menuitem action="action_move_line_form_encode_by_move" id="menu_encode_entries_by_move" parent="menu_finance_entries"/>-->
<!-- <record id="action_account_moves_sale" model="ir.actions.act_window">-->
<!-- <field name="name">Journal Items</field>-->
<!-- <field name="res_model">account.move.line</field>-->
<!-- <field name="view_type">form</field>-->
<!-- <field name="view_mode">tree,form,graph</field>-->
<!-- <field name="view_id" ref="view_move_line_tree"/>-->
<!-- <field name="search_view_id" ref="view_account_move_line_filter"/>-->
<!-- <field name="domain">[('journal_id.type', 'in', ['sale', 'purchase_refund'])]</field>-->
<!-- </record>-->
<!-- <menuitem action="action_account_moves_sale" id="menu_eaction_account_moves_sale" parent="menu_finance_receivables"/>-->
<!-- <record id="action_account_moves_purchase" model="ir.actions.act_window">-->
<!-- <field name="name">Journal Items</field>-->
<!-- <field name="res_model">account.move.line</field>-->
<!-- <field name="view_type">form</field>-->
<!-- <field name="view_mode">tree,form,graph</field>-->
<!-- <field name="view_id" ref="view_move_line_tree"/>-->
<!-- <field name="search_view_id" ref="view_account_move_line_filter"/>-->
<!-- <field name="domain">[('journal_id.type', 'in', ['purchase', 'sale_refund'])]</field>-->
<!-- </record>-->
<!-- <menuitem action="action_account_moves_purchase" id="menu_eaction_account_moves_purchase" parent="menu_finance_payables"/>-->
<record id="action_move_line_search" model="ir.actions.act_window">
<field name="name">Entry Lines</field>
<field name="type">ir.actions.act_window</field>
@ -1435,26 +1372,8 @@
<field name="view_mode">form</field>
<field name="act_window_id" ref="action_move_line_search"/>
</record>
<!-- <record id="action_move_line_search_view4" model="ir.actions.act_window">-->
<!-- <field name="name">Cheque Register</field>-->
<!-- <field name="type">ir.actions.act_window</field>-->
<!-- <field name="res_model">account.move.line</field>-->
<!-- <field name="view_type">form</field>-->
<!-- <field name="view_mode">tree,form</field>-->
<!-- <field name="view_id" ref="view_move_line_tree"/>-->
<!-- <field name="search_view_id" ref="view_account_move_line_filter"/>-->
<!-- <field name="domain">[('journal_id.type', '=', 'bank')]</field>-->
<!-- </record>-->
<!-- -->
<!-- <menuitem action="action_move_line_search_view4" id="journal_bank_move_lines" parent="menu_finance_bank_and_cash"/>-->
<!-- <menuitem action="action_move_line_search" id="menu_action_move_line_search" parent="account.next_id_29"/>-->
<menuitem id="menu_finance_charts" name="Charts" parent="account.menu_finance" sequence="4"/>
<!-- <wizard id="wizard_account_chart" menu="False" model="account.account" name="account.chart" string="Chart of Accounts"/>
<menuitem icon="STOCK_INDENT" action="wizard_account_chart" id="menu_action_account_tree2" parent="account.menu_finance_charts" type="wizard"/>
-->
<record id="view_bank_statement_reconcile_form" model="ir.ui.view">
<field name="name">account.bank.statement.reconcile.form</field>
@ -1517,20 +1436,6 @@
<field name="view_mode">form,tree</field>
<field name="view_id" ref="view_bank_statement_reconcile_form"/>
</record>
<!-- <menuitem
id="next_id_30"
name="Bank Reconciliation"
parent="menu_finance_periodical_processing"
groups="group_account_user"/> -->
<!-- <menuitem action="action_bank_statement_reconciliation_form" id="menu_action_account_bank_reconcile_tree" parent="next_id_30"/>-->
<!-- <wizard id="action_account_bank_reconcile_tree" menu="False" model="account.move.line" name="account.move.bank.reconcile" string="Bank reconciliation"/> -->
<!-- <menuitem action="action_account_bank_reconcile_tree" id="menu_action_account_bank_reconcile_check_tree" parent="account.next_id_30" type="wizard"/> -->
<!-- bank reconciliation -->
<!-- <menuitem action="action_account_bank_reconcile_tree"-->
<!-- id="menu_action_account_bank_reconcile_check_tree"-->
<!-- parent="periodical_processing_reconciliation" groups="group_account_user" />-->
<act_window
context="{'search_default_next_partner':1,'view_mode':True}"
@ -1591,12 +1496,10 @@
<field name="view_type">tree</field>
<field name="help">You can look up individual account entries by searching for useful information. To search for account entries, open a journal, then select a record line.</field>
</record>
<!-- <menuitem action="action_account_journal_period_tree" id="menu_action_account_journal_period_tree" parent="account.menu_finance_generic_reporting" sequence="2"/>-->
<!--
# Account Models
-->
# Account Models
-->
<record id="view_model_line_tree" model="ir.ui.view">
<field name="name">account.model.line.tree</field>
@ -1730,26 +1633,7 @@
</form>
</field>
</record>
<!-- <record id="view_account_move_line_filter" model="ir.ui.view">-->
<!-- <field name="name">Payment Terms</field>-->
<!-- <field name="model">account.payment.term</field>-->
<!-- <field name="type">search</field>-->
<!-- <field name="arch" type="xml">-->
<!-- <search string="Search Payment Terms">-->
<!-- <group col='10' colspan='4'>-->
<!-- <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Entry Lines"/>-->
<!-- <filter icon="terp-camera_test" string="Posted" domain="[('state','=','valid')]" help="Posted Entry Lines"/>-->
<!-- <separator orientation="vertical"/>-->
<!-- <field name="date" select='1'/>-->
<!-- <field name="account_id" select='1'/>-->
<!-- <field name="partner_id" select='1'>-->
<!-- <filter help="Next Partner Entries to reconcile" name="next_partner" string="Next Partner to reconcile" context="{'next_partner_only': 1}" icon="terp-partner" domain="[('account_id.reconcile','=',True),('reconcile_id','=',False)]"/>-->
<!-- </field>-->
<!-- <field name="balance" string="Debit/Credit" select='1'/>-->
<!-- </group>-->
<!-- </search>-->
<!-- </field>-->
<!-- </record>-->
<record id="action_payment_term_form" model="ir.actions.act_window">
<field name="name">Payment Terms</field>
<field name="res_model">account.payment.term</field>
@ -1759,8 +1643,8 @@
<menuitem action="action_payment_term_form" id="menu_action_payment_term_form" parent="menu_configuration_misc"/>
<!--
# Account Subscriptions
-->
# Account Subscriptions
-->
<record id="view_subscription_line_form" model="ir.ui.view">
<field name="name">account.subscription.line.form</field>
@ -1814,7 +1698,6 @@
<separator colspan="4" string="Starts on"/>
<field name="date_start" select="1"/>
<field name="period_total"/>
</group>
<group col="2" colspan="2">
@ -1884,15 +1767,6 @@
<field name="domain">[('account_id','child_of', [active_id]),('state','&lt;&gt;','draft')]</field>
<field name="context">{'account_id':active_id}</field>
</record>
<!-- <wizard id="wizard_move_line_select" menu="False" model="account.move.line" name="account.move.line.select" string="Move line select"/>-->
<!-- <record id="ir_open_account_account" model="ir.values">-->
<!-- <field eval="'tree_but_open'" name="key2"/>-->
<!-- <field eval="'account.account'" name="model"/>-->
<!-- <field name="name">Account Entries</field>-->
<!-- <field eval="'ir.actions.wizard,%d'%wizard_move_line_select" name="value"/>-->
<!-- <field eval="True" name="object"/>-->
<!-- </record>-->
<record id="view_move_line_tax_tree" model="ir.ui.view">
<field name="name">account.move.line.tax.tree</field>

93
addons/account/account_wizard.xml
View File

@ -1,100 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data>
<!-- <wizard-->
<!-- string="Account balance-Compare Years"-->
<!-- model="account.account"-->
<!-- name="account.balance.account.balance.report"-->
<!-- keyword="client_print_multi"-->
<!-- id="wizard_account_balance_compare_report"/>-->
<!-- for test only -->
<!-- wizard id="wizard_invoice_pay" model="account.invoice" name="account.invoice.pay" string="Pay invoice" groups="base.group_user"/-->
<!-- close year, period, journal -->
<!-- <wizard id="wizard_fiscalyear_close" menu="False" model="account.fiscalyear" name="account.fiscalyear.close" string="Generate Fiscal Year Opening Entries"/>-->
<!---->
<!-- <menuitem-->
<!-- action="wizard_fiscalyear_close"-->
<!-- id="menu_wizard_fy_close"-->
<!-- parent="menu_account_end_year_treatments"-->
<!-- type="wizard"-->
<!-- sequence="1"/>-->
<!-- <wizard id="wizard_fiscalyear_close_state" menu="False" model="account.fiscalyear" name="account.fiscalyear.close.state" string="Close a Fiscal Year"/>
<menuitem action="wizard_fiscalyear_close_state" id="menu_wizard_fy_close_state" parent="menu_account_end_year_treatments" type="wizard"/>
-->
<!-- automatic reconcile -->
<!-- <menuitem id="next_id_20" name="Reconciliation" parent="menu_finance_periodical_processing"/>-->
<!-- <wizard id="wizard_automatic_reconcile" menu="False" model="account.account" name="account.automatic.reconcile" string="Automatic reconciliation"/>
<menuitem action="wizard_automatic_reconcile" id="menu_automatic_reconcile" parent="next_id_20" type="wizard"/>-->
<!-- Import entry in statement -->
<!-- <wizard-->
<!-- string="Import invoices"-->
<!-- model="account.bank.statement"-->
<!-- name="populate_statement_from_inv"-->
<!-- menu="False"-->
<!-- id="wizard_populate_statement_from_inv"/>-->
<!-- manual reconcile -->
<!-- <wizard id="wizard_reconcile" model="account.move.line" name="account.move.line.reconcile" string="Reconcile Entries"/>-->
<!-- <wizard id="wizard_reconcile_unreconcile" model="account.move.reconcile" name="account.reconcile.unreconcile" string="Unreconcile Entries"/>-->
<!-- <wizard id="wizard_reconcile_select" menu="False" model="account.move.line" name="account.move.line.reconcile.select" string="Reconcile entries"/> -->
<!-- <menuitem action="wizard_reconcile_select" id="menu_reconcile_select" parent="account.next_id_20" type="wizard"/> -->
<!-- unreconcile -->
<!-- <wizard id="wizard_unreconcile" model="account.move.line" name="account.move.line.unreconcile" string="Unreconcile Entries"/>-->
<!-- <wizard id="wizard_unreconcile_select" menu="False" model="account.move.line" name="account.move.line.unreconcile.select" string="Unreconcile entries"/> -->
<!-- <menuitem action="wizard_unreconcile_select" id="menu_unreconcile_select" parent="account.next_id_20" type="wizard"/> -->
<!-- subscriptions -->
<!--
<wizard id="wizard_generate_subscription" menu="False" model="account.subscription" name="account.subscription.generate" string="Create subscription entries"/>
<menuitem action="wizard_generate_subscription" id="menu_generate_subscription" parent="account.menu_finance_periodical_processing" type="wizard"/>
-->
<!-- Aged partner balance -->
<!-- <wizard id="wizard_aged_trial_balance" menu="False" model="res.partner" name="account.aged.trial.balance" string="Aged Partner Balance"/>
<menuitem icon="STOCK_PRINT" action="wizard_aged_trial_balance" id="menu_aged_trial_balance" parent="next_id_22" type="wizard"/>-->
<!-- report-related wizards -->
<!-- <wizard id="wizard_partner_balance_report" menu="False" model="res.partner" name="account.partner.balance.report" string="Partner Balance"/>
<menuitem icon="STOCK_PRINT" action="wizard_partner_balance_report" id="menu_partner_balance" parent="account.next_id_22" type="wizard"/> -->
<menuitem id="next_id_22" name="Partner Accounts" parent="menu_finance_generic_reporting" sequence="1"/>
<!-- <wizard id="wizard_invoice_state_confirm" keyword="client_action_multi" model="account.invoice" multi="True" name="account.invoice.state.confirm" string="Confirm draft invoices" groups="base.group_user"/>-->
<!-- <wizard id="wizard_invoice_state_cancel" keyword="client_action_multi" model="account.invoice" multi="True" name="account.invoice.state.cancel" string="Cancel selected invoices" groups="base.group_user"/>-->
<!---->
<!-- account.move validate -->
<!-- <wizard id="wizard_validate_account_moves" menu="False" model="account.move" name="account.move.validate" string="Validate Ledger Postings"/>
<menuitem action="wizard_validate_account_moves" id="menu_validate_account_moves" parent="account.menu_finance_periodical_processing" type="wizard"/>
<wizard id="wizard_validate_account_moves_line" menu="True" model="account.move.line" name="account.move_line.validate" string="Validate Ledger Postings"/>-->
<!-- Use Models -->
<!-- <wizard string="Create Entries From Models" model="account.model" name="account_use_models" menu="False" id="wizard_account_use_model"/>-->
<!-- <menuitem action="wizard_account_use_model" type="wizard" parent="account.menu_finance_recurrent_entries" id="menu_account_use_model"/>-->
<!-- <wizard string="Create Entries From Models" model="account.move.line" name="account_use_models" menu="True" id="wizard_line_account_use_model"/>-->
<!-- account.invoice -->
<!-- <wizard string="Open State" model="account.invoice" name="account.wizard_paid_open" menu="False" id="wizard_paid_open" groups="base.group_user"/> -->
<!-- <wizard id="wizard_invoice_currency_change" model="account.invoice" name="account.invoice.currency_change" string="Change Currency" groups="base.group_user"/>-->
</data>
</openerp>

11
addons/account/board_account_demo.xml
View File

@ -2,16 +2,9 @@
<openerp>
<data noupdate="1">
<!--
Administrator shortcut
Demo user startup menu
Administrator shortcut
Demo user startup menu
-->
<!-- <record id="sc_account_dash" model="ir.ui.view_sc">
<field name="name">Accounting dashboard</field>
<field name="user_id" ref="base.user_root"/>
<field name="resource">ir.ui.menu</field>
<field name="sequence">0</field>
<field name="res_id" ref="menu_board_account"/>
</record> -->
<record id="base.user_root" model="res.users">
<field name="action_id" ref="open_board_account"/>
</record>

12
addons/account/company_view.xml
View File

@ -7,12 +7,12 @@
<field name="model">res.company</field>
<field name="type">form</field>
<field name="arch" type="xml">
<notebook>
<page string="Overdue Payments" position="inside">
<separator string="Overdue Payments Message" colspan="4"/>
<field name="overdue_msg" nolabel="1" colspan ="4"/>
</page>
</notebook>
<notebook>
<page string="Overdue Payments" position="inside">
<separator string="Overdue Payments Message" colspan="4"/>
<field name="overdue_msg" nolabel="1" colspan ="4"/>
</page>
</notebook>
</field>
</record>

26
addons/account/configurable_account_chart.xml
View File

@ -175,10 +175,6 @@
<field name="user_type" ref="conf_account_type_asset"/>
</record>
<!-- <record id="account.property_account_receivable" model="ir.property">
<field eval="'account.account,'+str(a_recv)" name="value"/>
</record> -->
<record id="conf_ova" model="account.account.template">
<field name="code">1103</field>
<field name="name">Output VAT</field>
@ -195,14 +191,6 @@
<field name="user_type" ref="conf_account_type_bnk"/>
</record>
<!-- <record id="conf_cash" model="account.account.template">-->
<!-- <field name="code">1105</field>-->
<!-- <field name="name">Cash</field>-->
<!-- <field ref="conf_cas" name="parent_id"/>-->
<!-- <field name="type">view</field>-->
<!-- <field name="user_type" ref="conf_account_type_cash"/>-->
<!-- </record>-->
<record id="conf_cli" model="account.account.template">
<field name="code">111</field>
<field name="name">Current Liabilities</field>
@ -220,10 +208,6 @@
<field name="user_type" ref="conf_account_type_liability"/>
</record>
<!-- <record id="account.property_account_payable" model="ir.property">
<field eval="'account.account,'+str(a_pay)" name="value"/>
</record>-->
<record id="conf_iva" model="account.account.template">
<field name="code">1112</field>
<field name="name">Input VAT</field>
@ -268,10 +252,6 @@
<field name="user_type" ref="conf_account_type_income"/>
</record>
<!-- <record id="account.property_account_income_categ" model="ir.property">
<field eval="'account.account,'+str(a_sale)" name="value"/>
</record> -->
<record id="conf_cos" model="account.account.template">
<field name="code">21</field>
<field name="name">Cost of Sales</field>
@ -312,12 +292,8 @@
<field name="user_type" ref="conf_account_type_expense"/>
</record>
<!-- <record id="account.property_account_expense_categ" model="ir.property">
<field eval="'account.account,'+str(a_expense)" name="value"/>
</record> -->
<!-- Taxes -->
<!-- TAX Code Definitions -->
<!-- TAX Code Definitions -->
<!-- Invoiced TAX -->

12
addons/account/demo/account_minimal.xml
View File

@ -419,18 +419,6 @@
Product income and expense accounts, default parameters
-->
<!-- <record id="property_account_expense_prd" model="ir.property">-->
<!-- <field name="name">property_account_expense</field>-->
<!-- <field name="fields_id" search="[('model','=','product.template'),('name','=','property_account_expense')]"/>-->
<!-- <field eval="'account.account,'+str(ref('account.a_expense'))" name="value"/>-->
<!-- <field name="company_id" ref="base.main_company"/>-->
<!-- </record>-->
<!-- <record id="property_account_income_prd" model="ir.property">-->
<!-- <field name="name">property_account_income</field>-->
<!-- <field name="fields_id" search="[('model','=','product.template'),('name','=','property_account_income')]"/>-->
<!-- <field eval="'account.account,'+str(ref('account.a_sale'))" name="value"/>-->
<!-- <field name="company_id" ref="base.main_company"/>-->
<!-- </record>-->
<record id="property_account_expense_categ" model="ir.property">
<field name="name">property_account_expense_categ</field>
<field name="fields_id" search="[('model','=','product.category'),('name','=','property_account_expense_categ')]"/>

1
addons/account/installer.py
View File

@ -80,7 +80,6 @@ class account_installer(osv.osv_memory):
'sale_tax':lambda *a:0.0,
'purchase_tax':lambda *a:0.0,
'company_id': _default_company,
#'charts':'configurable',
'bank_accounts_id':_get_default_accounts
}

10
addons/account/invoice.py
View File

@ -319,7 +319,6 @@ class account_invoice(osv.osv):
}
_defaults = {
'type': _get_type,
#'date_invoice': lambda *a: time.strftime('%Y-%m-%d'),
'state': 'draft',
'journal_id': _get_journal,
'currency_id': _get_currency,
@ -372,9 +371,6 @@ class account_invoice(osv.osv):
osv.osv.unlink(self, cr, uid, unlink_ids, context=context)
return True
# def get_invoice_address(self, cr, uid, ids):
# res = self.pool.get('res.partner').address_get(cr, uid, [part], ['invoice'])
# return [{}]
def onchange_partner_id(self, cr, uid, ids, type, partner_id,\
date_invoice=False, payment_term=False, partner_bank_id=False, company_id=False):
invoice_addr_id = False
@ -636,7 +632,6 @@ class account_invoice(osv.osv):
ait_obj.create(cr, uid, taxe)
# Update the stored value (fields.function), so we write to trigger recompute
self.pool.get('account.invoice').write(cr, uid, ids, {'invoice_line':[]}, context=context)
# self.pool.get('account.invoice').write(cr, uid, ids, {}, context=context)
return True
def button_compute(self, cr, uid, ids, context=None, set_total=False):
@ -879,7 +874,7 @@ class account_invoice(osv.osv):
line = self.group_lines(cr, uid, iml, line, inv)
journal_id = inv.journal_id.id #self._get_journal(cr, uid, {'type': inv['type']})
journal_id = inv.journal_id.id
journal = self.pool.get('account.journal').browse(cr, uid, journal_id)
if journal.centralisation:
raise osv.except_osv(_('UserError'),
@ -1321,9 +1316,6 @@ class account_invoice_line(osv.osv):
else:
app_acc_in = in_acc_cate
app_acc_exp = ex_acc_cate
# else:
# app_acc_in = self.pool.get('account.account').browse(cr,uid,in_pro_id)[0]
# app_acc_exp = self.pool.get('account.account').browse(cr,uid,exp_pro_id)[0]
if app_acc_in.company_id.id != company_id and app_acc_exp.company_id.id != company_id:
in_res_id = account_obj.search(cr, uid, [('name','=',app_acc_in.name),('company_id','=',company_id)])
exp_res_id = account_obj.search(cr, uid, [('name','=',app_acc_exp.name),('company_id','=',company_id)])

2
addons/account/partner_view.xml
View File

@ -63,7 +63,7 @@
<!--
Partners Extension
-->
-->
<record id="view_partner_property_form" model="ir.ui.view">
<field name="name">res.partner.property.form.inherit</field>

64
addons/account/process/customer_invoice_process.xml
View File

@ -1,21 +1,21 @@
<?xml version="1.0" ?>
<openerp>
<data>
<!--
Process
<!--
Process
-->
<record id="process_process_invoiceprocess0" model="process.process">
<field eval="1" name="active"/>
<field name="model_id" ref="account.model_account_invoice"/>
<field eval="&quot;&quot;&quot;Customer Invoice&quot;&quot;&quot;" name="name"/>
</record>
<!--
<!--
Process Node
-->
<record id="process_node_analytic0" model="process.node">
<field name="menu_id" ref="account.account_analytic_def_account"/>
<field name="model_id" ref="analytic.model_account_analytic_account"/>
@ -26,7 +26,7 @@
<field eval="&quot;&quot;&quot;object.state in ('draft', 'open', 'pending', 'close')&quot;&quot;&quot;" name="model_states"/>
<field eval="1" name="flow_start"/>
</record>
<record id="process_node_draftinvoices0" model="process.node">
<field name="menu_id" ref="account.menu_action_invoice_tree1"/>
<field name="model_id" ref="account.model_account_invoice"/>
@ -37,7 +37,7 @@
<field eval="&quot;&quot;&quot;object.state=='draft'&quot;&quot;&quot;" name="model_states"/>
<field eval="0" name="flow_start"/>
</record>
<record id="process_node_invoiceinvoice0" model="process.node">
<field name="menu_id" ref="account.menu_finance_receivables"/>
<field name="model_id" ref="account.model_account_invoice"/>
@ -48,7 +48,7 @@
<field eval="&quot;&quot;&quot;object.state=='draft'&quot;&quot;&quot;" name="model_states"/>
<field eval="0" name="flow_start"/>
</record>
<record id="process_node_accountingentries0" model="process.node">
<field name="menu_id" ref="account.menu_action_move_journal_line_form"/>
<field name="model_id" ref="account.model_account_move"/>
@ -58,7 +58,7 @@
<field name="process_id" ref="process_process_invoiceprocess0"/>
<field eval="0" name="flow_start"/>
</record>
<record id="process_node_bankstatement0" model="process.node">
<field name="menu_id" ref="account.menu_bank_statement_tree"/>
<field name="model_id" ref="account.model_account_bank_statement"/>
@ -70,7 +70,7 @@
<field eval="&quot;&quot;&quot;object.state=='draft'&quot;&quot;&quot;" name="model_states"/>
<field eval="1" name="flow_start"/>
</record>
<record id="process_node_paymententries0" model="process.node">
<field name="menu_id" ref="account.menu_action_move_journal_line_form"/>
<field name="model_id" ref="account.model_account_move_line"/>
@ -81,7 +81,7 @@
<field eval="&quot;&quot;&quot;object.state in ('draft', 'valid')&quot;&quot;&quot;" name="model_states"/>
<field eval="0" name="flow_start"/>
</record>
<record id="process_node_reconciliation0" model="process.node">
<field name="menu_id" ref="account.menu_eaction_account_moves_all"/>
<field name="model_id" ref="account.model_account_move_reconcile"/>
@ -92,7 +92,7 @@
<field eval="&quot;&quot;&quot;object.state=='valid'&quot;&quot;&quot;" name="model_states"/>
<field eval="0" name="flow_start"/>
</record>
<record id="process_node_paidinvoice0" model="process.node">
<field name="menu_id" ref="account.menu_action_invoice_tree1"/>
<field name="model_id" ref="account.model_account_invoice"/>
@ -103,7 +103,7 @@
<field eval="&quot;&quot;&quot;object.state=='paid'&quot;&quot;&quot;" name="model_states"/>
<field eval="0" name="flow_start"/>
</record>
<record id="process_node_accountingstatemententries0" model="process.node">
<field name="menu_id" ref="account.menu_eaction_account_moves_all"/>
<field name="model_id" ref="account.model_account_move_line"/>
@ -115,20 +115,16 @@
<field eval="&quot;&quot;&quot;object.state in ('draft', 'valid')&quot;&quot;&quot;" name="model_states"/>
<field eval="0" name="flow_start"/>
</record>
<!--
<!--
Process Transition
-->
<record id="res_roles_invoice0" model="res.roles">
<field eval="&quot;&quot;&quot;Invoice&quot;&quot;&quot;" name="name"/>
</record>
<!-- <record id="account.t5" model="workflow.transition">-->
<!-- <field name="role_id" ref="res_roles_invoice0"/>-->
<!-- </record>-->
<record id="process_transition_confirmstatementfromdraft0" model="process.transition">
<field eval="[(6,0,[])]" name="role_ids"/>
<field eval="[(6,0,[])]" name="transition_ids"/>
@ -137,7 +133,7 @@
<field model="process.node" name="target_node_id" ref="process_node_accountingstatemententries0"/>
<field model="process.node" name="source_node_id" ref="account.process_node_draftstatement0"/>
</record>
<record id="process_transition_analyticinvoice0" model="process.transition">
<field eval="[(6,0,[])]" name="role_ids"/>
<field eval="[(6,0,[])]" name="transition_ids"/>
@ -146,7 +142,7 @@
<field model="process.node" name="target_node_id" ref="process_node_draftinvoices0"/>
<field model="process.node" name="source_node_id" ref="process_node_analytic0"/>
</record>
<record id="process_transition_customerinvoice0" model="process.transition">
<field eval="[(6,0,[])]" name="role_ids"/>
<field eval="[(6,0,[])]" name="transition_ids"/>
@ -156,7 +152,7 @@
<field model="process.node" name="source_node_id" ref="process_node_draftinvoices0"/>
<field eval="[(6,0,[ref('account.pro2_to_open')])]" name="transition_ids"/>
</record>
<record id="process_transition_validentries0" model="process.transition">
<field eval="[(6,0,[])]" name="role_ids"/>
<field eval="[(6,0,[])]" name="transition_ids"/>
@ -165,7 +161,7 @@
<field model="process.node" name="target_node_id" ref="process_node_accountingentries0"/>
<field model="process.node" name="source_node_id" ref="process_node_invoiceinvoice0"/>
</record>
<record id="process_transition_entriesreconcile0" model="process.transition">
<field eval="[(6,0,[])]" name="role_ids"/>
<field eval="[(6,0,[])]" name="transition_ids"/>
@ -174,7 +170,7 @@
<field model="process.node" name="target_node_id" ref="process_node_reconciliation0"/>
<field model="process.node" name="source_node_id" ref="process_node_accountingentries0"/>
</record>
<record id="process_transition_statemententries0" model="process.transition">
<field eval="[(6,0,[])]" name="role_ids"/>
<field eval="[(6,0,[])]" name="transition_ids"/>
@ -183,7 +179,7 @@
<field model="process.node" name="target_node_id" ref="process_node_paymententries0"/>
<field model="process.node" name="source_node_id" ref="process_node_bankstatement0"/>
</record>
<record id="process_transition_paymentreconcile0" model="process.transition">
<field eval="[(6,0,[])]" name="role_ids"/>
<field eval="[(6,0,[])]" name="transition_ids"/>
@ -192,7 +188,7 @@
<field model="process.node" name="target_node_id" ref="process_node_reconciliation0"/>
<field model="process.node" name="source_node_id" ref="process_node_paymententries0"/>
</record>
<record id="process_transition_reconcilepaid0" model="process.transition">
<field eval="[(6,0,[])]" name="role_ids"/>
<field eval="[(6,0,[])]" name="transition_ids"/>
@ -201,17 +197,17 @@
<field model="process.node" name="target_node_id" ref="process_node_paidinvoice0"/>
<field model="process.node" name="source_node_id" ref="process_node_reconciliation0"/>
</record>
<!--
<!--
Process Action
-->
<record id="process_transition_action_createentries0" model="process.transition.action">
<field eval="&quot;&quot;&quot;action_move_create&quot;&quot;&quot;" name="action"/>
<field eval="&quot;&quot;&quot;object&quot;&quot;&quot;" name="state"/>
<field eval="&quot;&quot;&quot;Create entry&quot;&quot;&quot;" name="name"/>
<field name="transition_id" ref="process_transition_customerinvoice0"/>
</record>
</data>
</openerp>

17
addons/account/project/project_report.xml
View File

@ -3,32 +3,15 @@
<data>
<report auto="False" id="analytic_journal_print" menu="False" model="account.analytic.journal" name="account.analytic.account.journal" rml="account/project/report/analytic_journal.rml" string="Analytic Journal"/>
<!-- <wizard id="account_analytic_account_journal_report" keyword="client_print_multi" model="account.analytic.journal" name="account.analytic.account.journal.report" string="Analytic Journal"/>-->
<report auto="False" id="account_analytic_account_balance" menu="False" model="account.analytic.account" name="account.analytic.account.balance" rml="account/project/report/analytic_balance.rml" string="Analytic Balance"/>
<!--<wizard id="account_analytic_account_balance_report" keyword="client_print_multi" model="account.analytic.account" name="account.analytic.account.balance.report" string="Analytic Balance"/> -->
<report auto="False" id="account_analytic_account_inverted_balance" menu="False" model="account.analytic.account" name="account.analytic.account.inverted.balance" rml="account/project/report/inverted_analytic_balance.rml" string="Inverted Analytic Balance"/>
<!-- <wizard id="account_analytic_account_inverted_balance_report" keyword="client_print_multi" model="account.analytic.account" name="account.analytic.account.inverted.balance.report" string="Inverted Analytic Balance"/>-->
<report auto="False" id="account_analytic_account_cost_ledger" menu="False" model="account.analytic.account" name="account.analytic.account.cost_ledger" rml="account/project/report/cost_ledger.rml" string="Cost Ledger"/>
<!-- <wizard id="account_analytic_account_cost_ledger_report" keyword="client_print_multi" model="account.analytic.account" name="account.analytic.account.cost_ledger.report" string="Cost Ledger"/>-->
<report auto="False" id="account_analytic_account_quantity_cost_ledger" menu="False" model="account.analytic.account" name="account.analytic.account.quantity_cost_ledger" rml="account/project/report/quantity_cost_ledger.rml" string="Cost Ledger (Only quantities)"/>
<!-- <wizard id="account_analytic_account_quantity_cost_ledger_report" keyword="client_print_multi" model="account.analytic.account" name="account.analytic.account.quantity_cost_ledger.report" string="Cost Ledger (Only quantities)"/>-->
<report auto="False" id="account_analytic_account_analytic_check" menu="False" model="account.account" name="account.analytic.account.analytic.check" rml="account/project/report/analytic_check.rml" string="Analytic Check"/>
<!-- <wizard id="account_analytic_account_analytic_check_report" keyword="client_print_multi" model="account.account" name="account.analytic.account.analytic.check.report" string="Analytic Check"/>-->
</data>
</openerp>

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

@ -61,10 +61,6 @@
<field name="balance"/>
<field name="company_currency_id"/>
<field name="date" invisible="1"/>
<!-- <field name="parent_id" invisible="1"/>-->
<!-- <field name="type" invisible="1"/>-->
<!-- <field name="partner_id" invisible="1"/>-->
<!-- <field name="user_id" invisible="1"/>-->
</tree>
</field>
</record>
@ -112,7 +108,6 @@
<field name="context">{"search_default_user_id":uid}</field>
<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_accounting" groups="base.group_extended"/>
<record id="act_account_renew_view" model="ir.actions.act_window">
@ -135,17 +130,8 @@
<field name="view_id" ref="view_account_analytic_account_tree"/>
<field name="help">Analytic Charts of Accounts allows you to access to reports by analytic accounts (or cost accounts) . From this menu you can access to analytic balance, a report that relates the analytic accounts to the general accounts. It is useful for analyzing the profitability of projects, giving you the profitability of a project for the different operations that you used to carry out the project.</field>
</record>
<!-- <menuitem-->
<!-- action="action_account_analytic_account_tree2"-->
<!-- id="account_analytic_def_chart"-->
<!-- parent="account_analytic_def_account"/>-->
<!-- <menuitem action="action_account_analytic_account_tree2" id="account_analytic_chart" parent="account.menu_finance_charts"/>-->
<!-- <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 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"/>-->
<record id="view_account_analytic_line_form" model="ir.ui.view">
<field name="name">account.analytic.line.form</field>
@ -230,14 +216,8 @@
<field name="context">{"search_default_user_id":uid}</field>
<field name="view_id" ref="view_account_analytic_line_tree"/>
</record>
<!-- <wizard id="action_account_analytic_line" menu="False" model="account.analytic.line" name="account.analytic.line" string="Entries by Line"/>-->
<!-- <menuitem id="next_id_41" name="Analytic Entries" parent="account.menu_finance_entries"/>-->
<!-- Entries by Line -->
<!-- <menuitem icon="STOCK_JUSTIFY_FILL"-->
<!-- action="action_project_account_analytic_line_form"-->
<!-- id="account_entries_analytic_entries"-->
<!-- parent="next_id_41"/>-->
<!-- Entries by Line -->
<record id="action_account_tree1" model="ir.actions.act_window">
<field name="name">Analytic Entries</field>
@ -355,30 +335,6 @@
<field name="view_mode">tree,form</field>
</record>
<menuitem action="action_account_analytic_journal_open_form" id="account_analytic_journal_entries" parent="menu_finance_entries" groups="base.group_extended"/>
<!-- <record id="action_account_analytic_journal_open_form" model="ir.actions.act_window">
<field name="name">Check Register</field>
<field name="res_model">account.analytic.line</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="domain">[('journal_id','=',active_id)]</field>
</record> -->
<!-- <menuitem action="action_account_analytic_journal_open_form" id="account_analytic_journal_entries" parent="menu_finance_bank_and_cash"/>-->
<!-- <record id="action_account_analytic_journal_open_form" model="ir.actions.act_window">
<field name="name">Check Registers</field>
<field name="res_model">account.analytic.line</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="domain">[('journal_id','=',active_id)]</field>
</record> -->
<!-- <menuitem action="action_account_analytic_journal_open_form" id="account_analytic_journal_entries" parent="menu_finance_bank_and_cash"/>-->
<!-- <record id="ir_open_account_journal_analytic" model="ir.values">-->
<!-- <field eval="'tree_but_open'" name="key2"/>-->
<!-- <field eval="'account.analytic.journal'" name="model"/>-->
<!-- <field name="name">Open Analytic Journal</field>-->
<!-- <field eval="'ir.actions.act_window,%d'%action_account_analytic_journal_open_form" name="value"/>-->
<!-- <field eval="True" name="object"/>-->
<!-- </record>-->
#
# Reporting
@ -392,15 +348,6 @@
</record>
<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">-->
<!-- <field name="name">Analytic Entries by Journal</field>-->
<!-- <field name="res_model">account.analytic.journal</field>-->
<!-- <field name="view_type">tree</field>-->
<!-- <field name="view_id" ref="view_account_analytic_journal_tree"/>-->
<!-- </record>-->
<!-- <menuitem action="action_account_analytic_journal_tree2" id="account_analytic_journal_entries" parent="account.next_id_41"/>-->
#
# Statistics
#
@ -476,7 +423,6 @@
<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"/>-->
<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"/>

4
addons/account/project/wizard/account_analytic_balance_report.py
View File

@ -30,12 +30,12 @@ class account_analytic_balance(osv.osv_memory):
'date1': fields.date('Start of period', required=True),
'date2': fields.date('End of period', required=True),
'empty_acc': fields.boolean('Empty Accounts ? ', help='Check if you want to display Accounts with 0 balance too.'),
}
}
_defaults = {
'date1':time.strftime('%Y-01-01'),
'date2':time.strftime('%Y-%m-%d')
}
}
def check_report(self, cr, uid, ids, context=None):
datas = {}

2
addons/account/project/wizard/account_analytic_chart.py
View File

@ -27,7 +27,7 @@ class account_analytic_chart(osv.osv_memory):
_columns = {
'from_date': fields.date('From'),
'to_date': fields.date('To'),
}
}
def analytic_account_chart_open_window(self, cr, uid, ids, context=None):
mod_obj = self.pool.get('ir.model.data')

4
addons/account/project/wizard/account_analytic_check.py
View File

@ -29,12 +29,12 @@ class account_analytic_check(osv.osv_memory):
_columns = {
'date1': fields.date('Start of period', required=True),
'date2': fields.date('End of period', required=True),
}
}
_defaults = {
'date1':time.strftime('%Y-01-01'),
'date2':time.strftime('%Y-%m-%d')
}
}
def check_report(self, cr, uid, ids, context=None):
datas = {}

4
addons/account/project/wizard/account_analytic_cost_ledger_for_journal_report.py
View File

@ -30,12 +30,12 @@ class account_analytic_cost_ledger_journal_report(osv.osv_memory):
'date1': fields.date('Start of period', required=True),
'date2': fields.date('End of period', required=True),
'journal': fields.many2many('account.analytic.journal', 'ledger_journal_rel', 'ledger_id', 'Journal_id', 'Journals'),
}
}
_defaults = {
'date1':time.strftime('%Y-01-01'),
'date2':time.strftime('%Y-%m-%d')
}
}
def check_report(self, cr, uid, ids, context=None):
datas = {}

4
addons/account/project/wizard/account_analytic_cost_ledger_report.py
View File

@ -29,12 +29,12 @@ class account_analytic_cost_ledger(osv.osv_memory):
_columns = {
'date1': fields.date('Start of period', required=True),
'date2': fields.date('End of period', required=True),
}
}
_defaults = {
'date1':time.strftime('%Y-01-01'),
'date2':time.strftime('%Y-%m-%d')
}
}
def check_report(self, cr, uid, ids, context=None):
datas = {}

4
addons/account/project/wizard/account_analytic_inverted_balance_report.py
View File

@ -29,12 +29,12 @@ class account_analytic_inverted_balance(osv.osv_memory):
_columns = {
'date1': fields.date('Start of period', required=True),
'date2': fields.date('End of period', required=True),
}
}
_defaults = {
'date1':time.strftime('%Y-01-01'),
'date2':time.strftime('%Y-%m-%d')
}
}
def check_report(self, cr, uid, ids, context=None):
datas = {}

4
addons/account/project/wizard/account_analytic_journal_report.py
View File

@ -29,12 +29,12 @@ class account_analytic_Journal_report(osv.osv_memory):
_columns = {
'date1': fields.date('Start of period', required=True),
'date2': fields.date('End of period', required=True),
}
}
_defaults = {
'date1':time.strftime('%Y-01-01'),
'date2':time.strftime('%Y-%m-%d')
}
}
def check_report(self, cr, uid, ids, context=None):
datas = {}

2
addons/account/project/wizard/project_account_analytic_line.py
View File

@ -27,7 +27,7 @@ class project_account_analytic_line(osv.osv_memory):
_columns = {
'from_date': fields.date('From'),
'to_date': fields.date('To'),
}
}
def action_open_window(self, cr, uid, ids, context={}):
mod_obj =self.pool.get('ir.model.data')

4
addons/account/project/wizard/project_account_analytic_line_view.xml
View File

@ -28,8 +28,8 @@
<field name="res_model">project.account.analytic.line</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="view_id" ref="view_project_account_analytic_line_form"/>
<field name="target">new</field>
<field name="view_id" ref="view_project_account_analytic_line_form"/>
<field name="target">new</field>
</record>
</data>

6
addons/account/report/account_aged_partner_balance.py
View File

@ -181,10 +181,6 @@ class aged_trial_report(rml_parse.rml_parse, common_report_header):
## Add for total
self.total_account[(i+1)] = self.total_account[(i+1)] + (total and total[0] or 0.0)
values['name'] = partner['name']
#t = 0.0
#for i in range(5)+['direction']:
# t+= float(values.get(str(i), 0.0) or 0.0)
#values['total'] = t
if values['total']:
res.append(values)
@ -217,7 +213,7 @@ class aged_trial_report(rml_parse.rml_parse, common_report_header):
return 'Payable Accounts'
elif data['form']['result_selection'] == 'customer_supplier':
return 'Receivable and Payable Accounts'
return ''
return ''
report_sxw.report_sxw('report.account.aged_trial_balance', 'res.partner',
'addons/account/report/account_aged_partner_balance.rml',parser=aged_trial_report, header=False)

31
addons/account/report/account_balance.py
View File

@ -86,10 +86,6 @@ class account_balance(report_sxw.rml_parse, common_report_header):
elif form['filter'] == 'filter_date':
ctx['date_from'] = form['date_from']
ctx['date_to'] = form['date_to']
# accounts = obj_account.browse(self.cr, self.uid, ids, ctx)
# def cmp_code(x, y):
# return cmp(x.code, y.code)
# accounts.sort(cmp_code)
child_ids = obj_account._get_children_and_consol(self.cr, self.uid, ids, ctx)
if child_ids:
@ -108,28 +104,11 @@ class account_balance(report_sxw.rml_parse, common_report_header):
'debit': account['debit'],
'credit': account['credit'],
'balance': account['balance'],
# 'leef': not bool(account['child_id']),
'parent_id':account['parent_id'],
'bal_type':'',
}
self.sum_debit += account['debit']
self.sum_credit += account['credit']
# if account.child_id:
# def _check_rec(account):
# if not account.child_id:
# return bool(account.credit or account.debit)
# for c in account.child_id:
# if not _check_rec(c) or _check_rec(c):
# return True
# return False
# if not _check_rec(account) :
# continue
# if account['parent_id']:
# acc = obj_account.read(self.cr, self.uid, [ account['parent_id'][0] ] ,['name'], ctx)
# for r in result_acc:
# if r['id'] == account['parent_id'][0]:
# res['level'] = r['level'] + 1
# break
if form['display_account'] == 'bal_movement':
if res['credit'] > 0 or res['debit'] > 0 or res['balance'] > 0 :
result_acc.append(res)
@ -138,16 +117,6 @@ class account_balance(report_sxw.rml_parse, common_report_header):
result_acc.append(res)
else:
result_acc.append(res)
# if account.child_id:
# acc_id = [acc.id for acc in account.child_id]
# lst_string = ''
# lst_string = '\'' + '\',\''.join(map(str,acc_id)) + '\''
# self.cr.execute("select code,id from account_account where id IN (%s)"%(lst_string))
# a_id = self.cr.fetchall()
# a_id.sort()
# ids2 = [x[1] for x in a_id]
#
# result_acc += self.lines(form, ids2, done, level+1)
return result_acc
report_sxw.report_sxw('report.account.account.balance', 'account.account', 'addons/account/report/account_balance.rml', parser=account_balance, header="internal")

266
addons/account/report/account_balance_landscape.py
View File

@ -24,8 +24,6 @@ import locale
from report import report_sxw
import rml_parse
#from addons.account.wizard import wizard_account_balance_report
parents = {
'tr':1,
'li':1,
@ -59,267 +57,6 @@ class account_balance_landscape(rml_parse.rml_parse):
})
self.context = context
# def repeatIn(self, lst, name, nodes_parent=False,td=False,width=[],value=[],type=[]):
# self._node.data = ''
# node = self._find_parent(self._node, nodes_parent or parents)
# ns = node.nextSibling
##start
# if value==['Cash','%']:
# if show==1:
# if perc==1:
# if pattern=='none':
# value=['','Cash','%']
# type=['lable','lable','lable']
# width=[130,65,65]
# else:
# value=[' ','','Cash','%']
# type=['string','lable','lable','lable']
# width=[65,130,65,65]
# else:
# if pattern=='none':
# value=['']
# type=['lable']
# width=[195]
# else:
# value=[' ','']
# type=['string','lable']
# width=[65,195]
# else:
# if perc==1:
# if pattern=='none':
# value=['Cash','%']
# type=['lable','lable']
# width=[65,65]
# else:
# value=[' ','Cash','%']
# type=['string','lable','lable']
# width=[65,65,65]
# else:
# if pattern=='none':
# value=['']
# type=['lable']
# width=[65]
# else:
# value=[' ','']
# type=['string','lable']
# width=[65,65]
#
#
# if value==['year']:
# if show==1:
# if perc==1:
# if pattern=='none':
# width=[260]
# else:
# value=[' ','year']
# type=['string','string']
# width=[65,260]
# else:
# if pattern=='none':
# width=[195]
# else:
# value=[' ','year']
# type=['string','string']
# width=[65,195]
# else:
# if perc==1:
# if pattern=='none':
# width=[130]
# else:
# value=[' ','year']
# type=['string','string']
# width=[65,130]
#
# else:
# if pattern=='none':
# width=[65]
# else:
# value=[' ','year']
# type=['string','string']
# width=[65,65]
#
# if value==['Debit','Credit','Balance']:
# if show==1:
# if perc==1:
# if pattern=='none':
# width=[65,65,130]
# else:
# value=[' ','Debit','Credit','Balance']
# type=['string','lable','lable','lable']
# width=[65,65,65,130]
# else:
# if pattern=='none':
# width=[65,65,65]
# else:
# value=[' ','Debit','Credit','Balance']
# type=['string','lable','lable','lable']
# width=[65,65,65,65]
#
# else:
# if perc==1:
# if pattern=='none':
# value=['Balance']
# type=['lable']
# width=[130]
# else:
# value=[' ','Balance']
# type=['string','lable']
# width=[65,130]
# else:
# if pattern=='none':
# value=['Balance']
# type=['lable']
# width=[65]
# else:
# value=[' ','Balance']
# type=['string','lable']
# width=[65,65]
#
# if value==['debit','credit','balance']:
# if show==1:
# if perc==1:
# if pattern=='none':
# value=['debit','credit','balance','balance_perc']
# type=['string','string','string','string']
# width=[65,65,65,65]
# else:
# value=[pattern,'debit','credit','balance','balance_perc']
# type=['string','string','string','string','string']
# width=[65,65,65,65,65]
# else:
# if pattern=='none':
# value=['debit','credit','balance']
# type=['string','string','string']
# width=[65,65,65]
# else:
# value=[pattern,'debit','credit','balance']
# type=['string','string','string','string']
# width=[65,65,65,65]
#
# else:
# if perc==1:
# if pattern=='none':
# value=['balance','balance_perc']
# type=['string','string']
# width=[65,65]
# else:
# value=[pattern,'balance','balance_perc']
# type=['string','string','string']
# width=[65,65,65]
# else:
# if pattern=='none':
# value=['balance']
# type=['string']
# width=[65]
# else:
# value=[pattern,'balance']
# type=['string','string']
# width=[65,65]
#
# if value==['sum_debit','sum_credit','']:
# if show==1:
# if perc==1:
# if pattern=='none':
# width=[65,65,130]
# else:
# value=[' ','sum_debit','sum_credit','']
# type=['string','string','string','lable']
# width=[65,65,65,130]
# else:
# if pattern=='none':
# width=[65,65,65]
# else:
# value=[' ','sum_debit','sum_credit','']
# type=['string','string','string','lable']
# width=[65,65,65,65]
# else:
# if perc==1:
# if pattern=='none':
# value=['']
# type=['lable']
# width=[130]
# else:
# value=[' ','']
# type=['string','lable']
# width=[65,130]
# else:
# if pattern=='none':
# value=['']
# type=['lable']
# width=[65]
# else:
# value=[' ','']
# type=['string','lable']
# width=[65,65]
#
# if not lst:
# lst.append(1)
# for ns in node.childNodes :
# if ns and ns.nodeName!='#text' and ns.tagName=='blockTable' and td :
# width_str = ns._attrs['colWidths'].nodeValue
# ns.removeAttribute('colWidths')
# total_td = td * len(value)
#
# if not width:
# for v in value:
# width.append(30)
# check1=0
# for t in range(td):
# for v in range(len(value)):
# if type[v] in ('String','STRING','string'):
# if (value[v]==" " or value[0]==pattern):
# if check1==0:
# check1=1
# width_str +=',0.0'
# else:
# width_str +=',%d'%width[v]
# else:
# width_str +=',%d'%width[v]
# else:
# width_str +=',%d'%width[v]
# ns.setAttribute('colWidths',width_str)
#
# child_list = ns.childNodes
#
# check=0
# for child in child_list:
# if child.nodeName=='tr':
# lc = child.childNodes[1]
# for t in range(td):
# i=0
# for v in value:
#
# newnode = lc.cloneNode(1)
# temp2="%s['status']==1 and ( setTag('para','para',{'fontName':'Helvetica-bold'})) ]]"%(name)
##
# if type[i] in ('String','STRING','string'):
# if (v==" " or v==pattern) and i==0 and check==0:
# check=1
# if newnode.childNodes[1].lastChild:
# newnode.childNodes[1].lastChild.data=""
# else:
# if v==" ":
# if newnode.childNodes[1].lastChild:
# newnode.childNodes[1].lastChild.data=""
# else:
# t1= "[[ %s['%s%d'] ]]"%(name,v,t)
# if v=="year" or v=="sum_debit" or v=="sum_credit":
# if newnode.childNodes[1].lastChild:
# newnode.childNodes[1].lastChild.data = t1
# else:
# if newnode.childNodes[1].lastChild:
# newnode.childNodes[1].lastChild.data = t1+"[["+temp2
## newnode.childNodes[1].lastChild.data=[[ a['status']==1 and ( setTag('para','para',{'fontName':'Times-bold'})) ]]
# elif type[i] in ('Lable','LABLE','lable'):
# if newnode.childNodes[1].lastChild:
# newnode.childNodes[1].lastChild.data= v
#
# child.appendChild(newnode)
#
# newnode=False
# i+=1
# return super(account_balance_landscape,self).repeatIn(lst, name, nodes_parent=False)
#end
def linesForYear(self,form):
temp=0
years={}
@ -363,7 +100,6 @@ class account_balance_landscape(rml_parse.rml_parse):
total_for_perc=[]
# if perc==1:
self.done_total=1
self.total_for_perc=self.linesForTotal(form, ids={}, doneAccount={}, level=1)
self.done_total=0
@ -372,8 +108,6 @@ class account_balance_landscape(rml_parse.rml_parse):
locale.setlocale(locale.LC_ALL, '')
self.result_total["sum_credit" + str(t1)]=locale.format("%.2f", self.result_total["sum_credit" + str(t1)], grouping=True)
self.result_total["sum_debit" + str(t1)]=locale.format("%.2f", self.result_total["sum_debit" + str(t1)], grouping=True)
# self.flag=1
# self.result_total = {}
for temp in range(0,len(form['fiscalyear'])):
fy=self.pool.get('account.fiscalyear').name_get(self.cr, self.uid, form['fiscalyear'][temp])

1
addons/account/report/account_balance_sheet.py
View File

@ -91,7 +91,6 @@ class report_balancesheet_horizontal(rml_parse.rml_parse, common_report_header):
]
ctx = self.context.copy()
# ctx['state'] = form['context'].get('state','filter_no')
ctx['fiscalyear'] = data['form'].get('fiscalyear_id', False)
if data['form']['filter'] == 'filter_period' :

1
addons/account/report/account_report.py
View File

@ -122,7 +122,6 @@ class report_aged_receivable(osv.osv):
""" This view will be used in dashboard
The reason writing this code here is, we need to check date range from today to first date of fiscal year.
"""
# ranges = _get_ranges(cr) # Gets the ranges for the x axis of the graph (name column values)
pool_obj_fy = pooler.get_pool(cr.dbname).get('account.fiscalyear')
today = time.strftime('%Y-%m-%d')
fy_id = pool_obj_fy.find(cr, uid, exception=False)

7
addons/account/report/account_report_view.xml
View File

@ -47,7 +47,6 @@
<field name="view_type">form</field>
<field name="view_mode">tree,graph</field>
</record>
<!-- <menuitem action="action_account_receivable_graph" id="menu_account_receivable_graph" parent="account.menu_finance_reporting"/> -->
<!-- Report for Aged Receivable -->
@ -115,9 +114,6 @@
<field name="view_id" ref="board_view_created_invoice"/>
</record>
<!-- <menuitem id="menu_report_this_month" name="This Month" parent="account.menu_finance_reporting"/>-->
<!-- <menuitem id="menu_report_all_months" name="Sales by Account" parent="account.menu_finance_reporting"/> -->
<!-- Report of the sales by product and account -->
<record id="view_report_account_sales_tree" model="ir.ui.view">
<field name="name">report.account.sales.tree</field>
<field name="model">report.account.sales</field>
@ -169,9 +165,7 @@
<field name="view_mode">graph,tree</field>
<field name="search_view_id" ref="view_report_account_sales_search"/>
</record>
<!-- <menuitem action="action_report_account_sales_tree_all" id="menu_report_account_sales_all" parent="menu_report_all_months"/> -->
<!-- Report of the sales by product and account type -->
<record id="view_report_account_type_sales_tree" model="ir.ui.view">
<field name="name">report.account_type.sales.tree</field>
<field name="model">report.account_type.sales</field>
@ -237,7 +231,6 @@
<field name="view_mode">graph,tree</field>
<field name="search_view_id" ref="view_report_account_type_sales_search"/>
</record>
<!-- <menuitem action="action_report_account_type_sales_tree_all" id="menu_report_account_type_sales_all" parent="menu_report_all_months"/> -->
</data>
</openerp>

265
addons/account/report/compare_account_balance.py
View File

@ -58,268 +58,6 @@ class account_balance(report_sxw.rml_parse):
})
self.context = context
# def repeatIn(self, lst, name, nodes_parent=False,td=False,width=[],value=[],type=[]):
# self._node.data = ''
# node = self._find_parent(self._node, nodes_parent or parents)
# ns = node.nextSibling
##start
# if value==['Cash','%']:
# if show==1:
# if perc==1:
# if pattern=='none':
# value=['','Cash','%']
# type=['lable','lable','lable']
# width=[130,65,65]
# else:
# value=[' ','','Cash','%']
# type=['string','lable','lable','lable']
# width=[65,130,65,65]
# else:
# if pattern=='none':
# value=['']
# type=['lable']
# width=[195]
# else:
# value=[' ','']
# type=['string','lable']
# width=[65,195]
# else:
# if perc==1:
# if pattern=='none':
# value=['Cash','%']
# type=['lable','lable']
# width=[65,65]
# else:
# value=[' ','Cash','%']
# type=['string','lable','lable']
# width=[65,65,65]
# else:
# if pattern=='none':
# value=['']
# type=['lable']
# width=[65]
# else:
# value=[' ','']
# type=['string','lable']
# width=[65,65]
#
#
# if value==['year']:
# if show==1:
# if perc==1:
# if pattern=='none':
# width=[260]
# else:
# value=[' ','year']
# type=['string','string']
# width=[65,260]
# else:
# if pattern=='none':
# width=[195]
# else:
# value=[' ','year']
# type=['string','string']
# width=[65,195]
# else:
# if perc==1:
# if pattern=='none':
# width=[130]
# else:
# value=[' ','year']
# type=['string','string']
# width=[65,130]
#
# else:
# if pattern=='none':
# width=[65]
# else:
# value=[' ','year']
# type=['string','string']
# width=[65,65]
#
# if value==['Debit','Credit','Balance']:
# if show==1:
# if perc==1:
# if pattern=='none':
# width=[65,65,130]
# else:
# value=[' ','Debit','Credit','Balance']
# type=['string','lable','lable','lable']
# width=[65,65,65,130]
# else:
# if pattern=='none':
# width=[65,65,65]
# else:
# value=[' ','Debit','Credit','Balance']
# type=['string','lable','lable','lable']
# width=[65,65,65,65]
#
# else:
# if perc==1:
# if pattern=='none':
# value=['Balance']
# type=['lable']
# width=[130]
# else:
# value=[' ','Balance']
# type=['string','lable']
# width=[65,130]
# else:
# if pattern=='none':
# value=['Balance']
# type=['lable']
# width=[65]
# else:
# value=[' ','Balance']
# type=['string','lable']
# width=[65,65]
#
# if value==['debit','credit','balance']:
# if show==1:
# if perc==1:
# if pattern=='none':
# value=['debit','credit','balance','balance_perc']
# type=['string','string','string','string']
# width=[65,65,65,65]
# else:
# value=[pattern,'debit','credit','balance','balance_perc']
# type=['string','string','string','string','string']
# width=[65,65,65,65,65]
# else:
# if pattern=='none':
# value=['debit','credit','balance']
# type=['string','string','string']
# width=[65,65,65]
# else:
# value=[pattern,'debit','credit','balance']
# type=['string','string','string','string']
# width=[65,65,65,65]
#
# else:
# if perc==1:
# if pattern=='none':
# value=['balance','balance_perc']
# type=['string','string']
# width=[65,65]
# else:
# value=[pattern,'balance','balance_perc']
# type=['string','string','string']
# width=[65,65,65]
# else:
# if pattern=='none':
# value=['balance']
# type=['string']
# width=[65]
# else:
# value=[pattern,'balance']
# type=['string','string']
# width=[65,65]
#
# if value==['sum_debit','sum_credit','']:
# if show==1:
# if perc==1:
# if pattern=='none':
# width=[65,65,130]
# else:
# value=[' ','sum_debit','sum_credit','']
# type=['string','string','string','lable']
# width=[65,65,65,130]
# else:
# if pattern=='none':
# width=[65,65,65]
# else:
# value=[' ','sum_debit','sum_credit','']
# type=['string','string','string','lable']
# width=[65,65,65,65]
# else:
# if perc==1:
# if pattern=='none':
# value=['']
# type=['lable']
# width=[130]
# else:
# value=[' ','']
# type=['string','lable']
# width=[65,130]
# else:
# if pattern=='none':
# value=['']
# type=['lable']
# width=[65]
# else:
# value=[' ','']
# type=['string','lable']
# width=[65,65]
#
# if not lst:
# lst.append(1)
# for ns in node.childNodes :
# if ns and ns.nodeName!='#text' and ns.tagName=='blockTable' and td :
# width_str = ns._attrs['colWidths'].nodeValue
# ns.removeAttribute('colWidths')
# total_td = td * len(value)
#
# if not width:
# for v in value:
# width.append(30)
# check1=0
# for t in range(td):
# for v in range(len(value)):
# if type[v] in ('String','STRING','string'):
# if (value[v]==" " or value[0]==pattern):
# if check1==0:
# check1=1
# width_str +=',0.0'
# else:
# width_str +=',%d'%width[v]
# else:
# width_str +=',%d'%width[v]
# else:
# width_str +=',%d'%width[v]
# ns.setAttribute('colWidths',width_str)
#
# child_list = ns.childNodes
#
# check=0
# for child in child_list:
# if child.nodeName=='tr':
# lc = child.childNodes[1]
# for t in range(td):
# i=0
# for v in value:
#
# newnode = lc.cloneNode(1)
# temp2="%s['status']==1 and ( setTag('para','para',{'fontName':'Helvetica-bold'})) ]]"%(name)
##
# if type[i] in ('String','STRING','string'):
# if (v==" " or v==pattern) and i==0 and check==0:
# check=1
# if newnode.childNodes[1].lastChild:
# newnode.childNodes[1].lastChild.data=""
# else:
# if v==" ":
# if newnode.childNodes[1].lastChild:
# newnode.childNodes[1].lastChild.data=""
# else:
# t1= "[[ %s['%s%d'] ]]"%(name,v,t)
# if v=="year" or v=="sum_debit" or v=="sum_credit":
# if newnode.childNodes[1].lastChild:
# newnode.childNodes[1].lastChild.data = t1
# else:
# if newnode.childNodes[1].lastChild:
# newnode.childNodes[1].lastChild.data = t1+"[["+temp2
## newnode.childNodes[1].lastChild.data=[[ a['status']==1 and ( setTag('para','para',{'fontName':'Times-bold'})) ]]
# elif type[i] in ('Lable','LABLE','lable'):
# if newnode.childNodes[1].lastChild:
# newnode.childNodes[1].lastChild.data= v
#
# child.appendChild(newnode)
#
# newnode=False
# i+=1
# return super(account_balance,self).repeatIn(lst, name, nodes_parent=False)
#end
def linesForYear(self, form):
temp=0
years={}
@ -363,7 +101,6 @@ class account_balance(report_sxw.rml_parse):
total_for_perc=[]
# if perc==1:
self.done_total=1
self.total_for_perc=self.linesForTotal(form, ids={}, doneAccount={}, level=1)
self.done_total=0
@ -372,8 +109,6 @@ class account_balance(report_sxw.rml_parse):
locale.setlocale(locale.LC_ALL, '')
self.result_total["sum_credit" + str(t1)]=locale.format("%.2f", self.result_total["sum_credit" + str(t1)], grouping=True)
self.result_total["sum_debit" + str(t1)]=locale.format("%.2f", self.result_total["sum_debit" + str(t1)], grouping=True)
# self.flag=1
# self.result_total = {}
for temp in range(0,len(form['fiscalyear'])):
fy=self.pool.get('account.fiscalyear').name_get(self.cr, self.uid, form['fiscalyear'][temp])

22
addons/account/report/rml_parse.py
View File

@ -106,7 +106,6 @@ class rml_parse(report_sxw.rml_parse):
return Stringer
return Stringer
def explode_this(self,chaine,length):
#chaine = self.repair_string(chaine)
chaine = rstrip(chaine)
ast = list(chaine)
i = length
@ -120,7 +119,6 @@ class rml_parse(report_sxw.rml_parse):
UnicodeAst = []
_previouslyfound = False
i = 0
#print str(ast)
while i < len(ast):
elem = ast[i]
try:
@ -160,25 +158,5 @@ class rml_parse(report_sxw.rml_parse):
rml_head = rml_head.replace('<pageGraphics>','''<pageGraphics> <image x="10" y="26cm" height="770.0" width="1120.0" >[[company.logo]] </image> ''')
return True
# def _add_header(self, node):
# rml_head = tools.file_open('specific_param/report/header/corporate_rml_header_ch.rml').read()
# head_dom = xml.dom.minidom.parseString(rml_head)
# #for frame in head_dom.getElementsByTagName('frame'):
# # frame.parentNode.removeChild(frame)
# node2 = head_dom.documentElement
# for tag in node2.childNodes:
# if tag.nodeType==tag.ELEMENT_NODE:
# found = self._find_node(node, tag.localName)
# # rml_frames = found.getElementsByTagName('frame')
# if found:
# if tag.hasAttribute('position') and (tag.getAttribute('position')=='inside'):
# found.appendChild(tag)
# else:
# found.parentNode.replaceChild(tag, found)
# # for frame in rml_frames:
# # tag.appendChild(frame)
# return True
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

3
addons/account/report/tax_report.py
View File

@ -78,7 +78,6 @@ class tax_report(rml_parse.rml_parse):
top_result.append(res_general[ind_general])
ind_general+=1
i+=1
#array_result = self.sort_result(top_result)
return top_result
#return array_result
@ -133,8 +132,6 @@ class tax_report(rml_parse.rml_parse):
company_id, periods_ids,))
res = self.cr.dictfetchall()
#AND line.period_id IN ('+ period_sql_list +') \
i = 0
while i<len(res):
res[i]['account'] = obj_account.browse(self.cr, self.uid, res[i]['account_id'], context=context)

1
addons/account/wizard/__init__.py
View File

@ -50,7 +50,6 @@ import account_invoice_state
import account_chart
#TODO: remove this file no moe used
# also remove related view fiel
#import account_move_line_select
import account_validate_account_move
import account_use_model

2
addons/account/wizard/account_automatic_reconcile.py
View File

@ -151,8 +151,6 @@ class account_automatic_reconcile(osv.osv_memory):
query = "SELECT partner_id FROM account_move_line WHERE account_id=%s AND reconcile_id IS NULL \
AND state <> 'draft' GROUP BY partner_id \
HAVING ABS(SUM(debit-credit)) <> %s AND count(*)>0"%(account_id, 0.0)
# query="SELECT partner_id FROM account_move_line WHERE account_id=%s AND reconcile_id IS NULL \
# AND state <> 'draft' GROUP BY partner_id AND debit = credi"%(account_id)
else:
query = "SELECT partner_id FROM account_move_line WHERE account_id=%s AND reconcile_id IS NULL \
AND state <> 'draft' GROUP BY partner_id \

2
addons/account/wizard/account_chart.py
View File

@ -64,7 +64,7 @@ class account_chart(osv.osv_memory):
_defaults = {
'fiscalyear': _get_fiscalyear,
'target_move': 'all'
}
}
account_chart()
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

4
addons/account/wizard/account_compare_account_balance_report.py
View File

@ -46,13 +46,13 @@ class account_compare_account_balance_report(osv.osv_memory):
'periods': fields.many2many('account.period', 'period_account_balance_rel',
'report_id', 'period_id', 'Periods',
help='Keep empty for all open fiscal year'),
}
}
_defaults={
'compare_pattern': 'none',
'account_choice': 'moves',
'period_manner': 'actual',
}
}
def check(self, cr, uid, ids, context=None):
data={}

4
addons/account/wizard/account_fiscalyear_close.py
View File

@ -39,10 +39,10 @@ class account_fiscalyear_close(osv.osv_memory):
'Opening Entries Period', required=True),
'report_name': fields.char('Name of new entries',size=64, required=True),
'sure': fields.boolean('Check this box'),
}
}
_defaults = {
'report_name':'End of Fiscal Year Entry',
}
}
def data_save(self, cr, uid, ids, context=None):
"""

2
addons/account/wizard/account_fiscalyear_close_state.py
View File

@ -33,7 +33,7 @@ class account_fiscalyear_close_state(osv.osv_memory):
'fy_id': fields.many2one('account.fiscalyear', \
'Fiscal Year to close', required=True),
'sure': fields.boolean('Check this box', required=False)
}
}
def data_save(self, cr, uid, ids, context=None):
"""

32
addons/account/wizard/account_invoice_state_view.xml
View File

@ -12,7 +12,7 @@
<button icon="gtk-cancel" special="cancel" string="Close"/>
<button icon="terp-camera_test" string="Confirm Invoices" name="invoice_confirm" type="object" default_focus="1"/>
</group>
</form>
</form>
</field>
</record>
@ -21,20 +21,10 @@
<field name="res_model">account.invoice.confirm</field>
<field name="view_type">form</field>
<field name="view_mode">form</field>
<field name="view_id" ref="account_invoice_confirm_view"/>
<field name="target">new</field>
<field name="view_id" ref="account_invoice_confirm_view"/>
<field name="target">new</field>
</record>
<!-- <record model="ir.values" id="action_account_invoice_confirm_values">-->
<!-- <field name="model_id" ref="account.model_account_invoice" />-->
<!-- <field name="object" eval="1" />-->
<!-- <field name="name">Confirm Draft Invoices</field>-->
<!-- <field name="key2">client_action_multi</field>-->
<!-- <field name="value" eval="'ir.actions.act_window,' +str(ref('action_account_invoice_confirm'))" />-->
<!-- <field name="key">action</field>-->
<!-- <field name="model">account.invoice</field>-->
<!-- </record>-->
<record id="account_invoice_cancel_view" model="ir.ui.view">
<field name="name">account.invoice.cancel.form</field>
<field name="model">account.invoice.cancel</field>
@ -46,7 +36,7 @@
<button icon="terp-dialog-close" special="cancel" string="Close"/>
<button icon="gtk-cancel" string="Cancel Invoices" name="invoice_cancel" type="object" default_focus="1"/>
</group>
</form>
</form>
</field>
</record>
@ -55,19 +45,9 @@
<field name="res_model">account.invoice.cancel</field>
<field name="view_type">form</field>
<field name="view_mode">form</field>
<field name="view_id" ref="account_invoice_cancel_view"/>
<field name="target">new</field>
<field name="view_id" ref="account_invoice_cancel_view"/>
<field name="target">new</field>
</record>
<!-- <record model="ir.values" id="action_account_invoice_cancel_values">-->
<!-- <field name="model_id" ref="account.model_account_invoice" />-->
<!-- <field name="object" eval="1" />-->
<!-- <field name="name">Cancel Selected Invoices</field>-->
<!-- <field name="key2">client_action_multi</field>-->
<!-- <field name="value" eval="'ir.actions.act_window,' +str(ref('action_account_invoice_cancel'))" />-->
<!-- <field name="key">action</field>-->
<!-- <field name="model">account.invoice</field>-->
<!-- </record>-->
</data>
</openerp>

2
addons/account/wizard/account_move_bank_reconcile.py
View File

@ -31,7 +31,7 @@ class account_move_bank_reconcile(osv.osv_memory):
_description = "Move bank reconcile"
_columns = {
'journal_id': fields.many2one('account.journal', 'Journal', required=True),
}
}
def action_open_window(self, cr, uid, ids, context={}):
"""

1
addons/account/wizard/account_move_journal.py
View File

@ -156,7 +156,6 @@ class account_move_journal(osv.osv_memory):
res_id = data_pool.browse(cr, uid, result, context=context).res_id
return {
# 'domain': str([('journal_id', '=', journal_id), ('period_id', '=', period_id)]),
'name': name,
'view_type': 'form',
'view_mode': 'tree,graph,form',

4
addons/account/wizard/account_move_line_reconcile_select.py
View File

@ -27,7 +27,7 @@ class account_move_line_reconcile_select(osv.osv_memory):
_columns = {
'account_id': fields.many2one('account.account', 'Account', \
domain = [('reconcile', '=', 1)], required=True),
}
}
def action_open_window(self, cr, uid, ids, context={}):
"""
@ -47,7 +47,7 @@ class account_move_line_reconcile_select(osv.osv_memory):
'view_id': False,
'res_model': 'account.move.line',
'type': 'ir.actions.act_window'
}
}
account_move_line_reconcile_select()

3
addons/account/wizard/account_move_line_reconcile_select_view.xml
View File

@ -29,8 +29,5 @@
<field name="target">new</field>
</record>
<!-- <menuitem action="action_account_reconcile_select"
id="menu_reconcile_select" parent="periodical_processing_reconciliation" /> -->
</data>
</openerp>

12
addons/account/wizard/account_move_line_select_view.xml
View File

@ -23,17 +23,9 @@
<field name="res_model">account.move.line.select</field>
<field name="view_type">form</field>
<field name="view_mode">form</field>
<field name="view_id" ref="account_move_line_select_button_view"/>
<field name="target">new</field>
<field name="view_id" ref="account_move_line_select_button_view"/>
<field name="target">new</field>
</record>
<!-- <record id="ir_account_move_line_select" model="ir.values">-->
<!-- <field name="key2">tree_but_open</field>-->
<!-- <field name="model">account.account</field>-->
<!-- <field name="name">Open Account</field>-->
<!-- <field eval="'ir.actions.act_window,%d'%action_account_move_line_select_button" name="value"/>-->
<!-- <field eval="True" name="object"/>-->
<!-- </record>-->
</data>
</openerp>

4
addons/account/wizard/account_move_line_unreconcile_select.py
View File

@ -28,7 +28,7 @@ class account_move_line_unreconcile_select(osv.osv_memory):
_description = "Unreconciliation"
_columns ={
'account_id': fields.many2one('account.account','Account',required=True),
}
}
def action_open_window(self, cr, uid, ids, context={}):
data = self.read(cr, uid, ids, context=context)[0]
return {
@ -39,7 +39,7 @@ class account_move_line_unreconcile_select(osv.osv_memory):
'view_id': False,
'res_model': 'account.move.line',
'type': 'ir.actions.act_window'
}
}
account_move_line_unreconcile_select()

3
addons/account/wizard/account_move_line_unreconcile_select_view.xml
View File

@ -29,8 +29,5 @@
<field name="target">new</field>
</record>
<!-- <menuitem action="action_account_unreconcile_select"
id="menu_unreconcile_select" parent="periodical_processing_reconciliation" /> -->
</data>
</openerp>

2
addons/account/wizard/account_open_closed_fiscalyear.py
View File

@ -27,7 +27,7 @@ class account_open_closed_fiscalyear(osv.osv_memory):
_columns = {
'fyear_id': fields.many2one('account.fiscalyear', \
'Fiscal Year to Open', required=True, help='Select Fiscal Year which you want to remove entries for its End of year entries journal'),
}
}
def remove_entries(self, cr, uid, ids, context={}):
data = self.read(cr, uid, ids, [])[0]

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

@ -29,9 +29,5 @@
<field name="target">new</field>
</record>
<!-- <menuitem action="action_account_open_closed_fiscalyear"-->
<!-- id="menu_wizard_open_closed_fy" sequence="2"-->
<!-- parent="account.menu_account_end_year_treatments" />-->
</data>
</openerp>

2
addons/account/wizard/account_pay_invoice.py
View File

@ -36,7 +36,7 @@ class account_invoice_pay_writeoff(osv.osv_memory):
'writeoff_journal_id': fields.many2one('account.journal', 'Write-Off journal', required=True),
'comment': fields.char('Comment', size=64, required=True),
'analytic_id': fields.many2one('account.analytic.account','Analytic Account', domain=[('parent_id', '!=', False)])
}
}
_defaults = {
'comment': 'Write-Off',
}

3
addons/account/wizard/account_pay_invoice_view.xml
View File

@ -16,7 +16,7 @@
<field name="period_id" widget="selection"/>
</group>
<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="Partial Payment" name="pay_and_reconcile" type="object"/>
<button icon="gtk-execute" string="Full Payment" name="wo_check" type="object"/>
@ -60,6 +60,5 @@
</field>
</record>
</data>
</openerp>

2
addons/account/wizard/account_period_close.py
View File

@ -30,7 +30,7 @@ class account_period_close(osv.osv_memory):
_description = "period close"
_columns = {
'sure': fields.boolean('Check this box'),
}
}
def data_save(self, cr, uid, ids, context=None):
"""

8
addons/account/wizard/account_reconcile.py
View File

@ -30,7 +30,7 @@ class account_move_line_reconcile_prompt(osv.osv_memory):
_name = 'account.move.line.reconcile.prompt'
_description = 'Account move line reconcile'
_columns = {
}
}
def ask_reconcilation(self, cr, uid, ids, context):
return self.pool.get('account.move.line.reconcile').partial_check(cr, uid, ids, context)
@ -48,7 +48,7 @@ class account_move_line_reconcile(osv.osv_memory):
'credit': fields.float('Credit amount', readonly=True),
'debit': fields.float('Debit amount', readonly=True),
'writeoff': fields.float('Write-Off amount', readonly=True),
}
}
def default_get(self, cr, uid, fields, context=None):
res = super(account_move_line_reconcile, self).default_get(cr, uid, fields, context=context)
@ -149,11 +149,11 @@ class account_move_line_reconcile_writeoff(osv.osv_memory):
'date_p': fields.date('Date'),
'comment': fields.char('Comment', size= 64, required=True),
'analytic_id': fields.many2one('account.analytic.account', 'Analytic Account', domain=[('parent_id', '!=', False)]),
}
}
_defaults = {
'date_p': time.strftime('%Y-%m-%d'),
'comment': 'Write-off',
}
}
def trans_rec_addendum(self, cr, uid, ids, context=None):
mod_obj = self.pool.get('ir.model.data')

9
addons/account/wizard/account_reconcile_partner_process.py
View File

@ -71,15 +71,6 @@ class account_partner_reconcile_process(osv.osv_memory):
self.pool.get('res.partner').write(cr, uid, partner_id, {'last_reconciliation_date': time.strftime('%Y-%m-%d')}, context)
#TODO: we have to find a way to update the context of the current tab (we could open a new tab with the context but it's not really handy)
#TODO: remove that comments when the client side dev is done
#context.update({'partner_id': self.browse(cr, uid, ids, context)[0].next_partner_id})
#return {'context': context,
# 'target': 'opener',
# 'name': 'reconciliation process',
# 'view_type': 'form',
# 'view_mode': 'tree,form',
# 'res_model': 'account.move.line',
# 'type': 'ir.actions.act_window'
#}
return {}
_columns = {

7
addons/account/wizard/account_reconcile_partner_process_view.xml
View File

@ -41,12 +41,5 @@
<field name="model">account.move.line</field>
</record>
<!-- <menuitem
icon="STOCK_EXECUTE"
name="Partner reconciliation"
action="action_account_partner_reconcile"
id="menu_partner_reconcile"
parent="account.next_id_20"/>
-->
</data>
</openerp>

80
addons/account/wizard/account_reconcile_view.xml
View File

@ -2,42 +2,6 @@
<openerp>
<data>
<!-- <record id="view_account_move_line_reconcile_prompt" model="ir.ui.view">-->
<!-- <field name="name">account.move.line.reconcile.prompt.form</field>-->
<!-- <field name="model">account.move.line.reconcile.prompt</field>-->
<!-- <field name="type">form</field>-->
<!-- <field name="arch" type="xml">-->
<!-- <form string="Reconciliation">-->
<!-- <separator string="Are you sure you want to reconcile entries?" colspan="4"/>-->
<!-- <group colspan="4" col="6">-->
<!-- <label string ="" colspan="2"/>-->
<!---->
<!-- <button icon="gtk-cancel" special="cancel" string="Cancel"/>-->
<!-- <button icon="gtk-ok" string="Ok" name="ask_reconcilation" type="object" default_focus="1"/>-->
<!-- </group>-->
<!-- </form>-->
<!-- </field>-->
<!-- </record>-->
<!-- <record id="action_view_account_move_line_reconcile_prompt" model="ir.actions.act_window">-->
<!-- <field name="name">Reconcile Entries</field>-->
<!-- <field name="res_model">account.move.line.reconcile.prompt</field>-->
<!-- <field name="view_type">form</field>-->
<!-- <field name="view_mode">tree,form</field>-->
<!-- <field name="view_id" ref="view_account_move_line_reconcile_prompt"/>-->
<!-- <field name="target">new</field>-->
<!-- </record>-->
<!-- <record model="ir.values" id="action_account_move_line_reconcile_prompt_values">-->
<!-- <field name="model_id" ref="account.model_account_move_line" />-->
<!-- <field name="object" eval="1" />-->
<!-- <field name="name">Reconcile Entries</field>-->
<!-- <field name="key2">client_action_multi</field>-->
<!-- <field name="value" eval="'ir.actions.act_window,' +str(ref('action_view_account_move_line_reconcile_prompt'))" />-->
<!-- <field name="key">action</field>-->
<!-- <field name="model">account.move.line</field>-->
<!-- </record>-->
<record id="view_account_move_line_reconcile_full" model="ir.ui.view">
<field name="name">account.move.line.reconcile.full.form</field>
<field name="model">account.move.line.reconcile</field>
@ -82,50 +46,6 @@
<field name="key">action</field>
<field name="model">account.move.line</field>
</record>
<!-- <record id="view_account_move_line_reconcile_full" model="ir.ui.view">-->
<!-- <field name="name">account.move.line.reconcile.full.form</field>-->
<!-- <field name="model">account.move.line.reconcile</field>-->
<!-- <field name="type">form</field>-->
<!-- <field name="arch" type="xml">-->
<!-- <form string="Reconciliation">-->
<!-- <separator string="Reconciliation transactions" colspan="4"/>-->
<!-- <field name="trans_nbr"/>-->
<!-- <newline/>-->
<!-- <field name="credit"/>-->
<!-- <field name="debit"/>-->
<!-- <separator string="Write-Off" colspan="4"/>-->
<!-- <field name="writeoff"/>-->
<!-- <group colspan="4" col="6">-->
<!-- <label string ="" colspan="2"/>-->
<!-- <button icon="gtk-cancel" special="cancel" string="Cancel"/>-->
<!-- <button icon="terp-stock_effects-object-colorize" string="Reconcile" name="trans_rec_reconcile_full" type="object" default_focus="1"/>-->
<!-- </group>-->
<!-- </form>-->
<!-- </field>-->
<!-- </record>-->
<!---->
<!-- <record id="view_account_move_line_reconcile_partial" model="ir.ui.view">-->
<!-- <field name="name">account.move.line.reconcile.partial.form</field>-->
<!-- <field name="model">account.move.line.reconcile</field>-->
<!-- <field name="type">form</field>-->
<!-- <field name="arch" type="xml">-->
<!-- <form string="Reconciliation">-->
<!-- <separator string="Reconciliation transactions" colspan="4"/>-->
<!-- <field name="trans_nbr"/>-->
<!-- <newline/>-->
<!-- <field name="credit"/>-->
<!-- <field name="debit"/>-->
<!-- <separator string="Write-Off" colspan="4"/>-->
<!-- <field name="writeoff"/>-->
<!-- <group colspan="4" col="6">-->
<!-- <label string ="" colspan="2"/>-->
<!-- <button icon="gtk-cancel" special="cancel" string="Cancel"/>-->
<!-- <button icon="gtk-ok" string="Reconcile With Write-Off" name="trans_rec_addendum_writeoff" type="object" default_focus="1"/>-->
<!-- <button icon="gtk-ok" string="Partial Reconcile" name="trans_rec_reconcile_partial_reconcile" type="object"/>-->
<!-- </group>-->
<!-- </form>-->
<!-- </field>-->
<!-- </record>-->
<record id="account_move_line_reconcile_writeoff" model="ir.ui.view">
<field name="name">account.move.line.reconcile.writeoff.form</field>

2
addons/account/wizard/account_report_account_balance.py
View File

@ -30,7 +30,7 @@ class account_balance_report(osv.osv_memory):
_defaults = {
'journal_ids': [],
}
}
def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
mod_obj = self.pool.get('ir.model.data')

38
addons/account/wizard/account_report_account_balance_view.xml
View File

@ -3,28 +3,28 @@
<openerp>
<data>
<record id="account_report_balance_view" model="ir.ui.view">
<field name="name">Account Balance</field>
<field name="model">account.balance.report</field>
<field name="type">form</field>
<field name="inherit_id" ref="account_common_report_view" />
<field name="arch" type="xml">
<field name="fiscalyear_id" position="after">
<field name="display_account"/>
<newline/>
</field>
</field>
<record id="account_report_balance_view" model="ir.ui.view">
<field name="name">Account Balance</field>
<field name="model">account.balance.report</field>
<field name="type">form</field>
<field name="inherit_id" ref="account_common_report_view" />
<field name="arch" type="xml">
<field name="fiscalyear_id" position="after">
<field name="display_account"/>
<newline/>
</field>
</field>
</record>
<record id="action_account_balance_menu" model="ir.actions.act_window">
<field name="name">Account Balance</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">account.balance.report</field>
<field name="view_type">form</field>
<field name="view_mode">form</field>
<field name="view_id" ref="account_report_balance_view"/>
<field name="target">new</field>
</record>
<field name="name">Account Balance</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">account.balance.report</field>
<field name="view_type">form</field>
<field name="view_mode">form</field>
<field name="view_id" ref="account_report_balance_view"/>
<field name="target">new</field>
</record>
<menuitem
icon="STOCK_PRINT"

4
addons/account/wizard/account_report_aged_partner_balance.py
View File

@ -37,12 +37,12 @@ class account_aged_trial_balance(osv.osv_memory):
'direction_selection': fields.selection([('past','Past'),
('future','Future')],
'Analysis Direction', required=True),
}
}
_defaults = {
'period_length': 30,
'date_from' : time.strftime('%Y-%m-%d'),
'direction_selection': 'past',
}
}
def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
mod_obj = self.pool.get('ir.model.data')

8
addons/account/wizard/account_report_balance_sheet.py
View File

@ -36,12 +36,12 @@ class account_bs_report(osv.osv_memory):
'display_type': fields.boolean("Landscape Mode"),
'reserve_account_id': fields.many2one('account.account', 'Reserve & Surplus Account',required = True,
help='This Account is used for trasfering Profit/Loss(If It is Profit : Amount will be added, Loss : Amount will be duducted.), Which is calculated from Profilt & Loss Report', domain = [('type','=','payable')]),
}
}
_defaults={
'display_type': True,
'journal_ids': [],
}
}
def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
mod_obj = self.pool.get('ir.model.data')
@ -68,13 +68,13 @@ class account_bs_report(osv.osv_memory):
'type': 'ir.actions.report.xml',
'report_name': 'account.balancesheet.horizontal',
'datas': data,
}
}
else:
return {
'type': 'ir.actions.report.xml',
'report_name': 'account.balancesheet',
'datas': data,
}
}
account_bs_report()

2
addons/account/wizard/account_report_balance_sheet_view.xml
View File

@ -9,8 +9,6 @@
<field name="inherit_id" ref="account.account_common_report_view" />
<field name="arch" type="xml">
<field name="fiscalyear_id" position="after">
<!-- <field name="reserve_account_id"/>-->
<!-- <newline/>-->
<field name="display_account"/>
<field name="display_type"/>
<newline/>

2
addons/account/wizard/account_report_central_journal.py
View File

@ -31,7 +31,7 @@ class account_central_journal(osv.osv_memory):
'type': 'ir.actions.report.xml',
'report_name': 'account.central.journal',
'datas': data,
}
}
account_central_journal()

1
addons/account/wizard/account_report_central_journal_view.xml
View File

@ -11,7 +11,6 @@
<field name="fiscalyear_id" position="after">
<field name="amount_currency"/>
<newline/>
<!-- we don't change the view but have to define a view for this specific object otherelse openerp will try to build a fedault one without using the one from the parent object -->
</field>
</field>
</record>

4
addons/account/wizard/account_report_common_account.py
View File

@ -30,10 +30,10 @@ class account_common_account_report(osv.osv_memory):
('bal_solde','With balance is not equal to 0'),
],'Display accounts', required=True),
}
}
_defaults = {
'display_account': 'bal_all',
}
}
def pre_print_report(self, cr, uid, ids, data, query_line, context=None):
if context is None:

2
addons/account/wizard/account_report_common_journal.py
View File

@ -27,7 +27,7 @@ class account_common_journal_report(osv.osv_memory):
_inherit = "account.common.report"
_columns = {
'amount_currency': fields.boolean("With Currency", help="Print Report with the currency column if the currency is different then the company currency"),
}
}
def _build_context(self, cr, uid, ids, data, context=None):
if context is None:

4
addons/account/wizard/account_report_common_partner.py
View File

@ -30,10 +30,10 @@ class account_common_partner_report(osv.osv_memory):
('supplier','Payable Accounts'),
('customer_supplier' ,'Receivable and Payable Accounts')],
"Partner's", required=True),
}
}
_defaults = {
'result_selection': 'customer',
}
}
def pre_print_report(self, cr, uid, ids, data, query_line, context=None):
if context is None:

1
addons/account/wizard/account_report_common_view.xml
View File

@ -43,7 +43,6 @@
<record id="action_account_common_menu" model="ir.actions.act_window">
<field name="name">Common Report</field>
<!-- <field name="type">ir.actions.act_window</field>-->
<field name="res_model">account.common.report</field>
<field name="view_type">form</field>
<field name="view_mode">form</field>

5
addons/account/wizard/account_report_general_journal_view.xml
View File

@ -9,9 +9,8 @@
<field name="inherit_id" ref="account_common_report_view" />
<field name="arch" type="xml">
<field name="fiscalyear_id" position="after">
<field name="amount_currency"/>
<newline/>
<!-- we don't change the view but have to define a view for this specific object otherelse openerp will try to build a fedault one without using the one from the parent object -->
<field name="amount_currency"/>
<newline/>
</field>
</field>
</record>

8
addons/account/wizard/account_report_partner_ledger.py
View File

@ -35,12 +35,12 @@ class account_partner_ledger(osv.osv_memory):
'reconcil': fields.boolean('Include Reconciled Entries', help='Consider reconciled entries'),
'page_split': fields.boolean('One Partner Per Page', help='Display Ledger Report with One partner per page'),
'amount_currency': fields.boolean("With Currency", help="It adds the currency column if the currency is different then the company currency"),
}
}
_defaults = {
'reconcil': True,
'initial_balance': True,
'page_split': False,
}
}
def _print_report(self, cr, uid, ids, data, query_line, context=None):
if context is None:
@ -52,12 +52,12 @@ class account_partner_ledger(osv.osv_memory):
'type': 'ir.actions.report.xml',
'report_name': 'account.third_party_ledger',
'datas': data,
}
}
return {
'type': 'ir.actions.report.xml',
'report_name': 'account.third_party_ledger_other',
'datas': data,
}
}
account_partner_ledger()

4
addons/account/wizard/account_report_print_journal.py
View File

@ -30,10 +30,10 @@ class account_print_journal(osv.osv_memory):
'sort_selection': fields.selection([('date', 'Date'),
('ref', 'Reference Number'),],
'Entries Sorted By', required=True),
}
}
_defaults = {
'sort_selection': 'date',
}
}
def _print_report(self, cr, uid, ids, data, query_line, context=None):
if context is None:

8
addons/account/wizard/account_report_profit_loss.py
View File

@ -32,12 +32,12 @@ class account_pl_report(osv.osv_memory):
_description = "Account Profit And Loss Report"
_columns = {
'display_type': fields.boolean("Landscape Mode"),
}
}
_defaults = {
'display_type': True,
'journal_ids': [],
}
}
def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
mod_obj = self.pool.get('ir.model.data')
@ -60,13 +60,13 @@ class account_pl_report(osv.osv_memory):
'type': 'ir.actions.report.xml',
'report_name': 'pl.account.horizontal',
'datas': data,
}
}
else:
return {
'type': 'ir.actions.report.xml',
'report_name': 'pl.account',
'datas': data,
}
}
account_pl_report()

18
addons/account/wizard/account_statement_from_invoice.py
View File

@ -31,10 +31,10 @@ class account_statement_from_invoice_lines(osv.osv_memory):
_description = "Entries by Statement from Invoices"
_columns = {
'line_ids': fields.many2many('account.move.line', 'account_move_line_relation', 'move_id', 'line_id', 'Invoices'),
}
}
def populate_statement(self, cr, uid, ids, context=None):
statement_id = context.get('statement_id', False)
if not statement_id:
return {}
@ -42,7 +42,7 @@ class account_statement_from_invoice_lines(osv.osv_memory):
line_ids = data['line_ids']
if not line_ids:
return {}
line_obj = self.pool.get('account.move.line')
statement_obj = self.pool.get('account.bank.statement')
statement_line_obj = self.pool.get('account.bank.statement.line')
@ -50,29 +50,26 @@ class account_statement_from_invoice_lines(osv.osv_memory):
statement_reconcile_obj = self.pool.get('account.bank.statement.reconcile')
line_date = time.strftime('%Y-%m-%d')
statement = statement_obj.browse(cr, uid, statement_id, context=context)
# for each selected move lines
for line in line_obj.browse(cr, uid, line_ids, context=context):
ctx = context.copy()
# take the date for computation of currency => use payment date
# if line.date_maturity:
# ctx['date'] = line.date_maturity
# else:
ctx['date'] = line_date
amount = 0.0
if line.debit > 0:
amount = line.debit
elif line.credit > 0:
amount = -line.credit
if line.amount_currency:
amount = currency_obj.compute(cursor, user, line.currency_id.id,
statement.currency.id, line.amount_currency, context=ctx)
elif (line.invoice and line.invoice.currency_id.id <> statement.currency.id):
amount = currency_obj.compute(cursor, user, line.invoice.currency_id.id,
statement.currency.id, amount, context=ctx)
reconcile_id = statement_reconcile_obj.create(cr, uid, {
'line_ids': [(6, 0, [line.id])]
}, context=context)
@ -150,7 +147,6 @@ class account_statement_from_invoice(osv.osv_memory):
args.append(('id','not in',repeated_move_line_ids))
line_ids = line_obj.search(cr, uid, args,
#order='date DESC, id DESC', #doesn't work
context=context)
model_data_ids = mod_obj.search(cr,uid,[('model','=','ir.ui.view'),('name','=','view_account_statement_from_invoice_lines')], context=context)
resource_id = mod_obj.read(cr, uid, model_data_ids, fields=['res_id'], context=context)[0]['res_id']

12
addons/account/wizard/account_statement_from_invoice_view.xml
View File

@ -26,8 +26,8 @@
<field name="res_model">account.statement.from.invoice</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="view_id" ref="view_account_statement_from_invoice"/>
<field name="target">new</field>
<field name="view_id" ref="view_account_statement_from_invoice"/>
<field name="target">new</field>
</record>
<record id="view_account_statement_from_invoice_lines" model="ir.ui.view">
@ -41,7 +41,7 @@
<field height="300" width="700" name="line_ids" colspan="4" nolabel="1" domain="[('account_id.type','in',['receivable','payable']), ('reconcile_id','=',False), ('reconcile_partial_id','=',False)]"/>
</group>
<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="Ok" name="populate_statement" type="object"/>
</group>
@ -54,9 +54,9 @@
<field name="res_model">account.statement.from.invoice.lines</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="view_id" ref="view_account_statement_from_invoice_lines"/>
<field name="target">new</field>
<field name="context">{'statement_id': active_id}</field>
<field name="view_id" ref="view_account_statement_from_invoice_lines"/>
<field name="target">new</field>
<field name="context">{'statement_id': active_id}</field>
</record>
</data>
</openerp>

4
addons/account/wizard/account_subscription_generate.py
View File

@ -29,10 +29,10 @@ class account_subscription_generate(osv.osv_memory):
_description = "Subscription Compute"
_columns = {
'date': fields.date('Date', required=True),
}
}
_defaults = {
'date': lambda *a: time.strftime('%Y-%m-%d'),
}
}
def action_generate(self, cr, uid, ids, context={}):
mod_obj = self.pool.get('ir.model.data')
act_obj = self.pool.get('ir.actions.act_window')

4
addons/account/wizard/account_use_model.py
View File

@ -30,7 +30,7 @@ class account_use_model(osv.osv_memory):
_description = 'Use model'
_columns = {
'model': fields.many2many('account.model', 'account_use_model_relation', 'account_id', 'model_id', 'Account Model'),
}
}
def create_entries(self, cr, uid, ids, context=None):
account_model_obj = self.pool.get('account.model')
@ -92,7 +92,7 @@ class account_use_model(osv.osv_memory):
'views': [(resource_id,'form')],
'type': 'ir.actions.act_window',
'target': 'new',
}
}
def open_moves(self, cr, uid, ids, context=None):
mod_obj = self.pool.get('ir.model.data')

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

@ -42,9 +42,6 @@
<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"/>-->
<record id="view_account_use_model_open_entry" model="ir.ui.view">
<field name="name">account.use.model.open.entry.form</field>
<field name="model">account.use.model</field>

2
addons/account/wizard/account_validate_account_move.py
View File

@ -27,7 +27,7 @@ class validate_account_move(osv.osv_memory):
_columns = {
'journal_id': fields.many2one('account.journal', 'Journal', required=True),
'period_id': fields.many2one('account.period', 'Period', required=True, domain=[('state','<>','done')]),
}
}
def validate_move(self, cr, uid, ids, context=None):
obj_move = self.pool.get('account.move')

1
addons/account_analytic_analysis/account_analytic_analysis.py
View File

@ -560,7 +560,6 @@ class account_analytic_account_summary_month(osv.osv):
_description = "Hours summary by month"
_auto = False
_rec_name = 'month'
# _order = 'month'
def _unit_amount(self, cr, uid, ids, name, arg, context=None):
res = {}

1
addons/account_budget/__openerp__.py
View File

@ -63,7 +63,6 @@ Three reports are available:
],
'demo_xml': ['crossovered_budget_demo.xml'],
'test':[
# 'test/account_budget_spread.yml',
'test/account_budget.yml',
],
'installable': True,

3
addons/account_budget/account_budget_wizard.xml
View File

@ -1,9 +1,6 @@
<?xml version="1.0"?>
<openerp>
<data>
<!-- <wizard id="wizard_budget_spread" menu="False" model="account.budget.post" name="account.budget.spread" string="Spread amount"/>-->
<!-- <wizard id="wizard_budget_report" keyword="client_print_multi" model="account.budget.post" name="account.budget.report" string="Budget"/>-->
</data>
</openerp>

30
addons/account_budget/crossovered_budget_report.xml
View File

@ -11,36 +11,6 @@
auto="False"
menu="False" />
<!-- <wizard-->
<!-- string="Print Budgets"-->
<!-- model="crossovered.budget"-->
<!-- name="wizard.crossovered.budget"-->
<!-- id="wizard_crossovered_budget_menu"-->
<!-- keyword="client_print_multi" />-->
<!-- <wizard-->
<!-- string="Print Summary of Budgets"-->
<!-- model="crossovered.budget"-->
<!-- name="wizard.crossovered.budget.summary"-->
<!-- id="wizard_crossovered_budget_menu_1"-->
<!-- keyword="client_print_multi" />-->
<!-- Reports on account.analytic.account -->
<!-- <wizard-->
<!-- id="account_analytic_account_budget_report"-->
<!-- string="Print Budgets"-->
<!-- model="account.analytic.account"-->
<!-- name="wizard.analytic.account.budget.report"-->
<!-- keyword="client_print_multi"/>-->
<!---->
<!-- <report id="account_analytic_account_budget"-->
<!-- string="Print Budgets"-->
<!-- model="account.analytic.account"-->
<!-- name="account.analytic.account.budget"-->
<!-- rml="account_budget/report/analytic_account_budget_report.rml"-->
<!-- auto="False"-->
<!-- menu="False"/>-->
<!-- moved from account module -->
<report auto="False"
id="account_budget"

13
addons/account_budget/crossovered_budget_view.xml
View File

@ -79,7 +79,6 @@
<field name="crossovered_budget_line" widget="one2many_list" colspan="4" nolabel="1" mode="graph,tree">
<graph type="bar" string="Lines">
<field name="analytic_account_id" groups="base.group_extended"/>
<!--<field name="general_budget_id" operator="+" />-->
<field name="planned_amount" operator="+"/>
<field group="True" name="general_budget_id"/>
</graph>
@ -151,7 +150,6 @@
<button string="Approve" name="validate" states="confirm" type="workflow" icon="gtk-ok"/>
<button string="Done" name="done" states="validate" type="workflow" icon="gtk-jump-to" />
<button string="Cancel" name="cancel" states="confirm,validate" type="workflow" icon="gtk-cancel"/>
<!--<button string="Set to Draft" name="action_set_to_draft" states="cancel" type="object"/>-->
</group>
</form>
@ -290,7 +288,6 @@
</form>
<graph type="bar" string="Lines">
<field name="general_budget_id" />
<!--<field name="analytic_account_id" operator="+"/>-->
<field name="planned_amount" operator="+"/>
<field group="True" name="analytic_account_id"/>
</graph>
@ -299,16 +296,6 @@
</notebook>
</field>
</record>
<!-- moved from account module -->
<!--Budget -->
<!--<report
id="account_analytic_budget_print"
string="Print Budget"
model="account.analytic.budget.post"
name="account.analytic.budget.print"
rml="account/project/report/account_analytic_budget_report.rml"
auto="False"
menu="False"/>-->
</data>
</openerp>

13
addons/account_budget/crossovered_budget_workflow.xml
View File

@ -36,13 +36,6 @@
<field name="action">budget_validate()</field>
</record>
<!--<record model="workflow.activity" id="act_set_to_draft">
<field name="wkf_id" ref="wkf_crossovered_budget" />
<field name="name">settodraft</field>
<field name="kind">function</field>
<field name="action">action_set_to_draft()</field>
</record>-->
<record model="workflow.activity" id="act_cancel">
<field name="wkf_id" ref="wkf_crossovered_budget" />
<field name="name">cancel</field>
@ -94,11 +87,5 @@
<field name="role_id" ref="crossovered_budget_role"/>
</record>
<!--<record model="workflow.transition" id="t7">
<field name="act_from" ref="act_cancel" />
<field name="act_to" ref="act_draft" />
<field name="signal">settodraft</field>
<field name="role_id" ref="crossovered_budget_role"/>
</record>-->
</data>
</openerp>

3
addons/account_budget/report/analytic_account_budget_report.py
View File

@ -39,8 +39,6 @@ class analytic_account_budget_report(report_sxw.rml_parse):
if not ids:
ids = self.ids
# if not ids:
# return []
if not done:
done={}
@ -68,7 +66,6 @@ class analytic_account_budget_report(report_sxw.rml_parse):
d_from=form['date_from']
d_to=form['date_to']
# bd_ids = ','.join([str(x) for x in budget_lines])
self.cr.execute('select distinct(crossovered_budget_id) from crossovered_budget_lines where id =ANY(%s)',(b_line_ids,))
budget_ids=self.cr.fetchall()

3
addons/account_budget/report/crossovered_budget_report.py
View File

@ -40,8 +40,6 @@ class budget_report(report_sxw.rml_parse):
if not ids:
ids = self.ids
# if not ids:
# return []
if not done:
done={}
@ -71,7 +69,6 @@ class budget_report(report_sxw.rml_parse):
if not budget_ids:
return []
# bd_ids = ','.join([str(x) for x in budget_lines])
self.cr.execute('select distinct(analytic_account_id) from crossovered_budget_lines where id =ANY(%s)',(budget_ids,))
an_ids=self.cr.fetchall()

2
addons/account_cancel/account_cancel_view.xml
View File

@ -11,6 +11,6 @@
<field name="update_posted"/>
</field>
</field>
</record>
</record>
</data>
</openerp>

2
addons/account_followup/account_followup_view.xml
View File

@ -136,8 +136,6 @@
</field>
</record>
<!-- <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"

2
addons/account_followup/report/account_followup_report.py
View File

@ -39,7 +39,7 @@ class account_followup_stat(osv.osv):
'date_move_last':fields.date('Last move', readonly=True),
'date_followup':fields.date('Latest followup', readonly=True),
'followup_id': fields.many2one('account_followup.followup.line',
'Follow Ups', readonly=True, ondelete="cascade"),
'Follow Ups', readonly=True, ondelete="cascade"),
'balance':fields.float('Balance', readonly=True),
'debit':fields.float('Debit', readonly=True),
'credit':fields.float('Credit', readonly=True),

17
addons/account_followup/wizard/account_followup_print.py
View File

@ -98,22 +98,7 @@ class account_followup_print_all(osv.osv_memory):
'partner_lang': True,
'partner_ids': _get_partners,
'summary': _get_summary,
# 'email_body':'''
#Date : %(date)s
#
#Dear %(partner_name)s,
#
#Please find in attachment a reminder of all your unpaid invoices, for a total amount due of:
#
#%(followup_amount).2f %(company_currency)s
#
#
#Thanks,
#--
#%(user_signature)s
#%(company_name)s
# '''
}
}
def _get_partners_followp(self, cr, uid, ids, context=None):
data = {}

1
addons/account_followup/wizard/account_followup_print_view.xml
View File

@ -65,7 +65,6 @@
<field name="email_conf" colspan="4"/>
<field name="partner_lang" colspan="4"/>
<field name="email_subject" colspan="4"/>
<!--<separator string="Email body" colspan="4" attrs="{'readonly':[('partner_lang','=',True)]}"/>-->
<separator string="Email body" colspan="4" />
<field name="email_body" colspan="4" nolabel="1"/>
<separator string="Legend" colspan="4"/>

8
addons/account_invoice_layout/account_invoice_layout.py
View File

@ -170,7 +170,6 @@ class account_invoice_line(osv.osv):
_defaults = {
'state': 'article',
'sequence': 0,
# 'account_id': _default_account
}
account_invoice_line()
@ -190,13 +189,6 @@ class one2many_mod2(fields.one2many):
res[r[self._fields_id]].append( r['id'] )
return res
# def copy(self, cr, uid, id, default=None, context=None):
# if default is None:
# default = {}
# default['line_ids'] = False
# return super(account_invoice, self).copy(cr, uid, id, default, context)
class account_invoice(osv.osv):
def copy(self, cr, uid, id, default=None, context=None):

1
addons/account_payment/account_move_line.py
View File

@ -97,7 +97,6 @@ class account_move_line(osv.osv):
line2bank[line.id] = line.invoice.partner_bank_id.id
elif line.partner_id:
if not line.partner_id.bank_ids:
#raise osv.except_osv(_('Error !'), _('Partner '+ line.partner_id.name+ ' has no bank account defined'))
line2bank[line.id] = False
else:
for bank in line.partner_id.bank_ids:

Some files were not shown because too many files have changed in this diff Show More