How to determine transaction type for return goods to vendor in Intrastat file in S/4 HANA

I would like to know if anyone could help me with the determination of the transaction type for the procedure of returning goods to vendor in S/4 HANA. The creation of the Intrastat declaration has suffered some changes in S/4 HANA, and altough I have configured the automatic determination of transaction type 21 for PO of return goods to vendor, it doesn´t import that value to the Intrastat declaration when I create one. I have to access the Intrastat management transaction and change it manually (it assumes the transaction type 11).