banking-addons-team team mailing list archive
-
banking-addons-team team
-
Mailing list archive
-
Message #00830
[Merge] lp:~ruchir.shukla/banking-addons/banking-addons-ui-improvement into lp:banking-addons
Ruchir Shukla(BizzAppDev) has proposed merging lp:~ruchir.shukla/banking-addons/banking-addons-ui-improvement into lp:banking-addons.
Requested reviews:
Banking Addons Core Editors (banking-addons-team)
For more details, see:
https://code.launchpad.net/~ruchir.shukla/banking-addons/banking-addons-ui-improvement/+merge/181949
Hello !
Here are UI improvement changes as decided.
Only one this is missing that "Wizard form view in Pop-up not have 100% width and height"
--
https://code.launchpad.net/~ruchir.shukla/banking-addons/banking-addons-ui-improvement/+merge/181949
Your team Banking Addons Core Editors is requested to review the proposed merge of lp:~ruchir.shukla/banking-addons/banking-addons-ui-improvement into lp:banking-addons.
=== modified file 'account_banking/account_banking.py'
--- account_banking/account_banking.py 2013-06-25 15:40:51 +0000
+++ account_banking/account_banking.py 2013-08-24 07:13:29 +0000
@@ -233,6 +233,13 @@
_name = 'account.banking.imported.file'
_description = __doc__
_rec_name = 'date'
+
+ def _get_file_name(self, cr, uid, ids, name, args, context={}):
+ ret_val = {}
+ for rec_id in ids:
+ ret_val[rec_id] = "{0}_{1}.txt".format(self._table, rec_id)
+ return ret_val
+
_columns = {
'company_id': fields.many2one('res.company', 'Company',
select=True, readonly=True
@@ -264,6 +271,9 @@
'banking_id', 'Statements',
readonly=False,
),
+ 'file_name': fields.function(_get_file_name, method=True,
+ string="File Name", type="char",
+ size=256),
}
_defaults = {
'date': fields.date.context_today,
=== modified file 'account_banking/account_banking_view.xml'
--- account_banking/account_banking_view.xml 2013-06-04 10:18:31 +0000
+++ account_banking/account_banking_view.xml 2013-08-24 07:13:29 +0000
@@ -16,7 +16,11 @@
id="account_banking.menu_finance_banking_settings"
parent="account.menu_finance_configuration"
/>
-
+
+ <menuitem action="account.action_view_bank_statement_tree"
+ id="account.journal_cash_move_lines"
+ sequence="18"
+ parent="account.menu_finance_bank_and_cash"/>
<!-- Add a shortcut menu for bank accounts -->
<record model="ir.actions.act_window" id="action_account_banking_res_partner_banks">
<field name="name">Bank Accounts</field>
@@ -105,7 +109,8 @@
<field name="date" />
<field name="user_id" />
<field name="state" />
- <field name="file"/>
+ <field name="file_name" invisible="1"/>
+ <field name="file" filename="file_name"/>
<field name="format" />
</page>
<page string="Statements">
@@ -142,17 +147,17 @@
<!-- Add a menu item for it -->
<menuitem name="Imported Bank Statements Files"
id="menu_action_account_banking_imported_files"
- parent="account_banking.menu_finance_banking_actions"
+ parent="account.menu_finance_bank_and_cash"
action="action_account_banking_imported_files"
- sequence="12"
+ sequence="15"
/>
<!-- Add the import wizard to the menu -->
<menuitem name="Import Bank Statements File"
id="menu_account_banking_import_wizard"
- parent="account_banking.menu_finance_banking_actions"
+ parent="account.menu_finance_bank_and_cash"
action="wizard_account_banking_import_file"
- sequence="15"/>
+ sequence="12"/>
<!-- Add the import wizard to the statement's right menu -->
<act_window name="Import Bank Statements File"
=== modified file 'account_banking/i18n/nl.po'
--- account_banking/i18n/nl.po 2012-05-02 15:09:49 +0000
+++ account_banking/i18n/nl.po 2013-08-24 07:13:29 +0000
@@ -1771,3 +1771,13 @@
#: constraint:account.move.line:0
msgid "You can not create move line on view account."
msgstr "U kunt geen boekingsregel creëren op een zichtrekening"
+
+#. module: account_banking_payment
+#: field:banking.transaction.wizard,manual_payment_line_id:0
+msgid "Match this payment line"
+msgstr "Match deze betaling lijn"
+
+#. module: account_banking_payment
+#: field:banking.transaction.wizard,manual_payment_order_id:0
+msgid "Match this payment order"
+msgstr "Match deze betalingsopdracht"
=== modified file 'account_banking/wizard/bank_import.py'
--- account_banking/wizard/bank_import.py 2013-05-28 14:08:18 +0000
+++ account_banking/wizard/bank_import.py 2013-08-24 07:13:29 +0000
@@ -353,7 +353,7 @@
'%s: %s' % (_('Number of bank costs invoices created'),
results.bank_costs_invoice_cnt),
'',
- '%s:' % ('Error report'),
+ '%s:' % (_('Error report')),
'',
]
text_log = '\n'.join(report + results.log)
@@ -382,6 +382,12 @@
'res_id': ids[0] or False,
}
+ def _get_file_name(self, cr, uid, ids, name, args, context={}):
+ ret_val = {}
+ for rec_id in ids:
+ ret_val[rec_id] = "{0}_{1}.txt".format(self._table, rec_id)
+ return ret_val
+
_columns = {
'company': fields.many2one(
'res.company', 'Company', required=True,
@@ -425,6 +431,9 @@
'line_ids': fields.one2many(
'banking.import.line', 'banking_import_id', 'Transactions',
),
+ 'file_name': fields.function(_get_file_name, method=True,
+ string="File Name", type="char",
+ size=256),
}
def _default_parser_type(self, cr, uid, context=None):
=== modified file 'account_banking/wizard/bank_import_view.xml'
--- account_banking/wizard/bank_import_view.xml 2013-05-28 15:18:26 +0000
+++ account_banking/wizard/bank_import_view.xml 2013-08-24 07:13:29 +0000
@@ -5,15 +5,16 @@
<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">
- <group colspan="4" states="init,ready,error">
- <separator colspan="4" string="Select the processing details:"/>
- <field name="company" colspan="1"/>
- <field name="file"/>
- <newline />
- <field name="parser"/>
- <field name="state" invisible="1"/>
- </group>
+ <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_name" invisible="1"/>
+ <field name="file" filename="file_name"/>
+ <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">
@@ -37,16 +38,16 @@
attrs="{'invisible': [('state', '!=', 'ready')]}" />
</page>
</notebook>
- <group colspan="2" >
- <button icon="gtk-cancel"
- special="cancel"
- states="init"
- string="Cancel"/>
- <button icon="gtk-ok"
- string="Import"
- states="init"
- name="import_statements_file"
- type="object"/>
+ <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"
@@ -60,10 +61,10 @@
name="create_statement_lines"
type="object"
string="Confirm"
- states="review"/>
- </group>
- </form>
- </field>
+ states="review"/>
+ </footer>
+ </form>
+ </field>
</record>
<record id="wizard_account_banking_import_file" model="ir.actions.act_window">
=== modified file 'account_banking/wizard/banking_transaction_wizard.xml'
--- account_banking/wizard/banking_transaction_wizard.xml 2013-08-12 09:20:12 +0000
+++ account_banking/wizard/banking_transaction_wizard.xml 2013-08-24 07:13:29 +0000
@@ -5,96 +5,105 @@
<field name="name">transaction.wizard.first</field>
<field name="model">banking.transaction.wizard</field>
<field name="arch" type="xml">
- <form string="Match transaction">
+ <form string="Match transaction" version="7.0">
+
<!-- fields used for form logic -->
<field name="statement_line_parent_id" invisible="True"/>
<field name="invoice_ids" invisible="True"/>
<field name="move_line_ids" invisible="True"/>
<field name="match_multi" invisible="True"/>
<field name="duplicate" invisible="True"/>
- <group colspan="2" col="2">
- <group colspan="2" col="4">
- <separator string="Transaction data" colspan="4"/>
- <field name="partner_id"/>
- <field name="date"/>
- <field name="amount"/>
- <field name="ref"/>
- <field name="message" colspan="4"/>
- </group>
-
- <!-- (semi-) automatic matching and selection -->
-
- <group colspan="2" col="4">
+ <separator string="Transaction data" colspan="4"/>
+ <group colspan="4" col="6">
+
+ <field name="partner_id"/>
+ <field name="date"/>
+ <button colspan="2"
+ name="trigger_match"
+ type="object"
+ help="You can let the system try to match this bank statement line again after you have made any changes in the database (for instance, add an invoice or a bank account)."
+ class="oe_highlight"
+ string="Match again"/>
+ <field name="amount"/>
+ <field name="ref"/>
+ <button colspan="2"
+ name="reverse_duplicate"
+ type="object"
+ help="This bank transfer was marked as a duplicate. You can either confirm that this is not the case, or remove the bank transfer from the system."
+ string="Remove duplicate flag"/>
+
+ </group>
+ <group col="4" colspan="4">
+ <field name="message" colspan="4"/>
+ </group>
+
+ <group colspan="4" col="6">
- <separator string="Current match" colspan="4"/>
+ <separator string="Current match" colspan="6"/>
<field name="match_type"/>
<newline />
- <field name="move_currency_amount" />
+ <field name="move_currency_amount" string="Currency"/>
<newline />
<field name="residual"/>
- <group attrs="{'invisible': [('match_multi', '=', False)]}" colspan="4" col="2">
+ <newline />
+ <group attrs="{'invisible': [('match_multi', '=', False)]}" colspan="4" col="4">
<separator string="Multiple matches" colspan="2"/>
<label colspan="2" string="Multiple matches were found for this bank transfer. You must pick one of the matches or select a match manually below." />
</group>
- <group attrs="{'readonly': [('match_multi', '!=', True)]}" col="8">
+ <newline />
<!-- show if we have an invoice type match (but the user may need to select from multiple options)
or whenever there is an invoice_id (e.g. in case of a manual match)
-->
+ </group>
+ <group colspan="4" col="6">
+ <group attrs="{'readonly': [('match_multi', '!=', True)]}" col="6">
<field name='invoice_id'
attrs="{'readonly': [('match_multi', '=', False)], 'invisible': [('match_type', '!=', 'invoice'),('invoice_id', '=', False)]}"
- domain="[('id', 'in', invoice_ids[0][2])]"
+ domain="[('id', 'in', invoice_ids[0][2])]"
/>
<!-- show if we have a move type match or a manual match without an invoice_id
-->
- <field name='move_line_id'
+ <field name='move_line_id'
attrs="{'readonly': [('match_multi', '=', False)], 'invisible': [('match_type', '!=', 'move'),('invoice_id', '=', False)]}"
domain="[('id', 'in', move_line_ids[0][2])]"
/>
<field name='analytic_account_id' />
</group>
- <button colspan="1"
- name="trigger_write"
- type="object"
- attrs="{'invisible': [('match_multi', '=', False)]}"
- string="Select"/>
- <newline/>
+ <footer>
+ <button name="trigger_write"
+ type="object"
+ class="oe_highlight"
+ string="Match" />
+ or
+ <button string="Close" special="cancel" class="oe_link"/>
+ </footer>
+ </group>
+
+ <button colspan="1"
+ name="trigger_write"
+ type="object"
+ attrs="{'invisible': [('match_multi', '=', False)]}"
+ string="Select"/>
+ <newline/>
<!-- residual and write off -->
+ <group colspan="4" col="4">
+ <separator string="Match one or more invoices" colspan="4"/>
+
+ <field name="manual_invoice_ids" colspan="4"
+ context="{'search_default_partner_id': partner_id}"
+ nolabel="1"
+ />
+ <separator string="Or match one or more entries" colspan="4"/>
+ <field name="manual_move_line_ids" colspan="4"
+ context="{'search_default_partner_id': partner_id}"
+ nolabel="1"
+ />
+
</group>
<notebook>
- <!-- Duplicate flagging -->
- <page string="Duplicate" attrs="{'invisible': [('duplicate', '=', False)]}">
- <group colspan="2" col="2">
- <label colspan="2" string="This bank transfer was marked as a duplicate. You can either confirm that this is not the case, or remove the bank transfer from the system."/>
- <newline/>
- <button colspan="1"
- name="reverse_duplicate"
- type="object"
- string="Remove duplicate flag"/>
- </group>
- </page>
<!-- Redo automatic match -->
- <page string="Match again">
- <label string="You can let the system try to match this bank statement line again after you have made any changes in the database (for instance, add an invoice or a bank account)." colspan="2"/>
- <newline/>
- <button colspan="1"
- name="trigger_match"
- type="object"
- string="Match again"/>
- </page>
- <!-- Manual selection -->
- <page string="Manual match">
- <field name="manual_invoice_ids" colspan="4"
- context="{'search_default_partner_id': partner_id}"
- />
- <field name="manual_move_line_ids" colspan="4"
- context="{'search_default_partner_id': partner_id}"
- />
- <button name="trigger_write"
- type="object"
- string="Match" />
- </page>
<page string="Write-Off" attrs="{'invisible': [('match_type', '=', False)]}">
<group colspan="2" col="2">
<label string="Choose what you want to do with the eventual difference between the paid amount and the sum of allocated amounts. You can either choose to keep open this difference on the partner's account, or reconcile it with the payment." colspan="2"/>
@@ -118,11 +127,6 @@
</group>
</page>
</notebook>
- <group colspan="2">
- <separator/>
- <button icon="gtk-ok" string="Close" special="cancel"/>
- </group>
- </group>
</form>
</field>
</record>
Follow ups
