Ravish(OpenERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-crm_sale_feature-rmu into
lp:openobject-addons.
Requested reviews:
OpenERP Core Team (openerp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-crm_sale_feature-rmu/+merge/144213
Hello,
I have made all ask changes , group by sale team is already available and for
Crm label task ,it always show field's description(define in py),Product is
another example.
Thanks,
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-crm_sale_feature-rmu/+merge/144213
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-crm_sale_feature-rmu.
=== modified file 'account_analytic_analysis/account_analytic_analysis.py'
--- account_analytic_analysis/account_analytic_analysis.py 2012-12-21 16:48:08 +0000
+++ account_analytic_analysis/account_analytic_analysis.py 2013-01-22 05:52:23 +0000
@@ -484,6 +484,16 @@
res['value']['to_invoice'] = template.to_invoice.id
res['value']['pricelist_id'] = template.pricelist_id.id
return res
+
+ def on_change_timesheets(self, cr, ids, uid, invoice_on_timesheets):
+ if invoice_on_timesheets == True:
+ return { 'value':{
+ 'use_timesheets': True,
+ 'to_invoice':1,
+ }}
+ else:
+ return { 'value':{'use_timesheets': False}}
+
account_analytic_account()
class account_analytic_account_summary_user(osv.osv):
=== modified file 'account_analytic_analysis/account_analytic_analysis_view.xml'
--- account_analytic_analysis/account_analytic_analysis_view.xml 2013-01-10 17:11:00 +0000
+++ account_analytic_analysis/account_analytic_analysis_view.xml 2013-01-22 05:52:23 +0000
@@ -79,7 +79,7 @@
<td class="oe_timesheet_grey">
<label for="invoice_on_timesheets"/>
</td><td class="oe_timesheet_grey">
- <field name="invoice_on_timesheets"/>
+ <field name="invoice_on_timesheets" on_change="on_change_timesheets(invoice_on_timesheets)"/>
</td><td>
<field class="oe_inline" name="hours_qtt_est" attrs="{'invisible': [('invoice_on_timesheets','=',False)]}"/>
</td><td>
@@ -121,7 +121,7 @@
</td>
</tr>
</table>
- <group name='invoice_on_timesheets' attrs="{'invisible': [('invoice_on_timesheets','=',False)]}">
+ <group name='invoice_on_timesheets' attrs="{'invisible': [('invoice_on_timesheets','=',False)]}">
<p class="oe_grey oe_edit_only" colspan="2">
When invoicing on timesheet, OpenERP uses the
pricelist of the contract which uses the price
=== modified file 'hr_timesheet_invoice/hr_timesheet_invoice_view.xml'
--- hr_timesheet_invoice/hr_timesheet_invoice_view.xml 2012-12-07 11:20:02 +0000
+++ hr_timesheet_invoice/hr_timesheet_invoice_view.xml 2013-01-22 05:52:23 +0000
@@ -18,10 +18,10 @@
</xpath>
<xpath expr="/form/sheet" position='before'>
<header>
- <button name="set_pending" string="Pending" type="object" states="open" />
+ <button name="set_pending" string="To Renew" type="object" states="open" />
<button name="set_close" string="Contract Finished" type="object" states="open,pending" />
- <button name="set_open" string="Re-open project" type="object" states="pending,close" />
- <button name="set_open" string="Re-open project" type="object" states="cancelled,draft"/>
+ <button name="set_open" string="Set In Progress" type="object" states="pending,close" />
+ <button name="set_open" string="Set In Progress" type="object" states="cancelled,draft"/>
<button name="set_cancel" string="Cancel Contract" type="object" states="open,pending"/>
<field name="state" readonly="1" widget="statusbar"
statusbar_visible="open,pending,close" statusbar_colors='{"pending":"red", "template":"blue"}'/>
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : openerp-dev-gtk@lists.launchpad.net
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
