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

[MRG] from upstream

Browse Source 
(lp:c2c-financial-addons/6.1 rev 24.1.41)
This commit is contained in:
Guewen Baconnier @ Camptocamp
2012-06-27 10:01:37 +02:00
parent 4de5e6b857
commit c471a0f82a
6 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
account_statement_base_completion/data.xml
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<openerp> <openerp>
<data> <data noupdate="1">
<record id="bank_statement_completion_rule_2" model="account.statement.completion.rule"> <record id="bank_statement_completion_rule_2" model="account.statement.completion.rule">
<field name="name">Match from line label (based on partner field 'Bank Statement Label')</field> <field name="name">Match from line label (based on partner field 'Bank Statement Label')</field>

1
account_statement_base_import/statement_view.xml
View File

@@ -29,6 +29,7 @@
<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 name="type">form</field>
<field eval="20" name="priority"/>
<field name="arch" type="xml"> <field name="arch" type="xml">
<data> <data>
<xpath expr="/form/notebook/page/field[@name='line_ids']/form/field[@name='label']" position="after"> <xpath expr="/form/notebook/page/field[@name='line_ids']/form/field[@name='label']" position="after">

2
account_statement_ext/statement.py
View File

@@ -97,7 +97,7 @@ class AccountBankSatement(Model):
_columns = { _columns = {
'profile_id': fields.many2one('account.statement.profil', 'profile_id': fields.many2one('account.statement.profil',
'Profil', required=True, states={'draft': [('readonly', False)]}), 'Profil', required=True, readonly=True, states={'draft': [('readonly', False)]}),
'credit_partner_id': fields.related( 'credit_partner_id': fields.related(
'profile_id', 'profile_id',
'partner_id', 'partner_id',

2
account_statement_ext/statement_view.xml
View File

@@ -15,12 +15,14 @@
</field> </field>
</record> </record>
<record id="view_account_move_line_filter" model="ir.ui.view"> <record id="view_account_move_line_filter" model="ir.ui.view">
<field name="name">account.move.line.search.add_field</field>
<field name="model">account.move.line</field> <field name="model">account.move.line</field>
<field name="type">search</field> <field name="type">search</field>
<field name="inherit_id" ref="account.view_account_move_line_filter"/> <field name="inherit_id" ref="account.view_account_move_line_filter"/>
<field name="arch" type="xml"> <field name="arch" type="xml">
<field name="period_id" context="{'period_id':self}" position="after"> <field name="period_id" context="{'period_id':self}" position="after">
<field name="statement_id"/> <field name="statement_id"/>
<field name="ref"/>
</field> </field>
</field> </field>
</record> </record>

2
account_statement_transactionid_completion/data.xml
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<openerp> <openerp>
<data> <data noupdate="1">
<record id="bank_statement_completion_rule_4" model="account.statement.completion.rule"> <record id="bank_statement_completion_rule_4" model="account.statement.completion.rule">
<field name="name">Match from line reference (based on transaction ID)</field> <field name="name">Match from line reference (based on transaction ID)</field>

2
account_statement_transactionid_completion/statement.py
View File

@@ -34,7 +34,7 @@ class AccountStatementCompletionRule(Model):
def _get_functions(self, cr, uid, context=None): def _get_functions(self, cr, uid, context=None):
res = super (AccountStatementCompletionRule, self)._get_functions( res = super (AccountStatementCompletionRule, self)._get_functions(
cr, uid, context=context) cr, uid, context=context)
res.append(('get_from_transaction_id_and_so', 'From line reference (based on SO transaction ID')) res.append(('get_from_transaction_id_and_so', 'From line reference (based on SO transaction ID)'))
return res return res
_columns={ _columns={