"""
footer = ""
diff --git a/addons/mail/static/description/index.html b/addons/mail/static/description/index.html
index 2abaf66c26e..6a68f90fbfa 100644
--- a/addons/mail/static/description/index.html
+++ b/addons/mail/static/description/index.html
@@ -134,7 +134,7 @@ Set the right security policy; public, private or on invitation only -- accordin
-
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
diff --git a/addons/mass_mailing/data/mass_mailing_demo.xml b/addons/mass_mailing/data/mass_mailing_demo.xml
index 72bce71b78d..77952ff1530 100644
--- a/addons/mass_mailing/data/mass_mailing_demo.xml
+++ b/addons/mass_mailing/data/mass_mailing_demo.xml
@@ -40,7 +40,7 @@
-
Great stories have personality. Consider telling a great story that provides personality. Writing a story with personality for potential clients will assist with making a relationship connection. This shows up in small quirks like word choices or phrases. Write from your point of view, not from someone else's experience.
Great stories are for everyone even when only written for just one person. If you try to write with a wide general audience in mind, your story will ring false and be bland. No one will be interested. Write for one person. If it’s genuine for the one, it’s genuine for the rest.
Great stories have personality. Consider telling a great story that provides personality. Writing a story with personality for potential clients will assist with making a relationship connection. This shows up in small quirks like word choices or phrases. Write from your point of view, not from someone else's experience.
Great stories are for everyone even when only written for just one person. If you try to write with a wide general audience in mind, your story will ring false and be bland. No one will be interested. Write for one person. If it’s genuine for the one, it’s genuine for the rest.
Great stories have personality. Consider telling a great story that provides personality. Writing a story with personality for potential clients will assist with making a relationship connection. This shows up in small quirks like word choices or phrases. Write from your point of view, not from someone else's experience.
Great stories are for everyone even when only written for just one person. If you try to write with a wide general audience in mind, your story will ring false and be bland. No one will be interested. Write for one person. If it’s genuine for the one, it’s genuine for the rest.
Great stories have personality. Consider telling a great story that provides personality. Writing a story with personality for potential clients will assist with making a relationship connection. This shows up in small quirks like word choices or phrases. Write from your point of view, not from someone else's experience.
Great stories are for everyone even when only written for just one person. If you try to write with a wide general audience in mind, your story will ring false and be bland. No one will be interested. Write for one person. If it’s genuine for the one, it’s genuine for the rest.
diff --git a/addons/pos_loyalty/loyalty_demo.xml b/addons/pos_loyalty/loyalty_demo.xml
index 3701556a2ac..b18777bb17c 100644
--- a/addons/pos_loyalty/loyalty_demo.xml
+++ b/addons/pos_loyalty/loyalty_demo.xml
@@ -9,7 +9,7 @@
Free Beergift1000
-
+
diff --git a/addons/pos_restaurant/restaurant_demo.xml b/addons/pos_restaurant/restaurant_demo.xml
index 5660584f85f..048b173bf96 100644
--- a/addons/pos_restaurant/restaurant_demo.xml
+++ b/addons/pos_restaurant/restaurant_demo.xml
@@ -9,7 +9,7 @@
Kitchen Printerlocalhost
-
+
diff --git a/addons/sale/sale_demo.xml b/addons/sale/sale_demo.xml
index 2b76ffca5a1..6d95a848c5e 100644
--- a/addons/sale/sale_demo.xml
+++ b/addons/sale/sale_demo.xml
@@ -223,8 +223,8 @@
-
-
+
+ manual
diff --git a/addons/sale_stock/test/picking_order_policy.yml b/addons/sale_stock/test/picking_order_policy.yml
index 73f9a118abc..097de63919e 100644
--- a/addons/sale_stock/test/picking_order_policy.yml
+++ b/addons/sale_stock/test/picking_order_policy.yml
@@ -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.
-
diff --git a/addons/stock/doc/stock.rst b/addons/stock/doc/stock.rst
index 1567eaf416b..8a048e25b1c 100644
--- a/addons/stock/doc/stock.rst
+++ b/addons/stock/doc/stock.rst
@@ -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.
diff --git a/addons/stock/stock_demo.xml b/addons/stock/stock_demo.xml
index d849d83ea08..50ac06887b6 100644
--- a/addons/stock/stock_demo.xml
+++ b/addons/stock/stock_demo.xml
@@ -160,7 +160,7 @@
- Your Company, Chicago
+ My Company, Chicago1
@@ -184,7 +184,7 @@
- Your Company, Chicago
+ My Company, Chicago
diff --git a/addons/stock_calendar/test/orderpoint_calendar.yml b/addons/stock_calendar/test/orderpoint_calendar.yml
index 1aebbecfe29..c95b5ca7222 100644
--- a/addons/stock_calendar/test/orderpoint_calendar.yml
+++ b/addons/stock_calendar/test/orderpoint_calendar.yml
@@ -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'
diff --git a/addons/website_crm/views/website_crm.xml b/addons/website_crm/views/website_crm.xml
index 06113f928e5..124a2ac6cc6 100644
--- a/addons/website_crm/views/website_crm.xml
+++ b/addons/website_crm/views/website_crm.xml
@@ -51,7 +51,7 @@
-
+
diff --git a/doc/howtos/backend/exercise-creation b/doc/howtos/backend/exercise-creation
index 353556a43b5..6325efeb226 100644
--- a/doc/howtos/backend/exercise-creation
+++ b/doc/howtos/backend/exercise-creation
@@ -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
diff --git a/doc/howtos/website/module-empty b/doc/howtos/website/module-empty
index 0bbb26dd5b6..744dc7c9ab5 100644
--- a/doc/howtos/website/module-empty
+++ b/doc/howtos/website/module-empty
@@ -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
diff --git a/openerp/addons/base/base.sql b/openerp/addons/base/base.sql
index 2f2990d0212..a994cc906cc 100644
--- a/openerp/addons/base/base.sql
+++ b/openerp/addons/base/base.sql
@@ -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);
diff --git a/openerp/addons/base/base_data.xml b/openerp/addons/base/base_data.xml
index 36c65278d18..972b04f3220 100644
--- a/openerp/addons/base/base_data.xml
+++ b/openerp/addons/base/base_data.xml
@@ -21,7 +21,7 @@
- Your Company
+ My Company
@@ -36,9 +36,9 @@
- Your Company
+ My Company
- Your Company Tagline
+ My Company Tagline
diff --git a/openerp/addons/base/res/res_partner_demo.xml b/openerp/addons/base/res/res_partner_demo.xml
index 2a7c1d6ee49..8c9531b9250 100644
--- a/openerp/addons/base/res/res_partner_demo.xml
+++ b/openerp/addons/base/res/res_partner_demo.xml
@@ -160,12 +160,11 @@
Think Big Systems1
- Boston
- 02203
+ Londonthinkbig@yourcompany.example.com+1 857 349 3049
-
- One Lincoln Street
+
+ 89 Lingfield Towerhttp://www.think-big.com
@@ -194,22 +193,6 @@
1
-
- Paul Williams
-
- Line Mechanic
- paul.williams@deltapc.example.com
- 1
-
-
-
- Brian Williams
-
- Computer Technician
- brian.williams@deltapc.example.com
- 1
-
- James Miller
diff --git a/openerp/addons/base/res/res_partner_demo.yml b/openerp/addons/base/res/res_partner_demo.yml
index b577778524c..9fd892dbb39 100644
--- a/openerp/addons/base/res/res_partner_demo.yml
+++ b/openerp/addons/base/res/res_partner_demo.yml
@@ -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
diff --git a/openerp/addons/base/tests/test_osv_expression.yml b/openerp/addons/base/tests/test_osv_expression.yml
index 813acfd2669..73bbdfae3eb 100644
--- a/openerp/addons/base/tests/test_osv_expression.yml
+++ b/openerp/addons/base/tests/test_osv_expression.yml
@@ -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.
-
diff --git a/openerp/cli/templates/default/__openerp__.py.template b/openerp/cli/templates/default/__openerp__.py.template
index 2aae5fbdd46..1e8f759ba4e 100644
--- a/openerp/cli/templates/default/__openerp__.py.template
+++ b/openerp/cli/templates/default/__openerp__.py.template
@@ -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
diff --git a/openerp/cli/templates/theme/__openerp__.py.template b/openerp/cli/templates/theme/__openerp__.py.template
index 9eba44581a9..f6d99c2be45 100644
--- a/openerp/cli/templates/theme/__openerp__.py.template
+++ b/openerp/cli/templates/theme/__openerp__.py.template
@@ -19,6 +19,6 @@
],
# Your information
- 'author': "Your Company",
+ 'author': "My Company",
'website': "",
}