[FIX] stock: production lot as no longer a company_id field
[MERGE] forward port of branch saas-5 up to c86f217