[REF] remove vim modelines and resulting trailing blank lines
Let 2015 be a year without modelines! cf #4174
This commit is contained in:
committed by
Martin Trigaux
parent
b3cf5382a4
commit
4a0b13ed92
@@ -36,5 +36,3 @@ import company
|
||||
import res_currency
|
||||
import edi
|
||||
import res_config
|
||||
|
||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
|
||||
@@ -157,5 +157,3 @@ for a particular financial year and for preparation of vouchers there is a modul
|
||||
'installable': True,
|
||||
'auto_install': False,
|
||||
}
|
||||
|
||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
|
||||
@@ -3564,6 +3564,3 @@ class account_bank_accounts_wizard(osv.osv_memory):
|
||||
'currency_id': fields.many2one('res.currency', 'Secondary Currency', help="Forces all moves for this account to have this secondary currency."),
|
||||
'account_type': fields.selection([('cash','Cash'), ('check','Check'), ('bank','Bank')], 'Account Type'),
|
||||
}
|
||||
|
||||
|
||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
|
||||
@@ -159,6 +159,3 @@ class res_partner(osv.osv):
|
||||
'contract_ids': fields.one2many('account.analytic.account', \
|
||||
'partner_id', 'Contracts', readonly=True),
|
||||
}
|
||||
|
||||
|
||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
|
||||
@@ -111,5 +111,3 @@ class bank(osv.osv):
|
||||
|
||||
self.write(cr, uid, [bank.id], {'journal_id': journal_id}, context=context)
|
||||
return True
|
||||
|
||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
|
||||
@@ -871,5 +871,3 @@ class account_statement_operation_template(osv.osv):
|
||||
'amount': 100.0,
|
||||
'company_id': lambda self, cr, uid, c: self.pool.get('res.users').browse(cr, uid, uid, c).company_id.id,
|
||||
}
|
||||
|
||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
|
||||
@@ -359,6 +359,3 @@ class account_journal_cashbox_line(osv.osv):
|
||||
}
|
||||
|
||||
_order = 'pieces asc'
|
||||
|
||||
|
||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
|
||||
@@ -137,6 +137,3 @@ class account_financial_report(osv.osv):
|
||||
'sign': 1,
|
||||
'style_overwrite': 0,
|
||||
}
|
||||
|
||||
|
||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
|
||||
@@ -1641,5 +1641,3 @@ class mail_compose_message(models.Model):
|
||||
invoice.write({'sent': True})
|
||||
invoice.message_post(body=_("Invoice sent"))
|
||||
return super(mail_compose_message, self).send_mail()
|
||||
|
||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
|
||||
@@ -1411,6 +1411,3 @@ class account_move_line(osv.osv):
|
||||
result.append((journal.id,ng[journal.id],journal.type,
|
||||
bool(journal.currency),bool(journal.analytic_journal_id)))
|
||||
return result
|
||||
|
||||
|
||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
|
||||
@@ -46,6 +46,3 @@ If you have any queries regarding your account, Please contact us.
|
||||
Thank you in advance for your cooperation.
|
||||
Best Regards,'''
|
||||
}
|
||||
|
||||
|
||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
|
||||
@@ -20,5 +20,3 @@
|
||||
##############################################################################
|
||||
|
||||
import invoice
|
||||
|
||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
|
||||
@@ -287,7 +287,3 @@ class account_invoice_line(osv.osv, EDIMixin):
|
||||
|
||||
class account_invoice_tax(osv.osv, EDIMixin):
|
||||
_inherit = "account.invoice.tax"
|
||||
|
||||
|
||||
|
||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
|
||||
@@ -171,6 +171,3 @@ class account_installer(osv.osv_memory):
|
||||
context=context)[0]['charts']
|
||||
_logger.debug('Installing chart of accounts %s', chart)
|
||||
return (modules | set([chart])) - set(['has_default_company', 'configurable'])
|
||||
|
||||
|
||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
|
||||
@@ -336,6 +336,3 @@ class res_partner(osv.osv):
|
||||
return super(res_partner, self)._commercial_fields(cr, uid, context=context) + \
|
||||
['debit_limit', 'property_account_payable', 'property_account_receivable', 'property_account_position',
|
||||
'property_payment_term', 'property_supplier_payment_term', 'last_reconciliation_date']
|
||||
|
||||
|
||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
|
||||
@@ -68,6 +68,3 @@ class product_template(osv.osv):
|
||||
if self.pool.get('account.move.line').search(cr, uid, [('product_id', 'in', product_ids)], context=context, limit=1):
|
||||
raise osv.except_osv(_('Error!'), _("You can not change the unit of measure of a product that has been already used in an account journal item. If you need to change the unit of measure, you may deactivate this product.") % ())
|
||||
return super(product_template, self).write(cr, uid, ids, vals, context=context)
|
||||
|
||||
|
||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
|
||||
@@ -35,6 +35,3 @@ import account_entries_report
|
||||
import account_analytic_entries_report
|
||||
import account_treasury_report
|
||||
import account_financial_report
|
||||
|
||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
|
||||
|
||||
@@ -395,5 +395,3 @@ class report_agedpartnerbalance(osv.AbstractModel):
|
||||
_inherit = 'report.abstract_report'
|
||||
_template = 'account.report_agedpartnerbalance'
|
||||
_wrapped_report_class = aged_trial_report
|
||||
|
||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
|
||||
@@ -73,5 +73,3 @@ class analytic_entries_report(osv.osv):
|
||||
a.move_id,a.product_id,a.product_uom_id
|
||||
)
|
||||
""")
|
||||
|
||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
|
||||
@@ -134,5 +134,3 @@ class report_trialbalance(osv.AbstractModel):
|
||||
_inherit = 'report.abstract_report'
|
||||
_template = 'account.report_trialbalance'
|
||||
_wrapped_report_class = account_balance
|
||||
|
||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
|
||||
@@ -112,5 +112,3 @@ class report_agedpartnerbalance(osv.AbstractModel):
|
||||
_inherit = 'report.abstract_report'
|
||||
_template = 'account.report_centraljournal'
|
||||
_wrapped_report_class = journal_print
|
||||
|
||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
|
||||
@@ -143,5 +143,3 @@ class account_entries_report(osv.osv):
|
||||
where l.state != 'draft'
|
||||
)
|
||||
""")
|
||||
|
||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
|
||||
@@ -113,5 +113,3 @@ class report_financial(osv.AbstractModel):
|
||||
_inherit = 'report.abstract_report'
|
||||
_template = 'account.report_financial'
|
||||
_wrapped_report_class = report_account_common
|
||||
|
||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
|
||||
@@ -164,5 +164,3 @@ class report_generaljournal(osv.AbstractModel):
|
||||
_inherit = 'report.abstract_report'
|
||||
_template = 'account.report_generaljournal'
|
||||
_wrapped_report_class = journal_print
|
||||
|
||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
|
||||
@@ -312,5 +312,3 @@ class report_generalledger(osv.AbstractModel):
|
||||
_inherit = 'report.abstract_report'
|
||||
_template = 'account.report_generalledger'
|
||||
_wrapped_report_class = general_ledger
|
||||
|
||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
|
||||
@@ -229,6 +229,3 @@ class account_invoice_report(osv.osv):
|
||||
)""" % (
|
||||
self._table,
|
||||
self._select(), self._sub_select(), self._from(), self._group_by()))
|
||||
|
||||
|
||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
|
||||
@@ -213,5 +213,3 @@ class report_salepurchasejournal(osv.AbstractModel):
|
||||
_inherit = 'report.abstract_report'
|
||||
_template = 'account.report_salepurchasejournal'
|
||||
_wrapped_report_class = journal_print
|
||||
|
||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
|
||||
@@ -261,5 +261,3 @@ class report_partnerbalance(osv.AbstractModel):
|
||||
_inherit = 'report.abstract_report'
|
||||
_template = 'account.report_partnerbalance'
|
||||
_wrapped_report_class = partner_balance
|
||||
|
||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
|
||||
@@ -312,5 +312,3 @@ class report_partnerledgerother(osv.AbstractModel):
|
||||
_inherit = 'report.abstract_report'
|
||||
_template = 'account.report_partnerledgerother'
|
||||
_wrapped_report_class = third_party_ledger
|
||||
|
||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
|
||||
@@ -88,5 +88,3 @@ class report_overdue(osv.AbstractModel):
|
||||
_inherit = 'report.abstract_report'
|
||||
_template = 'account.report_overdue'
|
||||
_wrapped_report_class = Overdue
|
||||
|
||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
|
||||
@@ -286,5 +286,3 @@ class report_account_sales(osv.osv):
|
||||
group by
|
||||
to_char(inv.date_invoice, 'YYYY'),to_char(inv.date_invoice,'MM'),inv.currency_id, inv.period_id, inv_line.product_id, account.id
|
||||
)""")
|
||||
|
||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
|
||||
@@ -78,5 +78,3 @@ class account_treasury_report(osv.osv):
|
||||
group by p.id, p.fiscalyear_id, p.date_start, am.company_id
|
||||
)
|
||||
""")
|
||||
|
||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
|
||||
@@ -139,7 +139,3 @@ class common_report_header(object):
|
||||
if data.get('form', False) and data['form'].get('chart_account_id', False):
|
||||
return self.pool.get('account.account').browse(self.cr, self.uid, data['form']['chart_account_id']).company_id.currency_id.symbol
|
||||
return ''
|
||||
|
||||
#vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
|
||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
|
||||
@@ -242,5 +242,3 @@ class report_vat(osv.AbstractModel):
|
||||
_inherit = 'report.abstract_report'
|
||||
_template = 'account.report_vat'
|
||||
_wrapped_report_class = tax_report
|
||||
|
||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
|
||||
@@ -377,4 +377,3 @@ class account_config_settings(osv.osv_memory):
|
||||
'module_account_accountant': True,
|
||||
}}
|
||||
return {}
|
||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
|
||||
@@ -42,4 +42,3 @@ class res_currency_account(osv.osv):
|
||||
elif tot1 and account_invert:
|
||||
rate = float(tot2)/float(tot1)
|
||||
return rate
|
||||
|
||||
|
||||
@@ -47,5 +47,3 @@ for a in account_lists:
|
||||
(a2['parent_right']<a['parent_right']))
|
||||
if a2['parent_id']==a['id']:
|
||||
assert (a2['parent_left']>a['parent_left']) and (a2['parent_right']<a['parent_right'])
|
||||
|
||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
|
||||
@@ -159,4 +159,3 @@ class TestReconciliation(TransactionCase):
|
||||
checked_line += 1
|
||||
continue
|
||||
self.assertEquals(checked_line, 3)
|
||||
|
||||
|
||||
@@ -65,4 +65,3 @@ import account_change_currency
|
||||
|
||||
import pos_box
|
||||
import account_statement_from_invoice
|
||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
|
||||
@@ -251,6 +251,3 @@ class account_automatic_reconcile(osv.osv_memory):
|
||||
'target': 'new',
|
||||
'context': context,
|
||||
}
|
||||
|
||||
|
||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
|
||||
@@ -72,6 +72,3 @@ class account_change_currency(osv.osv_memory):
|
||||
obj_inv_line.write(cr, uid, [line.id], {'price_unit': new_price})
|
||||
obj_inv.write(cr, uid, [invoice.id], {'currency_id': new_currency}, context=context)
|
||||
return {'type': 'ir.actions.act_window_close'}
|
||||
|
||||
|
||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
|
||||
@@ -105,6 +105,3 @@ class account_chart(osv.osv_memory):
|
||||
'target_move': 'posted',
|
||||
'fiscalyear': _get_fiscalyear,
|
||||
}
|
||||
|
||||
|
||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
|
||||
@@ -90,5 +90,3 @@ class accounting_report(osv.osv_memory):
|
||||
def _print_report(self, cr, uid, ids, data, context=None):
|
||||
data['form'].update(self.read(cr, uid, ids, ['date_from_cmp', 'debit_credit', 'date_to_cmp', 'fiscalyear_id_cmp', 'period_from_cmp', 'period_to_cmp', 'filter_cmp', 'account_report_id', 'enable_filter', 'label_filter','target_move'], context=context)[0])
|
||||
return self.pool['report'].get_action(cr, uid, [], 'account.report_financial', data=data, context=context)
|
||||
|
||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
|
||||
@@ -273,6 +273,3 @@ class account_fiscalyear_close(osv.osv_memory):
|
||||
obj_acc_fiscalyear.invalidate_cache(cr, uid, ['end_journal_period_id'], [old_fyear.id], context=context)
|
||||
|
||||
return {'type': 'ir.actions.act_window_close'}
|
||||
|
||||
|
||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
|
||||
@@ -65,6 +65,3 @@ class account_fiscalyear_close_state(osv.osv_memory):
|
||||
self.invalidate_cache(cr, uid, context=context)
|
||||
|
||||
return {'type': 'ir.actions.act_window_close'}
|
||||
|
||||
|
||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
|
||||
@@ -229,7 +229,3 @@ class account_invoice_refund(osv.osv_memory):
|
||||
def invoice_refund(self, cr, uid, ids, context=None):
|
||||
data_refund = self.read(cr, uid, ids, ['filter_refund'],context=context)[0]['filter_refund']
|
||||
return self.compute_refund(cr, uid, ids, data_refund, context=context)
|
||||
|
||||
|
||||
|
||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
|
||||
@@ -64,6 +64,3 @@ class account_invoice_cancel(osv.osv_memory):
|
||||
raise osv.except_osv(_('Warning!'), _("Selected invoice(s) cannot be cancelled as they are already in 'Cancelled' or 'Done' state."))
|
||||
record.signal_workflow('invoice_cancel')
|
||||
return {'type': 'ir.actions.act_window_close'}
|
||||
|
||||
|
||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
|
||||
@@ -44,6 +44,3 @@ class account_journal_select(osv.osv_memory):
|
||||
result['domain'] = str([('journal_id', '=', journal_id), ('period_id', '=', period_id)])
|
||||
result['context'] = str({'journal_id': journal_id, 'period_id': period_id})
|
||||
return result
|
||||
|
||||
|
||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
|
||||
@@ -58,6 +58,3 @@ the bank account\nin the journal definition for reconciliation.'))
|
||||
'context': "{'journal_id': %d}" % (data['journal_id'],),
|
||||
'type': 'ir.actions.act_window'
|
||||
}
|
||||
|
||||
|
||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
|
||||
@@ -49,6 +49,3 @@ class account_move_line_reconcile_select(osv.osv_memory):
|
||||
'res_model': 'account.move.line',
|
||||
'type': 'ir.actions.act_window'
|
||||
}
|
||||
|
||||
|
||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
|
||||
@@ -66,6 +66,3 @@ class account_move_line_select(osv.osv_memory):
|
||||
result['context'].update({'consolidate_children': True})
|
||||
result['domain']=result['domain'][0:-1]+','+domain+result['domain'][-1]
|
||||
return result
|
||||
|
||||
|
||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
|
||||
@@ -38,6 +38,3 @@ class account_move_line_unreconcile_select(osv.osv_memory):
|
||||
'res_model': 'account.move.line',
|
||||
'type': 'ir.actions.act_window'
|
||||
}
|
||||
|
||||
|
||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
|
||||
@@ -43,6 +43,3 @@ class account_open_closed_fiscalyear(osv.osv_memory):
|
||||
cr.execute('delete from account_move where id IN %s', (tuple(ids_move),))
|
||||
self.invalidate_cache(cr, uid, context=context)
|
||||
return {'type': 'ir.actions.act_window_close'}
|
||||
|
||||
|
||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
|
||||
@@ -56,6 +56,3 @@ class account_period_close(osv.osv_memory):
|
||||
self.invalidate_cache(cr, uid, context=context)
|
||||
|
||||
return {'type': 'ir.actions.act_window_close'}
|
||||
|
||||
|
||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
|
||||
@@ -161,6 +161,3 @@ class account_move_line_reconcile_writeoff(osv.osv_memory):
|
||||
account_move_line_obj.reconcile(cr, uid, context['active_ids'], 'manual', account_id,
|
||||
period_id, journal_id, context=context)
|
||||
return {'type': 'ir.actions.act_window_close'}
|
||||
|
||||
|
||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
|
||||
@@ -97,6 +97,3 @@ class account_partner_reconcile_process(osv.osv_memory):
|
||||
'today_reconciled': _get_today_reconciled,
|
||||
'next_partner_id': _get_partner,
|
||||
}
|
||||
|
||||
|
||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
|
||||
@@ -38,5 +38,3 @@ class account_balance_report(osv.osv_memory):
|
||||
def _print_report(self, cr, uid, ids, data, context=None):
|
||||
data = self.pre_print_report(cr, uid, ids, data, context=context)
|
||||
return self.pool['report'].get_action(cr, uid, [], 'account.report_trialbalance', data=data, context=context)
|
||||
|
||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
|
||||
@@ -82,5 +82,3 @@ class account_aged_trial_balance(osv.osv_memory):
|
||||
if data.get('form',False):
|
||||
data['ids']=[data['form'].get('chart_account_id',False)]
|
||||
return self.pool['report'].get_action(cr, uid, [], 'account.report_agedpartnerbalance', data=data, context=context)
|
||||
|
||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
|
||||
@@ -34,5 +34,3 @@ class account_central_journal(osv.osv_memory):
|
||||
def _print_report(self, cr, uid, ids, data, context=None):
|
||||
data = self.pre_print_report(cr, uid, ids, data, context=context)
|
||||
return self.pool['report'].get_action(cr, uid, [], 'account.report_centraljournal', data=data, context=context)
|
||||
|
||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
|
||||
@@ -182,6 +182,3 @@ class account_common_report(osv.osv_memory):
|
||||
data['form']['periods'] = used_context.get('periods', False) and used_context['periods'] or []
|
||||
data['form']['used_context'] = dict(used_context, lang=context.get('lang', 'en_US'))
|
||||
return self._print_report(cr, uid, ids, data, context=context)
|
||||
|
||||
|
||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
|
||||
@@ -40,8 +40,3 @@ class account_common_account_report(osv.osv_memory):
|
||||
context = {}
|
||||
data['form'].update(self.read(cr, uid, ids, ['display_account'], context=context)[0])
|
||||
return data
|
||||
|
||||
|
||||
#vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
|
||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
|
||||
@@ -49,6 +49,3 @@ class account_common_journal_report(osv.osv_memory):
|
||||
period_list = data['form']['periods'] or self.pool.get('account.period').search(cr, uid, [('fiscalyear_id', 'in', fy_ids)], context=context)
|
||||
data['form']['active_ids'] = self.pool.get('account.journal.period').search(cr, uid, [('journal_id', 'in', data['form']['journal_ids']), ('period_id', 'in', period_list)], context=context)
|
||||
return data
|
||||
|
||||
|
||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
|
||||
@@ -41,7 +41,3 @@ class account_common_partner_report(osv.osv_memory):
|
||||
context = {}
|
||||
data['form'].update(self.read(cr, uid, ids, ['result_selection'], context=context)[0])
|
||||
return data
|
||||
|
||||
|
||||
#vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
|
||||
@@ -34,5 +34,3 @@ class account_general_journal(osv.osv_memory):
|
||||
def _print_report(self, cr, uid, ids, data, context=None):
|
||||
data = self.pre_print_report(cr, uid, ids, data, context=context)
|
||||
return self.pool['report'].get_action(cr, uid, [], 'account.report_generaljournal', data=data, context=context)
|
||||
|
||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
|
||||
@@ -62,5 +62,3 @@ class account_report_general_ledger(osv.osv_memory):
|
||||
context['landscape'] = data['form']['landscape']
|
||||
|
||||
return self.pool['report'].get_action(cr, uid, [], 'account.report_generalledger', data=data, context=context)
|
||||
|
||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
|
||||
@@ -45,5 +45,3 @@ class account_partner_balance(osv.osv_memory):
|
||||
data = self.pre_print_report(cr, uid, ids, data, context=context)
|
||||
data['form'].update(self.read(cr, uid, ids, ['display_partner'])[0])
|
||||
return self.pool['report'].get_action(cr, uid, [], 'account.report_partnerbalance', data=data, context=context)
|
||||
|
||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
|
||||
@@ -60,5 +60,3 @@ class account_partner_ledger(osv.osv_memory):
|
||||
if data['form'].get('page_split') is True:
|
||||
return self.pool['report'].get_action(cr, uid, [], 'account.report_partnerledgerother', data=data, context=context)
|
||||
return self.pool['report'].get_action(cr, uid, [], 'account.report_partnerledger', data=data, context=context)
|
||||
|
||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
|
||||
@@ -70,5 +70,3 @@ class account_print_journal(osv.osv_memory):
|
||||
return self.pool['report'].get_action(cr, uid, [], 'account.report_salepurchasejournal', data=data, context=context)
|
||||
else:
|
||||
return self.pool['report'].get_action(cr, uid, [], 'account.report_journal', data=data, context=context)
|
||||
|
||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
|
||||
@@ -38,6 +38,3 @@ class account_state_open(osv.osv_memory):
|
||||
raise osv.except_osv(_('Warning!'), _('Invoice is already reconciled.'))
|
||||
invoice.signal_workflow('open_test')
|
||||
return {'type': 'ir.actions.act_window_close'}
|
||||
|
||||
|
||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
|
||||
@@ -81,6 +81,3 @@ class account_statement_from_invoice_lines(osv.osv_memory):
|
||||
'date': statement.date,
|
||||
}, context=context)
|
||||
return {'type': 'ir.actions.act_window_close'}
|
||||
|
||||
|
||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
|
||||
@@ -47,6 +47,3 @@ class account_subscription_generate(osv.osv_memory):
|
||||
result = act_obj.read(cr, uid, [id], context=context)[0]
|
||||
result['domain'] = str([('id','in',moves_created)])
|
||||
return result
|
||||
|
||||
|
||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
|
||||
@@ -72,6 +72,3 @@ class account_tax_chart(osv.osv_memory):
|
||||
'period_id': _get_period,
|
||||
'target_move': 'posted'
|
||||
}
|
||||
|
||||
|
||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
|
||||
@@ -46,6 +46,3 @@ class account_unreconcile_reconcile(osv.osv_memory):
|
||||
if rec_ids:
|
||||
obj_move_reconcile.unlink(cr, uid, rec_ids, context=context)
|
||||
return {'type': 'ir.actions.act_window_close'}
|
||||
|
||||
|
||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
|
||||
@@ -70,6 +70,3 @@ class account_use_model(osv.osv_memory):
|
||||
'views': [(False,'tree'),(resource_id,'form')],
|
||||
'type': 'ir.actions.act_window',
|
||||
}
|
||||
|
||||
|
||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
|
||||
@@ -60,6 +60,3 @@ class validate_account_move_lines(osv.osv_memory):
|
||||
raise osv.except_osv(_('Warning!'), _('Selected Entry Lines does not have any account move entries in draft state.'))
|
||||
obj_move.button_validate(cr, uid, move_ids, context)
|
||||
return {'type': 'ir.actions.act_window_close'}
|
||||
|
||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
|
||||
|
||||
@@ -62,5 +62,3 @@ class account_vat_declaration(osv.osv_memory):
|
||||
datas['form']['company_id'] = taxcode.company_id.id
|
||||
|
||||
return self.pool['report'].get_action(cr, uid, [], 'account.report_vat', data=datas, context=context)
|
||||
|
||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
|
||||
@@ -18,6 +18,3 @@
|
||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
#
|
||||
##############################################################################
|
||||
|
||||
|
||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
|
||||
@@ -44,4 +44,3 @@ It assigns manager and user access rights to the Administrator and only user rig
|
||||
'auto_install': False,
|
||||
'application': True,
|
||||
}
|
||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
|
||||
@@ -48,5 +48,3 @@ Adds menu to show relevant information to each manager.You can also view the rep
|
||||
'installable': True,
|
||||
'auto_install': False,
|
||||
}
|
||||
|
||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
|
||||
@@ -890,5 +890,3 @@ class account_analytic_account_summary_month(osv.osv):
|
||||
') ' \
|
||||
'GROUP BY d.month, d.account_id ' \
|
||||
')')
|
||||
|
||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
|
||||
@@ -61,4 +61,3 @@ class sale_configuration(osv.osv_memory):
|
||||
user.company_id.write({'project_time_mode_id': wizard.time_unit.id})
|
||||
res = super(sale_configuration, self).set_sale_defaults(cr, uid, ids, context)
|
||||
return res
|
||||
|
||||
|
||||
@@ -20,5 +20,3 @@
|
||||
##############################################################################
|
||||
|
||||
import account_analytic_default
|
||||
|
||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
|
||||
@@ -48,5 +48,3 @@ Allows to automatically select analytic accounts based on criterions:
|
||||
'installable': True,
|
||||
'auto_install': False,
|
||||
}
|
||||
|
||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
|
||||
@@ -152,5 +152,3 @@ class product_template(osv.Model):
|
||||
# Remove context so it is not going to filter on product_id with active_id of template
|
||||
result['context'] = "{}"
|
||||
return result
|
||||
|
||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
|
||||
@@ -21,6 +21,3 @@
|
||||
import account_analytic_plans
|
||||
import wizard
|
||||
import report
|
||||
|
||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
|
||||
|
||||
@@ -81,5 +81,3 @@ The analytic plan validates the minimum and maximum percentage at the time of cr
|
||||
'installable': True,
|
||||
'auto_install': False,
|
||||
}
|
||||
|
||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
|
||||
@@ -479,5 +479,3 @@ class account_bank_statement_line(osv.osv):
|
||||
_columns = {
|
||||
'analytics_id': fields.many2one('account.analytic.plan.instance', 'Analytic Distribution'),
|
||||
}
|
||||
|
||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
|
||||
@@ -20,6 +20,3 @@
|
||||
##############################################################################
|
||||
|
||||
import crossovered_analytic
|
||||
|
||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
|
||||
|
||||
@@ -180,5 +180,3 @@ class report_crossoveredanalyticplans(osv.AbstractModel):
|
||||
_inherit = 'report.abstract_report'
|
||||
_template = 'account_analytic_plans.report_crossoveredanalyticplans'
|
||||
_wrapped_report_class = crossovered_analytic
|
||||
|
||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
|
||||
@@ -21,6 +21,3 @@
|
||||
|
||||
import analytic_plan_create_model
|
||||
import account_crossovered_analytic
|
||||
|
||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
|
||||
|
||||
@@ -67,5 +67,3 @@ class account_crossovered_analytic(osv.osv_memory):
|
||||
'form': data
|
||||
}
|
||||
return self.pool['report'].get_action(cr, uid, [], 'account_analytic_plans.report_crossoveredanalyticplans', data=datas, context=context)
|
||||
|
||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
|
||||
@@ -54,6 +54,3 @@ class analytic_plan_create_model(osv.osv_memory):
|
||||
}
|
||||
else:
|
||||
return {'type': 'ir.actions.act_window_close'}
|
||||
|
||||
|
||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
|
||||
@@ -22,5 +22,3 @@ import product
|
||||
import stock
|
||||
import purchase
|
||||
import invoice
|
||||
|
||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
|
||||
@@ -48,5 +48,3 @@ account.""",
|
||||
'auto_install': False,
|
||||
'installable': True,
|
||||
}
|
||||
|
||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
|
||||
@@ -212,5 +212,3 @@ class account_invoice(osv.osv):
|
||||
fpos,
|
||||
counterpart_acct_id)
|
||||
return invoice_data
|
||||
|
||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
|
||||
@@ -65,7 +65,3 @@ class product_template(osv.osv):
|
||||
help="This account will be used to value outgoing stock using cost price."),
|
||||
|
||||
}
|
||||
|
||||
|
||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
|
||||
|
||||
@@ -36,5 +36,3 @@ class purchase_order(osv.osv):
|
||||
fpos = order_line.order_id.fiscal_position or False
|
||||
account_id = self.pool.get('account.fiscal.position').map_account(cr, uid, fpos, acc_id)
|
||||
return account_id
|
||||
|
||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
|
||||
@@ -65,7 +65,3 @@ class stock_picking(osv.osv):
|
||||
a = self.pool.get('account.fiscal.position').map_account(cr, uid, fpos, oa)
|
||||
self.pool.get('account.invoice.line').write(cr, uid, [ol.id], {'account_id': a})
|
||||
return res
|
||||
|
||||
|
||||
|
||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
|
||||
@@ -23,5 +23,3 @@ import account_asset
|
||||
import account_asset_invoice
|
||||
import wizard
|
||||
import report
|
||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
|
||||
|
||||
@@ -55,5 +55,3 @@ of the depreciation lines.
|
||||
'installable': True,
|
||||
'application': False,
|
||||
}
|
||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user