From 615ff23f89a8c735c4bbe18f90a2e7681065366c Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Mon, 2 Apr 2012 11:05:51 +0200
Subject: [PATCH] [IMP] account.config.settings: remove sequence prefix fields,
 just keep the next number

bzr revid: rco@openerp.com-20120402090551-irtql2gt6hjpssgh
---
 addons/account/res_config.py       | 10 +++++-----
 addons/account/res_config_view.xml | 31 ++++++++++--------------------
 2 files changed, 15 insertions(+), 26 deletions(-)

diff --git a/addons/account/res_config.py b/addons/account/res_config.py
index b053b438894..3c70fbc5c39 100644
--- a/addons/account/res_config.py
+++ b/addons/account/res_config.py
@@ -42,7 +42,7 @@ class account_config_settings(osv.osv_memory):
         'currency_id': fields.related('company_id', 'currency_id', type='many2one', relation='res.currency',
             string='Main currency', help="Main currency of the company."),
         'paypal_account': fields.related('company_id', 'paypal_account', type='char', size=128,
-            string='Paypal account', help="Paypal username (usually email) for receiving online payments."),
+            string='Paypal account', help="Paypal account (email) for receiving online payments (credit card, etc.)"),
         'company_footer': fields.related('company_id', 'rml_footer2', type='char', size=250, readonly=True,
             string='Bank Accounts on Reports', help="Bank accounts as printed on footer of reports."),
 
@@ -63,16 +63,16 @@ class account_config_settings(osv.osv_memory):
 
         'sale_journal_id': fields.many2one('account.journal', 'Sale Journal'),
         'sale_sequence_prefix': fields.related('sale_journal_id', 'sequence_id', 'prefix', type='char', string='Invoice Sequence'),
-        'sale_sequence_next': fields.related('sale_journal_id', 'sequence_id', 'number_next', type='integer', string='Invoice Sequence Next Number'),
+        'sale_sequence_next': fields.related('sale_journal_id', 'sequence_id', 'number_next', type='integer', string='Next Invoice Number'),
         'sale_refund_journal_id': fields.many2one('account.journal', 'Sale Refund Journal'),
         'sale_refund_sequence_prefix': fields.related('sale_refund_journal_id', 'sequence_id', 'prefix', type='char', string='Refund Sequence'),
-        'sale_refund_sequence_next': fields.related('sale_refund_journal_id', 'sequence_id', 'number_next', type='integer', string='Refund Sequence Next Number'),
+        'sale_refund_sequence_next': fields.related('sale_refund_journal_id', 'sequence_id', 'number_next', type='integer', string='Next Refund Number'),
         'purchase_journal_id': fields.many2one('account.journal', 'Purchase Journal'),
         'purchase_sequence_prefix': fields.related('purchase_journal_id', 'sequence_id', 'prefix', type='char', string='Supplier Invoice Sequence'),
-        'purchase_sequence_next': fields.related('purchase_journal_id', 'sequence_id', 'number_next', type='integer', string='Supplier Invoice Sequence Next Number'),
+        'purchase_sequence_next': fields.related('purchase_journal_id', 'sequence_id', 'number_next', type='integer', string='Next Supplier Invoice Number'),
         'purchase_refund_journal_id': fields.many2one('account.journal', 'Purchase Refund Journal'),
         'purchase_refund_sequence_prefix': fields.related('purchase_refund_journal_id', 'sequence_id', 'prefix', type='char', string='Supplier Refund Sequence'),
-        'purchase_refund_sequence_next': fields.related('purchase_refund_journal_id', 'sequence_id', 'number_next', type='integer', string='Supplier Refund Sequence Next Number'),
+        'purchase_refund_sequence_next': fields.related('purchase_refund_journal_id', 'sequence_id', 'number_next', type='integer', string='Next Supplier Refund Number'),
 
         'module_account_check_writing': fields.boolean('Support check writings',
             help="""This allows you to check writing and printing.
diff --git a/addons/account/res_config_view.xml b/addons/account/res_config_view.xml
index 182e689c163..06a522a728c 100644
--- a/addons/account/res_config_view.xml
+++ b/addons/account/res_config_view.xml
@@ -62,38 +62,27 @@
                             <field name="module_account_budget"/>
                         </group>
                     </group>
-                    <group colspan="2">
-                        <separator string="Customer Invoices" colspan="4"/>
+                    <group colspan="2" col="2">
+                        <separator string="Customer Invoices" colspan="2"/>
                         <field name="sale_journal_id" invisible="1"/>
-                        <field name="sale_sequence_prefix" attrs="{'readonly': [('sale_journal_id','=',False)]}"/>
-                        <field name="sale_sequence_next" nolabel="1" attrs="{'readonly': [('sale_journal_id','=',False)]}"/>
-                        <newline/>
+                        <field name="sale_sequence_next" attrs="{'readonly': [('sale_journal_id','=',False)]}"/>
                         <field name="sale_refund_journal_id" invisible="1"/>
-                        <field name="sale_refund_sequence_prefix" attrs="{'readonly': [('sale_refund_journal_id','=',False)]}"/>
-                        <field name="sale_refund_sequence_next" nolabel="1" attrs="{'readonly': [('sale_refund_journal_id','=',False)]}"/>
-                        <newline/>
+                        <field name="sale_refund_sequence_next" attrs="{'readonly': [('sale_refund_journal_id','=',False)]}"/>
                         <field name="module_account_invoice_layout"/>
-                        <newline/>
                         <field name="module_account_voucher"/>
-                        <newline/>
                         <field name="module_account_followup"/>
-                        <newline/>
                         <field name="group_proforma_invoices"/>
                     </group>
-                    <group colspan="2">
-                        <separator string="Supplier Invoices" colspan="4"/>
+                    <group colspan="2" col="2">
+                        <separator string="Supplier Invoices" colspan="2"/>
                         <field name="purchase_journal_id" invisible="1"/>
-                        <field name="purchase_sequence_prefix" attrs="{'readonly': [('purchase_journal_id','=',False)]}"/>
-                        <field name="purchase_sequence_next" nolabel="1" attrs="{'readonly': [('purchase_journal_id','=',False)]}"/>
-                        <newline/>
+                        <field name="purchase_sequence_next" attrs="{'readonly': [('purchase_journal_id','=',False)]}"/>
                         <field name="purchase_refund_journal_id" invisible="1"/>
-                        <field name="purchase_refund_sequence_prefix" attrs="{'readonly': [('purchase_refund_journal_id','=',False)]}"/>
-                        <field name="purchase_refund_sequence_next" nolabel="1" attrs="{'readonly': [('purchase_refund_journal_id','=',False)]}"/>
-                        <newline/>
+                        <field name="purchase_refund_sequence_next" attrs="{'readonly': [('purchase_refund_journal_id','=',False)]}"/>
                         <field name="module_account_payment"/>
                     </group>
-                    <group colspan="2">
-                        <separator string="Electronic Payments" colspan="4"/>
+                    <group colspan="2" col="2">
+                        <separator string="Electronic Payments" colspan="2"/>
                         <field name="paypal_account"/>
                     </group>
                     <group colspan="2" col="2">