diff --git a/addons/account/__openerp__.py b/addons/account/__openerp__.py
index f06123487e2..3923add4fe0 100644
--- a/addons/account/__openerp__.py
+++ b/addons/account/__openerp__.py
@@ -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',
diff --git a/addons/account/account.py b/addons/account/account.py
index d0e4e66cd60..1f54a9b2c52 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -693,14 +693,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
@@ -708,16 +700,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):
@@ -731,7 +713,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)
@@ -1419,8 +1400,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
@@ -1903,8 +1882,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
@@ -2257,12 +2234,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,
@@ -2271,7 +2244,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)
@@ -2588,7 +2560,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,
diff --git a/addons/account/account_analytic_line.py b/addons/account/account_analytic_line.py
index 1792525a7f6..36fc350dfb8 100644
--- a/addons/account/account_analytic_line.py
+++ b/addons/account/account_analytic_line.py
@@ -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
diff --git a/addons/account/account_assert_test.xml b/addons/account/account_assert_test.xml
index 585c6bda124..ba5f9840ccc 100644
--- a/addons/account/account_assert_test.xml
+++ b/addons/account/account_assert_test.xml
@@ -4,25 +4,5 @@
-
-
-
diff --git a/addons/account/account_bank_statement.py b/addons/account/account_bank_statement.py
index 6ddea9645b4..e8cafd2443b 100644
--- a/addons/account/account_bank_statement.py
+++ b/addons/account/account_bank_statement.py
@@ -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'})
diff --git a/addons/account/account_cash_statement.py b/addons/account/account_cash_statement.py
index f08f9de2f8f..8bf75a8dd03 100644
--- a/addons/account/account_cash_statement.py
+++ b/addons/account/account_cash_statement.py
@@ -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 !'),
diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index 6effce8f488..80c245638f7 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -421,7 +421,6 @@
-
Customer Invoices
diff --git a/addons/account/account_invoice_workflow.xml b/addons/account/account_invoice_workflow.xml
index ba8d1ba2bc8..c3749eb8cf0 100644
--- a/addons/account/account_invoice_workflow.xml
+++ b/addons/account/account_invoice_workflow.xml
@@ -12,19 +12,6 @@
True
draft
-
-
-
-
-
-
-
-
-
-
@@ -65,35 +52,11 @@ write({'state':'cancel'})
function
-
-
-
-
-
-
-
invoice_open
-
-
-
-
-
-
-
-
-
-
-
-
@@ -106,11 +69,6 @@ write({'state':'cancel'})
invoice_cancel
-
-
-
-
-
@@ -126,7 +84,7 @@ write({'state':'cancel'})
invoice_cancel
-
+
@@ -134,7 +92,7 @@ write({'state':'cancel'})
move_line_id_payment_get()
test_paid()
-
+
diff --git a/addons/account/account_menuitem.xml b/addons/account/account_menuitem.xml
index 74c8234860d..3cb21315350 100644
--- a/addons/account/account_menuitem.xml
+++ b/addons/account/account_menuitem.xml
@@ -6,13 +6,10 @@
-
-
-
@@ -25,23 +22,12 @@
-
-
-
-
-
-
-
-
-
-
-
diff --git a/addons/account/account_move_line.py b/addons/account/account_move_line.py
index 94dd4e8eb86..4e6c2cb5d8d 100644
--- a/addons/account/account_move_line.py
+++ b/addons/account/account_move_line.py
@@ -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:
diff --git a/addons/account/account_report.xml b/addons/account/account_report.xml
index 8e26ee8553b..be0569fa65f 100644
--- a/addons/account/account_report.xml
+++ b/addons/account/account_report.xml
@@ -47,20 +47,6 @@
name="Taxes"
parent="account.menu_finance_generic_reporting" sequence="3"/>
-
-
-
-
-
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index bb0e96a8380..a8f0649a99e 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -160,7 +160,6 @@
-
@@ -256,7 +255,6 @@
[('parent_id','=',False)]
-
-
-
-
-
-
-
account.bank.statement.reconcile.form
account.bank.statement.reconcile
@@ -871,7 +862,6 @@
id="menu_action_tax_code_tree"
parent="menu_finance_charts"
sequence="12"/>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
Entry Lines
ir.actions.act_window
@@ -1434,26 +1371,8 @@
form
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
account.bank.statement.reconcile.form
@@ -1516,20 +1435,6 @@
form,tree
-
-
-
-
-
-
-
-
-
-
tree
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.
-
-
+ # Account Models
+ -->
account.model.line.tree
@@ -1729,26 +1632,7 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
Payment Terms
account.payment.term
@@ -1758,8 +1642,8 @@
+ # Account Subscriptions
+ -->
account.subscription.line.form
@@ -1813,7 +1697,6 @@
-
@@ -1883,15 +1766,6 @@
[('account_id','child_of', [active_id]),('state','<>','draft')]
{'account_id':active_id}
-
-
-
-
-
-
-
-
-
account.move.line.tax.tree
diff --git a/addons/account/account_wizard.xml b/addons/account/account_wizard.xml
index d7a879cdf20..639dc2dc111 100644
--- a/addons/account/account_wizard.xml
+++ b/addons/account/account_wizard.xml
@@ -1,100 +1,7 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/addons/account/board_account_demo.xml b/addons/account/board_account_demo.xml
index cfcebdbcdf1..93bfed6d56d 100644
--- a/addons/account/board_account_demo.xml
+++ b/addons/account/board_account_demo.xml
@@ -2,16 +2,9 @@
-
diff --git a/addons/account/company_view.xml b/addons/account/company_view.xml
index a3a1ec0080a..692c7960bbf 100644
--- a/addons/account/company_view.xml
+++ b/addons/account/company_view.xml
@@ -7,12 +7,12 @@
res.company
form
-
-
-
-
-
-
+
+
+
+
+
+
diff --git a/addons/account/configurable_account_chart.xml b/addons/account/configurable_account_chart.xml
index bfef98145a6..cd0305ec9b9 100644
--- a/addons/account/configurable_account_chart.xml
+++ b/addons/account/configurable_account_chart.xml
@@ -175,10 +175,6 @@
-
-
1103
Output VAT
@@ -195,14 +191,6 @@
-
-
-
-
-
-
-
-
111
Current Liabilities
@@ -220,10 +208,6 @@
-
-
1112
Input VAT
@@ -268,10 +252,6 @@
-
-
21
Cost of Sales
@@ -304,12 +284,8 @@
-
-
-
+
diff --git a/addons/account/demo/account_minimal.xml b/addons/account/demo/account_minimal.xml
index cfcd6d0033d..2e56faa2733 100644
--- a/addons/account/demo/account_minimal.xml
+++ b/addons/account/demo/account_minimal.xml
@@ -411,18 +411,6 @@
Product income and expense accounts, default parameters
-->
-
-
-
-
-
-
-
-
-
-
-
-
property_account_expense_categ
diff --git a/addons/account/installer.py b/addons/account/installer.py
index 4843f54187c..6671241a4d4 100644
--- a/addons/account/installer.py
+++ b/addons/account/installer.py
@@ -71,7 +71,6 @@ class account_installer(osv.osv_memory):
'period':lambda *a:'month',
'sale_tax':lambda *a:0.0,
'purchase_tax':lambda *a:0.0,
- #'charts':'configurable',
'bank_accounts_id':_get_default_accounts
}
diff --git a/addons/account/invoice.py b/addons/account/invoice.py
index cff1ce60141..c2fbe5f9293 100644
--- a/addons/account/invoice.py
+++ b/addons/account/invoice.py
@@ -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)])
diff --git a/addons/account/partner_view.xml b/addons/account/partner_view.xml
index 609b8f0da5a..f3a8cca8ada 100644
--- a/addons/account/partner_view.xml
+++ b/addons/account/partner_view.xml
@@ -63,7 +63,7 @@
+ -->
res.partner.property.form.inherit
diff --git a/addons/account/process/customer_invoice_process.xml b/addons/account/process/customer_invoice_process.xml
index 172de7b7b1c..1f04c8e023b 100644
--- a/addons/account/process/customer_invoice_process.xml
+++ b/addons/account/process/customer_invoice_process.xml
@@ -1,21 +1,21 @@
-
-
-
+
-
-
-
+
@@ -26,7 +26,7 @@
-
+
@@ -37,7 +37,7 @@
-
+
@@ -48,7 +48,7 @@
-
+
@@ -58,7 +58,7 @@
-
+
@@ -70,7 +70,7 @@
-
+
@@ -81,7 +81,7 @@
-
+
@@ -92,7 +92,7 @@
-
+
@@ -103,7 +103,7 @@
-
+
@@ -115,20 +115,16 @@
-
-
-
+
-
-
-
-
-
+
@@ -137,7 +133,7 @@
-
+
@@ -146,7 +142,7 @@
-
+
@@ -156,7 +152,7 @@
-
+
@@ -165,7 +161,7 @@
-
+
@@ -174,7 +170,7 @@
-
+
@@ -183,7 +179,7 @@
-
+
@@ -192,7 +188,7 @@
-
+
@@ -201,17 +197,17 @@
-
-
-
+
-
+
diff --git a/addons/account/project/project_report.xml b/addons/account/project/project_report.xml
index ae6aedeaab1..0bc8077761e 100644
--- a/addons/account/project/project_report.xml
+++ b/addons/account/project/project_report.xml
@@ -3,32 +3,15 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/addons/account/project/project_view.xml b/addons/account/project/project_view.xml
index 4bdab312ad2..2879cdede2a 100644
--- a/addons/account/project/project_view.xml
+++ b/addons/account/project/project_view.xml
@@ -60,11 +60,6 @@
-
-
-
-
-
@@ -112,7 +107,6 @@
{"search_default_user_id":uid}
-
@@ -135,17 +129,8 @@
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.
-
-
-
-
-
-
-
-
account.analytic.line.form
@@ -230,14 +215,8 @@
{"search_default_user_id":uid}
-
-
-
-
-
-
-
+
Analytic Entries
@@ -355,30 +334,6 @@
tree,form
-
-
-
-
-
-
-
-
-
-
-
-
#
# Reporting
@@ -392,15 +347,6 @@
-
-
-
-
-
-
-
-
-
#
# Statistics
#
@@ -476,7 +422,6 @@
tree,graph
-
diff --git a/addons/account/project/wizard/account_analytic_balance_report.py b/addons/account/project/wizard/account_analytic_balance_report.py
index b751808ffb9..2a0a8bba7a8 100644
--- a/addons/account/project/wizard/account_analytic_balance_report.py
+++ b/addons/account/project/wizard/account_analytic_balance_report.py
@@ -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 = {}
diff --git a/addons/account/project/wizard/account_analytic_chart.py b/addons/account/project/wizard/account_analytic_chart.py
index dc55d6c43e7..89155810fc0 100644
--- a/addons/account/project/wizard/account_analytic_chart.py
+++ b/addons/account/project/wizard/account_analytic_chart.py
@@ -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')
diff --git a/addons/account/project/wizard/account_analytic_check.py b/addons/account/project/wizard/account_analytic_check.py
index 48c89df8fc4..53327963151 100644
--- a/addons/account/project/wizard/account_analytic_check.py
+++ b/addons/account/project/wizard/account_analytic_check.py
@@ -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 = {}
diff --git a/addons/account/project/wizard/account_analytic_cost_ledger_for_journal_report.py b/addons/account/project/wizard/account_analytic_cost_ledger_for_journal_report.py
index 6074fee3f08..ad1ea42c29f 100644
--- a/addons/account/project/wizard/account_analytic_cost_ledger_for_journal_report.py
+++ b/addons/account/project/wizard/account_analytic_cost_ledger_for_journal_report.py
@@ -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 = {}
diff --git a/addons/account/project/wizard/account_analytic_cost_ledger_report.py b/addons/account/project/wizard/account_analytic_cost_ledger_report.py
index 96b480b4fb5..d228499e5bd 100644
--- a/addons/account/project/wizard/account_analytic_cost_ledger_report.py
+++ b/addons/account/project/wizard/account_analytic_cost_ledger_report.py
@@ -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 = {}
diff --git a/addons/account/project/wizard/account_analytic_inverted_balance_report.py b/addons/account/project/wizard/account_analytic_inverted_balance_report.py
index 52f7da936fe..0fac1ba8dec 100644
--- a/addons/account/project/wizard/account_analytic_inverted_balance_report.py
+++ b/addons/account/project/wizard/account_analytic_inverted_balance_report.py
@@ -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 = {}
diff --git a/addons/account/project/wizard/account_analytic_journal_report.py b/addons/account/project/wizard/account_analytic_journal_report.py
index aef6a85149d..06bec940f89 100644
--- a/addons/account/project/wizard/account_analytic_journal_report.py
+++ b/addons/account/project/wizard/account_analytic_journal_report.py
@@ -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 = {}
diff --git a/addons/account/project/wizard/project_account_analytic_line.py b/addons/account/project/wizard/project_account_analytic_line.py
index dbe3df3c819..5437abe5be7 100644
--- a/addons/account/project/wizard/project_account_analytic_line.py
+++ b/addons/account/project/wizard/project_account_analytic_line.py
@@ -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')
diff --git a/addons/account/project/wizard/project_account_analytic_line_view.xml b/addons/account/project/wizard/project_account_analytic_line_view.xml
index d564ffb5c81..926c783b444 100644
--- a/addons/account/project/wizard/project_account_analytic_line_view.xml
+++ b/addons/account/project/wizard/project_account_analytic_line_view.xml
@@ -28,8 +28,8 @@
project.account.analytic.line
form
tree,form
-
- new
+
+ new
diff --git a/addons/account/report/account_aged_partner_balance.py b/addons/account/report/account_aged_partner_balance.py
index a70d79cdd40..8e07f3ad56c 100644
--- a/addons/account/report/account_aged_partner_balance.py
+++ b/addons/account/report/account_aged_partner_balance.py
@@ -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)
diff --git a/addons/account/report/account_balance.py b/addons/account/report/account_balance.py
index 076369f7e10..79e2334b7dc 100644
--- a/addons/account/report/account_balance.py
+++ b/addons/account/report/account_balance.py
@@ -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")
diff --git a/addons/account/report/account_balance_landscape.py b/addons/account/report/account_balance_landscape.py
index 02d69ba8b19..e8b8502e331 100644
--- a/addons/account/report/account_balance_landscape.py
+++ b/addons/account/report/account_balance_landscape.py
@@ -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])
diff --git a/addons/account/report/account_balance_sheet.py b/addons/account/report/account_balance_sheet.py
index ab5a284e412..e76c8450573 100644
--- a/addons/account/report/account_balance_sheet.py
+++ b/addons/account/report/account_balance_sheet.py
@@ -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' :
diff --git a/addons/account/report/account_report.py b/addons/account/report/account_report.py
index 5a62c1ea337..362d0adb414 100644
--- a/addons/account/report/account_report.py
+++ b/addons/account/report/account_report.py
@@ -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)
diff --git a/addons/account/report/account_report_view.xml b/addons/account/report/account_report_view.xml
index 96b49f0247e..a0cee804992 100644
--- a/addons/account/report/account_report_view.xml
+++ b/addons/account/report/account_report_view.xml
@@ -47,7 +47,6 @@
form
tree,graph
-
@@ -115,9 +114,6 @@
-
-
-
report.account.sales.tree
report.account.sales
@@ -169,9 +165,7 @@
graph,tree
-
-
report.account_type.sales.tree
report.account_type.sales
@@ -237,7 +231,6 @@
graph,tree
-
diff --git a/addons/account/report/compare_account_balance.py b/addons/account/report/compare_account_balance.py
index 13fb90fdb5f..b29b2ea4648 100644
--- a/addons/account/report/compare_account_balance.py
+++ b/addons/account/report/compare_account_balance.py
@@ -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])
diff --git a/addons/account/report/rml_parse.py b/addons/account/report/rml_parse.py
index 1b38b930b2b..9178c0fd2e8 100644
--- a/addons/account/report/rml_parse.py
+++ b/addons/account/report/rml_parse.py
@@ -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('',''' [[company.logo]] ''')
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:
diff --git a/addons/account/report/tax_report.py b/addons/account/report/tax_report.py
index 2075b1f139b..5e5f68a3fa8 100644
--- a/addons/account/report/tax_report.py
+++ b/addons/account/report/tax_report.py
@@ -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
-
+
@@ -21,20 +21,10 @@
account.invoice.confirm
form
form
-
- new
+
+ new
-
-
-
-
-
-
-
-
-
-
account.invoice.cancel.form
account.invoice.cancel
@@ -46,7 +36,7 @@
-
+
@@ -55,19 +45,9 @@
account.invoice.cancel
form
form
-
- new
+
+ new
-
-
-
-
-
-
-
-
-
-
diff --git a/addons/account/wizard/account_move_bank_reconcile.py b/addons/account/wizard/account_move_bank_reconcile.py
index b103f0c55e7..fd1d56011ec 100644
--- a/addons/account/wizard/account_move_bank_reconcile.py
+++ b/addons/account/wizard/account_move_bank_reconcile.py
@@ -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={}):
"""
diff --git a/addons/account/wizard/account_move_journal.py b/addons/account/wizard/account_move_journal.py
index 1d0dce85910..7f89e700b74 100644
--- a/addons/account/wizard/account_move_journal.py
+++ b/addons/account/wizard/account_move_journal.py
@@ -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',
diff --git a/addons/account/wizard/account_move_line_reconcile_select.py b/addons/account/wizard/account_move_line_reconcile_select.py
index d089db01f5e..8538270c723 100644
--- a/addons/account/wizard/account_move_line_reconcile_select.py
+++ b/addons/account/wizard/account_move_line_reconcile_select.py
@@ -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()
diff --git a/addons/account/wizard/account_move_line_reconcile_select_view.xml b/addons/account/wizard/account_move_line_reconcile_select_view.xml
index c4c06dcf28b..93e8c9a04b1 100644
--- a/addons/account/wizard/account_move_line_reconcile_select_view.xml
+++ b/addons/account/wizard/account_move_line_reconcile_select_view.xml
@@ -29,8 +29,5 @@
new
-
-
diff --git a/addons/account/wizard/account_move_line_select_view.xml b/addons/account/wizard/account_move_line_select_view.xml
index 645b5a098e3..ae6c9e572d1 100644
--- a/addons/account/wizard/account_move_line_select_view.xml
+++ b/addons/account/wizard/account_move_line_select_view.xml
@@ -23,17 +23,9 @@
account.move.line.select
form
form
-
- new
+
+ new
-
-
-
-
-
-
-
-
diff --git a/addons/account/wizard/account_move_line_unreconcile_select.py b/addons/account/wizard/account_move_line_unreconcile_select.py
index 35d442001c7..c445828d0ae 100644
--- a/addons/account/wizard/account_move_line_unreconcile_select.py
+++ b/addons/account/wizard/account_move_line_unreconcile_select.py
@@ -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()
diff --git a/addons/account/wizard/account_move_line_unreconcile_select_view.xml b/addons/account/wizard/account_move_line_unreconcile_select_view.xml
index 33e96b93185..146d28820c7 100644
--- a/addons/account/wizard/account_move_line_unreconcile_select_view.xml
+++ b/addons/account/wizard/account_move_line_unreconcile_select_view.xml
@@ -29,8 +29,5 @@
new
-
-
diff --git a/addons/account/wizard/account_open_closed_fiscalyear.py b/addons/account/wizard/account_open_closed_fiscalyear.py
index 381c4c44aae..229a0d5d06d 100644
--- a/addons/account/wizard/account_open_closed_fiscalyear.py
+++ b/addons/account/wizard/account_open_closed_fiscalyear.py
@@ -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]
diff --git a/addons/account/wizard/account_open_closed_fiscalyear_view.xml b/addons/account/wizard/account_open_closed_fiscalyear_view.xml
index d4c3509d47e..625be2db246 100644
--- a/addons/account/wizard/account_open_closed_fiscalyear_view.xml
+++ b/addons/account/wizard/account_open_closed_fiscalyear_view.xml
@@ -29,9 +29,5 @@
new
-
-
-
-
diff --git a/addons/account/wizard/account_pay_invoice.py b/addons/account/wizard/account_pay_invoice.py
index 49a905836b2..77780f95033 100644
--- a/addons/account/wizard/account_pay_invoice.py
+++ b/addons/account/wizard/account_pay_invoice.py
@@ -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')
- }
+ }
_defaults = {
'comment': 'Write-Off',
}
diff --git a/addons/account/wizard/account_pay_invoice_view.xml b/addons/account/wizard/account_pay_invoice_view.xml
index 78254a90bbe..a1576245946 100644
--- a/addons/account/wizard/account_pay_invoice_view.xml
+++ b/addons/account/wizard/account_pay_invoice_view.xml
@@ -16,7 +16,7 @@
-
+
@@ -60,6 +60,5 @@
-
diff --git a/addons/account/wizard/account_period_close.py b/addons/account/wizard/account_period_close.py
index 56a4f2c5e35..5342f4b8334 100644
--- a/addons/account/wizard/account_period_close.py
+++ b/addons/account/wizard/account_period_close.py
@@ -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):
"""
diff --git a/addons/account/wizard/account_reconcile.py b/addons/account/wizard/account_reconcile.py
index e8db687edf7..3152964ab9f 100644
--- a/addons/account/wizard/account_reconcile.py
+++ b/addons/account/wizard/account_reconcile.py
@@ -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'),
- }
+ }
_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')
diff --git a/addons/account/wizard/account_reconcile_partner_process.py b/addons/account/wizard/account_reconcile_partner_process.py
index 6a1e354837d..d1b84e08a9d 100644
--- a/addons/account/wizard/account_reconcile_partner_process.py
+++ b/addons/account/wizard/account_reconcile_partner_process.py
@@ -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 = {
diff --git a/addons/account/wizard/account_reconcile_partner_process_view.xml b/addons/account/wizard/account_reconcile_partner_process_view.xml
index 05a50e671c2..297269dd38c 100644
--- a/addons/account/wizard/account_reconcile_partner_process_view.xml
+++ b/addons/account/wizard/account_reconcile_partner_process_view.xml
@@ -41,12 +41,5 @@
account.move.line
-
diff --git a/addons/account/wizard/account_reconcile_view.xml b/addons/account/wizard/account_reconcile_view.xml
index 673203478e8..06dccb5f801 100644
--- a/addons/account/wizard/account_reconcile_view.xml
+++ b/addons/account/wizard/account_reconcile_view.xml
@@ -2,42 +2,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
account.move.line.reconcile.full.form
account.move.line.reconcile
@@ -82,50 +46,6 @@
action
account.move.line
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
account.move.line.reconcile.writeoff.form
diff --git a/addons/account/wizard/account_report_account_balance.py b/addons/account/wizard/account_report_account_balance.py
index 6c9744979ff..398fba01054 100644
--- a/addons/account/wizard/account_report_account_balance.py
+++ b/addons/account/wizard/account_report_account_balance.py
@@ -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')
diff --git a/addons/account/wizard/account_report_account_balance_view.xml b/addons/account/wizard/account_report_account_balance_view.xml
index e107b7a2cfb..36af271a5ed 100644
--- a/addons/account/wizard/account_report_account_balance_view.xml
+++ b/addons/account/wizard/account_report_account_balance_view.xml
@@ -3,28 +3,28 @@
-
- Account Balance
- account.balance.report
- form
-
-
-
-
-
-
-
+
+ Account Balance
+ account.balance.report
+ form
+
+
+
+
+
+
+
+ Account Balance
+ ir.actions.act_window
+ account.balance.report
+ form
+ form
+
+ new
+
-
-
diff --git a/addons/account/wizard/account_report_central_journal.py b/addons/account/wizard/account_report_central_journal.py
index c424f397cde..e762e6d0591 100644
--- a/addons/account/wizard/account_report_central_journal.py
+++ b/addons/account/wizard/account_report_central_journal.py
@@ -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()
diff --git a/addons/account/wizard/account_report_central_journal_view.xml b/addons/account/wizard/account_report_central_journal_view.xml
index 91c550dfdca..3e24510a470 100644
--- a/addons/account/wizard/account_report_central_journal_view.xml
+++ b/addons/account/wizard/account_report_central_journal_view.xml
@@ -11,7 +11,6 @@
-
diff --git a/addons/account/wizard/account_report_common_account.py b/addons/account/wizard/account_report_common_account.py
index 2ec4a4c59b6..4f84d8f3264 100644
--- a/addons/account/wizard/account_report_common_account.py
+++ b/addons/account/wizard/account_report_common_account.py
@@ -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:
diff --git a/addons/account/wizard/account_report_common_journal.py b/addons/account/wizard/account_report_common_journal.py
index edc7776cdc1..44ee8448316 100644
--- a/addons/account/wizard/account_report_common_journal.py
+++ b/addons/account/wizard/account_report_common_journal.py
@@ -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:
diff --git a/addons/account/wizard/account_report_common_partner.py b/addons/account/wizard/account_report_common_partner.py
index 60be5560107..fe71ccb08f2 100644
--- a/addons/account/wizard/account_report_common_partner.py
+++ b/addons/account/wizard/account_report_common_partner.py
@@ -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:
diff --git a/addons/account/wizard/account_report_common_view.xml b/addons/account/wizard/account_report_common_view.xml
index 0c6a24c9910..aa140c7f8fc 100644
--- a/addons/account/wizard/account_report_common_view.xml
+++ b/addons/account/wizard/account_report_common_view.xml
@@ -43,7 +43,6 @@
diff --git a/addons/account/wizard/account_report_partner_ledger.py b/addons/account/wizard/account_report_partner_ledger.py
index b1a7560ff71..9283d62ba21 100644
--- a/addons/account/wizard/account_report_partner_ledger.py
+++ b/addons/account/wizard/account_report_partner_ledger.py
@@ -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()
diff --git a/addons/account/wizard/account_report_print_journal.py b/addons/account/wizard/account_report_print_journal.py
index ff6832d2ec1..e9c5b0fbf81 100644
--- a/addons/account/wizard/account_report_print_journal.py
+++ b/addons/account/wizard/account_report_print_journal.py
@@ -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:
diff --git a/addons/account/wizard/account_report_profit_loss.py b/addons/account/wizard/account_report_profit_loss.py
index 0ffd525fdcc..fd73571d7f5 100644
--- a/addons/account/wizard/account_report_profit_loss.py
+++ b/addons/account/wizard/account_report_profit_loss.py
@@ -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()
diff --git a/addons/account/wizard/account_statement_from_invoice.py b/addons/account/wizard/account_statement_from_invoice.py
index a409bb77f89..ab17a7f4a22 100644
--- a/addons/account/wizard/account_statement_from_invoice.py
+++ b/addons/account/wizard/account_statement_from_invoice.py
@@ -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']
diff --git a/addons/account/wizard/account_statement_from_invoice_view.xml b/addons/account/wizard/account_statement_from_invoice_view.xml
index 2d8d74826f3..19805143855 100644
--- a/addons/account/wizard/account_statement_from_invoice_view.xml
+++ b/addons/account/wizard/account_statement_from_invoice_view.xml
@@ -26,8 +26,8 @@
account.statement.from.invoice
form
tree,form
-
- new
+
+ new
@@ -41,7 +41,7 @@
-
+
@@ -54,9 +54,9 @@
account.statement.from.invoice.lines
form
tree,form
-
- new
- {'statement_id': active_id}
+
+ new
+ {'statement_id': active_id}
diff --git a/addons/account/wizard/account_subscription_generate.py b/addons/account/wizard/account_subscription_generate.py
index dccc4bb3c4e..fbc051bff7e 100644
--- a/addons/account/wizard/account_subscription_generate.py
+++ b/addons/account/wizard/account_subscription_generate.py
@@ -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')
diff --git a/addons/account/wizard/account_use_model.py b/addons/account/wizard/account_use_model.py
index 04647dc4a26..facb675a090 100644
--- a/addons/account/wizard/account_use_model.py
+++ b/addons/account/wizard/account_use_model.py
@@ -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')
diff --git a/addons/account/wizard/account_use_model_view.xml b/addons/account/wizard/account_use_model_view.xml
index 54efb585b95..fd3b13f3888 100644
--- a/addons/account/wizard/account_use_model_view.xml
+++ b/addons/account/wizard/account_use_model_view.xml
@@ -42,9 +42,6 @@
account.move.line
-
-
-
account.use.model.open.entry.form
account.use.model
diff --git a/addons/account/wizard/account_validate_account_move.py b/addons/account/wizard/account_validate_account_move.py
index e3d9e494da6..0fac7387db9 100644
--- a/addons/account/wizard/account_validate_account_move.py
+++ b/addons/account/wizard/account_validate_account_move.py
@@ -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')
diff --git a/addons/account_analytic_analysis/account_analytic_analysis.py b/addons/account_analytic_analysis/account_analytic_analysis.py
index a7fee587057..43a63f394a2 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis.py
+++ b/addons/account_analytic_analysis/account_analytic_analysis.py
@@ -41,7 +41,7 @@ class account_analytic_account(osv.osv):
group by account_analytic_line.account_id" ,(parent_ids,))
for account_id, sum in cr.fetchall():
res[account_id] = round(sum,2)
-
+
return self._compute_currency_for_level_tree(cr, uid, ids, parent_ids, res, context)
def _ca_to_invoice_calc(self, cr, uid, ids, name, arg, context=None):
@@ -154,7 +154,7 @@ class account_analytic_account(osv.osv):
for account_id, sum in cr.fetchall():
res[account_id] = round(sum,2)
return self._compute_currency_for_level_tree(cr, uid, ids, parent_ids, res, context)
-
+
# TODO Take care of pricelist and purchase !
def _ca_theorical_calc(self, cr, uid, ids, name, arg, context=None):
res = {}
@@ -185,7 +185,7 @@ class account_analytic_account(osv.osv):
GROUP BY account_analytic_line.account_id""",(parent_ids,))
for account_id, sum in cr.fetchall():
res2[account_id] = round(sum,2)
-
+
for obj_id in ids:
res.setdefault(obj_id, 0.0)
res2.setdefault(obj_id, 0.0)
@@ -194,7 +194,7 @@ class account_analytic_account(osv.osv):
if child_id != obj_id:
res[obj_id] += res.get(child_id, 0.0)
res[obj_id] += res2.get(child_id, 0.0)
-
+
# sum both result on account_id
for id in ids:
res[id] = round(res.get(id, 0.0),2) + round(res2.get(id, 0.0),2)
@@ -384,7 +384,7 @@ class account_analytic_account(osv.osv):
'month_ids': fields.function(_month, method=True, type='many2many', relation='account_analytic_analysis.summary.month', string='Month'),
'user_ids': fields.function(_user, method=True, type="many2many", relation='account_analytic_analysis.summary.user', string='User'),
}
-
+
account_analytic_account()
class account_analytic_account_summary_user(osv.osv):
@@ -425,7 +425,7 @@ class account_analytic_account_summary_user(osv.osv):
string='Total Time'),
'user' : fields.many2one('res.users', 'User'),
}
-
+
def init(self, cr):
tools.sql.drop_view_if_exists(cr, 'account_analytic_analysis_summary_user')
cr.execute('CREATE OR REPLACE VIEW account_analytic_analysis_summary_user AS (' \
@@ -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 = {}
@@ -684,7 +683,7 @@ class account_analytic_account_summary_month(osv.osv):
res.extend(cr.dictfetchall())
else:
res = map(lambda x: {'id': x}, ids)
-
+
res_trans_obj = self.pool.get('ir.translation')
for f in fields_pre:
if self._columns[f].translate:
diff --git a/addons/account_budget/__openerp__.py b/addons/account_budget/__openerp__.py
index 5b32009efff..6c822b7ae68 100644
--- a/addons/account_budget/__openerp__.py
+++ b/addons/account_budget/__openerp__.py
@@ -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,
diff --git a/addons/account_budget/account_budget_wizard.xml b/addons/account_budget/account_budget_wizard.xml
index e153200b6a5..ebfe70e4c50 100644
--- a/addons/account_budget/account_budget_wizard.xml
+++ b/addons/account_budget/account_budget_wizard.xml
@@ -1,9 +1,6 @@
-
-
-
diff --git a/addons/account_budget/crossovered_budget_report.xml b/addons/account_budget/crossovered_budget_report.xml
index 7a968cc9557..a6735cd309b 100644
--- a/addons/account_budget/crossovered_budget_report.xml
+++ b/addons/account_budget/crossovered_budget_report.xml
@@ -11,36 +11,6 @@
auto="False"
menu="False" />
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -151,7 +150,6 @@
-
@@ -290,7 +288,6 @@
-
@@ -299,16 +296,6 @@
-
-
-
diff --git a/addons/account_budget/crossovered_budget_workflow.xml b/addons/account_budget/crossovered_budget_workflow.xml
index a14cfd2cced..0874d510e04 100644
--- a/addons/account_budget/crossovered_budget_workflow.xml
+++ b/addons/account_budget/crossovered_budget_workflow.xml
@@ -36,13 +36,6 @@
budget_validate()
-
-
cancel
@@ -94,11 +87,5 @@
-
diff --git a/addons/account_budget/report/analytic_account_budget_report.py b/addons/account_budget/report/analytic_account_budget_report.py
index 07e8bb27d12..300d833ab81 100644
--- a/addons/account_budget/report/analytic_account_budget_report.py
+++ b/addons/account_budget/report/analytic_account_budget_report.py
@@ -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()
diff --git a/addons/account_budget/report/crossovered_budget_report.py b/addons/account_budget/report/crossovered_budget_report.py
index 6622ce81156..a5f26b19ebf 100644
--- a/addons/account_budget/report/crossovered_budget_report.py
+++ b/addons/account_budget/report/crossovered_budget_report.py
@@ -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()
diff --git a/addons/account_cancel/account_cancel_view.xml b/addons/account_cancel/account_cancel_view.xml
index 33d72e86502..9e8b532e931 100644
--- a/addons/account_cancel/account_cancel_view.xml
+++ b/addons/account_cancel/account_cancel_view.xml
@@ -11,6 +11,6 @@
-
+
diff --git a/addons/account_followup/account_followup_view.xml b/addons/account_followup/account_followup_view.xml
index 4af8021e0e7..0f223623c48 100644
--- a/addons/account_followup/account_followup_view.xml
+++ b/addons/account_followup/account_followup_view.xml
@@ -136,8 +136,6 @@
-
-
-
diff --git a/addons/account_invoice_layout/account_invoice_layout.py b/addons/account_invoice_layout/account_invoice_layout.py
index e596dd0a959..adb80d787a0 100644
--- a/addons/account_invoice_layout/account_invoice_layout.py
+++ b/addons/account_invoice_layout/account_invoice_layout.py
@@ -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):
diff --git a/addons/account_payment/account_move_line.py b/addons/account_payment/account_move_line.py
index ca583188a63..3f9b6c4b094 100644
--- a/addons/account_payment/account_move_line.py
+++ b/addons/account_payment/account_move_line.py
@@ -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:
diff --git a/addons/account_payment/wizard/account_payment_pay.py b/addons/account_payment/wizard/account_payment_pay.py
index 20e1e10f882..9e58ea46935 100644
--- a/addons/account_payment/wizard/account_payment_pay.py
+++ b/addons/account_payment/wizard/account_payment_pay.py
@@ -47,8 +47,6 @@ class account_payment_make_payment(osv.osv_memory):
result = mod_obj._get_id(cr, uid, module, wizard)
id = mod_obj.read(cr, uid, [result], ['res_id'])[0]['res_id']
return act_obj.read(cr, uid, [id])[0]
- #result['context'] = str({'fiscalyear': data['form']['fiscalyear']})
-
account_payment_make_payment()
diff --git a/addons/account_report/account.py b/addons/account_report/account.py
index 784d95daa79..5dffc0c6a78 100644
--- a/addons/account_report/account.py
+++ b/addons/account_report/account.py
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
##############################################################################
-#
+#
# OpenERP, Open Source Management Solution
# Copyright (C) 2004-2010 Tiny SPRL ().
#
@@ -15,7 +15,7 @@
# GNU Affero General Public License for more details.
#
# You should have received a copy of the GNU Affero General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
#
##############################################################################
@@ -33,25 +33,6 @@ from mx.DateTime import RelativeDateTime, now, DateTime, localtime
class account_report(osv.osv):
_name = "account.report.report"
_description = "Account Reporting"
-# _color = [
-# ('', ''),
-# ('green','Green'),
-# ('red','Red'),
-# ('pink','Pink'),
-# ('blue','Blue'),
-# ('yellow','Yellow'),
-# ('cyan','Cyan'),
-# ('lightblue','Light Blue'),
-# ('orange','Orange'),
-# ]
-# _style = [
-# ('1','Header 1'),
-# ('2','Header 2'),
-# ('3','Header 3'),
-# ('4','Header 4'),
-# ('5','Normal'),
-# ('6', 'Small'),
-# ]
def _amount_get(self, cr, uid, ids, field_name, arg, context={}):
obj_fy=self.pool.get('account.fiscalyear')
@@ -118,10 +99,6 @@ class account_report(osv.osv):
'report': _calc_report,
'tax_code': _calc_tax_code,
}
-# if field_name=='status':
-# fld_name = 'expression_status'
-# else:
-# fld_name = 'expression'
try:
val = eval(getattr(rep,'expression'), objdict)
except:
@@ -147,8 +124,6 @@ class account_report(osv.osv):
if parent_id:
acc=self.pool.get('account.report.report').browse(cr, uid, parent_id)
v['type']=acc.type
-# if int(acc.style) < 6:
-# v['style'] = str(int(acc.style)+1)
return {'value': v}
_columns = {
@@ -182,12 +157,8 @@ class account_report(osv.osv):
string='Status'),
'disp_tree':fields.boolean('Display Tree', help='When the indicators are printed, if one indicator is set with this field to True, then it will display one more graphs with all its children in tree'),
'disp_graph':fields.boolean('Display As Graph', help='If the field is set to True, information will be printed as a Graph, otherwise as an array.'),
-# 'style': fields.selection(_style, 'Style', required=True),
-# 'color_font' : fields.selection(_color, 'Font Color', help="Font Color for the report"),
-# 'color_back' : fields.selection(_color, 'Back Color')
}
_defaults = {
-# 'style': lambda *args: '5',
'active': lambda *args: True,
'type': lambda *args: 'indicator',
}
@@ -207,7 +178,7 @@ class account_report(osv.osv):
return self.name_get(cr, user, ids, context=context)
_constraints = [
- #TODO Put an expression to valid expression
+ #TODO Put an expression to valid expression
]
account_report()
diff --git a/addons/account_report/account_view.xml b/addons/account_report/account_view.xml
index 4b25851e37f..e61ae8beb35 100644
--- a/addons/account_report/account_view.xml
+++ b/addons/account_report/account_view.xml
@@ -17,7 +17,6 @@
-
@@ -25,7 +24,6 @@
-
@@ -50,8 +48,6 @@
-
diff --git a/addons/account_report/account_wizard.xml b/addons/account_report/account_wizard.xml
index 1e07a8fc248..c731b89a34b 100644
--- a/addons/account_report/account_wizard.xml
+++ b/addons/account_report/account_wizard.xml
@@ -1,10 +1,5 @@
-
-
-
-
-
\ No newline at end of file
diff --git a/addons/account_report/report/accounting_report.py b/addons/account_report/report/accounting_report.py
index 1bb6e7bbab8..f38f09d1e7f 100644
--- a/addons/account_report/report/accounting_report.py
+++ b/addons/account_report/report/accounting_report.py
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
##############################################################################
-#
+#
# OpenERP, Open Source Management Solution
# Copyright (C) 2004-2010 Tiny SPRL ().
#
@@ -15,7 +15,7 @@
# GNU Affero General Public License for more details.
#
# You should have received a copy of the GNU Affero General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
#
##############################################################################
@@ -42,8 +42,6 @@ class accounting_report(report_sxw.rml_parse):
'amount':res[0]['amount'],
'note':res[0]['note'],
'level': level,
-# 'color_font':res[0]['color_font'],
-# 'color_back':res[0]['color_back'],
}
self.ret_list.append(ret_dict)
diff --git a/addons/account_report/report/print_indicator.py b/addons/account_report/report/print_indicator.py
index 4245bf40415..55596764dc6 100644
--- a/addons/account_report/report/print_indicator.py
+++ b/addons/account_report/report/print_indicator.py
@@ -23,15 +23,6 @@ import pooler
import time
from report import report_sxw
-#from report.interface import report_int
-#from reportlab.graphics.shapes import Drawing
-#from reportlab.graphics.charts.barcharts import VerticalBarChart
-#import reportlab.lib.colors as colors
-#from reportlab.graphics.widgetbase import Widget, TypedPropertyCollection
-#from reportlab.graphics.charts.textlabels import BarChartLabel
-#from reportlab.graphics import renderPM
-#from report.render import render
-#from report.interface import report_int
from pychart import *
import StringIO
theme.use_color = 1
@@ -70,14 +61,6 @@ class accounting_report_indicator(report_sxw.rml_parse):
ind_ids=self.pool.get('account.report.report').search(self.cr,self.uid,[])
obj_inds=self.pool.get('account.report.report').browse(self.cr,self.uid,ind_ids)
-# def find_child(obj):
-# self.list.append(obj)
-# if obj.child_ids:
-# for child in obj.child_ids:
-# find_child(child)
-# return True
-#
-# find_child(obj_inds)
for obj_ind in obj_inds:
level = 0
@@ -245,39 +228,6 @@ class accounting_report_indicator(report_sxw.rml_parse):
if intercall:
return True
self.count +=1
-# drawing = Drawing(400, 300)
-# data = [
-# tuple(data_val),
-# ]
-# value_min=0.0
-# vmin=min(data_val)
-# vmax=max(data_val)
-#
-# val_min=((vmin < 0.00 and vmin-2.00) or 0.00)
-# # calculating maximum
-# val_max=(vmax/(pow(10,len(str(int(vmax)))-2))+1)*pow(10,len(str(int(vmax)))-2)
-# bc = VerticalBarChart()
-# bc.x = 50
-# bc.y = 50
-# bc.height = 245
-# bc.width = 300
-# bc.data = data
-# value_step=(abs(val_max)-abs(val_min))/5
-#
-# bc.strokeColor = colors.black
-# bc.valueAxis.valueMin = val_min
-# bc.valueAxis.valueMax = val_max
-# bc.valueAxis.valueStep = value_step
-#
-# bc.categoryAxis.labels.boxAnchor = 'ne'
-# bc.categoryAxis.labels.dx = 8
-#
-# bc.categoryAxis.labels.dy = -2
-# bc.categoryAxis.labels.angle = 30
-# bc.categoryAxis.categoryNames = data_period
-# drawing.add(bc)
-# drawing.save(formats=['png'],fnRoot=path+str(self.count),title="helo")
-# renderPM.drawToFile(drawing1, 'example1.jpg','jpg')
import os
path=tools.config['addons_path']+"/account_report/tmp_images/image"
@@ -286,7 +236,6 @@ class accounting_report_indicator(report_sxw.rml_parse):
os.mkdir(dirname)
can = canvas.init('image'+str(self.count)+".png")
-# can.clip(0,0,600,400)
data=zip(self.header_name,self.header_val)
@@ -300,7 +249,6 @@ class accounting_report_indicator(report_sxw.rml_parse):
can.close()
os.system('cp '+'image'+str(self.count)+'.png ' +path+str(self.count)+'.png')
os.system('rm '+'image'+str(self.count)+'.png')
-# can.endclip()
return path+str(self.count)+'.png'
report_sxw.report_sxw('report.print.indicators', 'account.report.history',
diff --git a/addons/account_reporting/account.py b/addons/account_reporting/account.py
index c8b3273491a..c1c68f04d9b 100644
--- a/addons/account_reporting/account.py
+++ b/addons/account_reporting/account.py
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
##############################################################################
-#
+#
# OpenERP, Open Source Management Solution
# Copyright (C) 2004-2010 Tiny SPRL ().
#
@@ -15,7 +15,7 @@
# GNU Affero General Public License for more details.
#
# You should have received a copy of the GNU Affero General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
#
##############################################################################
import time
@@ -88,7 +88,6 @@ class account_report_bs(osv.osv):
'code': fields.char('Code', size=64, required=True),
'account_id': fields.many2many('account.account', 'account_report_rel', 'report_id', 'account_id', 'Accounts'),
'note': fields.text('Note'),
-# 'style': fields.selection(_style, 'Style'),
'color_font' : fields.many2one('color.rml','Font Color'),
'color_back' : fields.many2one('color.rml','Back Color'),
'font_style' : fields.selection(_font, 'Font'),
diff --git a/addons/account_reporting/account_report.xml b/addons/account_reporting/account_report.xml
index 7603aaf5c45..ebfe70e4c50 100644
--- a/addons/account_reporting/account_report.xml
+++ b/addons/account_reporting/account_report.xml
@@ -1,18 +1,6 @@
-
-
-
-
-
-
-
diff --git a/addons/account_reporting/report/account_report_bs.py b/addons/account_reporting/report/account_report_bs.py
index 89ad84d1065..22628224306 100644
--- a/addons/account_reporting/report/account_report_bs.py
+++ b/addons/account_reporting/report/account_report_bs.py
@@ -24,7 +24,6 @@ import pooler
import locale
from report import report_sxw
-#from addons.account.wizard import wizard_account_balance_report
parents = {
'tr':1,
@@ -124,8 +123,6 @@ class account_report_bs(report_sxw.rml_parse):
res1['level'] = r['level'] + 1
break
result.append(res1)
- #res1 = self.check_child_id(account_id,level,ctx,report_type)
- #result += res1
if report_obj.child_id:
ids2 = [(x.code,x.id) for x in report_obj.child_id]
ids2.sort()
@@ -133,33 +130,6 @@ class account_report_bs(report_sxw.rml_parse):
return result
-# def check_child_id(self,account_id,level,ctx,report_type):
-# account = self.pool.get('account.account').browse(self.cr,self.uid,[account_id],ctx)[0]
-# result = []
-# res = {
-# 'code': account.code,
-# 'name': account.name,
-# 'level': level+1,
-# 'balance': account.balance,
-# 'color_font' : 'black',
-# 'color_back' :'white',
-# 'font_style' : 'Helvetica',
-# }
-# result.append(res)
-# if report_type != 'with_account':
-# acc_child_id = self.pool.get('account.account').search(self.cr,self.uid,[('parent_id','=',[account_id]),('type','=','view')])
-# for child_id in acc_child_id :
-# result += self.check_child_id(child_id,level+1,ctx,report_type)
-# return result
-#
-#
-#
-# def _sum_credit(self):
-# return self.sum_credit
-#
-# def _sum_debit(self):
-# return self.sum_debit
-
report_sxw.report_sxw('report.account.report.bs', 'account.report.bs', 'addons/account_reporting/report/account_report_bs.rml', parser=account_report_bs)
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account_tax_include/account_tax_include.py b/addons/account_tax_include/account_tax_include.py
index 20adc9bcfcc..afd1ef36ae7 100644
--- a/addons/account_tax_include/account_tax_include.py
+++ b/addons/account_tax_include/account_tax_include.py
@@ -161,8 +161,6 @@ class account_invoice_line(osv.osv):
# note: will call product_id_change_unit_price_inv with context...
# Temporary trap, for bad context that came from koo:
- # if isinstance(context, str):
- # print "str context:", context
ctx = (context and context.copy()) or {}
ctx.update({'price_type': ctx.get('price_type', 'tax_excluded')})
diff --git a/addons/account_voucher/report/report_voucher.py b/addons/account_voucher/report/report_voucher.py
index 1524f972e6a..a3f3bb0380d 100644
--- a/addons/account_voucher/report/report_voucher.py
+++ b/addons/account_voucher/report/report_voucher.py
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
##############################################################################
-#
+#
# OpenERP, Open Source Management Solution
# Copyright (C) 2004-2010 Tiny SPRL ().
#
@@ -15,7 +15,7 @@
# GNU Affero General Public License for more details.
#
# You should have received a copy of the GNU Affero General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
#
##############################################################################
@@ -37,19 +37,19 @@ class report_voucher(report_sxw.rml_parse):
def convert(self, amount, cur):
amt_en = amount_to_text_en.amount_to_text(amount, 'en', cur);
return amt_en
-
+
def debit(self, move_ids):
debit = 0.0
- for move in move_ids:#self.pool.get('account.move.line').browse(self.cr, self.uid, move_ids):
+ for move in move_ids:
debit +=move.debit
return debit
-
+
def credit(self, move_ids):
credit = 0.0
- for move in move_ids:#self.pool.get('account.move.line').browse(self.cr, self.uid, move_ids):
+ for move in move_ids:
credit +=move.credit
return credit
-
+
def _get_ref(self, voucher_id, move_ids):
voucher_line = self.pool.get('account.voucher.line').search(self.cr, self.uid, [('partner_id','=',move_ids.partner_id.id), ('voucher_id','=',voucher_id)])
if voucher_line:
diff --git a/addons/account_voucher/report/rml_parse.py b/addons/account_voucher/report/rml_parse.py
index 721c87fbcf5..e23d8c52947 100644
--- a/addons/account_voucher/report/rml_parse.py
+++ b/addons/account_voucher/report/rml_parse.py
@@ -107,7 +107,6 @@ class rml_parse(report_sxw.rml_parse):
return Stringer
def explode_this(self,chaine,length):
- #chaine = self.repair_string(chaine)
chaine = rstrip(chaine)
ast = list(chaine)
i = length
diff --git a/addons/account_voucher/voucher_view.xml b/addons/account_voucher/voucher_view.xml
index f8bc28fa0ac..eb093a0c553 100644
--- a/addons/account_voucher/voucher_view.xml
+++ b/addons/account_voucher/voucher_view.xml
@@ -82,10 +82,8 @@
-
-
@@ -188,48 +186,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
Journal Vouchers
@@ -242,51 +198,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
account.journal.form.inherit
account.journal
@@ -318,10 +229,5 @@
-
-
-
-
-
-
+
diff --git a/addons/account_voucher/voucher_wizard.xml b/addons/account_voucher/voucher_wizard.xml
index b8851b51afe..86c8221f417 100644
--- a/addons/account_voucher/voucher_wizard.xml
+++ b/addons/account_voucher/voucher_wizard.xml
@@ -1,18 +1,5 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/addons/account_voucher_payment/wizard/account_voucher_unreconcile_view.xml b/addons/account_voucher_payment/wizard/account_voucher_unreconcile_view.xml
index 3f8dd9c4e32..d88a2943811 100644
--- a/addons/account_voucher_payment/wizard/account_voucher_unreconcile_view.xml
+++ b/addons/account_voucher_payment/wizard/account_voucher_unreconcile_view.xml
@@ -1,7 +1,7 @@
-
+
Account voucher unreconcile
account.voucher.unreconcile
@@ -26,14 +26,6 @@
new
-
-
-
-
-
-
-
-
-
+
diff --git a/addons/analytic_journal_billing_rate/analytic_journal_billing_rate_view.xml b/addons/analytic_journal_billing_rate/analytic_journal_billing_rate_view.xml
index 3288ca9daf8..39be4c76a23 100644
--- a/addons/analytic_journal_billing_rate/analytic_journal_billing_rate_view.xml
+++ b/addons/analytic_journal_billing_rate/analytic_journal_billing_rate_view.xml
@@ -35,7 +35,6 @@
-
diff --git a/addons/analytic_user_function/analytic_user_function.py b/addons/analytic_user_function/analytic_user_function.py
index 2f5152faea6..0bb9afc3386 100644
--- a/addons/analytic_user_function/analytic_user_function.py
+++ b/addons/analytic_user_function/analytic_user_function.py
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
##############################################################################
-#
+#
# OpenERP, Open Source Management Solution
# Copyright (C) 2004-2010 Tiny SPRL ().
#
@@ -15,7 +15,7 @@
# GNU Affero General Public License for more details.
#
# You should have received a copy of the GNU Affero General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
#
##############################################################################
@@ -54,7 +54,7 @@ class hr_analytic_timesheet(osv.osv):
# Look in account, if no value for the user => look in parent until there is no more parent to look
# Take the first found... if nothing found => return False
def _get_related_user_account_recursiv(self, cr, uid, user_id, account_id):
-
+
temp=self.pool.get('analytic_user_funct_grid').search(cr, uid, [('user_id', '=', user_id),('account_id', '=', account_id) ])
account=self.pool.get('account.analytic.account').browse(cr, uid, account_id)
if temp:
@@ -64,21 +64,19 @@ class hr_analytic_timesheet(osv.osv):
return self._get_related_user_account_recursiv(cr, uid, user_id, account.parent_id.id)
else:
return False
-
-
+
+
def on_change_account_id(self, cr, uid, ids, account_id, user_id=False, unit_amount=0):
- #{'value': {'to_invoice': False, 'amount': (-162.0,), 'product_id': 7, 'general_account_id': (5,)}}
res = {}
if not (account_id):
#avoid a useless call to super
- return res
+ return res
if not (user_id):
return super(hr_analytic_timesheet, self).on_change_account_id(cr, uid, ids, account_id)
#get the browse record related to user_id and account_id
temp = self._get_related_user_account_recursiv(cr, uid, user_id, account_id)
- # temp = self.pool.get('analytic_user_funct_grid').search(cr, uid, [('user_id', '=', user_id),('account_id', '=', account_id) ])
if not temp:
#if there isn't any record for this user_id and account_id
return super(hr_analytic_timesheet, self).on_change_account_id(cr, uid, ids, account_id)
@@ -100,9 +98,9 @@ class hr_analytic_timesheet(osv.osv):
'for this product: "%s" (id:%d)') % \
(r.product_id.name, r.product_id.id,))
# Compute based on pricetype
- amount_unit = self.on_change_unit_amount(cr, uid, ids,
+ amount_unit = self.on_change_unit_amount(cr, uid, ids,
r.product_id.id, unit_amount, r.product_id.uom_id.id)['value']['amount']
-
+
amount = unit_amount * amount_unit
res ['value']['amount']= - round(amount, 2)
res ['value']['general_account_id']= a
@@ -112,19 +110,18 @@ class hr_analytic_timesheet(osv.osv):
res = {}
if not (user_id):
#avoid a useless call to super
- return res
+ return res
#get the old values from super
res = super(hr_analytic_timesheet, self).on_change_user_id(cr, uid, ids, user_id)
if account_id:
#get the browse record related to user_id and account_id
- # temp = self.pool.get('analytic_user_funct_grid').search(cr, uid, [('user_id', '=', user_id),('account_id', '=', account_id) ])
temp = self._get_related_user_account_recursiv(cr, uid, user_id, account_id)
if temp:
#add the value from the new relation analytic_user_funct_grid
r = self.pool.get('analytic_user_funct_grid').browse(cr, uid, temp)[0]
- res['value']['product_id'] = r.product_id.id
+ res['value']['product_id'] = r.product_id.id
#the change of product has to impact the amount, uom and general_account_id
a = r.product_id.product_tmpl_id.property_account_expense.id
@@ -136,9 +133,9 @@ class hr_analytic_timesheet(osv.osv):
'for this product: "%s" (id:%d)') % \
(r.product_id.name, r.product_id.id,))
# Compute based on pricetype
- amount_unit = self.on_change_unit_amount(cr, uid, ids,
+ amount_unit = self.on_change_unit_amount(cr, uid, ids,
r.product_id.id, unit_amount, r.product_id.uom_id.id)['value']['amount']
-
+
amount = unit_amount * amount_unit
res ['value']['amount']= - round(amount, 2)
res ['value']['general_account_id']= a
diff --git a/addons/auction/__openerp__.py b/addons/auction/__openerp__.py
index 75b50113028..69fef0748c4 100644
--- a/addons/auction/__openerp__.py
+++ b/addons/auction/__openerp__.py
@@ -43,14 +43,11 @@
'init_xml': ['auction_sequence.xml', 'auction_data.xml'],
'update_xml': [
'security/ir.model.access.csv',
- # 'wizard/auction_lots_able_view.xml',
- # 'wizard/auction_lots_enable_view.xml',
'wizard/auction_lots_make_invoice_buyer_view.xml',
'wizard/auction_lots_make_invoice_view.xml',
'wizard/auction_taken_view.xml',
'wizard/auction_lots_auction_move_view.xml',
'wizard/auction_pay_buy_view.xml',
- #'wizard/auction_payer_sel_view.xml',
'wizard/auction_lots_sms_send_view.xml',
'wizard/auction_catalog_flagey_view.xml',
'wizard/auction_lots_buyer_map_view.xml',
@@ -59,12 +56,11 @@
'report/report_auction_view.xml',
'auction_wizard.xml',
'board_auction_view.xml',
- # 'board_auction_manager_view.xml',
],
'demo_xml': ['auction_demo.xml','board_auction_demo.xml'],
'test': ['test/auction.yml'],
-
+
'installable': True,
'active': False,
'certificate': '0039333102717',
diff --git a/addons/auction/auction.py b/addons/auction/auction.py
index 0014edada56..5ea2441e6fd 100644
--- a/addons/auction/auction.py
+++ b/addons/auction/auction.py
@@ -35,10 +35,10 @@ import tools
class auction_artists(osv.osv):
_name = "auction.artists"
_columns = {
- 'name': fields.char('Artist/Author Name', size=64, required=True),
- 'pseudo': fields.char('Pseudo', size=64),
- 'birth_death_dates':fields.char('Birth / Death dates', size=64),
- 'biography': fields.text('Biography'),
+ 'name': fields.char('Artist/Author Name', size=64, required=True),
+ 'pseudo': fields.char('Pseudo', size=64),
+ 'birth_death_dates':fields.char('Birth / Death dates', size=64),
+ 'biography': fields.text('Biography'),
}
auction_artists()
@@ -49,10 +49,10 @@ class auction_dates(osv.osv):
"""Auction Dates"""
_name = "auction.dates"
_description=__doc__
-
+
def _adjudication_get(self, cr, uid, ids, prop, unknow_none, unknow_dict):
res={}
- total = 0.0
+ total = 0.0
lots_obj = self.pool.get('auction.lots')
for auction in self.browse(cr, uid, ids):
lots_ids = lots_obj.search(cr, uid, [('auction_id', '=', auction.id)])
@@ -71,27 +71,27 @@ class auction_dates(osv.osv):
return name
_columns = {
- 'name': fields.char('Auction Name', size=64, required=True),
- 'expo1': fields.date('First Exposition Day', required=True, help="Beginning Exposition Date For Auction"),
- 'expo2': fields.date('Last Exposition Day', required=True, help="Last Exposition Date For Auction"),
- 'auction1': fields.date('First Auction Day', required=True, help="Start Date Of Auction"),
- 'auction2': fields.date('Last Auction Day', required=True, help="End Date Of Auction"),
- 'journal_id': fields.many2one('account.journal', 'Buyer Journal', required=True, help="Account Journal For Buyer"),
- 'journal_seller_id': fields.many2one('account.journal', 'Seller Journal', required=True, help="Account Journal For Seller"),
- 'buyer_costs': fields.many2many('account.tax', 'auction_buyer_taxes_rel', 'auction_id', 'tax_id', 'Buyer Costs', help="Account Tax For Buyer"),
- 'seller_costs': fields.many2many('account.tax', 'auction_seller_taxes_rel', 'auction_id', 'tax_id', 'Seller Costs', help="Account Tax For Seller"),
- 'acc_income': fields.many2one('account.account', 'Income Account', required=True),
- 'acc_expense': fields.many2one('account.account', 'Expense Account', required=True),
- 'adj_total': fields.function(_adjudication_get, method=True, string='Total Adjudication', store=True),
- 'state': fields.selection((('draft', 'Draft'), ('closed', 'Closed')), 'State', select=1, readonly=True,
- help='When auction starts the state is \'Draft\'.\n At the end of auction, the state becomes \'Closed\'.'),
- 'account_analytic_id': fields.many2one('account.analytic.account', 'Analytic Account', required=True),
+ 'name': fields.char('Auction Name', size=64, required=True),
+ 'expo1': fields.date('First Exposition Day', required=True, help="Beginning Exposition Date For Auction"),
+ 'expo2': fields.date('Last Exposition Day', required=True, help="Last Exposition Date For Auction"),
+ 'auction1': fields.date('First Auction Day', required=True, help="Start Date Of Auction"),
+ 'auction2': fields.date('Last Auction Day', required=True, help="End Date Of Auction"),
+ 'journal_id': fields.many2one('account.journal', 'Buyer Journal', required=True, help="Account Journal For Buyer"),
+ 'journal_seller_id': fields.many2one('account.journal', 'Seller Journal', required=True, help="Account Journal For Seller"),
+ 'buyer_costs': fields.many2many('account.tax', 'auction_buyer_taxes_rel', 'auction_id', 'tax_id', 'Buyer Costs', help="Account Tax For Buyer"),
+ 'seller_costs': fields.many2many('account.tax', 'auction_seller_taxes_rel', 'auction_id', 'tax_id', 'Seller Costs', help="Account Tax For Seller"),
+ 'acc_income': fields.many2one('account.account', 'Income Account', required=True),
+ 'acc_expense': fields.many2one('account.account', 'Expense Account', required=True),
+ 'adj_total': fields.function(_adjudication_get, method=True, string='Total Adjudication', store=True),
+ 'state': fields.selection((('draft', 'Draft'), ('closed', 'Closed')), 'State', select=1, readonly=True,
+ help='When auction starts the state is \'Draft\'.\n At the end of auction, the state becomes \'Closed\'.'),
+ 'account_analytic_id': fields.many2one('account.analytic.account', 'Analytic Account', required=True),
}
-
+
_defaults = {
- 'state': lambda *a: 'draft',
+ 'state': lambda *a: 'draft',
}
-
+
_order = "auction1 desc"
def close(self, cr, uid, ids, context=None):
@@ -112,7 +112,7 @@ class auction_dates(osv.osv):
new_seller_invoice = lots_obj.seller_trans_create(cr, uid, lots_ids2, {})
self.write(cr, uid, ids, {'state': 'closed'}) #close the auction
return True
-
+
auction_dates()
#----------------------------------------------------------
@@ -120,27 +120,27 @@ auction_dates()
#----------------------------------------------------------
class auction_deposit(osv.osv):
"""Auction Deposit Border"""
-
+
_name = "auction.deposit"
_description=__doc__
_order = "id desc"
_columns = {
- 'transfer' : fields.boolean('Transfer'),
- 'name': fields.char('Depositer Inventory', size=64, required=True),
- 'partner_id': fields.many2one('res.partner', 'Seller', required=True, change_default=True),
- 'date_dep': fields.date('Deposit date', required=True),
- 'method': fields.selection((('keep', 'Keep until sold'), ('decease', 'Decrease limit of 10%'), ('contact', 'Contact the Seller')), 'Withdrawned method', required=True),
- 'tax_id': fields.many2one('account.tax', 'Expenses'),
- 'create_uid': fields.many2one('res.users', 'Created by', readonly=True),
- 'info': fields.char('Description', size=64),
- 'lot_id': fields.one2many('auction.lots', 'bord_vnd_id', 'Objects'),
- 'specific_cost_ids': fields.one2many('auction.deposit.cost', 'deposit_id', 'Specific Costs'),
- 'total_neg': fields.boolean('Allow Negative Amount'),
+ 'transfer' : fields.boolean('Transfer'),
+ 'name': fields.char('Depositer Inventory', size=64, required=True),
+ 'partner_id': fields.many2one('res.partner', 'Seller', required=True, change_default=True),
+ 'date_dep': fields.date('Deposit date', required=True),
+ 'method': fields.selection((('keep', 'Keep until sold'), ('decease', 'Decrease limit of 10%'), ('contact', 'Contact the Seller')), 'Withdrawned method', required=True),
+ 'tax_id': fields.many2one('account.tax', 'Expenses'),
+ 'create_uid': fields.many2one('res.users', 'Created by', readonly=True),
+ 'info': fields.char('Description', size=64),
+ 'lot_id': fields.one2many('auction.lots', 'bord_vnd_id', 'Objects'),
+ 'specific_cost_ids': fields.one2many('auction.deposit.cost', 'deposit_id', 'Specific Costs'),
+ 'total_neg': fields.boolean('Allow Negative Amount'),
}
_defaults = {
- 'method': lambda *a: 'keep',
- 'total_neg': lambda *a: False,
- 'name': lambda obj, cr, uid, context: obj.pool.get('ir.sequence').get(cr, uid, 'auction.deposit'),
+ 'method': lambda *a: 'keep',
+ 'total_neg': lambda *a: False,
+ 'name': lambda obj, cr, uid, context: obj.pool.get('ir.sequence').get(cr, uid, 'auction.deposit'),
}
auction_deposit()
@@ -149,16 +149,16 @@ auction_deposit()
# (Specific) Deposit Costs
#----------------------------------------------------------
class auction_deposit_cost(osv.osv):
-
+
"""Auction Deposit Cost"""
-
+
_name = 'auction.deposit.cost'
_description=__doc__
_columns = {
- 'name': fields.char('Cost Name', required=True, size=64),
- 'amount': fields.float('Amount'),
- 'account': fields.many2one('account.account', 'Destination Account', required=True),
- 'deposit_id': fields.many2one('auction.deposit', 'Deposit'),
+ 'name': fields.char('Cost Name', required=True, size=64),
+ 'amount': fields.float('Amount'),
+ 'account': fields.many2one('account.account', 'Destination Account', required=True),
+ 'deposit_id': fields.many2one('auction.deposit', 'Deposit'),
}
auction_deposit_cost()
@@ -166,16 +166,16 @@ auction_deposit_cost()
# Lots Categories
#----------------------------------------------------------
class aie_category(osv.osv):
-
+
_name="aie.category"
_order = "name"
_columns={
- 'name': fields.char('Name', size=64, required=True),
- 'code':fields.char('Code', size=64),
- 'parent_id': fields.many2one('aie.category', 'Parent aie Category', ondelete='cascade'),
- 'child_ids': fields.one2many('aie.category', 'parent_id', help="Childs aie category")
+ 'name': fields.char('Name', size=64, required=True),
+ 'code':fields.char('Code', size=64),
+ 'parent_id': fields.many2one('aie.category', 'Parent aie Category', ondelete='cascade'),
+ 'child_ids': fields.one2many('aie.category', 'parent_id', help="Childs aie category")
}
-
+
def name_get(self, cr, uid, ids, context=None):
if not context:
context = {}
@@ -189,22 +189,22 @@ class aie_category(osv.osv):
name = record['parent_id'][1] + ' / ' + name
res.append((record['id'], name))
return res
-
-aie_category()
-
+
+aie_category()
+
class auction_lot_category(osv.osv):
"""Auction Lots Category"""
-
+
_name = 'auction.lot.category'
_description=__doc__
_columns = {
- 'name': fields.char('Category Name', required=True, size=64),
- 'priority': fields.float('Priority'),
- 'active' : fields.boolean('Active', help="If the active field is set to true, it will allow you to hide the auction lot category without removing it."),
- 'aie_categ': fields.many2one('aie.category', 'Category', ondelete='cascade'),
+ 'name': fields.char('Category Name', required=True, size=64),
+ 'priority': fields.float('Priority'),
+ 'active' : fields.boolean('Active', help="If the active field is set to true, it will allow you to hide the auction lot category without removing it."),
+ 'aie_categ': fields.many2one('aie.category', 'Category', ondelete='cascade'),
}
_defaults = {
- 'active' : lambda *a: 1,
+ 'active' : lambda *a: 1,
}
auction_lot_category()
@@ -217,11 +217,11 @@ def _type_get(self, cr, uid, context=None):
obj = self.pool.get('auction.lot.category')
ids = obj.search(cr, uid, [])
res = obj.read(cr, uid, ids, ['name'], context)
- res = [(r['name'], r['name']) for r in res]
- return res
+ res = [(r['name'], r['name']) for r in res]
+ return res
class auction_lots(osv.osv):
-
+
"""Auction Object"""
_name = "auction.lots"
_order = "obj_num,lot_num,id"
@@ -231,7 +231,7 @@ class auction_lots(osv.osv):
if not context:
context={}
return self.write(cr, uid, ids, {'state':'unsold'})
-
+
def button_taken_away(self, cr, uid, ids, context=None):
if not context:
context={}
@@ -256,7 +256,7 @@ class auction_lots(osv.osv):
"""
if not context:
context = {}
-
+
res = {}
account_analytic_line_obj = self.pool.get('account.analytic.line')
lots = self.browse(cr, uid, ids, context)
@@ -289,24 +289,24 @@ class auction_lots(osv.osv):
elif name == "gross_revenue":
if lot.auction_id:
result = lot.buyer_price - lot.seller_price
-
+
elif name == "net_revenue":
if lot.auction_id:
result = lot.buyer_price - lot.seller_price - lot.costs
-
+
elif name == "gross_margin":
if ((lot.obj_price==0) and (lot.state=='draft')):
amount = lot.lot_est1
- else:
+ else:
amount = lot.obj_price
if amount > 0:
result = (lot.gross_revenue * 100) / amount
result = round(result,2)
-
+
elif name == "net_margin":
if ((lot.obj_price==0) and (lot.state=='draft')):
amount = lot.lot_est1
- else:
+ else:
amount = lot.obj_price
if amount > 0:
result = (lot.net_revenue * 100) / amount
@@ -320,8 +320,8 @@ class auction_lots(osv.osv):
auct_id = lot.auction_id.id
lot_count = self.search(cr, uid, [('auction_id', '=', auct_id)], count=True)
line_ids = account_analytic_line_obj.search(cr, uid, [
- ('account_id', '=', lot.auction_id.account_analytic_id.id),
- ('journal_id', '<>', lot.auction_id.journal_id.id),
+ ('account_id', '=', lot.auction_id.account_analytic_id.id),
+ ('journal_id', '<>', lot.auction_id.journal_id.id),
('journal_id', '<>', lot.auction_id.journal_seller_id.id)])
indir_cost = lot.bord_vnd_id.specific_cost_ids
for r in lot.bord_vnd_id.specific_cost_ids:
@@ -330,20 +330,20 @@ class auction_lots(osv.osv):
if line.amount:
som -= line.amount
result = som/lot_count
-
+
elif name=="paid_ach":
result = False
if lot.ach_inv_id and lot.ach_inv_id.state == 'paid':
result = True
-
+
elif name=="paid_vnd":
result = False
if lot.sel_inv_id and lot.sel_inv_id.state == 'paid':
- result = True
-
+ result = True
+
res[lot.id][name] = result
-
-
+
+
return res
def onchange_obj_ret(self, cr, uid, ids, obj_ret, context=None):
@@ -354,66 +354,66 @@ class auction_lots(osv.osv):
return {}
_columns = {
- 'bid_lines':fields.one2many('auction.bid_line', 'lot_id', 'Bids'),
- 'auction_id': fields.many2one('auction.dates', 'Auction', select=1, help="Auction For Object"),
- 'bord_vnd_id': fields.many2one('auction.deposit', 'Depositer Inventory', required=True, help="Provide Deposit Information: seller, Withdrawned Method, Object, Deposit Costs"),
- 'name': fields.char('Title', size=64, required=True, help='Auction Object Name'),
- 'name2': fields.char('Short Description (2)', size=64),
- 'lot_type': fields.selection(_type_get, 'Object category', size=64),
- 'author_right': fields.many2one('account.tax', 'Author rights', help="Account Tax For Author Commission"),
- 'lot_est1': fields.float('Minimum Estimation', help="Minimum Estimate Price"),
- 'lot_est2': fields.float('Maximum Estimation', help="Maximum Estimate Price"),
- 'lot_num': fields.integer('List Number', required=True, select=1, help="List Number In Depositer Inventory"),
- 'create_uid': fields.many2one('res.users', 'Created by', readonly=True),
- 'history_ids':fields.one2many('auction.lot.history', 'lot_id', 'Auction history'),
- 'lot_local':fields.char('Location', size=64, help="Auction Location"),
- 'artist_id':fields.many2one('auction.artists', 'Artist/Author'),
- 'artist2_id':fields.many2one('auction.artists', 'Artist/Author2'),
- 'important':fields.boolean('To be Emphatized'),
- 'product_id':fields.many2one('product.product', 'Product', required=True),
- 'obj_desc': fields.text('Object Description'),
- 'obj_num': fields.integer('Catalog Number'),
- 'obj_ret': fields.float('Price retired', help="Object Ret"),
- 'obj_comm': fields.boolean('Commission'),
- 'obj_price': fields.float('Adjudication price', help="Object Price"),
- 'ach_avance': fields.float('Buyer Advance'),
- 'ach_login': fields.char('Buyer Username', size=64),
+ 'bid_lines':fields.one2many('auction.bid_line', 'lot_id', 'Bids'),
+ 'auction_id': fields.many2one('auction.dates', 'Auction', select=1, help="Auction For Object"),
+ 'bord_vnd_id': fields.many2one('auction.deposit', 'Depositer Inventory', required=True, help="Provide Deposit Information: seller, Withdrawned Method, Object, Deposit Costs"),
+ 'name': fields.char('Title', size=64, required=True, help='Auction Object Name'),
+ 'name2': fields.char('Short Description (2)', size=64),
+ 'lot_type': fields.selection(_type_get, 'Object category', size=64),
+ 'author_right': fields.many2one('account.tax', 'Author rights', help="Account Tax For Author Commission"),
+ 'lot_est1': fields.float('Minimum Estimation', help="Minimum Estimate Price"),
+ 'lot_est2': fields.float('Maximum Estimation', help="Maximum Estimate Price"),
+ 'lot_num': fields.integer('List Number', required=True, select=1, help="List Number In Depositer Inventory"),
+ 'create_uid': fields.many2one('res.users', 'Created by', readonly=True),
+ 'history_ids':fields.one2many('auction.lot.history', 'lot_id', 'Auction history'),
+ 'lot_local':fields.char('Location', size=64, help="Auction Location"),
+ 'artist_id':fields.many2one('auction.artists', 'Artist/Author'),
+ 'artist2_id':fields.many2one('auction.artists', 'Artist/Author2'),
+ 'important':fields.boolean('To be Emphatized'),
+ 'product_id':fields.many2one('product.product', 'Product', required=True),
+ 'obj_desc': fields.text('Object Description'),
+ 'obj_num': fields.integer('Catalog Number'),
+ 'obj_ret': fields.float('Price retired', help="Object Ret"),
+ 'obj_comm': fields.boolean('Commission'),
+ 'obj_price': fields.float('Adjudication price', help="Object Price"),
+ 'ach_avance': fields.float('Buyer Advance'),
+ 'ach_login': fields.char('Buyer Username', size=64),
'ach_uid': fields.many2one('res.partner', 'Buyer'),
- 'seller_id': fields.related('bord_vnd_id','partner_id', type='many2one', relation='res.partner', string='Seller', readonly=True),
- 'ach_emp': fields.boolean('Taken Away', readonly=True, help="When state is Taken Away, This field is Marked as True"),
- 'is_ok': fields.boolean('Buyer\'s payment', help="When Buyer Pay For Bank statement', This field is Marked"),
- 'ach_inv_id': fields.many2one('account.invoice', 'Buyer Invoice', readonly=True, states={'draft':[('readonly', False)]}),
- 'sel_inv_id': fields.many2one('account.invoice', 'Seller Invoice', readonly=True, states={'draft':[('readonly', False)]}),
- 'vnd_lim': fields.float('Seller limit'),
- 'vnd_lim_net': fields.boolean('Net limit ?', readonly=True),
- 'image': fields.binary('Image', help="Object Image"),
- 'paid_vnd':fields.function(_getprice, string='Seller Paid', method=True, type='boolean', store=True, multi="paid_vnd", help="When state of Seller Invoice is 'Paid', This field is selected as True."),
- 'paid_ach':fields.function(_getprice, string='Buyer Invoice Reconciled', method=True, type='boolean', store=True, multi="paid_ach", help="When state of Buyer Invoice is 'Paid', This field is selected as True."),
+ 'seller_id': fields.related('bord_vnd_id','partner_id', type='many2one', relation='res.partner', string='Seller', readonly=True),
+ 'ach_emp': fields.boolean('Taken Away', readonly=True, help="When state is Taken Away, This field is Marked as True"),
+ 'is_ok': fields.boolean('Buyer\'s payment', help="When Buyer Pay For Bank statement', This field is Marked"),
+ 'ach_inv_id': fields.many2one('account.invoice', 'Buyer Invoice', readonly=True, states={'draft':[('readonly', False)]}),
+ 'sel_inv_id': fields.many2one('account.invoice', 'Seller Invoice', readonly=True, states={'draft':[('readonly', False)]}),
+ 'vnd_lim': fields.float('Seller limit'),
+ 'vnd_lim_net': fields.boolean('Net limit ?', readonly=True),
+ 'image': fields.binary('Image', help="Object Image"),
+ 'paid_vnd':fields.function(_getprice, string='Seller Paid', method=True, type='boolean', store=True, multi="paid_vnd", help="When state of Seller Invoice is 'Paid', This field is selected as True."),
+ 'paid_ach':fields.function(_getprice, string='Buyer Invoice Reconciled', method=True, type='boolean', store=True, multi="paid_ach", help="When state of Buyer Invoice is 'Paid', This field is selected as True."),
'state': fields.selection((
- ('draft', 'Draft'),
- ('unsold', 'Unsold'),
- ('paid', 'Paid'),
- ('sold', 'Sold'),
- ('taken_away', 'Taken away')), 'State', required=True, readonly=True,
+ ('draft', 'Draft'),
+ ('unsold', 'Unsold'),
+ ('paid', 'Paid'),
+ ('sold', 'Sold'),
+ ('taken_away', 'Taken away')), 'State', required=True, readonly=True,
help=' * The \'Draft\' state is used when a object is encoding as a new object. \
\n* The \'Unsold\' state is used when object does not sold for long time, user can also set it as draft state after unsold. \
\n* The \'Paid\' state is used when user pay for the object \
- \n* The \'Sold\' state is used when user buy the object.'),
- 'buyer_price': fields.function(_getprice, method=True, string='Buyer price', store=True, multi="buyer_price", help="Buyer Price"),
- 'seller_price': fields.function(_getprice, method=True, string='Seller price', store=True, multi="seller_price", help="Seller Price"),
- 'gross_revenue':fields.function(_getprice, method=True, string='Gross revenue', store=True, multi="gross_revenue", help="Buyer Price - Seller Price"),
- 'gross_margin':fields.function(_getprice, method=True, string='Gross Margin (%)', store=True, multi="gross_margin", help="(Gross Revenue*100.0)/ Object Price"),
- 'costs':fields.function(_getprice, method=True, string='Indirect costs', store=True, multi="costs", help="Deposit cost"),
- 'statement_id': fields.many2many('account.bank.statement.line', 'auction_statement_line_rel', 'auction_id', 'statement', 'Payment', help="Bank statement Line For Given Buyer"),
- 'net_revenue':fields.function(_getprice, method=True, string='Net revenue', store=True, multi="net_revenue", help="Buyer Price - Seller Price - Indirect Cost"),
- 'net_margin':fields.function(_getprice, method=True, string='Net Margin (%)', store=True, multi="net_margin", help="(Net Revenue * 100)/ Object Price"),
+ \n* The \'Sold\' state is used when user buy the object.'),
+ 'buyer_price': fields.function(_getprice, method=True, string='Buyer price', store=True, multi="buyer_price", help="Buyer Price"),
+ 'seller_price': fields.function(_getprice, method=True, string='Seller price', store=True, multi="seller_price", help="Seller Price"),
+ 'gross_revenue':fields.function(_getprice, method=True, string='Gross revenue', store=True, multi="gross_revenue", help="Buyer Price - Seller Price"),
+ 'gross_margin':fields.function(_getprice, method=True, string='Gross Margin (%)', store=True, multi="gross_margin", help="(Gross Revenue*100.0)/ Object Price"),
+ 'costs':fields.function(_getprice, method=True, string='Indirect costs', store=True, multi="costs", help="Deposit cost"),
+ 'statement_id': fields.many2many('account.bank.statement.line', 'auction_statement_line_rel', 'auction_id', 'statement', 'Payment', help="Bank statement Line For Given Buyer"),
+ 'net_revenue':fields.function(_getprice, method=True, string='Net revenue', store=True, multi="net_revenue", help="Buyer Price - Seller Price - Indirect Cost"),
+ 'net_margin':fields.function(_getprice, method=True, string='Net Margin (%)', store=True, multi="net_margin", help="(Net Revenue * 100)/ Object Price"),
}
_defaults = {
- 'state':lambda *a: 'draft',
- 'lot_num':lambda *a:1,
- 'is_ok': lambda *a: False,
+ 'state':lambda *a: 'draft',
+ 'lot_num':lambda *a:1,
+ 'is_ok': lambda *a: False,
}
-
+
def name_get(self, cr, user, ids, context=None):
if not context:
context={}
@@ -467,7 +467,7 @@ class auction_lots(osv.osv):
amount+=t['amount']
amount_total['value']= amount
amount_total['amount']= amount
-
+
return amount_total
@@ -481,7 +481,7 @@ class auction_lots(osv.osv):
tax_cost_ids.append(border_id.tax_id)
elif lot.auction_id and lot.auction_id.seller_costs:
tax_cost_ids += lot.auction_id.seller_costs
-
+
tax_costs = self.pool.get('account.tax').compute_all(cr, uid, tax_cost_ids, lot.obj_price, 1)['taxes']
# delete useless keys from the costs computed by the tax object... this is useless but cleaner...
for cost in tax_costs:
@@ -497,13 +497,13 @@ class auction_lots(osv.osv):
#FIXME:the string passes have lot 'should go through the system translations.
obj_price_wh_costs = reduce(lambda x, y: x + y['amount'], tax_costs, lot.obj_price)
if obj_price_wh_costs < lot.vnd_lim:
- costs.append({ 'type': 1,
- 'id': lot.obj_num,
- 'name': 'Remise lot '+ str(lot.obj_num),
+ costs.append({ 'type': 1,
+ 'id': lot.obj_num,
+ 'name': 'Remise lot '+ str(lot.obj_num),
'amount': lot.vnd_lim - obj_price_wh_costs}
)
return costs
-
+
def compute_seller_costs(self, cr, uid, ids, manual_only=False):
lots = self.browse(cr, uid, ids)
costs = []
@@ -543,9 +543,9 @@ class auction_lots(osv.osv):
# sum remise limite net and ristourne
def compute_seller_costs_summed(self, cr, uid, ids): #ach_pay_id
-
+
"""This Fuction sum Net remittance limit and refund"""
-
+
taxes = self.compute_seller_costs(cr, uid, ids)
taxes_summed = {}
for tax in taxes:
@@ -567,7 +567,7 @@ class auction_lots(osv.osv):
return taxes_summed.values()
def buyer_proforma(self, cr, uid, ids, context=None):
-
+
if not context:
context={}
invoices = {}
@@ -589,11 +589,10 @@ class auction_lots(osv.osv):
if not invoice_addr_id:
raise orm.except_orm(_('No Invoice Address'), _('The Buyer "%s" has no Invoice Address.') % (contact_addr_id,))
inv = {
- 'name': 'Auction proforma:' +lot.name,
- 'journal_id': lot.auction_id.journal_id.id,
- 'partner_id': partner_ref,
- 'type': 'out_invoice',
- # 'state':'proforma',
+ 'name': 'Auction proforma:' +lot.name,
+ 'journal_id': lot.auction_id.journal_id.id,
+ 'partner_id': partner_ref,
+ 'type': 'out_invoice',
}
inv.update(inv_ref.onchange_partner_id(cr, uid, [], 'out_invoice', partner_ref)['value'])
inv['account_id'] = inv['account_id'] and inv['account_id'][0]
@@ -648,10 +647,10 @@ class auction_lots(osv.osv):
contact_addr_id = res['contact']
invoice_addr_id = res['invoice']
inv = {
- 'name': 'Auction:' +lot.name,
- 'journal_id': lot.auction_id.journal_seller_id.id,
- 'partner_id': lot.bord_vnd_id.partner_id.id,
- 'type': 'in_invoice',
+ 'name': 'Auction:' +lot.name,
+ 'journal_id': lot.auction_id.journal_seller_id.id,
+ 'partner_id': lot.bord_vnd_id.partner_id.id,
+ 'type': 'in_invoice',
}
inv.update(inv_ref.onchange_partner_id(cr, uid, [], 'in_invoice', lot.bord_vnd_id.partner_id.id)['value'])
inv_id = inv_ref.create(cr, uid, inv, context)
@@ -666,14 +665,14 @@ class auction_lots(osv.osv):
taxes += map(lambda x: x.id, lot.auction_id.seller_costs)
inv_line= {
- 'invoice_id': inv_id,
- 'quantity': 1,
- 'product_id': lot.product_id.id,
- 'name': '['+str(lot.obj_num)+'] '+lot.auction_id.name,
- 'invoice_line_tax_id': [(6, 0, taxes)],
- 'account_analytic_id': lot.auction_id.account_analytic_id.id,
- 'account_id': lot.auction_id.acc_expense.id,
- 'price_unit': lot.obj_price,
+ 'invoice_id': inv_id,
+ 'quantity': 1,
+ 'product_id': lot.product_id.id,
+ 'name': '['+str(lot.obj_num)+'] '+lot.auction_id.name,
+ 'invoice_line_tax_id': [(6, 0, taxes)],
+ 'account_analytic_id': lot.auction_id.account_analytic_id.id,
+ 'account_id': lot.auction_id.acc_expense.id,
+ 'price_unit': lot.obj_price,
}
inv_line_obj.create(cr, uid, inv_line, context)
inv_ref.button_compute(cr, uid, invoices.values())
@@ -715,11 +714,11 @@ class auction_lots(osv.osv):
price = lot.obj_price or 0.0
lot_name =lot.obj_num
inv = {
- 'name':lot.auction_id.name or '',
- 'reference': lot.ach_login,
- 'journal_id': lot.auction_id.journal_id.id,
- 'partner_id': lot.ach_uid.id,
- 'type': 'out_invoice',
+ 'name':lot.auction_id.name or '',
+ 'reference': lot.ach_login,
+ 'journal_id': lot.auction_id.journal_id.id,
+ 'partner_id': lot.ach_uid.id,
+ 'type': 'out_invoice',
}
if invoice_number:
inv['number'] = invoice_number
@@ -734,14 +733,14 @@ class auction_lots(osv.osv):
taxes.append(lot.author_right.id)
inv_line= {
- 'invoice_id': inv_id,
- 'quantity': 1,
- 'product_id': lot.product_id.id,
- 'name': '['+str(lot.obj_num)+'] '+ lot.name,
- 'invoice_line_tax_id': [(6, 0, taxes)],
- 'account_analytic_id': lot.auction_id.account_analytic_id.id,
- 'account_id': lot.auction_id.acc_income.id,
- 'price_unit': lot.obj_price,
+ 'invoice_id': inv_id,
+ 'quantity': 1,
+ 'product_id': lot.product_id.id,
+ 'name': '['+str(lot.obj_num)+'] '+ lot.name,
+ 'invoice_line_tax_id': [(6, 0, taxes)],
+ 'account_analytic_id': lot.auction_id.account_analytic_id.id,
+ 'account_id': lot.auction_id.acc_income.id,
+ 'price_unit': lot.obj_price,
}
inv_line_obj.create(cr, uid, inv_line, context)
inv_ref.button_compute(cr, uid, [inv_id])
@@ -756,21 +755,21 @@ auction_lots()
#----------------------------------------------------------
class auction_bid(osv.osv):
"""Bid Auctions"""
-
+
_name = "auction.bid"
_description=__doc__
_order = 'id desc'
_columns = {
- 'partner_id': fields.many2one('res.partner', 'Buyer Name', required=True),
- 'contact_tel':fields.char('Contact', size=64),
- 'name': fields.char('Bid ID', size=64, required=True),
- 'auction_id': fields.many2one('auction.dates', 'Auction Date', required=True),
- 'bid_lines': fields.one2many('auction.bid_line', 'bid_id', 'Bid'),
+ 'partner_id': fields.many2one('res.partner', 'Buyer Name', required=True),
+ 'contact_tel':fields.char('Contact', size=64),
+ 'name': fields.char('Bid ID', size=64, required=True),
+ 'auction_id': fields.many2one('auction.dates', 'Auction Date', required=True),
+ 'bid_lines': fields.one2many('auction.bid_line', 'bid_id', 'Bid'),
}
_defaults = {
- 'name': lambda obj, cr, uid, context: obj.pool.get('ir.sequence').get(cr, uid, 'auction.bid'),
+ 'name': lambda obj, cr, uid, context: obj.pool.get('ir.sequence').get(cr, uid, 'auction.bid'),
}
-
+
def onchange_contact(self, cr, uid, ids, partner_id):
if not partner_id:
return {'value': {'contact_tel':False}}
@@ -785,13 +784,13 @@ auction_bid()
class auction_lot_history(osv.osv):
"""Lot History"""
-
+
_name = "auction.lot.history"
_description=__doc__
_columns = {
- 'name': fields.date('Date', size=64),
- 'lot_id': fields.many2one('auction.lots', 'Object', required=True, ondelete='cascade'),
- 'auction_id': fields.many2one('auction.dates', 'Auction date', required=True, ondelete='cascade'),
+ 'name': fields.date('Date', size=64),
+ 'lot_id': fields.many2one('auction.lots', 'Object', required=True, ondelete='cascade'),
+ 'auction_id': fields.many2one('auction.dates', 'Auction date', required=True, ondelete='cascade'),
'price': fields.float('Withdrawn price', digits=(16, 2))
}
_defaults = {
@@ -804,11 +803,11 @@ class auction_bid_lines(osv.osv):
_description="Bid"
_columns = {
- 'name': fields.char('Bid date', size=64),
- 'bid_id': fields.many2one('auction.bid', 'Bid ID', required=True, ondelete='cascade'),
- 'lot_id': fields.many2one('auction.lots', 'Object', required=True, ondelete='cascade'),
- 'call': fields.boolean('To be Called'),
- 'price': fields.float('Maximum Price'),
+ 'name': fields.char('Bid date', size=64),
+ 'bid_id': fields.many2one('auction.bid', 'Bid ID', required=True, ondelete='cascade'),
+ 'lot_id': fields.many2one('auction.lots', 'Object', required=True, ondelete='cascade'),
+ 'call': fields.boolean('To be Called'),
+ 'price': fields.float('Maximum Price'),
'auction': fields.char(string='Auction Name', size=64)
}
_defaults = {
diff --git a/addons/auction/auction_demo.xml b/addons/auction/auction_demo.xml
index 45b157e6545..9b804e8e4c3 100644
--- a/addons/auction/auction_demo.xml
+++ b/addons/auction/auction_demo.xml
@@ -34,12 +34,12 @@
Auction Adjudications
7x*
-
+
receivable
-
+
Auction Adjudication Expenses
6x*
@@ -128,7 +128,7 @@
default
-
+
Louvain-la-Neuve
Thomas Passot
@@ -141,12 +141,12 @@
-
+
Philippe Lavilier
1345-1450
-
+
POREAU OSWALD
1877-1955
@@ -195,7 +195,7 @@
-
+
TVA
0.12
@@ -211,7 +211,7 @@
-
+
Buyer Costs
0.21
@@ -219,7 +219,7 @@
-
+
Seller Costs1
-0.10
@@ -227,7 +227,7 @@
-
+
Seller Costs
-0.10
@@ -253,7 +253,7 @@
-
+
Oeuvres a 21%
@@ -267,7 +267,7 @@
1
-
+
Furniture
2
@@ -279,7 +279,7 @@
2
-
+
Sculpture
10
@@ -389,7 +389,6 @@
-
@@ -403,10 +402,8 @@
4
0.00
-
-
@@ -420,17 +417,14 @@
4
375
-
-
Plastic glass
5
-
300
500
show pices
@@ -462,7 +456,6 @@
bresslet
7
-
150
400
show pices
@@ -478,7 +471,6 @@
gold chain
11
-
400
700
show pices
@@ -494,7 +486,6 @@
fiber glass
8
-
300
500
show pices
@@ -510,7 +501,6 @@
lake photos
9
-
100
200
show pices
@@ -526,7 +516,6 @@
mobile photos
10
-
4500
4700
show models
@@ -542,7 +531,6 @@
Antique photos
11
-
1600
2200
show map Items
@@ -558,7 +546,6 @@
Hardware photos
12
-
2600
2800
show map Items
@@ -590,7 +577,6 @@
mobile accesories photos
13
-
1600
2200
show map Items
@@ -606,7 +592,6 @@
pikes-candles
14
-
30
50
show map Items
@@ -622,7 +607,6 @@
Coffee Service
15
-
10
20
show map Items
@@ -823,9 +807,7 @@
Demo
-
-
@@ -836,43 +818,43 @@
sign_in
-
+
sign_out
-
+
sign_in
-
+
sign_out
-
+
sign_in
-
+
sign_out
-
+
sign_in
-
+
sign_out
@@ -886,43 +868,43 @@
sign_in
-
+
sign_out
-
+
sign_in
-
+
sign_out
-
+
sign_in
-
+
sign_out
-
+
sign_in
-
+
sign_out
diff --git a/addons/auction/auction_report.xml b/addons/auction/auction_report.xml
index 885c08582ee..4df44c9c96a 100644
--- a/addons/auction/auction_report.xml
+++ b/addons/auction/auction_report.xml
@@ -1,7 +1,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/addons/auction/auction_wizard.xml b/addons/auction/auction_wizard.xml
index ab1b051add5..70caa14cd3b 100644
--- a/addons/auction/auction_wizard.xml
+++ b/addons/auction/auction_wizard.xml
@@ -1,45 +1,6 @@
-
-
diff --git a/addons/auction/board_auction_demo.xml b/addons/auction/board_auction_demo.xml
index f260f8bb1fc..1727d6a3522 100644
--- a/addons/auction/board_auction_demo.xml
+++ b/addons/auction/board_auction_demo.xml
@@ -2,13 +2,6 @@
-
-
-
-
-
-
-
diff --git a/addons/auction/board_auction_view.xml b/addons/auction/board_auction_view.xml
index 8a183c267d8..8865550949e 100644
--- a/addons/auction/board_auction_view.xml
+++ b/addons/auction/board_auction_view.xml
@@ -10,20 +10,19 @@
form
tree,form
-
+
auction.deposit
form
tree,form
-
-
+
+
report.auction.estimation.adj.category.tree
auction.lots
tree
-
@@ -47,13 +46,13 @@
-
+
Min est/Adj/Max est
auction.lots
form
graph,tree
-
+
board.auction.form
@@ -103,9 +102,9 @@
menu
-
+
-
+