2004 door locks misbehaving

When we lock the doors with the key from driver side both lock and stay locked. When locked from inside using the button on driver door the passenger door locks but immediately unlocks. If I have passenger door open, then lock from inside the doors lock and stay locked.  I am thinking perhaps friction in the lock or confused controls.  Window used to stick after a ding and when I replaced mechanism someone had clearly made a repair to lock are before. Window works perfectly now but lock, not so much. I wonder if I have undone a previous botch when I did window or disturbed something. Any experience shared would be appreciated.