DTG: 18.0-staging

ductinvn/erp#2062

ductinvn/erp#2071

ductinvn/erp#2061

ductinvn/erp#2085

ductinvn/erp#2079

ductinvn/erp#2076

ductinvn/erp#2078

ductinvn/erp#2072

ductinvn/erp#2049

ductinvn/erp#2067

ductinvn/erp#2055

ductinvn/erp#2056

ductinvn/erp#2052

ductinvn/erp#2048