Code after refactoring

opportunity.py

 #This file is part of Tryton.  The COPYRIGHT file at the top level of
 #this repository contains the full copyright notices and license terms.
 "Sales extension for managing leads and opportunities"
 from trytond.model import ModelView, ModelSQL, ModelWorkflow, fields
-from trytond.pyson import Equal, Eval, Not, In
+from trytond.pyson import Equal, Eval, Not, In, If, Get
 import datetime
 
-STATES =  [('lead', 'Open Lead'), 

[ced, 2010/01/26 20:12:22]

double space after =

[sharoonthomas, 2010/01/26 21:30:35]

Done.

-          ('opportunity', 'Opportunity'), 
-          ('converted', 'Converted'), 
-          ('cancel', 'Cancelled'), 
+STATES = [('lead', 'Lead'),
+          ('opportunity', 'Opportunity'),
+          ('converted', 'Converted'),
+          ('cancel', 'Cancelled'),
           ('lost', 'Lost'),
-          ]

[yangoon1, 2010/01/26 20:39:16]

I am still not quite sure about states:
according to http://en.wikipedia.org/wiki/Sales_lead a followup state would be
prospect (or even several prospects http://en.wikipedia.org/wiki/Sales_tunnel).

So to remain in your design it would be:
lead
prospect
finished (converted)
cancel
disqualified (lost)

Or to stay with common generic tryton patterns:
draft
open
sold
cancel
closed

Different levels of prospect would be handled by Probability on the resp. 2nd
state.

+         ]
+_STATES_LEAD = {'readonly': Not(Equal(Eval('state'), 'lead')), }
+_STATES_CONVERTED = {'readonly': Equal(Eval('state'), 'converted'), }
+
 class SaleOpportunity(ModelWorkflow, ModelSQL, ModelView):
-    'Sale Leads & opportunities'

[yangoon1, 2010/01/26 20:39:16]

Like we discussed in chat, would be for me just:
'Sale Opportunity'

[sharoonthomas, 2010/01/26 21:30:35]

Done.

+    'Sale Opportunity'
     _name = "sale.opportunity"
     _description = __doc__
     _rec_name = "title"
     _history = True
 ····
     title = fields.Char('Title', required=True, translate=True, select=1,
-                states={
-                        'readonly': Equal(Eval('state'), 'converted'),
-                        },depends=['state'])

[ced, 2010/01/26 20:12:22]

You remove 8cols of indentation to be aligned with states.
Like
http://hg.tryton.org/hgwebdir.cgi/modules/account_invoice/file/cf009c1eeb55/i...

[sharoonthomas, 2010/01/26 21:30:35]

Done.

+        states=_STATES_CONVERTED, depends=['state'])
     description = fields.Text('Description', select=2,
-                states={
-                        'readonly': Equal(Eval('state'), 'converted'),
-                        },depends=['state'])
+        states=_STATES_CONVERTED, depends=['state'])
     date = fields.DateTime('Date', required=True, select=1,
-                states={
-                        'readonly': Not(Equal(Eval('state'), 'lead')),
-                        },depends=['state'])
+        states=_STATES_LEAD, depends=['state'])
     end_date = fields.DateTime('End Date', select=2, readonly=True,
-                states={
-                        'invisible': In(Eval('state'), ['lead', 'opportunity']),
-                       }, depends=['state'])
+        states={
+                'invisible': In(Eval('state'), ['lead', 'opportunity']),
+        }, depends=['state'])
     party = fields.Many2One('party.party', 'Party', required=True, select=1,
-                states={
-                        'readonly': Equal(Eval('state'), 'converted'),
-                        },depends=['state'])·
-    address = fields.Many2One('party.address', 'Address', domain=[('party', '=', Eval('party'))],·

[ced, 2010/01/26 20:12:22]

still 80cols

[sharoonthomas, 2010/01/26 21:30:35]

Done.

-                select=2, depends=['party','state'],
-                states={
-                        'readonly': Equal(Eval('state'), 'converted'),
-                        })
+        states=_STATES_CONVERTED, depends=['state'])
+    company = fields.Many2One('company.company', 'Company', required=True,
+        states=_STATES_CONVERTED, domain=[
+            ('id', If(In('company', Eval('context', {})), '=', '!='),
+                Get(Eval('context', {}), 'company', 0)),
+        ])
+    employee = fields.Many2One('company.employee', 'Employee', required=True,
+        states=_STATES_CONVERTED, domain=[('company', '=', Eval('company'))],
+        depends=['company'])
+    address = fields.Many2One('party.address', 'Address',
+        domain=[('party', '=', Eval('party'))],
+        select=2, depends=['party', 'state'],
+        states=_STATES_CONVERTED)
     lines = fields.One2Many('sale.opportunity.lines', 'opportunity', 'Lines',
-                states={
-                        'readonly': Equal(Eval('state'), 'converted'),
-                        },depends=['state'])
+        states=_STATES_CONVERTED, depends=['state'])
     state = fields.Selection(STATES, 'State', required=True, select=1, sort=False, readonly=True)
     probability = fields.Integer('Conversion Probability',
-                    states={
-                        'required': Equal(Eval('state'), 'opportunity'),
-                        'readonly': Not(In(Eval('state'), ['opportunity', 'lead'])),
-                              }, depends=['state'], select=2,
-                    help="Percentage between 0 and 100")
+        states={
+            'required': Equal(Eval('state'), 'opportunity'),
+            'readonly': Not(In(Eval('state'), ['opportunity', 'lead'])),
+        }, depends=['state'], select=2,
+        help="Percentage between 0 and 100")
     history_lines = fields.One2Many('sale.opportunity.history.lines', 'sale_opportunity', 'History')
-    lost_reason = fields.Text('Reason for loss', states={
-                        'invisible': Not(Equal(Eval('state'), 'lost')),
-                              }, depends=['state'])
+    lost_reason = fields.Text('Reason for loss',
+        states={
+            'invisible': Not(Equal(Eval('state'), 'lost')),
+        }, depends=['state'])
 ····
     def __init__(self):
         super(SaleOpportunity, self).__init__()
         self._order[0] = ('date', 'DESC')
         self._sql_constraints += [
-            ('check_percentage','CHECK(probability >= 0 AND probability <= 100)', 'Probability must be between 0 and 100!')
+            ('check_percentage',·
+             'CHECK(probability >= 0 AND probability <= 100)', 
+             'Probability must be between 0 and 100!')
         ]
 ····
     def default_state(self, cursor, user, context=None):
         return 'lead'
 ····
     def default_date(self, cursor, user, context=None):
         return datetime.datetime.today()
 ····
     def default_probability(self, cursor, user, context=None):
         return 50
 ····
+    def default_company(self, cursor, user, context=None):
+        if context is None:
+            context = {}
+        if context.get('company'):
+            return context['company']
+        return False
+····
+    def default_employee(self, cursor, user_id, context=None):
+        user_obj = self.pool.get('res.user')
+        employee_obj = self.pool.get('company.employee')
+
+        if context is None:
+            context = {}
+        employee_id = None
+        if context.get('employee'):
+            employee_id = context['employee']
+        else:
+            user = user_obj.browse(cursor, user_id, user_id, context=context)
+            if user.employee:
+                employee_id = user.employee.id
+        if employee_id:
+            return employee_id
+        return False
+····
     def end_lead(self, cursor, user, opp_id, context=None):

[ced, 2010/01/26 20:12:22]

Better to use ids
:param ids: a list of opportunity ids or an opportunity id

[sharoonthomas, 2010/01/26 21:30:35]

But the workflow passes an ID as argument
On 2010/01/26 20:12:22, ced wrote:

         """
         This will fill the end_date for a lead/opportunity
         :param cursor: the database cursor
         :param user: the user id
         :param opp_id: id of the record to be flagged with the current datetime
         :param context: the context·
         """
         self.write(cursor, user, opp_id, {
-          'end_date':datetime.datetime.today(),

[ced, 2010/01/26 20:12:22]

indent 4cols

-          'state': 'converted',
-                                          },context=context)
+                            'end_date':datetime.datetime.today(),
+                            'state': 'converted',
+                }, context=context)
 ····
 SaleOpportunity()
 
 
 class SaleOpportunityLines(ModelSQL, ModelView):
-    'Sale Opportunity Lines/Items'
+    'Sale Opportunity Lines'
     _name = "sale.opportunity.lines"
     _description = __doc__
     _rec_name = "product"
 ····
     opportunity = fields.Many2One('sale.opportunity', 'Opportunity')
     product = fields.Many2One('product.product', 'Product', required=True)
     quantity = fields.Float('Quantity')

[ced, 2010/01/26 20:12:22]

Add an empty line

[sharoonthomas, 2010/01/26 21:30:35]

Done.

+····
 SaleOpportunityLines()
 
 
 class SaleOpportunityHistoryLines(ModelSQL, ModelView):
     'Sale Opportunity History Lines'
     _name = 'sale.opportunity.history.lines'
     _description = __doc__
 
     sale_opportunity = fields.Many2One('sale.opportunity', 'Sale Opportunity')
     date = fields.DateTime('Change Date')
@@ skipping 12 matching lines @@
                         id as sale_opportunity,
                         __id as id,·
                         create_date,
                         write_date,·
                         create_uid,
                         write_uid,
                         COALESCE(write_date, create_date) AS date,
                         COALESCE(write_uid,create_uid) AS user,
                         title,·
                         state,·
-                        probability
-                    FROM """ + opportunity_object._table + """__history

[ced, 2010/01/26 20:12:22]

Quote table name

[sharoonthomas, 2010/01/26 21:30:35]

Done.

-                    """, [])
+                        probability """
+                    'FROM "%s__history"' % opportunity_object._table
+                    , [])
 
-SaleOpportunityHistoryLines()
+SaleOpportunityHistoryLines()