Merge pull request #284 from hbrunn/7.0-travis-2016-07-16

[FIX] travis
This commit is contained in:
Pedro M. Baeza
2016-08-29 14:56:00 +02:00
committed by GitHub
15 changed files with 108 additions and 121 deletions

View File

@@ -25,7 +25,7 @@
##############################################################################
{
'name': 'Account Banking',
'version': '0.5',
'version': '7.0.0.0.5',
'license': 'AGPL-3',
'author': "Banking addons community,Odoo Community Association (OCA)",
'website': 'https://launchpad.net/banking-addons',

View File

@@ -1,32 +1,22 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data noupdate="1">
<record model="res.partner" id="partner_demo1">
<field name="name">Tiny S.p.r.l</field>
</record>
<record model="res.partner.bank" id="partner_bank1">
<field name="acc_number">301915554082</field>
<field name="state">bank</field>
<field name="partner_id" ref="partner_demo1"></field>
</record>
<data noupdate="1">
<record model="res.partner" id="partner_demo1">
<field name="name">Tiny S.p.r.l</field>
</record>
<record model="res.partner.bank" id="partner_bank1">
<field name="acc_number">301915554082</field>
<field name="state">bank</field>
<field name="partner_id" ref="partner_demo1"></field>
</record>
<record model="res.partner" id="partner_demo2">
<field name="name">The-design Company</field>
</record>
<record model="res.partner.bank" id="partner_bank2">
<field name="acc_number">050000000017</field>
<field name="state">iban</field>
<field name="partner_id" ref="partner_demo2"></field>
</record>
<!-- <record model="res.partner.bank" id="partner_agrolait">
<field name="acc_number">301915554082</field>
<field name="partner_id" ref="base.res_partner_agrolait"/>
</record>
<record model="res.partner.bank" id="res_partner_10">
<field name="acc_number">050000000017</field>
<field name="partner_id" ref="base.res_partner_10"/>
</record>-->
</data>
<record model="res.partner" id="partner_demo2">
<field name="name">The-design Company</field>
</record>
<record model="res.partner.bank" id="partner_bank2">
<field name="acc_number">050000000017</field>
<field name="state">iban</field>
<field name="partner_id" ref="partner_demo2"></field>
</record>
</data>
</openerp>

View File

@@ -1,3 +1,4 @@
# coding: utf-8
##############################################################################
#
# Copyright (C) 2009 EduSense BV (<http://www.edusense.nl>).

View File

@@ -20,5 +20,3 @@
##############################################################################
from . import models
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

View File

@@ -65,5 +65,3 @@ def to_swift(astr, schemes=('utf-8', 'latin-1', 'ascii')):
for x in unicodedata.normalize('NFKD', astr).encode('ascii', 'ignore')
]
return ''.join(s)
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

View File

@@ -1,4 +1,4 @@
# -*- encoding: utf-8 -*-
# coding: utf-8
##############################################################################
#
# Copyright (C) 2009 EduSense BV (<http://www.edusense.nl>).
@@ -262,7 +262,7 @@ class mem_bank_transaction(object):
setattr(self, attr, '')
self.remote_owner_address = []
def copy(self):
def copy(self): # noqa: W8106
'''
Return a copy of self
'''

View File

@@ -1,4 +1,4 @@
# -*- encoding: utf-8 -*-
# coding: utf-8
##############################################################################
#
# Copyright (C) 2009 EduSense BV (<http://www.edusense.nl>).

View File

@@ -1,4 +1,4 @@
# -*- encoding: utf-8 -*-
# coding: utf-8
##############################################################################
#
# Copyright (C) 2013 Therp BV (<http://therp.nl>).

View File

@@ -1,4 +1,4 @@
# -*- encoding: utf-8 -*-
# coding: utf-8
##############################################################################
#
# Copyright (C) 2009 EduSense BV (<http://www.edusense.nl>).
@@ -292,7 +292,7 @@ class IBAN(str):
@classmethod
def create(cls, BIC=None, countrycode=None, BBAN=None, bankcode=None,
branchcode=None, account=None):
branchcode=None, account=None): # noqa: W8106
'''
Create a IBAN number from a BBAN and a country code. Optionaly create
a BBAN from BBAN components before generation.

View File

@@ -1,4 +1,4 @@
# -*- encoding: utf-8 -*-
# coding: utf-8
##############################################################################
#
# Copyright (C) 2009 EduSense BV (<http://www.edusense.nl>).

View File

@@ -30,7 +30,7 @@ openerp.account_banking = function(instance)
// The match wizard can create or unlink a statement line
// Force a reload of the view so that the correct lines
// are shown.
var parent = this.getParent()
var parent = this.getParent();
if (parent)
{
var child = this.getParent().getChildren()[0];
@@ -48,4 +48,4 @@ openerp.account_banking = function(instance)
}
},
});
}
};

View File

@@ -1,4 +1,4 @@
# -*- encoding: utf-8 -*-
# coding: utf-8
##############################################################################
#
# Copyright (C) 2009 EduSense BV (<http://www.edusense.nl>).

View File

@@ -1,4 +1,4 @@
# -*- encoding: utf-8 -*-
# coding: utf-8
##############################################################################
#
# Copyright (C) 2009 EduSense BV (<http://www.edusense.nl>).

View File

@@ -1,80 +1,80 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data>
<record id="view_banking_import" model="ir.ui.view">
<field name="name">account.banking.bank.import</field>
<field name="model">account.banking.bank.import</field>
<field name="arch" type="xml">
<form string="Import Bank Transactions File" version="7.0">
<group colspan="4" states="init,ready,error">
<separator colspan="4" string="Select the processing details:"/>
<field name="company" colspan="1"/>
<field name="file" filename="file_name"/>
<field name="file_name" invisible="1"/>
<newline />
<field name="parser"/>
<field name="state" invisible="1"/>
</group>
<notebook colspan="4">
<page attrs="{'invisible': [('state', '!=', 'review')]}" string="Transactions">
<field name="line_ids" colspan="4" nolabel="1">
<tree string="Transaction" colors="red:duplicate;blue:reconcile_id">
<field name="date"/>
<field name="amount"/>
<field name="ref"/>
<field name="partner_bank_id"/>
<field name="partner_id"/>
<field name="account_id"/>
<field name="reconcile_id"/>
<field name="duplicate"/>
</tree>
</field>
</page>
<page attrs="{'invisible': [('state', '=', 'init')]}" string="Log">
<field name="log" colspan="4" nolabel="1" width="500"/>
</page>
<page attrs="{'invisible': [('state', '!=', 'ready')]}" string="Statements">
<field name="statement_ids" colspan="4" nolabel="1"
attrs="{'invisible': [('state', '!=', 'ready')]}" />
</page>
</notebook>
<footer>
<div attrs="{'invisible': [('state', '!=', 'init')]}">
<button string="Import" class="oe_highlight"
states="init" name="import_statements_file"
type="object"/>
or
<button class="oe_link" special="cancel"
states="init" string="Cancel"/>
</div>
<button icon="gtk-close"
special="cancel"
string="Close"
states="ready,error"/>
<button icon="gtk-close"
name="cancel_statement_lines"
type="object"
string="Cancel"
states="review"/>
<button icon="gtk-ok"
name="create_statement_lines"
type="object"
string="Confirm"
states="review"/>
</footer>
</form>
</field>
</record>
<data>
<record id="view_banking_import" model="ir.ui.view">
<field name="name">account.banking.bank.import</field>
<field name="model">account.banking.bank.import</field>
<field name="arch" type="xml">
<form string="Import Bank Transactions File" version="7.0">
<group colspan="4" states="init,ready,error">
<separator colspan="4" string="Select the processing details:"/>
<field name="company" colspan="1"/>
<field name="file" filename="file_name"/>
<field name="file_name" invisible="1"/>
<newline />
<field name="parser"/>
<field name="state" invisible="1"/>
</group>
<notebook colspan="4">
<page attrs="{'invisible': [('state', '!=', 'review')]}" string="Transactions">
<field name="line_ids" colspan="4" nolabel="1">
<tree string="Transaction" colors="red:duplicate;blue:reconcile_id">
<field name="date"/>
<field name="amount"/>
<field name="ref"/>
<field name="partner_bank_id"/>
<field name="partner_id"/>
<field name="account_id"/>
<field name="reconcile_id"/>
<field name="duplicate"/>
</tree>
</field>
</page>
<page attrs="{'invisible': [('state', '=', 'init')]}" string="Log">
<field name="log" colspan="4" nolabel="1" width="500"/>
</page>
<page attrs="{'invisible': [('state', '!=', 'ready')]}" string="Statements">
<field name="statement_ids" colspan="4" nolabel="1"
attrs="{'invisible': [('state', '!=', 'ready')]}" />
</page>
</notebook>
<footer>
<div attrs="{'invisible': [('state', '!=', 'init')]}">
<button string="Import" class="oe_highlight"
states="init" name="import_statements_file"
type="object"/>
or
<button class="oe_link" special="cancel"
states="init" string="Cancel"/>
</div>
<record id="wizard_account_banking_import_file" model="ir.actions.act_window">
<field name="name">Import Bank Statements File</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">account.banking.bank.import</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="view_id" ref="view_banking_import"/>
<field name="target">new</field>
</record>
</data>
<button icon="gtk-close"
special="cancel"
string="Close"
states="ready,error"/>
<button icon="gtk-close"
name="cancel_statement_lines"
type="object"
string="Cancel"
states="review"/>
<button icon="gtk-ok"
name="create_statement_lines"
type="object"
string="Confirm"
states="review"/>
</footer>
</form>
</field>
</record>
<record id="wizard_account_banking_import_file" model="ir.actions.act_window">
<field name="name">Import Bank Statements File</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">account.banking.bank.import</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="view_id" ref="view_banking_import"/>
<field name="target">new</field>
</record>
</data>
</openerp>

View File

@@ -1,4 +1,4 @@
# -*- encoding: utf-8 -*-
# coding: utf-8
##############################################################################
#
# Copyright (C) 2009 EduSense BV (<http://www.edusense.nl>).