[IMP]account_followup:Improvement in view is Done

bzr revid: aag@tinyerp.co.in-20110506122819-1yavcr27fvqxqblm

diff --git a/addons/account_followup/account_followup.py b/addons/account_followup/account_followup.py
index c798c70..bf504d0 100644 (file)
--- a/addons/account_followup/account_followup.py
+++ b/addons/account_followup/account_followup.py
@@ -41,7 +41,6 @@ class followup_line(osv.osv):
     _description = 'Follow-Up Criteria'
     _columns = {
         'name': fields.char('Name', size=64, required=True),
-        'sequence': fields.integer('Sequence', help="Gives the sequence order when displaying a list of follow-up lines."),
         'delay': fields.integer('Days of delay'),
         'start': fields.selection([('days','Net Days'),('end_of_month','End of Month')], 'Type of Term', size=64, required=True),
         'followup_id': fields.many2one('account_followup.followup', 'Follow Ups', required=True, ondelete="cascade"),

diff --git a/addons/account_followup/account_followup_demo.xml b/addons/account_followup/account_followup_demo.xml
index 2bf627d..9680a2b 100644 (file)
--- a/addons/account_followup/account_followup_demo.xml
+++ b/addons/account_followup/account_followup_demo.xml
@@ -10,7 +10,6 @@
 
         <record id="demo_followup_line1" model="account_followup.followup.line">
             <field name="name">Level 0 : 15 net days</field>
-            <field name="sequence">0</field>
             <field name="start">days</field>
             <field name="delay">15</field>
             <field name="followup_id" ref="demo_followup1"/>
@@ -27,7 +26,6 @@ Best Regards,
 
         <record id="demo_followup_line2" model="account_followup.followup.line">
             <field name="name">Level 1 : 30 net days</field>
-            <field name="sequence">1</field>
             <field name="start">days</field>
             <field name="delay">30</field>
             <field name="followup_id" ref="demo_followup1"/>
@@ -49,7 +47,6 @@ Best Regards,
 
         <record id="demo_followup_line3" model="account_followup.followup.line">
             <field name="name">Level 2 : 45 days end of month</field>
-            <field name="sequence">2</field>
             <field name="start">end_of_month</field>
             <field name="delay">45</field>
             <field name="followup_id" ref="demo_followup1"/>

diff --git a/addons/account_followup/account_followup_view.xml b/addons/account_followup/account_followup_view.xml
index 326264f..485b477 100644 (file)
--- a/addons/account_followup/account_followup_view.xml
+++ b/addons/account_followup/account_followup_view.xml
@@ -8,10 +8,9 @@
             <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Follow-Up Lines">
-                    <field name="sequence"/>
                     <field name="name"/>
                     <field name="delay"/>
-                    <field name="start"/>
+                    <field name="start" groups="base.group_extended"/>
                 </tree>
             </field>
         </record>
@@ -22,10 +21,9 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Follow-Up Lines">
-                    <field name="sequence"/>
                     <field name="name" />
                     <field name="delay" />
-                    <field name="start" />
+                    <field name="start" groups="base.group_extended"/>
                     <newline/>
                     <field colspan="4" name="description" />
                     <separator string="Legend" colspan="4"/>
@@ -45,9 +43,7 @@
                 <form string="Follow-Up">
                     <field name="name" />
                     <field name="company_id" widget="selection" groups="base.group_multi_company"/>
-                    <separator colspan="4" string="Description"/>
-                    <field colspan="4" name="description" nolabel="1" />
-                    <separator colspan="4" string="Followup Lines"/>
+                    <separator colspan="4" string="" />
                     <field colspan="4" name="followup_line" nolabel="1"/>
                 </form>
             </field>
@@ -75,6 +71,10 @@
                         <field name="name"/>
                         <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                    </group>
+                   <newline/>
+                   <group expand="0" string="Group By...">
+                        <filter string="Company" icon="terp-go-home" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
+                   </group>
                </search>
             </field>
         </record>

diff --git a/addons/account_followup/test/account_followup.yml b/addons/account_followup/test/account_followup.yml
index c69fdb1..ae0b2e8 100644 (file)
--- a/addons/account_followup/test/account_followup.yml
+++ b/addons/account_followup/test/account_followup.yml
@@ -6,7 +6,6 @@
     followup_line:
       - delay: 15
         name: 'level 0: 15 days'
-        sequence: 0
         start: days
         description: Dear %(partner_name)s,\n\nException made if there was a mistake
           of ours, it seems that the following amount staid unpaid. Please, take appropriate
@@ -16,7 +15,6 @@
           (+32).10.68.94.39.\n\nBest Regards,\n
       - delay: 30
         name: 'level1: 30 days'
-        sequence: 1
         start: days
         description: Dear %(partner_name)s,\n\nException made if there was a mistake
           of ours, it seems that the following amount staid unpaid. Please, take appropriate
@@ -26,7 +24,6 @@
           (+32).10.68.94.39.\n\nBest Regards,\n
       - delay: 45
         name: 'level 2: 45 days'
-        sequence: 2
         start: days
         description: Dear %(partner_name)s,\n\nException made if there was a mistake
           of ours, it seems that the following amount staid unpaid. Please, take appropriate

diff --git a/addons/account_followup/wizard/account_followup_print.py b/addons/account_followup/wizard/account_followup_print.py
index a8608c2..18b0fc1 100644 (file)
--- a/addons/account_followup/wizard/account_followup_print.py
+++ b/addons/account_followup/wizard/account_followup_print.py
@@ -171,7 +171,7 @@ class account_followup_print_all(osv.osv_memory):
             "SELECT * "\
             "FROM account_followup_followup_line "\
             "WHERE followup_id=%s "\
-            "ORDER BY sequence", (fup_id,))
+            "ORDER BY delay", (fup_id,))
         for result in cr.dictfetchall():
             delay = datetime.timedelta(days=result['delay'])
             fups[old] = (current_date - delay, result['id'])