mirror of
https://github.com/OCA/account-reconcile.git
synced 2025-01-20 12:27:39 +02:00
Fix Travis errors
This commit is contained in:
@@ -19,11 +19,10 @@
|
|||||||
#
|
#
|
||||||
##############################################################################
|
##############################################################################
|
||||||
|
|
||||||
from itertools import product
|
|
||||||
from openerp.osv import orm
|
from openerp.osv import orm
|
||||||
|
|
||||||
|
|
||||||
class easy_reconcile_advanced(orm.AbstractModel):
|
class EasyReconcileAdvanced(orm.AbstractModel):
|
||||||
|
|
||||||
_inherit = 'easy.reconcile.advanced'
|
_inherit = 'easy.reconcile.advanced'
|
||||||
|
|
||||||
|
|||||||
@@ -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.translate import _
|
||||||
from openerp.tools import DEFAULT_SERVER_DATETIME_FORMAT
|
|
||||||
|
|
||||||
|
|
||||||
class EasyReconcileOptions(orm.AbstractModel):
|
class EasyReconcileOptions(orm.AbstractModel):
|
||||||
|
|||||||
@@ -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_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_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_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_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_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_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_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
|
access_easy_reconcile_history_acc_mgr,easy.reconcile.history,model_easy_reconcile_history,account.group_account_manager,1,1,1,1
|
||||||
|
|||||||
|
@@ -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'
|
_inherit = 'account.move'
|
||||||
|
|
||||||
def create(self, cr, uid, vals, context=None):
|
def create(self, cr, uid, vals, context=None):
|
||||||
@@ -37,12 +37,12 @@ class account_move(orm.Model):
|
|||||||
cr, uid, invoice, context=context)
|
cr, uid, invoice, context=context)
|
||||||
vals = vals.copy()
|
vals = vals.copy()
|
||||||
vals['ref'] = ref
|
vals['ref'] = ref
|
||||||
move_id = super(account_move, self).\
|
move_id = super(AccountMove, self).create(cr, uid, vals,
|
||||||
create(cr, uid, vals, context=context)
|
context=context)
|
||||||
return move_id
|
return move_id
|
||||||
|
|
||||||
|
|
||||||
class account_invoice(orm.Model):
|
class AccountInvoice(orm.Model):
|
||||||
_inherit = 'account.invoice'
|
_inherit = 'account.invoice'
|
||||||
|
|
||||||
def _ref_from_invoice(self, cr, uid, invoice, context=None):
|
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
|
if (vals.get('supplier_invoice_reference') and not
|
||||||
vals.get('reference')):
|
vals.get('reference')):
|
||||||
vals['reference'] = vals['supplier_invoice_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)
|
context=context)
|
||||||
|
|
||||||
def write(self, cr, uid, ids, vals, context=None):
|
def write(self, cr, uid, ids, vals, context=None):
|
||||||
@@ -93,9 +93,9 @@ class account_invoice(orm.Model):
|
|||||||
if not invoice.reference:
|
if not invoice.reference:
|
||||||
locvals = vals.copy()
|
locvals = vals.copy()
|
||||||
locvals['reference'] = vals['supplier_invoice_reference']
|
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)
|
locvals, context=context)
|
||||||
return True
|
return True
|
||||||
else:
|
else:
|
||||||
return super(account_invoice, self).write(cr, uid, ids, vals,
|
return super(AccountInvoice, self).write(cr, uid, ids, vals,
|
||||||
context=context)
|
context=context)
|
||||||
|
|||||||
@@ -7,7 +7,6 @@
|
|||||||
<record id="bk_view_partner_form" model="ir.ui.view">
|
<record id="bk_view_partner_form" model="ir.ui.view">
|
||||||
<field name="name">account_bank_statement_import.view.partner.form</field>
|
<field name="name">account_bank_statement_import.view.partner.form</field>
|
||||||
<field name="model">res.partner</field>
|
<field name="model">res.partner</field>
|
||||||
<field name="type">form</field>
|
|
||||||
<field name="priority">20</field>
|
<field name="priority">20</field>
|
||||||
<field name="inherit_id" ref="account.view_partner_property_form"/>
|
<field name="inherit_id" ref="account.view_partner_property_form"/>
|
||||||
<field name="arch" type="xml">
|
<field name="arch" type="xml">
|
||||||
|
|||||||
@@ -7,7 +7,6 @@
|
|||||||
<field name="model">account.bank.statement</field>
|
<field name="model">account.bank.statement</field>
|
||||||
<field name="inherit_id" ref="account.view_bank_statement_form" />
|
<field name="inherit_id" ref="account.view_bank_statement_form" />
|
||||||
<field eval="16" name="priority"/>
|
<field eval="16" name="priority"/>
|
||||||
<field name="type">form</field>
|
|
||||||
<field name="arch" type="xml">
|
<field name="arch" type="xml">
|
||||||
<data>
|
<data>
|
||||||
<xpath expr="/form/sheet/notebook/page/field[@name='line_ids']/form/group/field[@name='sequence']" position="after">
|
<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="name">account_bank_statement_import_base.bank_statement.auto_cmpl</field>
|
||||||
<field name="model">account.bank.statement</field>
|
<field name="model">account.bank.statement</field>
|
||||||
<field name="inherit_id" ref="account.view_bank_statement_form" />
|
<field name="inherit_id" ref="account.view_bank_statement_form" />
|
||||||
<field name="type">form</field>
|
|
||||||
<field name="arch" type="xml">
|
<field name="arch" type="xml">
|
||||||
<data>
|
<data>
|
||||||
<xpath expr="/form/sheet/notebook/page/field[@name='line_ids']/tree/field[@name='amount']" position="after">
|
<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="name">account.statement.profile.view</field>
|
||||||
<field name="model">account.statement.profile</field>
|
<field name="model">account.statement.profile</field>
|
||||||
<field name="inherit_id" ref="account_statement_ext.statement_importer_view_form"/>
|
<field name="inherit_id" ref="account_statement_ext.statement_importer_view_form"/>
|
||||||
<field name="type">form</field>
|
|
||||||
<field name="arch" type="xml">
|
<field name="arch" type="xml">
|
||||||
<field name="bank_statement_prefix" position="after">
|
<field name="bank_statement_prefix" position="after">
|
||||||
<separator colspan="4" string="Auto-Completion Rules"/>
|
<separator colspan="4" string="Auto-Completion Rules"/>
|
||||||
@@ -64,7 +61,6 @@
|
|||||||
<record id="statement_st_completion_rule_view_form" model="ir.ui.view">
|
<record id="statement_st_completion_rule_view_form" model="ir.ui.view">
|
||||||
<field name="name">account.statement.completion.rule.view</field>
|
<field name="name">account.statement.completion.rule.view</field>
|
||||||
<field name="model">account.statement.completion.rule</field>
|
<field name="model">account.statement.completion.rule</field>
|
||||||
<field name="type">form</field>
|
|
||||||
<field name="arch" type="xml">
|
<field name="arch" type="xml">
|
||||||
<form string="Statement Completion Rule">
|
<form string="Statement Completion Rule">
|
||||||
<field name="sequence"/>
|
<field name="sequence"/>
|
||||||
@@ -79,7 +75,6 @@
|
|||||||
<record id="statement_st_completion_rule_view_tree" model="ir.ui.view">
|
<record id="statement_st_completion_rule_view_tree" model="ir.ui.view">
|
||||||
<field name="name">account.statement.completion.rule.view</field>
|
<field name="name">account.statement.completion.rule.view</field>
|
||||||
<field name="model">account.statement.completion.rule</field>
|
<field name="model">account.statement.completion.rule</field>
|
||||||
<field name="type">tree</field>
|
|
||||||
<field name="arch" type="xml">
|
<field name="arch" type="xml">
|
||||||
<tree string="Statement Completion Rule">
|
<tree string="Statement Completion Rule">
|
||||||
<field name="sequence"/>
|
<field name="sequence"/>
|
||||||
|
|||||||
@@ -19,15 +19,8 @@
|
|||||||
##############################################################################
|
##############################################################################
|
||||||
|
|
||||||
from openerp.tools.translate import _
|
from openerp.tools.translate import _
|
||||||
import base64
|
|
||||||
import csv
|
|
||||||
import tempfile
|
|
||||||
import datetime
|
import datetime
|
||||||
from file_parser import FileParser
|
from file_parser import FileParser
|
||||||
try:
|
|
||||||
import xlrd
|
|
||||||
except:
|
|
||||||
raise Exception(_('Please install python lib xlrd'))
|
|
||||||
|
|
||||||
|
|
||||||
class GenericFileParser(FileParser):
|
class GenericFileParser(FileParser):
|
||||||
|
|||||||
@@ -7,7 +7,6 @@
|
|||||||
<field name="name">account.statement.profile.view</field>
|
<field name="name">account.statement.profile.view</field>
|
||||||
<field name="model">account.statement.profile</field>
|
<field name="model">account.statement.profile</field>
|
||||||
<field name="inherit_id" ref="account_statement_ext.statement_importer_view_form"/>
|
<field name="inherit_id" ref="account_statement_ext.statement_importer_view_form"/>
|
||||||
<field name="type">form</field>
|
|
||||||
<field name="arch" type="xml">
|
<field name="arch" type="xml">
|
||||||
<field name="bank_statement_prefix" position="after">
|
<field name="bank_statement_prefix" position="after">
|
||||||
<separator colspan="4" string="Import related infos"/>
|
<separator colspan="4" string="Import related infos"/>
|
||||||
@@ -31,7 +30,6 @@
|
|||||||
<field name="name">account_bank_statement.bank_statement.view_form</field>
|
<field name="name">account_bank_statement.bank_statement.view_form</field>
|
||||||
<field name="model">account.bank.statement</field>
|
<field name="model">account.bank.statement</field>
|
||||||
<field name="inherit_id" ref="account_statement_base_completion.bank_statement_view_form" />
|
<field name="inherit_id" ref="account_statement_base_completion.bank_statement_view_form" />
|
||||||
<field name="type">form</field>
|
|
||||||
<field eval="20" name="priority"/>
|
<field eval="20" name="priority"/>
|
||||||
<field name="arch" type="xml">
|
<field name="arch" type="xml">
|
||||||
<xpath expr="//field[@name='line_ids']/form//field[@name='account_id']" position="attributes">
|
<xpath expr="//field[@name='line_ids']/form//field[@name='account_id']" position="attributes">
|
||||||
|
|||||||
@@ -4,7 +4,6 @@
|
|||||||
<record id="statement_importer_view" model="ir.ui.view">
|
<record id="statement_importer_view" model="ir.ui.view">
|
||||||
<field name="name">credit.statement.import.config.view</field>
|
<field name="name">credit.statement.import.config.view</field>
|
||||||
<field name="model">credit.statement.import</field>
|
<field name="model">credit.statement.import</field>
|
||||||
<field name="type">form</field>
|
|
||||||
<field name="arch" type="xml">
|
<field name="arch" type="xml">
|
||||||
<form string="Import statement">
|
<form string="Import statement">
|
||||||
<group colspan="4" >
|
<group colspan="4" >
|
||||||
|
|||||||
@@ -4,7 +4,6 @@
|
|||||||
<record id="statement_importer_view" model="ir.ui.view">
|
<record id="statement_importer_view" model="ir.ui.view">
|
||||||
<field name="name">credit.statement.import.config.view</field>
|
<field name="name">credit.statement.import.config.view</field>
|
||||||
<field name="model">credit.statement.import</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="inherit_id" ref="account_statement_base_import.statement_importer_view" />
|
||||||
<field name="arch" type="xml">
|
<field name="arch" type="xml">
|
||||||
<xpath expr="/form/group/field[@name='journal_id']" position="after">
|
<xpath expr="/form/group/field[@name='journal_id']" position="after">
|
||||||
|
|||||||
@@ -6,7 +6,6 @@
|
|||||||
<field name="name">account_bank_statement.bank_statement.view_form</field>
|
<field name="name">account_bank_statement.bank_statement.view_form</field>
|
||||||
<field name="model">account.bank.statement</field>
|
<field name="model">account.bank.statement</field>
|
||||||
<field name="inherit_id" ref="account_statement_base_completion.bank_statement_view_form" />
|
<field name="inherit_id" ref="account_statement_base_completion.bank_statement_view_form" />
|
||||||
<field name="type">form</field>
|
|
||||||
<field eval="20" name="priority"/>
|
<field eval="20" name="priority"/>
|
||||||
<field name="arch" type="xml">
|
<field name="arch" type="xml">
|
||||||
<data>
|
<data>
|
||||||
|
|||||||
@@ -11,7 +11,6 @@
|
|||||||
<record id="bk_view_partner_form" model="ir.ui.view">
|
<record id="bk_view_partner_form" model="ir.ui.view">
|
||||||
<field name="name">account_bank_statement_import.view.partner.form</field>
|
<field name="name">account_bank_statement_import.view.partner.form</field>
|
||||||
<field name="model">res.partner</field>
|
<field name="model">res.partner</field>
|
||||||
<field name="type">form</field>
|
|
||||||
<field name="priority">20</field>
|
<field name="priority">20</field>
|
||||||
<field name="inherit_id" ref="account_statement_base_completion.bk_view_partner_form"/>
|
<field name="inherit_id" ref="account_statement_base_completion.bk_view_partner_form"/>
|
||||||
<field name="arch" type="xml">
|
<field name="arch" type="xml">
|
||||||
|
|||||||
@@ -19,23 +19,21 @@
|
|||||||
#
|
#
|
||||||
##############################################################################
|
##############################################################################
|
||||||
|
|
||||||
from openerp.osv.orm import Model
|
from openerp.osv import orm
|
||||||
from openerp.osv import fields
|
|
||||||
|
|
||||||
|
|
||||||
class account_move(Model):
|
class AccountMove(orm.Model):
|
||||||
_inherit = 'account.move'
|
_inherit = 'account.move'
|
||||||
|
|
||||||
def unlink(self, cr, uid, ids, context=None):
|
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.
|
allow an easier way of cancelling the bank statement.
|
||||||
"""
|
"""
|
||||||
reconcile_to_delete = []
|
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 in self.browse(cr, uid, ids, context=context):
|
||||||
for move_line in move.line_id:
|
for move_line in move.line_id:
|
||||||
if move_line.reconcile_id:
|
if move_line.reconcile_id:
|
||||||
reconcile_to_delete.append(move_line.reconcile_id.id)
|
reconcile_to_delete.append(move_line.reconcile_id.id)
|
||||||
reconcile_obj.unlink(cr, uid, reconcile_to_delete, context=context)
|
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)
|
||||||
|
|||||||
@@ -5,7 +5,6 @@
|
|||||||
<record id="statement_importer_view_form" model="ir.ui.view">
|
<record id="statement_importer_view_form" model="ir.ui.view">
|
||||||
<field name="name">account.statement.profile.view</field>
|
<field name="name">account.statement.profile.view</field>
|
||||||
<field name="model">account.statement.profile</field>
|
<field name="model">account.statement.profile</field>
|
||||||
<field name="type">form</field>
|
|
||||||
<field name="arch" type="xml">
|
<field name="arch" type="xml">
|
||||||
<form string="Import statement">
|
<form string="Import statement">
|
||||||
<separator string="" colspan="4"/>
|
<separator string="" colspan="4"/>
|
||||||
@@ -27,7 +26,6 @@
|
|||||||
<record id="statement_importer_view_tree" model="ir.ui.view">
|
<record id="statement_importer_view_tree" model="ir.ui.view">
|
||||||
<field name="name">account.statement.profile.view</field>
|
<field name="name">account.statement.profile.view</field>
|
||||||
<field name="model">account.statement.profile</field>
|
<field name="model">account.statement.profile</field>
|
||||||
<field name="type">tree</field>
|
|
||||||
<field name="arch" type="xml">
|
<field name="arch" type="xml">
|
||||||
<tree string="Import statement">
|
<tree string="Import statement">
|
||||||
<field name="name" />
|
<field name="name" />
|
||||||
@@ -76,7 +74,6 @@
|
|||||||
<field name="name">account.bank.statement.tree</field>
|
<field name="name">account.bank.statement.tree</field>
|
||||||
<field name="model">account.bank.statement</field>
|
<field name="model">account.bank.statement</field>
|
||||||
<field name="inherit_id" ref="account.view_bank_statement_tree"/>
|
<field name="inherit_id" ref="account.view_bank_statement_tree"/>
|
||||||
<field name="type">tree</field>
|
|
||||||
<field name="arch" type="xml">
|
<field name="arch" type="xml">
|
||||||
<xpath expr="/tree/field[@name='name']" position="before">
|
<xpath expr="/tree/field[@name='name']" position="before">
|
||||||
<field name="id"/>
|
<field name="id"/>
|
||||||
@@ -95,7 +92,6 @@
|
|||||||
<field name="name">account.bank.statement.form</field>
|
<field name="name">account.bank.statement.form</field>
|
||||||
<field name="model">account.bank.statement</field>
|
<field name="model">account.bank.statement</field>
|
||||||
<field name="inherit_id" ref="account.view_bank_statement_form"/>
|
<field name="inherit_id" ref="account.view_bank_statement_form"/>
|
||||||
<field name="type">form</field>
|
|
||||||
<field name="arch" type="xml" >
|
<field name="arch" type="xml" >
|
||||||
|
|
||||||
<!-- Add before the group : profile and related infos -->
|
<!-- Add before the group : profile and related infos -->
|
||||||
|
|||||||
@@ -10,7 +10,6 @@
|
|||||||
<field name="model">account.bank.statement</field>
|
<field name="model">account.bank.statement</field>
|
||||||
<field name="inherit_id" ref="account_voucher.view_bank_statement_form_invoice" />
|
<field name="inherit_id" ref="account_voucher.view_bank_statement_form_invoice" />
|
||||||
<field eval="100" name="priority"/>
|
<field eval="100" name="priority"/>
|
||||||
<field name="type">form</field>
|
|
||||||
<field name="arch" type="xml">
|
<field name="arch" type="xml">
|
||||||
<button string="Import Invoices" position="replace">
|
<button string="Import Invoices" position="replace">
|
||||||
</button>
|
</button>
|
||||||
|
|||||||
@@ -19,16 +19,14 @@
|
|||||||
#
|
#
|
||||||
##############################################################################
|
##############################################################################
|
||||||
from openerp.tools.translate import _
|
from openerp.tools.translate import _
|
||||||
from openerp.osv import fields, orm
|
from openerp.osv import orm
|
||||||
|
|
||||||
|
|
||||||
class AccountStatementProfil(orm.Model):
|
class AccountStatementProfil(orm.Model):
|
||||||
_inherit = "account.statement.profile"
|
_inherit = "account.statement.profile"
|
||||||
|
|
||||||
def _get_import_type_selection(self, cr, uid, context=None):
|
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
|
selection = super(AccountStatementProfil, self
|
||||||
)._get_import_type_selection(cr, uid,
|
)._get_import_type_selection(cr, uid,
|
||||||
context=context)
|
context=context)
|
||||||
|
|||||||
@@ -6,7 +6,6 @@
|
|||||||
<field name="name">account.statement.completion.rule.view (account_statement_regex_account_completion)</field>
|
<field name="name">account.statement.completion.rule.view (account_statement_regex_account_completion)</field>
|
||||||
<field name="model">account.statement.completion.rule</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="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="arch" type="xml">
|
||||||
<field name="function_to_call" position="after">
|
<field name="function_to_call" position="after">
|
||||||
<group colspan="2">
|
<group colspan="2">
|
||||||
|
|||||||
@@ -22,7 +22,7 @@
|
|||||||
# #
|
# #
|
||||||
###############################################################################
|
###############################################################################
|
||||||
|
|
||||||
from openerp.osv import fields, orm
|
from openerp.osv import orm
|
||||||
from tools.translate import _
|
from tools.translate import _
|
||||||
from openerp.addons.account_statement_base_completion.statement import \
|
from openerp.addons.account_statement_base_completion.statement import \
|
||||||
ErrorTooManyPartner
|
ErrorTooManyPartner
|
||||||
|
|||||||
@@ -19,17 +19,14 @@
|
|||||||
#
|
#
|
||||||
##############################################################################
|
##############################################################################
|
||||||
|
|
||||||
from openerp.osv.orm import Model
|
from openerp.osv import orm
|
||||||
from openerp.osv import fields
|
|
||||||
|
|
||||||
|
|
||||||
class AccountStatementProfil(Model):
|
class AccountStatementProfil(orm.Model):
|
||||||
_inherit = "account.statement.profile"
|
_inherit = "account.statement.profile"
|
||||||
|
|
||||||
def _get_import_type_selection(self, cr, uid, context=None):
|
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(
|
res = super(AccountStatementProfil, self)._get_import_type_selection(
|
||||||
cr, uid, context=context)
|
cr, uid, context=context)
|
||||||
res.append(('generic_csvxls_transaction',
|
res.append(('generic_csvxls_transaction',
|
||||||
|
|||||||
@@ -5,7 +5,6 @@
|
|||||||
<field name="name">customer.invoice.transaction.inherit</field>
|
<field name="name">customer.invoice.transaction.inherit</field>
|
||||||
<field name="model">account.invoice</field>
|
<field name="model">account.invoice</field>
|
||||||
<field name="inherit_id" ref="account.invoice_form"/>
|
<field name="inherit_id" ref="account.invoice_form"/>
|
||||||
<field name="type">form</field>
|
|
||||||
<field name="arch" type="xml">
|
<field name="arch" type="xml">
|
||||||
<notebook position="inside">
|
<notebook position="inside">
|
||||||
<page string="Transactions datas">
|
<page string="Transactions datas">
|
||||||
@@ -19,7 +18,6 @@
|
|||||||
<field name="name">account.invoice.tree.inherit</field>
|
<field name="name">account.invoice.tree.inherit</field>
|
||||||
<field name="model">account.invoice</field>
|
<field name="model">account.invoice</field>
|
||||||
<field name="inherit_id" ref="account.invoice_tree"/>
|
<field name="inherit_id" ref="account.invoice_tree"/>
|
||||||
<field name="type">form</field>
|
|
||||||
<field name="arch" type="xml">
|
<field name="arch" type="xml">
|
||||||
<field name="origin" position="after">
|
<field name="origin" position="after">
|
||||||
<field name="transaction_id" select="2"/>
|
<field name="transaction_id" select="2"/>
|
||||||
|
|||||||
@@ -3,7 +3,6 @@
|
|||||||
<record id="view_order_form_transaction" model="ir.ui.view">
|
<record id="view_order_form_transaction" model="ir.ui.view">
|
||||||
<field name="name">sale.order.form.transaction</field>
|
<field name="name">sale.order.form.transaction</field>
|
||||||
<field name="model">sale.order</field>
|
<field name="model">sale.order</field>
|
||||||
<field name="type">form</field>
|
|
||||||
<field name="inherit_id" ref="sale.view_order_form"/>
|
<field name="inherit_id" ref="sale.view_order_form"/>
|
||||||
<field name="arch" type="xml">
|
<field name="arch" type="xml">
|
||||||
<field name="payment_term" position="after">
|
<field name="payment_term" position="after">
|
||||||
|
|||||||
@@ -4,7 +4,6 @@
|
|||||||
<field name="name">Hide voucher in invoice</field>
|
<field name="name">Hide voucher in invoice</field>
|
||||||
<field name="model">account.invoice</field>
|
<field name="model">account.invoice</field>
|
||||||
<field name="inherit_id" ref="account_voucher.view_invoice_customer" />
|
<field name="inherit_id" ref="account_voucher.view_invoice_customer" />
|
||||||
<field name="type">form</field>
|
|
||||||
<field name="arch" type="xml">
|
<field name="arch" type="xml">
|
||||||
<xpath expr="//button[@name='invoice_pay_customer'][last()]"
|
<xpath expr="//button[@name='invoice_pay_customer'][last()]"
|
||||||
position="replace">
|
position="replace">
|
||||||
@@ -30,7 +29,6 @@
|
|||||||
<field name="name">Hide voucher in supplier invoice</field>
|
<field name="name">Hide voucher in supplier invoice</field>
|
||||||
<field name="model">account.invoice</field>
|
<field name="model">account.invoice</field>
|
||||||
<field name="inherit_id" ref="account_voucher.view_invoice_supplier" />
|
<field name="inherit_id" ref="account_voucher.view_invoice_supplier" />
|
||||||
<field name="type">form</field>
|
|
||||||
<field name="arch" type="xml">
|
<field name="arch" type="xml">
|
||||||
<xpath expr="//button[@name='invoice_pay_customer'][last()]"
|
<xpath expr="//button[@name='invoice_pay_customer'][last()]"
|
||||||
position="replace">
|
position="replace">
|
||||||
|
|||||||
@@ -9,7 +9,6 @@
|
|||||||
<field name="model">account.bank.statement</field>
|
<field name="model">account.bank.statement</field>
|
||||||
<field name="inherit_id" ref="account.view_bank_statement_form" />
|
<field name="inherit_id" ref="account.view_bank_statement_form" />
|
||||||
<field eval="100" name="priority"/>
|
<field eval="100" name="priority"/>
|
||||||
<field name="type">form</field>
|
|
||||||
<field name="arch" type="xml">
|
<field name="arch" type="xml">
|
||||||
<field name="voucher_id" position="replace">
|
<field name="voucher_id" position="replace">
|
||||||
</field>
|
</field>
|
||||||
|
|||||||
Reference in New Issue
Block a user