clearcorp team mailing list archive
-
clearcorp team
-
Mailing list archive
-
Message #00481
[Branch ~banking-addons-team/banking-addons/6.1] Rev 150: [IMP] nl_clieop: Add a meaningful filename to Clieop files
Merge authors:
Endian Solutions <erwin@xxxxxxxxxxxxxxxxxx>
Related merge proposals:
https://code.launchpad.net/~endiansolutions/banking-addons/6.1-clieop_filename/+merge/141482
proposed by: Erwin van der Ploeg (Endian Solutions) (erwin-endiansolutions)
------------------------------------------------------------
revno: 150 [merge]
author: erwin@xxxxxxxxxxxxxxxxxx
committer: Stefan Rijnhart <stefan@xxxxxxxx>
branch nick: banking-addons
timestamp: Wed 2013-01-02 16:14:53 +0100
message:
[IMP] nl_clieop: Add a meaningful filename to Clieop files
modified:
account_banking_nl_clieop/account_banking_nl_clieop.py
account_banking_nl_clieop/account_banking_nl_clieop.xml
account_banking_nl_clieop/wizard/export_clieop.py
account_banking_nl_clieop/wizard/export_clieop_view.xml
--
lp:banking-addons
https://code.launchpad.net/~banking-addons-team/banking-addons/6.1
Your team CLEARCORP development team is subscribed to branch lp:banking-addons.
To unsubscribe from this branch go to https://code.launchpad.net/~banking-addons-team/banking-addons/6.1/+edit-subscription
=== modified file 'account_banking_nl_clieop/account_banking_nl_clieop.py'
--- account_banking_nl_clieop/account_banking_nl_clieop.py 2012-03-10 13:51:08 +0000
+++ account_banking_nl_clieop/account_banking_nl_clieop.py 2012-12-30 10:55:49 +0000
@@ -61,7 +61,10 @@
'date_generated':
fields.date('Generation Date', readonly=True, select=True),
'file':
- fields.binary('ClieOp File', readonly=True),
+ fields.binary('ClieOp File', readonly=True,),
+ 'filename': fields.char(
+ 'File Name', size=32,
+ ),
'state':
fields.selection([
('draft', 'Draft'),
@@ -69,6 +72,7 @@
('done', 'Reconciled'),
], 'State', readonly=True),
}
+
def get_daynr(self, cr, uid, context=None):
'''
Return highest day number
=== modified file 'account_banking_nl_clieop/account_banking_nl_clieop.xml'
--- account_banking_nl_clieop/account_banking_nl_clieop.xml 2011-07-21 11:30:59 +0000
+++ account_banking_nl_clieop/account_banking_nl_clieop.xml 2013-01-02 15:14:53 +0000
@@ -14,33 +14,34 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Client Opdrachten Export">
- <notebook>
- <page string="General Information">
- <field name="filetype" />
- <field name="identification" />
- <separator string="ClieOp Information" colspan="4" />
- <field name="total_amount" />
- <field name="check_no_accounts" />
- <field name="no_transactions" />
- <separator string="Processing Information" colspan="4" />
- <field name="prefered_date" />
- <field name="date_generated" />
- <field name="testcode" />
- <newline />
- <field name="file" colspan="4" />
- </page>
- <page string="Payment Orders">
- <field name="payment_order_ids" colspan="4" nolabel="1">
- <tree colors="blue:state in ('draft');gray:state in ('cancel','done');black:state in ('open')" string="Payment order">
- <field name="reference"/>
- <field name="date_created"/>
- <field name="date_done"/>
- <field name="total"/>
- <field name="state"/>
- </tree>
- </field>
- </page>
- </notebook>
+ <notebook>
+ <page string="General Information">
+ <field name="filetype" />
+ <field name="identification" />
+ <separator string="ClieOp Information" colspan="4" />
+ <field name="total_amount" />
+ <field name="check_no_accounts" />
+ <field name="no_transactions" />
+ <separator string="Processing Information" colspan="4" />
+ <field name="prefered_date" />
+ <field name="date_generated" />
+ <field name="testcode" />
+ <newline />
+ <field name="filename" invisible="True"/>
+ <field name="file" colspan="4" filename="filename"/>
+ </page>
+ <page string="Payment Orders">
+ <field name="payment_order_ids" colspan="4" nolabel="1">
+ <tree colors="blue:state in ('draft');gray:state in ('cancel','done');black:state in ('open')" string="Payment order">
+ <field name="reference"/>
+ <field name="date_created"/>
+ <field name="date_done"/>
+ <field name="total"/>
+ <field name="state"/>
+ </tree>
+ </field>
+ </page>
+ </notebook>
</form>
</field>
</record>
=== modified file 'account_banking_nl_clieop/wizard/export_clieop.py'
--- account_banking_nl_clieop/wizard/export_clieop.py 2012-03-10 13:51:08 +0000
+++ account_banking_nl_clieop/wizard/export_clieop.py 2013-01-02 15:14:53 +0000
@@ -138,13 +138,19 @@
readonly=True,
string='File',
),
+ 'filename': fields.related(
+ 'file_id', 'filename',
+ type='char', size=32,
+ readonly=True,
+ string='Filename',
+ ),
'payment_order_ids': fields.many2many(
'payment.order', 'rel_wiz_payorders', 'wizard_id',
'payment_order_id', 'Payment Orders',
readonly=True,
),
}
-
+
_defaults = {
'test': True,
}
@@ -334,6 +340,7 @@
no_transactions = order.nr_posts,
testcode = order.testcode,
file = base64.encodestring(clieopfile.rawdata),
+ filename = 'Clieop03-{0}.txt'.format(order.identification),
daynumber = int(clieopfile.header.file_id[2:]),
payment_order_ids = [
[6, 0, [x.id for x in clieop_export['payment_order_ids']]]
@@ -375,7 +382,7 @@
clieop_obj = self.pool.get('banking.export.clieop')
payment_order_obj = self.pool.get('payment.order')
clieop_file = clieop_obj.write(
- cursor, uid, clieop_export['file_id'].id, {'state':'sent'}
+ cursor, uid, clieop_export['file_id'].id, {'state': 'sent'}
)
wf_service = netsvc.LocalService('workflow')
for order in clieop_export['payment_order_ids']:
=== modified file 'account_banking_nl_clieop/wizard/export_clieop_view.xml'
--- account_banking_nl_clieop/wizard/export_clieop_view.xml 2011-07-21 11:30:59 +0000
+++ account_banking_nl_clieop/wizard/export_clieop_view.xml 2013-01-02 15:14:53 +0000
@@ -6,53 +6,54 @@
<field name="model">banking.export.clieop.wizard</field>
<field name="type">form</field>
<field name="arch" type="xml">
- <form string="Client Opdrachten Export">
- <field name="state" invisible="True"/>
- <group states="create">
- <separator colspan="4" string="Processing Details" />
- <field name="batchtype" />
- <field name="execution_date" />
- <field name="test" />
- <separator colspan="4" string="Reference for further communication" />
- <field name="reference" colspan="2" />
- <separator colspan="4" string="Additional message for all transactions" />
- <field name="fixed_message" />
- <newline/>
- <button icon="gtk-close"
- special="cancel"
- string="Cancel"
- />
- <button icon="gtk-ok"
- string="Create"
- name="create_clieop"
- type="object"
- />
- </group>
- <group states="finish">
- <field name="filetype" />
- <field name="identification" />
- <field name="total_amount" />
- <field name="check_no_accounts" />
- <field name="no_transactions" />
- <field name="prefered_date" />
- <field name="testcode" />
- <newline/>
- <field name="file_id" />
- <field name="file" />
- <newline/>
- <button icon="gtk-close"
- string="Cancel"
- name="cancel_clieop"
- type="object"
- />
- <button icon="gtk-ok"
- string="Finish"
- name="save_clieop"
- type="object"
- />
- </group>
- </form>
- </field>
- </record>
+ <form string="Client Opdrachten Export">
+ <field name="state" invisible="True"/>
+ <group states="create">
+ <separator colspan="4" string="Processing Details" />
+ <field name="batchtype" />
+ <field name="execution_date" />
+ <field name="test" />
+ <separator colspan="4" string="Reference for further communication" />
+ <field name="reference" colspan="2" />
+ <separator colspan="4" string="Additional message for all transactions" />
+ <field name="fixed_message" />
+ <newline/>
+ <button icon="gtk-close"
+ special="cancel"
+ string="Cancel"
+ />
+ <button icon="gtk-ok"
+ string="Create"
+ name="create_clieop"
+ type="object"
+ />
+ </group>
+ <group states="finish">
+ <field name="filetype" />
+ <field name="identification" />
+ <field name="total_amount" />
+ <field name="check_no_accounts" />
+ <field name="no_transactions" />
+ <field name="prefered_date" />
+ <field name="testcode" />
+ <newline/>
+ <field name="filename" invisible="True"/>
+ <field name="file_id" />
+ <field name="file" filename="filename"/>
+ <newline/>
+ <button icon="gtk-close"
+ string="Cancel"
+ name="cancel_clieop"
+ type="object"
+ />
+ <button icon="gtk-ok"
+ string="Finish"
+ name="save_clieop"
+ type="object"
+ />
+ </group>
+ </form>
+ </field>
+ </record>
</data>
</openerp>
