Merge lp:~openerp/openobject-server/publisher_warranty_improv into lp:openobject-server

[Nicolas Vanhoren (OpenERP)]

Some improvements to publisher warranty.

=== modified file 'bin/addons/base/publisher_warranty/publisher_warranty.py'
--- bin/addons/base/publisher_warranty/publisher_warranty.py	2010-12-20 10:19:58 +0000
+++ bin/addons/base/publisher_warranty/publisher_warranty.py	2011-01-12 17:21:59 +0000
@@ -165,14 +165,26 @@
             contracts = result["contracts"]
             for contract in contracts:
                 c_id = self.search(cr, uid, [("name","=",contract)])[0]
-                date_from = contracts[contract][0]
-                date_to = contracts[contract][1]
-                state = contracts[contract][2]
-                self.write(cr, uid, c_id, {
-                    "date_start": date_from,
-                    "date_stop": date_to,
-                    "state": state,
-                })
+                # for backward compatibility
+                if type(contracts[contract]) == tuple:
+                    self.write(cr, uid, c_id, {
+                        "date_start": contracts[contract][0],
+                        "date_stop": contracts[contract][1],
+                        "state": contracts[contract][2],
+                        "check_support": False,
+                        "check_opw": False,
+                        "kind": "",
+                    })
+                else:
+                    self.write(cr, uid, c_id, {
+                        "date_start": contracts[contract]["date_from"],
+                        "date_stop": contracts[contract]["date_to"],
+                        "state": contracts[contract]["state"],
+                        "check_support": contracts[contract]["check_support"],
+                        "check_opw": contracts[contract]["check_opw"],
+                        "kind": contracts[contract]["kind"],
+                    })
+
 
             limit_date = (datetime.datetime.now() - _PREVIOUS_LOG_CHECK).strftime(misc.DEFAULT_SERVER_DATETIME_FORMAT)
             for message in result["messages"]:
@@ -226,6 +238,8 @@
         'state' : fields.selection([('unvalidated', 'Unvalidated'), ('valid', 'Valid')
                             , ('terminated', 'Terminated'), ('canceled', 'Canceled')], string="State", readonly=True),
         'kind' : fields.char('Kind', size=64, readonly=True),
+        "check_support": fields.boolean("Support Level 1"),
+        "check_opw": fields.boolean("OPW"),
     }
 
     _defaults = {

=== modified file 'bin/addons/base/publisher_warranty/publisher_warranty_view.xml'
--- bin/addons/base/publisher_warranty/publisher_warranty_view.xml	2010-12-28 15:16:47 +0000
+++ bin/addons/base/publisher_warranty/publisher_warranty_view.xml	2011-01-12 17:21:59 +0000
@@ -22,19 +22,21 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Publisher Warranty Contract">
-                    <group col="2" colspan="4">
+                    <group col="3" colspan="4">
                         <group col="2">
                             <field name="name"/>
                         </group>
                         <group col="2">
                             <field name="date_start"/>
                             <field name="date_stop"/>
+                            <field name="check_support"/>
                         </group>
                         <group col="2">
                             <field name="state"/>
                             <field name="kind"/>
+                            <field name="check_opw"/>
                         </group>
-                        <group col="2">
+                        <group col="2" colspan="3">
                             <button name="check_validity" string="Validate" type="object"
                             attrs="{'invisible':[('state','in',['valid', 'terminated', 'canceled'])]}"/>
                             <button name="check_validity" string="Refresh Validation Dates" type="object"