summaryrefslogtreecommitdiff
path: root/addons/project
diff options
context:
space:
mode:
authorhusen <husen@husen-laptop>2010-12-30 15:28:09 +0530
committerhusen <husen@husen-laptop>2010-12-30 15:28:09 +0530
commitf433b959c2a72122dfddff8f06f4ecde37627ddd (patch)
treeb465b4da741804bf7ee31741bca6138a9e4fd84a /addons/project
parentab401b3788b35a548a947086885a27f68dcbb78c (diff)
parenta8e1beba5ecc831b423f8f54e9dd5bc70b0480b2 (diff)
merged with trunk
bzr revid: husen@husen-laptop-20101230095809-cl6dkve1odgdtqtv
Diffstat (limited to 'addons/project')
-rwxr-xr-x[-rw-r--r--]addons/project/__init__.py0
-rwxr-xr-x[-rw-r--r--]addons/project/__openerp__.py0
-rwxr-xr-x[-rw-r--r--]addons/project/board_project_demo.xml0
-rwxr-xr-x[-rw-r--r--]addons/project/board_project_manager_view.xml0
-rwxr-xr-x[-rw-r--r--]addons/project/board_project_view.xml0
-rwxr-xr-x[-rw-r--r--]addons/project/company.py0
-rwxr-xr-x[-rw-r--r--]addons/project/i18n/ar.po0
-rwxr-xr-x[-rw-r--r--]addons/project/i18n/bg.po0
-rwxr-xr-x[-rw-r--r--]addons/project/i18n/bs.po0
-rwxr-xr-x[-rw-r--r--]addons/project/i18n/ca.po0
-rwxr-xr-x[-rw-r--r--]addons/project/i18n/cs.po0
-rwxr-xr-x[-rw-r--r--]addons/project/i18n/de.po0
-rwxr-xr-x[-rw-r--r--]addons/project/i18n/el.po0
-rwxr-xr-x[-rw-r--r--]addons/project/i18n/es.po4
-rwxr-xr-x[-rw-r--r--]addons/project/i18n/es_AR.po0
-rwxr-xr-x[-rw-r--r--]addons/project/i18n/es_EC.po0
-rwxr-xr-x[-rw-r--r--]addons/project/i18n/et.po0
-rwxr-xr-x[-rw-r--r--]addons/project/i18n/eu.po0
-rwxr-xr-x[-rw-r--r--]addons/project/i18n/fi.po0
-rwxr-xr-x[-rw-r--r--]addons/project/i18n/fr.po0
-rwxr-xr-x[-rw-r--r--]addons/project/i18n/hr.po0
-rwxr-xr-x[-rw-r--r--]addons/project/i18n/hu.po0
-rwxr-xr-x[-rw-r--r--]addons/project/i18n/id.po0
-rwxr-xr-x[-rw-r--r--]addons/project/i18n/it.po0
-rwxr-xr-x[-rw-r--r--]addons/project/i18n/ko.po0
-rwxr-xr-x[-rw-r--r--]addons/project/i18n/lt.po0
-rwxr-xr-x[-rw-r--r--]addons/project/i18n/lv.po0
-rwxr-xr-x[-rw-r--r--]addons/project/i18n/mn.po0
-rwxr-xr-x[-rw-r--r--]addons/project/i18n/nl.po0
-rwxr-xr-x[-rw-r--r--]addons/project/i18n/nl_BE.po0
-rwxr-xr-x[-rw-r--r--]addons/project/i18n/pl.po0
-rwxr-xr-x[-rw-r--r--]addons/project/i18n/project.pot0
-rwxr-xr-x[-rw-r--r--]addons/project/i18n/pt.po0
-rwxr-xr-x[-rw-r--r--]addons/project/i18n/pt_BR.po0
-rwxr-xr-x[-rw-r--r--]addons/project/i18n/ro.po0
-rwxr-xr-x[-rw-r--r--]addons/project/i18n/ru.po0
-rwxr-xr-x[-rw-r--r--]addons/project/i18n/sk.po0
-rwxr-xr-x[-rw-r--r--]addons/project/i18n/sl.po0
-rwxr-xr-x[-rw-r--r--]addons/project/i18n/sq.po0
-rwxr-xr-x[-rw-r--r--]addons/project/i18n/sv.po0
-rwxr-xr-x[-rw-r--r--]addons/project/i18n/tlh.po0
-rwxr-xr-x[-rw-r--r--]addons/project/i18n/tr.po0
-rwxr-xr-x[-rw-r--r--]addons/project/i18n/uk.po0
-rwxr-xr-x[-rw-r--r--]addons/project/i18n/vi.po0
-rwxr-xr-x[-rw-r--r--]addons/project/i18n/zh_CN.po0
-rwxr-xr-x[-rw-r--r--]addons/project/i18n/zh_TW.po0
-rwxr-xr-x[-rw-r--r--]addons/project/installer.py0
-rwxr-xr-x[-rw-r--r--]addons/project/process/task_process.xml0
-rwxr-xr-x[-rw-r--r--]addons/project/project.py0
-rwxr-xr-x[-rw-r--r--]addons/project/project_data.xml0
-rwxr-xr-x[-rw-r--r--]addons/project/project_demo.xml0
-rwxr-xr-x[-rw-r--r--]addons/project/project_installer.xml0
-rwxr-xr-x[-rw-r--r--]addons/project/project_view.xml3
-rwxr-xr-x[-rw-r--r--]addons/project/report/__init__.py0
-rwxr-xr-x[-rw-r--r--]addons/project/report/project_report.py0
-rwxr-xr-x[-rw-r--r--]addons/project/report/project_report.xml0
-rwxr-xr-x[-rw-r--r--]addons/project/report/project_report.xsl0
-rwxr-xr-x[-rw-r--r--]addons/project/report/project_report_view.xml106
-rwxr-xr-x[-rw-r--r--]addons/project/res_partner.py0
-rwxr-xr-x[-rw-r--r--]addons/project/res_partner_view.xml0
-rwxr-xr-x[-rw-r--r--]addons/project/security/ir.model.access.csv3
-rwxr-xr-x[-rw-r--r--]addons/project/security/project_security.xml0
-rwxr-xr-x[-rw-r--r--]addons/project/test/test_project.yml0
-rwxr-xr-x[-rw-r--r--]addons/project/test/test_project_delegation.yml0
-rwxr-xr-x[-rw-r--r--]addons/project/wizard/__init__.py0
-rwxr-xr-x[-rw-r--r--]addons/project/wizard/project_task_close.py0
-rwxr-xr-x[-rw-r--r--]addons/project/wizard/project_task_close_view.xml0
-rwxr-xr-x[-rw-r--r--]addons/project/wizard/project_task_delegate.py0
-rwxr-xr-x[-rw-r--r--]addons/project/wizard/project_task_delegate_view.xml0
-rwxr-xr-x[-rw-r--r--]addons/project/wizard/project_task_reevaluate.py0
-rwxr-xr-x[-rw-r--r--]addons/project/wizard/project_task_reevaluate_view.xml0
71 files changed, 60 insertions, 56 deletions
diff --git a/addons/project/__init__.py b/addons/project/__init__.py
index 142cd98e485..142cd98e485 100644..100755
--- a/addons/project/__init__.py
+++ b/addons/project/__init__.py
diff --git a/addons/project/__openerp__.py b/addons/project/__openerp__.py
index 3177744ea9c..3177744ea9c 100644..100755
--- a/addons/project/__openerp__.py
+++ b/addons/project/__openerp__.py
diff --git a/addons/project/board_project_demo.xml b/addons/project/board_project_demo.xml
index 85bf3140d26..85bf3140d26 100644..100755
--- a/addons/project/board_project_demo.xml
+++ b/addons/project/board_project_demo.xml
diff --git a/addons/project/board_project_manager_view.xml b/addons/project/board_project_manager_view.xml
index 03dae91ee6d..03dae91ee6d 100644..100755
--- a/addons/project/board_project_manager_view.xml
+++ b/addons/project/board_project_manager_view.xml
diff --git a/addons/project/board_project_view.xml b/addons/project/board_project_view.xml
index 31b8e5085e2..31b8e5085e2 100644..100755
--- a/addons/project/board_project_view.xml
+++ b/addons/project/board_project_view.xml
diff --git a/addons/project/company.py b/addons/project/company.py
index 0967d130737..0967d130737 100644..100755
--- a/addons/project/company.py
+++ b/addons/project/company.py
diff --git a/addons/project/i18n/ar.po b/addons/project/i18n/ar.po
index 4e9a16b39bd..4e9a16b39bd 100644..100755
--- a/addons/project/i18n/ar.po
+++ b/addons/project/i18n/ar.po
diff --git a/addons/project/i18n/bg.po b/addons/project/i18n/bg.po
index d1349bb269b..d1349bb269b 100644..100755
--- a/addons/project/i18n/bg.po
+++ b/addons/project/i18n/bg.po
diff --git a/addons/project/i18n/bs.po b/addons/project/i18n/bs.po
index aaf95dee38c..aaf95dee38c 100644..100755
--- a/addons/project/i18n/bs.po
+++ b/addons/project/i18n/bs.po
diff --git a/addons/project/i18n/ca.po b/addons/project/i18n/ca.po
index ed946860aae..ed946860aae 100644..100755
--- a/addons/project/i18n/ca.po
+++ b/addons/project/i18n/ca.po
diff --git a/addons/project/i18n/cs.po b/addons/project/i18n/cs.po
index 5a048cdd2f0..5a048cdd2f0 100644..100755
--- a/addons/project/i18n/cs.po
+++ b/addons/project/i18n/cs.po
diff --git a/addons/project/i18n/de.po b/addons/project/i18n/de.po
index 6a55b72d9c2..6a55b72d9c2 100644..100755
--- a/addons/project/i18n/de.po
+++ b/addons/project/i18n/de.po
diff --git a/addons/project/i18n/el.po b/addons/project/i18n/el.po
index 11b9da29f39..11b9da29f39 100644..100755
--- a/addons/project/i18n/el.po
+++ b/addons/project/i18n/el.po
diff --git a/addons/project/i18n/es.po b/addons/project/i18n/es.po
index aa67fd89b25..2cfee43022f 100644..100755
--- a/addons/project/i18n/es.po
+++ b/addons/project/i18n/es.po
@@ -7,14 +7,14 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-27 18:22+0000\n"
+"PO-Revision-Date: 2010-12-28 08:41+0000\n"
"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
"<jesteve@zikzakmedia.com>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-28 04:40+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:41+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: project
diff --git a/addons/project/i18n/es_AR.po b/addons/project/i18n/es_AR.po
index 10ae0f46b8f..10ae0f46b8f 100644..100755
--- a/addons/project/i18n/es_AR.po
+++ b/addons/project/i18n/es_AR.po
diff --git a/addons/project/i18n/es_EC.po b/addons/project/i18n/es_EC.po
index 9e79d1c5508..9e79d1c5508 100644..100755
--- a/addons/project/i18n/es_EC.po
+++ b/addons/project/i18n/es_EC.po
diff --git a/addons/project/i18n/et.po b/addons/project/i18n/et.po
index 2a6c864ebc9..2a6c864ebc9 100644..100755
--- a/addons/project/i18n/et.po
+++ b/addons/project/i18n/et.po
diff --git a/addons/project/i18n/eu.po b/addons/project/i18n/eu.po
index 26e41e10d52..26e41e10d52 100644..100755
--- a/addons/project/i18n/eu.po
+++ b/addons/project/i18n/eu.po
diff --git a/addons/project/i18n/fi.po b/addons/project/i18n/fi.po
index 606b8957213..606b8957213 100644..100755
--- a/addons/project/i18n/fi.po
+++ b/addons/project/i18n/fi.po
diff --git a/addons/project/i18n/fr.po b/addons/project/i18n/fr.po
index 7edb6d5216d..7edb6d5216d 100644..100755
--- a/addons/project/i18n/fr.po
+++ b/addons/project/i18n/fr.po
diff --git a/addons/project/i18n/hr.po b/addons/project/i18n/hr.po
index 0942e7464fc..0942e7464fc 100644..100755
--- a/addons/project/i18n/hr.po
+++ b/addons/project/i18n/hr.po
diff --git a/addons/project/i18n/hu.po b/addons/project/i18n/hu.po
index 4e9a16b39bd..4e9a16b39bd 100644..100755
--- a/addons/project/i18n/hu.po
+++ b/addons/project/i18n/hu.po
diff --git a/addons/project/i18n/id.po b/addons/project/i18n/id.po
index e7826b58644..e7826b58644 100644..100755
--- a/addons/project/i18n/id.po
+++ b/addons/project/i18n/id.po
diff --git a/addons/project/i18n/it.po b/addons/project/i18n/it.po
index 99145e53370..99145e53370 100644..100755
--- a/addons/project/i18n/it.po
+++ b/addons/project/i18n/it.po
diff --git a/addons/project/i18n/ko.po b/addons/project/i18n/ko.po
index 524f4a13a1d..524f4a13a1d 100644..100755
--- a/addons/project/i18n/ko.po
+++ b/addons/project/i18n/ko.po
diff --git a/addons/project/i18n/lt.po b/addons/project/i18n/lt.po
index 7b3763cfa72..7b3763cfa72 100644..100755
--- a/addons/project/i18n/lt.po
+++ b/addons/project/i18n/lt.po
diff --git a/addons/project/i18n/lv.po b/addons/project/i18n/lv.po
index b6d56711eed..b6d56711eed 100644..100755
--- a/addons/project/i18n/lv.po
+++ b/addons/project/i18n/lv.po
diff --git a/addons/project/i18n/mn.po b/addons/project/i18n/mn.po
index 80a535bcd70..80a535bcd70 100644..100755
--- a/addons/project/i18n/mn.po
+++ b/addons/project/i18n/mn.po
diff --git a/addons/project/i18n/nl.po b/addons/project/i18n/nl.po
index 6cbc0cd4021..6cbc0cd4021 100644..100755
--- a/addons/project/i18n/nl.po
+++ b/addons/project/i18n/nl.po
diff --git a/addons/project/i18n/nl_BE.po b/addons/project/i18n/nl_BE.po
index c9fbc7c4471..c9fbc7c4471 100644..100755
--- a/addons/project/i18n/nl_BE.po
+++ b/addons/project/i18n/nl_BE.po
diff --git a/addons/project/i18n/pl.po b/addons/project/i18n/pl.po
index e8be6f92bb4..e8be6f92bb4 100644..100755
--- a/addons/project/i18n/pl.po
+++ b/addons/project/i18n/pl.po
diff --git a/addons/project/i18n/project.pot b/addons/project/i18n/project.pot
index ad2be7f43eb..ad2be7f43eb 100644..100755
--- a/addons/project/i18n/project.pot
+++ b/addons/project/i18n/project.pot
diff --git a/addons/project/i18n/pt.po b/addons/project/i18n/pt.po
index 5cdde78d9cc..5cdde78d9cc 100644..100755
--- a/addons/project/i18n/pt.po
+++ b/addons/project/i18n/pt.po
diff --git a/addons/project/i18n/pt_BR.po b/addons/project/i18n/pt_BR.po
index 6b571e6ac6c..6b571e6ac6c 100644..100755
--- a/addons/project/i18n/pt_BR.po
+++ b/addons/project/i18n/pt_BR.po
diff --git a/addons/project/i18n/ro.po b/addons/project/i18n/ro.po
index 48662ba4040..48662ba4040 100644..100755
--- a/addons/project/i18n/ro.po
+++ b/addons/project/i18n/ro.po
diff --git a/addons/project/i18n/ru.po b/addons/project/i18n/ru.po
index 9750689de67..9750689de67 100644..100755
--- a/addons/project/i18n/ru.po
+++ b/addons/project/i18n/ru.po
diff --git a/addons/project/i18n/sk.po b/addons/project/i18n/sk.po
index 3ce7faad827..3ce7faad827 100644..100755
--- a/addons/project/i18n/sk.po
+++ b/addons/project/i18n/sk.po
diff --git a/addons/project/i18n/sl.po b/addons/project/i18n/sl.po
index fd72b4001d0..fd72b4001d0 100644..100755
--- a/addons/project/i18n/sl.po
+++ b/addons/project/i18n/sl.po
diff --git a/addons/project/i18n/sq.po b/addons/project/i18n/sq.po
index 68f36c5979d..68f36c5979d 100644..100755
--- a/addons/project/i18n/sq.po
+++ b/addons/project/i18n/sq.po
diff --git a/addons/project/i18n/sv.po b/addons/project/i18n/sv.po
index 596d37096f9..596d37096f9 100644..100755
--- a/addons/project/i18n/sv.po
+++ b/addons/project/i18n/sv.po
diff --git a/addons/project/i18n/tlh.po b/addons/project/i18n/tlh.po
index 1b5987df2f8..1b5987df2f8 100644..100755
--- a/addons/project/i18n/tlh.po
+++ b/addons/project/i18n/tlh.po
diff --git a/addons/project/i18n/tr.po b/addons/project/i18n/tr.po
index 3207e0366c4..3207e0366c4 100644..100755
--- a/addons/project/i18n/tr.po
+++ b/addons/project/i18n/tr.po
diff --git a/addons/project/i18n/uk.po b/addons/project/i18n/uk.po
index 77875ce897a..77875ce897a 100644..100755
--- a/addons/project/i18n/uk.po
+++ b/addons/project/i18n/uk.po
diff --git a/addons/project/i18n/vi.po b/addons/project/i18n/vi.po
index 95669be480f..95669be480f 100644..100755
--- a/addons/project/i18n/vi.po
+++ b/addons/project/i18n/vi.po
diff --git a/addons/project/i18n/zh_CN.po b/addons/project/i18n/zh_CN.po
index 34cb97a38b3..34cb97a38b3 100644..100755
--- a/addons/project/i18n/zh_CN.po
+++ b/addons/project/i18n/zh_CN.po
diff --git a/addons/project/i18n/zh_TW.po b/addons/project/i18n/zh_TW.po
index b43bbc7f23d..b43bbc7f23d 100644..100755
--- a/addons/project/i18n/zh_TW.po
+++ b/addons/project/i18n/zh_TW.po
diff --git a/addons/project/installer.py b/addons/project/installer.py
index 693e2d58018..693e2d58018 100644..100755
--- a/addons/project/installer.py
+++ b/addons/project/installer.py
diff --git a/addons/project/process/task_process.xml b/addons/project/process/task_process.xml
index 1c5fba12596..1c5fba12596 100644..100755
--- a/addons/project/process/task_process.xml
+++ b/addons/project/process/task_process.xml
diff --git a/addons/project/project.py b/addons/project/project.py
index c076ed764d4..c076ed764d4 100644..100755
--- a/addons/project/project.py
+++ b/addons/project/project.py
diff --git a/addons/project/project_data.xml b/addons/project/project_data.xml
index f3bab29250a..f3bab29250a 100644..100755
--- a/addons/project/project_data.xml
+++ b/addons/project/project_data.xml
diff --git a/addons/project/project_demo.xml b/addons/project/project_demo.xml
index e3b905fea9d..e3b905fea9d 100644..100755
--- a/addons/project/project_demo.xml
+++ b/addons/project/project_demo.xml
diff --git a/addons/project/project_installer.xml b/addons/project/project_installer.xml
index 32b235e4691..32b235e4691 100644..100755
--- a/addons/project/project_installer.xml
+++ b/addons/project/project_installer.xml
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index f86f3d67de8..05d08d86054 100644..100755
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -41,7 +41,7 @@
</group>
<group col="2" colspan="2" name="misc">
<separator colspan="2" string="Miscelleanous"/>
- <field name="company_id" select="1" groups="base.group_multi_company" widget="selection"/>
+ <field name="company_id" select="1" groups="base.group_multi_company" widget="selection" required="1"/>
<field name="warn_manager"/>
</group>
<newline/>
@@ -73,6 +73,7 @@
<field colspan="4" name="partner_id" on_change="onchange_partner_id(partner_id)" select="1" string="Customer"/>
<field domain="[('partner_id','=',partner_id)]" name="contact_id" string="Invoice Address"/>
<field name="warn_customer"/>
+ <field name="currency_id" select="1" groups="base.group_multi_company" required="1"/>
<newline/>
<group colspan="4" col="4" groups="base.group_extended">
<separator colspan="2" string="Mail Header"/>
diff --git a/addons/project/report/__init__.py b/addons/project/report/__init__.py
index f35064b9752..f35064b9752 100644..100755
--- a/addons/project/report/__init__.py
+++ b/addons/project/report/__init__.py
diff --git a/addons/project/report/project_report.py b/addons/project/report/project_report.py
index 989f646724e..989f646724e 100644..100755
--- a/addons/project/report/project_report.py
+++ b/addons/project/report/project_report.py
diff --git a/addons/project/report/project_report.xml b/addons/project/report/project_report.xml
index 59d0fd28220..59d0fd28220 100644..100755
--- a/addons/project/report/project_report.xml
+++ b/addons/project/report/project_report.xml
diff --git a/addons/project/report/project_report.xsl b/addons/project/report/project_report.xsl
index 4da259ccf06..4da259ccf06 100644..100755
--- a/addons/project/report/project_report.xsl
+++ b/addons/project/report/project_report.xsl
diff --git a/addons/project/report/project_report_view.xml b/addons/project/report/project_report_view.xml
index 86f79857104..77dce617c7f 100644..100755
--- a/addons/project/report/project_report_view.xml
+++ b/addons/project/report/project_report_view.xml
@@ -2,7 +2,9 @@
<openerp>
<data>
- <menuitem id="base.menu_project_report" name="Reporting" parent="base.menu_main_pm" sequence="50"/>
+ <menuitem id="base.menu_project_report" name="Reporting"
+ groups="project.group_project_manager"
+ parent="base.menu_main_pm" sequence="50"/>
<record id="view_task_project_user_tree" model="ir.ui.view">
<field name="name">report.project.task.user.tree</field>
@@ -10,7 +12,7 @@
<field name="type">tree</field>
<field name="arch" type="xml">
<tree string="Tasks Analysis">
- <field name="name" invisible="1"/>
+ <field name="name" invisible="1"/>
<field name="project_id" invisible="1"/>
<field name="user_id" invisible="1"/>
<field name="date_deadline" invisible="1"/>
@@ -43,13 +45,13 @@
<field name="model">report.project.task.user</field>
<field name="type">graph</field>
<field name="arch" type="xml">
- <graph string="Tasks Analysis" type="bar">
- <field name="name"/>
- <field name="state" group="True"/>
- <field name="no_of_days" operator="+"/>
- </graph>
- </field>
- </record>
+ <graph string="Tasks Analysis" type="bar">
+ <field name="name"/>
+ <field name="state" group="True"/>
+ <field name="no_of_days" operator="+"/>
+ </graph>
+ </field>
+ </record>
<record id="view_task_project_user_search" model="ir.ui.view">
<field name="name">report.project.task.user.search</field>
@@ -57,52 +59,52 @@
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Tasks Analysis">
- <group colspan="10" col="12">
- <filter icon="terp-go-year" string=" Year "
+ <group colspan="10" col="12">
+ <filter icon="terp-go-year" string=" Year "
domain="[('date_start','&lt;=', time.strftime('%%Y-%%m-%%d')),('date_start','&gt;=',time.strftime('%%Y-01-01'))]"
- help="Current Year"/>
- <filter icon="terp-go-month" string=" Month "
- name="month"
- domain="[('date_start','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('date_start','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
- help="Current Month"/>
- <filter icon="terp-go-week"
- string=" Month-1 "
- separator="1"
+ help="Current Year"/>
+ <filter icon="terp-go-month" string=" Month "
+ name="month"
+ domain="[('date_start','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('date_start','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
+ help="Current Month"/>
+ <filter icon="terp-go-week"
+ string=" Month-1 "
+ separator="1"
domain="[('date_start','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('date_start','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
- help="Previous Month"/>
- <separator orientation="vertical"/>
- <filter string="Draft"
- icon="terp-document-new"
- domain="[('state','=','draft')]"
- help = "Draft tasks"/>
- <filter string="Current"
- icon="terp-check"
- domain="[('state', '=' ,'open')]"
- help = "In progress tasks"/>
- <filter string="Pending"
- icon="terp-gtk-media-pause"
- domain="[('state','=','pending')]"
- help = "Pending tasks"/>
- <filter string="Done"
- icon="terp-dialog-close"
- name="done"
- domain="[('state','=','done')]"/>
+ help="Previous Month"/>
+ <separator orientation="vertical"/>
+ <filter string="Draft"
+ icon="terp-document-new"
+ domain="[('state','=','draft')]"
+ help = "Draft tasks"/>
+ <filter string="Current"
+ icon="terp-check"
+ domain="[('state', '=' ,'open')]"
+ help = "In progress tasks"/>
+ <filter string="Pending"
+ icon="terp-gtk-media-pause"
+ domain="[('state','=','pending')]"
+ help = "Pending tasks"/>
+ <filter string="Done"
+ icon="terp-dialog-close"
+ name="done"
+ domain="[('state','=','done')]"/>
<separator orientation="vertical"/>
- <field name="project_id">
- <filter icon="terp-folder-violet"
- string="My Projects"
- help="My Projects" domain="[('project_id.user_id','=',uid)]"/>
+ <field name="project_id">
+ <filter icon="terp-folder-violet"
+ string="My Projects"
+ help="My Projects" domain="[('project_id.user_id','=',uid)]"/>
</field>
<field name="user_id" widget="selection">
- <filter icon="terp-personal"
- string="My Task"
- help = "My tasks"
- domain="[('user_id','=',uid)]" />
- <filter icon="terp-personal-"
- string="Non Assigned Tasks to users"
- help="Non Assigned Tasks to users"
- domain="[('user_id','=',False)]"/>
+ <filter icon="terp-personal"
+ string="My Task"
+ help = "My tasks"
+ domain="[('user_id','=',uid)]" />
+ <filter icon="terp-personal-"
+ string="Non Assigned Tasks to users"
+ help="Non Assigned Tasks to users"
+ domain="[('user_id','=',False)]"/>
</field>
<field name="partner_id" />
</group>
@@ -149,7 +151,7 @@
<field name="help">This report allows you to analyse the performance of your projects and users. You can analyse the quantities of tasks, the hours spent compared to the planned hours, the average number of days to open or close a task, etc.</field>
</record>
- <menuitem action="action_project_task_user_tree" id="menu_project_task_user_tree" parent="base.menu_project_report" groups="project.group_project_manager"/>
+ <menuitem action="action_project_task_user_tree" id="menu_project_task_user_tree" parent="base.menu_project_report"/>
<!-- Views and action for project dashboard -->
<record id="view_project_vs_remaining_hours_tree" model="ir.ui.view">
@@ -187,7 +189,7 @@
<field name="view_id" ref="view_project_vs_remaining_hours_graph"/>
</record>
- <record id="open_view_project_vs_remaining_hours_tree" model="ir.actions.act_window.view">
+ <record id="open_view_project_vs_remaining_hours_tree" model="ir.actions.act_window.view">
<field eval="2" name="sequence"/>
<field name="view_mode">tree</field>
<field name="view_id" ref="view_project_vs_remaining_hours_tree"/>
@@ -275,7 +277,7 @@
<field name="view_id" ref="view_project_vs_planned_total_hours_graph"/>
</record>
- <record id="open_view_project_vs_planned_total_hours_tree" model="ir.actions.act_window.view">
+ <record id="open_view_project_vs_planned_total_hours_tree" model="ir.actions.act_window.view">
<field eval="2" name="sequence"/>
<field name="view_mode">tree</field>
<field name="view_id" ref="view_project_vs_planned_total_hours_tree"/>
diff --git a/addons/project/res_partner.py b/addons/project/res_partner.py
index 3e2ff83f078..3e2ff83f078 100644..100755
--- a/addons/project/res_partner.py
+++ b/addons/project/res_partner.py
diff --git a/addons/project/res_partner_view.xml b/addons/project/res_partner_view.xml
index dc0226ba50e..dc0226ba50e 100644..100755
--- a/addons/project/res_partner_view.xml
+++ b/addons/project/res_partner_view.xml
diff --git a/addons/project/security/ir.model.access.csv b/addons/project/security/ir.model.access.csv
index fb237e88769..659948bc4d0 100644..100755
--- 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,0
+"access_project_task","project.task","model_project_task","project.group_project_user",1,1,1,1
"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
@@ -21,3 +21,4 @@
"access_project_vs_hours_manager","project.vs.hours.manager","model_project_vs_hours","project.group_project_manager",1,1,1,1
"access_project_task_sale_user","project.task salesman","model_project_task","base.group_sale_salesman",1,0,0,0
"access_project_project_sale_user","project.project salesman","model_project_project","base.group_sale_salesman",1,0,0,0
+"access_account_analytic_line_project","account.analytic.line project","analytic.model_account_analytic_line","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 b51a5a9c89a..b51a5a9c89a 100644..100755
--- a/addons/project/security/project_security.xml
+++ b/addons/project/security/project_security.xml
diff --git a/addons/project/test/test_project.yml b/addons/project/test/test_project.yml
index bca3bcbff41..bca3bcbff41 100644..100755
--- a/addons/project/test/test_project.yml
+++ b/addons/project/test/test_project.yml
diff --git a/addons/project/test/test_project_delegation.yml b/addons/project/test/test_project_delegation.yml
index 02bc9afaae8..02bc9afaae8 100644..100755
--- a/addons/project/test/test_project_delegation.yml
+++ b/addons/project/test/test_project_delegation.yml
diff --git a/addons/project/wizard/__init__.py b/addons/project/wizard/__init__.py
index 69e1051e621..69e1051e621 100644..100755
--- a/addons/project/wizard/__init__.py
+++ b/addons/project/wizard/__init__.py
diff --git a/addons/project/wizard/project_task_close.py b/addons/project/wizard/project_task_close.py
index 7091f466e2c..7091f466e2c 100644..100755
--- a/addons/project/wizard/project_task_close.py
+++ b/addons/project/wizard/project_task_close.py
diff --git a/addons/project/wizard/project_task_close_view.xml b/addons/project/wizard/project_task_close_view.xml
index d6bed92824d..d6bed92824d 100644..100755
--- a/addons/project/wizard/project_task_close_view.xml
+++ b/addons/project/wizard/project_task_close_view.xml
diff --git a/addons/project/wizard/project_task_delegate.py b/addons/project/wizard/project_task_delegate.py
index 72b32f7db68..72b32f7db68 100644..100755
--- a/addons/project/wizard/project_task_delegate.py
+++ b/addons/project/wizard/project_task_delegate.py
diff --git a/addons/project/wizard/project_task_delegate_view.xml b/addons/project/wizard/project_task_delegate_view.xml
index f9b27af05b3..f9b27af05b3 100644..100755
--- a/addons/project/wizard/project_task_delegate_view.xml
+++ b/addons/project/wizard/project_task_delegate_view.xml
diff --git a/addons/project/wizard/project_task_reevaluate.py b/addons/project/wizard/project_task_reevaluate.py
index e4e2fab66e3..e4e2fab66e3 100644..100755
--- a/addons/project/wizard/project_task_reevaluate.py
+++ b/addons/project/wizard/project_task_reevaluate.py
diff --git a/addons/project/wizard/project_task_reevaluate_view.xml b/addons/project/wizard/project_task_reevaluate_view.xml
index f0158631f51..f0158631f51 100644..100755
--- a/addons/project/wizard/project_task_reevaluate_view.xml
+++ b/addons/project/wizard/project_task_reevaluate_view.xml