Khushboo Bhatt(openerp) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-project-kanban-view-kbh-kbh into
lp:~openerp-dev/openobject-addons/trunk-project-kanban.
Requested reviews:
Amit Patel (OpenERP) (apa-tiny)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-project-kanban-view-kbh-kbh/+merge/97359
hello,
I have changed default project_id in project.task and project.issue model.
Thank you,
kbh.
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-project-kanban-view-kbh-kbh/+merge/97359
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-project-kanban.
=== modified file 'project/project.py'
--- project/project.py 2012-03-14 04:57:25 +0000
+++ project/project.py 2012-03-14 10:00:25 +0000
@@ -725,6 +725,7 @@
'progress': 0,
'sequence': 10,
'active': True,
+ 'project_id':lambda self, cr, uid, context: context.get('active_id',False),
'user_id': lambda obj, cr, uid, context: uid,
'company_id': lambda self, cr, uid, c: self.pool.get('res.company')._company_default_get(cr, uid, 'project.task', context=c)
}
=== modified file 'project/project_view.xml'
--- project/project_view.xml 2012-03-13 11:35:58 +0000
+++ project/project_view.xml 2012-03-14 10:00:25 +0000
@@ -193,7 +193,7 @@
<p class="tasks">
<button name="open_tasks" class="oe_project_buttons" type="object"><i>Tasks (<field name="open_task"/>)</i></button>
</p>
-
+
<div class="progress invoiced">
<br/>
<t t-esc="Math.round(record.effective_hours.raw_value)"/> hrs
=== modified file 'project/static/src/css/project.css'
--- project/static/src/css/project.css 2012-03-09 08:18:22 +0000
+++ project/static/src/css/project.css 2012-03-14 10:00:25 +0000
@@ -1,7 +1,4 @@
-.oe_project_vignette {
- padding: 6px;
- min-height: 100px;
-}
+
.oe_project_border{
border-right: groove;
}
@@ -50,85 +47,11 @@
}
.oe_project_font1{
-
+
-webkit-margin-before: 0em;
-webkit-margin-after: 0em;
}
-.oe_project_icon, .oe_project_desc {
- display: inline-block;
- vertical-align: top;
-}
-
-.oe_project_icon {
- width: 80px;
- height: 80px;
- padding: 0 4px;
-}
-
-.oe_project_progress{
- border-top-left-radius:3px;
- border-top-right-radius:3px;
- font-size: 40px;
- height:70px;
- font-weight: bold;
- text-align: center;
- margin-bottom:-7px;
- color: #FFFFFF;
- -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.4);
- background-color: #8A89BA;
-}
-.oe_project_end_date{
- border-bottom-left-radius:3px;
- border-bottom-right-radius:3px;
- font-size: 12px;
- text-align: center;
- font-weight: bold;
- color: #8A89BA;
- -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.4);
- background-color: #FFFFFF;
-}
-.oe_project_text{
- border-bottom-left-radius:3px;
- border-bottom-right-radius:3px;
- font-size: 15px;
- text-align: center;
- font-weight: bold;
- color: #FFFFFF;
- background-color: #8A89BA;
-}
-.oe_project_image {
- width: 20px;
- height: 20px;
- }
-
-.oe_project_desc {
- width: 220px;
- font-size: 13px;
- padding: 2px 5px;
- color: #4c4c4c;
-}
-
-.oe_project_desc h4 {
- margin: 0;
- font-size: 13px;
-}
-
-.oe_project_desc h4 a {
- color: #4c4c4c;
-}
-
-.oe_project_desc h4 a:hover {
- text-decoration: underline;
-}
-
-.oe_project_desc p {
- margin: 3px 0 5px;
-}
-
-.oe_project_desc .oe_button {
- font-size: 66%;
- min-width: 40px;
- height: 17px;
-}
-
+div.oe_fold_column{
+ padding:0px !important;
+}
\ No newline at end of file
=== modified file 'project_issue/project_issue.py'
--- project_issue/project_issue.py 2012-03-09 08:18:22 +0000
+++ project_issue/project_issue.py 2012-03-14 10:00:25 +0000
@@ -255,7 +255,9 @@
user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
if user.context_project_id:
return user.context_project_id.id
- return False
+ else:
+ project_id = context.get('active_id',False)
+ return project_id
def on_change_project(self, cr, uid, ids, project_id, context=None):
return {}
_______________________________________________
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
