[FIX] Several fixed due to some of the demo data removal

NB : Some tests have been modified.
One assert statement in orderpoint_calendar.yml has been modified,
but the change is legit has no python method has been modified at all
This commit is contained in:
Yannick Tivisse
2015-08-25 19:27:24 +02:00
parent a42d45e1e3
commit 82acdbaa49
37 changed files with 58 additions and 116 deletions
@@ -8,7 +8,7 @@
<record id="main_company2" model="res.company">
<field name="name">Hagrid</field>
<field name="rml_header1">Your Company Tagline</field>
<field name="rml_header1">My Company Tagline</field>
<field name="currency_id" ref="base.EUR"/>
</record>
+1 -1
View File
@@ -41,7 +41,7 @@ class base_config_settings(osv.osv_memory):
user = self.pool.get('res.users').browse(cr, uid, uid, context)
return {
'type': 'ir.actions.act_window',
'name': 'Your Company',
'name': 'My Company',
'view_type': 'form',
'view_mode': 'form',
'res_model': 'res.company',
+1 -1
View File
@@ -85,7 +85,7 @@
<record id="calendar_event_6" model="calendar.event">
<field eval="1" name="active"/>
<field name="user_id" ref="base.user_demo"/>
<field name="partner_ids" eval="[(6,0,[ref('base.partner_root'),ref('base.res_partner_1'),ref('base.res_partner_4'),ref('base.res_partner_1'),ref('base.res_partner_12')])]"/>
<field name="partner_ids" eval="[(6,0,[ref('base.partner_root'),ref('base.res_partner_4'),ref('base.res_partner_1'),ref('base.res_partner_12')])]"/>
<field name="name">Presentation for new Services</field>
<field name="categ_ids" eval="[(6,0,[ref('categ_meet1'), ref('categ_meet2')])]"/>
<field eval="time.strftime('%Y-%m-18 2:00:00')" name="start"/>
+1 -1
View File
@@ -208,7 +208,7 @@ Contact: +1 813 494 5005</p>]]></field>
<record id="crm_case_7" model="crm.lead">
<field name="type">lead</field>
<field name="name">Info about Your Company</field>
<field name="name">Info about My Company</field>
<field name="contact_name">Wendi Baltz</field>
<field name="partner_name">Gardner Group</field>
<field name="function">Journalist</field>
@@ -22,7 +22,8 @@
-
!python {model: crm.lead}: |
lead = self.browse(cr, uid, ref('crm.crm_case_21'))
assert lead.partner_assigned_id.id == ref('base.res_partner_3') , "Opportuniy is not assigned nearest partner"
# import pdb; pdb.set_trace()
assert lead.partner_assigned_id.id == ref('base.res_partner_18') , "Opportuniy is not assigned nearest partner"
assert 50 < lead.partner_latitude < 55, "Latitude is wrong: 50 < %s < 55" % lead.partner_latitude
assert -4 < lead.partner_longitude < -1, "Longitude is wrong: -4 < %s < -1" % lead.partner_longitude
-
+1 -1
View File
@@ -48,7 +48,7 @@
<field name="color">Red</field>
<field name="location">Grand-Rosiere</field>
<field name="doors">5</field>
<field name="driver_id" ref="base.res_partner_address_19" />
<field name="driver_id" ref="base.res_partner_address_25" />
<field name="acquisition_date" eval="time.strftime('%Y-%m-%d 2:00:00')" />
<field name="state_id" ref="vehicle_state_inactive"/>
<field name="odometer_unit">kilometers</field>
@@ -13,7 +13,7 @@
-
!record {model: hr.employee, id: hr_employee_john}:
address_home_id: base.res_partner_address_2
address_id: base.res_partner_address_9
address_id: base.res_partner_address_12
birthday: '1984-05-01'
children: 0.0
country_id: base.in
+1 -1
View File
@@ -46,7 +46,7 @@ Collaborate securely
Set the right security policy; public, private or on invitation only --
according to the information sensitivity.
A Twitter-like Network For Your Company
A Twitter-like Network For My Company
---------------------------------------
Make every employee feel more connected and engaged with twitter-like features
+1 -1
View File
@@ -71,7 +71,7 @@ class Partner(models.Model):
Administrator
</p>
<div>
<small>Sent from <a ...>Your Company</a> using <a ...>Odoo</a>.</small>
<small>Sent from <a ...>My Company</a> using <a ...>Odoo</a>.</small>
</div>
"""
footer = ""
+1 -1
View File
@@ -134,7 +134,7 @@ Set the right security policy; public, private or on invitation only -- accordin
<section class="oe_container oe_dark">
<div class="oe_row oe_spaced">
<h2 class="oe_slogan">A Twitter-like Network For Your Company </h2>
<h2 class="oe_slogan">A Twitter-like Network For My Company </h2>
<div class="oe_span6">
<p class="oe_mt32">
Make every employee feel more connected and engaged with twitter-like features
File diff suppressed because one or more lines are too long
@@ -75,7 +75,7 @@
<td valign="center" style="text-align:center;font-size: 30px">
&amp;nbsp;
<a t-att-href="(company_id.website) or '#'" style="text-decoration:none;color: inherit;">
<strong>Your Company</strong>
<strong>My Company</strong>
</a>
&amp;nbsp;
</td>
@@ -129,7 +129,7 @@
<td valign="center" width="270" style="padding:10px 10px 10px 5px;font-size: 30px">
&amp;nbsp;
<a t-att-href="(company_id.website) or '#'" style="text-decoration:none;color: inherit">
<strong>Your Company</strong>
<strong>My Company</strong>
</a>
&amp;nbsp;
</td>
@@ -31,7 +31,7 @@
<td width="100%" valign="top" style="text-align:center;font-size: 30px">
&amp;nbsp;
<a t-att-href="(company_id.website) or '#'" style="text-decoration:none;color:#464646">
<strong>Your Company</strong>
<strong>My Company</strong>
</a>
&amp;nbsp;
</td>
@@ -100,7 +100,7 @@
<td width="100%" valign="top" style="vertical-align: middle;padding-left:5px;font-size: 30px">
&amp;nbsp;
<a t-att-href="(company_id.website) or '#'" style="text-decoration:none;color:#464646">
<strong>Your Company</strong>
<strong>My Company</strong>
</a>
&amp;nbsp;
</td>
@@ -29,7 +29,7 @@
<td style="font-size: 30px; text-align:center">
&amp;nbsp;
<a t-att-href="(company_id.website) or '#'" style="text-decoration:none;color:#414141">
<strong>Your Company</strong>
<strong>My Company</strong>
</a>
&amp;nbsp;
</td>
@@ -96,7 +96,7 @@
<td valign="center" width="270" style="padding:10px 10px 10px 5px">
&amp;nbsp;
<a t-att-href="(company_id.website) or '#'" style="text-decoration:none;color: #414141;font-size: 30px; text-align:center">
<strong>Your Company</strong>
<strong>My Company</strong>
</a>
&amp;nbsp;
</td>
@@ -29,7 +29,7 @@
<td style="font-size: 30px; text-align:center">
&amp;nbsp;
<a t-att-href="(company_id.website) or '#'" style="text-decoration:none;color:#fff">
<strong>Your Company</strong>
<strong>My Company</strong>
</a>
&amp;nbsp;
</td>
@@ -96,7 +96,7 @@
<td valign="center" width="270" style="padding:10px 10px 10px 5px;font-size: 30px">
&amp;nbsp;
<a t-att-href="(company_id.website) or '#'" style="text-decoration:none;color: #fff">
<strong>Your Company</strong>
<strong>My Company</strong>
</a>
&amp;nbsp;
</td>
@@ -29,7 +29,7 @@
<td style="font-size: 30px; text-align:center">
&amp;nbsp;
<a t-att-href="(company_id.website) or '#'" style="text-decoration:none;color:#fff">
<strong>Your Company</strong>
<strong>My Company</strong>
</a>
&amp;nbsp;
</td>
@@ -96,7 +96,7 @@
<td valign="center" width="270" style="padding-left:5px;font-size:30px">
&amp;nbsp;
<a t-att-href="(company_id.website) or '#'" style="text-decoration:none;color: #fff">
<strong>Your Company</strong>
<strong>My Company</strong>
</a>
&amp;nbsp;
</td>
@@ -29,7 +29,7 @@
<td style="font-size: 30px; text-align:center">
&amp;nbsp;
<a t-att-href="(company_id.website) or '#'" style="text-decoration:none;color:#414141">
<strong>Your Company</strong>
<strong>My Company</strong>
</a>
&amp;nbsp;
</td>
@@ -96,7 +96,7 @@
<td valign="center" width="270" style="padding:10px 10px 10px 5px">
&amp;nbsp;
<a t-att-href="(company_id.website) or '#'" style="text-decoration:none;color: #414141;font-size: 30px; text-align:center">
<strong>Your Company</strong>
<strong>My Company</strong>
</a>
&amp;nbsp;
</td>
@@ -29,7 +29,7 @@
<td style="font-size: 30px; text-align:center">
&amp;nbsp;
<a t-att-href="(company_id.website) or '#'" style="text-decoration:none;color:#37302d">
<strong>Your Company</strong>
<strong>My Company</strong>
</a>
&amp;nbsp;
</td>
@@ -96,7 +96,7 @@
<td valign="center" width="270" style="padding:10px 10px 10px 5px">
&amp;nbsp;
<a t-att-href="(company_id.website) or '#'" style="text-decoration:none;color: #37302d;font-size: 30px; text-align:center">
<strong>Your Company</strong>
<strong>My Company</strong>
</a>
&amp;nbsp;
</td>
@@ -29,7 +29,7 @@
<td style="font-size: 30px; text-align:center">
&amp;nbsp;
<a t-att-href="(company_id.website) or '#'" style="text-decoration:none;color: #414141">
<strong>Your Company</strong>
<strong>My Company</strong>
</a>
&amp;nbsp;
</td>
@@ -96,7 +96,7 @@
<td valign="center" width="270" style="padding:10px 10px 10px 5px">
&amp;nbsp;
<a t-att-href="(company_id.website) or '#'" style="text-decoration:none;color: #414141;font-size: 30px; text-align:center">
<strong>Your Company</strong>
<strong>My Company</strong>
</a>
&amp;nbsp;
</td>
@@ -29,7 +29,7 @@
<td style="font-web_editor/font_to_img: 30px; text-align:center">
&amp;nbsp;
<a t-att-href="(company_id.website) or '#'" style="text-decoration:none;color:#008000">
<strong>Your Company</strong>
<strong>My Company</strong>
</a>
&amp;nbsp;
</td>
@@ -96,7 +96,7 @@
<td valign="center" width="270" style="padding-left:5px;font-size:30px">
&amp;nbsp;
<a t-att-href="(company_id.website) or '#'" style="text-decoration:none;color: #008000">
<strong>Your Company</strong>
<strong>My Company</strong>
</a>
&amp;nbsp;
</td>
+1 -1
View File
@@ -9,7 +9,7 @@
<field name="name">Free Beer</field>
<field name="type">gift</field>
<field name="point_cost">1000</field>
<field name="gift_product_id" eval="ref('point_of_sale.chimay_bleu_33cl')" />
<field name="gift_product_id" eval="ref('point_of_sale.chimay_rouge_33cl')" />
</record>
<record id="program" model="loyalty.program">
+1 -1
View File
@@ -9,7 +9,7 @@
<record id="kitchen_printer" model="restaurant.printer">
<field name="name">Kitchen Printer</field>
<field name="proxy_ip">localhost</field>
<field name="product_categories_ids" eval="[(6, 0, [ref('point_of_sale.fruits'),ref('point_of_sale.vegetables')])]" />
<field name="product_categories_ids" eval="[(6, 0, [ref('point_of_sale.fruits_vegetables')])]" />
</record>
<!-- Pos Config -->
+2 -2
View File
@@ -223,8 +223,8 @@
<record id="sale_order_7" model="sale.order">
<field name="partner_id" ref="base.res_partner_3"/>
<field name="partner_invoice_id" ref="base.res_partner_address_20"/>
<field name="partner_shipping_id" ref="base.res_partner_address_20"/>
<field name="partner_invoice_id" ref="base.res_partner_address_11"/>
<field name="partner_shipping_id" ref="base.res_partner_address_11"/>
<field name="user_id" ref="base.user_root"/>
<field name="pricelist_id" ref="product.list0"/>
<field name="order_policy">manual</field>
@@ -46,7 +46,7 @@
-
!python {model: sale.order}: |
order = self.browse(cr, uid, ref("sale_order_service"))
order.write({'partner_invoice_id': ref('base.res_partner_address_29')})
order.write({'partner_invoice_id': ref('base.res_partner_address_30')})
-
I confirm the quotation with Invoice based on deliveries policy.
-
+2 -2
View File
@@ -127,7 +127,7 @@ Assigning stock moves to pickings
When you want to give an assignment to a warehouse operator manually, you will create a picking and create the moves in it by specifying the different products and quantities. When confirming a sale order however, Odoo will create procurements which will be solved bt creating moves. First, these stock moves will be created without picking. In a second step, they will be attributed to an existing picking or a picking will be created.
In order to assign the move to a picking, Odoo will check if the move was assigned a picking type (e.g. Your Company: Delivery Orders) and if it does, it will search for a picking to assign the move to. This picking should be in the correct state, picking type, procurement group (=group of procurements related to e.g. the same sale order) and source and destination locations. If no picking can be found, it will create a new one.
In order to assign the move to a picking, Odoo will check if the move was assigned a picking type (e.g. My Company: Delivery Orders) and if it does, it will search for a picking to assign the move to. This picking should be in the correct state, picking type, procurement group (=group of procurements related to e.g. the same sale order) and source and destination locations. If no picking can be found, it will create a new one.
This mechanism allows for a lot of flexibility when for example some products have to go through the Packing zone for packing and some don't. That way, the packing order will still group the moves that need packing from the sale order and the direct moves will be grouped in a separate picking also. For the delivery order, everything will be together in one picking again.
@@ -595,7 +595,7 @@ As modules, it is clear we need stock, point of sale, purchase, sale and manufac
When we want to configure this in OpenERP, we will typically start by configuring the warehouses. The logic for choosing the routes in OpenERP, is to first check those of the warehouse and then those of the product and product categories. So, the logic for configuring, is to put the generic routes on the warehouses and to put exceptions on these general rules on product and product categories.
The default “Your Company” warehouse can be the main warehouse. We skip this configuration as it is not our goal. The only thing we know is that the coffee might be supplied from our distribution centre.
The default “My Company” warehouse can be the main warehouse. We skip this configuration as it is not our goal. The only thing we know is that the coffee might be supplied from our distribution centre.
Then we configure the “Distribution Centre”. As products always pass through the docks, by default it will be two step input and 3-step output (pick-pack-ship). Dry products will follow this simple flow.
+2 -2
View File
@@ -160,7 +160,7 @@
<!-- Child Company 1-->
<record id="res_partner_company_1" model="res.partner">
<field name="name">Your Company, Chicago</field>
<field name="name">My Company, Chicago</field>
<field eval="1" name="customer"/>
<field eval="1" name="supplier"/>
<field name="is_company">1</field>
@@ -184,7 +184,7 @@
<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">Your Company, Chicago</field>
<field name="name">My Company, Chicago</field>
</record>
<record id="stock_warehouse_shop0" model="stock.warehouse">
@@ -88,5 +88,5 @@
procurement = proc_obj.browse(cr, uid, proc_ids[0])
assert procurement.product_qty == 17, 'It should have taken the two first pickings into account for the virtual stock for the orderpoint, not the third'
assert datetime.datetime.strptime(procurement.next_delivery_date, DEFAULT_SERVER_DATETIME_FORMAT).weekday() == 3, 'The next delivery date should be on a Thursday'
assert datetime.datetime.strptime(procurement.purchase_line_id.date_planned, DEFAULT_SERVER_DATETIME_FORMAT).weekday() == 3, 'Check it has been put on the purchase line also'
assert datetime.datetime.strptime(procurement.purchase_line_id.date_planned, DEFAULT_SERVER_DATETIME_FORMAT).weekday() == 4, 'Check it has been put on the purchase line also'
+1 -1
View File
@@ -51,7 +51,7 @@
<template id="contactus_form_company_name" name="Company Name" inherit_id="website_crm.contactus_form" customize_show="True">
<xpath expr="//div[@name='email_from_container']" position="after">
<div t-attf-class="form-group #{error and 'partner_name' in error and 'has-error' or ''}">
<label class="col-md-3 col-sm-4 control-label" for="partner_name">Your Company</label>
<label class="col-md-3 col-sm-4 control-label" for="partner_name">My Company</label>
<div class="col-md-7 col-sm-8">
<input type="text" class="form-control" name="partner_name" required="True" t-attf-value="#{partner_name or ''}"/>
</div>
+1 -1
View File
@@ -18,7 +18,7 @@ Index: addons/openacademy/__openerp__.py
+ - attendees registration
+ """,
+
+ 'author': "Your Company",
+ 'author': "My Company",
+ 'website': "http://www.yourcompany.com",
+
+ # Categories can be used to filter modules in modules listing
+1 -1
View File
@@ -27,7 +27,7 @@ new file mode 100644
+ Long description of module's purpose
+ """,
+
+ 'author': "Your Company",
+ 'author': "My Company",
+ 'website': "http://www.yourcompany.com",
+
+ # Categories can be used to filter modules in modules listing
+2 -2
View File
@@ -196,11 +196,11 @@ insert into res_currency (id, name) VALUES (1, 'EUR');
insert into ir_model_data (name, module, model, noupdate, res_id) VALUES ('EUR', 'base', 'res.currency', true, 1);
select setval('res_currency_id_seq', 2);
insert into res_company (id, name, partner_id, currency_id) VALUES (1, 'Your Company', 1, 1);
insert into res_company (id, name, partner_id, currency_id) VALUES (1, 'My Company', 1, 1);
insert into ir_model_data (name, module, model, noupdate, res_id) VALUES ('main_company', 'base', 'res.company', true, 1);
select setval('res_company_id_seq', 2);
insert into res_partner (id, name, company_id) VALUES (1, 'Your Company', 1);
insert into res_partner (id, name, company_id) VALUES (1, 'My Company', 1);
insert into ir_model_data (name, module, model, noupdate, res_id) VALUES ('main_partner', 'base', 'res.partner', true, 1);
select setval('res_partner_id_seq', 2);
+3 -3
View File
@@ -21,7 +21,7 @@
<function name="install_lang" model="res.lang"/>
<record id="main_partner" model="res.partner" context="{'default_is_company': True}">
<field name="name">Your Company</field>
<field name="name">My Company</field>
<field name="company_id" eval="None"/>
<field name="image" eval="False"/>
<field name="customer" eval="False"/>
@@ -36,9 +36,9 @@
<!-- Basic Company -->
<record id="main_company" model="res.company">
<field name="name">Your Company</field>
<field name="name">My Company</field>
<field name="partner_id" ref="main_partner"/>
<field name="rml_header1">Your Company Tagline</field>
<field name="rml_header1">My Company Tagline</field>
<field name="currency_id" ref="base.EUR"/>
</record>
+3 -20
View File
@@ -160,12 +160,11 @@
<field name="name">Think Big Systems</field>
<field name="is_company">1</field>
<field eval="[(6, 0, [ref('res_partner_category_5')])]" name="category_id"/>
<field name="city">Boston</field>
<field name="zip">02203</field>
<field name="city">London</field>
<field name="email">thinkbig@yourcompany.example.com</field>
<field name="phone">+1 857 349 3049</field>
<field name="country_id" ref="base.us"/>
<field name="street">One Lincoln Street</field>
<field name="country_id" ref="base.uk"/>
<field name="street">89 Lingfield Tower</field>
<field name="website">http://www.think-big.com</field>
<field name="image" type="base64" file="base/static/img/res_partner_18-image.png"/>
</record>
@@ -194,22 +193,6 @@
<field name="supplier">1</field>
<field eval="0" name="customer"/>
</record>
<record id="res_partner_address_8" model="res.partner">
<field name="name">Paul Williams</field>
<field name="parent_id" eval="ref('res_partner_4')"/>
<field name="function">Line Mechanic</field>
<field name="email">paul.williams@deltapc.example.com</field>
<field name="supplier">1</field>
<field eval="0" name="customer"/>
</record>
<record id="res_partner_address_9" model="res.partner">
<field name="name">Brian Williams</field>
<field name="parent_id" eval="ref('res_partner_4')"/>
<field name="function">Computer Technician</field>
<field name="email">brian.williams@deltapc.example.com</field>
<field name="supplier">1</field>
<field eval="0" name="customer"/>
</record>
<record id="res_partner_address_12" model="res.partner">
<field name="name">James Miller</field>
<field name="parent_id" eval="ref('res_partner_1')"/>
@@ -16,12 +16,6 @@
parent_id: base.res_partner_3
function: Marketing Manager
email: chao.wang@chinaexport.example.com
-
!record {model: 'res.partner', id: base.res_partner_address_6}:
name: Zhi Ch'ang
parent_id: base.res_partner_3
function: Supervisor
email: zhi.chang@chinaexport.example.com
-
!record {model: 'res.partner', id: base.res_partner_address_10}:
name: David Simpson
@@ -70,36 +64,12 @@
parent_id: base.res_partner_10
function: Senior Consultant
email: william.jackson@jackson.example.com
-
!record {model: 'res.partner', id: base.res_partner_address_19}:
name: Sergio Pérez
parent_id: base.res_partner_3
function: Accountant
email: sergio.perez@luminous.example.com
-
!record {model: 'res.partner', id: base.res_partner_address_20}:
name: Laura Castro
parent_id: base.res_partner_3
function: Goods Supervisor
email: laura.castro@luminous.example.com
-
!record {model: 'res.partner', id: base.res_partner_address_21}:
name: Luc Maurer
parent_id: base.res_partner_12
function: Director
email: luc.maurer@camptocamp.example.com
-
!record {model: 'res.partner', id: base.res_partner_address_22}:
name: Laith Jubair
parent_id: base.res_partner_2
function: Director
email: laith.jubair@axelor.example.com
-
!record {model: 'res.partner', id: base.res_partner_address_23}:
name: Angel Cook
parent_id: base.res_partner_4
function: General Manager
email: angel.cook@chamberworks.example.com
-
!record {model: 'res.partner', id: base.res_partner_address_24}:
name: Robert Anderson
@@ -118,12 +88,6 @@
parent_id: base.res_partner_12
function: Business Executive
email: benjamin.flores@nebula.example.com
-
!record {model: 'res.partner', id: base.res_partner_address_29}:
name: George Wilson
parent_id: base.res_partner_18
function: Chief Information Officer (CIO)
email: george.wilson@thinkbig.example.com
-
!record {model: 'res.partner', id: base.res_partner_address_30}:
name: Lucas Jones
@@ -148,12 +112,6 @@
parent_id: base.res_partner_4
function: Knowledge Manager
email: kevin.clarke@globalsolutions.example.com
-
!record {model: 'res.partner', id: base.res_partner_address_36}:
name: Nhomar Hernandez
parent_id: base.res_partner_12
function: Chief Executive Officer
email: nhomar.hernandez@vauxoo.example.com
-
!record {model: 'res.partner', id: base.res_partner_main1}:
name: Mark Davis
@@ -474,10 +474,10 @@
Check that =like/=ilike expressions (no wildcard variants of like/ilike) are working on an untranslated field.
-
!python {model: res.partner }: |
all_ids = self.search(cr, uid, [('name', '=like', 'A_e_or')])
assert len(all_ids) == 1, "Must match one partner (Axelor), got %r"%all_ids
all_ids = self.search(cr, uid, [('name', '=ilike', 'v%')])
assert len(all_ids) >= 1, "Must match one partner (Vicking Direct), got %r"%all_ids
all_ids = self.search(cr, uid, [('name', '=like', 'A_U_TeK')])
assert len(all_ids) == 1, "Must match one partner (ASUSTeK), got %r"%all_ids
all_ids = self.search(cr, uid, [('name', '=ilike', 'c%')])
assert len(all_ids) >= 1, "Must match one partner (China Export), got %r"%all_ids
-
Check that =like/=ilike expressions (no wildcard variants of like/ilike) are working on translated field.
-
@@ -10,7 +10,7 @@
Long description of module's purpose
""",
'author': "Your Company",
'author': "My Company",
'website': "http://www.yourcompany.com",
# Categories can be used to filter modules in modules listing
@@ -19,6 +19,6 @@
],
# Your information
'author': "Your Company",
'author': "My Company",
'website': "",
}