diff options
| author | Yannick Tivisse <yti@odoo.com> | 2018-07-18 17:06:52 +0200 |
|---|---|---|
| committer | Yannick Tivisse <yti@odoo.com> | 2018-07-25 17:34:06 +0200 |
| commit | 58fc4e440952bde533c8aa1dc8b6fc2440a05337 (patch) | |
| tree | f8a0ab193099323a60091137f035f0983ee312e3 /addons | |
| parent | abc1289a4c58659ea5eb9b741a37e062e4a36e2f (diff) | |
[IMP] base: Improve partners/employees demo data
- Update all the pictures
- Rename the partners with a name that is easy to say for an English speaker (No more 'Agwoleight')
- Update all the addresses/phone numbers in the american format
- Unify the demo data with the new theme (Wood shop/manufacture,...)
Diffstat (limited to 'addons')
45 files changed, 121 insertions, 117 deletions
diff --git a/addons/account/static/src/js/reconciliation/tour_reconciliation.js b/addons/account/static/src/js/reconciliation/tour_reconciliation.js index 07b5b2fe7f2..9cb7fd8fa88 100644 --- a/addons/account/static/src/js/reconciliation/tour_reconciliation.js +++ b/addons/account/static/src/js/reconciliation/tour_reconciliation.js @@ -82,12 +82,12 @@ Tour.register('bank_statement_reconciliation', { { content: "change the partner of the second line", trigger: '.o_reconciliation_line:nth-child(2) .o_field_many2one input', - run: 'text Agro' + run: 'text Deco' }, { - content: "select Agrolait", - extra_trigger: '.ui-autocomplete:visible li:eq(1):contains(Create "Agro")', - trigger: '.ui-autocomplete:visible li:contains(Agrolait)', + content: "select Deco Addict ", + extra_trigger: '.ui-autocomplete:visible li:eq(1):contains(Create "Deco")', + trigger: '.ui-autocomplete:visible li:contains(Deco Addict)', }, { content: "use filter", @@ -96,9 +96,9 @@ Tour.register('bank_statement_reconciliation', { run: 'text 4610' }, { - content: "select a line linked to Agrolait", + content: "select a line linked to Deco Addict ", extra_trigger: '.o_reconciliation_line:nth-child(2) .match:not(:has(tr:eq(1)))', - trigger: '.o_reconciliation_line:nth-child(2) .match .line_info_button[data-content*=Agrolait]' + trigger: ".o_reconciliation_line:nth-child(2) .match .line_info_button[data-content*='Deco Addict']" }, { content: "deselect the line", diff --git a/addons/analytic/data/analytic_account_demo.xml b/addons/analytic/data/analytic_account_demo.xml index 4f20e9cc815..296bfe97820 100644 --- a/addons/analytic/data/analytic_account_demo.xml +++ b/addons/analytic/data/analytic_account_demo.xml @@ -41,7 +41,7 @@ <field name="group_id" ref="analytic.analytic_group_projects"/> </record> <record id="analytic_agrolait" model="account.analytic.account"> - <field name="name">Agrolait</field> + <field name="name">Deco Addict</field> <field name="partner_id" ref="base.res_partner_2"/> <field name="group_id" ref="analytic.analytic_group_projects"/> </record> @@ -76,7 +76,7 @@ <field name="group_id" ref="analytic.analytic_group_projects"/> </record> <record id="analytic_think_big_systems" model="account.analytic.account"> - <field name="name">Think Big Systems</field> + <field name="name">Lumber Inc</field> <field name="partner_id" ref="base.res_partner_18"/> <field name="group_id" ref="analytic.analytic_group_projects"/> </record> diff --git a/addons/crm/data/crm_lead_demo.xml b/addons/crm/data/crm_lead_demo.xml index 21f228e76a1..9ad1e398265 100644 --- a/addons/crm/data/crm_lead_demo.xml +++ b/addons/crm/data/crm_lead_demo.xml @@ -318,7 +318,7 @@ Andrew</p>]]></field> <field name="type">lead</field> <field name="name">Estimation for Office Furnitures</field> <field name="contact_name">Thomas Passot</field> - <field name="partner_name">Agrolait</field> + <field name="partner_name">Deco Addict</field> <field name="email_from">p.thomas@agrolait.com</field> <field name="partner_id" ref="base.res_partner_1"/> <field name="function">Functional Consultant</field> @@ -388,7 +388,7 @@ Andrew</p>]]></field> <field name="color">7</field> <field name="planned_revenue">24000</field> <field name="probability">10.0</field> - <field name="partner_name">Agrolait</field> + <field name="partner_name">Deco Addict</field> <field name="email_from">info@agrolait.com</field> <field name="partner_id" ref="base.res_partner_2"/> <field name="country_id" ref="base.be"/> @@ -737,7 +737,7 @@ Andrew</p>]]></field> <field name="name">Open Space Design</field> <field name="planned_revenue">11000</field> <field name="probability">45</field> - <field name="partner_name">Agrolait</field> + <field name="partner_name">Deco Addict</field> <field name="email_from">info@agrolait.com</field> <field name="partner_id" ref="base.res_partner_2"/> <field name="street">Rue de Namur 69</field> @@ -760,7 +760,7 @@ Andrew</p>]]></field> <field name="name">Interest in your products</field> <field name="planned_revenue">2000</field> <field name="probability">80</field> - <field name="partner_name">Agrolait</field> + <field name="partner_name">Deco Addict</field> <field name="email_from">info@agrolait.com</field> <field name="partner_id" ref="base.res_partner_2"/> <field name="country_id" ref="base.be"/> diff --git a/addons/crm/report/crm_activity_report.py b/addons/crm/report/crm_activity_report.py index 4a9808a6fe4..87f564b6522 100644 --- a/addons/crm/report/crm_activity_report.py +++ b/addons/crm/report/crm_activity_report.py @@ -52,7 +52,6 @@ class ActivityReport(models.Model): l.probability """ - def _from(self): return """ FROM mail_message AS m diff --git a/addons/google_drive/views/google_drive_views.xml b/addons/google_drive/views/google_drive_views.xml index 6451e1f5465..7cfd8f61e92 100644 --- a/addons/google_drive/views/google_drive_views.xml +++ b/addons/google_drive/views/google_drive_views.xml @@ -42,9 +42,9 @@ <field name='name_template' /> <p class="oe_grey"> The name of the attached document can use fixed or variable data. To distinguish between documents in - Google Drive, use fixed words and fields. For instance, in the example above, if you wrote Agrolait_%%(name)s_Sales + Google Drive, use fixed words and fields. For instance, in the example above, if you wrote Deco_Addict_%%(name)s_Sales in the Google Drive name field, the document in your Google Drive and in Odoo attachment will be named - 'Agrolait_SO0001_Sales'. + 'Deco_Addict_SO0001_Sales'. </p> </div> </group> diff --git a/addons/hr/data/hr_demo.xml b/addons/hr/data/hr_demo.xml index 68c60c81f0b..fb726e22768 100644 --- a/addons/hr/data/hr_demo.xml +++ b/addons/hr/data/hr_demo.xml @@ -136,10 +136,10 @@ If you have development competencies, we can propose you specific traineeships</ <!--Employees--> <record id="employee_root" model="hr.employee"> - <field name="name">Pieter Parker</field> + <field name="name">Aiden Hughes</field> <field name="work_location">Building 1, Second Floor</field> - <field name="work_phone">+3281813700</field> - <field name="work_email">pieter@odoo.com</field> + <field name="work_phone">(237)-125-2389</field> + <field name="work_email">aiden.hughes71@example.com</field> <field name="category_ids" eval="[(6, 0, [ref('employee_category_4'), ref('employee_category_3')])]"/> <field name="job_id" ref="hr.job_ceo"/> <field name="department_id" ref="dep_management"/> @@ -147,62 +147,62 @@ If you have development competencies, we can propose you specific traineeships</ </record> <record id="employee_al" model="hr.employee"> - <field name="name">Antoine Langlais</field> + <field name="name">Ronnie Hart</field> <field name="department_id" ref="dep_rd"/> <field name="job_id" ref="hr.job_cto"/> <field name="category_ids" eval="[(6, 0, [ref('employee_category_4'), ref('employee_category_3')])]"/> <field name="work_location">Building 1, Second Floor</field> - <field name="work_phone">+3281813700</field> - <field name="work_email">antoine@odoo.com</field> + <field name="work_phone">(376)-310-7863</field> + <field name="work_email">ronnie.hart87@example.com</field> <field name="image" type="base64" file="hr/static/img/employee_al-image.jpg"/> </record> <record id="employee_mit" model="hr.employee"> - <field name="name">John Smith</field> + <field name="name">Anita Oliver</field> <field name="department_id" ref="dep_rd"/> <field name="parent_id" ref="employee_al"/> <field name="job_id" ref="hr.job_developer"/> <field name="category_ids" eval="[(6, 0, [ref('employee_category_4')])]"/> <field name="work_location">Building 1, Second Floor</field> - <field name="work_phone">+3281813700</field> - <field name="mobile_phone">+32486571630</field> - <field name="work_email">john@odoo.com</field> - <field name="image" type="base64" file="hr/static/img/employee_mit-image.png"/> + <field name="work_phone">(538)-497-4804</field> + <field name="mobile_phone">(538)-672-3185</field> + <field name="work_email">anita.oliver32@example.com</field> + <field name="image" type="base64" file="hr/static/img/employee_mit-image.jpg"/> </record> <record id="employee_niv" model="hr.employee"> - <field name="name">Michael Hawkins</field> + <field name="name">Sharlene Rhodes</field> <field name="department_id" ref="dep_rd"/> <field name="parent_id" ref="employee_al"/> <field name="job_id" ref="hr.job_developer"/> <field name="category_ids" eval="[(6, 0, [ref('employee_category_4')])]"/> <field name="work_location">Building 1, Second Floor</field> - <field name="work_phone">+3281813700</field> - <field name="work_email">michael@odoo.com</field> + <field name="work_phone">(450)-719-4182</field> + <field name="work_email">sharlene.rhodes49@example.comcom</field> <field name="image" type="base64" file="hr/static/img/employee_niv-image.jpg"/> </record> <record id="employee_stw" model="hr.employee"> - <field name="name">Liam Nelson</field> + <field name="name">Randall Lewis</field> <field name="department_id" ref="dep_rd"/> <field name="parent_id" ref="employee_al"/> <field name="job_id" ref="hr.job_developer"/> <field name="category_ids" eval="[(6, 0, [ref('employee_category_4')])]"/> <field name="work_location">Building 1, Second Floor</field> - <field name="work_phone">+3281813700</field> - <field name="work_email">liam@odoo.com</field> + <field name="work_phone">(332)-775-6660</field> + <field name="work_email">randall.lewis74@example.com</field> <field name="image" type="base64" file="hr/static/img/employee_stw-image.jpg"/> </record> <record id="employee_chs" model="hr.employee"> - <field name="name">David Samson</field> + <field name="name">Jennie Fletcher</field> <field name="department_id" ref="dep_rd"/> <field name="parent_id" ref="employee_al"/> <field name="job_id" ref="hr.job_developer"/> <field name="category_ids" eval="[(6, 0, [ref('employee_category_4')])]"/> <field name="work_location">Building 1, Second Floor</field> - <field name="work_phone">+3281813700</field> - <field name="work_email">david@odoo.com</field> + <field name="work_phone">(157)-363-8229</field> + <field name="work_email">jennie.fletcher76@example.com</field> <field name="image" type="base64" file="hr/static/img/employee_chs-image.jpg"/> </record> @@ -220,158 +220,143 @@ If you have development competencies, we can propose you specific traineeships</ </record> <record id="employee_fme" model="hr.employee"> - <field name="name">Jack Macklin</field> + <field name="name">Keith Byrd</field> <field name="department_id" ref="dep_rd"/> <field name="parent_id" ref="employee_al"/> <field name="job_id" ref="hr.job_developer"/> <field name="category_ids" eval="[(6, 0, [ref('employee_category_4')])]"/> <field name="work_location">Building 1, Second Floor</field> - <field name="work_phone">+3281813700</field> - <field name="work_email">jack@odoo.com</field> + <field name="work_phone">(449)-505-5146</field> + <field name="work_email">keith.byrd52@example.com</field> <field name="image" type="base64" file="hr/static/img/employee_fme-image.jpg"/> </record> <record id="employee_fpi" model="hr.employee"> - <field name="name">Martin Lawrence</field> + <field name="name">Audrey Peterson</field> <field name="department_id" ref="dep_ps"/> <field name="parent_id" ref="employee_root"/> <field name="job_id" ref="hr.job_consultant"/> <field name="category_ids" eval="[(6, 0, [ref('employee_category_4'), ref('employee_category_5')])]"/> <field name="work_location">Building 1, Second Floor</field> - <field name="work_phone">+3281813700</field> - <field name="work_email">martin@odoo.com</field> + <field name="work_phone">(203)-276-7903</field> + <field name="work_email">audrey.peterson25@example.com</field> <field name="image" type="base64" file="hr/static/img/employee_fpi-image.jpg"/> </record> <record id="employee_jth" model="hr.employee"> - <field name="name">Jimmy Kosikin</field> + <field name="name">Toni Jimenez</field> <field name="department_id" ref="dep_ps"/> <field name="parent_id" ref="employee_root"/> <field name="job_id" ref="hr.job_consultant"/> <field name="category_ids" eval="[(6, 0, [ref('employee_category_4'), ref('employee_category_5')])]"/> <field name="work_location">Building 1, Second Floor</field> - <field name="work_phone">+3281813700</field> - <field name="work_email">jimmy@odoo.com</field> - <field name="image" type="base64" file="hr/static/img/employee_jth-image.png"/> + <field name="work_phone">(663)-707-8451</field> + <field name="work_email">toni.jimenez23@example.com</field> + <field name="image" type="base64" file="hr/static/img/employee_jth-image.jpg"/> </record> <record id="employee_ngh" model="hr.employee"> - <field name="name">Famke Jenssens</field> + <field name="name">Jeffrey Kelly</field> <field name="department_id" ref="dep_sales"/> <field name="parent_id" ref="employee_root"/> <field name="job_id" ref="hr.job_marketing"/> <field name="category_ids" eval="[(6, 0, [ref('employee_category_4'), ref('employee_category_2')])]"/> <field name="work_location">Building 1, Second Floor</field> - <field name="work_phone">+3281813700</field> - <field name="work_email">famke@odoo.com</field> + <field name="work_phone">(916)-264-7362</field> + <field name="work_email">jeffrey.kelly72@example.com</field> <field name="image" type="base64" file="hr/static/img/employee_ngh-image.jpg"/> </record> <record id="employee_vad" model="hr.employee"> - <field name="name">Ashley Presley</field> + <field name="name">Tina Williamson</field> <field name="department_id" ref="dep_administration"/> <field name="parent_id" ref="employee_root"/> <field name="job_id" ref="hr.job_hrm"/> <field name="category_ids" eval="[(6, 0, [ref('employee_category_4')])]"/> <field name="work_location">Building 1, Second Floor</field> - <field name="work_phone">+3281813700</field> - <field name="work_email">ashley@odoo.com</field> + <field name="work_phone">(360)-694-7266</field> + <field name="work_email">tina.williamson98@example.com</field> <field name="image" type="base64" file="hr/static/img/employee_vad-image.jpg"/> </record> <record id="employee_han" model="hr.employee"> - <field name="name">Hans Anders</field> + <field name="name">Walter Horton</field> <field name="department_id" ref="dep_rd"/> <field name="job_id" ref="hr.job_developer"/> <field name="work_location">Building 1, Second Floor</field> - <field name="work_phone">+3282823500</field> - <field name="image" type="base64" file="hr/static/img/employee_han-image.png"/> + <field name="work_phone">(350)-912-1201</field> + <field name="work_email">walter.horton80@example.com</field> + <field name="image" type="base64" file="hr/static/img/employee_han-image.jpg"/> </record> <record id="employee_jve" model="hr.employee"> - <field name="name">Jan Van Eyck</field> + <field name="name">Paul Williams</field> <field name="department_id" ref="dep_rd"/> <field name="job_id" ref="hr.job_developer"/> <field name="work_location">Building 1, Second Floor</field> - <field name="work_phone">+3282823500</field> - <field name="work_email">jve@odoo.com</field> + <field name="work_phone">(114)-262-1607</field> + <field name="work_email">paul.williams59@example.com</field> <field name="image" type="base64" file="hr/static/img/employee_jve-image.jpg"/> </record> <record id="employee_jep" model="hr.employee"> - <field name="name">Jean-Pierre Carnaud</field> + <field name="name">Doris Cole</field> <field name="department_id" ref="dep_ps"/> <field name="job_id" ref="hr.job_consultant"/> <field name="work_location">Building 1, Second Floor</field> - <field name="work_phone">+3282823500</field> - <field name="work_email">jep@odoo.com</field> + <field name="work_phone">(883)-331-5378</field> + <field name="work_email">doris.cole31@example.com</field> <field name="image" type="base64" file="hr/static/img/employee_jep-image.jpg"/> </record> <record id="employee_jod" model="hr.employee"> - <field name="name">John Doe</field> + <field name="name">Rachel Perry</field> <field name="department_id" ref="dep_sales"/> <field name="job_id" ref="hr.job_marketing"/> <field name="work_location">Building 1, Second Floor</field> - <field name="work_phone">+3282823500</field> + <field name="work_phone">(206)-267-3735</field> <field name="work_email">jod@odoo.com</field> - <field name="image" type="base64" file="hr/static/img/employee_jod-image.png"/> + <field name="image" type="base64" file="hr/static/img/employee_jod-image.jpg"/> </record> <record id="employee_jog" model="hr.employee"> - <field name="name">João Gomer</field> + <field name="name">Beth Evans</field> <field name="department_id" ref="dep_rd"/> <field name="job_id" ref="hr.job_developer"/> <field name="work_location">Building 1, Second Floor</field> - <field name="work_phone">+3282823500</field> - <field name="work_email">jog@odoo.com</field> + <field name="work_phone">(754)-532-3841</field> + <field name="work_email">beth.evans77@example.com</field> <field name="image" type="base64" file="hr/static/img/employee_jog-image.jpg"/> </record> <record id="employee_jgo" model="hr.employee"> - <field name="name">Juan Gomez</field> + <field name="name">Ernest Reed</field> <field name="department_id" ref="dep_ps"/> <field name="job_id" ref="hr.job_consultant"/> <field name="work_location">Building 1, Second Floor</field> - <field name="work_phone">+3282823500</field> + <field name="work_phone">(944)-518-8232</field> + <field name="work_email">ernest.reed47@example.com</field> <field name="image" type="base64" file="hr/static/img/employee_jgo-image.jpg"/> </record> <record id="employee_lur" model="hr.employee"> - <field name="name">Luigi Rondi</field> + <field name="name">Eli Lambert</field> <field name="department_id" ref="dep_sales"/> <field name="job_id" ref="hr.job_marketing"/> <field name="work_location">Building 1, Second Floor</field> - <field name="work_phone">+3282823500</field> - <field name="work_email">lur@odoo.com</field> - <field name="image" type="base64" file="hr/static/img/employee_lur-image.png"/> + <field name="work_phone">(644)-169-1352</field> + <field name="work_email">eli.lambert22@example.com</field> + <field name="image" type="base64" file="hr/static/img/employee_lur-image.jpg"/> </record> <record id="employee_hne" model="hr.employee"> - <field name="name">Николай Петра</field> + <field name="name">Abigail Peterson</field> <field name="department_id" ref="dep_ps"/> <field name="job_id" ref="hr.job_consultant"/> <field name="work_location">Building 1, Second Floor</field> - <field name="work_phone">+3282823500</field> - <field name="image" type="base64" file="hr/static/img/employee_hne-image.png"/> - </record> - - <record id="employee_djj" model="hr.employee"> - <field name="name">佐藤さくら (demo_ja_JP)</field> - <field name="department_id" ref="dep_ps"/> - <field name="job_id" ref="hr.job_consultant"/> - <field name="work_location">Building 1, Second Floor</field> - <field name="work_phone">+3282823500</field> - <field name="image" type="base64" file="hr/static/img/employee_djj-image.png"/> - </record> - - <record id="employee_dzc" model="hr.employee"> - <field name="name">趙生 (demo_zh_CN)</field> - <field name="department_id" ref="dep_rd"/> - <field name="job_id" ref="hr.job_developer"/> - <field name="work_location">Building 1, Second Floor</field> - <field name="work_phone">+3282823500</field> - <field name="image" type="base64" file="hr/static/img/employee_dzc-image.jpg"/> + <field name="work_email">abigail.peterson39@example.com</field> + <field name="work_phone">(482)-233-3393</field> + <field name="image" type="base64" file="hr/static/img/employee_hne-image.jpg"/> </record> </data> </odoo> diff --git a/addons/hr/static/img/employee_al-image.jpg b/addons/hr/static/img/employee_al-image.jpg Binary files differindex 0f0c1b97640..abddef0e876 100644 --- a/addons/hr/static/img/employee_al-image.jpg +++ b/addons/hr/static/img/employee_al-image.jpg diff --git a/addons/hr/static/img/employee_chs-image.jpg b/addons/hr/static/img/employee_chs-image.jpg Binary files differindex 1fb28d5382d..ea4a22e51c3 100644 --- a/addons/hr/static/img/employee_chs-image.jpg +++ b/addons/hr/static/img/employee_chs-image.jpg diff --git a/addons/hr/static/img/employee_djj-image.png b/addons/hr/static/img/employee_djj-image.png Binary files differdeleted file mode 100644 index a95e017738c..00000000000 --- a/addons/hr/static/img/employee_djj-image.png +++ /dev/null diff --git a/addons/hr/static/img/employee_dzc-image.jpg b/addons/hr/static/img/employee_dzc-image.jpg Binary files differdeleted file mode 100644 index 6293cd42e54..00000000000 --- a/addons/hr/static/img/employee_dzc-image.jpg +++ /dev/null diff --git a/addons/hr/static/img/employee_fme-image.jpg b/addons/hr/static/img/employee_fme-image.jpg Binary files differindex 434c44465e8..89f03a97172 100644 --- a/addons/hr/static/img/employee_fme-image.jpg +++ b/addons/hr/static/img/employee_fme-image.jpg diff --git a/addons/hr/static/img/employee_fp-image.jpg b/addons/hr/static/img/employee_fp-image.jpg Binary files differindex cf27b22e041..53023f84e1a 100644 --- a/addons/hr/static/img/employee_fp-image.jpg +++ b/addons/hr/static/img/employee_fp-image.jpg diff --git a/addons/hr/static/img/employee_fpi-image.jpg b/addons/hr/static/img/employee_fpi-image.jpg Binary files differindex 79a6478b30d..6dff1dea35f 100644 --- a/addons/hr/static/img/employee_fpi-image.jpg +++ b/addons/hr/static/img/employee_fpi-image.jpg diff --git a/addons/hr/static/img/employee_han-image.jpg b/addons/hr/static/img/employee_han-image.jpg Binary files differnew file mode 100644 index 00000000000..8968d3cf227 --- /dev/null +++ b/addons/hr/static/img/employee_han-image.jpg diff --git a/addons/hr/static/img/employee_han-image.png b/addons/hr/static/img/employee_han-image.png Binary files differdeleted file mode 100644 index 42046dd4bb4..00000000000 --- a/addons/hr/static/img/employee_han-image.png +++ /dev/null diff --git a/addons/hr/static/img/employee_hne-image.jpg b/addons/hr/static/img/employee_hne-image.jpg Binary files differnew file mode 100644 index 00000000000..402ac4141ce --- /dev/null +++ b/addons/hr/static/img/employee_hne-image.jpg diff --git a/addons/hr/static/img/employee_hne-image.png b/addons/hr/static/img/employee_hne-image.png Binary files differdeleted file mode 100644 index db074e864c6..00000000000 --- a/addons/hr/static/img/employee_hne-image.png +++ /dev/null diff --git a/addons/hr/static/img/employee_jep-image.jpg b/addons/hr/static/img/employee_jep-image.jpg Binary files differindex c9021ca4dc8..98fa7b11b23 100644 --- a/addons/hr/static/img/employee_jep-image.jpg +++ b/addons/hr/static/img/employee_jep-image.jpg diff --git a/addons/hr/static/img/employee_jgo-image.jpg b/addons/hr/static/img/employee_jgo-image.jpg Binary files differindex fa764468352..dfc34c2f929 100644 --- a/addons/hr/static/img/employee_jgo-image.jpg +++ b/addons/hr/static/img/employee_jgo-image.jpg diff --git a/addons/hr/static/img/employee_jod-image.jpg b/addons/hr/static/img/employee_jod-image.jpg Binary files differnew file mode 100644 index 00000000000..3e89648c694 --- /dev/null +++ b/addons/hr/static/img/employee_jod-image.jpg diff --git a/addons/hr/static/img/employee_jod-image.png b/addons/hr/static/img/employee_jod-image.png Binary files differdeleted file mode 100644 index 2c66f841cd4..00000000000 --- a/addons/hr/static/img/employee_jod-image.png +++ /dev/null diff --git a/addons/hr/static/img/employee_jog-image.jpg b/addons/hr/static/img/employee_jog-image.jpg Binary files differindex ba3e791e158..0d810bd3f94 100644 --- a/addons/hr/static/img/employee_jog-image.jpg +++ b/addons/hr/static/img/employee_jog-image.jpg diff --git a/addons/hr/static/img/employee_jth-image.jpg b/addons/hr/static/img/employee_jth-image.jpg Binary files differnew file mode 100644 index 00000000000..d4ec655fbf2 --- /dev/null +++ b/addons/hr/static/img/employee_jth-image.jpg diff --git a/addons/hr/static/img/employee_jth-image.png b/addons/hr/static/img/employee_jth-image.png Binary files differdeleted file mode 100644 index e1796838d4c..00000000000 --- a/addons/hr/static/img/employee_jth-image.png +++ /dev/null diff --git a/addons/hr/static/img/employee_jve-image.jpg b/addons/hr/static/img/employee_jve-image.jpg Binary files differindex e6da479fbfc..2818c5dda06 100644 --- a/addons/hr/static/img/employee_jve-image.jpg +++ b/addons/hr/static/img/employee_jve-image.jpg diff --git a/addons/hr/static/img/employee_lur-image.jpg b/addons/hr/static/img/employee_lur-image.jpg Binary files differnew file mode 100644 index 00000000000..0b322677517 --- /dev/null +++ b/addons/hr/static/img/employee_lur-image.jpg diff --git a/addons/hr/static/img/employee_lur-image.png b/addons/hr/static/img/employee_lur-image.png Binary files differdeleted file mode 100644 index fce634d8045..00000000000 --- a/addons/hr/static/img/employee_lur-image.png +++ /dev/null diff --git a/addons/hr/static/img/employee_mit-image.jpg b/addons/hr/static/img/employee_mit-image.jpg Binary files differnew file mode 100644 index 00000000000..b6dd0668d7f --- /dev/null +++ b/addons/hr/static/img/employee_mit-image.jpg diff --git a/addons/hr/static/img/employee_mit-image.png b/addons/hr/static/img/employee_mit-image.png Binary files differdeleted file mode 100644 index dbbf99e2bda..00000000000 --- a/addons/hr/static/img/employee_mit-image.png +++ /dev/null diff --git a/addons/hr/static/img/employee_ngh-image.jpg b/addons/hr/static/img/employee_ngh-image.jpg Binary files differindex 93c7472ec09..fc9f3fa0743 100644 --- a/addons/hr/static/img/employee_ngh-image.jpg +++ b/addons/hr/static/img/employee_ngh-image.jpg diff --git a/addons/hr/static/img/employee_niv-image.jpg b/addons/hr/static/img/employee_niv-image.jpg Binary files differindex 3c38c0ec2f2..8d0815e0199 100644 --- a/addons/hr/static/img/employee_niv-image.jpg +++ b/addons/hr/static/img/employee_niv-image.jpg diff --git a/addons/hr/static/img/employee_stw-image.jpg b/addons/hr/static/img/employee_stw-image.jpg Binary files differindex 473d139b83d..02fa1cac663 100644 --- a/addons/hr/static/img/employee_stw-image.jpg +++ b/addons/hr/static/img/employee_stw-image.jpg diff --git a/addons/hr/static/img/employee_vad-image.jpg b/addons/hr/static/img/employee_vad-image.jpg Binary files differindex df13e35148f..97466f849ef 100644 --- a/addons/hr/static/img/employee_vad-image.jpg +++ b/addons/hr/static/img/employee_vad-image.jpg diff --git a/addons/hr_expense/data/hr_expense_demo.xml b/addons/hr_expense/data/hr_expense_demo.xml index 9c1465145e3..9f4dfb84587 100644 --- a/addons/hr_expense/data/hr_expense_demo.xml +++ b/addons/hr_expense/data/hr_expense_demo.xml @@ -14,6 +14,7 @@ <field name="zip">1367</field> <field name="city">Grand-Rosière-Hottomont</field> <field name="country_id" ref="base.be"/> + <field name="type">private</field> </record> <record id="hr.employee_root" model="hr.employee"> diff --git a/addons/lunch/tests/test_lunch.py b/addons/lunch/tests/test_lunch.py index 0dc1900b310..608b1ed2d3f 100644 --- a/addons/lunch/tests/test_lunch.py +++ b/addons/lunch/tests/test_lunch.py @@ -10,7 +10,7 @@ class Test_Lunch(common.TransactionCase): """*****setUp*****""" super(Test_Lunch, self).setUp() - self.demo_user = self.env['res.users'].search([('name', '=', 'Demo User')]) + self.demo_user = self.env['res.users'].search([('name', '=', 'Marc Brown')]) self.product_bolognese_ref = self.env['ir.model.data'].get_object_reference('lunch', 'product_Bolognese') self.product_Bolognese_id = self.product_bolognese_ref and self.product_bolognese_ref[1] or False self.new_id_order = self.env['lunch.order'].create({ diff --git a/addons/point_of_sale/static/src/js/tests.js b/addons/point_of_sale/static/src/js/tests.js index a0cab0109ce..2048d3d8271 100644 --- a/addons/point_of_sale/static/src/js/tests.js +++ b/addons/point_of_sale/static/src/js/tests.js @@ -109,8 +109,8 @@ odoo.define('point_of_sale.tour.pricelist', function (require) { content: "open customer list", trigger: "button.set-customer", }, { - content: "select agrolait", - trigger: ".client-line:contains('Agrolait')", + content: "select Deco Addict", + trigger: ".client-line:contains('Deco Addict')", }, { content: "confirm selection", trigger: ".clientlist-screen .next", @@ -132,8 +132,8 @@ odoo.define('point_of_sale.tour.pricelist', function (require) { content: "open customer list", trigger: "button.set-customer", }, { - content: "select think big systems", - trigger: ".client-line:contains('Think Big Systems')", + content: "select Lumber Inc", + trigger: ".client-line:contains('Lumber Inc')", }, { content: "confirm selection", trigger: ".clientlist-screen .next", diff --git a/addons/portal/static/src/js/portal_tour.js b/addons/portal/static/src/js/portal_tour.js index 9bf552bde7d..6c5502630d8 100644 --- a/addons/portal/static/src/js/portal_tour.js +++ b/addons/portal/static/src/js/portal_tour.js @@ -14,7 +14,7 @@ tour.register('portal_load_homepage', { }, { content: "Load my account details", - trigger: 'input[value="Demo Portal User"]' + trigger: 'input[value="Joel Willis"]' } ] ); diff --git a/addons/project/static/src/js/tour.js b/addons/project/static/src/js/tour.js index dc66158921a..908e4b66b38 100644 --- a/addons/project/static/src/js/tour.js +++ b/addons/project/static/src/js/tour.js @@ -73,7 +73,7 @@ tour.register('project_tour', { content: _t('<b>Assign the task</b> to someone. <i>You can create and invite a new user on the fly.</i>'), position: "bottom", run: function (actions) { - actions.text("Demo User", this.$anchor.find("input")); + actions.text("Marc Brown", this.$anchor.find("input")); }, }, { trigger: ".ui-autocomplete > li > a", diff --git a/addons/sale_timesheet/data/sale_service_demo.xml b/addons/sale_timesheet/data/sale_service_demo.xml index 1941bf31aaf..1457c1cd2a9 100644 --- a/addons/sale_timesheet/data/sale_service_demo.xml +++ b/addons/sale_timesheet/data/sale_service_demo.xml @@ -113,7 +113,6 @@ <field name="parent_id" ref="hr.employee_root"/> </record> - <!-- Sale Order 'sale_order_1' (Agrolait) --> <record id="sale_order_1" model="sale.order"> <field name="partner_id" ref="base.res_partner_2"/> <field name="client_order_ref">AGR</field> diff --git a/addons/stock/data/stock_demo.xml b/addons/stock/data/stock_demo.xml index 3e0bcd86479..36cff37b2a4 100644 --- a/addons/stock/data/stock_demo.xml +++ b/addons/stock/data/stock_demo.xml @@ -142,15 +142,18 @@ </record> <record id="res_partner_address_41" model="res.partner"> - <field name="name">Steven Hamilton</field> + <field name="name">Jeff Lawson</field> <field name="parent_id" ref="res_partner_company_1"/> + <field name="email">jeff.lawson52@example.com</field> + <field name="phone">(461)-417-6587</field> + <field name="image" type="base64" file="stock/static/img/res_partner_address_41.jpg"/> </record> <record id="res_company_1" model="res.company"> <field name="currency_id" ref="base.USD"/> <field name="partner_id" ref="res_partner_company_1"/> <field name="parent_id" ref="base.main_company"/> - <field name="name">ProBike Chicago</field> + <field name="name">My Company, Chicago</field> </record> <record id="stock_warehouse_shop0" model="stock.warehouse"> diff --git a/addons/stock/static/img/res_partner_address_41.jpg b/addons/stock/static/img/res_partner_address_41.jpg Binary files differnew file mode 100644 index 00000000000..1de43e9256f --- /dev/null +++ b/addons/stock/static/img/res_partner_address_41.jpg diff --git a/addons/website_crm_partner_assign/tests/test_partner_assign.py b/addons/website_crm_partner_assign/tests/test_partner_assign.py index 3b4344e255f..61374979bfc 100644 --- a/addons/website_crm_partner_assign/tests/test_partner_assign.py +++ b/addons/website_crm_partner_assign/tests/test_partner_assign.py @@ -33,22 +33,39 @@ class TestPartnerAssign(TransactionCase): def test_partner_assign(self): """ Test the automatic assignation using geolocalisation """ - partner2 = self.env.ref('base.res_partner_2') + partner_be = self.env['res.partner'].create({ + "name": "Agrolait", + "is_company": True, + "city": "Wavre", + "zip": "1300", + "country_id": self.env.ref("base.be").id, + "street": "69 rue de Namur", + "partner_weight": 10, + }) + partner_uk = self.env['res.partner'].create({ + "name": "Think Big Systems", + "is_company": True, + "city": "London", + "country_id": self.env.ref("base.uk").id, + "street": "89 Lingfield Tower", + "partner_weight": 10, + }) + lead = self.env.ref('crm.crm_case_21') # In order to test find nearest Partner functionality and assign to opportunity, # I Set Geo Lattitude and Longitude according to partner address. - partner2.geo_localize() + partner_be.geo_localize() # I check Geo Latitude and Longitude of partner after set - self.assertTrue(50 < partner2.partner_latitude < 51, "Latitude is wrong: 50 < %s < 51" % partner2.partner_latitude) - self.assertTrue(3 < partner2.partner_longitude < 5, "Longitude is wrong: 3 < %s < 5" % partner2.partner_longitude) + self.assertTrue(50 < partner_be.partner_latitude < 51, "Latitude is wrong: 50 < %s < 51" % partner_be.partner_latitude) + self.assertTrue(3 < partner_be.partner_longitude < 5, "Longitude is wrong: 3 < %s < 5" % partner_be.partner_longitude) # I assign nearest partner to opportunity. lead.assign_partner() # I check assigned partner of opportunity who is nearest Geo Latitude and Longitude of opportunity. - self.assertEqual(lead.partner_assigned_id, self.env.ref('base.res_partner_18'), "Opportuniy is not assigned nearest partner") + self.assertEqual(lead.partner_assigned_id, partner_uk, "Opportuniy is not assigned nearest partner") self.assertTrue(50 < lead.partner_latitude < 55, "Latitude is wrong: 50 < %s < 55" % lead.partner_latitude) self.assertTrue(-4 < lead.partner_longitude < -1, "Longitude is wrong: -4 < %s < -1" % lead.partner_longitude) diff --git a/addons/website_customer/data/res_partner_demo.xml b/addons/website_customer/data/res_partner_demo.xml index b6430ffba14..9bea8129a98 100644 --- a/addons/website_customer/data/res_partner_demo.xml +++ b/addons/website_customer/data/res_partner_demo.xml @@ -4,10 +4,10 @@ <record id="base.res_partner_2" model="res.partner"> <field name="website_published" eval="True"/> - <field name="website_short_description">Agrolait designs, develops, integrates and supports HR and Supply Chain processes in order to make our customers more productive, responsive and profitable.</field> + <field name="website_short_description">Deco Addict designs, develops, integrates and supports HR and Supply Chain processes in order to make our customers more productive, responsive and profitable.</field> <field name="website_description" type="xml"> <p> - Agrolait designs, develops, integrates and supports HR and Supply + Deco Addict designs, develops, integrates and supports HR and Supply Chain processes in order to make our customers more productive, responsive and profitable. </p><p> @@ -17,7 +17,7 @@ installed IT software into account. That is why Idealis Consulting delivers excellence in HR and SC Management. </p><p> - Agrolait integrates ERP for Global Companies and supports PME + Deco Addict integrates ERP for Global Companies and supports PME with Open Sources software to manage their businesses. Our consultants are experts in the following areas: </p> @@ -62,10 +62,10 @@ </record> <record id="base.res_partner_4" model="res.partner"> <field name="website_published" eval="True"/> - <field name="website_short_description">Agrolait designs, develops, integrates and supports HR and Supply Chain processes in order to make our customers more productive, responsive and profitable.</field> + <field name="website_short_description">Deco Addict designs, develops, integrates and supports HR and Supply Chain processes in order to make our customers more productive, responsive and profitable.</field> <field name="website_description" type="xml"> <p> - Agrolait designs, develops, integrates and supports HR and Supply + Deco Addict designs, develops, integrates and supports HR and Supply Chain processes in order to make our customers more productive, responsive and profitable. </p><p> @@ -75,7 +75,7 @@ installed IT software into account. That is why Idealis Consulting delivers excellence in HR and SC Management. </p><p> - Agrolait integrates ERP for Global Companies and supports PME + Deco Addict integrates ERP for Global Companies and supports PME with Open Sources software to manage their businesses. Our consultants are experts in the following areas: </p> diff --git a/addons/website_partner/data/website_partner_demo.xml b/addons/website_partner/data/website_partner_demo.xml index fce6a8ff4b1..0fa21da58bf 100644 --- a/addons/website_partner/data/website_partner_demo.xml +++ b/addons/website_partner/data/website_partner_demo.xml @@ -223,10 +223,10 @@ Roadmap Development </li> </record> <record id="base.res_partner_18" model="res.partner"> - <field name="website_short_description">We are a technology consulting & strategic advisory firm that creates value enhancing solutions through the use of advanced software for our clients worldwide. At Think Big Systems we bring operational experience combined...</field> + <field name="website_short_description">We are a technology consulting & strategic advisory firm that creates value enhancing solutions through the use of advanced software for our clients worldwide. At Lumber Inc we bring operational experience combined...</field> <field name="website_description"><![CDATA[We are a technology consulting & strategic advisory firm that creates value enhancing solutions through the use of advanced software for our clients worldwide. <br/> <br/> -At Think Big Systems we bring operational experience combined with technological acumen. We understand that any software that supports business operations needs to be designed in such a way that facilitates the execution of critical operational processes, and serves as a tool to the users rather than a barrier. Our approach is focused on the process first, ensuring that it contributes to the goals of the company, we then optimize it, and design the software solutions to best support it.]]></field> +At Lumber Inc we bring operational experience combined with technological acumen. We understand that any software that supports business operations needs to be designed in such a way that facilitates the execution of critical operational processes, and serves as a tool to the users rather than a barrier. Our approach is focused on the process first, ensuring that it contributes to the goals of the company, we then optimize it, and design the software solutions to best support it.]]></field> </record> <record id="base.res_partner_12" model="res.partner"> diff --git a/addons/website_sale_wishlist/static/src/js/website_sale_tour_wishlist.js b/addons/website_sale_wishlist/static/src/js/website_sale_tour_wishlist.js index 1728fef9f92..81d79135787 100644 --- a/addons/website_sale_wishlist/static/src/js/website_sale_tour_wishlist.js +++ b/addons/website_sale_wishlist/static/src/js/website_sale_tour_wishlist.js @@ -48,7 +48,7 @@ tour.register('shop_wishlist', { }, { content: "check that logged in and search for Customizable Desk", - extra_trigger: 'li span:contains(Administrator)', + extra_trigger: "li span:contains('Mitchell Stephens')", trigger: 'form input[name="search"]', run: "text Customizable Desk", }, |
