[FIX] 'purchase_proposal': Merge with upstream
[FIX] 'purchase_proposal': Merge with upstream

jgmanzanas/CMNT_004_15,Comunitea/CMNT_004_15,Comunitea/CMNT_004_15,jgmanzanas/CMNT_004_15,jgmanzanas/CMNT_004_15,Comunitea/CMNT_004_15,Comunitea/CMNT_004_15,jgmanzanas/CMNT_004_15,jgmanzanas/CMNT_004_15,jgmanzanas/CMNT_004_15