diff options
Diffstat (limited to 'addons/crm_profiling')
| -rw-r--r-- | addons/crm_profiling/crm_profiling.py | 6 | ||||
| -rw-r--r-- | addons/crm_profiling/crm_profiling_demo.xml | 404 | ||||
| -rw-r--r-- | addons/crm_profiling/crm_profiling_view.xml | 26 | ||||
| -rw-r--r-- | addons/crm_profiling/wizard/open_questionnaire_view.xml | 16 |
4 files changed, 226 insertions, 226 deletions
diff --git a/addons/crm_profiling/crm_profiling.py b/addons/crm_profiling/crm_profiling.py index e1ad536f85f..c23636230f2 100644 --- a/addons/crm_profiling/crm_profiling.py +++ b/addons/crm_profiling/crm_profiling.py @@ -116,7 +116,7 @@ def _recompute_categ(self, cr, uid, pid, answers_ids): ok = [] cr.execute(''' select r.category_id - from res_partner_category_rel r left join crm_segmentation s on (r.category_id = s.categ_id) + from res_partner_res_partner_category_rel r left join crm_segmentation s on (r.category_id = s.categ_id) where r.partner_id = %s and (s.exclusif = false or s.exclusif is null) ''', (pid,)) for x in cr.fetchall(): @@ -249,7 +249,7 @@ class crm_segmentation(osv.osv): for categ in categs: if start: if categ['exclusif']: - cr.execute('delete from res_partner_category_rel where \ + cr.execute('delete from res_partner_res_partner_category_rel where \ category_id=%s', (categ['categ_id'][0],)) id = categ['id'] @@ -281,7 +281,7 @@ class crm_segmentation(osv.osv): partners.remove(pid) for partner_id in partners: - cr.execute('insert into res_partner_category_rel (category_id,partner_id) values (%s,%s)', (categ['categ_id'][0],partner_id)) + cr.execute('insert into res_partner_res_partner_category_rel (category_id,partner_id) values (%s,%s)', (categ['categ_id'][0],partner_id)) self.write(cr, uid, [id], {'state':'not running', 'partner_id':0}) return True diff --git a/addons/crm_profiling/crm_profiling_demo.xml b/addons/crm_profiling/crm_profiling_demo.xml index 6a0ca130ec3..96c1c840237 100644 --- a/addons/crm_profiling/crm_profiling_demo.xml +++ b/addons/crm_profiling/crm_profiling_demo.xml @@ -3,208 +3,208 @@ <data noupdate="1"> - <!-- - Questions - --> - - <record model="crm_profiling.question" id="activity_sector"> - <field name="name">Activity sector?</field> - </record> - <record model="crm_profiling.question" id="nb_employees"> - <field name="name">Number of employees?</field> - </record> - <record model="crm_profiling.question" id="partner_level"> - <field name="name">Partner level?</field> - </record> - <record model="crm_profiling.question" id="partner_tiny"> - <field name="name">OpenERP partner?</field> - </record> - - <!-- - Questionnaires - --> - - <record model="crm_profiling.questionnaire" id="questionnaire1"> - <field name="name">Base questionnaire</field> - <field name="description">First questionnaire.</field> - <field name="questions_ids" eval="[(6,0,[activity_sector,nb_employees,partner_level])]"/> - </record> - - <!-- - Answers - --> - - <record model="crm_profiling.answer" id="sector1"> - <field name="name">HR</field> - <field name="question_id" ref="activity_sector"/> - </record> - <record model="crm_profiling.answer" id="sector2"> - <field name="name">Telecom</field> - <field name="question_id" ref="activity_sector"/> - </record> - <record model="crm_profiling.answer" id="sector3"> - <field name="name">IT</field> - <field name="question_id" ref="activity_sector"/> - </record> - <record model="crm_profiling.answer" id="nb_employees1"> - <field name="name">1 to 50</field> - <field name="question_id" ref="nb_employees"/> - </record> - <record model="crm_profiling.answer" id="nb_employees2"> - <field name="name">51 to 100</field> - <field name="question_id" ref="nb_employees"/> - </record> - <record model="crm_profiling.answer" id="nb_employees3"> - <field name="name">more than 100</field> - <field name="question_id" ref="nb_employees"/> - </record> - <record model="crm_profiling.answer" id="partner_quality1"> - <field name="name">bronze</field> - <field name="question_id" ref="partner_level"/> - </record> - <record model="crm_profiling.answer" id="partner_quality2"> - <field name="name">silver</field> - <field name="question_id" ref="partner_level"/> - </record> - <record model="crm_profiling.answer" id="partner_quality3"> - <field name="name">gold</field> - <field name="question_id" ref="partner_level"/> - </record> - <record model="crm_profiling.answer" id="partner_tiny1"> - <field name="name">yes</field> - <field name="question_id" ref="partner_tiny"/> - </record> - <record model="crm_profiling.answer" id="partner_tiny2"> - <field name="name">no</field> - <field name="question_id" ref="partner_tiny"/> - </record> - - - <!-- - Resource: res.partner.category - --> - - <record id="base.res_partner_category_15" model="res.partner.category"> - <field name="name">IT sector</field> - <field name="parent_id" ref="base.res_partner_category_12"/> - </record> - <record id="base.res_partner_category_16" model="res.partner.category"> - <field name="name">Telecom sector</field> - <field name="parent_id" ref="base.res_partner_category_12"/> - </record> - <record id="base.res_partner_category_17" model="res.partner.category"> - <field name="name">HR sector</field> - <field name="parent_id" ref="base.res_partner_category_12"/> - </record> - - - <!-- - Profiles / crm.segmentation - --> - - <record model="crm.segmentation" id="crm.crm_segmentation0"> - <field name="name">OpenERP partners</field> - <field name="answer_yes" eval="[(6,0,[partner_tiny1])]" /> - <field name="categ_id" ref="base.res_partner_category_2"/> - <field name="profiling_active">True</field> - </record> - <record model="crm.segmentation" id="crm_segmentation1"> - <field name="name">Bronze partners</field> - <field name="answer_yes" eval="[(6,0,[partner_quality1])]" /> - <field name="parent_id" ref="crm.crm_segmentation0"/> - <field name="categ_id" ref="base.res_partner_category_3"/> - <field name="profiling_active">True</field> - </record> - <record model="crm.segmentation" id="crm_segmentation2"> - <field name="name">Silver partners</field> - <field name="answer_yes" eval="[(6,0,[partner_quality2])]" /> - <field name="parent_id" ref="crm.crm_segmentation0"/> - <field name="categ_id" ref="base.res_partner_category_4"/> - <field name="profiling_active">True</field> - </record> - <record model="crm.segmentation" id="crm_segmentation3"> - <field name="name">Gold partners</field> - <field name="answer_yes" eval="[(6,0,[partner_quality3])]" /> - <field name="parent_id" ref="crm.crm_segmentation0"/> - <field name="categ_id" ref="base.res_partner_category_5"/> - <field name="exclusif">True</field> - <field name="profiling_active">True</field> - </record> - <record model="crm.segmentation" id="crm_segmentation4"> - <field name="name">HR partners</field> - <field name="answer_yes" eval="[(6,0,[sector1])]" /> - <field name="categ_id" ref="base.res_partner_category_17"/> - <field name="profiling_active">True</field> - </record> - <record model="crm.segmentation" id="crm_segmentation5"> - <field name="name">Telecom partners</field> - <field name="answer_yes" eval="[(6,0,[sector2])]" /> - <field name="categ_id" ref="base.res_partner_category_16"/> - <field name="profiling_active">True</field> - </record> - <record model="crm.segmentation" id="crm_segmentation6"> - <field name="name">IT partners</field> - <field name="answer_yes" eval="[(6,0,[sector3])]" /> - <field name="categ_id" ref="base.res_partner_category_15"/> - <field name="profiling_active">True</field> - </record> - - <!-- - Partners - --> - - <record model="res.partner" id="base.res_partner_asus"> - <field name="answers_ids" eval="[(6,0,[ref('partner_quality1'), ref('nb_employees2'), ref('sector2'), ref('partner_tiny1')])]" /> - <field name="category_id" eval="[(6,0,[ref('base.res_partner_category_3'), ref('base.res_partner_category_16')])]"/> - </record> - <record model="res.partner" id="base.res_partner_agrolait"> - <field name="answers_ids" eval="[(6,0,[ref('partner_quality1'), ref('nb_employees1'), ref('sector1'), ref('partner_tiny1')])]" /> - <field name="category_id" eval="[(6,0,[ref('base.res_partner_category_3'), ref('base.res_partner_category_17')])]"/> - </record> - <record model="res.partner" id="base.res_partner_c2c"> - <field name="answers_ids" eval="[(6,0,[ref('partner_quality3'), ref('nb_employees3'), ref('sector3'), ref('partner_tiny1')])]" /> - <field name="category_id" eval="[(6,0,[ref('base.res_partner_category_5'), ref('base.res_partner_category_15')])]"/> - </record> - <record model="res.partner" id="base.res_partner_sednacom"> - <field name="answers_ids" eval="[(6,0,[ref('partner_quality2'), ref('nb_employees1'), ref('sector2'), ref('partner_tiny1')])]" /> - <field name="category_id" eval="[(6,0,[ref('base.res_partner_category_4'), ref('base.res_partner_category_16')])]"/> - </record> - <record model="res.partner" id="base.res_partner_thymbra"> - <field name="answers_ids" eval="[(6,0,[ref('partner_quality3'), ref('nb_employees3'), ref('sector3'), ref('partner_tiny1')])]" /> - <field name="category_id" eval="[(6,0,[ref('base.res_partner_category_5'), ref('base.res_partner_category_15')])]"/> - </record> - <record model="res.partner" id="base.res_partner_desertic_hispafuentes"> - <field name="answers_ids" eval="[(6,0,[ref('partner_quality2'), ref('nb_employees2'), ref('sector2'), ref('partner_tiny1')])]" /> - <field name="category_id" eval="[(6,0,[ref('base.res_partner_category_4'), ref('base.res_partner_category_16')])]"/> - </record> - <record model="res.partner" id="base.res_partner_tinyatwork"> - <field name="answers_ids" eval="[(6,0,[ref('partner_quality1'), ref('nb_employees1'), ref('sector1'), ref('partner_tiny1')])]" /> - <field name="category_id" eval="[(6,0,[ref('base.res_partner_category_3'), ref('base.res_partner_category_17')])]"/> - </record> - <record model="res.partner" id="base.res_partner_2"> - <field name="answers_ids" eval="[(6,0,[ref('partner_quality1'), ref('nb_employees2'), ref('sector3'), ref('partner_tiny1')])]" /> - <field name="category_id" eval="[(6,0,[ref('base.res_partner_category_3'), ref('base.res_partner_category_15')])]"/> - </record> - <record model="res.partner" id="base.res_partner_3"> - <field name="answers_ids" eval="[(6,0,[ref('partner_quality2'), ref('nb_employees1'), ref('sector3'), ref('partner_tiny1')])]" /> - <field name="category_id" eval="[(6,0,[ref('base.res_partner_category_4'), ref('base.res_partner_category_15')])]"/> - </record> - <record model="res.partner" id="base.res_partner_4"> - <field name="answers_ids" eval="[(6,0,[ref('partner_quality3'), ref('nb_employees1'), ref('sector2'), ref('partner_tiny1')])]" /> - <field name="category_id" eval="[(6,0,[ref('base.res_partner_category_1'), ref('base.res_partner_category_16')])]"/> - </record> - <record model="res.partner" id="base.res_partner_5"> - <field name="answers_ids" eval="[(6,0,[ref('partner_quality3'), ref('nb_employees2'), ref('sector1'), ref('partner_tiny1')])]" /> - <field name="category_id" eval="[(6,0,[ref('base.res_partner_category_1'), ref('base.res_partner_category_17')])]"/> - </record> - <record model="res.partner" id="base.res_partner_6"> - <field name="answers_ids" eval="[(6,0,[ref('partner_quality3'), ref('nb_employees3'), ref('sector2'), ref('partner_tiny1')])]" /> - <field name="category_id" eval="[(6,0,[ref('base.res_partner_category_1'), ref('base.res_partner_category_16')])]"/> - </record> - <record model="res.partner" id="base.res_partner_maxtor"> - <field name="answers_ids" eval="[(6,0,[ref('partner_quality3'), ref('nb_employees1'), ref('sector3'), ref('partner_tiny1')])]" /> - <field name="category_id" eval="[(6,0,[ref('base.res_partner_category_1'), ref('base.res_partner_category_15')])]"/> - </record> + <!-- + Questions + --> + + <record model="crm_profiling.question" id="activity_sector"> + <field name="name">Activity sector?</field> + </record> + <record model="crm_profiling.question" id="nb_employees"> + <field name="name">Number of employees?</field> + </record> + <record model="crm_profiling.question" id="partner_level"> + <field name="name">Partner level?</field> + </record> + <record model="crm_profiling.question" id="partner_tiny"> + <field name="name">OpenERP partner?</field> + </record> + + <!-- + Questionnaires + --> + + <record model="crm_profiling.questionnaire" id="questionnaire1"> + <field name="name">Base questionnaire</field> + <field name="description">First questionnaire.</field> + <field name="questions_ids" eval="[(6,0,[activity_sector,nb_employees,partner_level])]"/> + </record> + + <!-- + Answers + --> + + <record model="crm_profiling.answer" id="sector1"> + <field name="name">HR</field> + <field name="question_id" ref="activity_sector"/> + </record> + <record model="crm_profiling.answer" id="sector2"> + <field name="name">Telecom</field> + <field name="question_id" ref="activity_sector"/> + </record> + <record model="crm_profiling.answer" id="sector3"> + <field name="name">IT</field> + <field name="question_id" ref="activity_sector"/> + </record> + <record model="crm_profiling.answer" id="nb_employees1"> + <field name="name">1 to 50</field> + <field name="question_id" ref="nb_employees"/> + </record> + <record model="crm_profiling.answer" id="nb_employees2"> + <field name="name">51 to 100</field> + <field name="question_id" ref="nb_employees"/> + </record> + <record model="crm_profiling.answer" id="nb_employees3"> + <field name="name">more than 100</field> + <field name="question_id" ref="nb_employees"/> + </record> + <record model="crm_profiling.answer" id="partner_quality1"> + <field name="name">bronze</field> + <field name="question_id" ref="partner_level"/> + </record> + <record model="crm_profiling.answer" id="partner_quality2"> + <field name="name">silver</field> + <field name="question_id" ref="partner_level"/> + </record> + <record model="crm_profiling.answer" id="partner_quality3"> + <field name="name">gold</field> + <field name="question_id" ref="partner_level"/> + </record> + <record model="crm_profiling.answer" id="partner_tiny1"> + <field name="name">yes</field> + <field name="question_id" ref="partner_tiny"/> + </record> + <record model="crm_profiling.answer" id="partner_tiny2"> + <field name="name">no</field> + <field name="question_id" ref="partner_tiny"/> + </record> + + + <!-- + Resource: res.partner.category + --> + + <record id="base.res_partner_category_15" model="res.partner.category"> + <field name="name">IT sector</field> + <field name="parent_id" ref="base.res_partner_category_12"/> + </record> + <record id="base.res_partner_category_16" model="res.partner.category"> + <field name="name">Telecom sector</field> + <field name="parent_id" ref="base.res_partner_category_12"/> + </record> + <record id="base.res_partner_category_17" model="res.partner.category"> + <field name="name">HR sector</field> + <field name="parent_id" ref="base.res_partner_category_12"/> + </record> + + + <!-- + Profiles / crm.segmentation + --> + + <record model="crm.segmentation" id="crm.crm_segmentation0"> + <field name="name">OpenERP partners</field> + <field name="answer_yes" eval="[(6,0,[partner_tiny1])]" /> + <field name="categ_id" ref="base.res_partner_category_2"/> + <field name="profiling_active">True</field> + </record> + <record model="crm.segmentation" id="crm_segmentation1"> + <field name="name">Bronze partners</field> + <field name="answer_yes" eval="[(6,0,[partner_quality1])]" /> + <field name="parent_id" ref="crm.crm_segmentation0"/> + <field name="categ_id" ref="base.res_partner_category_3"/> + <field name="profiling_active">True</field> + </record> + <record model="crm.segmentation" id="crm_segmentation2"> + <field name="name">Silver partners</field> + <field name="answer_yes" eval="[(6,0,[partner_quality2])]" /> + <field name="parent_id" ref="crm.crm_segmentation0"/> + <field name="categ_id" ref="base.res_partner_category_4"/> + <field name="profiling_active">True</field> + </record> + <record model="crm.segmentation" id="crm_segmentation3"> + <field name="name">Gold partners</field> + <field name="answer_yes" eval="[(6,0,[partner_quality3])]" /> + <field name="parent_id" ref="crm.crm_segmentation0"/> + <field name="categ_id" ref="base.res_partner_category_5"/> + <field name="exclusif">True</field> + <field name="profiling_active">True</field> + </record> + <record model="crm.segmentation" id="crm_segmentation4"> + <field name="name">HR partners</field> + <field name="answer_yes" eval="[(6,0,[sector1])]" /> + <field name="categ_id" ref="base.res_partner_category_17"/> + <field name="profiling_active">True</field> + </record> + <record model="crm.segmentation" id="crm_segmentation5"> + <field name="name">Telecom partners</field> + <field name="answer_yes" eval="[(6,0,[sector2])]" /> + <field name="categ_id" ref="base.res_partner_category_16"/> + <field name="profiling_active">True</field> + </record> + <record model="crm.segmentation" id="crm_segmentation6"> + <field name="name">IT partners</field> + <field name="answer_yes" eval="[(6,0,[sector3])]" /> + <field name="categ_id" ref="base.res_partner_category_15"/> + <field name="profiling_active">True</field> + </record> + + <!-- + Partners + --> + + <record model="res.partner" id="base.res_partner_asus"> + <field name="answers_ids" eval="[(6,0,[ref('partner_quality1'), ref('nb_employees2'), ref('sector2'), ref('partner_tiny1')])]" /> + <field name="category_id" eval="[(6,0,[ref('base.res_partner_category_3'), ref('base.res_partner_category_16')])]"/> + </record> + <record model="res.partner" id="base.res_partner_agrolait"> + <field name="answers_ids" eval="[(6,0,[ref('partner_quality1'), ref('nb_employees1'), ref('sector1'), ref('partner_tiny1')])]" /> + <field name="category_id" eval="[(6,0,[ref('base.res_partner_category_3'), ref('base.res_partner_category_17')])]"/> + </record> + <record model="res.partner" id="base.res_partner_c2c"> + <field name="answers_ids" eval="[(6,0,[ref('partner_quality3'), ref('nb_employees3'), ref('sector3'), ref('partner_tiny1')])]" /> + <field name="category_id" eval="[(6,0,[ref('base.res_partner_category_5'), ref('base.res_partner_category_15')])]"/> + </record> + <record model="res.partner" id="base.res_partner_sednacom"> + <field name="answers_ids" eval="[(6,0,[ref('partner_quality2'), ref('nb_employees1'), ref('sector2'), ref('partner_tiny1')])]" /> + <field name="category_id" eval="[(6,0,[ref('base.res_partner_category_4'), ref('base.res_partner_category_16')])]"/> + </record> + <record model="res.partner" id="base.res_partner_thymbra"> + <field name="answers_ids" eval="[(6,0,[ref('partner_quality3'), ref('nb_employees3'), ref('sector3'), ref('partner_tiny1')])]" /> + <field name="category_id" eval="[(6,0,[ref('base.res_partner_category_5'), ref('base.res_partner_category_15')])]"/> + </record> + <record model="res.partner" id="base.res_partner_desertic_hispafuentes"> + <field name="answers_ids" eval="[(6,0,[ref('partner_quality2'), ref('nb_employees2'), ref('sector2'), ref('partner_tiny1')])]" /> + <field name="category_id" eval="[(6,0,[ref('base.res_partner_category_4'), ref('base.res_partner_category_16')])]"/> + </record> + <record model="res.partner" id="base.res_partner_tinyatwork"> + <field name="answers_ids" eval="[(6,0,[ref('partner_quality1'), ref('nb_employees1'), ref('sector1'), ref('partner_tiny1')])]" /> + <field name="category_id" eval="[(6,0,[ref('base.res_partner_category_3'), ref('base.res_partner_category_17')])]"/> + </record> + <record model="res.partner" id="base.res_partner_2"> + <field name="answers_ids" eval="[(6,0,[ref('partner_quality1'), ref('nb_employees2'), ref('sector3'), ref('partner_tiny1')])]" /> + <field name="category_id" eval="[(6,0,[ref('base.res_partner_category_3'), ref('base.res_partner_category_15')])]"/> + </record> + <record model="res.partner" id="base.res_partner_3"> + <field name="answers_ids" eval="[(6,0,[ref('partner_quality2'), ref('nb_employees1'), ref('sector3'), ref('partner_tiny1')])]" /> + <field name="category_id" eval="[(6,0,[ref('base.res_partner_category_4'), ref('base.res_partner_category_15')])]"/> + </record> + <record model="res.partner" id="base.res_partner_4"> + <field name="answers_ids" eval="[(6,0,[ref('partner_quality3'), ref('nb_employees1'), ref('sector2'), ref('partner_tiny1')])]" /> + <field name="category_id" eval="[(6,0,[ref('base.res_partner_category_1'), ref('base.res_partner_category_16')])]"/> + </record> + <record model="res.partner" id="base.res_partner_5"> + <field name="answers_ids" eval="[(6,0,[ref('partner_quality3'), ref('nb_employees2'), ref('sector1'), ref('partner_tiny1')])]" /> + <field name="category_id" eval="[(6,0,[ref('base.res_partner_category_1'), ref('base.res_partner_category_17')])]"/> + </record> + <record model="res.partner" id="base.res_partner_6"> + <field name="answers_ids" eval="[(6,0,[ref('partner_quality3'), ref('nb_employees3'), ref('sector2'), ref('partner_tiny1')])]" /> + <field name="category_id" eval="[(6,0,[ref('base.res_partner_category_1'), ref('base.res_partner_category_16')])]"/> + </record> + <record model="res.partner" id="base.res_partner_maxtor"> + <field name="answers_ids" eval="[(6,0,[ref('partner_quality3'), ref('nb_employees1'), ref('sector3'), ref('partner_tiny1')])]" /> + <field name="category_id" eval="[(6,0,[ref('base.res_partner_category_1'), ref('base.res_partner_category_15')])]"/> + </record> </data> </openerp> diff --git a/addons/crm_profiling/crm_profiling_view.xml b/addons/crm_profiling/crm_profiling_view.xml index dee6f244c9a..b779e54bf17 100644 --- a/addons/crm_profiling/crm_profiling_view.xml +++ b/addons/crm_profiling/crm_profiling_view.xml @@ -31,8 +31,8 @@ <field name="type">tree</field> <field name="arch" type="xml"> <tree string="Questionnaires"> - <field name="name" select="1" colspan="4"/> - <field name="description" select="1" colspan="4"/> + <field name="name" colspan="4"/> + <field name="description" colspan="4"/> <field name="questions_ids" colspan="4" nolabel="1"/> </tree> </field> @@ -46,13 +46,13 @@ <field name="type">form</field> <field name="arch" type="xml"> <form string="Questionnaires"> - <field name="name" select="1" /> + <field name="name"/> <newline/> <separator string="Questions List" colspan="4"/> <field name="questions_ids" colspan="4" nolabel="1"/> <newline/> <separator string="Description" colspan="4"/> - <field name="description" colspan="4" select="1" nolabel="1"/> + <field name="description" colspan="4" nolabel="1"/> </form> </field> </record> @@ -65,8 +65,8 @@ <field name="type">tree</field> <field name="arch" type="xml"> <tree string="Answers"> - <field name="question_id" select="1"/> - <field name="name" select="1"/> + <field name="question_id"/> + <field name="name"/> </tree> </field> </record> @@ -79,8 +79,8 @@ <field name="type">form</field> <field name="arch" type="xml"> <form string="Answers"> - <field name="question_id" select="1"/> - <field name="name" select="1"/> + <field name="question_id"/> + <field name="name"/> </form> </field> </record> @@ -93,7 +93,7 @@ <field name="type">tree</field> <field name="arch" type="xml"> <tree string="Questions"> - <field name="name" select="1" colspan="4"/> + <field name="name" colspan="4"/> <field name="answers_ids" colspan="4" nolabel="1"/> </tree> </field> @@ -108,15 +108,15 @@ <field name="arch" type="xml"> <form string="Questions"> <newline/> - <field name="name" select="1" /> + <field name="name"/> <newline/> <separator string="Avalaible Answers" colspan="4"/> <field name="answers_ids" colspan="4" nolabel="1"> <tree string="Answers" editable="bottom"> - <field name="name" select="1"/> + <field name="name"/> </tree> <form string="Answers"> - <field name="name" select="1"/> + <field name="name"/> </form> </field> </form> @@ -153,7 +153,7 @@ <notebook> <page string="Segmentation"> <separator string="Segmentation Description" colspan="4"/> - <field name="name" select="1"/> + <field name="name"/> <field name="exclusif"/> <newline/> <field name="categ_id" colspan="2"/> diff --git a/addons/crm_profiling/wizard/open_questionnaire_view.xml b/addons/crm_profiling/wizard/open_questionnaire_view.xml index 6c70f30c036..04dca6da22f 100644 --- a/addons/crm_profiling/wizard/open_questionnaire_view.xml +++ b/addons/crm_profiling/wizard/open_questionnaire_view.xml @@ -9,8 +9,9 @@ <field name="arch" type="xml"> <form string="Questionnaires" version="7.0"> <header> - <button name="build_form" string="Open Questionnaire" icon="terp-camera_test" type="object"/> - <button special="cancel" icon="gtk-cancel" string="Cancel"/> + <button name="build_form" string="Open Questionnaire" type="object" class="oe_highlight"/> + or + <button string="Cancel" class="oe_link" special="cancel" /> </header> <group> <field name="questionnaire_id"/> @@ -34,14 +35,13 @@ <field name="type">form</field> <field name="arch" type="xml"> <form version="7.0"> + <header> + <button name="questionnaire_compute" string="Save Data" type="object" class="oe_highlight"/> + or + <button string="Cancel" class="oe_link" special="cancel" /> + </header> <separator colspan="4" string="Questionnaire"/> <field name="question_ans_ids" colspan="4" nolabel="1" mode="tree,form" width="550" height="200"/> - <separator string="" colspan="4" /> - <label string="" colspan="2"/> - <group col="2" colspan="2"> - <button icon='gtk-cancel' special="cancel" string="_Cancel" /> - <button name="questionnaire_compute" string="Save Data" icon="terp-stock_format-scientific" colspan="1" type="object"/> - </group> </form> </field> </record> |