Merge branch 'refs/heads/develop' into feature_fomichev_erp-338_mp_orders_notifications

# Conflicts:
#	erp24/.gitignore

diff --cc erp24/.gitignore
index 8943eaeda17a127c56f37b2db685fc72b89d871b,15e3abb7274759523c1c378dd9919988b94e4b05..85c59d7006c424d42d40c758ab3370a9f88c1142
--- 1/erp24/.gitignore
--- 2/erp24/.gitignore
+++ b/erp24/.gitignore
@@@ -41,4 -41,6 +41,7 @@@ tests/_support/_generate
  /runtime/*
  /api2/runtime/*
  /api2/json/*
 -/pgsql_last.sql
+ /widgets/app.log
+ /web/dist-prod
++/pgsql_last.sql
 +/media/notification/*