diff --git a/addons/auction/auction_demo.xml b/addons/auction/auction_demo.xml
index da4989756f9..cb8dfc45376 100644
--- a/addons/auction/auction_demo.xml
+++ b/addons/auction/auction_demo.xml
@@ -2,6 +2,10 @@
+
+
+
+
Tax
diff --git a/addons/auction/security/auction_security.xml b/addons/auction/security/auction_security.xml
index 32fdf0d64f3..1fc69bb314f 100644
--- a/addons/auction/security/auction_security.xml
+++ b/addons/auction/security/auction_security.xml
@@ -8,6 +8,6 @@
Auction / User
-
+
\ No newline at end of file
diff --git a/addons/base_contact/base_contact_demo.xml b/addons/base_contact/base_contact_demo.xml
index 40646d1f8eb..393c318015c 100644
--- a/addons/base_contact/base_contact_demo.xml
+++ b/addons/base_contact/base_contact_demo.xml
@@ -2,6 +2,10 @@
+
+
+
+
diff --git a/addons/base_contact/security/base_contact_security.xml b/addons/base_contact/security/base_contact_security.xml
index 72b692ca372..56a995c76a8 100644
--- a/addons/base_contact/security/base_contact_security.xml
+++ b/addons/base_contact/security/base_contact_security.xml
@@ -9,5 +9,6 @@
Sales / Manager
+
diff --git a/addons/board/__openerp__.py b/addons/board/__openerp__.py
index 1c44dfe7955..770fc71777b 100644
--- a/addons/board/__openerp__.py
+++ b/addons/board/__openerp__.py
@@ -27,7 +27,7 @@
'author': 'OpenERP SA',
'depends': ['base'],
'update_xml': ['security/board_security.xml','security/ir.model.access.csv', 'wizard/board_menu_create_view.xml', 'board_view.xml','board_administration_view.xml'],
- 'demo_xml': [],
+ 'demo_xml': ['board_demo.xml'],
'installable': True,
'active': False,
'certificate': '0076912305725',
diff --git a/addons/board/board_demo.xml b/addons/board/board_demo.xml
new file mode 100644
index 00000000000..2f704e640bc
--- /dev/null
+++ b/addons/board/board_demo.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/addons/crm/crm_demo.xml b/addons/crm/crm_demo.xml
index 9ae60b11a70..e629330751f 100644
--- a/addons/crm/crm_demo.xml
+++ b/addons/crm/crm_demo.xml
@@ -5,6 +5,5 @@
-
diff --git a/addons/delivery/delivery_view.xml b/addons/delivery/delivery_view.xml
index b7ec0fed61e..d557f2c0750 100644
--- a/addons/delivery/delivery_view.xml
+++ b/addons/delivery/delivery_view.xml
@@ -128,7 +128,7 @@
sale.order
-
+
diff --git a/addons/document/document_demo.xml b/addons/document/document_demo.xml
index 1c757a73909..b94048ec13c 100644
--- a/addons/document/document_demo.xml
+++ b/addons/document/document_demo.xml
@@ -1,7 +1,9 @@
-
+
+
+
diff --git a/addons/email_template/email_template_account.py b/addons/email_template/email_template_account.py
index 24b7958276d..ec8d6446603 100644
--- a/addons/email_template/email_template_account.py
+++ b/addons/email_template/email_template_account.py
@@ -372,7 +372,7 @@ unless it is already specified in the From Email, e.g: John Doe ",
return True
else:
logger.notifyChannel(_("Email Template"), netsvc.LOG_ERROR, _("Mail from Account %s failed. Probable Reason:Account not approved") % id)
- return {'error_msg':"Mail from Account %s failed. Probable Reason:Account not approved"% id}
+ return {'nodestroy':True,'error_msg':"Mail from Account %s failed. Probable Reason:Account not approved"% id}
def extracttime(self, time_as_string):
"""
diff --git a/addons/email_template/email_template_account_view.xml b/addons/email_template/email_template_account_view.xml
index 97108cb9e33..a372e5fb443 100644
--- a/addons/email_template/email_template_account_view.xml
+++ b/addons/email_template/email_template_account_view.xml
@@ -3,7 +3,7 @@
+ groups="marketing.group_marketing_user,marketing.group_marketing_manager"/>
diff --git a/addons/email_template/security/ir.model.access.csv b/addons/email_template/security/ir.model.access.csv
index 79135b0de4d..17859d6bb9d 100644
--- a/addons/email_template/security/ir.model.access.csv
+++ b/addons/email_template/security/ir.model.access.csv
@@ -5,3 +5,6 @@
"access_email_template_account_system","email_template.account system","model_email_template_account","base.group_system",1,1,1,1
"access_email_template_system","email.template system","model_email_template","base.group_system",1,1,1,1
"access_email_template_mailbox_system","email_template.mailbox system","model_email_template_mailbox","base.group_system",1,0,0,0
+"access_email_template_account_manager","email_template.account","model_email_template_account","marketing.group_marketing_manager",1,1,1,1
+"access_email_template_manager","email.template","model_email_template","marketing.group_marketing_manager",1,1,1,1
+"access_email_template_mailbox_manager","email_template.mailbox","model_email_template_mailbox","marketing.group_marketing_manager",1,1,1,1
diff --git a/addons/event/report/report_event_registration_view.xml b/addons/event/report/report_event_registration_view.xml
index 7b489775f25..7794843af40 100644
--- a/addons/event/report/report_event_registration_view.xml
+++ b/addons/event/report/report_event_registration_view.xml
@@ -141,7 +141,7 @@
-
+
diff --git a/addons/event/security/event_security.xml b/addons/event/security/event_security.xml
index 8aba5863e22..648662911d2 100644
--- a/addons/event/security/event_security.xml
+++ b/addons/event/security/event_security.xml
@@ -2,7 +2,7 @@
-
+
Marketing / Manager
diff --git a/addons/event/security/ir.model.access.csv b/addons/event/security/ir.model.access.csv
index a2e4b55bed5..59651dfa007 100644
--- a/addons/event/security/ir.model.access.csv
+++ b/addons/event/security/ir.model.access.csv
@@ -1,16 +1,16 @@
"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
"access_event_type","event.type","model_event_type","marketing.group_marketing_user",1,0,0,0
-"access_event_type_manager","event.type manager","model_event_type","base.group_marketing_manager",1,1,1,1
+"access_event_type_manager","event.type manager","model_event_type","marketing.group_marketing_manager",1,1,1,1
"access_event_event","event.event","model_event_event","marketing.group_marketing_user",1,1,1,0
"access_event_registration","event.registration","model_event_registration","marketing.group_marketing_user",1,1,1,0
"access_report_event_registration","report.event.registration","model_report_event_registration","marketing.group_marketing_user",1,1,1,1
-"access_event_event_manager","event.event manager","model_event_event","base.group_marketing_manager",1,0,0,0
-"access_event_registration_manager","event.registration manager","model_event_registration","base.group_marketing_manager",1,0,0,0
-"access_crm_case_section_manager","crm.case.section manager","crm.model_crm_case_section","base.group_marketing_manager",1,1,1,1
-"access_product_product","product.product.product manager","product.model_product_product","base.group_marketing_manager",1,1,1,1
-"access_report_event_registration","report.event.registration","model_report_event_registration","base.group_marketing_manager",1,1,1,1
-"access_event_registration_badge_manager","event.registration.badge manager","model_event_registration_badge","base.group_marketing_manager",1,1,1,1
+"access_event_event_manager","event.event manager","model_event_event","marketing.group_marketing_manager",1,0,0,0
+"access_event_registration_manager","event.registration manager","model_event_registration","marketing.group_marketing_manager",1,0,0,0
+"access_crm_case_section_manager","crm.case.section manager","crm.model_crm_case_section","marketing.group_marketing_manager",1,1,1,1
+"access_product_product","product.product.product manager","product.model_product_product","marketing.group_marketing_manager",1,1,1,1
+"access_report_event_registration","report.event.registration","model_report_event_registration","marketing.group_marketing_manager",1,1,1,1
+"access_event_registration_badge_manager","event.registration.badge manager","model_event_registration_badge","marketing.group_marketing_manager",1,1,1,1
"access_event_event_sale_salesman","event.event.sale","model_event_event","base.group_sale_salesman",1,0,0,0
-"access_account_account_invoice_manager","account.account.invoice","account.model_account_invoice","base.group_marketing_manager",1,0,0,0
+"access_account_account_invoice_manager","account.account.invoice","account.model_account_invoice","marketing.group_marketing_manager",1,0,0,0
"access_event_registration_badge","event.registration.badge","model_event_registration_badge","marketing.group_marketing_user",1,0,0,0
"access_event_registration_sale_user","event.registration.sale.user","model_event_registration","base.group_sale_salesman",1,0,0,0
diff --git a/addons/marketing/__openerp__.py b/addons/marketing/__openerp__.py
index 16127d2d343..931ac38c4bb 100644
--- a/addons/marketing/__openerp__.py
+++ b/addons/marketing/__openerp__.py
@@ -34,7 +34,7 @@
'security/ir.model.access.csv',
'marketing_view.xml'
],
- 'demo_xml': [],
+ 'demo_xml': ['marketing_demo.xml'],
'installable': True,
'active': False,
}
diff --git a/addons/marketing/marketing_demo.xml b/addons/marketing/marketing_demo.xml
new file mode 100644
index 00000000000..904736ac5ec
--- /dev/null
+++ b/addons/marketing/marketing_demo.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/addons/marketing/marketing_view.xml b/addons/marketing/marketing_view.xml
index 69ee91d52dc..8b804487e77 100644
--- a/addons/marketing/marketing_view.xml
+++ b/addons/marketing/marketing_view.xml
@@ -2,7 +2,7 @@
-
+
marketing.installer.view
diff --git a/addons/marketing/security/marketing_security.xml b/addons/marketing/security/marketing_security.xml
index 740b9b3a2c5..06cf40772f4 100644
--- a/addons/marketing/security/marketing_security.xml
+++ b/addons/marketing/security/marketing_security.xml
@@ -4,5 +4,10 @@
Marketing / User
+
+
+ Marketing / Manager
+
+
diff --git a/addons/marketing_campaign/report/campaign_analysis_view.xml b/addons/marketing_campaign/report/campaign_analysis_view.xml
index 1c8581b3f31..745dd4047e5 100644
--- a/addons/marketing_campaign/report/campaign_analysis_view.xml
+++ b/addons/marketing_campaign/report/campaign_analysis_view.xml
@@ -11,6 +11,7 @@
+
diff --git a/addons/marketing_campaign/security/ir.model.access.csv b/addons/marketing_campaign/security/ir.model.access.csv
index 082cafd7054..c2b7b4f4c86 100644
--- a/addons/marketing_campaign/security/ir.model.access.csv
+++ b/addons/marketing_campaign/security/ir.model.access.csv
@@ -1,13 +1,21 @@
"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_marketing_campaign_admin","marketing.campaign","model_marketing_campaign","marketing.group_marketing_user",1,1,1,1
-"access_marketing_campaign_segment_campaignadmin","marketing.campaign.segment","model_marketing_campaign_segment","marketing.group_marketing_user",1,1,1,1
-"access_marketing_campaign_activity_campaignadmin","marketing.campaign.activity","model_marketing_campaign_activity","marketing.group_marketing_user",1,1,1,1
-"access_marketing_campaign_workitem_campaignadmin","marketing.campaign.workitem","model_marketing_campaign_workitem","marketing.group_marketing_user",1,1,1,1
-"access_marketing_campaign_transition_campaignadmin","marketing.campaign.transition","model_marketing_campaign_transition","marketing.group_marketing_user",1,1,1,1
-"access_marketing_campaign_analysis_campaignadmin","campaign.analysis","model_campaign_analysis","marketing.group_marketing_user",1,1,1,1
+"access_marketing_campaign_admin","marketing.campaign","model_marketing_campaign","marketing.group_marketing_user",1,1,0,0
+"access_marketing_campaign_segment_campaignadmin","marketing.campaign.segment","model_marketing_campaign_segment","marketing.group_marketing_user",1,1,0,0
+"access_marketing_campaign_activity_campaignadmin","marketing.campaign.activity","model_marketing_campaign_activity","marketing.group_marketing_user",1,1,0,0
+"access_marketing_campaign_workitem_campaignadmin","marketing.campaign.workitem","model_marketing_campaign_workitem","marketing.group_marketing_user",1,1,0,0
+"access_marketing_campaign_transition_campaignadmin","marketing.campaign.transition","model_marketing_campaign_transition","marketing.group_marketing_user",1,1,0,0
+"access_marketing_campaign_analysis_campaignadmin","campaign.analysis","model_campaign_analysis","marketing.group_marketing_user",1,1,0,0
"access_marketing_campaign_workitem_all","marketing.campaign.workitem","model_marketing_campaign_workitem","base.group_user",1,0,0,0
-"access_email_template_user","email.template","model_email_template","marketing.group_marketing_user",1,1,1,1
-"access_email_template_account_user","email_template.account.user","email_template.model_email_template_account","marketing.group_marketing_user",1,1,1,1
+"access_email_template_user","email.template","model_email_template","marketing.group_marketing_user",1,1,0,0
+"access_email_template_account_user","email_template.account.user","email_template.model_email_template_account","marketing.group_marketing_user",1,1,0,0
"access_marketing_campaign_system","marketing.campaign system","model_marketing_campaign","base.group_system",1,0,0,0
"access_marketing_campaign_segment_system","marketing.campaign.segment system","model_marketing_campaign_segment","base.group_system",1,0,0,0
"access_marketing_campaign_workitem_system","marketing.campaign.workitem system","model_marketing_campaign_workitem","base.group_system",1,0,0,0
+"access_marketing_campaign_manager","marketing.campaign","model_marketing_campaign","marketing.group_marketing_manager",1,1,1,1
+"access_marketing_campaign_segment_campaign_manager","marketing.campaign.segment","model_marketing_campaign_segment","marketing.group_marketing_manager",1,1,1,1
+"access_marketing_campaign_activity_campaign_manager","marketing.campaign.activity","model_marketing_campaign_activity","marketing.group_marketing_manager",1,1,1,1
+"access_marketing_campaign_workitem_campaign_manager","marketing.campaign.workitem","model_marketing_campaign_workitem","marketing.group_marketing_manager",1,1,1,1
+"access_marketing_campaign_transition_campaign_manager","marketing.campaign.transition","model_marketing_campaign_transition","marketing.group_marketing_manager",1,1,1,1
+"access_marketing_campaign_analysis_campaign_manager","campaign.analysis","model_campaign_analysis","marketing.group_marketing_manager",1,1,1,1
+"access_email_template_manager","email.template","model_email_template","marketing.group_marketing_manager",1,1,1,1
+"access_email_template_account_manager","email_template.account.manager","email_template.model_email_template_account","marketing.group_marketing_manager",1,1,1,1
diff --git a/addons/mrp/i18n/ca.po b/addons/mrp/i18n/ca.po
index d0f2e64988c..ca586185708 100644
--- a/addons/mrp/i18n/ca.po
+++ b/addons/mrp/i18n/ca.po
@@ -2270,7 +2270,7 @@ msgstr ""
#~ msgid "Product & Location"
#~ msgstr "Producte & Ubicació"
-#~ msgid "MRP & Logistic Scheduler"
+#~ msgid "MRP & Logistics Scheduler"
#~ msgstr "Planificador MRP & Logística"
#~ msgid ""
diff --git a/addons/mrp/i18n/de.po b/addons/mrp/i18n/de.po
index 5f6b1318cf4..8ba0a67e48e 100644
--- a/addons/mrp/i18n/de.po
+++ b/addons/mrp/i18n/de.po
@@ -2391,7 +2391,7 @@ msgstr "Jahr"
#~ msgid "Product & Location"
#~ msgstr "Produkt & Lagerort"
-#~ msgid "MRP & Logistic Scheduler"
+#~ msgid "MRP & Logistics Scheduler"
#~ msgstr "Fertigungs- und Beschaffungsplanung"
#~ msgid ""
diff --git a/addons/mrp/i18n/el.po b/addons/mrp/i18n/el.po
index 5c7ca68f453..0308547af2a 100644
--- a/addons/mrp/i18n/el.po
+++ b/addons/mrp/i18n/el.po
@@ -2354,7 +2354,7 @@ msgstr ""
#~ msgid "Best price (not yet active!)"
#~ msgstr "Best price (not yet active!)"
-#~ msgid "MRP & Logistic Scheduler"
+#~ msgid "MRP & Logistics Scheduler"
#~ msgstr "MRP & Προγραμματισμός Προμηθειών"
#~ msgid ""
diff --git a/addons/mrp/i18n/es.po b/addons/mrp/i18n/es.po
index aa9ce72a1fe..a28e574114b 100644
--- a/addons/mrp/i18n/es.po
+++ b/addons/mrp/i18n/es.po
@@ -2501,7 +2501,7 @@ msgstr "Año"
#~ msgid "Product & Location"
#~ msgstr "Producto & Ubicación"
-#~ msgid "MRP & Logistic Scheduler"
+#~ msgid "MRP & Logistics Scheduler"
#~ msgstr "Planificador MRP & Logística"
#~ msgid ""
diff --git a/addons/mrp/i18n/fi.po b/addons/mrp/i18n/fi.po
index 0cb3e26f332..a41a1571a61 100644
--- a/addons/mrp/i18n/fi.po
+++ b/addons/mrp/i18n/fi.po
@@ -2385,7 +2385,7 @@ msgstr ""
#~ "This is the days added to what you promise to customers for security purpose"
#~ msgstr "Nämä päivät lisätään asiakkaalle luvattuun aikaan turvallisuussyistä"
-#~ msgid "MRP & Logistic Scheduler"
+#~ msgid "MRP & Logistics Scheduler"
#~ msgstr "Tuotanto- ja logistiikka-aikataulut"
#~ msgid "A purchase order is created for a sub-contracting demand."
diff --git a/addons/mrp/i18n/it.po b/addons/mrp/i18n/it.po
index 56545de28d3..a9c38d15a38 100644
--- a/addons/mrp/i18n/it.po
+++ b/addons/mrp/i18n/it.po
@@ -2501,7 +2501,7 @@ msgstr ""
#~ "Questi sono i giorni aggiunti, per sicurezza, alla data che hai promesso ai "
#~ "clienti."
-#~ msgid "MRP & Logistic Scheduler"
+#~ msgid "MRP & Logistics Scheduler"
#~ msgstr "MRP e Schedulatore Logistico"
#~ msgid "Automatic Procurements"
diff --git a/addons/mrp/i18n/ko.po b/addons/mrp/i18n/ko.po
index f7d15c28df0..f6afd586b21 100644
--- a/addons/mrp/i18n/ko.po
+++ b/addons/mrp/i18n/ko.po
@@ -2246,7 +2246,7 @@ msgstr ""
#~ msgid "Product name"
#~ msgstr "제품 이름"
-#~ msgid "MRP & Logistic Scheduler"
+#~ msgid "MRP & Logistics Scheduler"
#~ msgstr "MRP 및 물류 스케줄러"
#~ msgid "Ask New Products"
diff --git a/addons/mrp/i18n/nl.po b/addons/mrp/i18n/nl.po
index 202d9117369..aeb0547ec47 100644
--- a/addons/mrp/i18n/nl.po
+++ b/addons/mrp/i18n/nl.po
@@ -2464,7 +2464,7 @@ msgstr ""
#~ "Dit is het aantal dagen dat als veiligheidsmarge wordt toegevoegd aan de "
#~ "beloofde levertijd."
-#~ msgid "MRP & Logistic Scheduler"
+#~ msgid "MRP & Logistics Scheduler"
#~ msgstr "MRP & logistieke planning"
#~ msgid "Product & Location"
diff --git a/addons/mrp/i18n/pl.po b/addons/mrp/i18n/pl.po
index 00767690d69..db537e316b7 100644
--- a/addons/mrp/i18n/pl.po
+++ b/addons/mrp/i18n/pl.po
@@ -2283,7 +2283,7 @@ msgstr ""
#~ msgid "Origin"
#~ msgstr "Pochodzenie"
-#~ msgid "MRP & Logistic Scheduler"
+#~ msgid "MRP & Logistics Scheduler"
#~ msgstr "MRP i planowanie logistyczne"
#~ msgid "Product & Location"
diff --git a/addons/mrp/i18n/pt.po b/addons/mrp/i18n/pt.po
index 38ab051f51b..dcb5807136a 100644
--- a/addons/mrp/i18n/pt.po
+++ b/addons/mrp/i18n/pt.po
@@ -2500,7 +2500,7 @@ msgstr ""
#~ "Estes são os dias adicionados aos que prometeu aos clientes para fins de "
#~ "segurança"
-#~ msgid "MRP & Logistic Scheduler"
+#~ msgid "MRP & Logistics Scheduler"
#~ msgstr "Planificador Logístico e de Produção"
#~ msgid "Automatic Procurements"
diff --git a/addons/mrp/i18n/ru.po b/addons/mrp/i18n/ru.po
index b9ff99b1ab9..7a0cfa7e1de 100644
--- a/addons/mrp/i18n/ru.po
+++ b/addons/mrp/i18n/ru.po
@@ -2516,7 +2516,7 @@ msgstr ""
#~ msgid "Exceptions Procurements"
#~ msgstr "Исключения поставок"
-#~ msgid "MRP & Logistic Scheduler"
+#~ msgid "MRP & Logistics Scheduler"
#~ msgstr "ПМР и Логистическое планирование"
#~ msgid "Stockable Stock"
diff --git a/addons/mrp/i18n/sk.po b/addons/mrp/i18n/sk.po
index d72ee6b54d0..2715a919654 100644
--- a/addons/mrp/i18n/sk.po
+++ b/addons/mrp/i18n/sk.po
@@ -2230,7 +2230,7 @@ msgstr ""
#~ msgid "Ask New Products"
#~ msgstr "Opýtať sa na nový produkt"
-#~ msgid "MRP & Logistic Scheduler"
+#~ msgid "MRP & Logistics Scheduler"
#~ msgstr "MRP a plánovač logistiky"
#~ msgid "Product & Location"
diff --git a/addons/mrp/i18n/tr.po b/addons/mrp/i18n/tr.po
index 6c34a3b860d..54a7b5e374d 100644
--- a/addons/mrp/i18n/tr.po
+++ b/addons/mrp/i18n/tr.po
@@ -2241,7 +2241,7 @@ msgstr ""
#~ msgid "Product & Location"
#~ msgstr "Ürün & Lokasyon Bilgisi"
-#~ msgid "MRP & Logistic Scheduler"
+#~ msgid "MRP & Logistics Scheduler"
#~ msgstr "MRP & Lojistik Planlaması"
#~ msgid "Ask New Products"
diff --git a/addons/mrp/i18n/zh_CN.po b/addons/mrp/i18n/zh_CN.po
index ce6a25897a9..f44485efd32 100644
--- a/addons/mrp/i18n/zh_CN.po
+++ b/addons/mrp/i18n/zh_CN.po
@@ -2544,7 +2544,7 @@ msgstr ""
#~ msgid "Product & Location"
#~ msgstr "产品&库位"
-#~ msgid "MRP & Logistic Scheduler"
+#~ msgid "MRP & Logistics Scheduler"
#~ msgstr "MRP&物流调度"
#~ msgid ""
diff --git a/addons/mrp/i18n/zh_HK.po b/addons/mrp/i18n/zh_HK.po
index a96126ab8db..5160246f0b4 100644
--- a/addons/mrp/i18n/zh_HK.po
+++ b/addons/mrp/i18n/zh_HK.po
@@ -2255,7 +2255,7 @@ msgstr ""
#~ "This is the days added to what you promise to customers for security purpose"
#~ msgstr "這是你為了客人的保險而所承諾的天數"
-#~ msgid "MRP & Logistic Scheduler"
+#~ msgid "MRP & Logistics Scheduler"
#~ msgstr "物料需求計劃 & 物流調度"
#~ msgid "Automatic Procurements"
diff --git a/addons/mrp/i18n/zh_TW.po b/addons/mrp/i18n/zh_TW.po
index 15c4a447108..a1e6e66c1de 100644
--- a/addons/mrp/i18n/zh_TW.po
+++ b/addons/mrp/i18n/zh_TW.po
@@ -2251,7 +2251,7 @@ msgstr ""
#~ "This is the days added to what you promise to customers for security purpose"
#~ msgstr "這是你為了客人的保險而所承諾的天數"
-#~ msgid "MRP & Logistic Scheduler"
+#~ msgid "MRP & Logistics Scheduler"
#~ msgstr "物料需求計劃 & 物流調度"
#~ msgid "Product & Location"
diff --git a/addons/mrp/mrp_demo.xml b/addons/mrp/mrp_demo.xml
index cea5c60ee56..d19a99a12ca 100644
--- a/addons/mrp/mrp_demo.xml
+++ b/addons/mrp/mrp_demo.xml
@@ -2,6 +2,11 @@
+
+
+
+
+
diff --git a/addons/mrp/security/mrp_security.xml b/addons/mrp/security/mrp_security.xml
index b105e1cbb8a..1cc4c5cea9b 100644
--- a/addons/mrp/security/mrp_security.xml
+++ b/addons/mrp/security/mrp_security.xml
@@ -9,7 +9,6 @@
Manufacturing / User
-
diff --git a/addons/procurement/company_view.xml b/addons/procurement/company_view.xml
index e046fd4faee..4d14f69edde 100644
--- a/addons/procurement/company_view.xml
+++ b/addons/procurement/company_view.xml
@@ -10,7 +10,7 @@
-
+
diff --git a/addons/procurement/i18n/en_US.po b/addons/procurement/i18n/en_US.po
index 61b250516dd..249709f42cf 100644
--- a/addons/procurement/i18n/en_US.po
+++ b/addons/procurement/i18n/en_US.po
@@ -314,8 +314,8 @@ msgstr "If you encode manually a Procurement, you probably want to use a make to
#. module: procurement
#: view:res.company:0
-msgid "MRP & Logistic Scheduler"
-msgstr "MRP & Logistic Scheduler"
+msgid "MRP & Logistics Scheduler"
+msgstr "MRP & Logistics Scheduler"
#. module: procurement
#: view:procurement.order.compute.all:0
diff --git a/addons/procurement/i18n/fr.po b/addons/procurement/i18n/fr.po
index 1cd6975c4f5..441527c6ce6 100644
--- a/addons/procurement/i18n/fr.po
+++ b/addons/procurement/i18n/fr.po
@@ -324,7 +324,7 @@ msgstr ""
#. module: procurement
#: view:res.company:0
-msgid "MRP & Logistic Scheduler"
+msgid "MRP & Logistics Scheduler"
msgstr ""
#. module: procurement
diff --git a/addons/procurement/i18n/it.po b/addons/procurement/i18n/it.po
index aecf56d6ea3..63df3159cd0 100644
--- a/addons/procurement/i18n/it.po
+++ b/addons/procurement/i18n/it.po
@@ -325,7 +325,7 @@ msgstr ""
#. module: procurement
#: view:res.company:0
-msgid "MRP & Logistic Scheduler"
+msgid "MRP & Logistics Scheduler"
msgstr ""
#. module: procurement
diff --git a/addons/procurement/i18n/mn.po b/addons/procurement/i18n/mn.po
index 0fd557774c7..72aa146cd7e 100644
--- a/addons/procurement/i18n/mn.po
+++ b/addons/procurement/i18n/mn.po
@@ -342,7 +342,7 @@ msgstr ""
#. module: procurement
#: view:res.company:0
-msgid "MRP & Logistic Scheduler"
+msgid "MRP & Logistics Scheduler"
msgstr "Үйлдвэрлэл & Логистик"
#. module: procurement
diff --git a/addons/procurement/i18n/nl.po b/addons/procurement/i18n/nl.po
index 978d027fb94..b426a7aa414 100644
--- a/addons/procurement/i18n/nl.po
+++ b/addons/procurement/i18n/nl.po
@@ -325,7 +325,7 @@ msgstr ""
#. module: procurement
#: view:res.company:0
-msgid "MRP & Logistic Scheduler"
+msgid "MRP & Logistics Scheduler"
msgstr ""
#. module: procurement
diff --git a/addons/procurement/i18n/pl.po b/addons/procurement/i18n/pl.po
index edf783bd6c4..737298169f3 100644
--- a/addons/procurement/i18n/pl.po
+++ b/addons/procurement/i18n/pl.po
@@ -344,7 +344,7 @@ msgstr ""
#. module: procurement
#: view:res.company:0
-msgid "MRP & Logistic Scheduler"
+msgid "MRP & Logistics Scheduler"
msgstr "MRP i planowanie logistyczne"
#. module: procurement
diff --git a/addons/procurement/i18n/procurement.pot b/addons/procurement/i18n/procurement.pot
index ccf727af0af..4c3a1dff71f 100644
--- a/addons/procurement/i18n/procurement.pot
+++ b/addons/procurement/i18n/procurement.pot
@@ -332,7 +332,7 @@ msgstr ""
#. module: procurement
#: view:res.company:0
-msgid "MRP & Logistic Scheduler"
+msgid "MRP & Logistics Scheduler"
msgstr ""
#. module: procurement
diff --git a/addons/procurement/i18n/ru.po b/addons/procurement/i18n/ru.po
index 3dab25cb2f6..ba77a1e4b57 100644
--- a/addons/procurement/i18n/ru.po
+++ b/addons/procurement/i18n/ru.po
@@ -342,7 +342,7 @@ msgstr ""
#. module: procurement
#: view:res.company:0
-msgid "MRP & Logistic Scheduler"
+msgid "MRP & Logistics Scheduler"
msgstr "ПМР и Логистическое планирование"
#. module: procurement
diff --git a/addons/procurement/procurement_view.xml b/addons/procurement/procurement_view.xml
index 53f84367b17..96b96f3af21 100644
--- a/addons/procurement/procurement_view.xml
+++ b/addons/procurement/procurement_view.xml
@@ -262,7 +262,7 @@
src_model="procurement.order"/>
-
+
diff --git a/addons/product/product_demo.xml b/addons/product/product_demo.xml
index 42fc157778e..65b27440c70 100644
--- a/addons/product/product_demo.xml
+++ b/addons/product/product_demo.xml
@@ -1,6 +1,11 @@
+
+
+
+
+
diff --git a/addons/project/project_demo.xml b/addons/project/project_demo.xml
index b0cfc8c716b..98efff361b3 100644
--- a/addons/project/project_demo.xml
+++ b/addons/project/project_demo.xml
@@ -4,7 +4,7 @@
-
+
diff --git a/addons/purchase/board_purchase_view.xml b/addons/purchase/board_purchase_view.xml
index c4f8d447a21..26743e413ef 100644
--- a/addons/purchase/board_purchase_view.xml
+++ b/addons/purchase/board_purchase_view.xml
@@ -131,7 +131,6 @@
-
diff --git a/addons/purchase/security/purchase_security.xml b/addons/purchase/security/purchase_security.xml
index 1848e9a7c61..e1149c91466 100644
--- a/addons/purchase/security/purchase_security.xml
+++ b/addons/purchase/security/purchase_security.xml
@@ -9,7 +9,6 @@
Purchase / User
-
Purchase Order multi-company
diff --git a/addons/purchase_requisition/purchase_requisition_demo.xml b/addons/purchase_requisition/purchase_requisition_demo.xml
index ee12ac76c9a..225137416bf 100644
--- a/addons/purchase_requisition/purchase_requisition_demo.xml
+++ b/addons/purchase_requisition/purchase_requisition_demo.xml
@@ -2,6 +2,10 @@
+
+
+
+
diff --git a/addons/purchase_requisition/security/purchase_tender.xml b/addons/purchase_requisition/security/purchase_tender.xml
index 9ccab8fdbb9..595b71008ef 100644
--- a/addons/purchase_requisition/security/purchase_tender.xml
+++ b/addons/purchase_requisition/security/purchase_tender.xml
@@ -5,6 +5,7 @@
Purchase Requisition / Manager
+
Purchase Requisition / User
diff --git a/addons/sale/i18n/ar.po b/addons/sale/i18n/ar.po
index de033e1a379..c61b42d7501 100644
--- a/addons/sale/i18n/ar.po
+++ b/addons/sale/i18n/ar.po
@@ -1453,7 +1453,7 @@ msgstr ""
#. module: sale
#: view:sale.order:0
-msgid "Logistic"
+msgid "Logistics"
msgstr ""
#. module: sale
diff --git a/addons/sale/i18n/bg.po b/addons/sale/i18n/bg.po
index 469e72f6b8e..cf82dd2f508 100644
--- a/addons/sale/i18n/bg.po
+++ b/addons/sale/i18n/bg.po
@@ -1460,7 +1460,7 @@ msgstr ""
#. module: sale
#: view:sale.order:0
-msgid "Logistic"
+msgid "Logistics"
msgstr ""
#. module: sale
@@ -2114,7 +2114,7 @@ msgstr "Фактура базирана на доставки"
#~ msgid "My sales in shipping exception"
#~ msgstr "Моите продажби с грешка при доставка"
-#~ msgid "Configure Sale Order Logistic"
+#~ msgid "Configure Sale Order Logistics"
#~ msgstr "Конфигуриране на реда на доставка при продажба"
#~ msgid "Sales Configuration"
diff --git a/addons/sale/i18n/bs.po b/addons/sale/i18n/bs.po
index c65a9e3e0cd..c121e6dfc39 100644
--- a/addons/sale/i18n/bs.po
+++ b/addons/sale/i18n/bs.po
@@ -1457,7 +1457,7 @@ msgstr ""
#. module: sale
#: view:sale.order:0
-msgid "Logistic"
+msgid "Logistics"
msgstr ""
#. module: sale
@@ -2215,7 +2215,7 @@ msgstr "Račun sa referencom na isporuku"
#~ "Ovaj korak pri konfiguraciji se koristi da bi se definisalo podrazumjevanje "
#~ "opcija izbora u toku kreiranja naloga za prodaju"
-#~ msgid "Configure Sale Order Logistic"
+#~ msgid "Configure Sale Order Logistics"
#~ msgstr "Konfigurisanje logistike prodajnog naloga"
#~ msgid "Sales Configuration"
diff --git a/addons/sale/i18n/ca.po b/addons/sale/i18n/ca.po
index 497996e82ba..1303d15c48e 100644
--- a/addons/sale/i18n/ca.po
+++ b/addons/sale/i18n/ca.po
@@ -1465,7 +1465,7 @@ msgstr ""
#. module: sale
#: view:sale.order:0
-msgid "Logistic"
+msgid "Logistics"
msgstr ""
#. module: sale
@@ -2038,7 +2038,7 @@ msgstr "Factura des d'albarans"
#~ msgid "Manual in progress"
#~ msgstr "Manual en procés"
-#~ msgid "Configure Sale Order Logistic"
+#~ msgid "Configure Sale Order Logistics"
#~ msgstr "Configureu la logística de les comandes de venda"
#~ msgid "You invoice has been successfully created !"
diff --git a/addons/sale/i18n/cs.po b/addons/sale/i18n/cs.po
index 47f616f52da..c84a67d748b 100644
--- a/addons/sale/i18n/cs.po
+++ b/addons/sale/i18n/cs.po
@@ -1453,7 +1453,7 @@ msgstr ""
#. module: sale
#: view:sale.order:0
-msgid "Logistic"
+msgid "Logistics"
msgstr ""
#. module: sale
diff --git a/addons/sale/i18n/de.po b/addons/sale/i18n/de.po
index c9994289ee4..e725e5fac59 100644
--- a/addons/sale/i18n/de.po
+++ b/addons/sale/i18n/de.po
@@ -1511,6 +1511,7 @@ msgstr "Verkäufe je Verkäufer"
#. module: sale
#: view:sale.order:0
+
msgid "Logistic"
msgstr "Logistik"
@@ -2251,7 +2252,7 @@ msgstr "Rechnung bei Wareneingang"
#~ msgid "Sale Procurement"
#~ msgstr "Auftragsbezogene Beschaffung"
-#~ msgid "Configure Sale Order Logistic"
+#~ msgid "Configure Sale Order Logistics"
#~ msgstr "Konfiguriere Packliste für Auftrag"
#~ msgid "Status"
diff --git a/addons/sale/i18n/el.po b/addons/sale/i18n/el.po
index b6b653eba49..37c55020a5d 100644
--- a/addons/sale/i18n/el.po
+++ b/addons/sale/i18n/el.po
@@ -1491,7 +1491,7 @@ msgstr ""
#. module: sale
#: view:sale.order:0
-msgid "Logistic"
+msgid "Logistics"
msgstr ""
#. module: sale
@@ -2411,8 +2411,8 @@ msgstr "Τιμολόγηση Βασισμένη Σε Παραδόσεις"
#~ "'Waiting Schedule' state is set when the invoice is confirmed but waiting "
#~ "for the scheduler to be on the date 'Date Ordered'."
-#~ msgid "Configure Sale Order Logistic"
-#~ msgstr "Configure Sale Order Logistic"
+#~ msgid "Configure Sale Order Logistics"
+#~ msgstr "Configure Sale Order Logistics"
#, python-format
#~ msgid ""
diff --git a/addons/sale/i18n/es.po b/addons/sale/i18n/es.po
index bb38622e3fe..932a437afb7 100644
--- a/addons/sale/i18n/es.po
+++ b/addons/sale/i18n/es.po
@@ -2146,7 +2146,7 @@ msgstr "Facturar desde albaranes"
#~ msgid "In progress"
#~ msgstr "En progreso"
-#~ msgid "Configure Sale Order Logistic"
+#~ msgid "Configure Sale Order Logistics"
#~ msgstr "Configurar la logística de los pedidos de venta"
#~ msgid "You invoice has been successfully created !"
diff --git a/addons/sale/i18n/es_AR.po b/addons/sale/i18n/es_AR.po
index 0c847f65824..9bb7c8b758c 100644
--- a/addons/sale/i18n/es_AR.po
+++ b/addons/sale/i18n/es_AR.po
@@ -1462,7 +1462,7 @@ msgstr ""
#. module: sale
#: view:sale.order:0
-msgid "Logistic"
+msgid "Logistics"
msgstr ""
#. module: sale
@@ -2190,7 +2190,7 @@ msgstr "Facturar desde órdenes de entrega"
#~ msgid "Status"
#~ msgstr "Estado"
-#~ msgid "Configure Sale Order Logistic"
+#~ msgid "Configure Sale Order Logistics"
#~ msgstr "Configurar logística de orden de venta"
#~ msgid "Create Advance Invoice"
diff --git a/addons/sale/i18n/et.po b/addons/sale/i18n/et.po
index 771d2773c54..fe91c762189 100644
--- a/addons/sale/i18n/et.po
+++ b/addons/sale/i18n/et.po
@@ -1485,7 +1485,7 @@ msgstr ""
#. module: sale
#: view:sale.order:0
-msgid "Logistic"
+msgid "Logistics"
msgstr ""
#. module: sale
@@ -2154,7 +2154,7 @@ msgstr "Arve kohaletoimetamiste põhjal"
#~ msgstr ""
#~ "Müügikorraldusel hankimine igale reale ja see muutub hankekorralduseks."
-#~ msgid "Configure Sale Order Logistic"
+#~ msgid "Configure Sale Order Logistics"
#~ msgstr "Seadista müügikorralduse logistika"
#~ msgid "Packing Policy"
diff --git a/addons/sale/i18n/fi.po b/addons/sale/i18n/fi.po
index d5867287896..d2c463e1d6c 100644
--- a/addons/sale/i18n/fi.po
+++ b/addons/sale/i18n/fi.po
@@ -1460,7 +1460,7 @@ msgstr ""
#. module: sale
#: view:sale.order:0
-msgid "Logistic"
+msgid "Logistics"
msgstr ""
#. module: sale
@@ -2224,7 +2224,7 @@ msgstr "Lasku perustuen toimitettuihin"
#~ msgid "Packing Policy"
#~ msgstr "Pakkauskäytäntö"
-#~ msgid "Configure Sale Order Logistic"
+#~ msgid "Configure Sale Order Logistics"
#~ msgstr "Myyntitilauksien logistiikan asetukset"
#~ msgid "One procurement for each product."
diff --git a/addons/sale/i18n/fr.po b/addons/sale/i18n/fr.po
index 9dc2ab136dc..11019cde0f7 100644
--- a/addons/sale/i18n/fr.po
+++ b/addons/sale/i18n/fr.po
@@ -1489,7 +1489,7 @@ msgstr ""
#. module: sale
#: view:sale.order:0
-msgid "Logistic"
+msgid "Logistics"
msgstr ""
#. module: sale
@@ -2094,7 +2094,7 @@ msgstr "Facture basé sur les livraisons"
#~ msgid "Sale Procurement"
#~ msgstr "Approvisionnement des ventes"
-#~ msgid "Configure Sale Order Logistic"
+#~ msgid "Configure Sale Order Logistics"
#~ msgstr "Configurer la logistique des commandes de ventes"
#~ msgid "Sale Order Procurement"
diff --git a/addons/sale/i18n/hr.po b/addons/sale/i18n/hr.po
index 6a521c55975..a0e3c69fba7 100644
--- a/addons/sale/i18n/hr.po
+++ b/addons/sale/i18n/hr.po
@@ -1458,7 +1458,7 @@ msgstr ""
#. module: sale
#: view:sale.order:0
-msgid "Logistic"
+msgid "Logistics"
msgstr ""
#. module: sale
@@ -2174,7 +2174,7 @@ msgstr "Račun na temelju dostava"
#~ msgid "Sale Procurement"
#~ msgstr "Pribavljanje za Prodaju"
-#~ msgid "Configure Sale Order Logistic"
+#~ msgid "Configure Sale Order Logistics"
#~ msgstr "Konfiguriraj logistiku Prodajne Narudžbe"
#~ msgid "Status"
diff --git a/addons/sale/i18n/hu.po b/addons/sale/i18n/hu.po
index 2c3b328219c..7f2bca798d8 100644
--- a/addons/sale/i18n/hu.po
+++ b/addons/sale/i18n/hu.po
@@ -1453,7 +1453,7 @@ msgstr ""
#. module: sale
#: view:sale.order:0
-msgid "Logistic"
+msgid "Logistics"
msgstr ""
#. module: sale
diff --git a/addons/sale/i18n/id.po b/addons/sale/i18n/id.po
index eb66cb0bf91..db2832bdd81 100644
--- a/addons/sale/i18n/id.po
+++ b/addons/sale/i18n/id.po
@@ -1458,7 +1458,7 @@ msgstr ""
#. module: sale
#: view:sale.order:0
-msgid "Logistic"
+msgid "Logistics"
msgstr ""
#. module: sale
diff --git a/addons/sale/i18n/it.po b/addons/sale/i18n/it.po
index 51cad856b37..d573d68187f 100644
--- a/addons/sale/i18n/it.po
+++ b/addons/sale/i18n/it.po
@@ -1494,7 +1494,7 @@ msgstr ""
#. module: sale
#: view:sale.order:0
-msgid "Logistic"
+msgid "Logistics"
msgstr ""
#. module: sale
@@ -2213,7 +2213,7 @@ msgstr "Fattura basata su Consegne"
#~ msgid "Sale Procurement"
#~ msgstr "Vendita appalti"
-#~ msgid "Configure Sale Order Logistic"
+#~ msgid "Configure Sale Order Logistics"
#~ msgstr "Configura la logistica di ordine di vendita"
#~ msgid "Status"
diff --git a/addons/sale/i18n/ko.po b/addons/sale/i18n/ko.po
index daa426d1cf4..37bd9b4d242 100644
--- a/addons/sale/i18n/ko.po
+++ b/addons/sale/i18n/ko.po
@@ -1454,7 +1454,7 @@ msgstr ""
#. module: sale
#: view:sale.order:0
-msgid "Logistic"
+msgid "Logistics"
msgstr ""
#. module: sale
@@ -2206,7 +2206,7 @@ msgstr "베송에 기초한 인보이스"
#~ "order"
#~ msgstr "판매 주문 작성 시, 디폴트 피킹 정책을 설정하는 구성 과정"
-#~ msgid "Configure Sale Order Logistic"
+#~ msgid "Configure Sale Order Logistics"
#~ msgstr "판매 주문 물류 구성"
#~ msgid "Quantity (UOS)"
diff --git a/addons/sale/i18n/lt.po b/addons/sale/i18n/lt.po
index 35180aaeb1d..a044f016e62 100644
--- a/addons/sale/i18n/lt.po
+++ b/addons/sale/i18n/lt.po
@@ -1461,7 +1461,7 @@ msgstr ""
#. module: sale
#: view:sale.order:0
-msgid "Logistic"
+msgid "Logistics"
msgstr ""
#. module: sale
@@ -2235,7 +2235,7 @@ msgstr "Sąskaita faktūra iš pristatymo užsakymo"
#~ msgid "Sale Procurement"
#~ msgstr "Planiniai užsakymai"
-#~ msgid "Configure Sale Order Logistic"
+#~ msgid "Configure Sale Order Logistics"
#~ msgstr "Konfigūruoti pardavimo užsakymo logistiką"
#~ msgid "Packing Policy"
diff --git a/addons/sale/i18n/lv.po b/addons/sale/i18n/lv.po
index b72e429313d..e92aa05e425 100644
--- a/addons/sale/i18n/lv.po
+++ b/addons/sale/i18n/lv.po
@@ -1454,7 +1454,7 @@ msgstr ""
#. module: sale
#: view:sale.order:0
-msgid "Logistic"
+msgid "Logistics"
msgstr ""
#. module: sale
diff --git a/addons/sale/i18n/nl.po b/addons/sale/i18n/nl.po
index da7086887fc..32539b346d8 100644
--- a/addons/sale/i18n/nl.po
+++ b/addons/sale/i18n/nl.po
@@ -1458,7 +1458,7 @@ msgstr ""
#. module: sale
#: view:sale.order:0
-msgid "Logistic"
+msgid "Logistics"
msgstr ""
#. module: sale
@@ -2160,7 +2160,7 @@ msgstr "Facturatie gebaseer op leveringen"
#~ msgid "Sale Procurement"
#~ msgstr "Uitlevering verkoop"
-#~ msgid "Configure Sale Order Logistic"
+#~ msgid "Configure Sale Order Logistics"
#~ msgstr "Stel verkooplogistiek in"
#~ msgid "Status"
diff --git a/addons/sale/i18n/nl_BE.po b/addons/sale/i18n/nl_BE.po
index d609b1b857e..6ed2db9718e 100644
--- a/addons/sale/i18n/nl_BE.po
+++ b/addons/sale/i18n/nl_BE.po
@@ -699,7 +699,7 @@ msgstr ""
#. module: sale
#: view:sale.config.picking_policy:0
-msgid "Configure Sale Order Logistic"
+msgid "Configure Sale Order Logistics"
msgstr ""
#. module: sale
diff --git a/addons/sale/i18n/pl.po b/addons/sale/i18n/pl.po
index 757a62a05c4..5d12493e00c 100644
--- a/addons/sale/i18n/pl.po
+++ b/addons/sale/i18n/pl.po
@@ -1496,7 +1496,7 @@ msgstr ""
#. module: sale
#: view:sale.order:0
-msgid "Logistic"
+msgid "Logistics"
msgstr ""
#. module: sale
@@ -2134,7 +2134,7 @@ msgstr "Faktura wg dostaw"
#~ msgid "Sales Process"
#~ msgstr "Proces sprzedaży"
-#~ msgid "Configure Sale Order Logistic"
+#~ msgid "Configure Sale Order Logistics"
#~ msgstr "Konfiguruj ligistykę zamówienia sprzedaży"
#~ msgid "One procurement for each product."
diff --git a/addons/sale/i18n/pt.po b/addons/sale/i18n/pt.po
index 8f1f7b132f8..2d6e3d27de6 100644
--- a/addons/sale/i18n/pt.po
+++ b/addons/sale/i18n/pt.po
@@ -1457,7 +1457,7 @@ msgstr ""
#. module: sale
#: view:sale.order:0
-msgid "Logistic"
+msgid "Logistics"
msgstr ""
#. module: sale
@@ -2208,7 +2208,7 @@ msgstr "Facturar com base na expedição"
#~ msgid "Procurement for each line"
#~ msgstr "Aprovisionamento para cada linha"
-#~ msgid "Configure Sale Order Logistic"
+#~ msgid "Configure Sale Order Logistics"
#~ msgstr "Configurar a logística da ordem de venda"
#~ msgid "Sales Configuration"
diff --git a/addons/sale/i18n/pt_BR.po b/addons/sale/i18n/pt_BR.po
index 6426f08af36..efa5aa93c45 100644
--- a/addons/sale/i18n/pt_BR.po
+++ b/addons/sale/i18n/pt_BR.po
@@ -1559,7 +1559,7 @@ msgstr "Vendas por Representante"
#. module: sale
#: view:sale.order:0
-msgid "Logistic"
+msgid "Logistics"
msgstr "Logistica"
#. module: sale
diff --git a/addons/sale/i18n/ro.po b/addons/sale/i18n/ro.po
index 755529d8146..dd68a487a4e 100644
--- a/addons/sale/i18n/ro.po
+++ b/addons/sale/i18n/ro.po
@@ -1453,7 +1453,7 @@ msgstr ""
#. module: sale
#: view:sale.order:0
-msgid "Logistic"
+msgid "Logistics"
msgstr ""
#. module: sale
diff --git a/addons/sale/i18n/ru.po b/addons/sale/i18n/ru.po
index 46b68f13499..1873236086a 100644
--- a/addons/sale/i18n/ru.po
+++ b/addons/sale/i18n/ru.po
@@ -1528,7 +1528,7 @@ msgstr "Продажи по менеджеру продаж"
#. module: sale
#: view:sale.order:0
-msgid "Logistic"
+msgid "Logistics"
msgstr "Логистика"
#. module: sale
diff --git a/addons/sale/i18n/sale.pot b/addons/sale/i18n/sale.pot
index 785e86fbeed..141edcbba48 100644
--- a/addons/sale/i18n/sale.pot
+++ b/addons/sale/i18n/sale.pot
@@ -1406,7 +1406,7 @@ msgstr ""
#. module: sale
#: view:sale.order:0
-msgid "Logistic"
+msgid "Logistics"
msgstr ""
#. module: sale
diff --git a/addons/sale/i18n/sk.po b/addons/sale/i18n/sk.po
index 759f08e932a..6d460268901 100644
--- a/addons/sale/i18n/sk.po
+++ b/addons/sale/i18n/sk.po
@@ -1454,7 +1454,7 @@ msgstr ""
#. module: sale
#: view:sale.order:0
-msgid "Logistic"
+msgid "Logistics"
msgstr ""
#. module: sale
diff --git a/addons/sale/i18n/sl.po b/addons/sale/i18n/sl.po
index 15f81f76eee..e93421dc470 100644
--- a/addons/sale/i18n/sl.po
+++ b/addons/sale/i18n/sl.po
@@ -1454,7 +1454,7 @@ msgstr ""
#. module: sale
#: view:sale.order:0
-msgid "Logistic"
+msgid "Logistics"
msgstr ""
#. module: sale
diff --git a/addons/sale/i18n/sq.po b/addons/sale/i18n/sq.po
index a677946c53e..1e67a58edfe 100644
--- a/addons/sale/i18n/sq.po
+++ b/addons/sale/i18n/sq.po
@@ -1454,7 +1454,7 @@ msgstr ""
#. module: sale
#: view:sale.order:0
-msgid "Logistic"
+msgid "Logistics"
msgstr ""
#. module: sale
diff --git a/addons/sale/i18n/sr.po b/addons/sale/i18n/sr.po
index 8a1463fb750..d20dfd8cc29 100644
--- a/addons/sale/i18n/sr.po
+++ b/addons/sale/i18n/sr.po
@@ -2303,7 +2303,7 @@ msgstr "Račun na osnovu isporuke"
#~ msgid "Sales Configuration"
#~ msgstr "Konfiguracija prodaje"
-#~ msgid "Configure Sale Order Logistic"
+#~ msgid "Configure Sale Order Logistics"
#~ msgstr "Konfigurisanje logistike naloga za prodaju"
#~ msgid "Status"
diff --git a/addons/sale/i18n/sv.po b/addons/sale/i18n/sv.po
index c4651c9030c..19c99c2e46c 100644
--- a/addons/sale/i18n/sv.po
+++ b/addons/sale/i18n/sv.po
@@ -1456,7 +1456,7 @@ msgstr ""
#. module: sale
#: view:sale.order:0
-msgid "Logistic"
+msgid "Logistics"
msgstr ""
#. module: sale
@@ -2184,7 +2184,7 @@ msgstr "Fakturera utgående ifrån leveranser"
#~ msgid "Procurement for each line"
#~ msgstr "Anskaffning för varje rad"
-#~ msgid "Configure Sale Order Logistic"
+#~ msgid "Configure Sale Order Logistics"
#~ msgstr "Konfigurera kundorder logistik"
#~ msgid "Sale Procurement"
diff --git a/addons/sale/i18n/tlh.po b/addons/sale/i18n/tlh.po
index 91409bfe880..0917dc6147f 100644
--- a/addons/sale/i18n/tlh.po
+++ b/addons/sale/i18n/tlh.po
@@ -1453,7 +1453,7 @@ msgstr ""
#. module: sale
#: view:sale.order:0
-msgid "Logistic"
+msgid "Logistics"
msgstr ""
#. module: sale
diff --git a/addons/sale/i18n/tr.po b/addons/sale/i18n/tr.po
index 0f19f853131..a4aad4e217b 100644
--- a/addons/sale/i18n/tr.po
+++ b/addons/sale/i18n/tr.po
@@ -1455,7 +1455,7 @@ msgstr ""
#. module: sale
#: view:sale.order:0
-msgid "Logistic"
+msgid "Logistics"
msgstr ""
#. module: sale
@@ -2119,7 +2119,7 @@ msgstr "Teslimatlara Bağlı Fatura"
#~ msgid "Sale Procurement"
#~ msgstr "Satış Satınalması"
-#~ msgid "Configure Sale Order Logistic"
+#~ msgid "Configure Sale Order Logistics"
#~ msgstr "Satış Sipariş Lojistiğini Ayarla"
#~ msgid "Status"
diff --git a/addons/sale/i18n/uk.po b/addons/sale/i18n/uk.po
index 4c3f124421e..1ae4fb3fd2a 100644
--- a/addons/sale/i18n/uk.po
+++ b/addons/sale/i18n/uk.po
@@ -1454,7 +1454,7 @@ msgstr ""
#. module: sale
#: view:sale.order:0
-msgid "Logistic"
+msgid "Logistics"
msgstr ""
#. module: sale
diff --git a/addons/sale/i18n/vi.po b/addons/sale/i18n/vi.po
index e5c2e469bf0..26f1909377c 100644
--- a/addons/sale/i18n/vi.po
+++ b/addons/sale/i18n/vi.po
@@ -1464,7 +1464,7 @@ msgstr ""
#. module: sale
#: view:sale.order:0
-msgid "Logistic"
+msgid "Logistics"
msgstr ""
#. module: sale
diff --git a/addons/sale/i18n/zh_CN.po b/addons/sale/i18n/zh_CN.po
index 08519599ba4..514c8c3ece9 100644
--- a/addons/sale/i18n/zh_CN.po
+++ b/addons/sale/i18n/zh_CN.po
@@ -1453,7 +1453,7 @@ msgstr ""
#. module: sale
#: view:sale.order:0
-msgid "Logistic"
+msgid "Logistics"
msgstr ""
#. module: sale
@@ -2220,7 +2220,7 @@ msgstr "发票基于送货单"
#~ msgid "Sale Procurement"
#~ msgstr "销售产品需求"
-#~ msgid "Configure Sale Order Logistic"
+#~ msgid "Configure Sale Order Logistics"
#~ msgstr "设置销售订单逻辑"
#~ msgid "Packing Policy"
diff --git a/addons/sale/i18n/zh_TW.po b/addons/sale/i18n/zh_TW.po
index 46046d713af..4c600190c3d 100644
--- a/addons/sale/i18n/zh_TW.po
+++ b/addons/sale/i18n/zh_TW.po
@@ -1453,7 +1453,7 @@ msgstr ""
#. module: sale
#: view:sale.order:0
-msgid "Logistic"
+msgid "Logistics"
msgstr ""
#. module: sale
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index ec3c390f521..a43b6c0a0f4 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -217,7 +217,7 @@
-
+
@@ -539,7 +539,7 @@
Sales Application Configuration
- Configure Sales Order Logistic
+ Configure Sales Order Logistics
Setup your sales workflow and default values.
diff --git a/addons/sale/stock.py b/addons/sale/stock.py
index f9e0c38494b..c020389ba19 100644
--- a/addons/sale/stock.py
+++ b/addons/sale/stock.py
@@ -69,6 +69,13 @@ class stock_picking(osv.osv):
def _get_price_unit_invoice(self, cursor, user, move_line, type):
if move_line.sale_line_id and move_line.sale_line_id.product_id.id == move_line.product_id.id:
+ from_uom_id = move_line.product_id.uom_id.id
+ to_uom_id = move_line.product_id.uos_id.id
+ price = move_line.sale_line_id.price_unit
+ coeff = move_line.product_id.uos_coeff
+ if from_uom_id != to_uom_id and coeff != 0:
+ price_unit = price / coeff
+ return price_unit
return move_line.sale_line_id.price_unit
return super(stock_picking, self)._get_price_unit_invoice(cursor, user, move_line, type)
diff --git a/addons/sale_mrp/__openerp__.py b/addons/sale_mrp/__openerp__.py
index a8380dcb370..e9eb4cbba92 100644
--- a/addons/sale_mrp/__openerp__.py
+++ b/addons/sale_mrp/__openerp__.py
@@ -35,6 +35,8 @@
'depends': ['mrp', 'sale'],
'init_xml': [],
'update_xml': [
+ 'security/sale_mrp_security.xml',
+ 'security/ir.model.access.csv',
'sale_mrp_view.xml',
],
'demo_xml': [],
diff --git a/addons/sale_mrp/security/ir.model.access.csv b/addons/sale_mrp/security/ir.model.access.csv
new file mode 100644
index 00000000000..90ff5ac06e2
--- /dev/null
+++ b/addons/sale_mrp/security/ir.model.access.csv
@@ -0,0 +1,3 @@
+"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
+"access_mrp_bom_user","mrp.bom","mrp.model_mrp_bom","base.group_sale_salesman",1,0,0,0
+"access_mrp_bom_manager","mrp.bom","mrp.model_mrp_bom","base.group_sale_manager",1,0,0,0
diff --git a/addons/sale_mrp/security/sale_mrp_security.xml b/addons/sale_mrp/security/sale_mrp_security.xml
new file mode 100644
index 00000000000..c0139329d1e
--- /dev/null
+++ b/addons/sale_mrp/security/sale_mrp_security.xml
@@ -0,0 +1,14 @@
+
+
+
+
+
+ Sales / Manager
+
+
+
+ Sales / User
+
+
+
+
diff --git a/addons/share/__openerp__.py b/addons/share/__openerp__.py
index 21b63fd3bc1..43dc7d23d49 100644
--- a/addons/share/__openerp__.py
+++ b/addons/share/__openerp__.py
@@ -41,6 +41,7 @@
""",
'website': 'http://www.openerp.com',
+ 'demo_xml': ['share_demo.xml'],
'data': [
'security/share_security.xml',
'share_view.xml',
diff --git a/addons/share/security/share_security.xml b/addons/share/security/share_security.xml
index 0b2e8c4c1fd..ea27101fd53 100644
--- a/addons/share/security/share_security.xml
+++ b/addons/share/security/share_security.xml
@@ -4,5 +4,6 @@
Sharing / User
+
diff --git a/addons/share/share_demo.xml b/addons/share/share_demo.xml
new file mode 100644
index 00000000000..139c81d4dd3
--- /dev/null
+++ b/addons/share/share_demo.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
diff --git a/addons/stock/board_warehouse_view.xml b/addons/stock/board_warehouse_view.xml
index b073be73575..a4b0054a124 100644
--- a/addons/stock/board_warehouse_view.xml
+++ b/addons/stock/board_warehouse_view.xml
@@ -13,7 +13,7 @@
form
tree,form
[('state','in',('confirmed','assigned')),'|','&',('picking_id','=',False),('location_id.usage', 'in', ['customer','supplier']),'&',('picking_id','!=',False),('picking_id.type','=','in')]
-
+
@@ -23,7 +23,7 @@
form
tree,form
[('state','in',('confirmed','assigned')),'|','&',('picking_id','=',False),('location_dest_id.usage', 'in', ['customer','supplier']),'&',('picking_id','!=',False),('picking_id.type','=','out')]
-
+
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 0c88c12bee7..213873a0480 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -1372,7 +1372,7 @@ class stock_production_lot(osv.osv):
return ids
_columns = {
- 'name': fields.char('Serial Number', size=64, required=True, help="Unique serial number, will be displayed as: PREFIX/SERIAL [INT_REF]"),
+ 'name': fields.char('Production Lot', size=64, required=True, help="Unique production lot, will be displayed as: PREFIX/SERIAL [INT_REF]"),
'ref': fields.char('Internal Reference', size=256, help="Internal reference number in case it differs from the manufacturer's serial number"),
'prefix': fields.char('Prefix', size=64, help="Optional prefix to prepend when displaying this serial number: PREFIX/SERIAL [INT_REF]"),
'product_id': fields.many2one('product.product', 'Product', required=True, domain=[('type', '<>', 'service')]),
diff --git a/addons/stock/stock_demo.xml b/addons/stock/stock_demo.xml
index bdc11f208ca..d21f1523226 100644
--- a/addons/stock/stock_demo.xml
+++ b/addons/stock/stock_demo.xml
@@ -2,6 +2,10 @@
+
+
+
+
diff --git a/addons/stock_location/i18n/ar.po b/addons/stock_location/i18n/ar.po
index 14ac0cec775..15698f0a426 100644
--- a/addons/stock_location/i18n/ar.po
+++ b/addons/stock_location/i18n/ar.po
@@ -29,7 +29,7 @@ msgstr ""
#. module: stock_location
#: view:product.product:0
-msgid "Logistic Flow"
+msgid "Logistics Flow"
msgstr ""
#. module: stock_location
diff --git a/addons/stock_location/i18n/bg.po b/addons/stock_location/i18n/bg.po
index 15c8281003d..6ec712b3543 100644
--- a/addons/stock_location/i18n/bg.po
+++ b/addons/stock_location/i18n/bg.po
@@ -29,7 +29,7 @@ msgstr ""
#. module: stock_location
#: view:product.product:0
-msgid "Logistic Flow"
+msgid "Logistics Flow"
msgstr ""
#. module: stock_location
diff --git a/addons/stock_location/i18n/bs.po b/addons/stock_location/i18n/bs.po
index d0af6268488..367c11ed5a8 100644
--- a/addons/stock_location/i18n/bs.po
+++ b/addons/stock_location/i18n/bs.po
@@ -29,7 +29,7 @@ msgstr ""
#. module: stock_location
#: view:product.product:0
-msgid "Logistic Flow"
+msgid "Logistics Flow"
msgstr ""
#. module: stock_location
diff --git a/addons/stock_location/i18n/ca.po b/addons/stock_location/i18n/ca.po
index d94921bda61..52ca8cb951f 100644
--- a/addons/stock_location/i18n/ca.po
+++ b/addons/stock_location/i18n/ca.po
@@ -29,7 +29,7 @@ msgstr ""
#. module: stock_location
#: view:product.product:0
-msgid "Logistic Flow"
+msgid "Logistics Flow"
msgstr ""
#. module: stock_location
diff --git a/addons/stock_location/i18n/cs.po b/addons/stock_location/i18n/cs.po
index 73b5d31b105..81ee1068653 100644
--- a/addons/stock_location/i18n/cs.po
+++ b/addons/stock_location/i18n/cs.po
@@ -29,7 +29,7 @@ msgstr ""
#. module: stock_location
#: view:product.product:0
-msgid "Logistic Flow"
+msgid "Logistics Flow"
msgstr ""
#. module: stock_location
diff --git a/addons/stock_location/i18n/el.po b/addons/stock_location/i18n/el.po
index 114381592f7..b1d01d5094c 100644
--- a/addons/stock_location/i18n/el.po
+++ b/addons/stock_location/i18n/el.po
@@ -32,7 +32,7 @@ msgstr ""
#. module: stock_location
#: view:product.product:0
-msgid "Logistic Flow"
+msgid "Logistics Flow"
msgstr ""
#. module: stock_location
diff --git a/addons/stock_location/i18n/es_AR.po b/addons/stock_location/i18n/es_AR.po
index c5d219a9823..860b97ff6ae 100644
--- a/addons/stock_location/i18n/es_AR.po
+++ b/addons/stock_location/i18n/es_AR.po
@@ -29,7 +29,7 @@ msgstr ""
#. module: stock_location
#: view:product.product:0
-msgid "Logistic Flow"
+msgid "Logistics Flow"
msgstr ""
#. module: stock_location
diff --git a/addons/stock_location/i18n/et.po b/addons/stock_location/i18n/et.po
index 5e68ccc2368..3828b0588ba 100644
--- a/addons/stock_location/i18n/et.po
+++ b/addons/stock_location/i18n/et.po
@@ -29,7 +29,7 @@ msgstr ""
#. module: stock_location
#: view:product.product:0
-msgid "Logistic Flow"
+msgid "Logistics Flow"
msgstr ""
#. module: stock_location
diff --git a/addons/stock_location/i18n/fr.po b/addons/stock_location/i18n/fr.po
index acb531a5549..dbe0d998994 100644
--- a/addons/stock_location/i18n/fr.po
+++ b/addons/stock_location/i18n/fr.po
@@ -29,7 +29,7 @@ msgstr ""
#. module: stock_location
#: view:product.product:0
-msgid "Logistic Flow"
+msgid "Logistics Flow"
msgstr ""
#. module: stock_location
diff --git a/addons/stock_location/i18n/hr.po b/addons/stock_location/i18n/hr.po
index 9e6e18715b2..9a67e1fe2fb 100644
--- a/addons/stock_location/i18n/hr.po
+++ b/addons/stock_location/i18n/hr.po
@@ -29,7 +29,7 @@ msgstr ""
#. module: stock_location
#: view:product.product:0
-msgid "Logistic Flow"
+msgid "Logistics Flow"
msgstr ""
#. module: stock_location
diff --git a/addons/stock_location/i18n/hu.po b/addons/stock_location/i18n/hu.po
index 83b3624675d..c48382d3f8a 100644
--- a/addons/stock_location/i18n/hu.po
+++ b/addons/stock_location/i18n/hu.po
@@ -29,7 +29,7 @@ msgstr ""
#. module: stock_location
#: view:product.product:0
-msgid "Logistic Flow"
+msgid "Logistics Flow"
msgstr ""
#. module: stock_location
diff --git a/addons/stock_location/i18n/id.po b/addons/stock_location/i18n/id.po
index 3888e97469a..30ea2eaf696 100644
--- a/addons/stock_location/i18n/id.po
+++ b/addons/stock_location/i18n/id.po
@@ -29,7 +29,7 @@ msgstr ""
#. module: stock_location
#: view:product.product:0
-msgid "Logistic Flow"
+msgid "Logistics Flow"
msgstr ""
#. module: stock_location
diff --git a/addons/stock_location/i18n/it.po b/addons/stock_location/i18n/it.po
index 3c138fc8622..ead3d8468ee 100644
--- a/addons/stock_location/i18n/it.po
+++ b/addons/stock_location/i18n/it.po
@@ -29,7 +29,7 @@ msgstr ""
#. module: stock_location
#: view:product.product:0
-msgid "Logistic Flow"
+msgid "Logistics Flow"
msgstr ""
#. module: stock_location
diff --git a/addons/stock_location/i18n/ko.po b/addons/stock_location/i18n/ko.po
index 64a5936c3a6..c98327842df 100644
--- a/addons/stock_location/i18n/ko.po
+++ b/addons/stock_location/i18n/ko.po
@@ -30,7 +30,7 @@ msgstr ""
#. module: stock_location
#: view:product.product:0
-msgid "Logistic Flow"
+msgid "Logistics Flow"
msgstr ""
#. module: stock_location
diff --git a/addons/stock_location/i18n/lt.po b/addons/stock_location/i18n/lt.po
index e1eaa398c2c..7761ac5fb80 100644
--- a/addons/stock_location/i18n/lt.po
+++ b/addons/stock_location/i18n/lt.po
@@ -29,7 +29,7 @@ msgstr ""
#. module: stock_location
#: view:product.product:0
-msgid "Logistic Flow"
+msgid "Logistics Flow"
msgstr ""
#. module: stock_location
diff --git a/addons/stock_location/i18n/mn.po b/addons/stock_location/i18n/mn.po
index aa677c23cd8..a6b2c29c243 100644
--- a/addons/stock_location/i18n/mn.po
+++ b/addons/stock_location/i18n/mn.po
@@ -30,7 +30,7 @@ msgstr ""
#. module: stock_location
#: view:product.product:0
-msgid "Logistic Flow"
+msgid "Logistics Flow"
msgstr ""
#. module: stock_location
diff --git a/addons/stock_location/i18n/nl.po b/addons/stock_location/i18n/nl.po
index 6ddc0f1b92d..d5da8405080 100644
--- a/addons/stock_location/i18n/nl.po
+++ b/addons/stock_location/i18n/nl.po
@@ -29,7 +29,7 @@ msgstr ""
#. module: stock_location
#: view:product.product:0
-msgid "Logistic Flow"
+msgid "Logistics Flow"
msgstr ""
#. module: stock_location
diff --git a/addons/stock_location/i18n/nl_BE.po b/addons/stock_location/i18n/nl_BE.po
index 401207e5cae..3c0dcd42c34 100644
--- a/addons/stock_location/i18n/nl_BE.po
+++ b/addons/stock_location/i18n/nl_BE.po
@@ -29,7 +29,7 @@ msgstr ""
#. module: stock_location
#: view:product.product:0
-msgid "Logistic Flow"
+msgid "Logistics Flow"
msgstr ""
#. module: stock_location
diff --git a/addons/stock_location/i18n/pl.po b/addons/stock_location/i18n/pl.po
index 0ee1d85550c..dd1d98a7e07 100644
--- a/addons/stock_location/i18n/pl.po
+++ b/addons/stock_location/i18n/pl.po
@@ -29,7 +29,7 @@ msgstr ""
#. module: stock_location
#: view:product.product:0
-msgid "Logistic Flow"
+msgid "Logistics Flow"
msgstr ""
#. module: stock_location
diff --git a/addons/stock_location/i18n/pt.po b/addons/stock_location/i18n/pt.po
index cdc303372d4..2eee9cb5b4a 100644
--- a/addons/stock_location/i18n/pt.po
+++ b/addons/stock_location/i18n/pt.po
@@ -29,7 +29,7 @@ msgstr ""
#. module: stock_location
#: view:product.product:0
-msgid "Logistic Flow"
+msgid "Logistics Flow"
msgstr ""
#. module: stock_location
diff --git a/addons/stock_location/i18n/pt_BR.po b/addons/stock_location/i18n/pt_BR.po
index 1f6ae3bd5b4..ffa9708416d 100644
--- a/addons/stock_location/i18n/pt_BR.po
+++ b/addons/stock_location/i18n/pt_BR.po
@@ -29,7 +29,7 @@ msgstr ""
#. module: stock_location
#: view:product.product:0
-msgid "Logistic Flow"
+msgid "Logistics Flow"
msgstr ""
#. module: stock_location
diff --git a/addons/stock_location/i18n/ro.po b/addons/stock_location/i18n/ro.po
index e45ec906169..402edbad361 100644
--- a/addons/stock_location/i18n/ro.po
+++ b/addons/stock_location/i18n/ro.po
@@ -29,7 +29,7 @@ msgstr ""
#. module: stock_location
#: view:product.product:0
-msgid "Logistic Flow"
+msgid "Logistics Flow"
msgstr ""
#. module: stock_location
diff --git a/addons/stock_location/i18n/ru.po b/addons/stock_location/i18n/ru.po
index 38709513ee1..2c2aa9d2a4f 100644
--- a/addons/stock_location/i18n/ru.po
+++ b/addons/stock_location/i18n/ru.po
@@ -29,7 +29,7 @@ msgstr "Входящие пути"
#. module: stock_location
#: view:product.product:0
-msgid "Logistic Flow"
+msgid "Logistics Flow"
msgstr "Товарно-транспортный поток"
#. module: stock_location
diff --git a/addons/stock_location/i18n/sl.po b/addons/stock_location/i18n/sl.po
index a0de701f1b4..3c480360a69 100644
--- a/addons/stock_location/i18n/sl.po
+++ b/addons/stock_location/i18n/sl.po
@@ -29,7 +29,7 @@ msgstr ""
#. module: stock_location
#: view:product.product:0
-msgid "Logistic Flow"
+msgid "Logistics Flow"
msgstr ""
#. module: stock_location
diff --git a/addons/stock_location/i18n/sq.po b/addons/stock_location/i18n/sq.po
index 511a0d9333f..bb3d33c55e9 100644
--- a/addons/stock_location/i18n/sq.po
+++ b/addons/stock_location/i18n/sq.po
@@ -30,7 +30,7 @@ msgstr ""
#. module: stock_location
#: view:product.product:0
-msgid "Logistic Flow"
+msgid "Logistics Flow"
msgstr ""
#. module: stock_location
diff --git a/addons/stock_location/i18n/stock_location.pot b/addons/stock_location/i18n/stock_location.pot
index ee05acde904..e00389b4c88 100644
--- a/addons/stock_location/i18n/stock_location.pot
+++ b/addons/stock_location/i18n/stock_location.pot
@@ -28,7 +28,7 @@ msgstr ""
#. module: stock_location
#: view:product.product:0
-msgid "Logistic Flow"
+msgid "Logistics Flow"
msgstr ""
#. module: stock_location
diff --git a/addons/stock_location/i18n/sv.po b/addons/stock_location/i18n/sv.po
index 62f737a30d5..5bd2f34576d 100644
--- a/addons/stock_location/i18n/sv.po
+++ b/addons/stock_location/i18n/sv.po
@@ -29,7 +29,7 @@ msgstr ""
#. module: stock_location
#: view:product.product:0
-msgid "Logistic Flow"
+msgid "Logistics Flow"
msgstr ""
#. module: stock_location
diff --git a/addons/stock_location/i18n/tlh.po b/addons/stock_location/i18n/tlh.po
index bc570c3c26f..aeddaabb045 100644
--- a/addons/stock_location/i18n/tlh.po
+++ b/addons/stock_location/i18n/tlh.po
@@ -29,7 +29,7 @@ msgstr ""
#. module: stock_location
#: view:product.product:0
-msgid "Logistic Flow"
+msgid "Logistics Flow"
msgstr ""
#. module: stock_location
diff --git a/addons/stock_location/i18n/tr.po b/addons/stock_location/i18n/tr.po
index 508a5b7cbb0..24073d880f5 100644
--- a/addons/stock_location/i18n/tr.po
+++ b/addons/stock_location/i18n/tr.po
@@ -29,7 +29,7 @@ msgstr ""
#. module: stock_location
#: view:product.product:0
-msgid "Logistic Flow"
+msgid "Logistics Flow"
msgstr ""
#. module: stock_location
diff --git a/addons/stock_location/i18n/uk.po b/addons/stock_location/i18n/uk.po
index 20ecf89146e..72391f54656 100644
--- a/addons/stock_location/i18n/uk.po
+++ b/addons/stock_location/i18n/uk.po
@@ -29,7 +29,7 @@ msgstr ""
#. module: stock_location
#: view:product.product:0
-msgid "Logistic Flow"
+msgid "Logistics Flow"
msgstr ""
#. module: stock_location
diff --git a/addons/stock_location/i18n/vi.po b/addons/stock_location/i18n/vi.po
index 69a82695333..f43399b2b34 100644
--- a/addons/stock_location/i18n/vi.po
+++ b/addons/stock_location/i18n/vi.po
@@ -30,7 +30,7 @@ msgstr ""
#. module: stock_location
#: view:product.product:0
-msgid "Logistic Flow"
+msgid "Logistics Flow"
msgstr ""
#. module: stock_location
diff --git a/addons/stock_location/i18n/zh_CN.po b/addons/stock_location/i18n/zh_CN.po
index d3b8a52102f..913ddd1dcf1 100644
--- a/addons/stock_location/i18n/zh_CN.po
+++ b/addons/stock_location/i18n/zh_CN.po
@@ -29,7 +29,7 @@ msgstr ""
#. module: stock_location
#: view:product.product:0
-msgid "Logistic Flow"
+msgid "Logistics Flow"
msgstr ""
#. module: stock_location
diff --git a/addons/stock_location/i18n/zh_TW.po b/addons/stock_location/i18n/zh_TW.po
index 9369bea9bfb..f04da49edd0 100644
--- a/addons/stock_location/i18n/zh_TW.po
+++ b/addons/stock_location/i18n/zh_TW.po
@@ -29,7 +29,7 @@ msgstr ""
#. module: stock_location
#: view:product.product:0
-msgid "Logistic Flow"
+msgid "Logistics Flow"
msgstr ""
#. module: stock_location
diff --git a/addons/stock_location/stock_location_view.xml b/addons/stock_location/stock_location_view.xml
index 3d08d48034e..24816e9fa1c 100644
--- a/addons/stock_location/stock_location_view.xml
+++ b/addons/stock_location/stock_location_view.xml
@@ -40,7 +40,7 @@
-
+
diff --git a/addons/subscription/security/subcription_security.xml b/addons/subscription/security/subcription_security.xml
index 0014f38182b..70c648380d5 100644
--- a/addons/subscription/security/subcription_security.xml
+++ b/addons/subscription/security/subcription_security.xml
@@ -8,6 +8,6 @@
Tools / User
-
+
diff --git a/addons/subscription/subscription_demo.xml b/addons/subscription/subscription_demo.xml
index bb8d61ef4b0..6f26cfde14d 100644
--- a/addons/subscription/subscription_demo.xml
+++ b/addons/subscription/subscription_demo.xml
@@ -1,6 +1,10 @@
+
+
+
+
diff --git a/addons/survey/survey_demo.xml b/addons/survey/survey_demo.xml
index 56e20746ac2..9f0ba5f5326 100644
--- a/addons/survey/survey_demo.xml
+++ b/addons/survey/survey_demo.xml
@@ -1,9 +1,11 @@
+
-
+
+
Human Resources
Human Resources
diff --git a/addons/wiki/__openerp__.py b/addons/wiki/__openerp__.py
index f16347c4da9..5fb7b86b66b 100644
--- a/addons/wiki/__openerp__.py
+++ b/addons/wiki/__openerp__.py
@@ -44,7 +44,7 @@ keep track for the wiki groups, pages, and history
'security/wiki_security.xml',
'security/ir.model.access.csv'
],
- 'demo_xml': [],
+ 'demo_xml': ['wiki_demo.xml'],
'test': ['test/wiki_test00.yml'],
'installable': True,
'active': False,
diff --git a/addons/wiki/security/wiki_security.xml b/addons/wiki/security/wiki_security.xml
index 934d7a607ee..98a8c03c177 100644
--- a/addons/wiki/security/wiki_security.xml
+++ b/addons/wiki/security/wiki_security.xml
@@ -11,6 +11,6 @@
Knowledge / User
-
+
diff --git a/addons/wiki/wiki_demo.xml b/addons/wiki/wiki_demo.xml
new file mode 100644
index 00000000000..66cd6c74c18
--- /dev/null
+++ b/addons/wiki/wiki_demo.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
\ No newline at end of file