diff options
| author | Christophe Simonis <chs@odoo.com> | 2018-06-15 13:27:17 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2018-06-15 13:27:27 +0200 |
| commit | 73652a0b196b51ec1f9a27880d0b398fb79bfca3 (patch) | |
| tree | 04e741fefdbb859dffa66a4037da7777ea980476 /addons/project | |
| parent | 8a03563269c3dc55c9c7157494af51e2485f1a14 (diff) | |
| parent | 50860317ccd2c1b44f873598858a3cff87fa7ea6 (diff) | |
[MERGE] forward port branch saas-11.3 up to 50860317ccd
Note: 1aacc962620982528a3dfc90d2c1dd0027359375 has been ignored and will
be forward-ported later
Diffstat (limited to 'addons/project')
| -rw-r--r-- | addons/project/controllers/portal.py | 2 | ||||
| -rw-r--r-- | addons/project/i18n/tr.po | 2 | ||||
| -rw-r--r-- | addons/project/models/project.py | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/addons/project/controllers/portal.py b/addons/project/controllers/portal.py index 96d845105e2..27ecc3c6a7f 100644 --- a/addons/project/controllers/portal.py +++ b/addons/project/controllers/portal.py @@ -142,7 +142,7 @@ class CustomerPortal(CustomerPortal): # pager pager = portal_pager( url="/my/tasks", - url_args={'date_begin': date_begin, 'date_end': date_end, 'sortby': sortby, 'filterby': filterby}, + url_args={'date_begin': date_begin, 'date_end': date_end, 'sortby': sortby, 'filterby': filterby, 'search_in': search_in, 'search': search}, total=task_count, page=page, step=self._items_per_page diff --git a/addons/project/i18n/tr.po b/addons/project/i18n/tr.po index 4e4795b6648..aa60fd117ae 100644 --- a/addons/project/i18n/tr.po +++ b/addons/project/i18n/tr.po @@ -1523,6 +1523,8 @@ msgid "" "Lets the company customize which Pad installation should be used to link to " "new pads (for example: http://etherpad.com/)." msgstr "" +"Şirketin yeni pedlere bağlantı kurmak için hangi Pad kurulumunun " +"kullanılması gerektiğini özelleştirir (örneğin: http://etherpad.com/)." #. module: project #: model:ir.model.fields,help:project.field_project_project__analytic_account_id diff --git a/addons/project/models/project.py b/addons/project/models/project.py index 4d486326217..c469614e1f0 100644 --- a/addons/project/models/project.py +++ b/addons/project/models/project.py @@ -872,7 +872,7 @@ class Task(models.Model): groups = [new_group] + groups for group_name, group_method, group_data in groups: - if group_name in ('customer'): + if group_name == 'customer': continue group_data['has_button_access'] = True |