Merge lp:~openerp-dev/openobject-addons/7.0-opw-595298-fka into lp:openobject-addons/7.0

[Foram Katharotiya (OpenERP)]

Hello,

I have fix the issue of the state of a purchase order always stay on approved state even if incoming shipment has been received and invoice has been paid when invoice method is set to the 'Based on purchase order lines' or 'Based on incoming shipment' in purchase order.

Thanks,
FKA

[Stefan Rijnhart (Opener) (stefan-opener)]

Hi Foram Katharotiya,

thank you very much for your work! I confirm that this patch fixes the problem, at least in my use case. According to code standards (PEP8), you would need to add some spaces to line 31, changing it from

    purchase_order_obj.write(cr, uid, po_id.id,{'state':'done'}, context=context)

to

    purchase_order_obj.write(cr, uid, po_id.id, {'state': 'done'}, context=context)

Another space is missing in line 13, after 'shipped'. You may even want to consider writing "'shipped': True" instead of "'shipped': 1" as I believe the former is more standard.

review: Needs Fixing

[lp:~openerp-dev/openobject-addons/7.0-opw-595298-fka]

9529. By Foram Katharotiya (OpenERP) on 2013-10-28

[MERGE] with 7.0

9530. By Foram Katharotiya (OpenERP) on 2013-10-28

[IMP] add spaces

[Stefan Rijnhart (Opener) (stefan-opener)]

On second thoughts, it occurred to me that you do not use the workflow here. When I receive the products, the workflow is done even if the invoice has not yet been paid and the purchase order state is not yet 'done'.

 After testing and reading the competing fix, https://code.launchpad.net/~csierra-h/openobject-addons/7.0/+merge/163556, it seems that this branch fixes the problem too, but using the workflow engine to follow the purchase order right up until setting it to 'done'.

I would therefore favour the other solution, but maybe there is a reason why you chose to bypass the workflow engine in your solution? Please let us know.

review: Needs Information

[Foram Katharotiya (OpenERP) (fka-openerp)]

Hello Stefan Rijnhart,

We can not merge workflow activities changes in stable version as per our policy so i need to chose this bypass.
And in this branch https://code.launchpad.net/~csierra-h/openobject-addons/7.0/+merge/163556, add activities in purchase order workflow which is not work yet properly. In this branch purchase order is mark as 'done' when invoice has been validate not paid.

[Stefan Rijnhart (Opener) (stefan-opener)]

Thank you for your quick response! I see that you are correct, and that the orders in the alternative solution get done before the invoices are paid. Given the restriction of the stable version, I think this is an acceptable solution but I am afraid that if it gets merged in 7.0, it will end up in 8.0 eventually. So for that reason I will review with 'abstain'. But again, thanks a lot!

review: Abstain

[lp:~openerp-dev/openobject-addons/7.0-opw-595298-fka]

9531. By Foram Katharotiya (OpenERP) on 2013-11-13

[MERGE] with 7.0

[Denis Ledoux (OpenERP) (dle-openerp)]

This fix mark the purchase order as done, indeed, but does not end the workflow itself.
If you active the developer mode, and print the workflow in the developer selection menu ("Print Workflow"), you will see that the 'Done' state is not colored in Red, the transition just before done is.

Unmerged revisions

9531. By Foram Katharotiya (OpenERP) on 2013-11-13

[MERGE] with 7.0

9530. By Foram Katharotiya (OpenERP) on 2013-10-28

[IMP] add spaces

9529. By Foram Katharotiya (OpenERP) on 2013-10-28

[MERGE] with 7.0

9528. By Foram Katharotiya (OpenERP) on 2013-10-23

[MERGE] with 7.0

9527. By Foram Katharotiya (OpenERP) on 2013-10-17

[FIX] The state of a purchase order always stay on approved state even if incoming shipment has been received and invoice has been paid when invoice method is set to the 'Based on purchase order lines' or 'Based on incoming shipment' in purchase order

=== modified file 'purchase/purchase.py'
--- purchase/purchase.py	2013-10-17 10:44:26 +0000
+++ purchase/purchase.py	2013-11-13 04:51:32 +0000
@@ -705,7 +705,11 @@
         return picking_ids[0] if picking_ids else False
 
     def picking_done(self, cr, uid, ids, context=None):
-        self.write(cr, uid, ids, {'shipped':1,'state':'approved'}, context=context)
+        state = 'approved'
+        for po_id in self.browse(cr, uid, ids, context=context):
+            if po_id.invoiced:
+                state = 'done'
+            self.write(cr, uid, po_id.id, {'shipped': True, 'state': state}, context=context)
         return True
 
     def copy(self, cr, uid, id, default=None, context=None):
@@ -1221,4 +1225,16 @@
             wf_service.trg_validate(uid, 'purchase.order', context['default_res_id'], 'send_rfq', cr)
         return super(mail_compose_message, self).send_mail(cr, uid, ids, context=context)
 
+class account_invoice(osv.Model):
+    _inherit = 'account.invoice'
+
+    def confirm_paid(self, cr, uid, ids, context=None):
+        res = super(account_invoice, self).confirm_paid(cr, uid, ids, context=context)
+        purchase_order_obj = self.pool.get('purchase.order')
+        po_ids = purchase_order_obj.search(cr, uid, [('invoice_ids', 'in', ids)], context=context)
+        if po_ids:
+            for po_id in purchase_order_obj.browse(cr, uid, po_ids, context=context):
+                if po_id.shipped and po_id.invoiced:
+                    purchase_order_obj.write(cr, uid, po_id.id, {'state':'done'}, context=context)
+        return res
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: