[IMP] Account : changes removed

bzr revid: rpr@tinyerp.com-20121219105758-6r4pkmf8buq4dht9

addons/account/account.py

@@ -58,7 +58,7 @@ class account_payment_term(osv.osv):
     _name = "account.payment.term"
     _description = "Payment Term"
     _columns = {
-        'name': fields.char('Payment Terms', size=64, translate=True, required=True),
+        'name': fields.char('Payment Term', size=64, translate=True, required=True),
         'active': fields.boolean('Active', help="If the active field is set to False, it will allow you to hide the payment term without removing it."),
         'note': fields.text('Description', translate=True),
         'line_ids': fields.one2many('account.payment.term.line', 'payment_id', 'Terms'),
@@ -112,7 +112,7 @@ class account_payment_term_line(osv.osv):
         'days': fields.integer('Number of Days', required=True, help="Number of days to add before computation of the day of month." \
             "If Date=15/01, Number of Days=22, Day of Month=-1, then the due date is 28/02."),
         'days2': fields.integer('Day of the Month', required=True, help="Day of the month, set -1 for the last day of the current month. If it's positive, it gives the day of the next month. Set 0 for net days (otherwise it's based on the beginning of the month)."),
-        'payment_id': fields.many2one('account.payment.term', 'Payment Terms', required=True, select=True, ondelete='cascade'),
+        'payment_id': fields.many2one('account.payment.term', 'Payment Term', required=True, select=True, ondelete='cascade'),
     }
     _defaults = {
         'value': 'balance',

addons/account/account_view.xml

@@ -1583,7 +1583,7 @@
             <field name="model">account.payment.term</field>
             <field name="arch" type="xml">
                 <search string="Payment Term">
-                    <field name="name" string="Payment Terms"/>
+                    <field name="name" string="Payment Term"/>
                     <field name="active"/>
                 </search>
             </field>

addons/account/report/account_invoice_report.py

@@ -63,7 +63,7 @@ class account_invoice_report(osv.osv):
         'product_id': fields.many2one('product.product', 'Product', readonly=True),
         'product_qty':fields.float('Qty', readonly=True),
         'uom_name': fields.char('Reference Unit of Measure', size=128, readonly=True),
-        'payment_term': fields.many2one('account.payment.term', 'Payment Terms', readonly=True),
+        'payment_term': fields.many2one('account.payment.term', 'Payment Term', readonly=True),
         'period_id': fields.many2one('account.period', 'Force Period', domain=[('state','<>','done')], readonly=True),
         'fiscal_position': fields.many2one('account.fiscal.position', 'Fiscal Position', readonly=True),
         'currency_id': fields.many2one('res.currency', 'Currency', readonly=True),

addons/account/report/account_report.py

@@ -164,7 +164,7 @@ class report_invoice_created(osv.osv):
             ],'Type', readonly=True),
         'number': fields.char('Invoice Number', size=32, readonly=True),
         'partner_id': fields.many2one('res.partner', 'Partner', readonly=True),
-        'amount_untaxed': fields.float('Subtotal', readonly=True),
+        'amount_untaxed': fields.float('Untaxed', readonly=True),
         'amount_total': fields.float('Total', readonly=True),
         'currency_id': fields.many2one('res.currency', 'Currency', readonly=True),
         'date_invoice': fields.date('Invoice Date', readonly=True),