merge with ssi's branch

bzr revid: pso@tinyerp.com-20101011111215-gp4pzrctkf3mb7w6

diff --git a/addons/document_ftp/test_easyftp.py b/addons/document_ftp/test_easyftp.py
index c552637..1f7324b 100644 (file)
--- a/addons/document_ftp/test_easyftp.py
+++ b/addons/document_ftp/test_easyftp.py
@@ -31,7 +31,7 @@ def get_plain_ftp(timeout=10.0):
     ftp = FTP()
     host = config.get('ftp_server_host', '127.0.0.1')
     port = config.get('ftp_server_port', '8021')
-    ftp.connect(host, port, timeout=timeout)
+    ftp.connect(host, port,timeout)
     return ftp
 
 def get_ftp_login(cr, uid, ormobj):

diff --git a/addons/document_ftp/wizard/ftp_configuration_view.xml b/addons/document_ftp/wizard/ftp_configuration_view.xml
index 0319c69..151e2ce 100644 (file)
--- a/addons/document_ftp/wizard/ftp_configuration_view.xml
+++ b/addons/document_ftp/wizard/ftp_configuration_view.xml
@@ -21,7 +21,7 @@
                <attribute name="string">Configure FTP Server</attribute>
                </separator>
                <xpath expr="//label[@string='description']" position="attributes">
-            <attribute name="string">Choose the address for the Document Management System's FTP server.</attribute>
+            <attribute name="string">Indicate the network address on which your OpenERP server should be reachable for end-users. This depends on your network topology and configuration, and will only affect the links displayed to the users. The format is HOST:PORT and the default host (localhost) is only suitable for access from the server machine itself..</attribute>
           </xpath>
           <xpath expr='//separator[@string="vsep"]' position='attributes'>
                                <attribute name='rowspan'>12</attribute>

diff --git a/addons/knowledge/installer.py b/addons/knowledge/installer.py
index 7840ffb..e74c37f 100644 (file)
--- a/addons/knowledge/installer.py
+++ b/addons/knowledge/installer.py
@@ -38,7 +38,7 @@ class knowledge_installer(osv.osv_memory):
             help="Lets you create wiki pages and page groups in order "
                  "to keep track of business knowledge and share it with "
                  "and  between your employees."),
-        # Templates of Content
+        # Content templates
         'wiki_faq':fields.boolean('Internal FAQ',
             help="Creates a skeleton internal FAQ pre-filled with "
                  "documentation about OpenERP's Document Management "

diff --git a/addons/knowledge/knowledge_installer.xml b/addons/knowledge/knowledge_installer.xml
index 1fa6cab..068fa9b 100644 (file)
--- a/addons/knowledge/knowledge_installer.xml
+++ b/addons/knowledge/knowledge_installer.xml
@@ -27,7 +27,7 @@
             <field name="document_ftp"/>
             <field name="document_webdav"/>
             <field name="wiki"/>
-            <separator string="Templates of Content" colspan="4"/>
+            <separator string="Content templates" colspan="4"/>
             <field name="wiki_faq"/>
             <field name="wiki_quality_manual"/>
           </group>

diff --git a/addons/project/security/ir.model.access.csv b/addons/project/security/ir.model.access.csv
index 4cc6d9d..b409a98 100644 (file)
--- a/addons/project/security/ir.model.access.csv
+++ b/addons/project/security/ir.model.access.csv
@@ -6,7 +6,7 @@
 "access_project_task_type_user","project.task.type user","model_project_task_type","project.group_project_user",1,1,1,1
 "access_project_task_type","project.task.type","model_project_task_type","project.group_project_manager",1,1,1,1
 "access_project_task_manager","project.task manager","model_project_task","project.group_project_manager",1,1,1,1
-"access_project_task","project.task","model_project_task","project.group_project_user",1,1,1,1
+"access_project_task","project.task","model_project_task","project.group_project_user",1,1,1,0
 "access_project_task_work","project.task.work","model_project_task_work","project.group_project_user",1,1,1,1
 "access_project_task_work_manager","project.task.work.manager","model_project_task_work","project.group_project_manager",1,1,1,1
 "access_report_project_task_user","report.project.task.user","model_report_project_task_user","project.group_project_manager",1,1,1,1

diff --git a/addons/project/security/project_security.xml b/addons/project/security/project_security.xml
index 97453dc..a5c5388 100644 (file)
--- a/addons/project/security/project_security.xml
+++ b/addons/project/security/project_security.xml
@@ -51,7 +51,15 @@
         <field name="name" >Projects According to User</field>
         <field name="model_id" ref="model_project_project"/>
         <field name="groups" eval="[(6, 0, [ref('group_project_manager')])]"/>
-        <field name="domain_force">[('user_id','=',user.id)]</field>
+        <field name="domain_force">[('members','in',[user.id])]</field>
+    </record>
+    
+     <record model="ir.rule" id="project_user_rule">
+        <field name="name" >Projects According to Members</field>
+        <field name="model_id" ref="model_project_project"/>
+         <field eval="1" name="perm_read"/>
+        <field name="groups" eval="[(6, 0, [ref('group_project_user')])]"/>
+        <field name="domain_force">[('members','in',[user.id])]</field>
     </record>
 
 </data>

diff --git a/addons/project_issue/security/ir.model.access.csv b/addons/project_issue/security/ir.model.access.csv
index 40ac968..5e82efa 100755 (executable)
--- a/addons/project_issue/security/ir.model.access.csv
+++ b/addons/project_issue/security/ir.model.access.csv
@@ -11,7 +11,6 @@
 "access_project_issue_system","project.issue system","model_project_issue","base.group_system",1,0,0,0
 "access_project_issue_report_system","project.issue.report system","model_project_issue_report","base.group_system",1,0,0,0
 "access_crm_case_section_system","crm.case.section system","crm.model_crm_case_section","base.group_system",1,1,1,1
-"access_project_issue_report_user","project.issue.report user","model_project_issue_report","project.group_project_user",1,0,0,0
 "access_project_issue_version_financial_user","project.issue.version.financial.user","model_project_issue_version","project.group_project_finance_user",1,0,0,0
 "access_crm_case_categ_financial_user","crm.case.categ.financial.user","crm.model_crm_case_categ","project.group_project_finance_user",1,0,0,0
 "access_crm_case_stage_financial_user","crm.case.stage.financial.user","crm.model_crm_case_stage","project.group_project_finance_user",1,0,0,0
@@ -21,4 +20,5 @@
 "access_mailgate_message_project_financial_user","mailgate.message.financial.user","mail_gateway.model_mailgate_message","project.group_project_finance_user",1,0,0,0
 "access_mailgate_message_project_manager","mailgate.message.manager","mail_gateway.model_mailgate_message","project.group_project_manager",1,1,1,1
 "access_resource_calendar_project_manager","resource.calendar.project.manager","resource.model_resource_calendar","project.group_project_manager",1,1,1,1
-
+"access_project_issue_report_user","project.issue.report user","model_project_issue_report","project.group_project_user",1,1,1,0
+"access_mailgate_message_issue_project_user","project.mailgate.message.issue.user","mail_gateway.model_mailgate_message","project.group_project_user",1,1,1,0

diff --git a/addons/project_issue/security/project_issue_security.xml b/addons/project_issue/security/project_issue_security.xml
index d0aeaba..a73eca5 100644 (file)
--- a/addons/project_issue/security/project_issue_security.xml
+++ b/addons/project_issue/security/project_issue_security.xml
@@ -4,5 +4,15 @@
             <record id="group_project_supporter" model="res.groups">
                <field name="name">Project / Support Manager</field>
            </record>
+           
+           <record model="ir.rule" id="project_issue_rule">
+        <field name="name" >Issues according to Users</field>
+        <field name="model_id" ref="model_project_issue"/>
+         <field eval="1" name="perm_read"/>
+         <field eval="1" name="perm_create"/>
+         <field eval="1" name="perm_write"/>
+        <field name="groups" eval="[(6, 0, [ref('project.group_project_user')])]"/>
+        <field name="domain_force">[('project_id.members','in',[user.id])]</field>
+    </record>
        </data>
 </openerp>

diff --git a/addons/project_issue_sheet/security/ir.model.access.csv b/addons/project_issue_sheet/security/ir.model.access.csv
index a71c77e..25bcbe0 100644 (file)
--- a/addons/project_issue_sheet/security/ir.model.access.csv
+++ b/addons/project_issue_sheet/security/ir.model.access.csv
@@ -15,4 +15,8 @@
 "access_account_fiscalyear_project_manager","account.fiscalyear.project.manager","account.model_account_fiscalyear","project.group_project_manager",1,1,1,1
 "access_hr_timesheet_invoice_factor_project_manager","hr_timesheet_invoice.factor.project.manager","hr_timesheet_invoice.model_hr_timesheet_invoice_factor","project.group_project_manager",1,1,1,1
 "access_account_invoice_project_manager","account.invoice.project.manager","account.model_account_invoice","project.group_project_manager",1,1,1,1
-
+"access_analytic_account_line_project_user","analytic_account_line_timesheet user","analytic.model_account_analytic_line","project.group_project_user",1,1,1,0
+"access_account_analytic_journal_project_user","account.analytic.journal.project.user","account.model_account_analytic_journal","project.group_project_user",1,1,1,0
+"access_account_fiscalyear_project_user","account.fiscalyear.project.user","account.model_account_fiscalyear","project.group_project_user",1,1,1,0
+"access_hr_timesheet_invoice_factor_project_user","hr_timesheet_invoice.factor.project.user","hr_timesheet_invoice.model_hr_timesheet_invoice_factor","project.group_project_user",1,1,1,0
+"access_account_invoice_project_user","account.invoice.project.user","account.model_account_invoice","project.group_project_user",1,1,1,0

diff --git a/addons/project_long_term/security/ir.model.access.csv b/addons/project_long_term/security/ir.model.access.csv
index 29424a1..ecb1047 100644 (file)
--- a/addons/project_long_term/security/ir.model.access.csv
+++ b/addons/project_long_term/security/ir.model.access.csv
@@ -1,11 +1,11 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
 "access_project_phase","project.phase","model_project_phase","project.group_project_user",1,1,1,0
-"access_project_resource_allocation","project.resource.allocation","model_project_resource_allocation","project.group_project_user",1,1,1,0
+"access_project_resource_allocation","project.resource.allocation","model_project_resource_allocation","project.group_project_user",1,0,0,0
 "access_project_phase_manager","project.phase manager","model_project_phase","project.group_project_manager",1,0,0,0
 "access_project_resource_allocation_manager","project.resource.allocation manager","model_project_resource_allocation","project.group_project_manager",1,0,0,0
 "access_project_resource_allocation_system","project.resource.allocation system","model_project_resource_allocation","base.group_system",1,0,0,0
 "access_project_phase_system","project.phase system","model_project_phase","base.group_system",1,0,0,0
-"access_resource_resource_user","resource.resource user","resource.model_resource_resource","project.group_project_user",1,0,1,1
+"access_resource_resource_user","resource.resource user","resource.model_resource_resource","project.group_project_user",1,0,0,0
 "access_resource_calendar_leaves_user","resource.calendar.leaves user","resource.model_resource_calendar_leaves","project.group_project_user",1,1,1,1
 "access_resource_resource_manager","resource.resource manager","resource.model_resource_resource","project.group_project_manager",1,1,1,1
 "access_project_resource_allocation_financial_user","project.resource.allocation.financial.user","model_project_resource_allocation","project.group_project_finance_user",1,0,0,0

diff --git a/addons/project_mailgate/__openerp__.py b/addons/project_mailgate/__openerp__.py
index 59b4331..7780236 100644 (file)
--- a/addons/project_mailgate/__openerp__.py
+++ b/addons/project_mailgate/__openerp__.py
@@ -33,9 +33,8 @@ It allows creating tasks as soon as a new mail arrives in our configured mail se
 Moreover, it keeps track of all further communications and task states.  
     """,
     "init_xml": [],
-    "update_xml": [
-        "project_mailgate_view.xml",
-        "security/ir.model.access.csv"
+    "update_xml": ["security/ir.model.access.csv",
+                   "project_mailgate_view.xml",
     ],
     'demo_xml': [
     ],

diff --git a/addons/project_mailgate/security/ir.model.access.csv b/addons/project_mailgate/security/ir.model.access.csv
index 23fd412..1a840d8 100644 (file)
--- a/addons/project_mailgate/security/ir.model.access.csv
+++ b/addons/project_mailgate/security/ir.model.access.csv
@@ -1,2 +1,3 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
 "access_mailgate_message_project_manager","project.mailgate.message.manager","mail_gateway.model_mailgate_message","project.group_project_manager",1,1,1,0
+"access_mailgate_message_project_user","project.mailgate.message.user","mail_gateway.model_mailgate_message","project.group_project_user",1,1,1,0

diff --git a/addons/project_messages/__openerp__.py b/addons/project_messages/__openerp__.py
index 6cd83e2..97f9c4f 100644 (file)
--- a/addons/project_messages/__openerp__.py
+++ b/addons/project_messages/__openerp__.py
@@ -32,8 +32,8 @@
     """,
     'website': 'http://www.openerp.com',
     'init_xml': [],
-    'update_xml': ['project_messages_view.xml',
-                   'security/ir.model.access.csv'],
+    'update_xml': ['security/ir.model.access.csv',
+                   'project_messages_view.xml'],
     'demo_xml': [],
     'installable': True,
     'active': False,

diff --git a/addons/project_messages/project_messages_view.xml b/addons/project_messages/project_messages_view.xml
index e8a013c..bf269e4 100644 (file)
--- a/addons/project_messages/project_messages_view.xml
+++ b/addons/project_messages/project_messages_view.xml
@@ -109,6 +109,6 @@
             <field name="view_mode">tree,form</field>
             <field name="view_id" ref="project_messages.view_project_message_tree"/>
        </record>
-       <menuitem action="messages_form" id="menu_messages_form" parent="project.menu_project_management"/>
+       <menuitem action="messages_form" id="menu_messages_form" parent="project.menu_project_management" groups="project.group_project_user"/>
      </data>
 </openerp>

diff --git a/addons/project_messages/security/ir.model.access.csv b/addons/project_messages/security/ir.model.access.csv
index a6b76f0..e31ffd8 100644 (file)
--- a/addons/project_messages/security/ir.model.access.csv
+++ b/addons/project_messages/security/ir.model.access.csv
@@ -2,3 +2,4 @@
 "access_project_messages","project.messages","model_project_messages","project.group_project_user",1,1,1,1
 "access_project_messages_manager","project.messages manager","model_project_messages","project.group_project_manager",1,1,1,1
 "access_project_messages_financial_user","project.messages.financial.user","model_project_messages","project.group_project_finance_user",1,0,0,0
+"access_project_message_project_user","project.project.user","model_project_project","project.group_project_user",1,0,0,0

diff --git a/addons/project_planning/board_project_planning_view.xml b/addons/project_planning/board_project_planning_view.xml
index b48ab78..a059d21 100644 (file)
--- a/addons/project_planning/board_project_planning_view.xml
+++ b/addons/project_planning/board_project_planning_view.xml
@@ -12,7 +12,7 @@
                                <action colspan="4" name="%(project_planning.action_account_analytic_planning_stat_form)d" string="My Project's planning" domain="[('manager_id','=',uid),('planning_id.state','&lt;&gt;','cancel')]"/>
                        </xpath>
             </field>
-        </record>"
+        </record>
 
     </data>
 </openerp>