pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[MERGE] merge with main addons

Browse Source 
bzr revid: psi@tinyerp.com-20120619050100-26hsypt5z491kbje
This commit is contained in:
Purnendu Singh (OpenERP)
2012-06-19 10:31:00 +05:30
parent d75a9c0023 8662748bf6
commit 2e3728db21
75 changed files with 2831 additions and 1302 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/project_long_term/project_long_term_view.xml
+1 -1
View File
@@ -213,7 +213,7 @@
</group>
</group>
<separator string="Force Assigned Users"/>
<field name="user_force_ids"/>
<field name="user_force_ids" widget="many2many_tags" />
<separator string="Previous Phases"/>
<field name="previous_phase_ids"/>
<separator string="Next Phases"/>
addons/project_long_term/wizard/project_compute_phases.py
+1 -1
View File
@@ -28,7 +28,7 @@ class project_compute_phases(osv.osv_memory):
'target_project': fields.selection([
('all', 'Compute All My Projects'),
('one', 'Compute a Single Project'),
], 'Schedule', required=True),
], 'Action', required=True),
'project_id': fields.many2one('project.project', 'Project')
}
_defaults = {
addons/project_long_term/wizard/project_compute_phases_view.xml
+1 -2
View File
@@ -10,9 +10,8 @@
<form string="Schedule Phases" version="7.0">
<header>
<button icon="gtk-ok" name="check_selection" string="C_ompute" type="object"/>
<button icon="gtk-cancel" special="cancel" string="_Cancel"/>
</header>
<group string="Schedule Phases">
<group>
<field name="target_project"/>
<field name="project_id" attrs="{'invisible':[('target_project','=','all')], 'required':[('target_project','!=','all')]}"/>
</group>
addons/project_long_term/wizard/project_compute_tasks_view.xml
-1
View File
@@ -10,7 +10,6 @@
<form string="Schedule Tasks" version="7.0">
<header>
<button icon="gtk-ok" name="compute_date" string="C_ompute" type="object"/>
<button icon="gtk-cancel" special="cancel" string="_Cancel"/>
</header>
<group>
<field name="project_id"/>