Bharat Devnani (Open ERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-addons-issues4-sale-pso-button-done-bde
into lp:~openerp-dev/openobject-addons/trunk-addons-issues4-sale-pso.
Requested reviews:
OpenERP R&D Team (openerp-dev)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-addons-issues4-sale-pso-button-done-bde/+merge/119488
Hello Sir,
I have removed Done button form Order Lines to Invoice view and also removed
its related functionality.
Thanks & Regards,
Devnani Bharat R.
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-addons-issues4-sale-pso-button-done-bde/+merge/119488
Your team OpenERP R&D Team is requested to review the proposed merge of
lp:~openerp-dev/openobject-addons/trunk-addons-issues4-sale-pso-button-done-bde
into lp:~openerp-dev/openobject-addons/trunk-addons-issues4-sale-pso.
=== modified file 'sale/sale.py'
--- sale/sale.py 2012-08-08 14:08:46 +0000
+++ sale/sale.py 2012-08-14 08:58:54 +0000
@@ -1260,13 +1260,6 @@
def button_confirm(self, cr, uid, ids, context=None):
return self.write(cr, uid, ids, {'state': 'confirmed'})
- def button_done(self, cr, uid, ids, context=None):
- wf_service = netsvc.LocalService("workflow")
- res = self.write(cr, uid, ids, {'state': 'done'})
- for line in self.browse(cr, uid, ids, context=context):
- wf_service.trg_write(uid, 'sale.order', line.order_id.id, cr)
- return res
-
def uos_change(self, cr, uid, ids, product_uos, product_uos_qty=0, product_id=None):
product_obj = self.pool.get('product.product')
if not product_id:
=== modified file 'sale/sale_view.xml'
--- sale/sale_view.xml 2012-08-09 16:35:29 +0000
+++ sale/sale_view.xml 2012-08-14 08:58:54 +0000
@@ -508,8 +508,7 @@
<header>
<span groups="base.group_user">
<button name="button_cancel" string="Cancel" type="object" icon="gtk-cancel" states="confirmed,exception"/>
- <button name="%(action_view_sale_order_line_make_invoice)d" string="Create Invoice" type="action" states="done" icon="gtk-go-forward" attrs="{'invisible': [('invoiced', '=', 1)]}" class="oe_highlight"/>
- <button name="button_done" string="Done" type="object" states="confirmed,exception" icon="gtk-go-forward" class="oe_highlight"/>
+ <button name="%(action_view_sale_order_line_make_invoice)d" string="Create Invoice" type="action" icon="gtk-go-forward" attrs="{'invisible': [('invoiced', '=', True)]}" class="oe_highlight"/>
</span>
<field name="state" widget="statusbar" statusbar_visible="draft,confirmed,done" statusbar_colors='{"exception":"red","cancel":"red"}'/>
</header>
=== modified file 'sale/wizard/sale_line_invoice.py'
--- sale/wizard/sale_line_invoice.py 2012-08-07 11:34:14 +0000
+++ sale/wizard/sale_line_invoice.py 2012-08-14 08:58:54 +0000
@@ -89,7 +89,7 @@
for lid in line_id:
invoices[line.order_id.id].append((line, lid))
sales_order_line_obj.write(cr, uid, [line.id],
- {'invoiced': True})
+ {'invoiced': True, 'state': 'done'})
for result in invoices.values():
order = result[0][0].order_id
il = map(lambda x: x[1], result)
_______________________________________________
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
