Merge remote-tracking branch 'origin/dev' into dev

thirdparty/views.py

@@ -134,6 +134,7 @@ def stk_3rd_fetch(request, what, company_id):
         "left outer join "+\
         "(select id,name,external_code from inventory_storehouse) s "+\
         "on b.store_fr_id=s.id"
+
     #s="SELECT id,code,to_char(a.tm,'yyyy-mm-dd HH24:MI:SS'),"+\
     #    "(select count(*) from stkdetails.c"+ancestor_id+" where batch_id=a.id) cnt,"+\
     #    "vtype_id,(select name from inventory_voucher where id=a.vtype_id),"+\