audrius/account-reconcile
1
0
Fork 1
mirror of https://github.com/OCA/account-reconcile.git synced 2025-01-20 12:27:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix Travis errors

Browse Source
This commit is contained in:
Pedro M. Baeza
2014-08-04 21:05:19 +02:00
parent b94bebee0e
commit b522f28ffb
23 changed files with 36 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
account_advanced_reconcile_transaction_ref/base_advanced_reconciliation.py
View File

@@ -19,11 +19,10 @@
#
##############################################################################
from itertools import product
from openerp.osv import orm
class easy_reconcile_advanced(orm.AbstractModel):
class EasyReconcileAdvanced(orm.AbstractModel):
_inherit = 'easy.reconcile.advanced'

3
account_easy_reconcile/easy_reconcile.py
View File

@@ -19,9 +19,8 @@
#
##############################################################################
from openerp.osv import fields, osv, orm
from openerp.osv import fields, orm
from openerp.tools.translate import _
from openerp.tools import DEFAULT_SERVER_DATETIME_FORMAT
class EasyReconcileOptions(orm.AbstractModel):

6
account_easy_reconcile/security/ir.model.access.csv
View File

@@ -2,14 +2,8 @@ id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
access_easy_reconcile_options_acc_user,easy.reconcile.options,model_easy_reconcile_options,account.group_account_user,1,0,0,0
access_account_easy_reconcile_method_acc_user,account.easy.reconcile.method,model_account_easy_reconcile_method,account.group_account_user,1,0,0,0
access_account_easy_reconcile_acc_user,account.easy.reconcile,model_account_easy_reconcile,account.group_account_user,1,1,0,0
access_easy_reconcile_simple_name_acc_user,easy.reconcile.simple.name,model_easy_reconcile_simple_name,account.group_account_user,1,0,0,0
access_easy_reconcile_simple_partner_acc_user,easy.reconcile.simple.partner,model_easy_reconcile_simple_partner,account.group_account_user,1,0,0,0
access_easy_reconcile_simple_reference_acc_user,easy.reconcile.simple.reference,model_easy_reconcile_simple_reference,account.group_account_user,1,0,0,0
access_easy_reconcile_options_acc_mgr,easy.reconcile.options,model_easy_reconcile_options,account.group_account_user,1,0,0,0
access_account_easy_reconcile_method_acc_mgr,account.easy.reconcile.method,model_account_easy_reconcile_method,account.group_account_user,1,1,1,1
access_account_easy_reconcile_acc_mgr,account.easy.reconcile,model_account_easy_reconcile,account.group_account_user,1,1,1,1
access_easy_reconcile_simple_name_acc_mgr,easy.reconcile.simple.name,model_easy_reconcile_simple_name,account.group_account_user,1,0,0,0
access_easy_reconcile_simple_partner_acc_mgr,easy.reconcile.simple.partner,model_easy_reconcile_simple_partner,account.group_account_user,1,0,0,0
access_easy_reconcile_simple_reference_acc_mgr,easy.reconcile.simple.reference,model_easy_reconcile_simple_reference,account.group_account_user,1,0,0,0
access_easy_reconcile_history_acc_user,easy.reconcile.history,model_easy_reconcile_history,account.group_account_user,1,1,1,0
access_easy_reconcile_history_acc_mgr,easy.reconcile.history,model_easy_reconcile_history,account.group_account_manager,1,1,1,1
1 id name model_id:id group_id:id perm_read perm_write perm_create perm_unlink
2 access_easy_reconcile_options_acc_user easy.reconcile.options model_easy_reconcile_options account.group_account_user 1 0 0 0
3 access_account_easy_reconcile_method_acc_user account.easy.reconcile.method model_account_easy_reconcile_method account.group_account_user 1 0 0 0
4 access_account_easy_reconcile_acc_user account.easy.reconcile model_account_easy_reconcile account.group_account_user 1 1 0 0
access_easy_reconcile_simple_name_acc_user easy.reconcile.simple.name model_easy_reconcile_simple_name account.group_account_user 1 0 0 0
access_easy_reconcile_simple_partner_acc_user easy.reconcile.simple.partner model_easy_reconcile_simple_partner account.group_account_user 1 0 0 0
access_easy_reconcile_simple_reference_acc_user easy.reconcile.simple.reference model_easy_reconcile_simple_reference account.group_account_user 1 0 0 0
5 access_easy_reconcile_options_acc_mgr easy.reconcile.options model_easy_reconcile_options account.group_account_user 1 0 0 0
6 access_account_easy_reconcile_method_acc_mgr account.easy.reconcile.method model_account_easy_reconcile_method account.group_account_user 1 1 1 1
7 access_account_easy_reconcile_acc_mgr account.easy.reconcile model_account_easy_reconcile account.group_account_user 1 1 1 1
access_easy_reconcile_simple_name_acc_mgr easy.reconcile.simple.name model_easy_reconcile_simple_name account.group_account_user 1 0 0 0
access_easy_reconcile_simple_partner_acc_mgr easy.reconcile.simple.partner model_easy_reconcile_simple_partner account.group_account_user 1 0 0 0
access_easy_reconcile_simple_reference_acc_mgr easy.reconcile.simple.reference model_easy_reconcile_simple_reference account.group_account_user 1 0 0 0
8 access_easy_reconcile_history_acc_user easy.reconcile.history model_easy_reconcile_history account.group_account_user 1 1 1 0
9 access_easy_reconcile_history_acc_mgr easy.reconcile.history model_easy_reconcile_history account.group_account_manager 1 1 1 1

16
account_invoice_reference/account_move.py
View File

@@ -19,10 +19,10 @@
#
##############################################################################
from openerp.osv import orm, fields
from openerp.osv import orm
class account_move(orm.Model):
class AccountMove(orm.Model):
_inherit = 'account.move'
def create(self, cr, uid, vals, context=None):
@@ -37,12 +37,12 @@ class account_move(orm.Model):
cr, uid, invoice, context=context)
vals = vals.copy()
vals['ref'] = ref
move_id = super(account_move, self).\
create(cr, uid, vals, context=context)
move_id = super(AccountMove, self).create(cr, uid, vals,
context=context)
return move_id
class account_invoice(orm.Model):
class AccountInvoice(orm.Model):
_inherit = 'account.invoice'
def _ref_from_invoice(self, cr, uid, invoice, context=None):
@@ -82,7 +82,7 @@ class account_invoice(orm.Model):
if (vals.get('supplier_invoice_reference') and not
vals.get('reference')):
vals['reference'] = vals['supplier_invoice_reference']
return super(account_invoice, self).create(cr, uid, vals,
return super(AccountInvoice, self).create(cr, uid, vals,
context=context)
def write(self, cr, uid, ids, vals, context=None):
@@ -93,9 +93,9 @@ class account_invoice(orm.Model):
if not invoice.reference:
locvals = vals.copy()
locvals['reference'] = vals['supplier_invoice_reference']
super(account_invoice, self).write(cr, uid, [invoice.id],
super(AccountInvoice, self).write(cr, uid, [invoice.id],
locvals, context=context)
return True
else:
return super(account_invoice, self).write(cr, uid, ids, vals,
return super(AccountInvoice, self).write(cr, uid, ids, vals,
context=context)

1
account_statement_base_completion/partner_view.xml
View File

@@ -7,7 +7,6 @@
<record id="bk_view_partner_form" model="ir.ui.view">
<field name="name">account_bank_statement_import.view.partner.form</field>
<field name="model">res.partner</field>
<field name="type">form</field>
<field name="priority">20</field>
<field name="inherit_id" ref="account.view_partner_property_form"/>
<field name="arch" type="xml">

5
account_statement_base_completion/statement_view.xml
View File

@@ -7,7 +7,6 @@
<field name="model">account.bank.statement</field>
<field name="inherit_id" ref="account.view_bank_statement_form" />
<field eval="16" name="priority"/>
<field name="type">form</field>
<field name="arch" type="xml">
<data>
<xpath expr="/form/sheet/notebook/page/field[@name='line_ids']/form/group/field[@name='sequence']" position="after">
@@ -37,7 +36,6 @@
<field name="name">account_bank_statement_import_base.bank_statement.auto_cmpl</field>
<field name="model">account.bank.statement</field>
<field name="inherit_id" ref="account.view_bank_statement_form" />
<field name="type">form</field>
<field name="arch" type="xml">
<data>
<xpath expr="/form/sheet/notebook/page/field[@name='line_ids']/tree/field[@name='amount']" position="after">
@@ -51,7 +49,6 @@
<field name="name">account.statement.profile.view</field>
<field name="model">account.statement.profile</field>
<field name="inherit_id" ref="account_statement_ext.statement_importer_view_form"/>
<field name="type">form</field>
<field name="arch" type="xml">
<field name="bank_statement_prefix" position="after">
<separator colspan="4" string="Auto-Completion Rules"/>
@@ -64,7 +61,6 @@
<record id="statement_st_completion_rule_view_form" model="ir.ui.view">
<field name="name">account.statement.completion.rule.view</field>
<field name="model">account.statement.completion.rule</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Statement Completion Rule">
<field name="sequence"/>
@@ -79,7 +75,6 @@
<record id="statement_st_completion_rule_view_tree" model="ir.ui.view">
<field name="name">account.statement.completion.rule.view</field>
<field name="model">account.statement.completion.rule</field>
<field name="type">tree</field>
<field name="arch" type="xml">
<tree string="Statement Completion Rule">
<field name="sequence"/>

7
account_statement_base_import/parser/generic_file_parser.py
View File

@@ -19,15 +19,8 @@
##############################################################################
from openerp.tools.translate import _
import base64
import csv
import tempfile
import datetime
from file_parser import FileParser
try:
import xlrd
except:
raise Exception(_('Please install python lib xlrd'))
class GenericFileParser(FileParser):

2
account_statement_base_import/statement_view.xml
View File

@@ -7,7 +7,6 @@
<field name="name">account.statement.profile.view</field>
<field name="model">account.statement.profile</field>
<field name="inherit_id" ref="account_statement_ext.statement_importer_view_form"/>
<field name="type">form</field>
<field name="arch" type="xml">
<field name="bank_statement_prefix" position="after">
<separator colspan="4" string="Import related infos"/>
@@ -31,7 +30,6 @@
<field name="name">account_bank_statement.bank_statement.view_form</field>
<field name="model">account.bank.statement</field>
<field name="inherit_id" ref="account_statement_base_completion.bank_statement_view_form" />
<field name="type">form</field>
<field eval="20" name="priority"/>
<field name="arch" type="xml">
<xpath expr="//field[@name='line_ids']/form//field[@name='account_id']" position="attributes">

1
account_statement_base_import/wizard/import_statement_view.xml
View File

@@ -4,7 +4,6 @@
<record id="statement_importer_view" model="ir.ui.view">
<field name="name">credit.statement.import.config.view</field>
<field name="model">credit.statement.import</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Import statement">
<group colspan="4" >

1
account_statement_commission/import_statement_view.xml
View File

@@ -4,7 +4,6 @@
<record id="statement_importer_view" model="ir.ui.view">
<field name="name">credit.statement.import.config.view</field>
<field name="model">credit.statement.import</field>
<field name="type">form</field>
<field name="inherit_id" ref="account_statement_base_import.statement_importer_view" />
<field name="arch" type="xml">
<xpath expr="/form/group/field[@name='journal_id']" position="after">

1
account_statement_commission/statement_view.xml
View File

@@ -6,7 +6,6 @@
<field name="name">account_bank_statement.bank_statement.view_form</field>
<field name="model">account.bank.statement</field>
<field name="inherit_id" ref="account_statement_base_completion.bank_statement_view_form" />
<field name="type">form</field>
<field eval="20" name="priority"/>
<field name="arch" type="xml">
<data>

1
account_statement_completion_label/partner_view.xml
View File

@@ -11,7 +11,6 @@
<record id="bk_view_partner_form" model="ir.ui.view">
<field name="name">account_bank_statement_import.view.partner.form</field>
<field name="model">res.partner</field>
<field name="type">form</field>
<field name="priority">20</field>
<field name="inherit_id" ref="account_statement_base_completion.bk_view_partner_form"/>
<field name="arch" type="xml">

12
account_statement_ext/account.py
View File

@@ -19,23 +19,21 @@
#
##############################################################################
from openerp.osv.orm import Model
from openerp.osv import fields
from openerp.osv import orm
class account_move(Model):
class AccountMove(orm.Model):
_inherit = 'account.move'
def unlink(self, cr, uid, ids, context=None):
"""
Delete the reconciliation when we delete the moves. This
"""Delete the reconciliation when we delete the moves. This
allow an easier way of cancelling the bank statement.
"""
reconcile_to_delete = []
reconcile_obj = self.pool.get('account.move.reconcile')
reconcile_obj = self.pool['account.move.reconcile']
for move in self.browse(cr, uid, ids, context=context):
for move_line in move.line_id:
if move_line.reconcile_id:
reconcile_to_delete.append(move_line.reconcile_id.id)
reconcile_obj.unlink(cr, uid, reconcile_to_delete, context=context)
return super(account_move, self).unlink(cr, uid, ids, context=context)
return super(AccountMove, self).unlink(cr, uid, ids, context=context)

4
account_statement_ext/statement_view.xml
View File

@@ -5,7 +5,6 @@
<record id="statement_importer_view_form" model="ir.ui.view">
<field name="name">account.statement.profile.view</field>
<field name="model">account.statement.profile</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Import statement">
<separator string="" colspan="4"/>
@@ -27,7 +26,6 @@
<record id="statement_importer_view_tree" model="ir.ui.view">
<field name="name">account.statement.profile.view</field>
<field name="model">account.statement.profile</field>
<field name="type">tree</field>
<field name="arch" type="xml">
<tree string="Import statement">
<field name="name" />
@@ -76,7 +74,6 @@
<field name="name">account.bank.statement.tree</field>
<field name="model">account.bank.statement</field>
<field name="inherit_id" ref="account.view_bank_statement_tree"/>
<field name="type">tree</field>
<field name="arch" type="xml">
<xpath expr="/tree/field[@name='name']" position="before">
<field name="id"/>
@@ -95,7 +92,6 @@
<field name="name">account.bank.statement.form</field>
<field name="model">account.bank.statement</field>
<field name="inherit_id" ref="account.view_bank_statement_form"/>
<field name="type">form</field>
<field name="arch" type="xml" >
<!-- Add before the group : profile and related infos -->

1
account_statement_no_invoice_import/statement_view.xml
View File

@@ -10,7 +10,6 @@
<field name="model">account.bank.statement</field>
<field name="inherit_id" ref="account_voucher.view_bank_statement_form_invoice" />
<field eval="100" name="priority"/>
<field name="type">form</field>
<field name="arch" type="xml">
<button string="Import Invoices" position="replace">
</button>

6
account_statement_ofx_import/statement.py
View File

@@ -19,16 +19,14 @@
#
##############################################################################
from openerp.tools.translate import _
from openerp.osv import fields, orm
from openerp.osv import orm
class AccountStatementProfil(orm.Model):
_inherit = "account.statement.profile"
def _get_import_type_selection(self, cr, uid, context=None):
"""
Inherited from parent to add parser.
"""
"""Inherited from parent to add parser."""
selection = super(AccountStatementProfil, self
)._get_import_type_selection(cr, uid,
context=context)

1
account_statement_regex_account_completion/statement_view.xml
View File

@@ -6,7 +6,6 @@
<field name="name">account.statement.completion.rule.view (account_statement_regex_account_completion)</field>
<field name="model">account.statement.completion.rule</field>
<field name="inherit_id" ref="account_statement_base_completion.statement_st_completion_rule_view_form" />
<field name="type">form</field>
<field name="arch" type="xml">
<field name="function_to_call" position="after">
<group colspan="2">

2
account_statement_so_completion/statement.py
View File

@@ -22,7 +22,7 @@
# #
###############################################################################
from openerp.osv import fields, orm
from openerp.osv import orm
from tools.translate import _
from openerp.addons.account_statement_base_completion.statement import \
ErrorTooManyPartner

9
account_statement_transactionid_import/statement.py
View File

@@ -19,17 +19,14 @@
#
##############################################################################
from openerp.osv.orm import Model
from openerp.osv import fields
from openerp.osv import orm
class AccountStatementProfil(Model):
class AccountStatementProfil(orm.Model):
_inherit = "account.statement.profile"
def _get_import_type_selection(self, cr, uid, context=None):
"""
Has to be inherited to add parser
"""
"""Has to be inherited to add parser"""
res = super(AccountStatementProfil, self)._get_import_type_selection(
cr, uid, context=context)
res.append(('generic_csvxls_transaction',

2
base_transaction_id/invoice_view.xml
View File

@@ -5,7 +5,6 @@
<field name="name">customer.invoice.transaction.inherit</field>
<field name="model">account.invoice</field>
<field name="inherit_id" ref="account.invoice_form"/>
<field name="type">form</field>
<field name="arch" type="xml">
<notebook position="inside">
<page string="Transactions datas">
@@ -19,7 +18,6 @@
<field name="name">account.invoice.tree.inherit</field>
<field name="model">account.invoice</field>
<field name="inherit_id" ref="account.invoice_tree"/>
<field name="type">form</field>
<field name="arch" type="xml">
<field name="origin" position="after">
<field name="transaction_id" select="2"/>

1
base_transaction_id/sale_view.xml
View File

@@ -3,7 +3,6 @@
<record id="view_order_form_transaction" model="ir.ui.view">
<field name="name">sale.order.form.transaction</field>
<field name="model">sale.order</field>
<field name="type">form</field>
<field name="inherit_id" ref="sale.view_order_form"/>
<field name="arch" type="xml">
<field name="payment_term" position="after">

2
invoicing_voucher_killer/invoice_view.xml
View File

@@ -4,7 +4,6 @@
<field name="name">Hide voucher in invoice</field>
<field name="model">account.invoice</field>
<field name="inherit_id" ref="account_voucher.view_invoice_customer" />
<field name="type">form</field>
<field name="arch" type="xml">
<xpath expr="//button[@name='invoice_pay_customer'][last()]"
position="replace">
@@ -30,7 +29,6 @@
<field name="name">Hide voucher in supplier invoice</field>
<field name="model">account.invoice</field>
<field name="inherit_id" ref="account_voucher.view_invoice_supplier" />
<field name="type">form</field>
<field name="arch" type="xml">
<xpath expr="//button[@name='invoice_pay_customer'][last()]"
position="replace">

1
statement_voucher_killer/statement_view.xml
View File

@@ -9,7 +9,6 @@
<field name="model">account.bank.statement</field>
<field name="inherit_id" ref="account.view_bank_statement_form" />
<field eval="100" name="priority"/>
<field name="type">form</field>
<field name="arch" type="xml">
<field name="voucher_id" position="replace">
</field>