openerp-dev-web team mailing list archive

["aag\(OpenERP\)" <aag@xxxxxxxxxxx>]

aag(OpenERP) has proposed merging lp:~openerp-commiter/openobject-addons/trunk-addons-aag into lp:~openerp-dev/openobject-addons/trunk-dev-addons2.

Requested reviews:
  OpenERP R&D Team (openerp-dev)
Related bugs:
  #665052 "Logistics" not "Logistic"
  https://bugs.launchpad.net/bugs/665052
  #668378 invoice from packing wrong price/unit if product has uos
  https://bugs.launchpad.net/bugs/668378


purhcase improvments :Warehouse dashboard: Task id:1774
[IMP] IN ALL: the demo user should be in all applications name user groups, Task id: 1771
-- 
https://code.launchpad.net/~openerp-commiter/openobject-addons/trunk-addons-aag/+merge/40962
Your team OpenERP R&D Team is requested to review the proposed merge of lp:~openerp-commiter/openobject-addons/trunk-addons-aag into lp:~openerp-dev/openobject-addons/trunk-dev-addons2.

=== modified file 'auction/security/auction_security.xml'
--- auction/security/auction_security.xml	2010-10-06 12:05:48 +0000
+++ auction/security/auction_security.xml	2010-11-16 14:05:36 +0000
@@ -8,6 +8,9 @@
     <record id="group_auction_user" model="res.groups">
         <field name="name">Auction / User</field>
     </record>
+    <record id="base.user_demo" model="res.users">
+        <field eval="[(4, ref('group_auction_user'))]" name="groups_id"/>
+    </record>
     
 </data>
 </openerp>
\ No newline at end of file

=== modified file 'base_contact/security/base_contact_security.xml'
--- base_contact/security/base_contact_security.xml	2010-08-09 06:02:26 +0000
+++ base_contact/security/base_contact_security.xml	2010-11-16 14:05:36 +0000
@@ -5,9 +5,14 @@
     <record id="base.group_sale_salesman" model="res.groups">
         <field name="name">Sales / User</field>
     </record>
+    
+    <record id="base.user_demo" model="res.users">
+        <field eval="[(4, ref('base.group_sale_salesman'))]" name="groups_id"/>
+    </record>
 
     <record id="base.group_sale_manager" model="res.groups">
         <field name="name">Sales / Manager</field>
     </record>
+    
 </data>
 </openerp>

=== modified file 'board/security/board_security.xml'
--- board/security/board_security.xml	2010-08-09 06:02:26 +0000
+++ board/security/board_security.xml	2010-11-16 14:05:36 +0000
@@ -5,6 +5,10 @@
     <record id="base.group_sale_salesman" model="res.groups">
         <field name="name">Sales / User</field>
     </record>
+    
+    <record id="base.user_demo" model="res.users">
+        <field eval="[(4, ref('base.group_sale_salesman'))]" name="groups_id"/>
+    </record>
 
 </data>
 </openerp>

=== modified file 'crm/security/crm_security.xml'
--- crm/security/crm_security.xml	2010-11-14 13:48:21 +0000
+++ crm/security/crm_security.xml	2010-11-16 14:05:36 +0000
@@ -9,6 +9,10 @@
     <record id="base.group_sale_salesman" model="res.groups">
         <field name="name">Sales / User</field>
     </record>
+    
+    <record id="base.user_demo" model="res.users">
+        <field eval="[(4, ref('base.group_sale_salesman'))]" name="groups_id"/>
+    </record>
 
     <record id="base.group_sale_salesman_all_leads" model="res.groups">
         <field name="name">Sales / User - See All Leads</field>

=== modified file 'delivery/delivery_view.xml'
--- delivery/delivery_view.xml	2010-10-17 11:59:01 +0000
+++ delivery/delivery_view.xml	2010-11-16 14:05:36 +0000
@@ -128,7 +128,7 @@
             <field name="model">sale.order</field>
             <field name="inherit_id" ref="sale.view_order_form"/>
             <field name="arch" type="xml">
-                <group name="logistic" position="inside">
+                <group name="logistics" position="inside">
                     <field name="id" invisible="True"/>
                     <field name="carrier_id" context="{'order_id':active_id}"/>
                 </group>

=== modified file 'document/security/document_security.xml'
--- document/security/document_security.xml	2010-11-04 15:44:46 +0000
+++ document/security/document_security.xml	2010-11-16 14:05:36 +0000
@@ -5,6 +5,10 @@
     <record id="base.group_document_user" model="res.groups">
         <field name="name">Knowledge / User</field>
     </record>
+    
+    <record id="base.user_demo" model="res.users">
+        <field eval="[(4, ref('base.group_document_user'))]" name="groups_id"/>
+    </record>
 
 <!--    <record id="group_document_manager" model="res.groups">-->
 <!--        <field name="name">Document / Manager</field>-->

=== modified file 'email_template/email_template_account.py'
--- email_template/email_template_account.py	2010-09-13 00:43:42 +0000
+++ email_template/email_template_account.py	2010-11-16 14:05:36 +0000
@@ -372,7 +372,7 @@
                 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):
         """

=== modified file 'email_template/email_template_account_view.xml'
--- email_template/email_template_account_view.xml	2010-10-16 16:47:09 +0000
+++ email_template/email_template_account_view.xml	2010-11-16 14:05:36 +0000
@@ -3,7 +3,7 @@
     <data>
 
         <menuitem name="Marketing" icon="terp-crm" id="base.marketing_menu" sequence="17"
-            groups="marketing.group_marketing_user"/>
+            groups="marketing.group_marketing_user,marketing.group_marketing_manager"/>
         <menuitem name="Emails" id="base.menu_emails" parent="base.marketing_menu" sequence="5"/>
         <menuitem name="Email Template" id="menu_email_template" parent="base.menu_emails"/>
 

=== modified file 'email_template/security/ir.model.access.csv'
--- email_template/security/ir.model.access.csv	2010-10-16 16:47:09 +0000
+++ email_template/security/ir.model.access.csv	2010-11-16 14:05:36 +0000
@@ -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

=== modified file 'idea/security/idea_security.xml'
--- idea/security/idea_security.xml	2010-11-14 13:48:21 +0000
+++ idea/security/idea_security.xml	2010-11-16 14:05:36 +0000
@@ -8,6 +8,11 @@
    	<record model="res.groups" id="base.group_tool_user">
         	<field name="name">Tools / User</field>
    	</record>
+   	
+   	 <record id="base.user_demo" model="res.users">
+        <field eval="[(4, ref('base.group_tool_user'))]" name="groups_id"/>
+    </record>
+   	
 
 	</data>
 </openerp>

=== modified file 'knowledge/security/knowledge_security.xml'
--- knowledge/security/knowledge_security.xml	2010-11-14 13:48:21 +0000
+++ knowledge/security/knowledge_security.xml	2010-11-16 14:05:36 +0000
@@ -8,6 +8,10 @@
             <record id="base.group_document_user" model="res.groups">
                 <field name="name">Knowledge / User</field>
             </record>
+            
+            <record id="base.user_demo" model="res.users">
+                <field eval="[(4, ref('base.group_document_user'))]" name="groups_id"/>
+            </record>
 
 </data>
 </openerp>

=== modified file 'marketing/marketing_view.xml'
--- marketing/marketing_view.xml	2010-10-16 16:47:09 +0000
+++ marketing/marketing_view.xml	2010-11-16 14:05:36 +0000
@@ -2,7 +2,7 @@
 <openerp>
     <data>
 
-        <menuitem name="Marketing" icon="terp-crm" id="base.marketing_menu" sequence="17" groups="marketing.group_marketing_user"/>
+        <menuitem name="Marketing" icon="terp-crm" id="base.marketing_menu" sequence="17" groups="marketing.group_marketing_user,marketing.group_marketing_manager"/>
 
         <record id="view_marketing_installer" model="ir.ui.view">
             <field name="name">marketing.installer.view</field>

=== modified file 'marketing/security/marketing_security.xml'
--- marketing/security/marketing_security.xml	2010-10-16 16:47:09 +0000
+++ marketing/security/marketing_security.xml	2010-11-16 14:05:36 +0000
@@ -4,5 +4,15 @@
     <record id="marketing.group_marketing_user" model="res.groups">
         <field name="name">Marketing / User</field>
     </record>
+    
+   <record id="base.user_demo" model="res.users">
+        <field eval="[(4, ref('marketing.group_marketing_user'))]" name="groups_id"/>
+   </record>
+    
+    
+    <record id="marketing.group_marketing_manager" model="res.groups">
+        <field name="name">Marketing / Manager</field>
+    </record>
+    
 </data>
 </openerp>

=== modified file 'marketing_campaign/report/campaign_analysis_view.xml'
--- marketing_campaign/report/campaign_analysis_view.xml	2010-10-27 13:08:17 +0000
+++ marketing_campaign/report/campaign_analysis_view.xml	2010-11-16 14:05:36 +0000
@@ -11,6 +11,7 @@
                 <field name="month" invisible="1"/>
                 <field name="day" invisible="1"/>
                 <field name="date" invisible="1"/>
+                <field name="state" invisible="1"/>
                 <field name="campaign_id" invisible="1"/>
                 <field name="activity_id" invisible="1"/>
                 <field name="segment_id" invisible="1"/>

=== modified file 'marketing_campaign/security/ir.model.access.csv'
--- marketing_campaign/security/ir.model.access.csv	2010-10-16 16:47:09 +0000
+++ marketing_campaign/security/ir.model.access.csv	2010-11-16 14:05:36 +0000
@@ -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

=== modified file 'mrp/i18n/ca.po'
--- mrp/i18n/ca.po	2010-10-31 05:05:24 +0000
+++ mrp/i18n/ca.po	2010-11-16 14:05:36 +0000
@@ -2270,7 +2270,7 @@
 #~ msgid "Product & Location"
 #~ msgstr "Producte & Ubicació"
 
-#~ msgid "MRP & Logistic Scheduler"
+#~ msgid "MRP & Logistics Scheduler"
 #~ msgstr "Planificador MRP & Logística"
 
 #~ msgid ""

=== modified file 'mrp/i18n/de.po'
--- mrp/i18n/de.po	2010-11-10 05:03:50 +0000
+++ mrp/i18n/de.po	2010-11-16 14:05:36 +0000
@@ -2391,7 +2391,7 @@
 #~ msgid "Product & Location"
 #~ msgstr "Produkt & Lagerort"
 
-#~ msgid "MRP & Logistic Scheduler"
+#~ msgid "MRP & Logistics Scheduler"
 #~ msgstr "Fertigungs- und Beschaffungsplanung"
 
 #~ msgid ""

=== modified file 'mrp/i18n/el.po'
--- mrp/i18n/el.po	2010-10-30 05:55:00 +0000
+++ mrp/i18n/el.po	2010-11-16 14:05:36 +0000
@@ -2354,7 +2354,7 @@
 #~ msgid "Best price (not yet active!)"
 #~ msgstr "Best price (not yet active!)"
 
-#~ msgid "MRP & Logistic Scheduler"
+#~ msgid "MRP & Logistics Scheduler"
 #~ msgstr "MRP & Προγραμματισμός Προμηθειών"
 
 #~ msgid ""

=== modified file 'mrp/i18n/es.po'
--- mrp/i18n/es.po	2010-11-15 05:03:15 +0000
+++ mrp/i18n/es.po	2010-11-16 14:05:36 +0000
@@ -2380,7 +2380,7 @@
 #~ msgid "Product & Location"
 #~ msgstr "Producto & Ubicación"
 
-#~ msgid "MRP & Logistic Scheduler"
+#~ msgid "MRP & Logistics Scheduler"
 #~ msgstr "Planificador MRP & Logística"
 
 #~ msgid ""

=== modified file 'mrp/i18n/fi.po'
--- mrp/i18n/fi.po	2010-10-31 05:05:24 +0000
+++ mrp/i18n/fi.po	2010-11-16 14:05:36 +0000
@@ -2385,7 +2385,7 @@
 #~ "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."

=== modified file 'mrp/i18n/it.po'
--- mrp/i18n/it.po	2010-10-31 05:05:24 +0000
+++ mrp/i18n/it.po	2010-11-16 14:05:36 +0000
@@ -2501,7 +2501,7 @@
 #~ "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"

=== modified file 'mrp/i18n/ko.po'
--- mrp/i18n/ko.po	2010-11-06 04:53:16 +0000
+++ mrp/i18n/ko.po	2010-11-16 14:05:36 +0000
@@ -2246,7 +2246,7 @@
 #~ msgid "Product name"
 #~ msgstr "ì œí’ˆ 이름"
 
-#~ msgid "MRP & Logistic Scheduler"
+#~ msgid "MRP & Logistics Scheduler"
 #~ msgstr "MRP 및 물류 스케줄러"
 
 #~ msgid "Ask New Products"

=== modified file 'mrp/i18n/nl.po'
--- mrp/i18n/nl.po	2010-10-31 05:05:24 +0000
+++ mrp/i18n/nl.po	2010-11-16 14:05:36 +0000
@@ -2464,7 +2464,7 @@
 #~ "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"

=== modified file 'mrp/i18n/pl.po'
--- mrp/i18n/pl.po	2010-11-06 04:53:16 +0000
+++ mrp/i18n/pl.po	2010-11-16 14:05:36 +0000
@@ -2283,7 +2283,7 @@
 #~ msgid "Origin"
 #~ msgstr "Pochodzenie"
 
-#~ msgid "MRP & Logistic Scheduler"
+#~ msgid "MRP & Logistics Scheduler"
 #~ msgstr "MRP i planowanie logistyczne"
 
 #~ msgid "Product & Location"

=== modified file 'mrp/i18n/pt.po'
--- mrp/i18n/pt.po	2010-10-30 05:55:00 +0000
+++ mrp/i18n/pt.po	2010-11-16 14:05:36 +0000
@@ -2500,7 +2500,7 @@
 #~ "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"

=== modified file 'mrp/i18n/ru.po'
--- mrp/i18n/ru.po	2010-10-30 05:55:00 +0000
+++ mrp/i18n/ru.po	2010-11-16 14:05:36 +0000
@@ -2400,7 +2400,7 @@
 #~ msgid "Exceptions Procurements"
 #~ msgstr "Исключения поставок"
 
-#~ msgid "MRP & Logistic Scheduler"
+#~ msgid "MRP & Logistics Scheduler"
 #~ msgstr "ПМР и Логистическое планирование"
 
 #~ msgid "Stockable Stock"

=== modified file 'mrp/i18n/sk.po'
--- mrp/i18n/sk.po	2010-10-30 05:55:00 +0000
+++ mrp/i18n/sk.po	2010-11-16 14:05:36 +0000
@@ -2230,7 +2230,7 @@
 #~ 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"

=== modified file 'mrp/i18n/tr.po'
--- mrp/i18n/tr.po	2010-10-30 05:55:00 +0000
+++ mrp/i18n/tr.po	2010-11-16 14:05:36 +0000
@@ -2241,7 +2241,7 @@
 #~ msgid "Product & Location"
 #~ msgstr "Ürün & Lokasyon Bilgisi"
 
-#~ msgid "MRP & Logistic Scheduler"
+#~ msgid "MRP & Logistics Scheduler"
 #~ msgstr "MRP & Lojistik Planlaması"
 
 #~ msgid "Ask New Products"

=== modified file 'mrp/i18n/zh_CN.po'
--- mrp/i18n/zh_CN.po	2010-10-31 05:05:24 +0000
+++ mrp/i18n/zh_CN.po	2010-11-16 14:05:36 +0000
@@ -2544,7 +2544,7 @@
 #~ msgid "Product & Location"
 #~ msgstr "产品&库位"
 
-#~ msgid "MRP & Logistic Scheduler"
+#~ msgid "MRP & Logistics Scheduler"
 #~ msgstr "MRP&物流调度"
 
 #~ msgid ""

=== modified file 'mrp/i18n/zh_HK.po'
--- mrp/i18n/zh_HK.po	2010-10-30 05:55:00 +0000
+++ mrp/i18n/zh_HK.po	2010-11-16 14:05:36 +0000
@@ -2255,7 +2255,7 @@
 #~ "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"

=== modified file 'mrp/i18n/zh_TW.po'
--- mrp/i18n/zh_TW.po	2010-10-30 05:55:00 +0000
+++ mrp/i18n/zh_TW.po	2010-11-16 14:05:36 +0000
@@ -2251,7 +2251,7 @@
 #~ "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"

=== modified file 'mrp/security/mrp_security.xml'
--- mrp/security/mrp_security.xml	2010-10-18 09:28:40 +0000
+++ mrp/security/mrp_security.xml	2010-11-16 14:05:36 +0000
@@ -8,6 +8,15 @@
     <record id="group_mrp_user" model="res.groups">
         <field name="name">Manufacturing / User</field>
     </record>
+    
+    <record id="base.user_demo" model="res.users">
+        <field eval="[(4, ref('group_mrp_user'))]" name="groups_id"/>
+    </record>
+    
+    
+    <record id="base.user_demo" model="res.users">
+        <field eval="[(4, ref('group_mrp_user'))]" name="groups_id"/>
+    </record>
 
 
     <!-- restrict access to menu -->

=== modified file 'procurement/company_view.xml'
--- procurement/company_view.xml	2010-09-06 09:49:34 +0000
+++ procurement/company_view.xml	2010-11-16 14:05:36 +0000
@@ -10,7 +10,7 @@
             <field name="inherit_id" ref="base.view_company_form"/>
             <field name="arch" type="xml">
                 <page string="Configuration" position="inside">
-                    <separator string="MRP &amp; Logistic Scheduler" colspan="4"/>
+                    <separator string="MRP &amp; Logistics Scheduler" colspan="4"/>
                     <field name="schedule_range"/>
                 </page>
             </field>

=== modified file 'procurement/i18n/en_US.po'
--- procurement/i18n/en_US.po	2010-08-23 06:26:09 +0000
+++ procurement/i18n/en_US.po	2010-11-16 14:05:36 +0000
@@ -314,8 +314,8 @@
 
 #. 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

=== modified file 'procurement/i18n/fr.po'
--- procurement/i18n/fr.po	2010-10-30 05:55:00 +0000
+++ procurement/i18n/fr.po	2010-11-16 14:05:36 +0000
@@ -324,7 +324,7 @@
 
 #. module: procurement
 #: view:res.company:0
-msgid "MRP & Logistic Scheduler"
+msgid "MRP & Logistics Scheduler"
 msgstr ""
 
 #. module: procurement

=== modified file 'procurement/i18n/it.po'
--- procurement/i18n/it.po	2010-11-11 04:47:01 +0000
+++ procurement/i18n/it.po	2010-11-16 14:05:36 +0000
@@ -325,7 +325,7 @@
 
 #. module: procurement
 #: view:res.company:0
-msgid "MRP & Logistic Scheduler"
+msgid "MRP & Logistics Scheduler"
 msgstr ""
 
 #. module: procurement

=== modified file 'procurement/i18n/mn.po'
--- procurement/i18n/mn.po	2010-10-30 05:55:00 +0000
+++ procurement/i18n/mn.po	2010-11-16 14:05:36 +0000
@@ -342,7 +342,7 @@
 
 #. module: procurement
 #: view:res.company:0
-msgid "MRP & Logistic Scheduler"
+msgid "MRP & Logistics Scheduler"
 msgstr "Үйлдвэрлэл & Логистик"
 
 #. module: procurement

=== modified file 'procurement/i18n/nl.po'
--- procurement/i18n/nl.po	2010-10-30 05:55:00 +0000
+++ procurement/i18n/nl.po	2010-11-16 14:05:36 +0000
@@ -325,7 +325,7 @@
 
 #. module: procurement
 #: view:res.company:0
-msgid "MRP & Logistic Scheduler"
+msgid "MRP & Logistics Scheduler"
 msgstr ""
 
 #. module: procurement

=== modified file 'procurement/i18n/pl.po'
--- procurement/i18n/pl.po	2010-10-30 05:55:00 +0000
+++ procurement/i18n/pl.po	2010-11-16 14:05:36 +0000
@@ -344,7 +344,7 @@
 
 #. module: procurement
 #: view:res.company:0
-msgid "MRP & Logistic Scheduler"
+msgid "MRP & Logistics Scheduler"
 msgstr "MRP i planowanie logistyczne"
 
 #. module: procurement

=== modified file 'procurement/i18n/procurement.pot'
--- procurement/i18n/procurement.pot	2010-10-18 17:59:39 +0000
+++ procurement/i18n/procurement.pot	2010-11-16 14:05:36 +0000
@@ -312,7 +312,7 @@
 
 #. module: procurement
 #: view:res.company:0
-msgid "MRP & Logistic Scheduler"
+msgid "MRP & Logistics Scheduler"
 msgstr ""
 
 #. module: procurement

=== modified file 'procurement/i18n/ru.po'
--- procurement/i18n/ru.po	2010-11-01 05:11:47 +0000
+++ procurement/i18n/ru.po	2010-11-16 14:05:36 +0000
@@ -342,7 +342,7 @@
 
 #. module: procurement
 #: view:res.company:0
-msgid "MRP & Logistic Scheduler"
+msgid "MRP & Logistics Scheduler"
 msgstr "ПМР и Логистическое планирование"
 
 #. module: procurement

=== modified file 'procurement/procurement_view.xml'
--- procurement/procurement_view.xml	2010-10-26 06:08:44 +0000
+++ procurement/procurement_view.xml	2010-11-16 14:05:36 +0000
@@ -262,7 +262,7 @@
             src_model="procurement.order"/>
 
         <!-- Procurements are located in Warehouse menu hierarchy, MRP users should come to Stock application to use it.  -->
-        <menuitem id="menu_stock_sched" name="Schedulers" parent="stock.menu_stock_root" sequence="4" groups="base.group_extended"/>
+        <menuitem id="menu_stock_sched" name="Schedulers" parent="stock.menu_stock_root" sequence="4"/>
             <menuitem action="action_compute_schedulers" id="menu_stock_proc_schedulers" parent="menu_stock_sched" sequence="20" groups="stock.group_stock_manager"/>
             <menuitem action="procurement_exceptions" id="menu_stock_procurement_action" parent="menu_stock_sched" sequence="50" groups="stock.group_stock_manager"/>
         <menuitem id="menu_stock_procurement" name="Automatic Procurements" parent="stock.menu_stock_root" sequence="5" groups="base.group_extended"/>

=== modified file 'product/security/product_security.xml'
--- product/security/product_security.xml	2010-10-17 20:31:19 +0000
+++ product/security/product_security.xml	2010-11-16 14:05:36 +0000
@@ -15,6 +15,10 @@
     <record id="base.group_sale_salesman" model="res.groups">
         <field name="name">Sales / User</field>
     </record>
+    
+     <record id="base.user_demo" model="res.users">
+        <field eval="[(4, ref('base.group_sale_salesman'))]" name="groups_id"/>
+    </record>
 
     <record id="product_comp_rule" model="ir.rule">
         <field name="name" >Product multi-company</field>

=== modified file 'project/security/project_security.xml'
--- project/security/project_security.xml	2010-11-14 13:48:21 +0000
+++ project/security/project_security.xml	2010-11-16 14:05:36 +0000
@@ -13,6 +13,10 @@
     <record id="base.group_sale_salesman" model="res.groups">
         <field name="name">Sales / User</field>
     </record>
+    
+     <record id="base.user_demo" model="res.users">
+        <field eval="[(4, ref('base.group_sale_salesman')),(4, ref('group_project_user'))]" name="groups_id"/>
+    </record>
 
     <record model="ir.ui.menu" id="menu_definitions">
         <field name="groups_id" eval="[(6,0,[ref('group_project_manager')])]"/>

=== modified file 'purchase/board_purchase_view.xml'
--- purchase/board_purchase_view.xml	2010-11-10 07:17:59 +0000
+++ purchase/board_purchase_view.xml	2010-11-16 14:05:36 +0000
@@ -131,7 +131,6 @@
                         </child1>
                         <child2>
                         	<action colspan="4" height="220" name="%(action_purchase_order_monthly_categ_graph)d" string="Monthly Purchase by Category"  />
-                            <action colspan="4" height="220" name="%(action_negotiation_by_supplier)d" string="Negotiation by Supplier"  />
                         <!--
                             <action colspan="4" height="220" name="%(purchase.action_purchase_by_supplier)d" string="Purchase by supplier"  />
                             <action colspan="4" height="220" name="%(purchase.action_total_price_by_product_by_state)d" string="Total price by product by state"  />

=== modified file 'purchase/security/purchase_security.xml'
--- purchase/security/purchase_security.xml	2010-06-29 12:09:26 +0000
+++ purchase/security/purchase_security.xml	2010-11-16 14:05:36 +0000
@@ -8,7 +8,14 @@
     <record id="group_purchase_user" model="res.groups">
         <field name="name">Purchase / User</field>
     </record>
+    
+    <record id="base.user_demo" model="res.users">
+        <field eval="[(4, ref('group_purchase_user'))]" name="groups_id"/>
+    </record>
 
+    <record id="base.user_demo" model="res.users">
+        <field eval="[(4, ref('group_purchase_user'))]" name="groups_id"/>
+    </record>
 
     <record model="ir.rule" id="purchase_order_comp_rule">
         <field name="name">Purchase Order multi-company</field>

=== modified file 'purchase_requisition/security/purchase_tender.xml'
--- purchase_requisition/security/purchase_tender.xml	2010-10-18 09:28:40 +0000
+++ purchase_requisition/security/purchase_tender.xml	2010-11-16 14:05:36 +0000
@@ -5,9 +5,14 @@
     <record id="group_purchase_requisition_manager" model="res.groups">
         <field name="name">Purchase Requisition / Manager</field>
     </record>
+    
     <record id="group_purchase_requisition_user" model="res.groups">
         <field name="name">Purchase Requisition / User</field>
     </record>
+    
+     <record id="base.user_demo" model="res.users">
+        <field eval="[(4, ref('group_purchase_requisition_user'))]" name="groups_id"/>
+    </record>
 
     <record model="ir.rule" id="purchase_requisition_comp_rule">
         <field name="name">Purchase Requisition multi-company</field>

=== modified file 'sale/i18n/ar.po'
--- sale/i18n/ar.po	2010-10-30 05:55:00 +0000
+++ sale/i18n/ar.po	2010-11-16 14:05:36 +0000
@@ -1453,7 +1453,7 @@
 
 #. module: sale
 #: view:sale.order:0
-msgid "Logistic"
+msgid "Logistics"
 msgstr ""
 
 #. module: sale

=== modified file 'sale/i18n/bg.po'
--- sale/i18n/bg.po	2010-10-30 05:55:00 +0000
+++ sale/i18n/bg.po	2010-11-16 14:05:36 +0000
@@ -1460,7 +1460,7 @@
 
 #. module: sale
 #: view:sale.order:0
-msgid "Logistic"
+msgid "Logistics"
 msgstr ""
 
 #. module: sale
@@ -2114,7 +2114,7 @@
 #~ msgid "My sales in shipping exception"
 #~ msgstr "Моите продажби с грешка при доставка"
 
-#~ msgid "Configure Sale Order Logistic"
+#~ msgid "Configure Sale Order Logistics"
 #~ msgstr "Конфигуриране на реда на доставка при продажба"
 
 #~ msgid "Sales Configuration"

=== modified file 'sale/i18n/bs.po'
--- sale/i18n/bs.po	2010-10-30 05:55:00 +0000
+++ sale/i18n/bs.po	2010-11-16 14:05:36 +0000
@@ -1457,7 +1457,7 @@
 
 #. module: sale
 #: view:sale.order:0
-msgid "Logistic"
+msgid "Logistics"
 msgstr ""
 
 #. module: sale
@@ -2215,7 +2215,7 @@
 #~ "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"

=== modified file 'sale/i18n/ca.po'
--- sale/i18n/ca.po	2010-10-31 05:05:24 +0000
+++ sale/i18n/ca.po	2010-11-16 14:05:36 +0000
@@ -1465,7 +1465,7 @@
 
 #. module: sale
 #: view:sale.order:0
-msgid "Logistic"
+msgid "Logistics"
 msgstr ""
 
 #. module: sale
@@ -2038,7 +2038,7 @@
 #~ 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 !"

=== modified file 'sale/i18n/cs.po'
--- sale/i18n/cs.po	2010-10-30 05:55:00 +0000
+++ sale/i18n/cs.po	2010-11-16 14:05:36 +0000
@@ -1453,7 +1453,7 @@
 
 #. module: sale
 #: view:sale.order:0
-msgid "Logistic"
+msgid "Logistics"
 msgstr ""
 
 #. module: sale

=== modified file 'sale/i18n/de.po'
--- sale/i18n/de.po	2010-11-09 04:49:59 +0000
+++ sale/i18n/de.po	2010-11-16 14:05:36 +0000
@@ -1511,6 +1511,7 @@
 
 #. module: sale
 #: view:sale.order:0
+
 msgid "Logistic"
 msgstr "Logistik"
 
@@ -2251,7 +2252,7 @@
 #~ msgid "Sale Procurement"
 #~ msgstr "Auftragsbezogene Beschaffung"
 
-#~ msgid "Configure Sale Order Logistic"
+#~ msgid "Configure Sale Order Logistics"
 #~ msgstr "Konfiguriere Packliste für Auftrag"
 
 #~ msgid "Status"

=== modified file 'sale/i18n/el.po'
--- sale/i18n/el.po	2010-10-30 05:55:00 +0000
+++ sale/i18n/el.po	2010-11-16 14:05:36 +0000
@@ -1464,7 +1464,7 @@
 
 #. module: sale
 #: view:sale.order:0
-msgid "Logistic"
+msgid "Logistics"
 msgstr ""
 
 #. module: sale
@@ -2344,8 +2344,8 @@
 #~ "'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 ""

=== modified file 'sale/i18n/es.po'
--- sale/i18n/es.po	2010-11-15 05:03:15 +0000
+++ sale/i18n/es.po	2010-11-16 14:05:36 +0000
@@ -2146,7 +2146,7 @@
 #~ 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 !"

=== modified file 'sale/i18n/es_AR.po'
--- sale/i18n/es_AR.po	2010-10-30 05:55:00 +0000
+++ sale/i18n/es_AR.po	2010-11-16 14:05:36 +0000
@@ -1462,7 +1462,7 @@
 
 #. module: sale
 #: view:sale.order:0
-msgid "Logistic"
+msgid "Logistics"
 msgstr ""
 
 #. module: sale
@@ -2190,7 +2190,7 @@
 #~ 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"

=== modified file 'sale/i18n/et.po'
--- sale/i18n/et.po	2010-10-31 05:05:24 +0000
+++ sale/i18n/et.po	2010-11-16 14:05:36 +0000
@@ -1485,7 +1485,7 @@
 
 #. module: sale
 #: view:sale.order:0
-msgid "Logistic"
+msgid "Logistics"
 msgstr ""
 
 #. module: sale
@@ -2154,7 +2154,7 @@
 #~ 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"

=== modified file 'sale/i18n/fi.po'
--- sale/i18n/fi.po	2010-10-31 05:05:24 +0000
+++ sale/i18n/fi.po	2010-11-16 14:05:36 +0000
@@ -1460,7 +1460,7 @@
 
 #. module: sale
 #: view:sale.order:0
-msgid "Logistic"
+msgid "Logistics"
 msgstr ""
 
 #. module: sale
@@ -2224,7 +2224,7 @@
 #~ 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."

=== modified file 'sale/i18n/fr.po'
--- sale/i18n/fr.po	2010-11-14 05:08:41 +0000
+++ sale/i18n/fr.po	2010-11-16 14:05:36 +0000
@@ -1489,7 +1489,7 @@
 
 #. module: sale
 #: view:sale.order:0
-msgid "Logistic"
+msgid "Logistics"
 msgstr ""
 
 #. module: sale
@@ -2094,7 +2094,7 @@
 #~ 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"

=== modified file 'sale/i18n/hr.po'
--- sale/i18n/hr.po	2010-10-30 05:55:00 +0000
+++ sale/i18n/hr.po	2010-11-16 14:05:36 +0000
@@ -1458,7 +1458,7 @@
 
 #. module: sale
 #: view:sale.order:0
-msgid "Logistic"
+msgid "Logistics"
 msgstr ""
 
 #. module: sale
@@ -2174,7 +2174,7 @@
 #~ 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"

=== modified file 'sale/i18n/hu.po'
--- sale/i18n/hu.po	2010-10-30 05:55:00 +0000
+++ sale/i18n/hu.po	2010-11-16 14:05:36 +0000
@@ -1453,7 +1453,7 @@
 
 #. module: sale
 #: view:sale.order:0
-msgid "Logistic"
+msgid "Logistics"
 msgstr ""
 
 #. module: sale

=== modified file 'sale/i18n/id.po'
--- sale/i18n/id.po	2010-10-31 05:05:24 +0000
+++ sale/i18n/id.po	2010-11-16 14:05:36 +0000
@@ -1458,7 +1458,7 @@
 
 #. module: sale
 #: view:sale.order:0
-msgid "Logistic"
+msgid "Logistics"
 msgstr ""
 
 #. module: sale

=== modified file 'sale/i18n/it.po'
--- sale/i18n/it.po	2010-11-02 04:51:23 +0000
+++ sale/i18n/it.po	2010-11-16 14:05:36 +0000
@@ -1494,7 +1494,7 @@
 
 #. module: sale
 #: view:sale.order:0
-msgid "Logistic"
+msgid "Logistics"
 msgstr ""
 
 #. module: sale
@@ -2213,7 +2213,7 @@
 #~ 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"

=== modified file 'sale/i18n/ko.po'
--- sale/i18n/ko.po	2010-10-30 05:55:00 +0000
+++ sale/i18n/ko.po	2010-11-16 14:05:36 +0000
@@ -1454,7 +1454,7 @@
 
 #. module: sale
 #: view:sale.order:0
-msgid "Logistic"
+msgid "Logistics"
 msgstr ""
 
 #. module: sale
@@ -2206,7 +2206,7 @@
 #~ "order"
 #~ msgstr "판매 주문 작성 ì‹œ, 디폴트 피킹 ì •ì±…ì„ ì„¤ì •í•˜ëŠ” 구성 ê³¼ì •"
 
-#~ msgid "Configure Sale Order Logistic"
+#~ msgid "Configure Sale Order Logistics"
 #~ msgstr "판매 주문 물류 구성"
 
 #~ msgid "Quantity (UOS)"

=== modified file 'sale/i18n/lt.po'
--- sale/i18n/lt.po	2010-10-30 05:55:00 +0000
+++ sale/i18n/lt.po	2010-11-16 14:05:36 +0000
@@ -1461,7 +1461,7 @@
 
 #. module: sale
 #: view:sale.order:0
-msgid "Logistic"
+msgid "Logistics"
 msgstr ""
 
 #. module: sale
@@ -2235,7 +2235,7 @@
 #~ 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"

=== modified file 'sale/i18n/lv.po'
--- sale/i18n/lv.po	2010-10-30 05:55:00 +0000
+++ sale/i18n/lv.po	2010-11-16 14:05:36 +0000
@@ -1454,7 +1454,7 @@
 
 #. module: sale
 #: view:sale.order:0
-msgid "Logistic"
+msgid "Logistics"
 msgstr ""
 
 #. module: sale

=== modified file 'sale/i18n/nl.po'
--- sale/i18n/nl.po	2010-10-31 05:05:24 +0000
+++ sale/i18n/nl.po	2010-11-16 14:05:36 +0000
@@ -1458,7 +1458,7 @@
 
 #. module: sale
 #: view:sale.order:0
-msgid "Logistic"
+msgid "Logistics"
 msgstr ""
 
 #. module: sale
@@ -2160,7 +2160,7 @@
 #~ msgid "Sale Procurement"
 #~ msgstr "Uitlevering verkoop"
 
-#~ msgid "Configure Sale Order Logistic"
+#~ msgid "Configure Sale Order Logistics"
 #~ msgstr "Stel verkooplogistiek in"
 
 #~ msgid "Status"

=== modified file 'sale/i18n/nl_BE.po'
--- sale/i18n/nl_BE.po	2010-08-10 09:37:25 +0000
+++ sale/i18n/nl_BE.po	2010-11-16 14:05:36 +0000
@@ -699,7 +699,7 @@
 
 #. module: sale
 #: view:sale.config.picking_policy:0
-msgid "Configure Sale Order Logistic"
+msgid "Configure Sale Order Logistics"
 msgstr ""
 
 #. module: sale

=== modified file 'sale/i18n/pl.po'
--- sale/i18n/pl.po	2010-11-06 04:53:16 +0000
+++ sale/i18n/pl.po	2010-11-16 14:05:36 +0000
@@ -1496,7 +1496,7 @@
 
 #. module: sale
 #: view:sale.order:0
-msgid "Logistic"
+msgid "Logistics"
 msgstr ""
 
 #. module: sale
@@ -2134,7 +2134,7 @@
 #~ 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."

=== modified file 'sale/i18n/pt.po'
--- sale/i18n/pt.po	2010-10-30 05:55:00 +0000
+++ sale/i18n/pt.po	2010-11-16 14:05:36 +0000
@@ -1457,7 +1457,7 @@
 
 #. module: sale
 #: view:sale.order:0
-msgid "Logistic"
+msgid "Logistics"
 msgstr ""
 
 #. module: sale
@@ -2208,7 +2208,7 @@
 #~ 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"

=== modified file 'sale/i18n/pt_BR.po'
--- sale/i18n/pt_BR.po	2010-10-31 05:05:24 +0000
+++ sale/i18n/pt_BR.po	2010-11-16 14:05:36 +0000
@@ -1466,7 +1466,7 @@
 
 #. module: sale
 #: view:sale.order:0
-msgid "Logistic"
+msgid "Logistics"
 msgstr "Logistica"
 
 #. module: sale

=== modified file 'sale/i18n/ro.po'
--- sale/i18n/ro.po	2010-10-30 05:55:00 +0000
+++ sale/i18n/ro.po	2010-11-16 14:05:36 +0000
@@ -1453,7 +1453,7 @@
 
 #. module: sale
 #: view:sale.order:0
-msgid "Logistic"
+msgid "Logistics"
 msgstr ""
 
 #. module: sale

=== modified file 'sale/i18n/ru.po'
--- sale/i18n/ru.po	2010-10-30 05:55:00 +0000
+++ sale/i18n/ru.po	2010-11-16 14:05:36 +0000
@@ -1528,7 +1528,7 @@
 
 #. module: sale
 #: view:sale.order:0
-msgid "Logistic"
+msgid "Logistics"
 msgstr "Логистика"
 
 #. module: sale

=== modified file 'sale/i18n/sale.pot'
--- sale/i18n/sale.pot	2010-10-18 17:59:39 +0000
+++ sale/i18n/sale.pot	2010-11-16 14:05:36 +0000
@@ -1387,7 +1387,7 @@
 
 #. module: sale
 #: view:sale.order:0
-msgid "Logistic"
+msgid "Logistics"
 msgstr ""
 
 #. module: sale

=== modified file 'sale/i18n/sk.po'
--- sale/i18n/sk.po	2010-10-30 05:55:00 +0000
+++ sale/i18n/sk.po	2010-11-16 14:05:36 +0000
@@ -1454,7 +1454,7 @@
 
 #. module: sale
 #: view:sale.order:0
-msgid "Logistic"
+msgid "Logistics"
 msgstr ""
 
 #. module: sale

=== modified file 'sale/i18n/sl.po'
--- sale/i18n/sl.po	2010-10-30 05:55:00 +0000
+++ sale/i18n/sl.po	2010-11-16 14:05:36 +0000
@@ -1454,7 +1454,7 @@
 
 #. module: sale
 #: view:sale.order:0
-msgid "Logistic"
+msgid "Logistics"
 msgstr ""
 
 #. module: sale

=== modified file 'sale/i18n/sq.po'
--- sale/i18n/sq.po	2010-10-30 05:55:00 +0000
+++ sale/i18n/sq.po	2010-11-16 14:05:36 +0000
@@ -1454,7 +1454,7 @@
 
 #. module: sale
 #: view:sale.order:0
-msgid "Logistic"
+msgid "Logistics"
 msgstr ""
 
 #. module: sale

=== modified file 'sale/i18n/sr.po'
--- sale/i18n/sr.po	2010-11-06 04:53:16 +0000
+++ sale/i18n/sr.po	2010-11-16 14:05:36 +0000
@@ -2303,7 +2303,7 @@
 #~ msgid "Sales Configuration"
 #~ msgstr "Konfiguracija prodaje"
 
-#~ msgid "Configure Sale Order Logistic"
+#~ msgid "Configure Sale Order Logistics"
 #~ msgstr "Konfigurisanje logistike naloga za prodaju"
 
 #~ msgid "Status"

=== modified file 'sale/i18n/sv.po'
--- sale/i18n/sv.po	2010-10-31 05:05:24 +0000
+++ sale/i18n/sv.po	2010-11-16 14:05:36 +0000
@@ -1456,7 +1456,7 @@
 
 #. module: sale
 #: view:sale.order:0
-msgid "Logistic"
+msgid "Logistics"
 msgstr ""
 
 #. module: sale
@@ -2184,7 +2184,7 @@
 #~ 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"

=== modified file 'sale/i18n/tlh.po'
--- sale/i18n/tlh.po	2010-10-30 05:55:00 +0000
+++ sale/i18n/tlh.po	2010-11-16 14:05:36 +0000
@@ -1453,7 +1453,7 @@
 
 #. module: sale
 #: view:sale.order:0
-msgid "Logistic"
+msgid "Logistics"
 msgstr ""
 
 #. module: sale

=== modified file 'sale/i18n/tr.po'
--- sale/i18n/tr.po	2010-10-31 05:05:24 +0000
+++ sale/i18n/tr.po	2010-11-16 14:05:36 +0000
@@ -1455,7 +1455,7 @@
 
 #. module: sale
 #: view:sale.order:0
-msgid "Logistic"
+msgid "Logistics"
 msgstr ""
 
 #. module: sale
@@ -2119,7 +2119,7 @@
 #~ 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"

=== modified file 'sale/i18n/uk.po'
--- sale/i18n/uk.po	2010-10-30 05:55:00 +0000
+++ sale/i18n/uk.po	2010-11-16 14:05:36 +0000
@@ -1454,7 +1454,7 @@
 
 #. module: sale
 #: view:sale.order:0
-msgid "Logistic"
+msgid "Logistics"
 msgstr ""
 
 #. module: sale

=== modified file 'sale/i18n/vi.po'
--- sale/i18n/vi.po	2010-11-15 05:03:15 +0000
+++ sale/i18n/vi.po	2010-11-16 14:05:36 +0000
@@ -1464,7 +1464,7 @@
 
 #. module: sale
 #: view:sale.order:0
-msgid "Logistic"
+msgid "Logistics"
 msgstr ""
 
 #. module: sale

=== modified file 'sale/i18n/zh_CN.po'
--- sale/i18n/zh_CN.po	2010-10-30 05:55:00 +0000
+++ sale/i18n/zh_CN.po	2010-11-16 14:05:36 +0000
@@ -1453,7 +1453,7 @@
 
 #. module: sale
 #: view:sale.order:0
-msgid "Logistic"
+msgid "Logistics"
 msgstr ""
 
 #. module: sale
@@ -2220,7 +2220,7 @@
 #~ msgid "Sale Procurement"
 #~ msgstr "销售产品需求"
 
-#~ msgid "Configure Sale Order Logistic"
+#~ msgid "Configure Sale Order Logistics"
 #~ msgstr "设置销售订单逻辑"
 
 #~ msgid "Packing Policy"

=== modified file 'sale/i18n/zh_TW.po'
--- sale/i18n/zh_TW.po	2010-10-30 05:55:00 +0000
+++ sale/i18n/zh_TW.po	2010-11-16 14:05:36 +0000
@@ -1453,7 +1453,7 @@
 
 #. module: sale
 #: view:sale.order:0
-msgid "Logistic"
+msgid "Logistics"
 msgstr ""
 
 #. module: sale

=== modified file 'sale/sale_view.xml'
--- sale/sale_view.xml	2010-11-10 09:42:43 +0000
+++ sale/sale_view.xml	2010-11-16 14:05:36 +0000
@@ -539,7 +539,7 @@
                   <attribute name="string">Sales Application Configuration</attribute>
                 </form>
                 <separator string="title" position="attributes">
-                <attribute name="string">Configure Sales Order Logistic</attribute>
+                <attribute name="string">Configure Sales Order Logistics</attribute>
                   </separator>
                   <xpath expr="//label[@string='description']" position="attributes">
                     <attribute name="string">Setup your sales workflow and default values.</attribute>

=== modified file 'sale/security/sale_security.xml'
--- sale/security/sale_security.xml	2010-11-14 13:48:21 +0000
+++ sale/security/sale_security.xml	2010-11-16 14:05:36 +0000
@@ -9,6 +9,10 @@
         <field name="name">Sales / User</field>
     </record>
 
+    <record id="base.user_demo" model="res.users">
+        <field eval="[(4, ref('base.group_sale_salesman'))]" name="groups_id"/>
+    </record>
+    
     <record model="ir.ui.menu" id="base.menu_base_partner">
         <field eval="[(4, ref('base.group_sale_salesman'))]" name="groups_id"/>
     </record>

=== modified file 'sale/stock.py'
--- sale/stock.py	2010-10-21 09:30:04 +0000
+++ sale/stock.py	2010-11-16 14:05:36 +0000
@@ -69,6 +69,13 @@
 
     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)
 

=== modified file 'sale_mrp/__openerp__.py'
--- sale_mrp/__openerp__.py	2010-09-09 05:25:01 +0000
+++ sale_mrp/__openerp__.py	2010-11-16 14:05:36 +0000
@@ -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': [],

=== added directory 'sale_mrp/security'
=== added file 'sale_mrp/security/ir.model.access.csv'
--- sale_mrp/security/ir.model.access.csv	1970-01-01 00:00:00 +0000
+++ sale_mrp/security/ir.model.access.csv	2010-11-16 14:05:36 +0000
@@ -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

=== added file 'sale_mrp/security/sale_mrp_security.xml'
--- sale_mrp/security/sale_mrp_security.xml	1970-01-01 00:00:00 +0000
+++ sale_mrp/security/sale_mrp_security.xml	2010-11-16 14:05:36 +0000
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+<data noupdate="0">
+
+	<record id="base.group_sale_manager" model="res.groups">
+	        <field name="name">Sales / Manager</field>
+	    </record>
+    
+    <record id="base.group_sale_salesman" model="res.groups">
+        <field name="name">Sales / User</field>
+    </record>
+
+     <record id="base.user_demo" model="res.users">
+        <field eval="[(4, ref('base.group_sale_salesman'))]" name="groups_id"/>
+    </record>
+   
+</data>
+</openerp>

=== modified file 'share/security/share_security.xml'
--- share/security/share_security.xml	2010-10-17 05:13:19 +0000
+++ share/security/share_security.xml	2010-11-16 14:05:36 +0000
@@ -4,5 +4,10 @@
         <record id="group_share_user" model="res.groups">
             <field name="name">Sharing / User</field>
         </record>
+        
+        <record id="base.user_demo" model="res.users">
+            <field eval="[(4, ref('group_share_user'))]" name="groups_id"/>
+        </record>
+    
     </data>
 </openerp>

=== modified file 'stock/board_warehouse_view.xml'
--- stock/board_warehouse_view.xml	2010-12-07 13:02:48 +0000
+++ stock/board_warehouse_view.xml	2010-11-16 14:05:36 +0000
@@ -13,7 +13,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="domain">[('state','in',('confirmed','assigned')),'|','&amp;',('picking_id','=',False),('location_id.usage', 'in', ['customer','supplier']),'&amp;',('picking_id','!=',False),('picking_id.type','=','in')]</field>
-            <field name="view_id" ref="stock.view_move_tree_reception_picking_board"/>
+            <field name="view_id" ref="stock.view_move_tree_reception_picking"/>
         </record>
 
         <record id="action_outgoing_product_board" model="ir.actions.act_window">
@@ -23,7 +23,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="domain">[('state','in',('confirmed','assigned')),'|','&amp;',('picking_id','=',False),('location_dest_id.usage', 'in', ['customer','supplier']),'&amp;',('picking_id','!=',False),('picking_id.type','=','out')]</field>
-            <field name="view_id" ref="stock.view_move_tree_reception_picking_board"/>
+            <field name="view_id" ref="stock.view_move_tree_reception_picking"/>
         </record>
 
         <record model="ir.actions.act_window" id="action_stock_incoming_product_delay">

=== modified file 'stock/security/stock_security.xml'
--- stock/security/stock_security.xml	2010-10-16 16:47:09 +0000
+++ stock/security/stock_security.xml	2010-11-16 14:05:36 +0000
@@ -9,6 +9,10 @@
         <field name="name">Warehouse / User</field>
     </record>
 
+    <record id="base.user_demo" model="res.users">
+        <field eval="[(4, ref('group_stock_user'))]" name="groups_id"/>
+    </record>
+
 <!-- multi -->
 
     <record model="ir.rule" id="stock_picking_rule">

=== modified file 'stock/stock.py'
--- stock/stock.py	2010-11-12 13:29:08 +0000
+++ stock/stock.py	2010-11-16 14:05:36 +0000
@@ -1372,7 +1372,7 @@
         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')]),

=== modified file 'stock_location/i18n/ar.po'
--- stock_location/i18n/ar.po	2010-10-30 05:55:00 +0000
+++ stock_location/i18n/ar.po	2010-11-16 14:05:36 +0000
@@ -29,7 +29,7 @@
 
 #. module: stock_location
 #: view:product.product:0
-msgid "Logistic Flow"
+msgid "Logistics Flow"
 msgstr ""
 
 #. module: stock_location

=== modified file 'stock_location/i18n/bg.po'
--- stock_location/i18n/bg.po	2010-10-30 05:55:00 +0000
+++ stock_location/i18n/bg.po	2010-11-16 14:05:36 +0000
@@ -29,7 +29,7 @@
 
 #. module: stock_location
 #: view:product.product:0
-msgid "Logistic Flow"
+msgid "Logistics Flow"
 msgstr ""
 
 #. module: stock_location

=== modified file 'stock_location/i18n/bs.po'
--- stock_location/i18n/bs.po	2010-10-30 05:55:00 +0000
+++ stock_location/i18n/bs.po	2010-11-16 14:05:36 +0000
@@ -29,7 +29,7 @@
 
 #. module: stock_location
 #: view:product.product:0
-msgid "Logistic Flow"
+msgid "Logistics Flow"
 msgstr ""
 
 #. module: stock_location

=== modified file 'stock_location/i18n/ca.po'
--- stock_location/i18n/ca.po	2010-10-30 05:55:00 +0000
+++ stock_location/i18n/ca.po	2010-11-16 14:05:36 +0000
@@ -29,7 +29,7 @@
 
 #. module: stock_location
 #: view:product.product:0
-msgid "Logistic Flow"
+msgid "Logistics Flow"
 msgstr ""
 
 #. module: stock_location

=== modified file 'stock_location/i18n/cs.po'
--- stock_location/i18n/cs.po	2010-10-30 05:55:00 +0000
+++ stock_location/i18n/cs.po	2010-11-16 14:05:36 +0000
@@ -29,7 +29,7 @@
 
 #. module: stock_location
 #: view:product.product:0
-msgid "Logistic Flow"
+msgid "Logistics Flow"
 msgstr ""
 
 #. module: stock_location

=== modified file 'stock_location/i18n/el.po'
--- stock_location/i18n/el.po	2010-10-30 05:55:00 +0000
+++ stock_location/i18n/el.po	2010-11-16 14:05:36 +0000
@@ -32,7 +32,7 @@
 
 #. module: stock_location
 #: view:product.product:0
-msgid "Logistic Flow"
+msgid "Logistics Flow"
 msgstr ""
 
 #. module: stock_location

=== modified file 'stock_location/i18n/es_AR.po'
--- stock_location/i18n/es_AR.po	2010-10-30 05:55:00 +0000
+++ stock_location/i18n/es_AR.po	2010-11-16 14:05:36 +0000
@@ -29,7 +29,7 @@
 
 #. module: stock_location
 #: view:product.product:0
-msgid "Logistic Flow"
+msgid "Logistics Flow"
 msgstr ""
 
 #. module: stock_location

=== modified file 'stock_location/i18n/et.po'
--- stock_location/i18n/et.po	2010-10-30 05:55:00 +0000
+++ stock_location/i18n/et.po	2010-11-16 14:05:36 +0000
@@ -29,7 +29,7 @@
 
 #. module: stock_location
 #: view:product.product:0
-msgid "Logistic Flow"
+msgid "Logistics Flow"
 msgstr ""
 
 #. module: stock_location

=== modified file 'stock_location/i18n/fr.po'
--- stock_location/i18n/fr.po	2010-10-30 05:55:00 +0000
+++ stock_location/i18n/fr.po	2010-11-16 14:05:36 +0000
@@ -29,7 +29,7 @@
 
 #. module: stock_location
 #: view:product.product:0
-msgid "Logistic Flow"
+msgid "Logistics Flow"
 msgstr ""
 
 #. module: stock_location

=== modified file 'stock_location/i18n/hr.po'
--- stock_location/i18n/hr.po	2010-10-30 05:55:00 +0000
+++ stock_location/i18n/hr.po	2010-11-16 14:05:36 +0000
@@ -29,7 +29,7 @@
 
 #. module: stock_location
 #: view:product.product:0
-msgid "Logistic Flow"
+msgid "Logistics Flow"
 msgstr ""
 
 #. module: stock_location

=== modified file 'stock_location/i18n/hu.po'
--- stock_location/i18n/hu.po	2010-10-30 05:55:00 +0000
+++ stock_location/i18n/hu.po	2010-11-16 14:05:36 +0000
@@ -29,7 +29,7 @@
 
 #. module: stock_location
 #: view:product.product:0
-msgid "Logistic Flow"
+msgid "Logistics Flow"
 msgstr ""
 
 #. module: stock_location

=== modified file 'stock_location/i18n/id.po'
--- stock_location/i18n/id.po	2010-10-30 05:55:00 +0000
+++ stock_location/i18n/id.po	2010-11-16 14:05:36 +0000
@@ -29,7 +29,7 @@
 
 #. module: stock_location
 #: view:product.product:0
-msgid "Logistic Flow"
+msgid "Logistics Flow"
 msgstr ""
 
 #. module: stock_location

=== modified file 'stock_location/i18n/it.po'
--- stock_location/i18n/it.po	2010-10-30 05:55:00 +0000
+++ stock_location/i18n/it.po	2010-11-16 14:05:36 +0000
@@ -29,7 +29,7 @@
 
 #. module: stock_location
 #: view:product.product:0
-msgid "Logistic Flow"
+msgid "Logistics Flow"
 msgstr ""
 
 #. module: stock_location

=== modified file 'stock_location/i18n/ko.po'
--- stock_location/i18n/ko.po	2010-10-30 05:55:00 +0000
+++ stock_location/i18n/ko.po	2010-11-16 14:05:36 +0000
@@ -30,7 +30,7 @@
 
 #. module: stock_location
 #: view:product.product:0
-msgid "Logistic Flow"
+msgid "Logistics Flow"
 msgstr ""
 
 #. module: stock_location

=== modified file 'stock_location/i18n/lt.po'
--- stock_location/i18n/lt.po	2010-10-30 05:55:00 +0000
+++ stock_location/i18n/lt.po	2010-11-16 14:05:36 +0000
@@ -29,7 +29,7 @@
 
 #. module: stock_location
 #: view:product.product:0
-msgid "Logistic Flow"
+msgid "Logistics Flow"
 msgstr ""
 
 #. module: stock_location

=== modified file 'stock_location/i18n/mn.po'
--- stock_location/i18n/mn.po	2010-10-30 05:55:00 +0000
+++ stock_location/i18n/mn.po	2010-11-16 14:05:36 +0000
@@ -30,7 +30,7 @@
 
 #. module: stock_location
 #: view:product.product:0
-msgid "Logistic Flow"
+msgid "Logistics Flow"
 msgstr ""
 
 #. module: stock_location

=== modified file 'stock_location/i18n/nl.po'
--- stock_location/i18n/nl.po	2010-10-30 05:55:00 +0000
+++ stock_location/i18n/nl.po	2010-11-16 14:05:36 +0000
@@ -29,7 +29,7 @@
 
 #. module: stock_location
 #: view:product.product:0
-msgid "Logistic Flow"
+msgid "Logistics Flow"
 msgstr ""
 
 #. module: stock_location

=== modified file 'stock_location/i18n/nl_BE.po'
--- stock_location/i18n/nl_BE.po	2010-10-30 05:55:00 +0000
+++ stock_location/i18n/nl_BE.po	2010-11-16 14:05:36 +0000
@@ -29,7 +29,7 @@
 
 #. module: stock_location
 #: view:product.product:0
-msgid "Logistic Flow"
+msgid "Logistics Flow"
 msgstr ""
 
 #. module: stock_location

=== modified file 'stock_location/i18n/pl.po'
--- stock_location/i18n/pl.po	2010-10-30 05:55:00 +0000
+++ stock_location/i18n/pl.po	2010-11-16 14:05:36 +0000
@@ -29,7 +29,7 @@
 
 #. module: stock_location
 #: view:product.product:0
-msgid "Logistic Flow"
+msgid "Logistics Flow"
 msgstr ""
 
 #. module: stock_location

=== modified file 'stock_location/i18n/pt.po'
--- stock_location/i18n/pt.po	2010-10-30 05:55:00 +0000
+++ stock_location/i18n/pt.po	2010-11-16 14:05:36 +0000
@@ -29,7 +29,7 @@
 
 #. module: stock_location
 #: view:product.product:0
-msgid "Logistic Flow"
+msgid "Logistics Flow"
 msgstr ""
 
 #. module: stock_location

=== modified file 'stock_location/i18n/pt_BR.po'
--- stock_location/i18n/pt_BR.po	2010-10-30 05:55:00 +0000
+++ stock_location/i18n/pt_BR.po	2010-11-16 14:05:36 +0000
@@ -29,7 +29,7 @@
 
 #. module: stock_location
 #: view:product.product:0
-msgid "Logistic Flow"
+msgid "Logistics Flow"
 msgstr ""
 
 #. module: stock_location

=== modified file 'stock_location/i18n/ro.po'
--- stock_location/i18n/ro.po	2010-10-30 05:55:00 +0000
+++ stock_location/i18n/ro.po	2010-11-16 14:05:36 +0000
@@ -29,7 +29,7 @@
 
 #. module: stock_location
 #: view:product.product:0
-msgid "Logistic Flow"
+msgid "Logistics Flow"
 msgstr ""
 
 #. module: stock_location

=== modified file 'stock_location/i18n/ru.po'
--- stock_location/i18n/ru.po	2010-10-30 05:55:00 +0000
+++ stock_location/i18n/ru.po	2010-11-16 14:05:36 +0000
@@ -29,7 +29,7 @@
 
 #. module: stock_location
 #: view:product.product:0
-msgid "Logistic Flow"
+msgid "Logistics Flow"
 msgstr "Товарно-транспортный поток"
 
 #. module: stock_location

=== modified file 'stock_location/i18n/sl.po'
--- stock_location/i18n/sl.po	2010-10-30 05:55:00 +0000
+++ stock_location/i18n/sl.po	2010-11-16 14:05:36 +0000
@@ -29,7 +29,7 @@
 
 #. module: stock_location
 #: view:product.product:0
-msgid "Logistic Flow"
+msgid "Logistics Flow"
 msgstr ""
 
 #. module: stock_location

=== modified file 'stock_location/i18n/sq.po'
--- stock_location/i18n/sq.po	2010-10-30 05:55:00 +0000
+++ stock_location/i18n/sq.po	2010-11-16 14:05:36 +0000
@@ -30,7 +30,7 @@
 
 #. module: stock_location
 #: view:product.product:0
-msgid "Logistic Flow"
+msgid "Logistics Flow"
 msgstr ""
 
 #. module: stock_location

=== modified file 'stock_location/i18n/stock_location.pot'
--- stock_location/i18n/stock_location.pot	2010-10-18 17:59:39 +0000
+++ stock_location/i18n/stock_location.pot	2010-11-16 14:05:36 +0000
@@ -28,7 +28,7 @@
 
 #. module: stock_location
 #: view:product.product:0
-msgid "Logistic Flow"
+msgid "Logistics Flow"
 msgstr ""
 
 #. module: stock_location

=== modified file 'stock_location/i18n/sv.po'
--- stock_location/i18n/sv.po	2010-10-30 05:55:00 +0000
+++ stock_location/i18n/sv.po	2010-11-16 14:05:36 +0000
@@ -29,7 +29,7 @@
 
 #. module: stock_location
 #: view:product.product:0
-msgid "Logistic Flow"
+msgid "Logistics Flow"
 msgstr ""
 
 #. module: stock_location

=== modified file 'stock_location/i18n/tlh.po'
--- stock_location/i18n/tlh.po	2010-10-30 05:55:00 +0000
+++ stock_location/i18n/tlh.po	2010-11-16 14:05:36 +0000
@@ -29,7 +29,7 @@
 
 #. module: stock_location
 #: view:product.product:0
-msgid "Logistic Flow"
+msgid "Logistics Flow"
 msgstr ""
 
 #. module: stock_location

=== modified file 'stock_location/i18n/tr.po'
--- stock_location/i18n/tr.po	2010-10-30 05:55:00 +0000
+++ stock_location/i18n/tr.po	2010-11-16 14:05:36 +0000
@@ -29,7 +29,7 @@
 
 #. module: stock_location
 #: view:product.product:0
-msgid "Logistic Flow"
+msgid "Logistics Flow"
 msgstr ""
 
 #. module: stock_location

=== modified file 'stock_location/i18n/uk.po'
--- stock_location/i18n/uk.po	2010-10-30 05:55:00 +0000
+++ stock_location/i18n/uk.po	2010-11-16 14:05:36 +0000
@@ -29,7 +29,7 @@
 
 #. module: stock_location
 #: view:product.product:0
-msgid "Logistic Flow"
+msgid "Logistics Flow"
 msgstr ""
 
 #. module: stock_location

=== modified file 'stock_location/i18n/vi.po'
--- stock_location/i18n/vi.po	2010-10-30 05:55:00 +0000
+++ stock_location/i18n/vi.po	2010-11-16 14:05:36 +0000
@@ -30,7 +30,7 @@
 
 #. module: stock_location
 #: view:product.product:0
-msgid "Logistic Flow"
+msgid "Logistics Flow"
 msgstr ""
 
 #. module: stock_location

=== modified file 'stock_location/i18n/zh_CN.po'
--- stock_location/i18n/zh_CN.po	2010-10-30 05:55:00 +0000
+++ stock_location/i18n/zh_CN.po	2010-11-16 14:05:36 +0000
@@ -29,7 +29,7 @@
 
 #. module: stock_location
 #: view:product.product:0
-msgid "Logistic Flow"
+msgid "Logistics Flow"
 msgstr ""
 
 #. module: stock_location

=== modified file 'stock_location/i18n/zh_TW.po'
--- stock_location/i18n/zh_TW.po	2010-10-30 05:55:00 +0000
+++ stock_location/i18n/zh_TW.po	2010-11-16 14:05:36 +0000
@@ -29,7 +29,7 @@
 
 #. module: stock_location
 #: view:product.product:0
-msgid "Logistic Flow"
+msgid "Logistics Flow"
 msgstr ""
 
 #. module: stock_location

=== modified file 'stock_location/stock_location_view.xml'
--- stock_location/stock_location_view.xml	2010-10-18 10:09:41 +0000
+++ stock_location/stock_location_view.xml	2010-11-16 14:05:36 +0000
@@ -40,7 +40,7 @@
             <field name="inherit_id" ref="product.product_normal_form_view"/>
             <field name="arch" type="xml">
                 <notebook position="inside">
-                    <page string="Logistic Flow">
+                    <page string="Logistics Flow">
                         <field name="flow_pull_ids" editable="bottom" colspan="4" nolabel="1">
                             <tree string="Pulled flows">
                                 <field name="location_id" attrs="{'required': [('type_proc', '=', 'move')]}"/>

=== modified file 'subscription/security/subcription_security.xml'
--- subscription/security/subcription_security.xml	2010-08-13 06:06:34 +0000
+++ subscription/security/subcription_security.xml	2010-11-16 14:05:36 +0000
@@ -8,6 +8,10 @@
    	<record model="res.groups" id="base.group_tool_user">
         	<field name="name">Tools / User</field>
    	</record>
+   	
+   	<record id="base.user_demo" model="res.users">
+            <field eval="[(4, ref('base.group_tool_user'))]" name="groups_id"/>
+    </record>
 
 </data>
 </openerp>

=== modified file 'survey/security/survey_security.xml'
--- survey/security/survey_security.xml	2010-11-14 13:48:21 +0000
+++ survey/security/survey_security.xml	2010-11-16 14:05:36 +0000
@@ -14,6 +14,10 @@
    	<record model="res.groups" id="group_survey_user">
         	<field name="name">Survey / User</field>
    	</record>
+   	
+   	<record id="base.user_demo" model="res.users">
+            <field eval="[(4, ref('base.group_sale_salesman')),(4, ref('base.group_tool_user')),(4, ref('group_survey_user'))]" name="groups_id"/>
+    </record>
 
 </data>
 </openerp>

=== modified file 'wiki/security/wiki_security.xml'
--- wiki/security/wiki_security.xml	2010-08-09 06:02:26 +0000
+++ wiki/security/wiki_security.xml	2010-11-16 14:05:36 +0000
@@ -12,5 +12,9 @@
         <field name="name">Knowledge / User</field>
     </record>
 
+    <record id="base.user_demo" model="res.users">
+        <field eval="[(4, ref('base.group_sale_salesman')),(4, ref('base.group_document_user'))]" name="groups_id"/>
+    </record>
+    
 </data>
 </openerp>