SEPA Tools for OpenERP

Merge lp:~factorlibre/sepa-tools/sepa-tools into lp:sepa-tools/6.1

  1. sepa-tools
  2. Merge into 6.1
Proposed by Alberto Garcia (Factor Libre)
Status: Merged
Merged at revision: 7
Proposed branch: lp:~factorlibre/sepa-tools/sepa-tools
Merge into: lp:sepa-tools/6.1
Diff against target: 99 lines (+10/-0)
5 files modified
account_payment_sepa_direct_debit/account_banking_sdd_view.xml (+2/-0)
account_payment_sepa_direct_debit/account_invoice_view.xml (+1/-0)
account_payment_sepa_direct_debit/account_payment_view.xml (+1/-0)
account_payment_sepa_direct_debit/res_partner_bank_view.xml (+3/-0)
account_payment_sepa_direct_debit/sdd_mandate_view.xml (+3/-0)
To merge this branch: bzr merge lp:~factorlibre/sepa-tools/sepa-tools
Reviewer Review Type Date Requested Status
Ignacio Ibeas (www.acysos.com) Approve
Review via email: mp+208746@code.launchpad.net

Description of the change

Add type view in mandate

To post a comment you must log in.
Revision history for this message
Ignacio Ibeas (www.acysos.com) (ignacio-acysos) wrote :

El bug proviene de banking-addons que lo tienen así, aunque en la ramas OCB no da ese fallo, es más correcto especificarlo como has indicado.

Recomiendo que avises de este bug a banking-addons.

Aprobado el merge.

Saludos

Revision history for this message
Ignacio Ibeas (www.acysos.com) (ignacio-acysos) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'account_payment_sepa_direct_debit/account_banking_sdd_view.xml'
--- account_payment_sepa_direct_debit/account_banking_sdd_view.xml 2014-02-09 15:05:50 +0000
+++ account_payment_sepa_direct_debit/account_banking_sdd_view.xml 2014-02-28 08:45:21 +0000
@@ -10,6 +10,7 @@
10<record id="view_banking_export_sdd_form" model="ir.ui.view">10<record id="view_banking_export_sdd_form" model="ir.ui.view">
11 <field name="name">account.banking.export.sdd.form</field>11 <field name="name">account.banking.export.sdd.form</field>
12 <field name="model">banking.export.sdd</field>12 <field name="model">banking.export.sdd</field>
13 <field name="type">form</field>
13 <field name="arch" type="xml">14 <field name="arch" type="xml">
14 <form string="SEPA Direct Debit">15 <form string="SEPA Direct Debit">
15 <notebook>16 <notebook>
@@ -43,6 +44,7 @@
43<record id="view_banking_export_sdd_tree" model="ir.ui.view">44<record id="view_banking_export_sdd_tree" model="ir.ui.view">
44 <field name="name">account.banking.export.sdd.tree</field>45 <field name="name">account.banking.export.sdd.tree</field>
45 <field name="model">banking.export.sdd</field>46 <field name="model">banking.export.sdd</field>
47 <field name="type">tree</field>
46 <field name="arch" type="xml">48 <field name="arch" type="xml">
47 <tree string="SEPA Direct Debit">49 <tree string="SEPA Direct Debit">
48 <field name="filename"/>50 <field name="filename"/>
4951
=== modified file 'account_payment_sepa_direct_debit/account_invoice_view.xml'
--- account_payment_sepa_direct_debit/account_invoice_view.xml 2014-02-09 15:05:50 +0000
+++ account_payment_sepa_direct_debit/account_invoice_view.xml 2014-02-28 08:45:21 +0000
@@ -11,6 +11,7 @@
11 <field name="name">add.sdd.mandate.on.customer.invoice.form</field>11 <field name="name">add.sdd.mandate.on.customer.invoice.form</field>
12 <field name="model">account.invoice</field>12 <field name="model">account.invoice</field>
13 <field name="inherit_id" ref="account.invoice_form"/>13 <field name="inherit_id" ref="account.invoice_form"/>
14 <field name="type">form</field>
14 <field name="arch" type="xml">15 <field name="arch" type="xml">
15 <field name="partner_bank_id" position="after">16 <field name="partner_bank_id" position="after">
16 <field name="sdd_mandate_id" domain="[('partner_id', '=', partner_id), ('state', '=', 'valid')]" attrs="{'invisible': [('type', '=', 'out_refund')]}"/>17 <field name="sdd_mandate_id" domain="[('partner_id', '=', partner_id), ('state', '=', 'valid')]" attrs="{'invisible': [('type', '=', 'out_refund')]}"/>
1718
=== modified file 'account_payment_sepa_direct_debit/account_payment_view.xml'
--- account_payment_sepa_direct_debit/account_payment_view.xml 2014-02-09 15:05:50 +0000
+++ account_payment_sepa_direct_debit/account_payment_view.xml 2014-02-28 08:45:21 +0000
@@ -11,6 +11,7 @@
11 <field name="name">sdd.payment.order.form</field>11 <field name="name">sdd.payment.order.form</field>
12 <field name="model">payment.order</field>12 <field name="model">payment.order</field>
13 <field name="inherit_id" ref="account_payment.view_payment_order_form"/>13 <field name="inherit_id" ref="account_payment.view_payment_order_form"/>
14 <field name="type">form</field>
14 <field name="arch" type="xml">15 <field name="arch" type="xml">
15 <xpath expr="//field[@name='line_ids']/form/notebook/page/field[@name='bank_id']" position="after">16 <xpath expr="//field[@name='line_ids']/form/notebook/page/field[@name='bank_id']" position="after">
16 <field name="sdd_mandate_id" domain="[('partner_bank_id', '=', bank_id), ('state', '=', 'valid')]" invisible="context.get('default_type')!='receivable'" context="{'default_partner_bank_id': bank_id}"/>17 <field name="sdd_mandate_id" domain="[('partner_bank_id', '=', bank_id), ('state', '=', 'valid')]" invisible="context.get('default_type')!='receivable'" context="{'default_partner_bank_id': bank_id}"/>
1718
=== modified file 'account_payment_sepa_direct_debit/res_partner_bank_view.xml'
--- account_payment_sepa_direct_debit/res_partner_bank_view.xml 2014-02-09 15:05:50 +0000
+++ account_payment_sepa_direct_debit/res_partner_bank_view.xml 2014-02-28 08:45:21 +0000
@@ -11,6 +11,7 @@
11 <field name="name">sdd.mandate.res.partner.bank.form</field>11 <field name="name">sdd.mandate.res.partner.bank.form</field>
12 <field name="model">res.partner.bank</field>12 <field name="model">res.partner.bank</field>
13 <field name="inherit_id" ref="base.view_partner_bank_form"/>13 <field name="inherit_id" ref="base.view_partner_bank_form"/>
14 <field name="type">form</field>
14 <field name="arch" type="xml">15 <field name="arch" type="xml">
15 <field name="bank_bic" position="after">16 <field name="bank_bic" position="after">
16 <separator string="SEPA Direct Debit Mandates" colspan="4" />17 <separator string="SEPA Direct Debit Mandates" colspan="4" />
@@ -23,6 +24,7 @@
23 <field name="name">sdd.mandate.res.partner.bank.tree</field>24 <field name="name">sdd.mandate.res.partner.bank.tree</field>
24 <field name="model">res.partner.bank</field>25 <field name="model">res.partner.bank</field>
25 <field name="inherit_id" ref="base.view_partner_bank_tree"/>26 <field name="inherit_id" ref="base.view_partner_bank_tree"/>
27 <field name="type">tree</field>
26 <field name="arch" type="xml">28 <field name="arch" type="xml">
27 <field name="partner_id" position="after">29 <field name="partner_id" position="after">
28 <field name="sdd_mandate_ids" string="SDD Mandates"/>30 <field name="sdd_mandate_ids" string="SDD Mandates"/>
@@ -36,6 +38,7 @@
36 <field name="name">sdd.mandate.partner.form</field>38 <field name="name">sdd.mandate.partner.form</field>
37 <field name="model">res.partner</field>39 <field name="model">res.partner</field>
38 <field name="inherit_id" ref="account.view_partner_property_form"/>40 <field name="inherit_id" ref="account.view_partner_property_form"/>
41 <field name="type">form</field>
39 <field name="arch" type="xml">42 <field name="arch" type="xml">
40 <xpath expr="//field[@name='bank_ids']/form/group/field[@name='bank_bic']" position="after">43 <xpath expr="//field[@name='bank_ids']/form/group/field[@name='bank_bic']" position="after">
41 <separator string="SEPA Direct Debit Mandates" colspan="4" />44 <separator string="SEPA Direct Debit Mandates" colspan="4" />
4245
=== modified file 'account_payment_sepa_direct_debit/sdd_mandate_view.xml'
--- account_payment_sepa_direct_debit/sdd_mandate_view.xml 2014-02-09 15:05:50 +0000
+++ account_payment_sepa_direct_debit/sdd_mandate_view.xml 2014-02-28 08:45:21 +0000
@@ -10,6 +10,7 @@
10<record id="sdd_mandate_form" model="ir.ui.view">10<record id="sdd_mandate_form" model="ir.ui.view">
11 <field name="name">sdd.mandate.form</field>11 <field name="name">sdd.mandate.form</field>
12 <field name="model">sdd.mandate</field>12 <field name="model">sdd.mandate</field>
13 <field name="type">form</field>
13 <field name="arch" type="xml">14 <field name="arch" type="xml">
14 <form string="SEPA Direct Debit Mandate">15 <form string="SEPA Direct Debit Mandate">
15 <group colspan="4">16 <group colspan="4">
@@ -45,6 +46,7 @@
45<record id="sdd_mandate_tree" model="ir.ui.view">46<record id="sdd_mandate_tree" model="ir.ui.view">
46 <field name="name">sdd.mandate.tree</field>47 <field name="name">sdd.mandate.tree</field>
47 <field name="model">sdd.mandate</field>48 <field name="model">sdd.mandate</field>
49 <field name="type">tree</field>
48 <field name="arch" type="xml">50 <field name="arch" type="xml">
49 <tree string="SEPA Direct Debit Mandate" colors="blue:state=='draft';black:state in ('expired', 'cancel')">51 <tree string="SEPA Direct Debit Mandate" colors="blue:state=='draft';black:state in ('expired', 'cancel')">
50 <field name="company_id" groups="base.group_multi_company"/>52 <field name="company_id" groups="base.group_multi_company"/>
@@ -61,6 +63,7 @@
61<record id="sdd_mandate_search" model="ir.ui.view">63<record id="sdd_mandate_search" model="ir.ui.view">
62 <field name="name">sdd.mandate.search</field>64 <field name="name">sdd.mandate.search</field>
63 <field name="model">sdd.mandate</field>65 <field name="model">sdd.mandate</field>
66 <field name="type">search</field>
64 <field name="arch" type="xml">67 <field name="arch" type="xml">
65 <search string="Search SEPA Direct Debit Mandates">68 <search string="Search SEPA Direct Debit Mandates">
66 <field name="partner_id"/>69 <field name="partner_id"/>

Subscribers

People subscribed via source and target branches