Anto has proposed merging
lp:~openerp-dev/openobject-addons/trunk-bug-994272-abo into
lp:openobject-addons.
Requested reviews:
OpenERP Core Team (openerp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-bug-994272-abo/+merge/131913
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-bug-994272-abo/+merge/131913
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-bug-994272-abo.
=== modified file 'analytic/analytic.py'
--- analytic/analytic.py 2012-10-29 09:17:13 +0000
+++ analytic/analytic.py 2012-10-29 14:07:24 +0000
@@ -96,9 +96,29 @@
res[row['id']][field] = row[field]
return self._compute_level_tree(cr, uid, ids, child_ids, res, fields, context)
- def _complete_name_calc(self, cr, uid, ids, prop, unknow_none, unknow_dict):
- res = self.name_get(cr, uid, ids)
- return dict(res)
+ def name_get(self, cr, uid, ids, context=None):
+ res = []
+ for id in ids:
+ elmt = self.browse(cr, uid, id, context=context)
+ res.append((id, self._get_one_full_name(elmt)))
+ return res
+
+ def _get_full_name(self, cr, uid, ids, name=None, args=None, context=None):
+ if context == None:
+ context = {}
+ res = {}
+ for elmt in self.browse(cr, uid, ids, context=context):
+ res[elmt.id] = self._get_one_full_name(elmt)
+ return res
+
+ def _get_one_full_name(self, elmt, level=6):
+ if level<=0:
+ return '...'
+ if elmt.parent_id:
+ parent_path = self._get_one_full_name(elmt.parent_id, level-1) + "/"
+ else:
+ parent_path = ''
+ return parent_path + elmt.name
def _child_compute(self, cr, uid, ids, name, arg, context=None):
result = {}
@@ -139,7 +159,7 @@
_columns = {
'name': fields.char('Account/Contract Name', size=128, required=True),
- 'complete_name': fields.function(_complete_name_calc, type='char', string='Full Account Name'),
+ 'complete_name': fields.function(_get_full_name, type='char', string='Full Account Name'),
'code': fields.char('Reference', size=24, select=True),
'type': fields.selection([('view','Analytic View'), ('normal','Analytic Account'),('contract','Contract or Project'),('template','Template of Contract')], 'Type of Account', required=True,
help="If you select the View Type, it means you won\'t allow to create journal entries using that account.\n"\
=== modified file 'project/project_view.xml'
--- project/project_view.xml 2012-10-28 08:35:08 +0000
+++ project/project_view.xml 2012-10-29 14:07:24 +0000
@@ -10,7 +10,7 @@
<menuitem id="menu_project_management" name="Project" parent="base.menu_main_pm" sequence="1"/>
<menuitem id="base.menu_definitions" name="Configuration" parent="base.menu_main_pm" sequence="60"/>
-
+
<record id="act_project_project_2_project_task_all" model="ir.actions.act_window">
<field name="res_model">project.task</field>
<field name="view_type">form</field>
@@ -141,9 +141,8 @@
<field name="date" string="End Date"/>
<field name="priority" groups="base.group_no_one"/>
<field name="active" attrs="{'invisible':[('state','in',['open', 'pending', 'template'])]}"/>
-
<field name="currency_id" groups="base.group_multi_currency" required="1"/>
- <field name="parent_id" domain="[('id','!=',analytic_account_id)]" context="{'current_model': 'project.project'}"/>
+ <field name="parent_id" string="Parent" help="Append this project to another one using analytic accounts hierarchy" domain="[('id','!=',analytic_account_id)]" context="{'current_model': 'project.project'}" />
</group>
</group>
</page>
@@ -160,7 +159,7 @@
</field>
</record>
- <record id="view_project_project_filter" model="ir.ui.view">
+ <record id="view_project_project_filter" model="ir.ui.view">
<field name="name">project.project.select</field>
<field name="model">project.project</field>
<field name="arch" type="xml">
@@ -475,7 +474,7 @@
</field>
</record>
- <!-- Project Task Kanban View -->
+ <!-- Project Task Kanban View -->
<record model="ir.ui.view" id="view_task_kanban">
<field name="name">project.task.kanban</field>
<field name="model">project.task</field>
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
