[IMP] confliction resoved
authorHardik Ansodariy (OpenERP) <han@tinyerp.com>
Mon, 29 Aug 2011 06:21:49 +0000 (11:51 +0530)
committerHardik Ansodariy (OpenERP) <han@tinyerp.com>
Mon, 29 Aug 2011 06:21:49 +0000 (11:51 +0530)
bzr revid: han@tinyerp.com-20110829062149-tfhlws3kv50wvmn9

1  2 
addons/crm/crm_installer.py
addons/crm/crm_installer_view.xml
addons/crm/crm_lead_view.xml
addons/crm/crm_opportunity_view.xml
addons/mail_gateway/mail_gateway.py
addons/project/installer.py
addons/project/project_installer.xml

@@@ -32,12 -31,12 +31,13 @@@ class crm_installer(osv.osv_memory)
          'crm_fundraising': fields.boolean('Fundraising', help="This may help associations in their fundraising process and tracking."),
          'crm_claim': fields.boolean('Claims', help="Manages the suppliers and customers claims, including your corrective or preventive actions."),
          'crm_caldav': fields.boolean('Calendar Synchronizing', help="Helps you to synchronize the meetings with other calendar clients and mobiles."),
-         'sale_crm': fields.boolean('Opportunity to Quotation', help="This module relates sale from opportunity cases in the CRM."),
+         'sale_crm': fields.boolean('Opportunity to Quotation', help="Create a Quotation from an Opportunity."),
          'fetchmail': fields.boolean('Fetch Emails', help="Allows you to receive E-Mails from POP/IMAP server."),
-         'thunderbird': fields.boolean('Thunderbird', help="Allows you to link your e-mail to OpenERP's documents. You can attach it to any existing one in OpenERP or create a new one."),
-         'outlook': fields.boolean('MS-Outlook', help="Allows you to link your e-mail to OpenERP's documents. You can attach it to any existing one in OpenERP or create a new one."),
+         'thunderbird': fields.boolean('Thunderbird Plug-In', help="Allows you to link your e-mail to OpenERP's documents. You can attach it to any existing one in OpenERP or create a new one."),
+         'outlook': fields.boolean('MS-Outlook Plug-In', help="Allows you to link your e-mail to OpenERP's documents. You can attach it to any existing one in OpenERP or create a new one."),
          'wiki_sale_faq': fields.boolean('Sale FAQ', help="Helps you manage wiki pages for Frequently Asked Questions on Sales Application."),
 +        'crm_todo': fields.boolean('CRM TODO', help=" add a crm todo list in your Opportunities form."),
+         'import_google': fields.boolean('Google Import', help="Imports contacts and events from your google account."),
      }
  
      def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
@@@ -2,49 -2,24 +2,62 @@@
    <data>
      <record id="view_crm_installer" model="ir.ui.view">
        <field name="name">crm.installer.view</field>
-       <field name="model">crm.installer</field>
+       <field name="model">base.setup.installer</field>
        <field name="type">form</field>
-       <field name="inherit_id" ref="base.res_config_installer"/>
+       <field name="inherit_id" ref="base_setup.view_base_setup_installer"/>
        <field name="arch" type="xml">
          <data>
 +          <form position="attributes">
 +            <attribute name="string">CRM Application Configuration</attribute>
 +          </form>
 +
 +          <separator string="title" position="attributes">
 +            <attribute name="string">Configure Your CRM Application</attribute>
 +          </separator>
 +          <xpath expr="//label[@string='description']"
 +                 position="attributes">
 +            <attribute name="string">Enhance your core CRM Application with additional functionalities.</attribute>
 +          </xpath>
 +          <xpath expr='//separator[@string="vsep"]' position='attributes'>
 +              <attribute name='rowspan'>13</attribute>
 +              <attribute name='string'></attribute>
 +          </xpath>
 +          <xpath expr="//button[@string='Install Modules']" position="attributes">
 +            <attribute name="string">Configure</attribute>
 +          </xpath>
 +            <group colspan="8">
 +            <group colspan="4" col="4" groups="base.group_extended" name="other">
 +                  <field name="crm_claim" />
 +                  <field name="crm_helpdesk" />
 +                  <field name="crm_fundraising" />
 +                  <field name="wiki_sale_faq"/>
 +                    <field name="sale_crm" invisible="1"/>
 +                    <field name="crm_todo"/>
 +            </group>
 +            <group colspan="2" col="2">
 +                <separator string="Synchronization" colspan="4" />
 +                <field name="crm_caldav" />
 +                <field name="fetchmail" />
 +            </group>
 +            <group colspan="2" col="2">
 +              <separator string="Plug-In" colspan="4" />
 +                  <field name="thunderbird" />
 +                  <field name="outlook" />
 +              </group>
 +          </group>
+           <xpath expr="//group[@name='crm']" position="replace">
+             <newline/>
+             <separator string="Customer Relationship Management Features" colspan="4"/>
+             <field name="crm_claim" groups="base.group_extended"/>
+             <field name="crm_helpdesk" groups="base.group_extended"/>
+             <field name="crm_fundraising" groups="base.group_extended"/>
+             <field name="wiki_sale_faq" groups="base.group_extended"/>
+             <field name="sale_crm" invisible="1" groups="base.group_extended"/>
+             <field name="crm_caldav"/>
+             <field name="fetchmail"/>
+             <field name="thunderbird"/>
+             <field name="outlook"/>
+           </xpath>
          </data>
        </field>
      </record>
Simple merge
                              <group colspan="2" col="2">
                                  <separator string="Mailings" colspan="2"/>
                                  <field name="optin" on_change="on_change_optin(optin)"/>
-                                       <field name="optout" on_change="on_change_optout(optout)"/>
+                                 <field name="optout" on_change="on_change_optout(optout)"/>
                              </group>
                          </page>
 -
 -                        <page string="Communication &amp; History" groups="base.group_extended">
 -                            <group colspan="4">
 +                        <page string="Extra Info" groups="base.group_extended">
 +                            <group col="2" colspan="2">
 +                                <separator string="Dates" colspan="2"/>
 +                                <field name="create_date"/>
 +                                <field name="write_date"/>
 +                                <field name="date_closed"/>
 +                                <field name="date_open"/>
 +                            </group>
 +                            <group col="2" colspan="2">
 +                                <separator string="Misc" colspan="2"/>
 +                                <field name="active"/>
 +                                <field name="day_open"/>
 +                                <field name="day_close"/>
 +                                <field name="referred"/>
 +                            </group>
 +                            <separator colspan="4" string="References"/>
 +                            <field name="ref"/>
 +                            <field name="ref2"/>
 +                        </page>
 +                        </notebook>
 +                        <group colspan="4">
 +                            <group col="3" colspan="2">
                                  <field colspan="4" name="email_cc" string="Global CC" widget="char" size="512"/>
                              </group>
 +                            <newline/>
 +                            <group col="3" colspan="2">
 +                                    <field name="email_from" string="Email" />
 +                                    <button string="Send Email"
 +                                    name="%(crm.action_crm_send_mail)d"
 +                                    context="{'mail':'new', 'model': 'crm.lead'}"
 +                                    icon="terp-mail-message-new" type="action" />
 +                             </group>
                              <field name="message_ids" colspan="4" nolabel="1" mode="tree,form">
 -                                <tree string="History">
 +                            <tree string="Note">
                                      <field name="display_text" string="History Information"/>
                                      <field name="history" invisible="1"/>
                                      <button
@@@ -268,20 -267,20 +267,22 @@@ class mailgate_message(osv.osv)
          'model': fields.char('Object Name', size=128, select=1, readonly=True),
          'res_id': fields.integer('Resource ID', select=1, readonly=True),
          'ref_id': fields.char('Reference Id', size=256, readonly=True, help="Message Id in Email Server.", select=True),
 -        'date': fields.datetime('Date', readonly=True),
 +        'date': fields.datetime('Date'),
          'history': fields.boolean('Is History?', readonly=True),
 -        'user_id': fields.many2one('res.users', 'User Responsible', readonly=True),
 +        'user_id': fields.many2one('res.users', 'User Responsible'),
          'message': fields.text('Message', readonly=True),
 -        'email_from': fields.char('From', size=128, help="Email From", readonly=True),
 -        'email_to': fields.char('To', help="Email Recipients", size=256, readonly=True),
 -        'email_cc': fields.char('Cc', help="Carbon Copy Email Recipients", size=256, readonly=True),
 -        'email_bcc': fields.char('Bcc', help='Blind Carbon Copy Email Recipients', size=256, readonly=True),
 -        'message_id': fields.char('Message Id', size=1024, readonly=True, help="Message Id on Email.", select=True),
 -        'references': fields.text('References', readonly=True, help="References emails."),
 -        'description': fields.text('Description', readonly=True),
 +        'email_from': fields.char('From', size=128, help="Email From"),
 +        'email_to': fields.char('To', help="Email Recipients", size=256),
 +        'email_cc': fields.char('Cc', help="Carbon Copy Email Recipients", size=256),
 +        'email_bcc': fields.char('Bcc', help='Blind Carbon Copy Email Recipients', size=256),
 +        'message_id': fields.char('Message Id', size=1024, help="Message Id on Email.", select=True),
 +        'references': fields.text('References', help="References emails."),
 +        'description': fields.text('Description'),
          'partner_id': fields.many2one('res.partner', 'Partner', required=False),
 +        'attachment_ids': fields.many2many('ir.attachment', 'message_attachment_rel', 'message_id', 'attachment_id', 'Attachments'),
 +        'display_text': fields.function(_get_display_text, method=True, type='text', size="512", string='Notes'),
+         'attachment_ids': fields.many2many('ir.attachment', 'message_attachment_rel', 'message_id', 'attachment_id', 'Attachments', readonly=True),
+         'display_text': fields.function(_get_display_text, type='text', size="512", string='Display Text'),
      }
  
      def init(self, cr):
@@@ -41,12 -40,11 +40,12 @@@ class project_installer(osv.osv_memory)
          'project_issue': fields.boolean('Issues Tracker',
              help="Automatically synchronizes project tasks and crm cases."),
          # Methodologies
-         'project_scrum': fields.boolean('SCRUM',
+         'project_scrum': fields.boolean('Methodology: SCRUM',
              help="Implements and tracks the concepts and task types defined "
                   "in the SCRUM methodology."),
-         'project_gtd': fields.boolean('Getting Things Done',
+         'project_gtd': fields.boolean('Methodology: Getting Things Done',
              help="GTD is a methodology to efficiently organise yourself and your tasks. This module fully integrates GTD principle with OpenERP's project management."),
 +        'project_todo': fields.boolean('Project TODO', help=" add a project todo list in your Opportunities form."),
      }
  project_installer()
  
@@@ -3,38 -3,22 +3,30 @@@
  
      <record id="view_project_installer" model="ir.ui.view">
        <field name="name">project.installer.view</field>
-       <field name="model">project.installer</field>
+       <field name="model">base.setup.installer</field>
        <field name="type">form</field>
-       <field name="inherit_id" ref="base.res_config_installer"/>
+       <field name="inherit_id" ref="base_setup.view_base_setup_installer"/>
        <field name="arch" type="xml">
            <data>
-           <form position="attributes">
-             <attribute name="string">Project Application Configuration</attribute>
-           </form>
-           <separator string="title" position="attributes">
-             <attribute name="string">Configure Your Project Management Application</attribute>
-           </separator>
-            <xpath expr='//separator[@string="vsep"]' position='attributes'>
-                 <attribute name='string'></attribute>
-              </xpath>
-           <xpath expr="//label[@string='description']" position="attributes">
-               <attribute name="string">Various OpenERP applications are available to manage your projects with different level of control and flexibility.</attribute>
-           </xpath>
-           <xpath expr="//button[@string='Install Modules']" position="attributes">
-               <attribute name="string">Configure</attribute>
-           </xpath>
-           <group colspan="8">
-             <field name="project_issue"/>
-             <field name="project_long_term" groups="base.group_extended"/>
-             <field name="hr_timesheet_sheet"/>
-             <field name="project_timesheet"/>
-             <field name="account_budget" groups="base.group_extended"/>
+           <xpath expr="//group[@name='project']" position="replace">
              <newline/>
++<<<<<<< TREE
 +            <separator string="Methodologies" colspan="4"/>
 +            <field name="project_scrum"/>
 +            <field name="project_gtd"/>
 +            <field name="project_todo"/>
 +          </group>
++=======
+             <separator  string="Project Management Features" colspan="4" />
+             <field name="project_issue" />
+             <field name="project_long_term" />
+             <field name="hr_timesheet_sheet" />
+             <field name="project_timesheet" />
+             <field name="account_budget" />
+             <field name="project_scrum" />
+             <field name="project_gtd" />
+           </xpath>
++>>>>>>> MERGE-SOURCE
          </data>
        </field>
      </record>