-
Notifications
You must be signed in to change notification settings - Fork 76
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #180 from sudhir-serpentcs/10.0-MIG-Issue175-BR001…
…140-project_partner_name [MIG][10.0-Issue175-T23296] project_partner_name
- Loading branch information
Showing
11 changed files
with
181 additions
and
148 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -15,15 +15,14 @@ Installation | |
============ | ||
|
||
To install this module, you need to: | ||
* have basic modules installed (project) | ||
* Have basic modules installed (project) | ||
|
||
Bug Tracker | ||
=========== | ||
|
||
Bugs are tracked on `GitHub Issues | ||
<https://github.com/OCA/infrastructure-dns/issues>`_. In case of trouble, please | ||
check there if your issue has already been reported. If you spotted it first, | ||
help us smashing it by providing a detailed and welcomed feedback. | ||
Bugs are tracked on `GitHub Issues <https://github.com/Elico-Corp/odoo-addons/issues>`_. | ||
In case of trouble, please check there if your issue has already been reported. | ||
If you spotted it first, help us smashing it by providing a detailed and welcomed feedback | ||
|
||
Credits | ||
======= | ||
|
@@ -44,9 +43,20 @@ Maintainer | |
|
||
This module is maintained by Elico Corporation. | ||
|
||
Elico Corporation offers consulting services to implement open source | ||
management software in SMEs, with a strong involvement in quality of service. | ||
Elico Corp is an innovative actor in China, Hong-Kong and Singapore servicing | ||
well known international companies and as well as local mid-sized businesses. | ||
Since 2010, our seasoned Sino-European consultants have been providing full | ||
range Odoo services: | ||
|
||
Our headquarters are located in Shanghai with branches in Hong Kong, ShenZhen | ||
and Singapore servicing customers from Greater China, Asia Pacific, Europe, | ||
Americas, etc... | ||
* Business consultancy for Gap analysis, BPM, operational work-flows review. | ||
* Ready-to-use ERP packages aimed at starting businesses. | ||
* Odoo implementation for manufacturing, international trading, service industry | ||
and e-commerce. | ||
* Connectors and integration with 3rd party software (Magento, Taobao, Coswin, | ||
Joomla, Prestashop, Tradevine etc...). | ||
* Odoo Support services such as developments, training, maintenance and hosting. | ||
|
||
Our headquarters are located in Shanghai with branch in Singapore servicing | ||
customers from all over Asia Pacific. | ||
|
||
Contact information: `Sales <[email protected]>`__ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,5 @@ | ||
# -*- coding: utf-8 -*- | ||
# © 2016 Elico Corp (www.elico-corp.com). | ||
# © 2016-2017 Elico Corp (https://www.elico-corp.com) | ||
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). | ||
|
||
from . import models |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,20 +1,21 @@ | ||
# -*- coding: utf-8 -*- | ||
# © 2016 Elico Corp (www.elico-corp.com). | ||
# © 2016-2017 Elico Corp (https://www.elico-corp.com) | ||
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). | ||
{ | ||
"name": "Project Partner Name", | ||
"summary": "Project Partner Name", | ||
"version": "10.0.1.0.0", | ||
'category': 'Project Management', | ||
'website': 'https://www.elico-corp.com', | ||
'support': '[email protected]', | ||
"author": "Elico Corp", | ||
"category": "Project Management", | ||
"website": "https://www.elico-corp.com", | ||
"support": "[email protected]", | ||
"license": "AGPL-3", | ||
"application": False, | ||
"installable": False, | ||
"depends": [ | ||
"project", | ||
"account_analytic_parent", | ||
], | ||
"data": [ | ||
"views/project_view.xml", | ||
], | ||
"installable": True, | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,6 @@ | ||
# -*- coding: utf-8 -*- | ||
# © 2016 Elico Corp (www.elico-corp.com). | ||
# © 2016-2017 Elico Corp (https://www.elico-corp.com) | ||
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). | ||
|
||
from . import project_partner_mandatory | ||
from . import analytic_account_id | ||
from . import project_project | ||
from . import analytic_account |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,56 @@ | ||
# -*- coding: utf-8 -*- | ||
# © 2016-2017 Elico Corp (https://www.elico-corp.com) | ||
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). | ||
|
||
from odoo import api, models | ||
|
||
|
||
class AnalyticAccount(models.Model): | ||
_inherit = 'account.analytic.account' | ||
|
||
def _get_partner_ref(self, project): | ||
partner = project.partner_id | ||
return partner.is_company and partner.ref\ | ||
or (partner.parent_id and partner.parent_id.ref or False) | ||
|
||
@api.multi | ||
def _get_full_names(self, level): | ||
self.ensure_one() | ||
|
||
# Tail recursion function | ||
def iter_parent_ids(elmt, level, full_names): | ||
if level <= 0: | ||
full_names.append('...') | ||
return (None, 0, full_names) | ||
elif elmt.parent_id and not elmt.type == 'template': | ||
full_names.append(elmt.name) | ||
return iter_parent_ids(elmt.parent_id, level - 1, full_names) | ||
else: | ||
full_names.append(elmt.name) | ||
return (None, level - 1, full_names) | ||
|
||
(_, _, full_names) = iter_parent_ids(self, level, []) | ||
|
||
return full_names | ||
|
||
@api.multi | ||
def name_get(self): | ||
res = [] | ||
project_obj = self.env['project.project'] | ||
for analytic_acc in self: | ||
full_names = analytic_acc._get_full_names(6) | ||
if isinstance(full_names, list) and full_names: | ||
project = project_obj.search( | ||
[('analytic_account_id', '=', analytic_acc.id)], limit=1 | ||
) | ||
if project: | ||
partner_ref = self._get_partner_ref(project) | ||
if partner_ref: | ||
full_names[0] = "%s - %s" % ( | ||
partner_ref, | ||
full_names[0] | ||
) | ||
full_names.reverse() # order on First Root Last Leaf | ||
res.append((analytic_acc.id, ' / '.join(full_names))) | ||
|
||
return res |
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,40 @@ | ||
# -*- coding: utf-8 -*- | ||
# © 2016-2017 Elico Corp (https://www.elico-corp.com) | ||
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). | ||
|
||
from odoo import api, models | ||
|
||
|
||
class ProjectProject(models.Model): | ||
_inherit = 'project.project' | ||
|
||
def _get_partner_ref(self, project): | ||
partner = project.partner_id | ||
return partner.is_company and partner.ref\ | ||
or (partner.parent_id and partner.parent_id.ref or False) | ||
|
||
@api.multi | ||
def name_get(self): | ||
result = [] | ||
for project in self: | ||
partner_ref = self._get_partner_ref(project) | ||
project_name = partner_ref and '%s - %s' % ( | ||
partner_ref, project.name | ||
) or project.name | ||
result.append((project.id, '%s' % (project_name))) | ||
return result | ||
|
||
@api.model | ||
def name_search(self, name, args=None, operator='ilike', limit=100): | ||
args = args or [] | ||
projects = self.browse() | ||
if name: | ||
projects = self.search( | ||
['|', ('partner_id.ref', operator, name), | ||
('partner_id.parent_id.ref', operator, name)] + args, | ||
limit=limit | ||
) | ||
if not projects: | ||
projects = self.search([('name', operator, name)] + args, | ||
limit=limit) | ||
return projects.name_get() |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
# -*- coding: utf-8 -*- | ||
# © 2017 Elico corp (www.elico-corp.com) | ||
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html) | ||
|
||
from . import test_project_partner_name |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,36 @@ | ||
# -*- coding: utf-8 -*- | ||
# © 2017 Elico corp (www.elico-corp.com) | ||
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html) | ||
from odoo.tests import common | ||
|
||
|
||
class TestProjectPartnerName(common.TransactionCase): | ||
|
||
def setUp(self): | ||
super(TestProjectPartnerName, self).setUp() | ||
self.project_obj = self.env['project.project'] | ||
self.analytic_acc_obj = self.env['account.analytic.account'] | ||
self.project1 = self.env.ref('project.project_project_3') | ||
self.partner1 = self.env.ref('base.res_partner_2') | ||
self.project1.partner_id = self.partner1.id | ||
self.partner1.ref = 'ref1' | ||
self.project2 = self.env.ref('project.project_project_5') | ||
self.partner2 = self.env.ref('base.res_partner_address_13') | ||
self.partner2.parent_id.ref = 'ref2' | ||
|
||
def test_name_get_search(self): | ||
"""Check namge_get and namge_search of Project / Analytic | ||
Partner Name Ref""" | ||
proj_name1 = self.project1.name | ||
self.assertEqual(self.project1.name_get()[0][1], | ||
self.partner1.ref + ' - ' + proj_name1) | ||
self.assertEqual(self.project2.name_get()[0][1], | ||
self.partner2.parent_id.ref + ' - ' + | ||
self.project2.name) | ||
self.assertEqual(self.project_obj.name_search(proj_name1)[0][1], | ||
self.partner1.ref + ' - ' + proj_name1) | ||
analytic_name = self.analytic_acc_obj.name_search( | ||
self.project1.analytic_account_id.name | ||
) | ||
self.assertEqual(analytic_name[0][1], | ||
self.partner1.ref + ' - ' + proj_name1) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,15 +1,15 @@ | ||
<?xml version="1.0" encoding="utf-8"?> | ||
<openerp> | ||
<data> | ||
<record id="edit_project" model="ir.ui.view"> | ||
<field name="name">project.project.form</field> | ||
<field name="model">project.project</field> | ||
<field name="inherit_id" ref="project.edit_project"/> | ||
<field name="arch" type="xml"> | ||
<field name="partner_id" position="attributes"> | ||
<attribute name="required">1</attribute> | ||
</field> | ||
<odoo> | ||
|
||
<record id="edit_project" model="ir.ui.view"> | ||
<field name="name">project.project.form</field> | ||
<field name="model">project.project</field> | ||
<field name="inherit_id" ref="project.edit_project"/> | ||
<field name="arch" type="xml"> | ||
<field name="partner_id" position="attributes"> | ||
<attribute name="required">1</attribute> | ||
</field> | ||
</record> | ||
</data> | ||
</openerp> | ||
</field> | ||
</record> | ||
|
||
</odoo> |