[IMP] miscelleanous improvments
authorFabien Pinckaers <fp@tinyerp.com>
Fri, 25 Jun 2010 08:46:21 +0000 (10:46 +0200)
committerFabien Pinckaers <fp@tinyerp.com>
Fri, 25 Jun 2010 08:46:21 +0000 (10:46 +0200)
bzr revid: fp@tinyerp.com-20100625084621-8mztzgdyxrcfv93w

19 files changed:
addons/account/account_view.xml
addons/account/report/account_balance_landscape.rml [changed mode: 0755->0644]
addons/account/report/account_invoice_report_view.xml
addons/account/report/compare_account_balance.rml [changed mode: 0755->0644]
addons/account/report/voucher_print.py [changed mode: 0755->0644]
addons/account/report/voucher_print.rml [changed mode: 0755->0644]
addons/analytic/project.py
addons/crm/crm.py
addons/crm/crm_lead.py
addons/crm/crm_opportunity_view.xml
addons/crm/report/crm_lead_report.py
addons/crm/report/crm_lead_report_view.xml
addons/crm/wizard/crm_lead_to_opportunity.py
addons/hr_attendance/hr_attendance.py
addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
addons/project_issue/__openerp__.py
addons/project_issue/project_issue.py
addons/project_issue/project_issue_demo.xml
addons/sale_crm/wizard/makesale.py

index aa3bf57..066c5be 100644 (file)
 
         <act_window domain="[('journal_id', '=', active_id)]" id="act_account_journal_2_account_move_line" name="Entry lines" res_model="account.move.line" src_model="account.journal"/>
 
-        <act_window domain="[('partner_id', '=', active_id), ('account_id.type', 'in', ['receivable', 'payable']), ('reconcile_id','=',False)]" id="act_account_partner_account_move_unreconciled" name="Unreconciled Receivables &amp; Payables" res_model="account.move.line" src_model="res.partner"/>
-
         <act_window domain="[('partner_id', '=', active_id), ('account_id.type', 'in', ['receivable', 'payable'])]" id="act_account_partner_account_move_all" name="Receivables &amp; Payables" res_model="account.move.line" src_model="res.partner"/>
 
         <act_window domain="[('partner_id', '=', active_id)]" id="act_account_partner_account_move" name="All Account Entries" res_model="account.move.line" src_model="res.partner"/>
index 448f2ab..c163d50 100644 (file)
         <field name="arch" type="xml">
             <search string="Invoices Analysis">
               <group col="10" colspan="12">
-                       <filter icon="terp-go-year" string="  365 Days  "
-                                   domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]"
-                                   help="Invoices of last 365 days"/>
-                       <filter icon="terp-go-month" string="   30 Days   "
-                                       name="month"
-                                       domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"
-                                       help="Invoices of last 30 days"/>
-                       <filter icon="terp-go-week"
-                               string="    7 Days    "
-                               separator="1"
-                               domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date','&gt;',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
-                               help="Invoices during last 7 days"/>
-                       <separator orientation="vertical"/>
+                    <filter icon="terp-go-year" string="  365 Days  "
+                            domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]"
+                            help="Invoices of last 365 days"/>
+                    <filter icon="terp-go-month" string="   30 Days   "
+                            name="month"
+                            domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"
+                            help="Invoices of last 30 days"/>
+                    <filter icon="terp-go-week"
+                            string="    7 Days    "
+                            separator="1"
+                            domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date','&gt;',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
+                            help="Invoices during last 7 days"/>
+                    <separator orientation="vertical"/>
                     <filter string="Current"
-                                       icon="terp-check"
-                               domain="[('state','in',('draft','open'))]"
-                               help = "Draft and Open Invoices"/>
-                       <filter string="Pro-forma"
-                                       icon="terp-check"
-                                       domain="[('state','=','proforma'),('state','=','proforma2')]"
-                                       help = "Pro-forma Invoices"/>
-                       <filter string="Current"
-                                       domain="[('state', '=' ,'open')]"
-                                       help = "open Invoices"/>
-                       <filter string="Done"
+                            icon="terp-check"
+                            domain="[('state','in',('draft','open'))]"
+                            help = "Draft and Open Invoices"/>
+                       <filter string="Pro-forma"
+                               icon="terp-check"
+                               domain="[('state','=','proforma'),('state','=','proforma2')]"
+                               help = "Pro-forma Invoices"/>
+                       <filter string="Current"
+                            domain="[('state', '=' ,'open')]"
+                            help = "open Invoices"/>
+                    <filter string="Done"
                             icon="terp-dialog-close"
                             domain="[('state','=','paid')]"
                             help = "Done Invoices"/>
                   <field name="partner_id"/>
                     <field name="user_id" widget="selection">
                     <filter icon="terp-dolar"
-                               string="My Invoices"
-                               help="My Invoices"
-                               domain="[('user_id','=',uid)]"/>
+                            string="My Invoices"
+                            help="My Invoices"
+                            domain="[('user_id','=',uid)]"/>
                     </field>
-                               </group>
-                               <newline/>
+                </group>
+                <newline/>
                 <group expand="0" string="Group By...">
-                    <filter string="Salesman" name='User' icon="terp-personal" context="{'group_by':'user_id'}"/>
+                    <filter string="Salesman" name='user' icon="terp-personal" context="{'group_by':'user_id'}"/>
                     <filter string="Partner" icon="terp-personal" context="{'group_by':'partner_id'}"/>
                     <filter string="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id','set_visible':True}"/>
                     <separator orientation="vertical"/>
                     <separator orientation="vertical"/>
                     <filter string="Company" icon="terp-go-home" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
                     <newline/>
-                    <filter string="Day" icon="terp-go-today" context="{'group_by':'day'}"/>
-                    <filter string="Month" icon="terp-go-month" context="{'group_by':'month'}"/>
-                    <filter string="Year" icon="terp-go-year" context="{'group_by':'year'}"/>
+                    <filter string="Day" name="day" icon="terp-go-today" context="{'group_by':'day'}"/>
+                    <filter string="Month" name="month" icon="terp-go-month" context="{'group_by':'month'}"/>
+                    <filter string="Year" name="year" icon="terp-go-year" context="{'group_by':'year'}"/>
                 </group>
                 <newline/>
                 <group expand="0" string="Extended options..." groups="base.group_extended">
         <field name="res_model">account.invoice.report</field>
         <field name="view_type">form</field>
         <field name="view_mode">tree,graph</field>
-        <field name="context">{'search_default_month':1,'search_default_User':1,'group_by_no_leaf':1,'group_by':[]}</field>
+        <field name="context">{'search_default_month':1,'search_default_product':1,'group_by_no_leaf':1,'group_by':[]}</field>
         <field name="search_view_id" ref="view_account_invoice_report_search"/>
     </record>
 
     <menuitem action="action_account_invoice_report_all" id="menu_action_account_invoice_report_all" parent="account.menu_finance_statistic_report_statement" sequence="0"/>
 
+    <act_window
+        domain="[('partner_id', '=', active_id)]"
+        id="act_account_invoice_partner_relation"
+        name="Monthly Turnover"
+        context="{'search_default_month':1,'search_default_user':1,'group_by_no_leaf':1,'group_by':[]}"
+        res_model="account.invoice.report"
+        src_model="res.partner"/>
+
 </data>
 </openerp>
old mode 100755 (executable)
new mode 100644 (file)
old mode 100755 (executable)
new mode 100644 (file)
index f52dd23..77a8817 100644 (file)
@@ -153,13 +153,15 @@ class account_analytic_account(osv.osv):
     def name_get(self, cr, uid, ids, context={}):
         if not len(ids):
             return []
-        reads = self.read(cr, uid, ids, ['name','parent_id'], context)
         res = []
-        for record in reads:
-            name = record['name']
-            if record['parent_id']:
-                name = record['parent_id'][1]+' / '+name
-            res.append((record['id'], name))
+        for account in self.browse(cr, uid, ids, context=context):
+            data = []
+            acc = account
+            while acc:
+                data.insert(0, acc.name)
+                acc = acc.parent_id
+            data = ' / '.join(data)
+            res.append((account.id, data))
         return res
 
     def _complete_name_calc(self, cr, uid, ids, prop, unknow_none, unknow_dict):
@@ -197,7 +199,7 @@ class account_analytic_account(osv.osv):
         'date': fields.date('Date End'),
         'company_id': fields.many2one('res.company', 'Company', required=True),
         'company_currency_id': fields.function(_get_company_currency, method=True, type='many2one', relation='res.currency', string='Currency'),
-        'state': fields.selection([('draft','Draft'),('open','Open'), ('pending','Pending'),('cancelled', 'Cancelled'),('close','Closed'),('template', 'Template')], 'State', required=True,readonly=True,
+        'state': fields.selection([('draft','Draft'),('open','Open'), ('pending','Pending'),('cancelled', 'Cancelled'),('close','Closed'),('template', 'Template')], 'State', required=True,
                                   help='* When an account is created its in \'Draft\' state.\
                                   \n* If any associated partner is there, it can be in \'Open\' state.\
                                   \n* If any pending balance is there it can be in \'Pending\'. \
@@ -314,7 +316,7 @@ class account_analytic_line(osv.osv):
 
     _columns = {
         'name' : fields.char('Description', size=256, required=True),
-        'date' : fields.date('Date', required=True),
+        'date' : fields.date('Date', required=True, select=1),
         'amount' : fields.float('Amount', required=True, help='Calculated by multiplying the quantity and the price given in the Product\'s cost price.'),
         'unit_amount' : fields.float('Quantity', help='Specifies the amount of quantity to count.'),
         'account_id' : fields.many2one('account.analytic.account', 'Analytic Account', required=True, ondelete='cascade', select=True),
index feb49ba..c46519c 100644 (file)
@@ -118,20 +118,18 @@ class crm_case(object):
         @param context: A standard dictionary for contextual values"""
         if not context:
             context = {}
-
         s = self.get_stage_dict(cr, uid, ids, context=context)
         section = self._name
+        stage = False
         stage_pool = self.pool.get('crm.case.stage')
         for case in self.browse(cr, uid, ids, context):
             if section in s:
                 st = case.stage_id.id  or False
                 if st in s[section]:
                     data = {'stage_id': s[section][st]}
-                    stage = stage_pool.browse(cr, uid, s[section][st], context=context)
-                    if stage.on_change:
-                        data.update({'probability': stage.probability})
+                    stage = s[section][st]
                     self.write(cr, uid, [case.id], data)
-        return True
+        return stage
 
     def get_stage_dict(self, cr, uid, ids, context=None):
         """This function gives dictionary for stage according to stage levels
@@ -174,9 +172,10 @@ class crm_case(object):
                 s[section] = dict([(v, k) for (k, v) in s[section].iteritems()])
                 if st in s[section]:
                     data = {'stage_id': s[section][st]}
-                    stage = stage_pool.browse(cr, uid, s[section][st], context=context)
-                    if stage.on_change:
-                        data.update({'probability': stage.probability})
+                    if s[section][st]:
+                        stage = stage_pool.browse(cr, uid, s[section][st], context=context)
+                        if stage.on_change:
+                            data.update({'probability': stage.probability})
                     self.write(cr, uid, [case.id], data)
         return True
 
index e5e1c92..eca93eb 100644 (file)
@@ -117,8 +117,8 @@ and users by email"),
                          domain="[('section_id','=',section_id),\
                         ('object_id.model', '=', 'crm.lead')]"),
         'partner_name': fields.char("Partner Name", size=64),
-        'optin': fields.selection([('yes','Yes'),('no','No'),('unknown','/')],'Opt-In'),
-        'optout': fields.selection([('yes','Yes'),('no','No'),('unknown','/')],'Opt-Out'),
+        'optin': fields.boolean('Opt-In'),
+        'optout': fields.boolean('Opt-Out'),
         'type':fields.selection([
             ('lead','Lead'),
             ('opportunity','Opportunity'),
@@ -150,8 +150,6 @@ and users by email"),
         'user_id': crm_case._get_default_user,
         'email_from': crm_case._get_default_email,
         'state': lambda *a: 'draft',
-        'optin': lambda *a: 'unknown',
-        'optout': lambda *a: 'unknown',
         'section_id': crm_case._get_section,
         'company_id': lambda s, cr, uid, c: s.pool.get('res.company')._company_default_get(cr, uid, 'crm.lead', context=c),
         'priority': lambda *a: crm.AVAILABLE_PRIORITIES[2][0],
@@ -235,6 +233,14 @@ and users by email"),
                         }
         return value
 
+    def stage_next(self, cr, uid, ids, context=None):
+        stage = super(crm_lead, self).stage_next(cr, uid, ids, context)
+        if stage:
+            stage_obj = self.pool.get('crm.case.stage').browse(cr, uid, stage, context=context)
+            if stage_obj.on_change:
+                data = {'probability': stage_obj.probability}
+                self.write(cr, uid, ids, data)
+        return stage
 crm_lead()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
index 4060337..23d3ffc 100644 (file)
                                 <field name="fax"/>
                                 <newline/>
                                 <field name="mobile"/>
+                                <field name="optin"/>
+                                <field name="optout"/>
                             </group>
                         </page>
 
index a70bd45..f9c39c9 100644 (file)
@@ -77,7 +77,6 @@ class crm_lead_report(osv.osv):
         'name': fields.char('Year', size=64, required=False, readonly=True),
         'user_id':fields.many2one('res.users', 'User', readonly=True),
         'section_id':fields.many2one('crm.case.section', 'Section', readonly=True),
-        'nbr': fields.integer('# of Cases', readonly=True),
         'state': fields.selection(AVAILABLE_STATES, 'State', size=16, readonly=True),
         'avg_answers': fields.function(_get_data, string='Avg. Answers', method=True, type="integer"),
         'perc_done': fields.function(_get_data, string='%Done', method=True, type="float"),
@@ -92,10 +91,10 @@ class crm_lead_report(osv.osv):
         'create_date': fields.datetime('Create Date', readonly=True),
         'day': fields.char('Day', size=128, readonly=True),
         'email': fields.integer('# of Emails', size=128, readonly=True),
-        'delay_open': fields.float('Delay to open',digits=(16,2),readonly=True, group_operator="avg",help="Number of Days to open the case"),
+        'delay_open': fields.float('Delay to Open',digits=(16,2),readonly=True, group_operator="avg",help="Number of Days to open the case"),
+        'delay_close': fields.float('Delay to Close',digits=(16,2),readonly=True, group_operator="avg",help="Number of Days to close the case"),
         'delay_expected': fields.float('Overpassed Deadline',digits=(16,2),readonly=True, group_operator="avg"),
-        'delay_close': fields.float('Delay to close',digits=(16,2),readonly=True, group_operator="avg",help="Number of Days to close the case"),
-        'probability': fields.float('Probability',digits=(16,2),readonly=True),
+        'probability': fields.float('Probability',digits=(16,2),readonly=True, group_operator="avg"),
         'planned_revenue': fields.float('Planned Revenue',digits=(16,2),readonly=True),
         'categ_id': fields.many2one('crm.case.categ', 'Category',\
                          domain="[('section_id','=',section_id),\
@@ -107,6 +106,7 @@ class crm_lead_report(osv.osv):
         'opening_date': fields.date('Opening Date', readonly=True),
         'creation_date': fields.date('Creation Date', readonly=True),
         'date_closed': fields.date('Close Date', readonly=True),
+        'nbr': fields.integer('# of Cases', readonly=True),
         'company_id': fields.many2one('res.company', 'Company', readonly=True),
         'priority': fields.selection(crm.AVAILABLE_PRIORITIES, 'Priority'),
         'type':fields.selection([
index 5292b29..c95cd04 100644 (file)
                 <field name="partner_id" invisible="1"/>
                 <field name="day" invisible="1"/>
                 <field name="nbr" sum="# Leads"/>
-                <field name="email" sum="#Mails"/>
-                <field name="delay_open" sum='Avg Closing Delay'/>
-                <field name="delay_close" sum='Avg Closing Delay'/>
+                <field name="email" sum="# Mails"/>
+                <field name="delay_open"/>
+                <field name="delay_close"/>
                 <field name="delay_expected"/>
                 <field name="avg_answers"/>
              </tree>
             </field>
         </record>
 
-<!-- Leads by user and section Form View -->
-
-        <record id="view_report_crm_lead_form" model="ir.ui.view">
-            <field name="name">crm.lead.report.form</field>
-            <field name="model">crm.lead.report</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <form string="Leads Analysis">
-                    <field name="name" select="1"/>
-                    <field name="month" select="1"/>
-                    <field name="user_id" select="1"/>
-                    <field name="section_id" select="1"/>
-                    <field name="nbr" select="1"/>
-                    <field name="delay_close"/>
-                    <field name="stage_id"/>
-                    <field name="state" select="1"/>
-                </form>
-            </field>
-        </record>
-
 <!-- Leads by user and section Graph View -->
 
         <record id="view_report_crm_lead_graph" model="ir.ui.view">
@@ -60,8 +40,8 @@
             <field name="type">graph</field>
             <field name="arch" type="xml">
                 <graph orientation="horizontal" string="Leads Analysis" type="bar">
-                    <field name="state"/>
-                    <field name="nbr" operator="+"/>
+                    <field name="day"/>
+                    <field name="planned_revenue" operator="+"/>
                     <field group="True" name="user_id"/>
                 </graph>
             </field>
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Leads Analysis">
-                    <group col="16" colspan="8">
-                           <filter string="Last 365 Days" icon="terp-go-year"
-                               domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('create_date','&gt;',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]"/>
-                        <filter string="Last 30 Days" icon="terp-go-month" name="This Month"
-                            domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('create_date','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"/>
+                    <group col="20" colspan="8">
+                        <filter icon="terp-check"
+                            string="Opportunities"
+                            name="opportunity"
+                            domain="[('type','=','opportunity')]"/>
+                        <filter icon="terp-check"
+                            string="Leads"
+                            name="lead"
+                            domain="[('type','=','lead')]"/>
+                        <separator orientation="vertical" />
+                        <filter string="Last 365 Days" icon="terp-go-year"
+                            domain="[('create_date','&gt;',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]"/>
+                        <filter string="Last 30 Days" icon="terp-go-month" name="this_month"
+                            domain="[('create_date','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"/>
                         <filter icon="terp-go-week" string="7 Days" separator="1"
-                            domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('create_date','&gt;',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"/>
-                           <separator orientation="vertical" />
+                            domain="[('create_date','&gt;',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"/>
+                        <separator orientation="vertical" />
                         <filter icon="terp-check"
                             string="Current"
                             domain="[('state','in',('draft','open')]"/>
                         <filter icon="terp-check"
                             string="Pending"
                             domain="[('state','=','pending')]"/>
-                           <separator orientation="vertical" />
-                           <field name="section_id"
-                               default="context.get('section_id', False)"
-                               widget="selection"
-                               context="{'invisible_section': False}">
-                           <filter icon="terp-crm"
-                               context="{'invisible_section': False}"
-                               domain="[('section_id.user_id','=',uid)]"
-                               help="My section" />
-                           </field>
-                          <field name="user_id" widget="selection">
+                        <filter icon="terp-check"
+                            string="Closed"
+                            domain="[('state','=','done')]"/>
+                        <separator orientation="vertical" />
+                        <field name="section_id"
+                            default="context.get('section_id', False)"
+                            widget="selection"
+                            context="{'invisible_section': False}">
+                            <filter icon="terp-crm"
+                                context="{'invisible_section': False}"
+                                domain="[('section_id.user_id','=',uid)]"
+                                help="My section" />
+                        </field>
+                        <field name="user_id" widget="selection">
                             <filter icon="terp-personal+" string="My Case" help="My Case" domain="[('user_id','=',uid)]" />
-                           </field>
+                        </field>
                    </group>
                    <newline/>
                    <group  expand="0" string="Group By...">
-                        <filter string="User" name="User" icon="terp-personal"
+                        <filter string="User" name="user" icon="terp-personal"
                             domain="[]" context="{'group_by':'user_id'}" />
                        <filter string="Partner" icon="terp-personal" context="{'group_by':'partner_id'}" />
                         <separator orientation="vertical" />
                         <filter string="Year" icon="terp-go-year"
                             domain="[]" context="{'group_by':'name'}" />
                   </group>
-                   <newline/>
-                   <group  expand="0" string="Extended options..." groups="base.group_extended">
-                       <field name="partner_id"/>
-                            <separator orientation="vertical"/>
-                         <field name="stage_id" widget="selection" domain="[('object_id.model', '=', 'crm.lead')]"/>
-                         <field name="categ_id" widget="selection" domain="[('object_id.model', '=', 'crm.lead')]"/>
-                          <separator orientation="vertical"/>
-                         <field name="company_id" widget="selection" groups="base.group_multi_company"/>
-                           <newline/>
-                          <field name="creation_date"/>
-                          <field name="opening_date"/>
-                          <field name="date_closed"/>
-                   </group>
+                  <newline/>
+                  <group  expand="0" string="Extended options..." groups="base.group_extended">
+                      <field name="partner_id"/>
+                      <separator orientation="vertical"/>
+                      <field name="stage_id" widget="selection" domain="[('object_id.model', '=', 'crm.lead')]"/>
+                      <field name="categ_id" widget="selection" domain="[('object_id.model', '=', 'crm.lead')]"/>
+                      <separator orientation="vertical"/>
+                      <field name="company_id" widget="selection" groups="base.group_multi_company"/>
+                      <newline/>
+                      <field name="creation_date"/>
+                      <field name="opening_date"/>
+                      <field name="date_closed"/>
+                  </group>
                </search>
             </field>
         </record>
             <field name="name">Leads Analysis</field>
             <field name="res_model">crm.lead.report</field>
             <field name="view_type">form</field>
-            <field name="context">{"search_default_User":1,"search_default_This Month":1,'group_by_no_leaf':1,'group_by':[]}</field>
+            <field name="context">{'search_default_opportunity':1, "search_default_user":1,"search_default_this_month":1,'group_by_no_leaf':1,'group_by':[]}</field>
             <field name="view_mode">tree,graph</field>
-            <field name="domain">['|',('type', '=', 'lead'),('type', '=', False)]</field>
-            <field name="search_view_id" ref="view_report_crm_lead_filter"/>
+            <field name="domain">[]</field>
         </record>
 
        <record model="ir.actions.act_window.view" id="action_report_crm_lead_tree">
             <field name="name">Opportunities Analysis</field>
             <field name="res_model">crm.lead.report</field>
             <field name="view_type">form</field>
-            <field name="context">{"search_default_User":1,"search_default_This Month":1,'group_by_no_leaf':1,'group_by':[]}</field>
+            <field name="context">{"search_default_opportunity": 1, "search_default_user":1,"search_default_this_month":1,'group_by_no_leaf':1,'group_by':[]}</field>
             <field name="view_mode">tree,graph</field>
-            <field name="domain">[('type', '=', 'opportunity')]</field>
-            <field name="search_view_id" ref="view_report_crm_lead_filter"/>
+            <field name="domain">[]</field>
         </record>
 
        <record model="ir.actions.act_window.view" id="action_report_crm_opportunity_tree">
index 12edf5e..00a2fb7 100644 (file)
@@ -81,9 +81,7 @@ class crm_lead2opportunity(osv.osv_memory):
                 'partner_id': this.partner_id.id, 
                 'type': 'opportunity'
             }
-            
             lead_obj.write(cr, uid, lead.id, vals, context=context)
-            
             lead_obj._history(cr, uid, [lead], _('Opportunity'), details='Converted to Opportunity', context=context)
 
         value = {
index 9f58466..e14a91d 100644 (file)
@@ -54,7 +54,7 @@ class hr_attendance(osv.osv):
 
         return res
     _columns = {
-        'name' : fields.datetime('Date', required=True),
+        'name' : fields.datetime('Date', required=True, select=1),
         'action' : fields.selection([('sign_in', 'Sign In'), ('sign_out', 'Sign Out'),('action','Action')], 'Action', required=True),
         'action_desc' : fields.many2one("hr.action.reason", "Action reason", domain="[('action_type', '=', action)]", help='Specifies the reason for Signing In/Signing Out in case of extra hours.'),
         'employee_id' : fields.many2one('hr.employee', "Employee's Name", required=True, select=True),
index 487e368..050b798 100644 (file)
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Timesheet">
-                    <field name="name"/>
-                    <field name="user_id"/>
-                    <field name="date_from"/>
-                    <field name="date_to"/>
-                    <field name="company_id" select="1" groups="base.group_multi_company"/>
-                    <field name="department_id" groups="base.group_extended"/>
+                    <group colspan="4" col="6">
+                        <field name="name"/>
+                        <field name="company_id" select="1" groups="base.group_multi_company"/>
+                        <field name="department_id" groups="base.group_extended"/>
+                        <newline/>
+                        <field name="user_id"/>
+                        <field name="date_from"/>
+                        <field name="date_to"/>
+                    </group>
                     <notebook colspan="4">
                         <page string="Daily View">
                             <group col="6" colspan="4">
                                 <button name="sign_in" string="Sign In" type="object" icon="terp-gtk-jump-to-ltr"/>
                                 <button name="sign_out" string="Sign Out" type="object" icon="terp-gtk-jump-to-rtl"/>
                             </group>
-
                             <field name="state_attendance" groups="hr_attendance.group_hr_attendance"/>
                             <field name="total_attendance_day" widget="float_time" groups="hr_attendance.group_hr_attendance"/>
                             <field colspan="4" context="date=date_current,user_id=user_id" domain="[('name','=',date_current)]" name="timesheet_ids" nolabel="1">
                                     <field invisible="1" name="journal_id"/>
                                     <field invisible="1" name="product_id"/>
                                     <field invisible="1" name="product_uom_id" on_change="on_change_unit_amount(product_id, unit_amount, product_uom_id)"/>
-                                    <field name="amount"/>
-                                    <field name="general_account_id"/>
+                                    <field invisible="1" name="amount"/>
+                                    <field invisible="1" name="general_account_id"/>
                                     <field invisible="1" name="user_id" required="1"/>
                                 </tree>
                                 <form string="Timesheet">
                                     <field name="name"/>
                                     <field name="unit_amount" on_change="on_change_unit_amount(product_id, unit_amount, product_uom_id)" widget="float_time"/>
                                     <field name="to_invoice"/>
-                                    <field invisible="1" name="journal_id"/>
-                                    <field invisible="1" name="product_id"/>
-                                    <field invisible="1" name="product_uom_id" on_change="on_change_unit_amount(product_id, unit_amount, product_uom_id)"/>
+                                    <field name="journal_id"/>
+                                    <field name="product_id"/>
+                                    <field name="product_uom_id" on_change="on_change_unit_amount(product_id, unit_amount, product_uom_id)"/>
                                     <field name="amount"/>
                                     <field name="general_account_id"/>
                                     <field name="user_id" required="1"/>
index 7339399..97f9e96 100644 (file)
@@ -34,7 +34,7 @@
         'crm',
         'project',
         'hr_timesheet_sheet',
-        'project_long_term',
+        'resource'
     ],
     'init_xml': [
         'project_issue_data.xml'
index 5a70987..8ec01ae 100644 (file)
@@ -301,3 +301,11 @@ class project_issue(osv.osv, crm.crm_case):
 
 project_issue()
 
+class project(osv.osv):
+    _inherit = "project.project"
+    _columns = {
+        'resource_calendar_id': fields.many2one('resource.calendar', 'Working Time', help="Timetable working hours to adjust the gantt diagram report"),
+    }
+project()
+
+
index ed03167..aee12cc 100644 (file)
 <?xml version="1.0"?>
 <openerp>
 <data noupdate="1">
-       <!--
-               ((((((((((( Demo Cases )))))))))))
-       -->
-<!--For Issue Tracking-->
-       <record id="crm_case_buginaccountsmodule0" model="project.issue">
-               <field name="partner_address_id" ref="base.res_partner_address_8"/>
-               <field eval="time.strftime('%Y-%m-08 10:15:00')" name="date"/>
-               <field name="type_id" ref="type1"/>
-               <field eval="&quot;5&quot;" name="priority"/>
-               <field name="user_id" ref="base.user_root"/>
-               <field name="partner_id" ref="base.res_partner_agrolait"/>
-               <field eval="&quot;open&quot;" name="state"/>
-               <field name="section_id" ref="crm.section_sales_department"/>
-               <field eval="1" name="active"/>
-               <field name="categ_id" ref="bug_categ"/>
-               <field name="stage_id" ref="stage1"/>
-               <field name="project_id" ref="project.project_project_22"/>
-               <field eval="15.0" name="duration"/>
-               <field eval="&quot;Bug in Accounts module&quot;" name="name"/>
-               <field eval="&quot;agr@agrolait.com&quot;" name="email_from"/>
-       </record>
-       <record id="crm_case_log_takecorrectiveactions0" model="mailgate.message">
-               <field eval="time.strftime('%Y-%m-08')" name="date"/>
-               <field name="case_id" ref="crm_case_buginaccountsmodule0"/>
-               <field name="som" ref="base.som_normal"/>
-               <field eval="&quot;Take corrective actions&quot;" name="name"/>
-               <field model="res.partner.canal" name="canal_id" search="[('name','=','website')]"/>
-       </record>
+    <record id="crm_case_buginaccountsmodule0" model="project.issue">
+        <field name="partner_address_id" ref="base.res_partner_address_8"/>
+        <field eval="time.strftime('%Y-%m-08 10:15:00')" name="date"/>
+        <field name="type_id" ref="type1"/>
+        <field eval="&quot;5&quot;" name="priority"/>
+        <field name="user_id" ref="base.user_root"/>
+        <field name="partner_id" ref="base.res_partner_agrolait"/>
+        <field eval="&quot;open&quot;" name="state"/>
+        <field name="section_id" ref="crm.section_sales_department"/>
+        <field eval="1" name="active"/>
+        <field name="categ_id" ref="bug_categ"/>
+        <field name="stage_id" ref="stage1"/>
+        <field name="project_id" ref="project.project_project_22"/>
+        <field eval="15.0" name="duration"/>
+        <field eval="&quot;Bug in Accounts module&quot;" name="name"/>
+        <field eval="&quot;agr@agrolait.com&quot;" name="email_from"/>
+    </record>
 
-       <record id="crm_case_programnotgivingproperoutput0" model="project.issue">
-               <field name="partner_address_id" ref="base.res_partner_address_tang"/>
-               <field eval="time.strftime('%Y-%m-15  12:50:00')" name="date"/>
-               <field name="type_id" ref="type2"/>
-               <field eval="&quot;3&quot;" name="priority"/>
-               <field name="user_id" ref="base.user_root"/>
-               <field name="partner_id" ref="base.res_partner_asus"/>
-               <field eval="&quot;done&quot;" name="state"/>
-               <field name="section_id" ref="crm.section_sales_department"/>
-               <field eval="1" name="active"/>
-               <field eval="3.5" name="duration"/>
-               <field name="categ_id" ref="bug_categ"/>
-               <field name="stage_id" ref="stage2"/>
-               <field eval="&quot;Program not giving proper output&quot;" name="name"/>
-               <field name="project_id" ref="project.project_project_22"/>
-       </record>
+    <record id="crm_case_programnotgivingproperoutput0" model="project.issue">
+        <field name="partner_address_id" ref="base.res_partner_address_tang"/>
+        <field eval="time.strftime('%Y-%m-15  12:50:00')" name="date"/>
+        <field name="type_id" ref="type2"/>
+        <field eval="&quot;3&quot;" name="priority"/>
+        <field name="user_id" ref="base.user_root"/>
+        <field name="partner_id" ref="base.res_partner_asus"/>
+        <field eval="&quot;done&quot;" name="state"/>
+        <field name="section_id" ref="crm.section_sales_department"/>
+        <field eval="1" name="active"/>
+        <field eval="3.5" name="duration"/>
+        <field name="categ_id" ref="bug_categ"/>
+        <field name="stage_id" ref="stage2"/>
+        <field eval="&quot;Program not giving proper output&quot;" name="name"/>
+        <field name="project_id" ref="project.project_project_22"/>
+    </record>
 
-       <record id="crm_case_outputincorrect0" model="project.issue">
-               <field name="partner_address_id" ref="base.res_partner_address_9"/>
-               <field eval="time.strftime('%Y-%m-18 14:30:00')" name="date"/>
-               <field name="type_id" ref="type1"/>
-               <field eval="&quot;4&quot;" name="priority"/>
-               <field name="user_id" ref="base.user_demo"/>
-               <field eval="&quot;cancel&quot;" name="state"/>
-               <field name="section_id" ref="crm.section_sales_department"/>
-               <field eval="1" name="active"/>
-               <field eval="2.3" name="duration"/>
-               <field name="categ_id" ref="bug_categ"/>
-               <field name="stage_id" ref="stage3"/>
-               <field name="project_id" ref="project.project_project_23"/>
-               <field eval="&quot;Output incorrect&quot;" name="name"/>
-       </record>
+    <record id="crm_case_outputincorrect0" model="project.issue">
+        <field name="partner_address_id" ref="base.res_partner_address_9"/>
+        <field eval="time.strftime('%Y-%m-18 14:30:00')" name="date"/>
+        <field name="type_id" ref="type1"/>
+        <field eval="&quot;4&quot;" name="priority"/>
+        <field name="user_id" ref="base.user_demo"/>
+        <field eval="&quot;cancel&quot;" name="state"/>
+        <field name="section_id" ref="crm.section_sales_department"/>
+        <field eval="1" name="active"/>
+        <field eval="2.3" name="duration"/>
+        <field name="categ_id" ref="bug_categ"/>
+        <field name="stage_id" ref="stage3"/>
+        <field name="project_id" ref="project.project_project_23"/>
+        <field eval="&quot;Output incorrect&quot;" name="name"/>
+    </record>
 
-       <record id="crm_case_problemloadingpage0" model="project.issue">
-               <field name="partner_address_id" ref="base.res_partner_address_13"/>
-               <field eval="time.strftime('%Y-%m-20  15:25:05')" name="date"/>
-               <field name="type_id" ref="type1"/>
-               <field eval="&quot;3&quot;" name="priority"/>
-               <field name="user_id" ref="base.user_root"/>
-               <field name="partner_id" ref="base.res_partner_14"/>
-               <field eval="&quot;cancel&quot;" name="state"/>
-               <field name="section_id" ref="crm.section_sales_department"/>
-               <field eval="1" name="active"/>
-               <field eval="4.0" name="duration"/>
-               <field name="categ_id" ref="bug_categ"/>
-               <field name="stage_id" ref="stage4"/>
-               <field name="project_id" ref="project.project_project_22"/>
-               <field eval="&quot;Problem loading page&quot;" name="name"/>
-       </record>
+    <record id="crm_case_problemloadingpage0" model="project.issue">
+        <field name="partner_address_id" ref="base.res_partner_address_13"/>
+        <field eval="time.strftime('%Y-%m-20  15:25:05')" name="date"/>
+        <field name="type_id" ref="type1"/>
+        <field eval="&quot;3&quot;" name="priority"/>
+        <field name="user_id" ref="base.user_root"/>
+        <field name="partner_id" ref="base.res_partner_14"/>
+        <field eval="&quot;cancel&quot;" name="state"/>
+        <field name="section_id" ref="crm.section_sales_department"/>
+        <field eval="1" name="active"/>
+        <field eval="4.0" name="duration"/>
+        <field name="categ_id" ref="bug_categ"/>
+        <field name="stage_id" ref="stage4"/>
+        <field name="project_id" ref="project.project_project_22"/>
+        <field eval="&quot;Problem loading page&quot;" name="name"/>
+    </record>
 
-       <record id="crm_case_pagenotfound0" model="project.issue">
-               <field eval="time.strftime('%Y-%m-22  18:15:00')" name="date"/>
-               <field name="type_id" ref="type1"/>
-               <field eval="&quot;3&quot;" name="priority"/>
-               <field name="user_id" ref="base.user_root"/>
-               <field name="partner_id" ref="base.res_partner_desertic_hispafuentes"/>
-               <field eval="&quot;draft&quot;" name="state"/>
-               <field name="section_id" ref="crm.section_sales_department"/>
-               <field eval="1" name="active"/>
-               <field eval="1.0" name="duration"/>
-               <field name="categ_id" ref="bug_categ"/>
-               <field name="stage_id" ref="stage5"/>
-               <field name="project_id" ref="project.project_project_22"/>
-               <field eval="&quot;Page not Found&quot;" name="name"/>
-       </record>
+    <record id="crm_case_pagenotfound0" model="project.issue">
+        <field eval="time.strftime('%Y-%m-22  18:15:00')" name="date"/>
+        <field name="type_id" ref="type1"/>
+        <field eval="&quot;3&quot;" name="priority"/>
+        <field name="user_id" ref="base.user_root"/>
+        <field name="partner_id" ref="base.res_partner_desertic_hispafuentes"/>
+        <field eval="&quot;draft&quot;" name="state"/>
+        <field name="section_id" ref="crm.section_sales_department"/>
+        <field eval="1" name="active"/>
+        <field eval="1.0" name="duration"/>
+        <field name="categ_id" ref="bug_categ"/>
+        <field name="stage_id" ref="stage5"/>
+        <field name="project_id" ref="project.project_project_22"/>
+        <field eval="&quot;Page not Found&quot;" name="name"/>
+    </record>
 
-       <record id="crm_case_programmingerror0" model="project.issue">
-               <field name="partner_address_id" ref="base.res_partner_address_10"/>
-               <field eval="time.strftime('%Y-%m-24  09:45:00')" name="date"/>
-               <field name="type_id" ref="type2"/>
-               <field eval="&quot;3&quot;" name="priority"/>
-               <field name="user_id" ref="base.user_root"/>
-               <field name="partner_id" ref="base.res_partner_5"/>
-               <field eval="&quot;pending&quot;" name="state"/>
-               <field name="section_id" ref="crm.section_sales_department"/>
-               <field eval="1" name="active"/>
-               <field eval="4.0" name="duration"/>
-               <field name="categ_id" ref="bug_categ"/>
-               <field name="stage_id" ref="stage6"/>
-               <field name="project_id" ref="project.project_project_22"/>
-               <field eval="&quot;Programming Error&quot;" name="name"/>
-       </record>
+    <record id="crm_case_programmingerror0" model="project.issue">
+        <field name="partner_address_id" ref="base.res_partner_address_10"/>
+        <field eval="time.strftime('%Y-%m-24  09:45:00')" name="date"/>
+        <field name="type_id" ref="type2"/>
+        <field eval="&quot;3&quot;" name="priority"/>
+        <field name="user_id" ref="base.user_root"/>
+        <field name="partner_id" ref="base.res_partner_5"/>
+        <field eval="&quot;pending&quot;" name="state"/>
+        <field name="section_id" ref="crm.section_sales_department"/>
+        <field eval="1" name="active"/>
+        <field eval="4.0" name="duration"/>
+        <field name="categ_id" ref="bug_categ"/>
+        <field name="stage_id" ref="stage6"/>
+        <field name="project_id" ref="project.project_project_22"/>
+        <field eval="&quot;Programming Error&quot;" name="name"/>
+    </record>
 
-       <record id="crm_case_logicalerrorinprogram0" model="project.issue">
-               <field name="partner_address_id" ref="base.res_partner_address_6"/>
-               <field eval="time.strftime('%Y-%m-26  11:10:00')" name="date"/>
-               <field name="type_id" ref="type1"/>
-               <field eval="&quot;2&quot;" name="priority"/>
-               <field name="user_id" ref="base.user_root"/>
-               <field name="partner_id" ref="base.res_partner_6"/>
-               <field eval="&quot;pending&quot;" name="state"/>
-               <field name="section_id" ref="crm.section_sales_department"/>
-               <field eval="1" name="active"/>
-               <field eval="2.0" name="duration"/>
-               <field name="categ_id" ref="bug_categ"/>
-               <field name="stage_id" ref="stage6"/>
-               <field name="project_id" ref="project.project_project_9"/>
-               <field eval="&quot;Logical Error in Program&quot;" name="name"/>
-       </record>
+    <record id="crm_case_logicalerrorinprogram0" model="project.issue">
+        <field name="partner_address_id" ref="base.res_partner_address_6"/>
+        <field eval="time.strftime('%Y-%m-26  11:10:00')" name="date"/>
+        <field name="type_id" ref="type1"/>
+        <field eval="&quot;2&quot;" name="priority"/>
+        <field name="user_id" ref="base.user_root"/>
+        <field name="partner_id" ref="base.res_partner_6"/>
+        <field eval="&quot;pending&quot;" name="state"/>
+        <field name="section_id" ref="crm.section_sales_department"/>
+        <field eval="1" name="active"/>
+        <field eval="2.0" name="duration"/>
+        <field name="categ_id" ref="bug_categ"/>
+        <field name="stage_id" ref="stage6"/>
+        <field name="project_id" ref="project.project_project_9"/>
+        <field eval="&quot;Logical Error in Program&quot;" name="name"/>
+    </record>
 
-       <record id="crm_case_constrainterror0" model="project.issue">
-               <field name="partner_address_id" ref="base.res_partner_address_6"/>
-               <field eval="time.strftime('%Y-%m-25  13:35:00')" name="date"/>
-               <field name="type_id" ref="type1"/>
-               <field eval="&quot;2&quot;" name="priority"/>
-               <field name="user_id" ref="base.user_root"/>
-               <field name="partner_id" ref="base.res_partner_6"/>
-               <field eval="&quot;pending&quot;" name="state"/>
-               <field name="section_id" ref="crm.section_sales_department"/>
-               <field eval="1" name="active"/>
-               <field eval="7.3" name="duration"/>
-               <field name="categ_id" ref="bug_categ"/>
-               <field name="stage_id" ref="stage5"/>
-               <field name="project_id" ref="project.project_project_9"/>
-               <field eval="&quot;Constraint Error&quot;" name="name"/>
-       </record>
+    <record id="crm_case_constrainterror0" model="project.issue">
+        <field name="partner_address_id" ref="base.res_partner_address_6"/>
+        <field eval="time.strftime('%Y-%m-25  13:35:00')" name="date"/>
+        <field name="type_id" ref="type1"/>
+        <field eval="&quot;2&quot;" name="priority"/>
+        <field name="user_id" ref="base.user_root"/>
+        <field name="partner_id" ref="base.res_partner_6"/>
+        <field eval="&quot;pending&quot;" name="state"/>
+        <field name="section_id" ref="crm.section_sales_department"/>
+        <field eval="1" name="active"/>
+        <field eval="7.3" name="duration"/>
+        <field name="categ_id" ref="bug_categ"/>
+        <field name="stage_id" ref="stage5"/>
+        <field name="project_id" ref="project.project_project_9"/>
+        <field eval="&quot;Constraint Error&quot;" name="name"/>
+    </record>
 
-       <record id="crm_case_errorinprogram0" model="project.issue">
-               <field name="partner_address_id" ref="base.res_partner_address_10"/>
-               <field eval="time.strftime('%Y-%m-28  15:40:00')" name="date"/>
-               <field name="type_id" ref="type2"/>
-               <field eval="&quot;2&quot;" name="priority"/>
-               <field name="user_id" ref="base.user_demo"/>
-               <field name="partner_id" ref="base.res_partner_5"/>
-               <field eval="&quot;open&quot;" name="state"/>
-               <field eval="1" name="active"/>
-               <field eval="1.3" name="duration"/>
-               <field name="categ_id" ref="feature_request_categ"/>
-               <field name="stage_id" ref="stage5"/>
-               <field name="project_id" ref="project.project_project_22"/>
-               <field eval="&quot;Error in Program&quot;" name="name"/>
-       </record>
+    <record id="crm_case_errorinprogram0" model="project.issue">
+        <field name="partner_address_id" ref="base.res_partner_address_10"/>
+        <field eval="time.strftime('%Y-%m-28  15:40:00')" name="date"/>
+        <field name="type_id" ref="type2"/>
+        <field eval="&quot;2&quot;" name="priority"/>
+        <field name="user_id" ref="base.user_demo"/>
+        <field name="partner_id" ref="base.res_partner_5"/>
+        <field eval="&quot;open&quot;" name="state"/>
+        <field eval="1" name="active"/>
+        <field eval="1.3" name="duration"/>
+        <field name="categ_id" ref="feature_request_categ"/>
+        <field name="stage_id" ref="stage5"/>
+        <field name="project_id" ref="project.project_project_22"/>
+        <field eval="&quot;Error in Program&quot;" name="name"/>
+    </record>
 
-       <record id="crm_case_patcheserrorinprogram0" model="project.issue">
-               <field name="partner_address_id" ref="base.res_partner_address_9"/>
-               <field eval="time.strftime('%Y-%m-28  16:30:00')" name="date"/>
-               <field name="type_id" ref="type2"/>
-               <field eval="&quot;2&quot;" name="priority"/>
-               <field name="user_id" ref="base.user_root"/>
-               <field name="partner_id" ref="base.res_partner_2"/>
-               <field eval="&quot;open&quot;" name="state"/>
-               <field name="section_id" ref="crm.section_sales_department"/>
-               <field eval="1" name="active"/>
-               <field eval="13.0" name="duration"/>
-               <field name="categ_id" ref="feature_request_categ"/>
-               <field name="stage_id" ref="stage5"/>
-               <field name="project_id" ref="project.project_project_9"/>
-               <field eval="&quot;Patches Error in Program&quot;" name="name"/>
-       </record>
+    <record id="crm_case_patcheserrorinprogram0" model="project.issue">
+        <field name="partner_address_id" ref="base.res_partner_address_9"/>
+        <field eval="time.strftime('%Y-%m-28  16:30:00')" name="date"/>
+        <field name="type_id" ref="type2"/>
+        <field eval="&quot;2&quot;" name="priority"/>
+        <field name="user_id" ref="base.user_root"/>
+        <field name="partner_id" ref="base.res_partner_2"/>
+        <field eval="&quot;open&quot;" name="state"/>
+        <field name="section_id" ref="crm.section_sales_department"/>
+        <field eval="1" name="active"/>
+        <field eval="13.0" name="duration"/>
+        <field name="categ_id" ref="feature_request_categ"/>
+        <field name="stage_id" ref="stage5"/>
+        <field name="project_id" ref="project.project_project_9"/>
+        <field eval="&quot;Patches Error in Program&quot;" name="name"/>
+    </record>
 
-       <record id="crm_case_newfeaturestobeadded0" model="project.issue">
-               <field name="partner_address_id" ref="base.res_partner_address_wong"/>
-               <field eval="time.strftime('%Y-%m-01 12:15:10')" name="date"/>
-               <field name="type_id" ref="type1"/>
-               <field eval="&quot;4&quot;" name="priority"/>
-               <field name="user_id" ref="base.user_root"/>
-               <field name="partner_id" ref="base.res_partner_maxtor"/>
-               <field eval="&quot;open&quot;" name="state"/>
-               <field name="section_id" ref="crm.section_sales_department"/>
-               <field eval="1" name="active"/>
-               <field eval="3.2" name="duration"/>
-               <field name="categ_id" ref="feature_request_categ"/>
-               <field name="stage_id" ref="stage1"/>
-               <field name="project_id" ref="project.project_project_21"/>
-               <field eval="&quot;New Features To Be Added&quot;" name="name"/>
-       </record>
+    <record id="crm_case_newfeaturestobeadded0" model="project.issue">
+        <field name="partner_address_id" ref="base.res_partner_address_wong"/>
+        <field eval="time.strftime('%Y-%m-01 12:15:10')" name="date"/>
+        <field name="type_id" ref="type1"/>
+        <field eval="&quot;4&quot;" name="priority"/>
+        <field name="user_id" ref="base.user_root"/>
+        <field name="partner_id" ref="base.res_partner_maxtor"/>
+        <field eval="&quot;open&quot;" name="state"/>
+        <field name="section_id" ref="crm.section_sales_department"/>
+        <field eval="1" name="active"/>
+        <field eval="3.2" name="duration"/>
+        <field name="categ_id" ref="feature_request_categ"/>
+        <field name="stage_id" ref="stage1"/>
+        <field name="project_id" ref="project.project_project_21"/>
+        <field eval="&quot;New Features To Be Added&quot;" name="name"/>
+    </record>
 
-       <record id="crm_case_addmenustothemodule0" model="project.issue">
-               <field name="partner_address_id" ref="base.res_partner_address_1"/>
-               <field eval="time.strftime('%Y-%m-05 18:00:00')" name="date"/>
-               <field name="type_id" ref="type2"/>
-               <field eval="&quot;1&quot;" name="priority"/>
-               <field name="user_id" ref="base.user_demo"/>
-               <field name="partner_id" ref="base.res_partner_9"/>
-               <field eval="&quot;done&quot;" name="state"/>
-               <field name="section_id" ref="crm.section_sales_department"/>
-               <field eval="1" name="active"/>
-               <field eval="3.0" name="duration"/>
-               <field name="categ_id" ref="feature_request_categ"/>
-               <field name="stage_id" ref="stage2"/>
-               <field name="project_id" ref="project.project_project_21"/>
-               <field eval="&quot;Add menus to the module&quot;" name="name"/>
-               <field eval="&quot;info@opensides.be&quot;" name="email_from"/>
-       </record>
+    <record id="crm_case_addmenustothemodule0" model="project.issue">
+        <field name="partner_address_id" ref="base.res_partner_address_1"/>
+        <field eval="time.strftime('%Y-%m-05 18:00:00')" name="date"/>
+        <field name="type_id" ref="type2"/>
+        <field eval="&quot;1&quot;" name="priority"/>
+        <field name="user_id" ref="base.user_demo"/>
+        <field name="partner_id" ref="base.res_partner_9"/>
+        <field eval="&quot;done&quot;" name="state"/>
+        <field name="section_id" ref="crm.section_sales_department"/>
+        <field eval="1" name="active"/>
+        <field eval="3.0" name="duration"/>
+        <field name="categ_id" ref="feature_request_categ"/>
+        <field name="stage_id" ref="stage2"/>
+        <field name="project_id" ref="project.project_project_21"/>
+        <field eval="&quot;Add menus to the module&quot;" name="name"/>
+        <field eval="&quot;info@opensides.be&quot;" name="email_from"/>
+    </record>
 
-       <record id="crm_case_includeattendancesheetinproject0" model="project.issue">
-               <field name="partner_address_id" ref="base.res_partner_address_2"/>
-               <field eval="time.strftime('%Y-%m-10 17:05:30')" name="date"/>
-               <field name="type_id" ref="type1"/>
-               <field eval="&quot;3&quot;" name="priority"/>
-               <field name="user_id" ref="base.user_root"/>
-               <field name="partner_id" ref="base.res_partner_10"/>
-               <field eval="&quot;cancel&quot;" name="state"/>
-               <field name="section_id" ref="crm.section_sales_department"/>
-               <field eval="1" name="active"/>
-               <field eval="2.0" name="duration"/>
-               <field name="categ_id" ref="feature_request_categ"/>
-               <field name="stage_id" ref="stage3"/>
-               <field name="project_id" ref="project.project_project_9"/>
-               <field eval="&quot;Include Attendance sheet in Project&quot;" name="name"/>
-               <field eval="&quot;contact@tecsas.fr&quot;" name="email_from"/>
-       </record>
+    <record id="crm_case_includeattendancesheetinproject0" model="project.issue">
+        <field name="partner_address_id" ref="base.res_partner_address_2"/>
+        <field eval="time.strftime('%Y-%m-10 17:05:30')" name="date"/>
+        <field name="type_id" ref="type1"/>
+        <field eval="&quot;3&quot;" name="priority"/>
+        <field name="user_id" ref="base.user_root"/>
+        <field name="partner_id" ref="base.res_partner_10"/>
+        <field eval="&quot;cancel&quot;" name="state"/>
+        <field name="section_id" ref="crm.section_sales_department"/>
+        <field eval="1" name="active"/>
+        <field eval="2.0" name="duration"/>
+        <field name="categ_id" ref="feature_request_categ"/>
+        <field name="stage_id" ref="stage3"/>
+        <field name="project_id" ref="project.project_project_9"/>
+        <field eval="&quot;Include Attendance sheet in Project&quot;" name="name"/>
+        <field eval="&quot;contact@tecsas.fr&quot;" name="email_from"/>
+    </record>
 
-       <record id="crm_case_createnewobject0" model="project.issue">
-               <field model="res.partner.canal" name="canal_id" search="[('name','=','phone')]"/>
-               <field name="partner_address_id" ref="base.res_partner_address_6"/>
-               <field name="som" ref="base.som_happy"/>
-               <field eval="time.strftime('%Y-%m-15 10:35:15')" name="date"/>
-               <field name="type_id" ref="type1"/>
-               <field eval="&quot;3&quot;" name="priority"/>
-               <field name="user_id" ref="base.user_root"/>
-               <field name="partner_id" ref="base.res_partner_6"/>
-               <field eval="&quot;draft&quot;" name="state"/>
-               <field name="section_id" ref="crm.section_sales_department"/>
-               <field eval="1" name="active"/>
-               <field eval="2.45" name="duration"/>
-               <field name="categ_id" ref="feature_request_categ"/>
-               <field name="stage_id" ref="stage5"/>
-               <field name="project_id" ref="project.project_project_22"/>
-               <field eval="&quot;Create new object&quot;" name="name"/>
-       </record>
+    <record id="crm_case_createnewobject0" model="project.issue">
+        <field model="res.partner.canal" name="canal_id" search="[('name','=','phone')]"/>
+        <field name="partner_address_id" ref="base.res_partner_address_6"/>
+        <field eval="time.strftime('%Y-%m-15 10:35:15')" name="date"/>
+        <field name="type_id" ref="type1"/>
+        <field eval="&quot;3&quot;" name="priority"/>
+        <field name="user_id" ref="base.user_root"/>
+        <field name="partner_id" ref="base.res_partner_6"/>
+        <field eval="&quot;draft&quot;" name="state"/>
+        <field name="section_id" ref="crm.section_sales_department"/>
+        <field eval="1" name="active"/>
+        <field eval="2.45" name="duration"/>
+        <field name="categ_id" ref="feature_request_categ"/>
+        <field name="stage_id" ref="stage5"/>
+        <field name="project_id" ref="project.project_project_22"/>
+        <field eval="&quot;Create new object&quot;" name="name"/>
+    </record>
 
-       <record id="crm_case_improvereportsinhrms0" model="project.issue">
-               <field name="partner_address_id" ref="base.res_partner_address_15"/>
-               <field eval="time.strftime('%Y-%m-19 12:15:00')" name="date"/>
-               <field name="type_id" ref="type1"/>
-               <field eval="&quot;4&quot;" name="priority"/>
-               <field name="user_id" ref="base.user_root"/>
-               <field name="partner_id" ref="base.res_partner_11"/>
-               <field eval="&quot;pending&quot;" name="state"/>
-               <field name="section_id" ref="crm.section_sales_department"/>
-               <field eval="1" name="active"/>
-               <field eval="15.0" name="duration"/>
-               <field name="categ_id" ref="feature_request_categ"/>
-               <field name="stage_id" ref="stage6"/>
-               <field name="project_id" ref="project.project_project_22"/>
-               <field eval="&quot;Improve Reports in HRMS&quot;" name="name"/>
-       </record>
+    <record id="crm_case_improvereportsinhrms0" model="project.issue">
+        <field name="partner_address_id" ref="base.res_partner_address_15"/>
+        <field eval="time.strftime('%Y-%m-19 12:15:00')" name="date"/>
+        <field name="type_id" ref="type1"/>
+        <field eval="&quot;4&quot;" name="priority"/>
+        <field name="user_id" ref="base.user_root"/>
+        <field name="partner_id" ref="base.res_partner_11"/>
+        <field eval="&quot;pending&quot;" name="state"/>
+        <field name="section_id" ref="crm.section_sales_department"/>
+        <field eval="1" name="active"/>
+        <field eval="15.0" name="duration"/>
+        <field name="categ_id" ref="feature_request_categ"/>
+        <field name="stage_id" ref="stage6"/>
+        <field name="project_id" ref="project.project_project_22"/>
+        <field eval="&quot;Improve Reports in HRMS&quot;" name="name"/>
+    </record>
 
-       <record id="crm_case_improvereportsinpms0" model="project.issue">
-               <field name="partner_address_id" ref="base.res_partner_address_15"/>
-               <field eval="time.strftime('%Y-%m-21 14:30:00')" name="date"/>
-               <field name="type_id" ref="type1"/>
-               <field eval="&quot;2&quot;" name="priority"/>
-               <field name="user_id" ref="base.user_demo"/>
-               <field name="partner_id" ref="base.res_partner_11"/>
-               <field eval="&quot;pending&quot;" name="state"/>
-               <field name="section_id" ref="crm.section_sales_department"/>
-               <field eval="1" name="active"/>
-               <field eval="06.15" name="duration"/>
-               <field name="categ_id" ref="feature_request_categ"/>
-               <field name="stage_id" ref="stage5"/>
-               <field name="project_id" ref="project.project_project_22"/>
-               <field eval="&quot;Improve Reports in PMS&quot;" name="name"/>
-       </record>
+    <record id="crm_case_improvereportsinpms0" model="project.issue">
+        <field name="partner_address_id" ref="base.res_partner_address_15"/>
+        <field eval="time.strftime('%Y-%m-21 14:30:00')" name="date"/>
+        <field name="type_id" ref="type1"/>
+        <field eval="&quot;2&quot;" name="priority"/>
+        <field name="user_id" ref="base.user_demo"/>
+        <field name="partner_id" ref="base.res_partner_11"/>
+        <field eval="&quot;pending&quot;" name="state"/>
+        <field name="section_id" ref="crm.section_sales_department"/>
+        <field eval="1" name="active"/>
+        <field eval="06.15" name="duration"/>
+        <field name="categ_id" ref="feature_request_categ"/>
+        <field name="stage_id" ref="stage5"/>
+        <field name="project_id" ref="project.project_project_22"/>
+        <field eval="&quot;Improve Reports in PMS&quot;" name="name"/>
+    </record>
 
 </data>
 </openerp>
index e4aacce..42050e6 100644 (file)
@@ -28,9 +28,9 @@ import pooler
 from tools.translate import _
 
 sale_form = """<?xml version="1.0"?>
-<form string="Create a Sale Order">
+<form string="Convert to Sale Order">
     <field name="partner_id" required="True"/>
-    <field name="shop_id" required="True"/>
+    <field name="shop_id" required="True" widget="selection"/>
     <field name="analytic_account"/>
     <field name="picking_policy" required="True"/>
     <field name="close"/>