Merge branch '3.0.2_online'

Conflicts:
	modules/main/facade/project_facade.js

modules/main/facade/project_facade.js

@@ -844,7 +844,7 @@ async function getProjectGLJPrice(projectID, unitPriceFileId, property) {
     let tenderCoe = gljUtil.getTenderPriceCoe(glj, property);
     let result = gljUtil.getGLJPrice(glj, {
       gljList: gljList
-    }, calcOptions, labourCoeDatas, decimalObj, false,tenderCoe,true);
+    }, calcOptions, labourCoeDatas, decimalObj, false,tenderCoe,true));
     glj.marketPrice = result.marketPrice;
     glj.basePrice = result.basePrice;
   }