Sanjay Gohel (Open ERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-project-gallery-apa-improvement-sgo
into lp:~openerp-dev/openobject-addons/trunk-project-gallery-apa.
Requested reviews:
Amit Patel (OpenERP) (apa-tiny)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-project-gallery-apa-improvement-sgo/+merge/104089
Hello sir,
I have change the label of hours and set default value in timesheet if its
create from project and if phases will create from project project of that
setted in new phases.
and changed kanban color red.
Thank You.
SGO
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-project-gallery-apa-improvement-sgo/+merge/104089
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-project-gallery-apa.
=== modified file 'project/static/src/css/project.css'
--- project/static/src/css/project.css 2012-04-26 17:35:41 +0000
+++ project/static/src/css/project.css 2012-04-30 10:54:21 +0000
@@ -24,6 +24,7 @@
.project_vignettes .project_fields {
width: 100%; }
.project_vignettes .project_fields th {
+ width: 120px;
font-weight: normal; }
.project_vignettes .project_fields td {
color: #888888; }
@@ -117,7 +118,7 @@
background: #B1DCFE;
}
.oe_kanban_color_2 {
- background: firebrick;
+ background: #FFB8B8;
}
.oe_kanban_color_3 {
background: khaki;
=== modified file 'project_long_term/project_long_term_view.xml'
--- project_long_term/project_long_term_view.xml 2012-04-27 06:27:25 +0000
+++ project_long_term/project_long_term_view.xml 2012-04-30 10:54:21 +0000
@@ -308,7 +308,7 @@
<field name="inherit_id" ref="project.view_task_form2"/>
<field name="arch" type="xml">
<xpath expr="//field[@name='effective_hours']" position="after">
- <field name="phase_id"/>
+ <field name="phase_id" context="{'default_project_id' : project_id}"/>
</xpath>
</field>
</record>
=== modified file 'project_timesheet/project_timesheet.py'
--- project_timesheet/project_timesheet.py 2012-04-24 11:33:21 +0000
+++ project_timesheet/project_timesheet.py 2012-04-30 10:54:21 +0000
@@ -76,6 +76,15 @@
factor_id = data_obj.browse(cr, uid, data_id).res_id
res['value'].update({'to_invoice': factor_id})
return res
+
+ def getAnalyticJournal(self, cr, uid, context=None):
+ md = self.pool.get('ir.model.data')
+ try:
+ result = md.get_object_reference(cr, uid, 'hr_timesheet', 'analytic_journal')
+ return result[1]
+ except ValueError:
+ pass
+ return False
def open_timesheets(self, cr, uid, ids, context=None):
#Open the View for the Timesheet of the project
@@ -87,7 +96,7 @@
context = {}
if ids:
project = self.browse(cr, uid, ids[0], context=context)
- context = dict(context, search_default_account_id=project.analytic_account_id.id)
+ context = dict(context, search_default_account_id=project.analytic_account_id.id,default_account_id=project.analytic_account_id.id,default_journal_id=self.getAnalyticJournal(cr, uid, context))
return {
'name': _('Bill Tasks Works'),
'context': context,
=== modified file 'project_timesheet/project_timesheet_view.xml'
--- project_timesheet/project_timesheet_view.xml 2012-04-27 06:27:25 +0000
+++ project_timesheet/project_timesheet_view.xml 2012-04-30 10:54:21 +0000
@@ -32,7 +32,7 @@
<field name="inherit_id" ref="project.view_project_kanban"/>
<field name="arch" type="xml">
<field name="task" position="after">
- <field name="timesheets"/>
+ <field name="timesheets" context="{'search_default_account_id': project_id, 'default_account_id': project_id}"/>
<field name="total_timesheet"/>
<field name="currency_id"/>
</field>
@@ -44,13 +44,13 @@
<xpath expr="//tr[@id='deadline']" position="before">
<tr >
- <th align="left">To invoice</th>
+ <th align="left">Amount to invoice</th>
<td align="left">
<field name="amt_to_invoice"/> <t t-esc="record.currency_id.raw_value[1].split(' ')[1][1]"/>
</td>
</tr>
<tr>
- <th align="left">To hours</th>
+ <th align="left">Hours to Invoice</th>
<td align="left">
<field name="hrs_to_invoice"/> h
</td>
_______________________________________________
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
