improved_views

bzr revid: fp@tinyerp.com-20081029133445-mt0jdpv1qamifk8m

diff --git a/addons/base_contact/base_contact.py b/addons/base_contact/base_contact.py
index c56aeaa..16a5e38 100644 (file)
--- a/addons/base_contact/base_contact.py
+++ b/addons/base_contact/base_contact.py
@@ -91,7 +91,7 @@ class res_partner_address(osv.osv):
     _inherit='res.partner.address'
     _description ='Partner Address'
     _columns = {
-        'job_ids':fields.one2many('res.partner.job', 'address_id', 'Functions and Addresses'),
+        'job_ids':fields.one2many('res.partner.job', 'address_id', 'Contacts'),
         'email': fields.related('job_ids', 'email', type='char', string='Default Email'),
     }
 res_partner_address()

diff --git a/addons/crm/crm.py b/addons/crm/crm.py
index 761c330..8fce933 100644 (file)
--- a/addons/crm/crm.py
+++ b/addons/crm/crm.py
@@ -223,8 +223,8 @@ class crm_case_rule(osv.osv):
         'active': fields.boolean('Active'),
         'sequence': fields.integer('Sequence'),
 
-        'trg_state_from': fields.selection([('',''),('escalate','Escalate')]+AVAILABLE_STATES, 'Case state from', size=16),
-        'trg_state_to': fields.selection([('',''),('escalate','Escalate')]+AVAILABLE_STATES, 'Case state to', size=16),
+        'trg_state_from': fields.selection([('',''),('escalate','Escalate')]+AVAILABLE_STATES, 'Case State', size=16),
+        'trg_state_to': fields.selection([('',''),('escalate','Escalate')]+AVAILABLE_STATES, 'Button Pressed', size=16),
 
         'trg_date_type':  fields.selection([
             ('none','None'),
@@ -242,19 +242,19 @@ class crm_case_rule(osv.osv):
         'trg_partner_id': fields.many2one('res.partner', 'Partner'),
         'trg_partner_categ_id': fields.many2one('res.partner.category', 'Partner Category'),
 
-        'trg_priority_from': fields.selection([('','')] + AVAILABLE_PRIORITIES, 'Priority min'),
-        'trg_priority_to': fields.selection([('','')] + AVAILABLE_PRIORITIES, 'Priority max'),
+        'trg_priority_from': fields.selection([('','')] + AVAILABLE_PRIORITIES, 'Minimum Priority'),
+        'trg_priority_to': fields.selection([('','')] + AVAILABLE_PRIORITIES, 'Maximim Priority'),
 
         'act_method': fields.char('Call Object Method', size=64),
         'act_state': fields.selection([('','')]+AVAILABLE_STATES, 'Set state to', size=16),
         'act_section_id': fields.many2one('crm.case.section', 'Set section to'),
         'act_user_id': fields.many2one('res.users', 'Set responsible to'),
         'act_priority': fields.selection([('','')] + AVAILABLE_PRIORITIES, 'Set priority to'),
-        'act_email_cc': fields.char('Add watchers (Cc)', size=250),
+        'act_email_cc': fields.char('Add watchers (Cc)', size=250, help="These people will receive a copy of the futur communication between partner and users by email"),
 
-        'act_remind_partner': fields.boolean('Remind partner'),
-        'act_remind_user': fields.boolean('Remind responsible'),
-        'act_remind_attach': fields.boolean('Remind with attachment'),
+        'act_remind_partner': fields.boolean('Remind Partner', help="Check this if you want the rule to send a reminder by email to the partner."),
+        'act_remind_user': fields.boolean('Remind responsible', help="Check this if you want the rule to send a reminder by email to the user."),
+        'act_remind_attach': fields.boolean('Remind with attachment', help="Check this if you want that all documents attached to the case be attached to the reminder email sent."),
 
         'act_mail_to_user': fields.boolean('Mail to responsible'),
         'act_mail_to_partner': fields.boolean('Mail to partner'),

diff --git a/addons/crm/crm_view.xml b/addons/crm/crm_view.xml
index 1d4cfc2..d84e3f5 100644 (file)
--- a/addons/crm/crm_view.xml
+++ b/addons/crm/crm_view.xml
@@ -114,39 +114,42 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Case Rule">
-                    <notebook>
-                        <page string="Rule Information">
-                            <separator colspan="4" string="General Information"/>
-                            <field name="name" select="1"/>
-                            <field name="active" select="2"/>
-                            
-                            <separator colspan="4" string="Criterions to be checked"/>
+                    <field name="name" select="1"/>
+                    <field name="active" select="2"/>
+                    <notebook colspan="4">
+                        <page string="Conditions">
+                            <separator colspan="4" string="Conditions on States"/>
                             <field name="trg_state_from" select="2"/>
                             <field name="trg_state_to" select="2"/>
                             
+                            <separator colspan="4" string="Conditions on Case Fields"/>
                             <field name="trg_section_id" select="1"/>
                             <field name="trg_categ_id"/>
                             <field name="trg_user_id" select="2"/>
-                            
-                            <newline/>
-                            <field name="trg_priority_from"/>
-                            <field name="trg_priority_to"/>
-                            
+                            <separator colspan="4" string="Conditions on Case Partner"/>
                             <field name="trg_partner_id"/>
                             <field name="trg_partner_categ_id"/>
-                            
+                            <separator colspan="4" string="Conditions on Priority Range"/>
+                            <field name="trg_priority_from"/>
+                            <field name="trg_priority_to"/>
+                            <separator colspan="4" string="Conditions on Timing"/>
                             <field name="trg_date_type"/>
                             <label align="1.0" string="Delay after trigger date:"/>
                             <group col="2" colspan="1">
                                 <field name="trg_date_range" nolabel="1"/>
                                 <field name="trg_date_range_type" nolabel="1"/>
                             </group>
+                            <separator colspan="4" string="Note"/>
+                            <label string="The case must match all non empty fields so that the rule trigger the action described in the 'Actions' tab." colspan="4"/>
+                        </page>
+                        <page string="Actions">
                             
-                            <separator colspan="4" string="Actions to execute"/>
+                            <separator colspan="4" string="Fields to Change"/>
                             <field name="act_state"/>
                             <field name="act_section_id"/>
                             <field name="act_user_id"/>
                             <field name="act_priority"/>
+                            <separator colspan="4" string="E-Mail Reminders (includes the content of the case)"/>
                             <field name="act_remind_user"/>
                             <field name="act_remind_partner"/>
                             <field name="act_remind_attach"/>
@@ -154,26 +157,25 @@
                             <!--
                                        <field name="act_method" colspan="4" readonly="1"/>
                                        -->
-                            
                         </page>
-                        <page string="E-Mail Information">
-                            <separator colspan="4" string="Email to send"/>
+                        <page string="E-Mail Actions">
+                            <separator colspan="4" string="Template of Email to Send"/>
                             <field name="act_mail_to_user"/>
                             <field name="act_mail_to_partner"/>
                             <field name="act_mail_to_watchers"/>
                             <field colspan="4" name="act_mail_to_email"/>
                             <field colspan="4" name="act_mail_body"/>
-                            <group col="2" colspan="4" string="Special Keywords">
-                                <label align="0.0" string="%%(case_id)s = Case ID"/>
-                                <label align="0.0" string="%%(case_subject)s = Case subject"/>
-                                <label align="0.0" string="%%(case_date)s = Creation date"/>
-                                <label align="0.0" string="%%(email_from)s = Partner email"/>
-                                <label align="0.0" string="%%(partner)s = Partner name"/>
-                                <label align="0.0" string="%%(partner_email)s = Partner email"/>
-                                <label align="0.0" string="%%(case_user)s = Responsible name"/>
-                                <label align="0.0" string="%%(case_user_email)s = Responsible email"/>
-                                <label align="0.0" string="%%(case_user_phone)s = Responsible phone"/>
-                            </group>
+
+                            <separator colspan="4" string="Special Keywords to Be Used in The Body"/>
+                            <label align="0.0" string="%%(case_id)s = Case ID" colspan="2"/>
+                            <label align="0.0" string="%%(case_subject)s = Case subject" colspan="2"/>
+                            <label align="0.0" string="%%(case_date)s = Creation date" colspan="2"/>
+                            <label align="0.0" string="%%(email_from)s = Partner email" colspan="2"/>
+                            <label align="0.0" string="%%(partner)s = Partner name" colspan="2"/>
+                            <label align="0.0" string="%%(partner_email)s = Partner email" colspan="2"/>
+                            <label align="0.0" string="%%(case_user)s = Responsible name" colspan="2"/>
+                            <label align="0.0" string="%%(case_user_email)s = Responsible email" colspan="2"/>
+                            <label align="0.0" string="%%(case_user_phone)s = Responsible phone" colspan="2"/>
                         </page>
                     </notebook>
                 </form>