Revert "Revert "Revert "changes in quotation & salesorer bug"""

This reverts commit f90e8e8110b8ec28f3c148227d4ecc7ce3b57980.
Revert "Revert "Revert "Revert "changes in quotation & salesorer bug""""

This reverts commit bc2f73a19a62f9e8cf050eab1e7fb0cf25ecc0d4.