From 7457e87e341556deda4b770d2a14530b59a4f8c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Krier?= <ced@b2ck.com>
Date: Fri, 2 Jan 2009 18:13:48 +0100
Subject: [PATCH] Change percent into percentage (in %) for issue642

---
 invoice.xml     |  8 ++++----
 payment_term.py | 22 ++++++++++++++++++----
 2 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/invoice.xml b/invoice.xml
index f1cd35d126..93a2a93e79 100644
--- a/invoice.xml
+++ b/invoice.xml
@@ -22,7 +22,7 @@ this repository contains the full copyright notices and license terms. -->
                     <field name="lines" colspan="4">
                         <tree string="Payment Term Line" sequence="sequence">
                             <field name="type"/>
-                            <field name="percent"/>
+                            <field name="percentage"/>
                             <field name="amount"/>
                             <field name="currency"/>
                             <field name="days"/>
@@ -34,11 +34,11 @@ this repository contains the full copyright notices and license terms. -->
                             <label name="type"/>
                             <field name="type"/>
                             <group col="1" id="label_amount_percent">
-                                <label name="percent" fill="1" xexpand="1" expand="1"/>
+                                <label name="percentage" fill="1" xexpand="1" expand="1"/>
                                 <label name="amount" fill="1" xexpand="1" expand="1"/>
                             </group>
                             <group col="3" id="amount_percent">
-                                <field name="percent" colspan="3"/>
+                                <field name="percentage" colspan="3"/>
                                 <field name="amount"/>
                                 <label name="currency"/>
                                 <field name="currency"/>
@@ -123,7 +123,7 @@ this repository contains the full copyright notices and license terms. -->
         </record>
         <record model="account.invoice.payment_term.line.type"
             id="payment_term_line_type_percent">
-            <field name="name">Percent</field>
+            <field name="name">Percentage</field>
             <field name="code">percent</field>
         </record>
         <record model="account.invoice.payment_term.line.type"
diff --git a/payment_term.py b/payment_term.py
index 1f919a42bb..55848586b3 100644
--- a/payment_term.py
+++ b/payment_term.py
@@ -2,6 +2,8 @@
 #this repository contains the full copyright notices and license terms.
 
 from trytond.osv import fields, OSV
+from trytond.sql_db import table_handler
+from decimal import Decimal
 
 
 class PaymentTerm(OSV):
@@ -82,7 +84,8 @@ class PaymentTermLineType(OSV):
             return currency_obj.compute(cursor, user, line.currency,
                     line.amount, currency, context=context)
         elif line.type == 'percent':
-            return currency_obj.round(cursor, user, currency, amount * line.percent)
+            return currency_obj.round(cursor, user, currency,
+                    amount * line.percentage / Decimal('100'))
         elif line.type == 'remainder':
             return currency_obj.round(cursor, user, currency, amount)
         return None
@@ -130,11 +133,11 @@ class PaymentTermLine(OSV):
             required=True, ondelete="CASCADE")
     type = fields.Selection('get_type', 'Type', required=True,
             on_change=['type'])
-    percent = fields.Numeric('Percent', digits=(16, 8),
+    percentage = fields.Numeric('Percentage', digits=(16, 8),
             states={
                 'invisible': "type != 'percent'",
                 'required': "type == 'percent'",
-            })
+            }, help='In %')
     amount = fields.Numeric('Amount', digits="(16, currency_digits)",
             states={
                 'invisible': "type != 'fixed'",
@@ -154,6 +157,17 @@ class PaymentTermLine(OSV):
         super(PaymentTermLine, self).__init__()
         self._order.insert(0, ('sequence', 'ASC'))
 
+    def _auto_init(self, cursor, module_name):
+        super(PaymentTermLine, self)._auto_init(cursor, module_name)
+        table = table_handler(cursor, self._table, self._name, module_name)
+
+        # Migration from 1.0 percent change into percentage
+        if 'percent' in table.table:
+            cursor.execute('UPDATE "' + self._table + '" ' \
+                    'SET percentage = percent * 100')
+            cursor.execute('ALTER TABLE "' + self._table + '" ' \
+                    'DROP COLUMN percent')
+
     def default_type(self, cursor, user, context=None):
         return 'remainder'
 
@@ -181,7 +195,7 @@ class PaymentTermLine(OSV):
             res['amount'] = Decimal('0.0')
             res['currency'] =  False
         if vals['type'] != 'percent':
-            res['percent'] =  Decimal('0.0')
+            res['percentage'] =  Decimal('0.0')
         return res
 
     def on_change_with_currency_digits(self, cursor, user, ids, vals,