Amit Patel (OpenERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-10clicks-sale-apa into
lp:openobject-addons.
Requested reviews:
OpenERP Core Team (openerp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-10clicks-sale-apa/+merge/132678
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-10clicks-sale-apa/+merge/132678
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-10clicks-sale-apa.
=== modified file 'mail/mail_followers.py'
--- mail/mail_followers.py 2012-10-29 11:21:17 +0000
+++ mail/mail_followers.py 2012-11-02 11:01:37 +0000
@@ -161,9 +161,13 @@
if signature:
body_html = tools.append_content_to_html(body_html, signature)
+ partner_email = []
+ for partner in msg.partner_ids:
+ if partner.email:partner_email.append(partner.email)
+
mail_values = {
'mail_message_id': msg.id,
- 'email_to': [],
+ 'email_to': partner_email,
'auto_delete': True,
'body_html': body_html,
'state': 'outgoing',
=== modified file 'project/wizard/project_task_reevaluate_view.xml'
--- project/wizard/project_task_reevaluate_view.xml 2012-08-09 06:05:16 +0000
+++ project/wizard/project_task_reevaluate_view.xml 2012-11-02 11:01:37 +0000
@@ -9,7 +9,7 @@
<form string="Reevaluate Task" version="7.0">
<separator string="Reevaluation Task"/>
<group>
- <field name="remaining_hours" widget="float_time"/>
+ <field name="remaining_hours" widget="float_time" groups="project.group_time_work_estimation_tasks"/>
</group>
<footer>
<button name="compute_hours" string="_Evaluate" type="object" default_focus="1" class="oe_highlight"/>
=== modified file 'sale/sale.py'
--- sale/sale.py 2012-11-02 08:36:12 +0000
+++ sale/sale.py 2012-11-02 11:01:37 +0000
@@ -580,6 +580,11 @@
self.write(cr, uid, ids, {'state': 'cancel'})
return True
+ def action_draft(self, cr, uid, ids, context=None):
+ """Resets Sale Order as draft.
+ """
+ return self.write(cr, uid, ids, {'state':'draft'}, context=context)
+
def action_button_confirm(self, cr, uid, ids, context=None):
assert len(ids) == 1, 'This option should only be used for a single id at a time.'
wf_service = netsvc.LocalService('workflow')
=== modified file 'sale/sale_view.xml'
--- sale/sale_view.xml 2012-10-29 09:14:55 +0000
+++ sale/sale_view.xml 2012-11-02 11:01:37 +0000
@@ -164,14 +164,15 @@
<field name="arch" type="xml">
<form string="Sales Order" version="7.0">
<header>
+ <button name="action_draft" string="Reset to Draft" states="cancel" type="object"/>
<button name="invoice_recreate" states="invoice_except" string="Recreate Invoice" groups="base.group_user"/>
<button name="invoice_corrected" states="invoice_except" string="Ignore Exception" groups="base.group_user"/>
<button name="action_quotation_send" string="Send by Mail" type="object" states="draft" class="oe_highlight" groups="base.group_user"/>
<button name="action_quotation_send" string="Send by Mail" type="object" states="sent" groups="base.group_user"/>
<button name="print_quotation" string="Print" type="object" states="draft" class="oe_highlight" groups="base.group_user"/>
<button name="print_quotation" string="Print" type="object" states="sent" groups="base.group_user"/>
- <button name="action_button_confirm" states="draft" string="Confirm" type="object" groups="base.group_user"/>
- <button name="action_button_confirm" states="sent" string="Confirm" class="oe_highlight" type="object" groups="base.group_user"/>
+ <button name="action_button_confirm" states="draft" string="Confirm Sale" type="object" groups="base.group_user"/>
+ <button name="action_button_confirm" states="sent" string="Confirm Sale" class="oe_highlight" type="object" groups="base.group_user"/>
<button name="action_view_invoice" string="View Invoice" type="object" class="oe_highlight"
attrs="{'invisible': [('invoice_exists', '=', False)]}" groups="base.group_user"/>
<button name="%(action_view_sale_advance_payment_inv)d" string="Create Invoice"
_______________________________________________
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
