Merge lp:~openerp-commiter/openobject-addons/trunk-rpa-new into lp:~openerp/openobject-addons/old_trunk

[Rucha (Open ERP)]

[Rucha (Open ERP) (rpa-openerp)]

Changes in document_ics,
task work for ergonomy states - buttons > changes in state names + Minor modifications

[Jay Vora (Serpent Consulting Services) (jayvora)]

review: Needs Fixing

[Jay Vora (Serpent Consulting Services) (jayvora)]

Can you please update and request again?
Thanks.

=== modified file 'account/account_bank_statement.py'
--- account/account_bank_statement.py	2009-01-16 09:44:05 +0000
+++ account/account_bank_statement.py	2009-04-23 06:56:53 +0000
@@ -124,7 +124,7 @@
             states={'confirm':[('readonly', True)]}),
         'move_line_ids': fields.one2many('account.move.line', 'statement_id',
             'Entry lines', states={'confirm':[('readonly',True)]}),
-        'state': fields.selection([('draft', 'Draft'),('confirm', 'Confirm')],
+        'state': fields.selection([('draft', 'Draft'),('confirm', 'Confirmed')],
             'State', required=True,
             states={'confirm': [('readonly', True)]}, readonly="1"),
         'currency': fields.function(_currency, method=True, string='Currency',

=== modified file 'account/invoice.py'
--- account/invoice.py	2009-03-19 13:02:14 +0000
+++ account/invoice.py	2009-04-24 12:06:40 +0000
@@ -209,7 +209,7 @@
             ('proforma2','Pro-forma'),
             ('open','Open'),
             ('paid','Done'),
-            ('cancel','Cancelled')
+            ('cancel','Canceled')
         ],'State', select=True, readonly=True),
 
         'date_invoice': fields.date('Date Invoiced', states={'open':[('readonly',True)],'close':[('readonly',True)]}),

=== modified file 'account_budget/crossovered_budget.py'
--- account_budget/crossovered_budget.py	2009-03-06 23:50:10 +0000
+++ account_budget/crossovered_budget.py	2009-04-24 12:06:40 +0000
@@ -111,7 +111,7 @@
         'validating_user_id': fields.many2one('res.users','Validate User', readonly=True),
         'date_from': fields.date('Start Date',required=True,states={'done':[('readonly',True)]}),
         'date_to': fields.date('End Date',required=True,states={'done':[('readonly',True)]}),
-        'state' : fields.selection([('draft','Draft'),('confirm','Confirmed'),('validate','Validated'),('done','Done'),('cancel', 'Cancelled')], 'Status', select=True, required=True, readonly=True),
+        'state' : fields.selection([('draft','Draft'),('confirm','Confirmed'),('validate','Validated'),('done','Done'),('cancel', 'Canceled')], 'Status', select=True, required=True, readonly=True),
         'crossovered_budget_line': fields.one2many('crossovered.budget.lines', 'crossovered_budget_id', 'Budget Lines',states={'done':[('readonly',True)]} ),
     }
 

=== modified file 'account_payment/payment.py'
--- account_payment/payment.py	2009-02-26 14:31:43 +0000
+++ account_payment/payment.py	2009-04-24 12:06:40 +0000
@@ -99,7 +99,7 @@
         'state': fields.selection([
             ('draft', 'Draft'),
             ('open','Confirmed'),
-            ('cancel','Cancelled'),
+            ('cancel','Canceled'),
             ('done','Done')], 'State', select=True),
         'line_ids': fields.one2many('payment.line','order_id','Payment lines',states={'done':[('readonly',True)]}),
         'total': fields.function(_total, string="Total", method=True,

=== modified file 'board/board_view.xml'
--- board/board_view.xml	2009-04-17 10:37:08 +0000
+++ board/board_view.xml	2009-04-24 12:01:17 +0000
@@ -49,15 +49,15 @@
                 </tree>
             </field>
         </record>
+        
+        
         <record id="view_board_form" model="ir.ui.view">
             <field name="name">board.board.form</field>
             <field name="model">board.board</field>
             <field name="type">form</field>
-            <field eval="1" name="priority"/>
             <field name="arch" type="xml">
                 <form string="Dashboard">
                     <field name="name" select="1"/>
-                    <button colspan="2" name="%(wizard_board_create_menu)d" string="Create Menu" type="action" icon="gtk-justify-fill"/>
                     <field colspan="4" name="line_ids">
                         <tree string="Dashboard View">
                             <field name="name"/>
@@ -74,9 +74,11 @@
                             <field name="position"/>
                         </form>
                     </field>
+                    <button colspan="2" name="%(wizard_board_create_menu)d" string="Create Menu" type="action" icon="gtk-justify-fill"/>
                 </form>
             </field>
         </record>
+        
         <record id="action_view_board_list_form" model="ir.actions.act_window">
             <field name="name">Dashboard Definition</field>
             <field name="res_model">board.board</field>

=== modified file 'document_ics/__init__.py'
--- document_ics/__init__.py	2009-03-06 23:50:10 +0000
+++ document_ics/__init__.py	2009-04-23 13:46:21 +0000
@@ -21,4 +21,6 @@
 ##############################################################################
 
 import document
+import document_ics_config_wizard
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== modified file 'document_ics/__terp__.py'
--- document_ics/__terp__.py	2009-02-03 17:02:20 +0000
+++ document_ics/__terp__.py	2009-04-23 13:46:21 +0000
@@ -30,7 +30,7 @@
     'website': 'http://www.openerp.com',
     'depends': ['document', 'crm_configuration'],
     'init_xml': ['document_data.xml'],
-    'update_xml': ['document_view.xml', 'security/ir.model.access.csv'],
+    'update_xml': ['document_view.xml', 'security/ir.model.access.csv','document_ics_config_wizard.xml'],
     'demo_xml': ['document_demo.xml'],
     'installable': True,
     'active': False,

=== modified file 'document_ics/document.py'
--- document_ics/document.py	2009-01-05 13:49:37 +0000
+++ document_ics/document.py	2009-04-24 14:06:06 +0000
@@ -28,20 +28,21 @@
 import datetime
 import time
 import random
+import tools
 
 ICS_TAGS = {
-    'summary':'normal',
-    'uid':'normal' ,
-    'dtstart':'date' ,
-    'dtend':'date' ,
-    'created':'date' ,
-    'dt-stamp':'date' ,
-    'last-modified':'normal' ,
-    'url':'normal' ,
-    'attendee':'multiple',
-    'location':'normal',
-    'categories': 'normal',
-    'description':'normal',
+    'summary':'normal', 
+    'uid':'normal' , 
+    'dtstart':'date' , 
+    'dtend':'date' , 
+    'created':'date' , 
+    'dtstamp':'date' , 
+    'last-modified':'normal' , 
+    'url':'normal' , 
+    'attendee':'multiple', 
+    'location':'normal', 
+    'categories': 'normal', 
+    'description':'normal', 
 
     # TODO: handle the 'duration' property
 }
@@ -49,8 +50,8 @@
 class document_directory_ics_fields(osv.osv):
     _name = 'document.directory.ics.fields'
     _columns = {
-        'field_id': fields.many2one('ir.model.fields', 'Open ERP Field', required=True),
-        'name': fields.selection(map(lambda x: (x,x), ICS_TAGS.keys()),'ICS Value', required=True),
+        'field_id': fields.many2one('ir.model.fields', 'Open ERP Field', required=True), 
+        'name': fields.selection(map(lambda x: (x, x), ICS_TAGS.keys()), 'ICS Value', required=True), 
         'content_id': fields.many2one('document.directory.content', 'Content', required=True, ondelete='cascade')
     }
 document_directory_ics_fields()
@@ -58,8 +59,8 @@
 class document_directory_content(osv.osv):
     _inherit = 'document.directory.content'
     _columns = {
-        'ics_object_id': fields.many2one('ir.model', 'Object'),
-        'ics_domain': fields.char('Domain', size=64),
+        'ics_object_id': fields.many2one('ir.model', 'Object'), 
+        'ics_domain': fields.char('Domain', size=64), 
         'ics_field_ids': fields.one2many('document.directory.ics.fields', 'content_id', 'Fields Mapping')
     }
     _defaults = {
@@ -87,7 +88,7 @@
                     uuid = event.value
                 if event.name.lower() in fields:
                     if ICS_TAGS[event.name.lower()]=='normal':
-                        result[fields[event.name.lower()]] = event.value.encode('utf8')
+                        result[fields[event.name.lower()]] = event.value
                     elif ICS_TAGS[event.name.lower()]=='date':
                         result[fields[event.name.lower()]] = event.value.strftime('%Y-%m-%d %H:%M:%S')
             if not uuid:
@@ -105,6 +106,12 @@
         return True
 
     def process_read_ics(self, cr, uid, node, context={}):
+        def ics_datetime(idate, short=False):
+            if short:
+                return datetime.date.fromtimestamp(time.mktime(time.strptime(idate, '%Y-%m-%d')))
+            else:
+                return datetime.datetime.strptime(idate, '%Y-%m-%d %H:%M:%S')
+
         import vobject
         obj_class = self.pool.get(node.content.ics_object_id.model)
         # Can be improved to use context and active_id !
@@ -113,21 +120,32 @@
         cal = vobject.iCalendar()
         for obj in obj_class.browse(cr, uid, ids, context):
             event = cal.add('vevent')
+            # Fix dtstamp et last-modified with create and write date on the object line
+            perm = obj_class.perm_read(cr, uid, [obj.id], context)
+            event.add('dtstamp').value = ics_datetime(perm[0]['create_date'][:19])
+            if perm[0]['write_date']:
+                event.add('last-modified').value = ics_datetime(perm[0]['write_date'][:19])
             for field in node.content.ics_field_ids:
                 value = getattr(obj, field.field_id.name)
                 if (not value) and field.name=='uid':
-                    value = 'OpenERP-'+str(random.randint(1999999999, 9999999999))
+                    value = 'OpenERP-%s_%s@%s' % (node.content.ics_object_id.model, str(obj.id), cr.dbname,)
                     obj_class.write(cr, uid, [obj.id], {field.field_id.name: value})
                 if ICS_TAGS[field.name]=='normal':
                     if type(value)==type(obj):
                         value=value.name
                     value = value or ''
                     event.add(field.name).value = value or ''
-                elif ICS_TAGS[field.name]=='date':
-                    dt = value or time.strftime('%Y-%m-%d %H:%M:%S')
-                    if len(dt)==10:
-                        dt = dt+' 09:00:00'
-                    value = datetime.datetime.strptime(dt, '%Y-%m-%d %H:%M:%S')
+                elif ICS_TAGS[field.name]=='date' and value:
+                    if field.name == 'dtstart':
+                        self.date_start = value
+                    if field.name == 'dtend' and isinstance(value, float):
+                        start_date = datetime.datetime.fromtimestamp(time.mktime(time.strptime(self.date_start, "%Y-%m-%d %H:%M:%S")))
+                        value = (start_date + datetime.timedelta(hours=value)).strftime('%Y-%m-%d %H:%M:%S' )
+                        
+                    if len(value)==10:
+                        value = ics_datetime(value, True)
+                    else:
+                        value = ics_datetime(value)
                     event.add(field.name).value = value
         s= StringIO.StringIO(cal.serialize().encode('utf8'))
         s.name = node
@@ -138,8 +156,36 @@
 class crm_case(osv.osv):
     _inherit = 'crm.case'
     _columns = {
-        'code': fields.char('Calendar Code', size=64)
-    }
+        'code': fields.char('Calendar Code', size=64),
+        'date_deadline': fields.datetime('Deadline', help="Deadline Date is automatically computed from Start Date + Duration"),
+    }
+    
+    _defaults = {
+        'code': lambda obj, cr, uid, context: obj.pool.get('ir.sequence').get(cr, uid, 'crm.case'),
+    }
+    
+    def copy(self, cr, uid, id, default=None, context=None):
+        """
+        code field must be unique in ICS file
+        """
+        if not default: default = {}
+        if not context: context = {}
+        default.update({'code': self.pool.get('ir.sequence').get(cr, uid, 'crm.case'), 'id': False})
+        return super(crm_case, self).copy(cr, uid, id, default, context)
+    
+    def on_change_duration(self, cr, uid, id, date, duration):
+        if not date:
+            return {}
+        start_date = datetime.datetime.fromtimestamp(time.mktime(time.strptime(date, "%Y-%m-%d %H:%M:%S")))
+        if duration >= 0 :
+            end = start_date + datetime.timedelta(hours=duration)
+        if duration < 0:
+            raise osv.except_osv(_('Warning !'),
+                    _('You can not set negative Duration.'))
+             
+        res = {'value' : {'date_deadline' : end.strftime('%Y-%m-%d %H:%M:%S' )}}
+        return res
+    
 crm_case()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== modified file 'document_ics/document_data.xml'
--- document_ics/document_data.xml	2008-10-28 08:38:03 +0000
+++ document_ics/document_data.xml	2009-04-24 08:40:05 +0000
@@ -6,6 +6,21 @@
         <field name="code">.ics</field>
         <field name="name">ICS Calendar</field>
     </record>
-
 </data>
-</openerp>
+
+	
+  <data noupdate="1">
+      <!-- Sequences for sale.order -->
+      <record id="seq_type_crm_case_code" model="ir.sequence.type">
+          <field name="name">CRM Case Code</field>
+          <field name="code">crm.case</field>
+      </record>
+      <record id="seq_sale_order" model="ir.sequence">
+          <field name="name">CRM Case</field>
+          <field name="code">crm.case</field>
+          <field name="prefix">CASE</field>
+          <field name="padding">3</field>
+      </record>
+  </data>
+    
+</openerp>
\ No newline at end of file

=== modified file 'document_ics/document_demo.xml'
--- document_ics/document_demo.xml	2009-04-20 12:04:38 +0000
+++ document_ics/document_demo.xml	2009-04-23 13:46:21 +0000
@@ -26,6 +26,11 @@
         <field name="field_id" ref="crm.field_crm_case_date"/>
         <field name="content_id" ref="dir_content_calendar"/>
     </record>
+    <record model="document.directory.ics.fields" id="dir_field6">
+        <field name="name">dtend</field>
+        <field name="field_id" ref="crm.field_crm_case_date_deadline"/>
+        <field name="content_id" ref="dir_content_calendar"/>
+    </record>
     <record model="document.directory.ics.fields" id="dir_field2">
         <field name="name">summary</field>
         <field name="field_id" ref="crm.field_crm_case_name"/>

=== added file 'document_ics/document_ics_config_wizard.py'
--- document_ics/document_ics_config_wizard.py	1970-01-01 00:00:00 +0000
+++ document_ics/document_ics_config_wizard.py	2009-04-24 14:06:06 +0000
@@ -0,0 +1,133 @@
+    # -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution    
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    $Id$
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import time
+import tools
+from osv import fields, osv, orm
+import os
+import mx.DateTime
+import base64
+import pooler
+
+SECTION_NAME = {
+    'meeting' : 'Meetings', 
+    'lead':'Prospects', 
+    'opportunity':'Opportunities', 
+    'jobs':'Jobs', 
+    'bugs':'Bug Tracking', 
+    'fund':'Fund Raising', 
+    'helpdesk':'HelpDesk', 
+    'claims':'Claims', 
+    'phonecall':'Phone Calls', 
+                }
+
+ICS_TAGS = {
+        'summary':'Description', 
+        'uid':'Calendar Code' , 
+        'dtstart':'Date' , 
+        'dtend':'Deadline' , 
+        'url':'Partner Email' , 
+        'description':'Your action', 
+            }
+
+class document_ics_crm_wizard(osv.osv_memory):
+    _name='document.ics.crm.wizard'
+    _columns = {
+        'name':fields.char('Name', size=64), 
+        'meeting' : fields.boolean('Calendar of Meetings', help="Manages the calendar of meetings of the users."), 
+        'lead' : fields.boolean('Prospect', help="Allows you to track and manage prospects which are pre-sales requests or contacts, the very first contact with a customer request."), 
+        'opportunity' : fields.boolean('Business Opportunities', help="Tracks identified business opportunities for your sales pipeline."), 
+        'jobs' : fields.boolean('Jobs Hiring Process', help="Help you to organise the jobs hiring process: evaluation, meetings, email integration..."), 
+        'document_ics':fields.boolean('Shared Calendar', help=" Will allow you to synchronise your Open ERP calendars with your phone, outlook, Sunbird, ical, ..."), 
+        'bugs' : fields.boolean('Bug Tracking', help="Used by companies to track bugs and support requests on softwares"), 
+        'helpdesk': fields.boolean('Helpdesk', help="Manages an Helpdesk service."), 
+        'fund' : fields.boolean('Fund Raising Operations', help="This may help associations in their fund raising process and tracking."), 
+        'claims' : fields.boolean('Claims', help="Manages the supplier and customers claims, including your corrective or preventive actions."), 
+        'phonecall' : fields.boolean('Phone Calls', help="Help you to encode the result of a phone call or to planify a list of phone calls to process."), 
+    }
+    _defaults = {
+        'meeting': lambda *args: True, 
+        'opportunity': lambda *args: True, 
+        'phonecall': lambda *args: True, 
+    }
+    
+    def action_create(self, cr, uid, ids, context=None):
+        data=self.read(cr, uid, ids, [])[0]
+        dir_obj = self.pool.get('document.directory')
+        dir_cont_obj = self.pool.get('document.directory.content')
+        parent_dir = dir_obj.search(cr, uid, [('name', '=', 'Calendars')])[0]
+        for section in ['meeting', 'lead', 'opportunity', 'jobs', 'bugs', 'fund', 'helpdesk', 'claims', 'phonecall']:
+            if (not data[section]):
+                continue
+            else:
+                vals = {
+                     'name':SECTION_NAME[section]+' Calendars', 
+                     'parent_id': parent_dir,
+                     'type' : 'directory',
+                     'user_id' : uid
+                        }
+                dir_id = dir_obj.create(cr, uid, vals)
+                object_id=self.pool.get('ir.model').search(cr, uid, [('name', '=', 'Case')])[0]
+                section_id=self.pool.get('crm.case.section').search(cr, uid, [('name', '=', SECTION_NAME[section])])[0]
+                vals_cont={
+                      'name': SECTION_NAME[section], 
+                      'sequence': 1, 
+                      'directory_id': dir_id, 
+                      'suffix': section, 
+                      'extension': '.ics', 
+                      'ics_object_id': object_id, 
+                      'ics_domain': [('section_id', '=', section_id)], 
+                      'include_name' : False
+                    } 
+                
+                content_id = dir_cont_obj.create(cr, uid, vals_cont)
+                
+                ics_obj=self.pool.get('document.directory.ics.fields')
+                for tag in ['description', 'url', 'summary', 'dtstart', 'dtend', 'uid']:
+                    field_id =  self.pool.get('ir.model.fields').search(cr, uid, [('model_id.name', '=', 'Case'), ('field_description', '=', ICS_TAGS[tag])])[0]
+                    vals_ics={ 
+                            'field_id':  field_id , 
+                            'name':  tag , 
+                            'content_id': content_id , 
+                              }
+                    ics_obj.create(cr, uid, vals_ics)
+
+        return {
+                'view_type': 'form', 
+                "view_mode": 'form', 
+                'res_model': 'ir.actions.configuration.wizard', 
+                'type': 'ir.actions.act_window', 
+                'target':'new', 
+         }
+    def action_cancel(self, cr, uid, ids, conect=None):
+        return {
+                'view_type': 'form', 
+                "view_mode": 'form', 
+                'res_model': 'ir.actions.configuration.wizard', 
+                'type': 'ir.actions.act_window', 
+                'target':'new', 
+         }
+
+document_ics_crm_wizard()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+

=== added file 'document_ics/document_ics_config_wizard.xml'
--- document_ics/document_ics_config_wizard.xml	1970-01-01 00:00:00 +0000
+++ document_ics/document_ics_config_wizard.xml	2009-04-23 13:46:21 +0000
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+    
+	<record id="view_document_ics_config_directories" model="ir.ui.view">
+            <field name="name">Configure Directory for Sections</field>
+            <field name="model">document.ics.crm.wizard</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Configure CRM Sections">
+                    <separator colspan="4" string="Create Pre-Configured Directories"/>
+                    <newline/>
+                    <field name="meeting"/>
+                    <field name="opportunity"/>
+                    <field name="phonecall"/>
+                    <field name="lead"/>
+                    <field name="claims"/>
+                    <field name="bugs"/>
+                    <field name="helpdesk"/>
+                    <field name="jobs"/>
+                    <field name="fund"/>
+                    <newline/>
+                    <group col="4" colspan="4">
+                        <button icon="gtk-cancel" name="action_cancel" type="object" special="cancel" string="Cancel"/>
+                        <button icon="gtk-go-forward" name="action_create" string="Next" type="object"/>
+                    </group>
+                </form>
+            </field>
+        </record>
+
+        <record id="action_view_document_ics_config_directories" model="ir.actions.act_window">
+            <field name="name">Configure Directory for Sections </field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">document.ics.crm.wizard</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+        </record>
+        
+        <!-- register configuration wizard -->
+        <record id="config_wizard_step_case_section_menu" model="ir.actions.todo">
+            <field name="name">Create Directories for CRM Case Section</field>
+            <field name="note">This Configuration step use to create Directories in document for all Case Sections</field>
+            <field name="action_id" ref="action_view_document_ics_config_directories"/>
+        </record>
+        
+        
+     </data>  
+</openerp>
+  

=== modified file 'document_ics/document_view.xml'
--- document_ics/document_view.xml	2008-10-28 10:07:10 +0000
+++ document_ics/document_view.xml	2009-04-24 09:38:56 +0000
@@ -20,6 +20,31 @@
             </field>
         </field>
     </record>
-
+	
+	 <record model="ir.ui.view" id="view_case_inherit_form">
+        <field name="name">crm.case.code.form</field>
+        <field name="model">crm.case</field>
+        <field name="type">form</field>
+        <field name="inherit_id" ref="crm.crm_case-view"/>
+        <field name="arch" type="xml">
+            <field name="priority" position="after">
+                <field name="code"/>
+            </field>
+        </field>
+    </record>
+    
+    <record model="ir.ui.view" id="view_case_inherit_form1">
+        <field name="name">crm.case.inherit.form1</field>
+        <field name="model">crm.case</field>
+        <field name="type">form</field>
+        <field name="inherit_id" ref="crm.crm_case-view"/>
+        <field name="arch" type="xml">
+            <field name="date" position="replace">
+           		<field name="date" on_change="on_change_duration(date, duration)"/>
+                <field name="duration" string="Duration(In Hour)" on_change="on_change_duration(date, duration)" widget="float_time"/>
+            </field>
+        </field>
+    </record>
+    
 </data>
 </openerp>

=== modified file 'hr_expense/hr_expense.py'
--- hr_expense/hr_expense.py	2009-04-02 09:55:23 +0000
+++ hr_expense/hr_expense.py	2009-04-24 12:06:40 +0000
@@ -77,7 +77,7 @@
             ('accepted', 'Accepted'),
             ('invoiced', 'Invoiced'),
             ('paid', 'Reimbursed'),
-            ('cancelled', 'Cancelled')],
+            ('cancelled', 'Canceled')],
             'State', readonly=True),
     }
     _defaults = {

=== modified file 'hr_holidays/hr.py'
--- hr_holidays/hr.py	2009-03-19 15:56:46 +0000
+++ hr_holidays/hr.py	2009-04-24 12:06:40 +0000
@@ -110,7 +110,7 @@
 
     _columns = {
         'name' : fields.char('Description', required=True, readonly=True, size=64, states={'draft':[('readonly',False)]}),
-        'state': fields.selection([('draft', 'draft'), ('confirm', 'Waiting Validation'), ('refuse', 'Refused'), ('validate', 'Validate'), ('cancel', 'Cancel')], 'Status', readonly=True),
+        'state': fields.selection([('draft', 'Draft'), ('confirm', 'Waiting Validation'), ('refuse', 'Refused'), ('validate', 'Validated'), ('cancel', 'Canceled')], 'Status', readonly=True),
         'date_from' : fields.datetime('Vacation start day', required=True, readonly=True, states={'draft':[('readonly',False)]}),
         'date_to' : fields.datetime('Vacation end day',required=True,readonly=True, states={'draft':[('readonly',False)]}),
         'holiday_status' : fields.many2one("hr.holidays.status", "Holiday's Status", required=True,readonly=True, states={'draft':[('readonly',False)]}),

=== modified file 'mrp_operations/mrp_operations.py'
--- mrp_operations/mrp_operations.py	2009-03-06 23:50:10 +0000
+++ mrp_operations/mrp_operations.py	2009-04-24 12:06:40 +0000
@@ -42,7 +42,7 @@
 class mrp_production_workcenter_line(osv.osv):
     _inherit = 'mrp.production.workcenter.line'
     _columns = {
-       'state': fields.selection([('draft','Draft'),('startworking', 'In Progress'),('pause','Pause'),('cancel','Canceled'),('done','Finished')],'Status', readonly=True),
+       'state': fields.selection([('draft','Draft'),('startworking', 'In Progress'),('pause','Paused'),('cancel','Canceled'),('done','Finished')],'Status', readonly=True),
        'date_planned': fields.related('production_id', 'date_planned', type='datetime', string='Date Planned'),
        'date_start': fields.datetime('Start Date'),
        'date_finnished': fields.datetime('End Date'),
@@ -226,7 +226,7 @@
                   raise osv.except_osv(_('Sorry!'),_('You cannot finish the operation without Starting/Resuming it !'))
                   return False
                if 'cancel' in code_lst:
-                  raise osv.except_osv(_('Sorry!'),_('Operation is Already Cancelled  !'))
+                  raise osv.except_osv(_('Sorry!'),_('Operation is Already Canceled  !'))
                   return False
             if code.start_stop=='cancel':
                if  not 'start' in code_lst :

=== modified file 'project/project.py'
--- project/project.py	2009-04-02 12:22:47 +0000
+++ project/project.py	2009-04-24 12:06:40 +0000
@@ -114,7 +114,7 @@
         'warn_footer': fields.text('Mail Footer', help="Footer added at the beginning of the email for the warning message sent to the customer when a task is closed."),
         'notes': fields.text('Notes', help="Internal description of the project."),
         'timesheet_id': fields.many2one('hr.timesheet.group', 'Working Time', help="Timetable working hours to adjust the gantt diagram report"),
-        'state': fields.selection([('template', 'Template'), ('open', 'Running'), ('pending', 'Pending'), ('cancelled', 'Cancelled'), ('done', 'Done')], 'State', required=True, readonly=True),
+        'state': fields.selection([('template', 'Template'), ('open', 'Running'), ('pending', 'Pending'), ('cancelled', 'Canceled'), ('done', 'Done')], 'State', required=True, readonly=True),
      }
 
     _defaults = {
@@ -270,7 +270,7 @@
         'priority' : fields.selection([('4','Very Low'), ('3','Low'), ('2','Medium'), ('1','Urgent'), ('0','Very urgent')], 'Importance'),
         'sequence': fields.integer('Sequence'),
         'type': fields.many2one('project.task.type', 'Type'),
-        'state': fields.selection([('draft', 'Draft'),('open', 'In Progress'),('pending', 'Pending'), ('cancelled', 'Cancelled'), ('done', 'Done')], 'Status', readonly=True, required=True),
+        'state': fields.selection([('draft', 'Draft'),('open', 'In Progress'),('pending', 'Pending'), ('cancelled', 'Canceled'), ('done', 'Done')], 'Status', readonly=True, required=True),
         'date_start': fields.datetime('Starting Date'),
         'date_deadline': fields.datetime('Deadline'),
         'date_close': fields.datetime('Date Closed', readonly=True),

=== modified file 'project/project_view.xml'
--- project/project_view.xml	2009-04-17 10:37:08 +0000
+++ project/project_view.xml	2009-04-24 12:01:17 +0000
@@ -298,7 +298,7 @@
                                 <button name="do_open" states="pending,draft" string="Start Task" type="object" icon="gtk-execute"/>
                                 <button name="do_reopen" states="done,cancelled" string="Reactivate" type="object" icon="gtk-convert"/>
                                 <button name="do_pending" states="open" string="Pending" type="object" icon="gtk-media-pause"/>
-                                <button groups="base.group_extended" name="%(wizard_delegate_task)d" states="pending,open" string="Delegate" type="action" icon="gtk-sort-descending"/>
+                                <button groups="base.group_extended" name="%(wizard_delegate_task)d" states="pending,open,draft" string="Delegate" type="action" icon="gtk-sort-descending"/>
                                 <button name="%(wizard_close_task)d" states="pending,open" string="Done" type="action" icon="gtk-jump-to"/>
                                 <button name="do_cancel" states="draft,open,pending" string="Cancel" type="object" icon="gtk-cancel"/>
 

=== modified file 'purchase/purchase.py'
--- purchase/purchase.py	2009-03-17 14:02:37 +0000
+++ purchase/purchase.py	2009-04-24 12:06:40 +0000
@@ -155,7 +155,7 @@
 
         'pricelist_id':fields.many2one('product.pricelist', 'Pricelist', required=True, states={'confirmed':[('readonly',True)], 'approved':[('readonly',True)]}, help="The pricelist sets the currency used for this purchase order. It also computes the supplier price for the selected products/quantities."),
 
-        'state': fields.selection([('draft', 'Request for Quotation'), ('wait', 'Waiting'), ('confirmed', 'Confirmed'), ('approved', 'Approved'),('except_picking', 'Shipping Exception'), ('except_invoice', 'Invoice Exception'), ('done', 'Done'), ('cancel', 'Cancelled')], 'Order Status', readonly=True, help="The state of the purchase order or the quotation request. A quotation is a purchase order in a 'Draft' state. Then the order has to be confirmed by the user, the state switch to 'Confirmed'. Then the supplier must confirm the order to change the state to 'Approved'. When the purchase order is paid and received, the state becomes 'Done'. If a cancel action occurs in the invoice or in the reception of goods, the state becomes in exception.", select=True),
+        'state': fields.selection([('draft', 'Request for Quotation'), ('wait', 'Waiting'), ('confirmed', 'Confirmed'), ('approved', 'Approved'),('except_picking', 'Shipping Exception'), ('except_invoice', 'Invoice Exception'), ('done', 'Done'), ('cancel', 'Canceled')], 'Order Status', readonly=True, help="The state of the purchase order or the quotation request. A quotation is a purchase order in a 'Draft' state. Then the order has to be confirmed by the user, the state switch to 'Confirmed'. Then the supplier must confirm the order to change the state to 'Approved'. When the purchase order is paid and received, the state becomes 'Done'. If a cancel action occurs in the invoice or in the reception of goods, the state becomes in exception.", select=True),
         'order_line': fields.one2many('purchase.order.line', 'order_id', 'Order Lines', states={'approved':[('readonly',True)]}),
         'validator' : fields.many2one('res.users', 'Validated by', readonly=True),
         'notes': fields.text('Notes'),

=== modified file 'report_account/report_receivable.py'
--- report_account/report_receivable.py	2009-04-14 12:13:09 +0000
+++ report_account/report_receivable.py	2009-04-24 12:06:40 +0000
@@ -179,7 +179,7 @@
             ('proforma2','Pro-forma'),
             ('open','Open'),
             ('paid','Done'),
-            ('cancel','Cancelled')
+            ('cancel','Canceled')
         ],'State', readonly=True),
         'origin': fields.char('Origin', size=64, readonly=True),
         'create_date' : fields.datetime('Create Date', readonly=True)

=== modified file 'report_task/report_task.py'
--- report_task/report_task.py	2009-03-20 11:28:18 +0000
+++ report_task/report_task.py	2009-04-24 12:06:40 +0000
@@ -33,7 +33,7 @@
         'task_hrs': fields.float('Task Hours', readonly=True),
         'task_progress': fields.float('Task Progress', readonly=True),
         'company_id' : fields.many2one('res.company', 'Company'),
-        'task_state': fields.selection([('draft', 'Draft'),('open', 'Open'),('pending', 'Pending'), ('cancelled', 'Cancelled'), ('done', 'Done'),('no','No Task')], 'Status', readonly=True),
+        'task_state': fields.selection([('draft', 'Draft'),('open', 'Open'),('pending', 'Pending'), ('cancelled', 'Canceled'), ('done', 'Done'),('no','No Task')], 'Status', readonly=True),
     }
 
     def init(self, cr):
@@ -73,7 +73,7 @@
         'delay_hours': fields.float('Delay Hours', readonly=True),
         'progress': fields.float('Progress (%)', readonly=True),
         'priority' : fields.selection([('4','Very Low'), ('3','Low'), ('2','Medium'), ('1','Urgent'), ('0','Very urgent')], 'Importance', readonly=True),
-        'state': fields.selection([('draft', 'Draft'),('open', 'In Progress'),('pending', 'Pending'), ('cancelled', 'Cancelled'), ('done', 'Done')], 'Status', readonly=True),
+        'state': fields.selection([('draft', 'Draft'),('open', 'In Progress'),('pending', 'Pending'), ('cancelled', 'Canceled'), ('done', 'Done')], 'Status', readonly=True),
         'remaining_hours': fields.float('Remaining Hours', readonly=True),
         'date_close' : fields.datetime('Date Closed', readonly=True)
     }