diff --git a/db/db.sql b/db/db.sql
index 8470e56d7..76c97d398 100644
--- a/db/db.sql
+++ b/db/db.sql
@@ -1576,15 +1576,19 @@ INSERT INTO saltypes (st_id, salcode, salname, salshortname, disabled) VALUES(7,
 INSERT INTO saltypes (st_id, salcode, salname, salshortname, disabled) VALUES(8, 300, 'ЕСВ', 'ЕСВ', 0);
 
 
-INSERT INTO options (optname, optvalue) VALUES('api', 'YTozOntzOjM6ImV4cCI7czowOiIiO3M6Mzoia2V5IjtzOjQ6InRlc3QiO3M6NToiYXR5cGUiO3M6MToiMSI7fQ==');
-INSERT INTO options (optname, optvalue) VALUES('common', 'YTozOTp7czo5OiJxdHlkaWdpdHMiO3M6MToiMCI7czo4OiJhbWRpZ2l0cyI7czoxOiIwIjtzOjEwOiJkYXRlZm9ybWF0IjtzOjU6ImQubS5ZIjtzOjExOiJwYXJ0aW9udHlwZSI7czoxOiIxIjtzOjY6InBob25lbCI7czoyOiIxMCI7czo2OiJwcmljZTEiO3M6MTg6ItCg0L7Qt9C00YDRltCx0L3QsCI7czo2OiJwcmljZTIiO3M6MTI6ItCe0L/RgtC+0LLQsCI7czo2OiJwcmljZTMiO3M6MDoiIjtzOjY6InByaWNlNCI7czowOiIiO3M6NjoicHJpY2U1IjtzOjA6IiI7czo4OiJkZWZwcmljZSI7czowOiIiO3M6ODoic2hvcG5hbWUiO3M6MDoiIjtzOjg6InRzX2JyZWFrIjtzOjI6IjYwIjtzOjg6InRzX3N0YXJ0IjtzOjU6IjA5OjAwIjtzOjY6InRzX2VuZCI7czo1OiIxODowMCI7czoxMToiY2hlY2tzbG9nYW4iO3M6MDoiIjtzOjExOiJhdXRvYXJ0aWNsZSI7aToxO3M6MTA6InVzZXNudW1iZXIiO3M6MToiMCI7czoxMDoidXNlc2Nhbm5lciI7aTowO3M6MTY6InVzZW1vYmlsZXNjYW5uZXIiO2k6MDtzOjk6InVzZWltYWdlcyI7aTowO3M6MTQ6InByaW50b3V0cXJjb2RlIjtpOjA7czoxNDoibm9jaGVja2FydGljbGUiO2k6MDtzOjE1OiJzaG93YWN0aXZldXNlcnMiO2k6MDtzOjg6InNob3djaGF0IjtpOjA7czoxMDoidXNlY2F0dHJlZSI7aTowO3M6OToidXNlYnJhbmNoIjtpOjA7czoxMDoibm9hbGxvd2ZpeiI7aTowO3M6MTA6ImFsbG93bWludXMiO2k6MDtzOjY6InVzZXZhbCI7aTowO3M6NjoiY2FwY2hhIjtpOjA7czo5OiJudW1iZXJ0dG4iO2k6MDtzOjk6InBheXR5cGVpbiI7czoxOiIwIjtzOjEwOiJwYXl0eXBlb3V0IjtzOjE6IjAiO3M6MTI6ImFsbG93bWludXNtZiI7aTowO3M6NzoiY2FzaGllciI7czowOiIiO3M6MTA6ImFjdHVhbGRhdGUiO2k6MTcwNDA2MDAwMDtzOjE0OiJzcHJlYWRkZWxpdmVyeSI7aTowO3M6MTE6ImJheWRlbGl2ZXJ5IjtpOjA7fQ==');
-INSERT INTO options (optname, optvalue) VALUES('discount', 'YToxODp7czo4OiJmaXJzdGJheSI7czoyOiIxMSI7czo2OiJib251czEiO3M6MzoiMS4xIjtzOjY6ImxldmVsMiI7czowOiIiO3M6NjoiYm9udXMyIjtzOjM6IjEuNCI7czo2OiJzdW1tYTEiO3M6MzoiMTAwIjtzOjY6InN1bW1hMiI7czo0OiIxMDAwIjtzOjY6ImJvbnVzMyI7czoxOiIzIjtzOjY6InN1bW1hMyI7czo0OiIzMDAwIjtzOjY6ImJvbnVzNCI7czoxOiI0IjtzOjY6InN1bW1hNCI7czo0OiI0MDAwIjtzOjU6ImRpc2MxIjtzOjE6IjEiO3M6MTA6ImRpc2NzdW1tYTEiO3M6MToiMCI7czo1OiJkaXNjMiI7czoxOiIzIjtzOjEwOiJkaXNjc3VtbWEyIjtzOjE6IjAiO3M6NToiZGlzYzMiO3M6MToiNyI7czoxMDoiZGlzY3N1bW1hMyI7czoxOiIwIjtzOjU6ImRpc2M0IjtzOjA6IiI7czoxMDoiZGlzY3N1bW1hNCI7czowOiIiO30=');
-INSERT INTO options (optname, optvalue) VALUES('food', 'YToxNTp7czo4OiJ3b3JrdHlwZSI7czoxOiIyIjtzOjk6InByaWNldHlwZSI7czo2OiJwcmljZTEiO3M6ODoiZGVsaXZlcnkiO2k6MTtzOjY6InRhYmxlcyI7aToxO3M6NDoicGFjayI7aToxO3M6NDoibWVudSI7aToxO3M6NDoibmFtZSI7czo2OiJkZGRkZGQiO3M6NToicGhvbmUiO3M6ODoiNTU1NTU1NTUiO3M6NjoidGltZXBuIjtzOjI6IjExIjtzOjY6InRpbWVzYSI7czowOiIiO3M6NjoidGltZXN1IjtzOjA6IiI7czoxMjoiZm9vZGJhc2VtZW51IjtzOjE6IjAiO3M6MTY6ImZvb2RiYXNlbWVudW5hbWUiO3M6MDoiIjtzOjk6ImZvb2RtZW51MiI7czoxOiIwIjtzOjEyOiJmb29kbWVudW5hbWUiO3M6MDoiIjt9');
-INSERT INTO options (optname, optvalue) VALUES('printer', 'YTo3OntzOjg6InBtYXhuYW1lIjtzOjE6IjciO3M6OToicHJpY2V0eXBlIjtzOjY6InByaWNlMSI7czoxMToiYmFyY29kZXR5cGUiO3M6NDoiQzEyOCI7czo2OiJwcHJpY2UiO2k6MTtzOjU6InBjb2RlIjtpOjE7czo4OiJwYmFyY29kZSI7aToxO3M6NzoicHFyY29kZSI7aTowO30=');
-INSERT INTO options (optname, optvalue) VALUES('salary', 'YTo1OntzOjEzOiJjb2RlYmFzZWluY29tIjtzOjM6IjEwNSI7czoxMDoiY29kZXJlc3VsdCI7czozOiI5MDAiO3M6NDoiY2FsYyI7czoyMTk6InYyMDAgPSB2MTA1DQovL9C');
-INSERT INTO options (optname, optvalue) VALUES('shop', 'YToyMDp7czo3OiJkZWZjdXN0IjtzOjE6IjEiO3M6MTE6ImRlZmN1c3RuYW1lIjtzOjI5OiLQm9C10L7QvdC40LQg0JzQsNGA0YLRi9C90Y7QuiI7czo5OiJkZWZicmFuY2giO047czo5OiJvcmRlcnR5cGUiO3M6MToiMCI7czoxMjoiZGVmcHJpY2V0eXBlIjtzOjY6InByaWNlMSI7czo1OiJlbWFpbCI7czowOiIiO3M6ODoic2hvcG5hbWUiO3M6MTc6ItCd0LDRiCDQvNCw0LPQsNC3IjtzOjEyOiJjdXJyZW5jeW5hbWUiO3M6Njoi0YDRg9CxIjtzOjg6InVzZWxvZ2luIjtpOjA7czo5OiJ1c2VmaWx0ZXIiO2k6MDtzOjEzOiJjcmVhdGVuZXdjdXN0IjtpOjA7czoxMToidXNlZmVlZGJhY2siO2k6MDtzOjExOiJ1c2VtYWlucGFnZSI7aTowO3M6NzoiYWJvdXR1cyI7czoxNjoiUEhBK1BHSnlQand2Y0Q0PSI7czo3OiJjb250YWN0IjtzOjA6IiI7czo4OiJkZWxpdmVyeSI7czowOiIiO3M6NDoibmV3cyI7czowOiIiO3M6NToicGFnZXMiO2E6Mjp7czo0OiJuZXdzIjtPOjEyOiJBcHBcRGF0YUl0ZW0iOjI6e3M6MjoiaWQiO047czo5OiIAKgBmaWVsZHMiO2E6NDp7czo0OiJsaW5rIjtzOjQ6Im5ld3MiO3M6NToidGl0bGUiO3M6MTE6Imtra3JycnJycnJyIjtzOjU6Im9yZGVyIjtzOjE6IjIiO3M6NDoidGV4dCI7czoyNDoiUEhBK1pXVmxaV1ZsWldWbFBDOXdQZz09Ijt9fXM6ODoiYWJvdXRfdXMiO086MTI6IkFwcFxEYXRhSXRlbSI6Mjp7czoyOiJpZCI7TjtzOjk6IgAqAGZpZWxkcyI7YTo0OntzOjQ6ImxpbmsiO3M6ODoiYWJvdXRfdXMiO3M6NToidGl0bGUiO3M6OToi0J4g0L3QsNGBIjtzOjU6Im9yZGVyIjtzOjE6IjMiO3M6NDoidGV4dCI7czozMjoiUEhBK1BHSSswSjRnMEwzUXNOR0JQQzlpUGp3dmNEND0iO319fXM6NToicGhvbmUiO3M6MDoiIjtzOjEwOiJzYWxlc291cmNlIjtzOjE6IjAiO30=');
-INSERT INTO options (optname, optvalue) VALUES('val', 'YToyOntzOjc6InZhbGxpc3QiO2E6MTp7aToxNjQyNjc1OTU1O086MTI6IkFwcFxEYXRhSXRlbSI6Mjp7czoyOiJpZCI7aToxNjQyNjc1OTU1O3M6OToiACoAZmllbGRzIjthOjM6e3M6NDoiY29kZSI7czozOiJVU0QiO3M6NDoibmFtZSI7czoxMDoi0JTQvtC70LDRgCI7czo0OiJyYXRlIjtzOjI6IjYwIjt9fX1zOjg6InZhbHByaWNlIjtpOjE7fQ==');
-INSERT INTO options (optname, optvalue) VALUES('version', '6.12.0');
+INSERT INTO `options` (`optname`, `optvalue`) VALUES('api', 'YTozOntzOjM6ImV4cCI7czowOiIiO3M6Mzoia2V5IjtzOjQ6InRlc3QiO3M6NToiYXR5cGUiO3M6MToiMSI7fQ==');
+INSERT INTO `options` (`optname`, `optvalue`) VALUES('common', 'YTo0Mjp7czo5OiJxdHlkaWdpdHMiO3M6MToiMCI7czo4OiJhbWRpZ2l0cyI7czoxOiIwIjtzOjEwOiJkYXRlZm9ybWF0IjtzOjU6ImQubS5ZIjtzOjExOiJwYXJ0aW9udHlwZSI7czoxOiIxIjtzOjY6InBob25lbCI7czoyOiIxMCI7czo2OiJwcmljZTEiO3M6MTg6ItCg0L7Qt9C00YDRltCx0L3QsCI7czo2OiJwcmljZTIiO3M6MTI6ItCe0L/RgtC+0LLQsCI7czo2OiJwcmljZTMiO3M6MDoiIjtzOjY6InByaWNlNCI7czowOiIiO3M6NjoicHJpY2U1IjtzOjA6IiI7czo4OiJkZWZwcmljZSI7czowOiIiO3M6ODoic2hvcG5hbWUiO3M6MDoiIjtzOjg6InRzX2JyZWFrIjtzOjI6IjYwIjtzOjg6InRzX3N0YXJ0IjtzOjU6IjA5OjAwIjtzOjY6InRzX2VuZCI7czo1OiIxODowMCI7czoxMToiY2hlY2tzbG9nYW4iO3M6MDoiIjtzOjExOiJhdXRvYXJ0aWNsZSI7aToxO3M6MTA6InVzZXNudW1iZXIiO3M6MToiMCI7czoxMDoidXNlc2Nhbm5lciI7aTowO3M6MTY6InVzZW1vYmlsZXNjYW5uZXIiO2k6MDtzOjk6InVzZWltYWdlcyI7aTowO3M6MTQ6InByaW50b3V0cXJjb2RlIjtpOjA7czoxNDoibm9jaGVja2FydGljbGUiO2k6MDtzOjE1OiJzaG93YWN0aXZldXNlcnMiO2k6MDtzOjg6InNob3djaGF0IjtpOjA7czoxMDoidXNlY2F0dHJlZSI7aTowO3M6OToidXNlYnJhbmNoIjtpOjA7czoxMDoibm9hbGxvd2ZpeiI7aTowO3M6MTA6ImFsbG93bWludXMiO2k6MDtzOjY6InVzZXZhbCI7aTowO3M6NjoiY2FwY2hhIjtpOjA7czo5OiJudW1iZXJ0dG4iO2k6MDtzOjk6InBheXR5cGVpbiI7czoxOiIwIjtzOjEwOiJwYXl0eXBlb3V0IjtzOjE6IjAiO3M6MTI6ImFsbG93bWludXNtZiI7aTowO3M6NzoiY2FzaGllciI7czowOiIiO3M6MTA6ImFjdHVhbGRhdGUiO2k6MTcwNDA2MDAwMDtzOjE0OiJzcHJlYWRkZWxpdmVyeSI7aTowO3M6MTE6ImJheWRlbGl2ZXJ5IjtpOjA7czo4OiJub3VwZGF0ZSI7aTowO3M6NzoiY2hlY2tpcCI7aTowO3M6NjoiaXBsaXN0IjtzOjA6IiI7fQ==');
+INSERT INTO `options` (`optname`, `optvalue`) VALUES('discount', 'YToxODp7czo4OiJmaXJzdGJheSI7czoyOiIxMSI7czo2OiJib251czEiO3M6MzoiMS4xIjtzOjY6ImxldmVsMiI7czowOiIiO3M6NjoiYm9udXMyIjtzOjM6IjEuNCI7czo2OiJzdW1tYTEiO3M6MzoiMTAwIjtzOjY6InN1bW1hMiI7czo0OiIxMDAwIjtzOjY6ImJvbnVzMyI7czoxOiIzIjtzOjY6InN1bW1hMyI7czo0OiIzMDAwIjtzOjY6ImJvbnVzNCI7czoxOiI0IjtzOjY6InN1bW1hNCI7czo0OiI0MDAwIjtzOjU6ImRpc2MxIjtzOjE6IjEiO3M6MTA6ImRpc2NzdW1tYTEiO3M6MToiMCI7czo1OiJkaXNjMiI7czoxOiIzIjtzOjEwOiJkaXNjc3VtbWEyIjtzOjE6IjAiO3M6NToiZGlzYzMiO3M6MToiNyI7czoxMDoiZGlzY3N1bW1hMyI7czoxOiIwIjtzOjU6ImRpc2M0IjtzOjA6IiI7czoxMDoiZGlzY3N1bW1hNCI7czowOiIiO30=');
+INSERT INTO `options` (`optname`, `optvalue`) VALUES('food', 'YToxNTp7czo4OiJ3b3JrdHlwZSI7czoxOiIyIjtzOjk6InByaWNldHlwZSI7czo2OiJwcmljZTEiO3M6ODoiZGVsaXZlcnkiO2k6MTtzOjY6InRhYmxlcyI7aToxO3M6NDoicGFjayI7aToxO3M6NDoibWVudSI7aToxO3M6NDoibmFtZSI7czo2OiJkZGRkZGQiO3M6NToicGhvbmUiO3M6ODoiNTU1NTU1NTUiO3M6NjoidGltZXBuIjtzOjI6IjExIjtzOjY6InRpbWVzYSI7czowOiIiO3M6NjoidGltZXN1IjtzOjA6IiI7czoxMjoiZm9vZGJhc2VtZW51IjtzOjE6IjAiO3M6MTY6ImZvb2RiYXNlbWVudW5hbWUiO3M6MDoiIjtzOjk6ImZvb2RtZW51MiI7czoxOiIwIjtzOjEyOiJmb29kbWVudW5hbWUiO3M6MDoiIjt9');
+INSERT INTO `options` (`optname`, `optvalue`) VALUES('modules', 'YToxMjp7czo3OiJvY3N0b3JlIjtpOjA7czo0OiJzaG9wIjtpOjA7czoxMDoid29vY29tZXJjZSI7aTowO3M6MjoibnAiO2k6MDtzOjY6InByb211YSI7aTowO3M6ODoiaG9yb3Nob3AiO2k6MDtzOjQ6InZkb2MiO2k6MDtzOjU6Imlzc3VlIjtpOjA7czo0OiJub3RlIjtpOjA7czozOiJwcG8iO2k6MDtzOjg6ImNoZWNrYm94IjtpOjA7czo2OiJ2a2Fzc2EiO2k6MDt9');
+INSERT INTO `options` (`optname`, `optvalue`) VALUES('printer', 'YTo3OntzOjg6InBtYXhuYW1lIjtzOjE6IjciO3M6OToicHJpY2V0eXBlIjtzOjY6InByaWNlMSI7czoxMToiYmFyY29kZXR5cGUiO3M6NDoiQzEyOCI7czo2OiJwcHJpY2UiO2k6MTtzOjU6InBjb2RlIjtpOjE7czo4OiJwYmFyY29kZSI7aToxO3M6NzoicHFyY29kZSI7aTowO30=');
+INSERT INTO `options` (`optname`, `optvalue`) VALUES('salary', 'YTo1OntzOjEzOiJjb2RlYmFzZWluY29tIjtzOjM6IjEwNSI7czoxMDoiY29kZXJlc3VsdCI7czozOiI5MDAiO3M6NDoiY2FsYyI7czoyMTk6InYyMDAgPSB2MTA1DQovL9C');
+INSERT INTO `options` (`optname`, `optvalue`) VALUES('shop', 'YToyMDp7czo3OiJkZWZjdXN0IjtzOjE6IjEiO3M6MTE6ImRlZmN1c3RuYW1lIjtzOjI5OiLQm9C10L7QvdC40LQg0JzQsNGA0YLRi9C90Y7QuiI7czo5OiJkZWZicmFuY2giO047czo5OiJvcmRlcnR5cGUiO3M6MToiMCI7czoxMjoiZGVmcHJpY2V0eXBlIjtzOjY6InByaWNlMSI7czo1OiJlbWFpbCI7czowOiIiO3M6ODoic2hvcG5hbWUiO3M6MTc6ItCd0LDRiCDQvNCw0LPQsNC3IjtzOjEyOiJjdXJyZW5jeW5hbWUiO3M6Njoi0YDRg9CxIjtzOjg6InVzZWxvZ2luIjtpOjA7czo5OiJ1c2VmaWx0ZXIiO2k6MDtzOjEzOiJjcmVhdGVuZXdjdXN0IjtpOjA7czoxMToidXNlZmVlZGJhY2siO2k6MDtzOjExOiJ1c2VtYWlucGFnZSI7aTowO3M6NzoiYWJvdXR1cyI7czoxNjoiUEhBK1BHSnlQand2Y0Q0PSI7czo3OiJjb250YWN0IjtzOjA6IiI7czo4OiJkZWxpdmVyeSI7czowOiIiO3M6NDoibmV3cyI7czowOiIiO3M6NToicGFnZXMiO2E6Mjp7czo0OiJuZXdzIjtPOjEyOiJBcHBcRGF0YUl0ZW0iOjI6e3M6MjoiaWQiO047czo5OiIAKgBmaWVsZHMiO2E6NDp7czo0OiJsaW5rIjtzOjQ6Im5ld3MiO3M6NToidGl0bGUiO3M6MTE6Imtra3JycnJycnJyIjtzOjU6Im9yZGVyIjtzOjE6IjIiO3M6NDoidGV4dCI7czoyNDoiUEhBK1pXVmxaV1ZsWldWbFBDOXdQZz09Ijt9fXM6ODoiYWJvdXRfdXMiO086MTI6IkFwcFxEYXRhSXRlbSI6Mjp7czoyOiJpZCI7TjtzOjk6IgAqAGZpZWxkcyI7YTo0OntzOjQ6ImxpbmsiO3M6ODoiYWJvdXRfdXMiO3M6NToidGl0bGUiO3M6OToi0J4g0L3QsNGBIjtzOjU6Im9yZGVyIjtzOjE6IjMiO3M6NDoidGV4dCI7czozMjoiUEhBK1BHSSswSjRnMEwzUXNOR0JQQzlpUGp3dmNEND0iO319fXM6NToicGhvbmUiO3M6MDoiIjtzOjEwOiJzYWxlc291cmNlIjtzOjE6IjAiO30=');
+INSERT INTO `options` (`optname`, `optvalue`) VALUES('sms', 'YToxMTp7czoxMjoic21zY2x1YnRva2VuIjtzOjA6IiI7czoxMjoic21zY2x1YmxvZ2luIjtzOjA6IiI7czoxMToic21zY2x1YnBhc3MiO3M6MDoiIjtzOjk6InNtc2NsdWJhbiI7czowOiIiO3M6MTA6InNtc2NsdWJ2YW4iO3M6MDoiIjtzOjEyOiJzbXNzZW15dG9rZW4iO3M6MDoiIjtzOjEyOiJzbXNzZW15ZGV2aWQiO3M6MDoiIjtzOjExOiJmbHlzbXNsb2dpbiI7czowOiIiO3M6MTA6ImZseXNtc3Bhc3MiO3M6MDoiIjtzOjg6ImZseXNtc2FuIjtzOjA6IiI7czo3OiJzbXN0eXBlIjtzOjE6IjAiO30=');
+INSERT INTO `options` (`optname`, `optvalue`) VALUES('val', 'YToyOntzOjc6InZhbGxpc3QiO2E6MTp7aToxNjQyNjc1OTU1O086MTI6IkFwcFxEYXRhSXRlbSI6Mjp7czoyOiJpZCI7aToxNjQyNjc1OTU1O3M6OToiACoAZmllbGRzIjthOjM6e3M6NDoiY29kZSI7czozOiJVU0QiO3M6NDoibmFtZSI7czoxMDoi0JTQvtC70LDRgCI7czo0OiJyYXRlIjtzOjI6IjYwIjt9fX1zOjg6InZhbHByaWNlIjtpOjE7fQ==');
+INSERT INTO `options` (`optname`, `optvalue`) VALUES('version', '6.12.0');
+
+
 
 
 
diff --git a/www/app/entity/category.php b/www/app/entity/category.php
index 62aae6dc3..763be912a 100644
--- a/www/app/entity/category.php
+++ b/www/app/entity/category.php
@@ -22,7 +22,7 @@ protected function init() {
 
     protected function afterLoad() {
 
-        \App\Helper::log($this->detail);
+      
         $xml = @simplexml_load_string($this->detail);
 
         $this->price1 = (string)($xml->price1[0]);
diff --git a/www/app/entity/doc/order.php b/www/app/entity/doc/order.php
index b94a5149b..11c09e944 100644
--- a/www/app/entity/doc/order.php
+++ b/www/app/entity/doc/order.php
@@ -239,7 +239,6 @@ public function reserve() {
 
             }
         }
-
     }
     //отмена  резерва
     public function unreserve() {
@@ -301,5 +300,34 @@ public function DoBalans() {
         }
              
     }
-    
+    /**
+    * список  неотправленных позиций
+    * 
+    */
+    public function getNotSendedItem() {
+         $notsendqty=[]; 
+         $sendqty=[]; 
+         $notsend=0;
+         $docs= Document::find("state >=5 and meta_name  in ('GoodsIssue','TTN') and parent_id=". $this->document_id);   
+         foreach($docs as $d)  {
+             foreach($d->unpackDetails('detaildata') as $item){
+                if(!isset($sendqty[$item->item_id]) ) $sendqty[$item->item_id]=0;
+                
+                $sendqty[$item->item_id] += $item->quantity;
+             }
+         }
+         foreach($this->unpackDetails('detaildata') as $item){
+            if(($sendqty[$item->item_id] ?? 0) ==0)  {
+                $notsend=$item->quantity;
+            }   else {
+                $notsend=$item->quantity - $sendqty[$item->item_id];  
+            }
+            if($notsend > 0) {
+                $notsendqty[$item->item_id] = $notsend;
+            }
+            
+         }        
+     
+         return $notsendqty;
+    }    
 }
diff --git a/www/app/entity/doc/ordercust.php b/www/app/entity/doc/ordercust.php
index 537b78518..a54534f81 100644
--- a/www/app/entity/doc/ordercust.php
+++ b/www/app/entity/doc/ordercust.php
@@ -59,4 +59,35 @@ public function getRelationBased() {
         return $list;
     }
 
+    
+    /**
+    * список  неоприходованых позиций
+    * 
+    */
+    public function getNotReceivedItems() :array{
+         $notrecqty=[]; 
+         $recqty=[]; 
+         $notrec=0;
+         $docs= Document::find("state >=5 and meta_name  in ('GoodsReceipt') and parent_id=". $this->document_id);   
+         foreach($docs as $d)  {
+             foreach($d->unpackDetails('detaildata') as $item){
+                if(!isset($recqty[$item->item_id]) ) $recqty[$item->item_id]=0;
+                
+                $recqty[$item->item_id] += $item->quantity;
+             }
+         }
+         foreach($this->unpackDetails('detaildata') as $item){
+            if(($recqty[$item->item_id] ?? 0) ==0)  {
+                $notrec=$item->quantity;
+            }   else {
+                $notrec=$item->quantity - $recqty[$item->item_id];  
+            }
+            if($notrec > 0) {
+                $notrecqty[$item->item_id]= $notrec;
+            }
+            
+         }        
+     
+         return $notrecqty;
+    }
 }
diff --git a/www/app/entity/doc/ttn.php b/www/app/entity/doc/ttn.php
index 65a3779c7..13e04481a 100644
--- a/www/app/entity/doc/ttn.php
+++ b/www/app/entity/doc/ttn.php
@@ -275,25 +275,7 @@ public function onState($state, $oldstate) {
 
             }
         }
-        $common = \App\System::getOptions("common");
-
-        if ($this->parent_id > 0) {
-            $order = Document::load($this->parent_id);
-
-            $list = $order->getChildren('TTN');
-
-            if (count($list) == 1 && $common['numberttn'] <> 1) {   //только  эта  ТТН
-                if ($state == Document::STATE_DELIVERED && ($order->state == Document::STATE_INSHIPMENT || $order->state == Document::STATE_READYTOSHIP || $order->state == Document::STATE_INPROCESS)) {
-                    $order->updateStatus(Document::STATE_DELIVERED);
-                }
-                if ($state == Document::STATE_INSHIPMENT && ($order->state == Document::STATE_INPROCESS || $order->state == Document::STATE_READYTOSHIP)) {
-                    $order->updateStatus(Document::STATE_INSHIPMENT);
-                }
-                if ($state == Document::STATE_READYTOSHIP && $order->state == Document::STATE_INPROCESS) {
-                    $order->updateStatus(Document::STATE_READYTOSHIP);
-                }
-            }
-        }
+        
     }
 
     public function getRelationBased() {
diff --git a/www/app/entity/entry.php b/www/app/entity/entry.php
index 36fb54784..3928cc37c 100644
--- a/www/app/entity/entry.php
+++ b/www/app/entity/entry.php
@@ -78,7 +78,7 @@ public static function getQuantity($date = 0, $stock = 0, $customer = 0, $emp =
         $conn = \ZDB\DB::getConnect();
         $where = "   1=1";
         if ($date > 0) {
-            $where = $where . "   date(document_date) <= " . $conn->DBDate($date);
+            $where = $where . "   document_date  <= " . $conn->DBDate($date);
         }
 
         if ($emp > 0) {
@@ -109,7 +109,7 @@ public static function getAmount($date = 0, $stock = 0, $customer = 0, $emp = 0)
         $conn = \ZDB\DB::getConnect();
         $where = "   1=1";
         if ($date > 0) {
-            $where = $where . " and  date(document_date) <= " . $conn->DBDate($date);
+            $where = $where . " and   document_date <= " . $conn->DBDate($date);
         }
 
         if ($emp > 0) {
diff --git a/www/app/entity/stock.php b/www/app/entity/stock.php
index 4b0a4624a..5f696706c 100644
--- a/www/app/entity/stock.php
+++ b/www/app/entity/stock.php
@@ -118,7 +118,7 @@ public static function getQuantity($stock_id, $date = null) {
             $stock = Stock::load($stock_id);
             if ($date > 0) {
                 $conn = \ZDB\DB::getConnect();
-                $where = "   stock_id = {$stock_id} and date(document_date) <= " . $conn->DBDate($date);
+                $where = "   stock_id = {$stock_id} and  document_date  <= " . $conn->DBDate($date);
                 $sql = " select coalesce(sum(quantity),0) AS quantity  from entrylist_view  where " . $where;
                 return $conn->GetOne($sql);
             } else {
diff --git a/www/app/entity/subscribe.php b/www/app/entity/subscribe.php
index dc18ca43f..2a2c686e5 100644
--- a/www/app/entity/subscribe.php
+++ b/www/app/entity/subscribe.php
@@ -296,7 +296,7 @@ private    function sendmsg($text, $options=[]){
                 $ret =   self::sendSMS($options['phone'], $text);
             }
             if (strlen($options['email']) > 0 && $this->msg_type == self::MSG_EMAIL) {
-
+                // отправляем  в  очередь если  включен  планировщик
                 if(System::useCron()) {
                     $task = new  \App\Entity\CronTask();
                     $task->tasktype=\App\Entity\CronTask::TYPE_SUBSEMAIL;
diff --git a/www/app/modules/note/entity/topic.php b/www/app/modules/note/entity/topic.php
index f65ed1b8d..2537bc3b5 100644
--- a/www/app/modules/note/entity/topic.php
+++ b/www/app/modules/note/entity/topic.php
@@ -17,27 +17,40 @@ protected function init() {
 
     protected function beforeSave() {
         parent::beforeSave();
-        //упаковываем  данные в detail
+        
+        /*
         $this->content = "<content>";
         $this->detail = base64_encode($this->detail) ;
         $this->content .= "<detail>{$this->detail}</detail>";
         $this->content .= "<isbasa64>1</isbasa64>";
         $this->content .= "<updatedon>{$this->updatedon}</updatedon>";
         $this->content .= "</content>";
-
-        return true;
+        */
+        
+        $content=[]  ;
+        $content['detail'] =$this->detail ;
+        $content['updatedon'] =$this->updatedon ;
+        $this->content = serialize($content) ;
+        
     }
 
     protected function afterLoad() {
-        //распаковываем  данные из detail
-        $xml = @simplexml_load_string($this->content);
-
-        $this->detail = (string)($xml->detail[0]);
-        $this->isbasa64 = (int)($xml->isbasa64[0]);
-        if($this->isbasa64==1) {
-            $this->detail = base64_decode($this->detail) ;
+        
+        if(strpos($this->content,'<content>') ===0  ) {
+            $xml = @simplexml_load_string($this->content);
+
+            $this->detail = (string)($xml->detail[0]);
+            $this->isbasa64 = (int)($xml->isbasa64[0]);
+            if($this->isbasa64==1) {
+                $this->detail = base64_decode($this->detail) ;
+            }
+            $this->updatedon = (int)($xml->updatedon[0]);       
+        }  else  {
+            $content = unserialize($this->content) ;
+            $this->updatedon = $content['updatedon'] ;
+            $this->detail = $content['detail'] ;
         }
-        $this->updatedon = (int)($xml->updatedon[0]);
+     
         
         parent::afterLoad();
     }
diff --git a/www/app/modules/ocstore/orders.php b/www/app/modules/ocstore/orders.php
index 864cf8a3a..1aee00aef 100644
--- a/www/app/modules/ocstore/orders.php
+++ b/www/app/modules/ocstore/orders.php
@@ -92,7 +92,7 @@ public function filterOnSubmit($sender) {
             foreach ($data['orders'] as $ocorder) {
 
 
-                $cnt  = $conn->getOne("select count(*) from documents_view where (meta_name='Order' or meta_name='TTN') and content like '%<ocorder>{$ocorder['order_id']}</ocorder>%'")  ;
+                $cnt  = $conn->getOne("select count(*) from documents_view where (meta_name='Order' or meta_name='TTN') and content like '%<ocorder>{$ocorder['order_id']}</ocorder>%'  and (CURRENT_DATE - INTERVAL 1 MONTH) < document_date  ")  ;
 
                 if (intval($cnt) > 0) { //уже импортирован
                     continue;
diff --git a/www/app/modules/shop/pages/admin/dashboard.php b/www/app/modules/shop/pages/admin/dashboard.php
index 7400ad6da..9e75edc5d 100644
--- a/www/app/modules/shop/pages/admin/dashboard.php
+++ b/www/app/modules/shop/pages/admin/dashboard.php
@@ -85,8 +85,8 @@ public function updateGraph() {
         $this->_tvars['ord'] = json_encode($ord);
 
         $sql = " content  LIKE '%<shoporder>1</shoporder>%' "  ;
-        $sql .= " and date(document_date) <= " . $conn->DBDAte(time());
-        $sql .= " and date(document_date) > " . $conn->DBDAte(strtotime("- 30 day", time()));
+        $sql .= " and  (document_date) <= " . $conn->DBDAte(time());
+        $sql .= " and  (document_date) > " . $conn->DBDAte(strtotime("- 30 day", time()));
         
         $items = array();
         $cats = array();
@@ -151,7 +151,7 @@ public function updateGraph() {
         
         $sql   = "  state in (9,10,20) and   
                   content  LIKE '%<shoporder>1</shoporder>%'   
-                   and date(document_date) <= {$to}  and date(document_date) > {$from} " ;
+                   and  (document_date) <= {$to}  and  (document_date) > {$from} " ;
         
         $docs = \App\Entity\Doc\Document::find($sql);   
       
diff --git a/www/app/modules/wc/items.php b/www/app/modules/wc/items.php
index 5d00e4efc..340854785 100644
--- a/www/app/modules/wc/items.php
+++ b/www/app/modules/wc/items.php
@@ -174,9 +174,7 @@ public function onUpdateQty($sender) {
                 return;
             }
              $c = count($data);
-
-            \App\Helper::log($page*$c);
-
+   
             if ($c == 0) {
                 break;
             }
diff --git a/www/app/modules/wc/orders.php b/www/app/modules/wc/orders.php
index deb2af6ce..5ab18a97e 100644
--- a/www/app/modules/wc/orders.php
+++ b/www/app/modules/wc/orders.php
@@ -217,7 +217,7 @@ public function onImport($sender) {
 
     public function onRefresh($sender) {
 
-        $this->_eorders = Document::find("meta_name='Order' and content like '%<wcorderback>0</wcorderback>%' and state <> " . Document::STATE_NEW);
+        $this->_eorders = Document::find("meta_name='Order' and content like '%<wcorderback>0</wcorderback>%'   and (CURRENT_DATE - INTERVAL 1 MONTH) < document_date and state <> " . Document::STATE_NEW);
         $this->updateform->orderslist->Reload();
     }
 
diff --git a/www/app/pages/doc/goodsissue.php b/www/app/pages/doc/goodsissue.php
index 8d938977c..079b6cecb 100644
--- a/www/app/pages/doc/goodsissue.php
+++ b/www/app/pages/doc/goodsissue.php
@@ -190,22 +190,8 @@ public function __construct($docid = 0, $basedocid = 0) {
                         $notfound = array();
                         $order = $basedoc->cast();
 
-                        //проверяем  что уже есть отправка
-                        $list = $order->getChildren('TTN');
-
-                        if (count($list) > 0 && $common['numberttn'] <> 1) {
-
-                            $this->setError('У замовлення вже є відправки');
-                            App::Redirect("\\App\\Pages\\Register\\GIList");
-                            return;
-                        }
-                        $list = $order->getChildren('GoodsIssue');
-
-                        if (count($list) > 0 && $common['numberttn'] <> 1) {
-
-                            $this->setError('У замовлення вже є відправки');
-                            App::Redirect("\\App\\Pages\\Register\\GIList");
-                            return;
+                        if($order->getNotSendedItem() > 0){
+                            $this->setWarn('Позиції по  цьому замовленню вже відправлені') ;
                         }
 
                         $this->docform->total->setText(H::fa($order->amount));
diff --git a/www/app/pages/doc/goodsreceipt.php b/www/app/pages/doc/goodsreceipt.php
index 216186827..57c87f6d1 100644
--- a/www/app/pages/doc/goodsreceipt.php
+++ b/www/app/pages/doc/goodsreceipt.php
@@ -215,10 +215,24 @@ public function __construct($docid = 0, $basedocid = 0) {
                         $this->docform->customer->setText($basedoc->customer_name);
                         $this->docform->val->setValue(0);
                         $this->docform->rate->setText(1);
+                        $this->docform->basedoc->setText($basedoc->document_number);
 
                         $order = $basedoc->cast();
-                        $this->docform->basedoc->setText($order->document_number);
-                        $this->_itemlist = $basedoc->unpackDetails('detaildata');
+                        $nr=$order->getNotReceivedItems();
+                        if(count($nr)==0) {
+                           $this->setWarn('Всі позиції вже доставлені') ;
+                        }
+                        $this->_itemlist = [];
+                      
+                        foreach($order->unpackDetails('detaildata') as $item){
+                            if($nr[$item->item_id] ??0 > 0 )  {
+                                $item->quantity =   $nr[$item->item_id] ;
+                                $this->_itemlist[] = $item; 
+                                
+                            }
+                           
+                        }
+                        
                         $this->CalcTotal();
                         $this->CalcPay();
                     }
@@ -691,10 +705,7 @@ public function savedocOnClick($sender) {
         }
 
         $file = $this->docform->scan->getFile();
-        if ($file['size'] > 10000000) {
-            $this->setError("Файл більше 10 МБ!");
-            return;
-        }
+     
 
         if ($this->_doc->payed == 0) {
             $this->_doc->headerdata['payment'] = 0;
@@ -733,16 +744,18 @@ public function savedocOnClick($sender) {
                 }
 
                 if ($this->_doc->parent_id > 0) {   //закрываем заказ
-                    if ($this->_doc->payamount > 0 && $this->_doc->payamount > $this->_doc->payed) {
-
-                    } else {
                         $order = Document::load($this->_doc->parent_id);
-                        if ($order->meta_name =="OrderCust" && $order->state == Document::STATE_INPROCESS) {
-                            $order->updateStatus(Document::STATE_CLOSED);
-
-                            $this->setSuccess("Заявка {$order->document_number} закрита");
-                        }
-                    }
+                        
+                        if ($order->meta_name =="OrderCust"){
+                            $order = $order->cast();
+                            $nr=$order->getNotReceivedItems();
+                            if(count($nr)==0){ // все доставлено
+                               if($order->state == Document::STATE_INPROCESS  ||  $order->state == Document::STATE_INSHIPMENT  ) {
+                                   $order->updateStatus(Document::STATE_DELIVERED);
+                               }
+                            }                   
+                       }
+                     
                 }
 
                 //обновляем  курс
diff --git a/www/app/pages/doc/ttn.php b/www/app/pages/doc/ttn.php
index 775bac194..36c2435df 100644
--- a/www/app/pages/doc/ttn.php
+++ b/www/app/pages/doc/ttn.php
@@ -190,26 +190,12 @@ public function __construct($docid = 0, $basedocid = 0) {
                         $notfound = array();
                         $order = $basedoc->cast();
 
-                        //проверяем  что уже есть отправка
-                        $list = $order->getChildren('TTN');
-
-                        if (count($list) > 0 && $common['numberttn'] <> 1) {
-
-                            $this->setError('У замовлення вже є відправки');
-                            App::Redirect("\\App\\Pages\\Register\\GIList");
-                            return;
-                        }
-                        $list = $order->getChildren('GoodsIssue');
-
-                        if (count($list) > 0 && $common['numberttn'] <> 1) {
-
-                            $this->setError('У замовлення вже є відправки');
-                            App::Redirect("\\App\\Pages\\Register\\GIList");
-                            return;
+                        if($order->getNotSendedItem() > 0){
+                            $this->setWarn('Позиції по  цьому замовленню вже відправлені') ;
                         }
+                
                         $this->docform->total->setText($order->amount);
 
-
                         if($order->headerdata['store']>0) {
                             $this->docform->store->setValue($order->headerdata['store']);
                             
diff --git a/www/app/pages/options.php b/www/app/pages/options.php
index 1a7274b3e..20eec489e 100644
--- a/www/app/pages/options.php
+++ b/www/app/pages/options.php
@@ -120,11 +120,7 @@ public function __construct() {
         $this->business->add(new CheckBox('useval'));
         $this->business->add(new CheckBox('printoutqrcode'));
 
-
-
-        $this->business->add(new CheckBox('numberttn'));
-        
-
+   
         $this->business->add(new CheckBox('spreaddelivery'));
         $this->business->add(new CheckBox('baydelivery'));
 
@@ -150,7 +146,7 @@ public function __construct() {
 
         $this->business->usesnumber->setValue($common['usesnumber']??0);
 
-        $this->business->numberttn->setChecked($common['numberttn']);
+
 
         $this->business->spreaddelivery->setChecked($common['spreaddelivery']);
         $this->business->baydelivery->setChecked($common['baydelivery']);
@@ -411,8 +407,6 @@ public function saveBusinessOnClick($sender) {
         $common['spreaddelivery'] = $this->business->spreaddelivery->isChecked() ? 1 : 0;
         $common['baydelivery'] = $this->business->baydelivery->isChecked() ? 1 : 0;
 
-        $common['numberttn'] = $this->business->numberttn->isChecked() ? 1 : 0;
-
 
 
         System::setOptions("common", $common);
diff --git a/www/app/pages/register/grlist.php b/www/app/pages/register/grlist.php
index 015dd2ba4..fb5a7f6be 100644
--- a/www/app/pages/register/grlist.php
+++ b/www/app/pages/register/grlist.php
@@ -41,7 +41,7 @@ public function __construct() {
 
         $this->filter->add(new TextInput('searchnumber'));
         $this->filter->add(new TextInput('searchtext'));
-        $this->filter->add(new DropDownChoice('status', array(0 => 'Відкриті', 1 => 'Не проведені', 2 => 'Не сплачені', 3 => 'Всі'), 0));
+        $this->filter->add(new DropDownChoice('status', array(0 => 'Відкриті',   1 => 'Не сплачені', 2 => 'Всі'), 0));
         $this->filter->add(new DropDownChoice('searchcomp', Firm::findArray('firm_name', 'disabled<>1', 'firm_name'), 0));
         $this->filter->add(new DropDownChoice('fstore', \App\Entity\Store::getList(), 0));
         $this->filter->add(new AutocompleteTextInput('searchcust'))->onText($this, 'OnAutoCustomer');
@@ -243,16 +243,13 @@ private function getWhere() {
         $status = $this->page->filter->status->getValue();
 
         if ($status == 0) {
-            $where .= " and ( (payamount > 0 and payamount > payed) or  (state <>" . Document::STATE_EXECUTED . ")) ";
+            $where .= "  and    state >3 and  state  not in(14,5,9 )        ";
         }
-
+      
         if ($status == 1) {
-            $where .= " and  state <>" . Document::STATE_EXECUTED;
+            $where .= " and state=". Document::STATE_WP;
         }
         if ($status == 2) {
-            $where .= " and  (payamount > 0 and payamount > payed)";
-        }
-        if ($status == 3) {
 
         }
 
diff --git a/www/app/pages/register/officelist.php b/www/app/pages/register/officelist.php
index eb6d852a7..3ed63893d 100644
--- a/www/app/pages/register/officelist.php
+++ b/www/app/pages/register/officelist.php
@@ -531,10 +531,10 @@ private function getWhere() {
         $to = $filterform->to->getDate();
 
         if ($from > 0) {
-            $where .= " and date(document_date) >= " . $conn->DBDate($from);
+            $where .= " and  document_date >= " . $conn->DBDate($from);
         }
         if ($to > 0) {
-            $where .= " and date(document_date) <= " . $conn->DBDate($to);
+            $where .= " and  document_date <= " . $conn->DBDate($to);
         }
 
 
diff --git a/www/app/pages/register/orderlist.php b/www/app/pages/register/orderlist.php
index f942ce41f..3b23d9fcb 100644
--- a/www/app/pages/register/orderlist.php
+++ b/www/app/pages/register/orderlist.php
@@ -521,19 +521,13 @@ public function updateStatusButtons() {
             $this->statuspan->resform->setVisible(false);
         }
 
-        if (count($list) > 0 && $common['numberttn'] <> 1) {
-            $this->statuspan->statusform->bttn->setVisible(false);
-        }
+       
         $list = $this->_doc->getChildren('GoodsIssue');
 
         if(count($list)>0) {
             $this->statuspan->resform->setVisible(false);
         }
-
-        if (count($list) > 0 && $common['numberttn'] <> 1) {
-            $this->statuspan->statusform->bgi->setVisible(false);
-        }
-
+    
     
         if ($this->_doc->hasPayments()) {
             $this->statuspan->statusform->bpos->setVisible(false);
@@ -957,7 +951,7 @@ private function getWhere() {
         $conn = \ZDB\DB::getConnect();
         $filter=$this->page->listpanel->filter;
 
-        $where = "     meta_name  = 'Order'  ";
+        $where = "     meta_name  = 'Order'  and (CURRENT_DATE - INTERVAL 1 MONTH) < document_date ";
 
         $salesource =$filter->salesource->getValue();
         if ($salesource > 0) {
diff --git a/www/app/pages/register/paylist.php b/www/app/pages/register/paylist.php
index 8ff4c48e1..6535ad4a4 100644
--- a/www/app/pages/register/paylist.php
+++ b/www/app/pages/register/paylist.php
@@ -45,7 +45,8 @@ public function __construct() {
         $this->add(new Form('filter'))->onSubmit($this, 'filterOnSubmit');
         $this->filter->add(new DropDownChoice('fmfund', \App\Entity\MoneyFund::getList(), 0));
         $this->filter->add(new DropDownChoice('fuser', \App\Entity\User::findArray('username', 'disabled<>1', 'username'), 0));
-        $this->filter->add(new Date('from', time()));
+        $this->filter->add(new DropDownChoice('fsort', [], 0));
+        $this->filter->add(new Date('from', strtotime('-1 week')));
         $this->filter->add(new Date('to', time()));
 
         $this->filter->add(new AutocompleteTextInput('fcustomer'))->onText($this, 'OnAutoCustomer');
@@ -503,9 +504,18 @@ public function getItemCount() {
     }
 
     public function getItems($start=-1, $count=-1, $sortfield = null, $asc = null) {
+        $sort = $this->page->filter->fsort->getValue();
 
+        $order =" pl_id desc ";
+        if($sort==1) {
+           $order =" p.amount desc ";
+        }
+        if($sort==2) {
+           $order =" (0-p.amount) desc ";
+        }
+        
         $conn = \ZDB\DB::getConnect();
-        $sql = "select  p.*,d.customer_name,d.meta_id,d.document_date  from documents_view  d join paylist_view p on d.document_id = p.document_id where " . $this->getWhere() . " order  by  pl_id desc   ";
+        $sql = "select  p.*,d.customer_name,d.meta_id,d.document_date  from documents_view  d join paylist_view p on d.document_id = p.document_id where " . $this->getWhere() . " order  by   " . $order;
         if ($count > 0) {
             $limit =" limit {$start},{$count}";
         
diff --git a/www/app/pages/register/stocklist.php b/www/app/pages/register/stocklist.php
index 0c1873317..93c6a519c 100644
--- a/www/app/pages/register/stocklist.php
+++ b/www/app/pages/register/stocklist.php
@@ -12,6 +12,7 @@
 use Zippy\Html\Form\AutocompleteTextInput;
 use Zippy\Html\Form\Date;
 use Zippy\Html\Form\DropDownChoice;
+use Zippy\Html\Form\TextInput;
 use Zippy\Html\Form\Form;
 use Zippy\Html\Label;
 use Zippy\Html\Link\ClickLink;
@@ -39,7 +40,9 @@ public function __construct() {
         $this->filter->add(new Date('to', time() + (1 * 24 * 3600)));
         $this->filter->add(new DropDownChoice('fstore', Store::getList(), H::getDefStore()));
         $this->filter->add(new AutocompleteTextInput('fitem'))->onText($this, 'OnAutoItem');
-
+        $this->filter->fitem->onChange($this, "onItem");
+        $this->filter->add(new TextInput('fsnumber'))->setVisible(false);
+ 
         $doclist = $this->add(new DataView('doclist', new StockListDataSource($this), $this, 'doclistOnRow'));
 
         $this->add(new Paginator('pag', $doclist));
@@ -83,7 +86,19 @@ public function OnAutoItem($sender) {
         }
         return $r;
     }
+     public function onItem($sender) {
+        $this->filter->fsnumber->setVisible(false);
+
+        $item = Item::load($sender->getKey());
+        if ($item != null) {
+            if ($item->useserial == 1) {
+                $this->filter->fsnumber->setVisible(true);
+
+            }
+
+        }
 
+    }
     //просмотр
     public function showOnClick($sender) {
 
@@ -117,9 +132,12 @@ private function getWhere() {
 
         $store_id = $this->page->filter->fstore->getValue();
         $item_id = $this->page->filter->fitem->getKey();
+        $snumber = $this->page->filter->fsnumber->getText();
 
         $where = " s.item_id = {$item_id} and date(d.document_date) >= " . $conn->DBDate($this->page->filter->from->getDate()) . " and  date(d.document_date) <= " . $conn->DBDate($this->page->filter->to->getDate());
-
+        if (strlen($snumber) > 0) {
+            $where .= " and s.snumber=" . $conn->qstr($snumber);
+        }
         if ($store_id > 0) {
             $where .= " and s.store_id=" . $store_id;
         }
diff --git a/www/app/pages/report/balance.php b/www/app/pages/report/balance.php
index 4fadb8fd2..1f85a85f3 100644
--- a/www/app/pages/report/balance.php
+++ b/www/app/pages/report/balance.php
@@ -70,7 +70,7 @@ private function generateReport() {
         }
 
         $stview ="SELECT  SUM( (SELECT COALESCE(SUM(quantity), 0)  FROM entrylist_view
-          WHERE entrylist_view.stock_id = store_stock_view.stock_id and date(document_date) < {$dbdt} ) * partion)  from store_stock_view ";
+          WHERE entrylist_view.stock_id = store_stock_view.stock_id and  document_date < {$dbdt} ) * partion)  from store_stock_view ";
 
         $sql = $stview. " where {$brst} item_type=   ".Item::TYPE_MAT;
         $amat = doubleval($conn->GetOne($sql)) ;
diff --git a/www/app/pages/report/emptask.php b/www/app/pages/report/emptask.php
index 86e7027c4..56bd72995 100644
--- a/www/app/pages/report/emptask.php
+++ b/www/app/pages/report/emptask.php
@@ -59,8 +59,8 @@ private function generateReport() {
         $conn = \ZDB\DB::getConnect();
 
         $where = "   meta_name='Task'   
-              AND DATE( document_date) >= " . $conn->DBDate($from) . "
-              AND DATE( document_date) <= " . $conn->DBDate($to) . "
+              AND   document_date  >= " . $conn->DBDate($from) . "
+              AND   document_date  <= " . $conn->DBDate($to) . "
                 
         and state= " . Document::STATE_CLOSED;
 
diff --git a/www/app/pages/report/outfood.php b/www/app/pages/report/outfood.php
index be9842015..f5ee8fd08 100644
--- a/www/app/pages/report/outfood.php
+++ b/www/app/pages/report/outfood.php
@@ -67,10 +67,10 @@ private function generateReport() {
         if($rtype ==0) {
 
             $sql = "
-              SELECT  DATE(document_date) AS dt,COUNT(*) AS qty  FROM documents_view dv  
+              SELECT  document_date  AS dt,COUNT(*) AS qty  FROM documents_view dv  
                 WHERE  dv.meta_name='OrderFood' AND  state = 9
-                AND DATE(dv.document_date) >= " . $conn->DBDate($from) . "
-                AND DATE(dv.document_date) <= " . $conn->DBDate($to) . "
+                AND dv.document_date >= " . $conn->DBDate($from) . "
+                AND dv.document_date <= " . $conn->DBDate($to) . "
                 {$forbar}
                 GROUP BY dt
                 ORDER BY dt 
diff --git a/www/app/pages/service/armfood.php b/www/app/pages/service/armfood.php
index 964506933..bef030b94 100644
--- a/www/app/pages/service/armfood.php
+++ b/www/app/pages/service/armfood.php
@@ -487,7 +487,7 @@ public function onDocRow($row) {
 
     public function updateorderlist($sender) {
         $conn = \ZDB\DB::getConnect();
-        $where = " (state not in(9) or content like '%<passfisc>1</passfisc>%' ) and date(document_date) >= " . $conn->DBDate(strtotime('-1 week'))    ;
+        $where = " (state not in(9) or content like '%<passfisc>1</passfisc>%' ) and  document_date  >= " . $conn->DBDate(strtotime('-1 week'))    ;
         if ($sender instanceof Form) {
             $text = trim($sender->searchnumber->getText());
             $cust = $sender->searchcust->getKey();
diff --git a/www/app/pages/service/armpos.php b/www/app/pages/service/armpos.php
index 1496a1d13..986db442d 100644
--- a/www/app/pages/service/armpos.php
+++ b/www/app/pages/service/armpos.php
@@ -1518,7 +1518,7 @@ public function OnOpenShift($sender) {
             }
             \App\Modules\PPO\PPOHelper::clearStat($this->pos->pos_id);
             
-            
+            //задача  для  автозакрытия
             if($this->pos->autoshift >0){
                 $task = new  \App\Entity\CronTask()  ;
                 $task->tasktype = \App\Entity\CronTask::TYPE_AUTOSHIFT;
@@ -1705,7 +1705,7 @@ public function onDocRow($row) {
     public function updatechecklist($sender) {
         $conn = \ZDB\DB::getConnect();
 
-        $where = "meta_name='PosCheck' and date(document_date) >= " . $conn->DBDate(strtotime('-1 month'))    ;
+        $where = "meta_name='PosCheck' and  document_date  >= " . $conn->DBDate(strtotime('-1 month'))    ;
 
 
         if ($sender instanceof Form) {
diff --git a/www/app/pages/service/export.php b/www/app/pages/service/export.php
index f6ab06d22..36790630f 100644
--- a/www/app/pages/service/export.php
+++ b/www/app/pages/service/export.php
@@ -250,7 +250,7 @@ public function onDPreview($sender) {
 
         $conn = \ZDB\DB::getConnect();
 
-        $sql = "meta_name='{$dt}' and date(document_date) >= " . $conn->DBDate($sender->dfrom->getDate()) . " and  date(document_date) <= " . $conn->DBDate($sender->dto->getDate());
+        $sql = "meta_name='{$dt}' and   document_date  >= " . $conn->DBDate($sender->dfrom->getDate()) . " and  document_date <= " . $conn->DBDate($sender->dto->getDate());
         $this->_docs = Document::find($sql);
         $this->dformlist->doclist->Reload();
     }
diff --git a/www/app/system.php b/www/app/system.php
index 17b6870ab..d6c698cb7 100644
--- a/www/app/system.php
+++ b/www/app/system.php
@@ -10,8 +10,8 @@
  */
 class System
 {
-    public const CURR_VERSION = "6.12.0";
-    public const PREV_VERSION = "6.11.9";
+    public const CURR_VERSION = "6.12.1";
+    public const PREV_VERSION = "6.12.0";
     public const REQUIRED_DB  = "6.12.0";
 
     private static $_options = array();   //  для кеширования
@@ -231,12 +231,12 @@ public static function checkIP() {
 
     
     /**
-    * проверка  обновлений  и ряа  параметров  настроек
-    * 
+    * проверка  обновлений  и ряда  параметров  настроек
+    * вызывается  раз в  неделю
     */
     public static function checkUpdate() {
         $options = System::getOptions("common");       
-        if($options['noupdate']==1) {
+        if(($options['noupdate'] ??0)==1) {
            return;  
         }
         $lastcheck=intval( \App\Helper::getKeyVal('lastchecksystem')) ;
@@ -257,6 +257,14 @@ public static function checkUpdate() {
                     $n->save();                 
                           
                 }
+                if(System::useCron() == false){
+                    $n = new \App\Entity\Notify();
+                    $n->user_id = $user->user_id;
+                    $n->message = "Планувальник вимкнено. Деякі  фонові завдання  не  будуть виконуватись " ;
+                    $n->sender_id = \App\Entity\Notify::SYSTEM;
+
+                    $n->save();                    
+                }
         }
          
         if($user->rolename=='admins'   ){
diff --git a/www/app/widgets/docview.php b/www/app/widgets/docview.php
index 4ad3f80ca..b0d1f6555 100644
--- a/www/app/widgets/docview.php
+++ b/www/app/widgets/docview.php
@@ -154,13 +154,14 @@ public function loaddata($arg, $post) {
 
         $ret['pdoc_id'] = 0;
         $ret['pdoc_name'] = 0;
-        $p = Document::load($doc->parent_id);
-        if($p instanceof Document) {
-            $ret['pdoc_id'] = $doc->parent_id;
-            $ret['pdoc_name'] = $p->meta_desc . ' ' . $p->document_number;
+        if($doc->parent_id >0){
+            $p = Document::load($doc->parent_id);
+            if($p instanceof Document) {
+                $ret['pdoc_id'] = $doc->parent_id;
+                $ret['pdoc_name'] = $p->meta_desc . ' ' . $p->document_number. ' ' . $p->getStateName($p->state);
 
+            }
         }
-
         $ret['reldocs'] = array();
 
         return json_encode($ret, JSON_UNESCAPED_UNICODE);
@@ -177,7 +178,11 @@ public function loadchilddocs($arg, $post) {
 
         $docs = array();
         foreach($doc->getChildren() as $d) {
-            $docs[]=array('id'=>$d->document_id,'name'=>$d->meta_desc . ' ' . $d->document_number,'candel'=>($user->user_id == $d->user_id || $user->rolename  =='admins'));
+            $docs[]=array('id'=>$d->document_id,
+                          'name'=>$d->meta_desc . ' ' . $d->document_number,
+                          'status'=>$d->getStateName($d->state),
+                          'candel'=>($user->user_id == $d->user_id || $user->rolename  =='admins')
+                          );
         }
 
 
diff --git a/www/composer.lock b/www/composer.lock
index 825af88ec..72b988295 100644
--- a/www/composer.lock
+++ b/www/composer.lock
@@ -516,16 +516,16 @@
         },
         {
             "name": "leon-mbs/ppolib",
-            "version": "1.5.7",
+            "version": "1.5.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/leon-mbs/ppolib.git",
-                "reference": "8a383bab5e2745d1ae5d9f045b521248f73b0617"
+                "reference": "d70d399fa69b1ceb4032a27e116c45b0b8caf0b2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/leon-mbs/ppolib/zipball/8a383bab5e2745d1ae5d9f045b521248f73b0617",
-                "reference": "8a383bab5e2745d1ae5d9f045b521248f73b0617",
+                "url": "https://api.github.com/repos/leon-mbs/ppolib/zipball/d70d399fa69b1ceb4032a27e116c45b0b8caf0b2",
+                "reference": "d70d399fa69b1ceb4032a27e116c45b0b8caf0b2",
                 "shasum": ""
             },
             "require": {
@@ -546,9 +546,9 @@
             "homepage": "https://github.com/leon-mbs/ppolib",
             "support": {
                 "issues": "https://github.com/leon-mbs/ppolib/issues",
-                "source": "https://github.com/leon-mbs/ppolib/tree/1.5.7"
+                "source": "https://github.com/leon-mbs/ppolib/tree/1.5.8"
             },
-            "time": "2024-12-11T00:08:13+00:00"
+            "time": "2024-12-13T11:17:28+00:00"
         },
         {
             "name": "leon-mbs/zdb",
@@ -1689,12 +1689,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/Roave/SecurityAdvisories.git",
-                "reference": "1fd8b74024b8938b25df3a9971c7ad9d57d4f592"
+                "reference": "233f7c395ac3b83e3c85aa304f3350bf8897aca5"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/1fd8b74024b8938b25df3a9971c7ad9d57d4f592",
-                "reference": "1fd8b74024b8938b25df3a9971c7ad9d57d4f592",
+                "url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/233f7c395ac3b83e3c85aa304f3350bf8897aca5",
+                "reference": "233f7c395ac3b83e3c85aa304f3350bf8897aca5",
                 "shasum": ""
             },
             "conflict": {
@@ -2018,6 +2018,7 @@
                 "laravel/fortify": "<1.11.1",
                 "laravel/framework": "<6.20.45|>=7,<7.30.7|>=8,<8.83.28|>=9,<9.52.17|>=10,<10.48.23|>=11,<11.31",
                 "laravel/laravel": ">=5.4,<5.4.22",
+                "laravel/pulse": "<1.3.1",
                 "laravel/reverb": "<1.4",
                 "laravel/socialite": ">=1,<2.0.10",
                 "latte/latte": "<2.10.8",
@@ -2243,6 +2244,7 @@
                 "shopware/storefront": "<=6.4.8.1|>=6.5.8,<6.5.8.7-dev",
                 "shopxo/shopxo": "<=6.1",
                 "showdoc/showdoc": "<2.10.4",
+                "shuchkin/simplexlsx": ">=1.0.12,<1.1.12",
                 "silverstripe-australia/advancedreports": ">=1,<=2",
                 "silverstripe/admin": "<1.13.19|>=2,<2.1.8",
                 "silverstripe/assets": ">=1,<1.11.1",
@@ -2280,7 +2282,7 @@
                 "snipe/snipe-it": "<=7.0.13",
                 "socalnick/scn-social-auth": "<1.15.2",
                 "socialiteproviders/steam": "<1.1",
-                "spatie/browsershot": "<3.57.4",
+                "spatie/browsershot": "<5.0.1",
                 "spatie/image-optimizer": "<1.7.3",
                 "spencer14420/sp-php-email-handler": "<1",
                 "spipu/html2pdf": "<5.2.8",
@@ -2531,7 +2533,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-12-10T21:04:50+00:00"
+            "time": "2024-12-13T21:04:51+00:00"
         },
         {
             "name": "sabberworm/php-css-parser",
diff --git a/www/index.php b/www/index.php
index 999d7b515..69dd54ed7 100644
--- a/www/index.php
+++ b/www/index.php
@@ -37,7 +37,7 @@
     $app = new \App\Application();
     $modules = \App\System::getOptions('modules');
 
-    if ($modules['shop'] == 1 && \App\System::getOption('shop', 'usemainpage')==1) {
+    if (($modules['shop'] ??0)== 1 && \App\System::getOption('shop', 'usemainpage')==1) {
         $app->Run('\App\Modules\Shop\Pages\Catalog\Main' );
     } else {
         $app->Run($mainpage);
diff --git a/www/templates/apihelp.html b/www/templates/apihelp.html
index 2295d99be..cdc010be4 100644
--- a/www/templates/apihelp.html
+++ b/www/templates/apihelp.html
@@ -22,12 +22,14 @@ <h3>Формат обміну</h3>
                 <br>Authorization: Bearer <JWT токен>
                 <br>
                 <br><code>{"jsonrpc": "2.0", "method": "echo", "params": {"say": "Привіт"}, "id": 1}</code>
+             </p>
             <ul>
                 <li>jsonrpc - завжди "2.0"</li>
                 <li>method - функція, що викликається</li>
                 <li>params - параметри (не обов'язкове поле)</li>
                 <li>id - ідентифікатор запиту</li>
             </ul>
+             <p>
             Ідентифікатор запиту повертається у відповідь і може бути будь яким унікальним у випадку пакетного
             (batch)  запиту, (сервер може бути асинхронним та повернути відповіді у довільному порядку). У випадку
             відсутності ідентифікатора вважається, що запит - це нотифікація і не потребує відповіді.
@@ -37,15 +39,17 @@ <h3>Формат обміну</h3>
             <br> Відповідь має вигляд
             <br>
             <code> {"jsonrpc": "2.0", "result": {"answer": "Привіт"}, "id": 1} </code>
+             </p>
             <ul>
                 <li>jsonrpc - завжди "2.0"</li>
                 <li>result - відповідь</li>
                 <li>error - повертається замість result, якщо помилка</li>
                 <li>id - відповідний ідентифікатор із запиту</li>
             </ul>
+            <p>
             <i class="fa fa-exclamation-triangle"></i>  Поля з довільним текстом (наприклад описи) повертаються  закодованими  в  base64
             </p>
-            <p>
+            
                 <b>Коди помилок</b>
             <table class="ctable">
                 <tr>
@@ -73,7 +77,7 @@ <h3>Формат обміну</h3>
                     <td>Хибна команда</td>
                 </tr>
             </table>
-            </p>
+          
             <h3>Авторизація</h3>
             <p>
                 Тип авторизації задається в налаштуваннях і може бути на основі JWT токена, Basic аутентифікації
@@ -237,7 +241,7 @@ <h4 id="cust">Контрагенти</h4>
                 <td>
                  "params":   {
                 "customer_id":"8",
-                        "customer_name":"\"Рога&Копыта\"",
+                        "customer_name":"\"Рога&amp;Копыта\"",
                         "phone":"0991111111",
                         "email":"test@ukr.net",
                         "city":"",
@@ -489,8 +493,8 @@ <h4 id="docs">Документи</h4>
                  
                         <br> mf - каса або банкiвський рахунок
                         <br> branch_id - фiлiя (якщо увiмкнено)
-                        <br> amount - сума. Якщо >0 створюєтся Прибутковий касовий  ордер iнакше Видатковий касовий ордер
-                        <br> customer_id - контрагент.  Якщо задано i сума >0 то оплата вiд покупця. Якщо сума < 0 то оплата  постачальнику
+                        <br> amount - сума. Якщо &gt;0 створюєтся Прибутковий касовий  ордер iнакше Видатковий касовий ордер
+                        <br> customer_id - контрагент.  Якщо задано i сума &gt;0 то оплата вiд покупця. Якщо сума &lt; 0 то оплата  постачальнику
                                    
                  </td>
                 <td> "params":     {
diff --git a/www/templates/modules/hr/items.html b/www/templates/modules/hr/items.html
index 3bb3a5ae7..5d162c90f 100644
--- a/www/templates/modules/hr/items.html
+++ b/www/templates/modules/hr/items.html
@@ -4,10 +4,10 @@
             <div class="col-12 col-xl-10">
             
             <h3>Експорт   товарів в  магазин</h3>
-                &nbsp;&nbsp;&nbsp;<small><i class="fa fa-exclamation-triangle text-danger"></i>Спецсимволи (типу <b> & ' " `</b>)
+                &nbsp;&nbsp;&nbsp;<small><i class="fa fa-exclamation-triangle text-danger"></i>Спецсимволи (типу <b> &amp; ' " `</b>)
                     в назвi або описi можуть викликати проблеми з вигрузкою</small>
 
-            <br><a zippy="checkconn"><i class="fa fa fa-sync"></i> Загрузити категорії</a>        
+            <br><a zippy="checkconn"><i class="fa  fa-sync"></i> Загрузити категорії</a>        
                 
                 <div class="navbar nav">
                     <form zippy="filter" class="form-inline ">
diff --git a/www/templates/modules/hr/options.html b/www/templates/modules/hr/options.html
index a408499ae..095500ad4 100644
--- a/www/templates/modules/hr/options.html
+++ b/www/templates/modules/hr/options.html
@@ -25,7 +25,7 @@ <h4>Налаштування з'єднання</h4>
                         <label for="defpricetype">Тип ціни </label>
 
                         <select class="form-control" zippy="defpricetype">
-                            <option value='0'>Не обрано</option>
+                            <option value="0">Не обрано</option>
 
                         </select>
 
@@ -34,7 +34,7 @@ <h4>Налаштування з'єднання</h4>
                         <label for="defmf">Каса за замовчанням</label>
 
                         <select class="form-control" zippy="defmf">
-                            <option value='0'>Не вказана</option>
+                            <option value="0">Не вказана</option>
 
                         </select>
                         <small class="form-text text-muted">Якщо оплата  не  на  стороні IM </small>
diff --git a/www/templates/modules/hr/orders.html b/www/templates/modules/hr/orders.html
index 9910fd823..ace1b16a4 100644
--- a/www/templates/modules/hr/orders.html
+++ b/www/templates/modules/hr/orders.html
@@ -5,7 +5,7 @@
 
                 <h3>Імпорт замовлень</h3>
 
-          <br><a zippy="checkconn"><i class="fa fa fa-sync"></i> Загрузити статуси</a>        
+          <br><a zippy="checkconn"><i class="fa   fa-sync"></i> Загрузити статуси</a>        
                  
                 <div class="navbar nav">
                     <form zippy="filter" class="form-inline ">
diff --git a/www/templates/modules/issue/pages/projectlist.html b/www/templates/modules/issue/pages/projectlist.html
index 17e5f7b10..e7c789c2b 100644
--- a/www/templates/modules/issue/pages/projectlist.html
+++ b/www/templates/modules/issue/pages/projectlist.html
@@ -89,7 +89,7 @@ <h2>Проекти</h2>
                             </div>
                             <div class="form-group">
                                 <label for="editcust"> Замовник </label>
-                                <typeahead   v-model="editcust"  v-model="customer_id"  ref="cust"  :onquery="ontext"   placeholder="Почнiть вводити ..."></typeahead>   
+                                <typeahead   v-model="editcust"     ref="cust"  :onquery="ontext"   placeholder="Почнiть вводити ..."></typeahead>   
 
                             </div>
                             <div class="form-group">
@@ -183,7 +183,7 @@ <h4>Коментарі</h4>
           </div>
            <div v-show="this.mode=='show'" class="col-12 col-md-8 col-xl-6">
                 <h4>Опис</h4>
-                <p v-html="desc"><p>
+                <p v-html="desc"></p>
           </div>
         </div>
 
diff --git a/www/templates/modules/np/options.html b/www/templates/modules/np/options.html
index 47a254982..1001f19b6 100644
--- a/www/templates/modules/np/options.html
+++ b/www/templates/modules/np/options.html
@@ -84,7 +84,7 @@ <h5>Данi вiдправника за замовчуванням</h5>
               <tr zippy="gablist">
                  <td zippy="gabname"></td>
                  <td> <a zippy="delgab"> <i class="fa fa-trash"></i></a></td>
-              <tr>
+              </tr>
            </table>
   
         </div>
diff --git a/www/templates/modules/np/ttnlist.html b/www/templates/modules/np/ttnlist.html
index abe4f15ed..202d73faf 100644
--- a/www/templates/modules/np/ttnlist.html
+++ b/www/templates/modules/np/ttnlist.html
@@ -31,7 +31,7 @@ <h3>Стан  доставок</h3>
 
                 
                 &nbsp; &nbsp;  <a zippy="refresh">Оновити</a>
-                <table class="table  table">
+                <table class="table  table-sm">
                     <tr>
                         <th>ТТН</th>
                         <th>Сума</th>
diff --git a/www/templates/modules/ocstore/items.html b/www/templates/modules/ocstore/items.html
index 0a5cb863d..31ae010c4 100644
--- a/www/templates/modules/ocstore/items.html
+++ b/www/templates/modules/ocstore/items.html
@@ -4,10 +4,10 @@
             <div class="col-12 col-xl-10">
             
             <h3>Експорт   товарів в  магазин</h3>
-                &nbsp;&nbsp;&nbsp;<small><i class="fa fa-exclamation-triangle text-danger"></i>Спецсимволи (типу <b> & ' " `</b>)
+                &nbsp;&nbsp;&nbsp;<small><i class="fa fa-exclamation-triangle text-danger"></i>Спецсимволи (типу <b> &amp; ' " `</b>)
                     в назвi або описi можуть викликати проблеми з вигрузкою</small>
 
-            <br><a zippy="checkconn"><i class="fa fa fa-sync"></i> Перевiрити  з'єднання</a>        
+            <br><a zippy="checkconn"><i class="fa   fa-sync"></i> Перевiрити  з'єднання</a>        
                 
                 <div class="navbar nav">
                     <form zippy="filter" class="form-inline ">
diff --git a/www/templates/modules/ocstore/options.html b/www/templates/modules/ocstore/options.html
index 11d9f0151..b8631f45f 100644
--- a/www/templates/modules/ocstore/options.html
+++ b/www/templates/modules/ocstore/options.html
@@ -43,7 +43,7 @@ <h4>Налаштування підключення</h4>
                         <label for="defpricetype">Тип ціни </label>
 
                         <select class="form-control" zippy="defpricetype">
-                            <option value='0'>Не обрано</option>
+                            <option value="0">Не обрано</option>
 
                         </select>
                         <small class="form-text text-muted">Ціна для оновлення в магазині </small>
@@ -53,7 +53,7 @@ <h4>Налаштування підключення</h4>
                         <label for="defmf">Каса за замовчанням</label>
 
                         <select class="form-control" zippy="defmf">
-                            <option value='0'>Не вказана</option>
+                            <option value="0">Не вказана</option>
 
                         </select>
                         <small class="form-text text-muted">Якщо оплата  не  на  стороні IM </small>
diff --git a/www/templates/modules/ocstore/orders.html b/www/templates/modules/ocstore/orders.html
index 05ccb2fc2..1ba8082f7 100644
--- a/www/templates/modules/ocstore/orders.html
+++ b/www/templates/modules/ocstore/orders.html
@@ -6,7 +6,7 @@
             <div class="col-12 col-xl-10    ">
 
                 <h3>Імпорт замовлень</h3>
-                  <a zippy="checkconn"><i class="fa fa fa-sync"></i> Перевiрити  з'єднання</a>
+                  <a zippy="checkconn"><i class="fa   fa-sync"></i> Перевiрити  з'єднання</a>
   
 
                 <div class="navbar nav">
diff --git a/www/templates/modules/pu/items.html b/www/templates/modules/pu/items.html
index 07132d471..a7abe8896 100644
--- a/www/templates/modules/pu/items.html
+++ b/www/templates/modules/pu/items.html
@@ -7,7 +7,7 @@
             <div class="col-12 col-xl-10">
 
               <h3>Експорт   товарів в  магазин</h3>
-                &nbsp;&nbsp;&nbsp;<small><i class="fa fa-exclamation-triangle text-danger"></i>Спецсимволи (типу <b> & ' " `</b>)
+                &nbsp;&nbsp;&nbsp;<small><i class="fa fa-exclamation-triangle text-danger"></i>Спецсимволи (типу <b> &amp; ' " `</b>)
                     в назвi або описi може викликати проблеми з вигрузкою</small>
                <div class="navbar nav">
                     <form zippy="filter" class="form-inline ">
diff --git a/www/templates/modules/pu/options.html b/www/templates/modules/pu/options.html
index dcf85452c..d1c27e2fe 100644
--- a/www/templates/modules/pu/options.html
+++ b/www/templates/modules/pu/options.html
@@ -24,7 +24,7 @@ <h4>Налаштування з'єднання</h4>
                         <label for="defpricetype">Тип ціни </label>
 
                         <select class="form-control" zippy="defpricetype">
-                            <option value='0'>Не обрано</option>
+                            <option value="0">Не обрано</option>
 
                         </select>
 
@@ -33,7 +33,7 @@ <h4>Налаштування з'єднання</h4>
                         <label for="defmf">Каса за замовчанням</label>
 
                         <select class="form-control" zippy="defmf">
-                            <option value='0'>Не вказана</option>
+                            <option value="0">Не вказана</option>
 
                         </select>
                         <small class="form-text text-muted">Якщо оплата  не  на  стороні IM </small>
diff --git a/www/templates/modules/shop/pages/admin/custom.html b/www/templates/modules/shop/pages/admin/custom.html
index 84f15965a..bb3a2a64b 100644
--- a/www/templates/modules/shop/pages/admin/custom.html
+++ b/www/templates/modules/shop/pages/admin/custom.html
@@ -68,14 +68,14 @@ <h4>Редагування сторiнки</h4>
                 </div> 
                   <div class="form-group   ">
                         <label for="pagelink">Вiдносне  посилання    </label>
-                        <input pattern=[0-9a-z_]+ required="required" style="width:200px;" zippy="pagelink" class="form-control ">
+                        <input pattern="[0-9a-z_]+" required  style="width:200px;" zippy="pagelink" class="form-control ">
 
                         <small>Не включаючи адресу сайту. Допускаються тiльки  латиничнi символи (наприклад:  news,  about_us,  dostavka)</small>
                         
                     </div> 
                <div class="form-group   ">
                         <label for="pageorder">Порядковий  номер    </label>
-                        <input pattern=[0-9]+ required="required" style="width:40px;" zippy="pageorder" class="form-control ">
+                        <input pattern="[0-9]+" required="required" style="width:40px;" zippy="pageorder" class="form-control ">
 
                         <small>Номер  порядку виводу  в  меню</small>
                         
diff --git a/www/templates/modules/shop/pages/admin/options.html b/www/templates/modules/shop/pages/admin/options.html
index 221d77df3..4c35e41df 100644
--- a/www/templates/modules/shop/pages/admin/options.html
+++ b/www/templates/modules/shop/pages/admin/options.html
@@ -40,7 +40,7 @@ <h4>Налаштування</h4>
                         <label class="col-6 col-form-label"  for="defmf">Каса за замовчанням</label>
                         <div class="col-6">
                             <select class="form-control" zippy="defmf">
-                                <option value='0'>Не вказана</option>
+                                <option value="0">Не вказана</option>
                             </select>
                             <small class="form-text text-muted">Якщо оплата  не  на  стороні IM </small>
                         </div> 
@@ -66,9 +66,9 @@ <h4>Налаштування</h4>
                              <div class="col-6">
                             <select class="form-control " zippy="shopordertype">
 
-                                <option value='0'>Звичайне замовлення</option>
-                                <option value='1'>Касовий чек</option>
-                                <option value='2'>Замовлення кафе</option> 
+                                <option value="0">Звичайне замовлення</option>
+                                <option value="1">Касовий чек</option>
+                                <option value="2">Замовлення кафе</option> 
 
                             </select>
                             </div>  
diff --git a/www/templates/modules/shop/pages/admin/productlist.html b/www/templates/modules/shop/pages/admin/productlist.html
index 8f1df7494..49bc03188 100644
--- a/www/templates/modules/shop/pages/admin/productlist.html
+++ b/www/templates/modules/shop/pages/admin/productlist.html
@@ -102,9 +102,9 @@ <h4>Редагування</h4>
                                 <a zippy="updatecust" >Оновити кастомні поля</a> 
                                 <table class="table table-sm">
                                     <tr zippy="attrlist">
-
+                                      
                                     <div zippy="attrdata"></div>
-
+                                     
 
                                     </tr>
                                 </table>
diff --git a/www/templates/modules/shop/pages/catalog/catalog.html b/www/templates/modules/shop/pages/catalog/catalog.html
index 81bbbe9f5..965bebb28 100644
--- a/www/templates/modules/shop/pages/catalog/catalog.html
+++ b/www/templates/modules/shop/pages/catalog/catalog.html
@@ -65,7 +65,7 @@
                                     {{#usefeedback}}
                                     <div class="d-flex align-items-center ">
                                         <div class="mr-2">
-                                            <input style="display:inline" readonly="readonly" type="hidden" class="rating" zippy="srated" value="0" data-filled="fas fa-star" data-empty="far fa-star "/>
+                                            <input style="display:inline"   type="hidden" class="rating" zippy="srated" value="0" data-filled="fas fa-star" data-empty="far fa-star "/>
                                         </div>
                                         <span zippy="scomments"></span>
                                     </div> 
diff --git a/www/templates/modules/shop/pages/catalog/cchat.html b/www/templates/modules/shop/pages/catalog/cchat.html
index 0f78f5e28..2567633ab 100644
--- a/www/templates/modules/shop/pages/catalog/cchat.html
+++ b/www/templates/modules/shop/pages/catalog/cchat.html
@@ -40,7 +40,7 @@ <h4>Чат  по замовленню {{document_number}} вiд {{document_date}
                           {{#isseller}}
                           <div class="row">
                             <div class="col-6"><b>Продавець</b></div>
-                            <div class="col-4 text-right"><small>{{msgdate}}</div>
+                            <div class="col-4 text-right"><small>{{msgdate}}</small></div>
                             <div class="col-2"> </div>
                           </div>
                            <div class="row">
@@ -67,8 +67,8 @@ <h4>Чат  по замовленню {{document_number}} вiд {{document_date}
                              <i   class="fa fa-check-double "></i>
                               {{/checked}}
                                {{^checked}}
-                             <i   class="fa fa-check "></i>    </small>
-                              {{/checked}}
+                             <i   class="fa fa-check "></i>   
+                              {{/checked}}     </small>
                             </div>
                             
                           </div>
diff --git a/www/templates/modules/shop/pages/catalog/main.html b/www/templates/modules/shop/pages/catalog/main.html
index 59add096a..af1ca2cae 100644
--- a/www/templates/modules/shop/pages/catalog/main.html
+++ b/www/templates/modules/shop/pages/catalog/main.html
@@ -16,7 +16,7 @@
                 <div class="row" zippy="subcatlistp">
 
 
-                    <div zippy="subcatlist" class="col-12 col-sm-6 col-md-4 col-lg-3 col-xl-2 subcatlist mb-4" zippy="subcatlist">
+                    <div zippy="subcatlist" class="col-12 col-sm-6 col-md-4 col-lg-3 col-xl-2 subcatlist mb-4"  >
                         <div class="card h-100">
                             {{^nouseimages}}
                             <a zippy="scatimg"><img class="card-img-top"/></a>
diff --git a/www/templates/modules/shop/pages/catalog/menu.html b/www/templates/modules/shop/pages/catalog/menu.html
index 2be53742a..772cecdaa 100644
--- a/www/templates/modules/shop/pages/catalog/menu.html
+++ b/www/templates/modules/shop/pages/catalog/menu.html
@@ -81,7 +81,7 @@ <h4  > <a class="btn btn-outline-secondary  w-50" href="/menu/2"> {{smname}} </a
                  <div class="tab-content"  >
                  {{#cats}}     
                    <div class="tab-pane  show   " id="{{cat_id}}"> 
-                     <h3> {{cat_name}} </h4>
+                     <h3> {{cat_name}} </h3>
                      <table class="table table-sm">
                                         
                       {{#items}}                                                                 
diff --git a/www/templates/modules/shop/pages/catalog/order.html b/www/templates/modules/shop/pages/catalog/order.html
index 1cb0a7c36..689eeac6f 100644
--- a/www/templates/modules/shop/pages/catalog/order.html
+++ b/www/templates/modules/shop/pages/catalog/order.html
@@ -81,7 +81,7 @@ <h3 class="mt-2 mb-3">Оформлення замовлення</h3>
                      {{#usepayment}}
                     <div class="form-group  row">
                     
-                            <label class="col-5 col-form-label" for="payment" for="payment">Оплата</label>
+                            <label class="col-5 col-form-label" for="payment"  >Оплата</label>
                       
                        <div class="col-7">
                        <select class="form-control" zippy="payment">
diff --git a/www/templates/modules/shop/pages/catalog/orderpay.html b/www/templates/modules/shop/pages/catalog/orderpay.html
index f8098a151..23d7e9eaa 100644
--- a/www/templates/modules/shop/pages/catalog/orderpay.html
+++ b/www/templates/modules/shop/pages/catalog/orderpay.html
@@ -157,7 +157,7 @@ <h3 class="mt-2 mb-3">Оплата замовлення {{onumber}}</h3>
         <div class="col-12 col-md-auto">
                <h5 id="qrerror" style="display:none"   class="text-danger">Не задані параметри  отримувача</h5>
              
-               <div id = "qrpan" style="display:none">
+               <div id="qrpan" style="display:none">
                 <h4  >QR код для  оплати</h4>
                
                 <div class="modal-body  ">
diff --git a/www/templates/modules/shop/pages/catalog/productview.html b/www/templates/modules/shop/pages/catalog/productview.html
index c166eed10..79fae48d8 100644
--- a/www/templates/modules/shop/pages/catalog/productview.html
+++ b/www/templates/modules/shop/pages/catalog/productview.html
@@ -57,7 +57,7 @@ <h6><span zippy="customsize"></span></h6>
                         </div>
                         <div class="mt-1">
                             {{#usefeedback}}
-                            <input readonly="readonly" type="hidden" class="rating" zippy="rated" value="0"                            data-filled="fas fa-star" data-empty="far fa-star "/>
+                            <input   type="hidden" class="rating" zippy="rated" value="0"                            data-filled="fas fa-star" data-empty="far fa-star "/>
                             &nbsp;<span zippy="comments"></span>
                             {{/usefeedback}}
                         </div>
@@ -132,7 +132,7 @@ <h5>Вiдгуки</h5>
                     <tr zippy="commentlist">
                         <td>
 
-                            <span zippy="created"></span>&nbsp;&nbsp;<input readonly="readonly" type="hidden" class="rating"
+                            <span zippy="created"></span>&nbsp;&nbsp;<input   type="hidden" class="rating"
                                                                             zippy="rate" value="0" data-filled="fas fa-star"
                                                                             data-empty="far  fa-star "/>
                             <br><b><span zippy="nick"></span>:</b>
diff --git a/www/templates/modules/vdoc/doclist.html b/www/templates/modules/vdoc/doclist.html
index 71946ba70..86cf4ccb7 100644
--- a/www/templates/modules/vdoc/doclist.html
+++ b/www/templates/modules/vdoc/doclist.html
@@ -73,7 +73,7 @@ <h3>Документи на вiдправку </h3>
                 <a class="btn btn-sm btn-success" v-on:click.prevent="onSend">Вiдправити  в Вчасно  </a>
                 
 
-                                    <input  v-model="kep" id="" name="kep" class="ml-3" type="checkbox"  >
+                                    <input  v-model="kep"   name="kep" class="ml-3" type="checkbox"  >
                                     <label class="form-check-label mr-sm-2" for="fref">Накласти КЕП</label>
                                       
                 <div v-show="showsp2" class="spinner-border spinner-border-sm"></div>
diff --git a/www/templates/modules/wc/items.html b/www/templates/modules/wc/items.html
index 66bd20abd..f716c394e 100644
--- a/www/templates/modules/wc/items.html
+++ b/www/templates/modules/wc/items.html
@@ -6,7 +6,7 @@
             <div class="col-12 col-xl-10">
 
                 <h3>Експорт нових товарів</h3>
-                              <a zippy="checkconn"><i class="fa fa fa-sync"></i> Перевiрити  з'єднання</a>
+                              <a zippy="checkconn"><i class="fa   fa-sync"></i> Перевiрити  з'єднання</a>
    <div class="navbar nav">
                     <form zippy="filter" class="form-inline ">
                        <label for="searchcat">Категорія</label>
diff --git a/www/templates/modules/wc/options.html b/www/templates/modules/wc/options.html
index 517d1027b..048e180f6 100644
--- a/www/templates/modules/wc/options.html
+++ b/www/templates/modules/wc/options.html
@@ -42,7 +42,7 @@ <h4>Налаштування з'єднання</h4>
                         <label for="defpricetype">Тип ціни </label>
 
                         <select class="form-control" zippy="defpricetype">
-                            <option value='0'>Не обрано</option>
+                            <option value="0">Не обрано</option>
 
                         </select>
 
@@ -51,7 +51,7 @@ <h4>Налаштування з'єднання</h4>
                         <label for="defmf">Каса за замовчанням</label>
 
                         <select class="form-control" zippy="defmf">
-                            <option value='0'>Не вказана</option>
+                            <option value="0">Не вказана</option>
 
                         </select>
                         <small class="form-text text-muted">Якщо оплата  не  на  стороні IM </small>
diff --git a/www/templates/modules/wc/orders.html b/www/templates/modules/wc/orders.html
index 4526d1035..25e63e623 100644
--- a/www/templates/modules/wc/orders.html
+++ b/www/templates/modules/wc/orders.html
@@ -6,7 +6,7 @@
             <div class="col-12 col-xl-10   ">
 
                 <h3>Імпорт замовлень</h3>
-                <a zippy="checkconn"><i class="fa fa fa-sync"></i> Перевiрити  з'єднання</a>
+                <a zippy="checkconn"><i class="fa   fa-sync"></i> Перевiрити  з'єднання</a>
  
 
                 <div class="navbar nav">
diff --git a/www/templates/pages/branchlist.html b/www/templates/pages/branchlist.html
index 4c53b3c7a..393d96d42 100644
--- a/www/templates/pages/branchlist.html
+++ b/www/templates/pages/branchlist.html
@@ -29,7 +29,7 @@ <h3>Перелік філій </h3>
                 <form class="col-6 col-md-4" zippy="branchdetail">
                     <div class="form-group">
                         <label for="editbranchname">Назва</label>
-                        <input required="required" class="form-control" zippy="editbranchname"/>
+                        <input  required  class="form-control" zippy="editbranchname"/>
                     </div>
 
 
diff --git a/www/templates/pages/chat.html b/www/templates/pages/chat.html
index 46e0ae75e..f284d1317 100644
--- a/www/templates/pages/chat.html
+++ b/www/templates/pages/chat.html
@@ -78,7 +78,7 @@ <h4>Загальний чат</h4>
               
              <div class="form-group">
                      <label for="msgtext">Повiдомлення</label> 
-                    <textarea required="required"   zippy="msgtext"   class="form-control"></textarea>
+                    <textarea  required    zippy="msgtext"   class="form-control"></textarea>
                      
                        
                   </div>
diff --git a/www/templates/pages/crontab.html b/www/templates/pages/crontab.html
index fd5fd1864..56e04ee1c 100644
--- a/www/templates/pages/crontab.html
+++ b/www/templates/pages/crontab.html
@@ -32,12 +32,10 @@ <h5>Черга завдань</h5>
                 <table class="table table-sm mt-2  ">
                     <tr  zippy="nlist">
 
-                        <td>  <span zippy="ndate" > </span>
-                        <td>  <span zippy="ntype" > </span>
+                        <td>  <span zippy="ndate" > </span>   </td>
+                        <td>  <span zippy="ntype" > </span> </td>
 
-                            
-                        </td>
-                        
+                       
                         <td>
                         <a title="Запустити" zippy="nexec"><i class="fa fa-cog"></i></a>   &nbsp;&nbsp;&nbsp;&nbsp;
                         <a title="Видалити" zippy="ndel"><i class="fa fa-trash"></i></a> 
diff --git a/www/templates/pages/doc/calcsalary.html b/www/templates/pages/doc/calcsalary.html
index df7e849f4..782a62eb4 100644
--- a/www/templates/pages/doc/calcsalary.html
+++ b/www/templates/pages/doc/calcsalary.html
@@ -15,11 +15,11 @@ <h3> Нарахування зарплати</h3>
                 <div class="col-12 col-md-4 col-xl-3">
                     <div class="form-group">
                         <label for="document_number">Номер документа</label>
-                        <input class="form-control" type="text" v-model="doc.document_number" required="required"> 
+                        <input class="form-control" type="text" v-model="doc.document_number"  required > 
                     </div>
                     <div class="form-group">
                         <label for="document_date"> Дата</label>
-                        <input class="form-control" type="date" v-model="doc.document_date" required="required">
+                        <input class="form-control" type="date" v-model="doc.document_date"  required >
                     </div>
 
 
@@ -46,7 +46,7 @@ <h3> Нарахування зарплати</h3>
                     </div>
                     <div class="form-group  ">
                         <label for="daysmon">Кiл. роб. днiв </label>
-                        <input v-on:change="hch()" style="width:100px;"  type="number" required="required"  class="form-control" v-model="doc.daysmon">
+                        <input v-on:change="hch()" style="width:100px;"  type="number"  required   class="form-control" v-model="doc.daysmon">
                         <small>Кiлькiсть робочих днiв в  мiсяцi</small>
                     </div>
  
diff --git a/www/templates/pages/doc/goodsissue.html b/www/templates/pages/doc/goodsissue.html
index cd8ff6573..4390214fa 100644
--- a/www/templates/pages/doc/goodsissue.html
+++ b/www/templates/pages/doc/goodsissue.html
@@ -12,7 +12,7 @@ <h3>Видаткова накладна </h3>
                 <div class="col-12 col-md-4 col-xl-3">
                     <div class="form-group">
                         <label for="document_number">Номер документа</label>
-                        <input class="form-control" type="text" zippy="document_number" required="required">
+                        <input class="form-control" type="text" zippy="document_number"  required >
                     </div>
 
                     <div class="form-group  ">
@@ -53,7 +53,7 @@ <h3>Видаткова накладна </h3>
                 <div class="col-12 col-md-4  col-xl-3">
                     <div class="form-group">
                         <label for="document_date"> Дата</label>
-                        <input style="width:120px;" class="form-control" type="text" zippy="document_date" required="required">
+                        <input style="width:120px;" class="form-control" type="text" zippy="document_date"  required >
                     </div>
 
                     <div class="form-group  ">
@@ -79,7 +79,7 @@ <h3>Видаткова накладна </h3>
                 <div class="col-12 col-md-4  col-xl-3">
                     <div class="form-group">
                         <label for="order">Замовлення</label>
-                        <input readonly="readonly" class="form-control-plaintext" type="text" zippy="order">
+                        <input readonly  class="form-control-plaintext" type="text" zippy="order">
                     </div>                    
                      <div class="form-group  ">
                         <label for="salesource">Джерело продаж</label>
@@ -302,14 +302,14 @@ <h4>Введення товару </h4>
                     {{/usesnumber}}
                     <div class="form-group">
                         <label for="editquantity">Кількість</label>
-                        <input  class="form-control qtyprice" type="text" zippy="editquantity" required="required" pattern="[0-9,\.\s]+"
+                        <input  class="form-control qtyprice" type="text" zippy="editquantity"  required  pattern="[0-9,\.\s]+"
                                style="width: 70px;">
 
                     </div>
 
                     <div class="form-group">
                         <label for="editprice">Ціна </label>
-                        <input class="form-control qtyprice" type="text" zippy="editprice" required="required" pattern="[0-9,\.\s]+"
+                        <input class="form-control qtyprice" type="text" zippy="editprice"  required  pattern="[0-9,\.\s]+"
                                style="width: 70px;">
 
                     </div>
@@ -338,7 +338,7 @@ <h3>&nbsp;Новий покупець </h3>
 
                     <div class="form-group">
                         <label for="editcustname">Назва </label>
-                        <input class="form-control " zippy="editcustname" required="required"/>
+                        <input class="form-control " zippy="editcustname"  required />
                     </div>
                     <div class="form-group">
                         <label for="editphone">Телефон</label>
diff --git a/www/templates/pages/doc/goodsreceipt.html b/www/templates/pages/doc/goodsreceipt.html
index e9cf32edb..0381db472 100644
--- a/www/templates/pages/doc/goodsreceipt.html
+++ b/www/templates/pages/doc/goodsreceipt.html
@@ -11,11 +11,11 @@ <h3> Прибуткова накладна </h3>
                 <div class="col-12 col-md-3">
                     <div class="form-group">
                         <label for="document_number">Номер документа</label>
-                        <input class="form-control" type="text" zippy="document_number" required="required">
+                        <input class="form-control" type="text" zippy="document_number"  required >
                     </div>
                     <div class="form-group">
                         <label for="document_date"> Дата</label>
-                        <input class="form-control" type="text" zippy="document_date" required="required">
+                        <input class="form-control" type="text" zippy="document_date"  required >
                     </div>
 
                     <div class="form-group  ">
@@ -421,7 +421,7 @@ <h4>Введення товару </h4>
                     <div class="form-group row">
                         <label class="col-6 col-form-label" for="editquantity">Кількість</label>
                          <div class="col-6">
-                            <input autocomplete="off" class="form-control qtyprice" type="text" zippy="editquantity" required="required"                               pattern="[0-9,\.\s]+"                               style="width: 100px;"/>
+                            <input autocomplete="off" class="form-control qtyprice" type="text" zippy="editquantity"  required                                pattern="[0-9,\.\s]+"                               style="width: 100px;"/>
                          </div>
                     </div>
 
@@ -429,7 +429,7 @@ <h4>Введення товару </h4>
                     <div class="form-group row">
                         <label class="col-6 col-form-label" for="editprice">Ціна </label>
                          <div class="col-6">
-                            <input autocomplete="off" class="form-control qtyprice" type="text" zippy="editprice" required="required"                               pattern="[0-9,\.\s]+"                               style="width: 100px;">
+                            <input autocomplete="off" class="form-control qtyprice" type="text" zippy="editprice"  required                                pattern="[0-9,\.\s]+"                               style="width: 100px;">
                          </div>
                     </div>
                     <div class="form-group row">
@@ -490,7 +490,7 @@ <h3>&nbsp;Новий товар </h3>
 
                     <div class="form-group">
                         <label for="editnewitemname">Назва </label>
-                        <input autofocus="on"   class="form-control " zippy="editnewitemname" required="required"/>
+                        <input autofocus="on"   class="form-control " zippy="editnewitemname"  required />
                     </div>
                     <div class="form-group">
                         <label for="editnewitemcode">Код</label>
@@ -542,7 +542,7 @@ <h3>&nbsp;Новий постачальник </h3>
 
                     <div class="form-group">
                         <label for="editcustname">Назва </label>
-                        <input autofocus="on"   class="form-control " zippy="editcustname" required="required"/>
+                        <input autofocus="on"   class="form-control " zippy="editcustname"  required />
                     </div>
                     <div class="form-group">
                         <label for="editphone">Телефон</label>
@@ -706,7 +706,7 @@ <h3>&nbsp;Ввод за  серійними номерами</h3>
 
                     <div class="form-group">
                         <label for="editsnitemname">Назва </label>
-                        <input  autofocus="on"   placeholder="Почніть вводити..." class="form-control " zippy="editsnitemname" required="required"/>
+                        <input  autofocus="on"   placeholder="Почніть вводити..." class="form-control " zippy="editsnitemname"  required />
                          <small>В довіднику номенклатури тре вказати що даний ТМЦ обліковується  за  серійним номером</small>
                        
                     </div>
@@ -718,7 +718,7 @@ <h3>&nbsp;Ввод за  серійними номерами</h3>
           
                      <div class="form-group">
                         <label for="editsnprice">Ціна </label>
-                        <input autocomplete="off" class="form-control qtyprice" type="text" zippy="editsnprice" required="required"                               pattern="[0-9,\.\s]+"                               style="width: 100px;">
+                        <input autocomplete="off" class="form-control qtyprice" type="text" zippy="editsnprice"  required                                pattern="[0-9,\.\s]+"                               style="width: 100px;">
                     </div>
                     
                     <div class="form-group">
diff --git a/www/templates/pages/doc/incomeitem.html b/www/templates/pages/doc/incomeitem.html
index a7e540f20..fb25845c3 100644
--- a/www/templates/pages/doc/incomeitem.html
+++ b/www/templates/pages/doc/incomeitem.html
@@ -15,7 +15,7 @@ <h3> Оприбуткування ТМЦ</h3>
                     </div>
                     <div class="form-group">
                         <label for="document_date"> Дата</label>
-                        <input class="form-control" type="text" zippy="document_date" required="required">
+                        <input class="form-control" type="text" zippy="document_date"  required >
                     </div>
 
                     <div class="form-group  ">
@@ -162,12 +162,12 @@ <h4>Введення товару </h4>
                     <label for="editquantity">Кількість</label>
 
                     <input style="width:100px;" type="text" zippy="editquantity" class="form-control qtyprice"
-                           required="required" pattern="[0-9,\.]+"/>
+                            required  pattern="[0-9,\.]+"/>
 
                 </div>
                 <div class="form-group">
                     <label for="editprice">Ціна </label>
-                    <input autocomplete="off" class="form-control qtyprice" type="text" zippy="editprice" required="required"
+                    <input autocomplete="off" class="form-control qtyprice" type="text" zippy="editprice"  required 
                            pattern="[0-9,\.]+"
                            style="width: 100px;">
                 </div>
@@ -191,7 +191,7 @@ <h3>&nbsp;Новий товар </h3>
 
                     <div class="form-group">
                         <label for="editnewitemname">Назва </label>
-                        <input class="form-control " zippy="editnewitemname" required="required"/>
+                        <input class="form-control " zippy="editnewitemname"  required />
                     </div>
                     <div class="form-group">
                         <label for="editnewitemcode">Артикул</label>
diff --git a/www/templates/pages/doc/incomemoney.html b/www/templates/pages/doc/incomemoney.html
index aff70f2b2..dd6624ab9 100644
--- a/www/templates/pages/doc/incomemoney.html
+++ b/www/templates/pages/doc/incomemoney.html
@@ -16,7 +16,7 @@ <h3> Прибутковий ордер</h3>
                     </div>
                     <div class="form-group">
                         <label for="document_date"> Дата</label>
-                        <input class="form-control" type="text" zippy="document_date" required="required">
+                        <input class="form-control" type="text" zippy="document_date"  required >
                     </div>
                     <div class="form-group  ">
                         <label for="payment">Каса, рахунок</label>
diff --git a/www/templates/pages/doc/incomeservice.html b/www/templates/pages/doc/incomeservice.html
index a866ad0ed..1fc75c297 100644
--- a/www/templates/pages/doc/incomeservice.html
+++ b/www/templates/pages/doc/incomeservice.html
@@ -17,7 +17,7 @@ <h3> Отриманi послуги
                 <div class="col-6 col-md-4 col-lg-3">
                     <div class="form-group">
                         <label for="document_number">Номер документа</label>
-                        <input class="form-control" type="text" zippy="document_number" required="required">
+                        <input class="form-control" type="text" zippy="document_number"  required >
                     </div>
                          <div class="form-group  ">
                         <label for="firm">Замовник</label>
@@ -48,7 +48,7 @@ <h3> Отриманi послуги
                 <div class="col-6 col-md-4 col-lg-3">
                     <div class="form-group">
                         <label for="document_date"> Дата</label>
-                        <input class="form-control" type="text" zippy="document_date" required="required">
+                        <input class="form-control" type="text" zippy="document_date"  required >
                     </div>
 
                 
@@ -244,7 +244,7 @@ <h3>Редагування </h3>
 
                     <div class="form-group">
                         <label for="editprice">Вартiсть </label>
-                        <input class="form-control qtyprice" type="text" zippy="editprice" required="required" pattern="[0-9,\.]+"
+                        <input class="form-control qtyprice" type="text" zippy="editprice"  required  pattern="[0-9,\.]+"
                                value="0" style="width: 100px;">
                     </div>
 
@@ -263,7 +263,7 @@ <h3>&nbsp;Новий контрагент </h3>
 
                     <div class="form-group">
                         <label for="editcustname">Назва </label>
-                        <input autofocus="on"   class="form-control " zippy="editcustname" required="required"/>
+                        <input autofocus="on"   class="form-control " zippy="editcustname"  required />
                     </div>
                     <div class="form-group">
                         <label for="editphone">Телефон</label>
@@ -293,9 +293,9 @@ <h3>&nbsp;Новий контрагент </h3>
                     <input placeholder="Почніть вводити.." class="form-control  mr-sm-2" zippy="editsname"/>
 
                     <label for="editsqty">Кіл.</label>
-                    <input autocomplete="off" class="form-control  qtyprice  mr-sm-2" type="text" zippy="editsqty" required="required"                           pattern="[0-9,\.]+" style="width:75px">
+                    <input autocomplete="off" class="form-control  qtyprice  mr-sm-2" type="text" zippy="editsqty"  required                            pattern="[0-9,\.]+" style="width:75px">
                     <label for="editsprice">Ціна</label>
-                    <input autocomplete="off" class="form-control  qtyprice  mr-sm-2" type="text" zippy="editsprice" required="required"                           pattern="[0-9,\.]+" style="width:100px">
+                    <input autocomplete="off" class="form-control  qtyprice  mr-sm-2" type="text" zippy="editsprice"  required                            pattern="[0-9,\.]+" style="width:100px">
                     <input class="btn btn-success  " type="submit" value="Додати">
                 </form>
                 <table class="table   table-sm  ">
diff --git a/www/templates/pages/doc/inventory.html b/www/templates/pages/doc/inventory.html
index 827002bae..df03ad429 100644
--- a/www/templates/pages/doc/inventory.html
+++ b/www/templates/pages/doc/inventory.html
@@ -46,7 +46,7 @@ <h3> Інвентаризація
                 <div class="col-12 col-md-3">
                     <div class="form-group">
                         <label for="document_date"> Дата</label>
-                        <input class="form-control" type="text" zippy="document_date" required="required">
+                        <input class="form-control" type="text" zippy="document_date"  required >
                     </div>
 
                     <div class="form-group  ">
@@ -172,7 +172,7 @@ <h4>Введення ТМЦ </h4>
                     <label for="editquantity">Кількість</label>
                     <div>
                         <input style="width:100px;" type="text" zippy="editquantity" class="form-control qtyprice"
-                               required="required" pattern="[0-9,\.]+"/>
+                                required  pattern="[0-9,\.]+"/>
                     </div>
                 </div>
 
diff --git a/www/templates/pages/doc/invoice.html b/www/templates/pages/doc/invoice.html
index eab40dc53..880e5b11a 100644
--- a/www/templates/pages/doc/invoice.html
+++ b/www/templates/pages/doc/invoice.html
@@ -62,11 +62,11 @@ <h3>Рахунок-фактура </h3>
                 <div class="col-12 col-md-3">
                    <div class="form-group">
                         <label for="document_number">Номер документа</label>
-                        <input class="form-control" type="text" zippy="document_number" required="required">
+                        <input class="form-control" type="text" zippy="document_number"  required >
                     </div>
                    <div class="form-group">
                         <label for="document_date"> Дата</label>
-                        <input class="form-control" type="text" zippy="document_date" required="required">
+                        <input class="form-control" type="text" zippy="document_date"  required >
                     </div>
                     <div class="form-group  ">
                         <label for="store">Зі складу</label>
@@ -210,13 +210,13 @@ <h4>Редагування товару </h4>
                     </div>
                     <div class="form-group">
                         <label for="editquantity">Кількість</label>
-                        <input autocomplete="off" class="form-control qtyprice" type="text" zippy="editquantity" required="required"
+                        <input autocomplete="off" class="form-control qtyprice" type="text" zippy="editquantity"  required 
                                pattern="[0-9,\.]+" style="width: 100px;">
 
                     </div>
                     <div class="form-group">
                         <label for="editprice">Ціна </label>
-                        <input autocomplete="off" class="form-control qtyprice" type="text" zippy="editprice" required="required"  pattern="[0-9,\.]+"   style="width: 100px;">
+                        <input autocomplete="off" class="form-control qtyprice" type="text" zippy="editprice"  required   pattern="[0-9,\.]+"   style="width: 100px;">
                     </div>
 
 
@@ -243,13 +243,13 @@ <h4>Редагування послуги</h4>
                     </div>
                     <div class="form-group">
                         <label for="editserquantity">Кiлькiсть</label>
-                        <input autocomplete="off" class="form-control qtyprice" type="text" zippy="editserquantity" required="required"
+                        <input autocomplete="off" class="form-control qtyprice" type="text" zippy="editserquantity"  required 
                                pattern="[0-9,\.]+" style="width: 100px;">
 
                     </div>
                     <div class="form-group">
                         <label for="editserprice">Цiна </label>
-                        <input autocomplete="off" class="form-control qtyprice" type="text" zippy="editserprice" required="required"
+                        <input autocomplete="off" class="form-control qtyprice" type="text" zippy="editserprice"  required 
                                pattern="[0-9,\.]+"                               style="width: 100px;">
 
                     </div>
@@ -272,7 +272,7 @@ <h3>&nbsp;Новий контрагент </h3>
 
                     <div class="form-group">
                         <label for="editcustname">Назва </label>
-                        <input autofocus="on"   class="form-control " zippy="editcustname" required="required"/>
+                        <input autofocus="on"   class="form-control " zippy="editcustname"  required />
                     </div>
                     <div class="form-group">
                         <label for="editcustphone">Телефон</label>
diff --git a/www/templates/pages/doc/invoicecust.html b/www/templates/pages/doc/invoicecust.html
index b001d447a..1f2d6663d 100644
--- a/www/templates/pages/doc/invoicecust.html
+++ b/www/templates/pages/doc/invoicecust.html
@@ -11,7 +11,7 @@ <h3> Рахунок вхідний </h3>
                 <div class="col-12 col-md-3">
                     <div class="form-group">
                         <label for="document_number">Номер документа</label>
-                        <input class="form-control" type="text" zippy="document_number" required="required">
+                        <input class="form-control" type="text" zippy="document_number"  required >
                     </div>
 
                     <div class="form-group  ">
@@ -40,7 +40,7 @@ <h3> Рахунок вхідний </h3>
                 <div class="col-12 col-md-3">
                     <div class="form-group">
                         <label for="document_date"> Дата</label>
-                        <input class="form-control" type="text" zippy="document_date" required="required">
+                        <input class="form-control" type="text" zippy="document_date"  required >
                     </div>
  
                     <div class="form-group  ">
@@ -276,7 +276,7 @@ <h4>Введення товару </h4>
 
                     <div class="form-group">
                         <label for="editquantity">Кількість</label>
-                        <input autocomplete="off" class="form-control qtyprice" type="text" zippy="editquantity" required="required"
+                        <input autocomplete="off" class="form-control qtyprice" type="text" zippy="editquantity"  required 
                                pattern="[0-9,\.]+"
                                style="width: 100px;"/>
                     </div>
@@ -284,7 +284,7 @@ <h4>Введення товару </h4>
 
                     <div class="form-group">
                         <label for="editprice">Ціна </label>
-                        <input autocomplete="off" class="form-control qtyprice" type="text" zippy="editprice" required="required"
+                        <input autocomplete="off" class="form-control qtyprice" type="text" zippy="editprice"  required 
                                pattern="[0-9,\.]+"
                                style="width: 100px;">
                     </div>
@@ -311,7 +311,7 @@ <h3>&nbsp;Новий товар </h3>
 
                     <div class="form-group">
                         <label for="editnewitemname">Назва </label>
-                        <input class="form-control " zippy="editnewitemname" required="required"/>
+                        <input class="form-control " zippy="editnewitemname"  required />
                     </div>
                     <div class="form-group">
                         <label for="editnewitemcode">Код</label>
diff --git a/www/templates/pages/doc/moveitem.html b/www/templates/pages/doc/moveitem.html
index f9d4cf43b..c021e05fb 100644
--- a/www/templates/pages/doc/moveitem.html
+++ b/www/templates/pages/doc/moveitem.html
@@ -41,7 +41,7 @@ <h3> Перемiщення ТМЦ</h3>
                     </div>
                     <div class="form-group">
                         <label for="document_date"> Дата</label>
-                        <input class="form-control" type="text" zippy="document_date" required="required">
+                        <input class="form-control" type="text" zippy="document_date"  required >
                     </div>          
                 </div>
             </div>
@@ -137,7 +137,7 @@ <h4>Введення товару </h4>
                     <label for="editquantity">Кількість</label>
 
                     <input onkeydown="onItem()" style="width:100px;" type="text" zippy="editquantity" class="form-control qtyprice"
-                           required="required" pattern="[0-9,\.]+"/>
+                            required  pattern="[0-9,\.]+"/>
 
                 </div>
 
@@ -164,7 +164,7 @@ <h3>&nbsp;Ввод за  серійними номерами</h3>
 
                     <div class="form-group">
                         <label for="editsnitemname">Назва </label>
-                        <input  autofocus="on"   placeholder="Почніть вводити..." class="form-control " zippy="editsnitemname" required="required"/>
+                        <input  autofocus="on"   placeholder="Почніть вводити..." class="form-control " zippy="editsnitemname"  required />
                     </div>
                     <div class="form-group">
                         <label for="editsn">Серійні номери</label>
diff --git a/www/templates/pages/doc/movemoney.html b/www/templates/pages/doc/movemoney.html
index 30710c3c8..4fb54d768 100644
--- a/www/templates/pages/doc/movemoney.html
+++ b/www/templates/pages/doc/movemoney.html
@@ -15,7 +15,7 @@ <h3> Перемiщення  коштiв</h3>
                     </div>
                     <div class="form-group">
                         <label for="document_date"> Дата</label>
-                        <input class="form-control" type="text" zippy="document_date" required="required">
+                        <input class="form-control" type="text" zippy="document_date"  required >
                     </div>
 
                     <div class="form-group  ">
diff --git a/www/templates/pages/doc/movepart.html b/www/templates/pages/doc/movepart.html
index 03c54c5e6..6a196806e 100644
--- a/www/templates/pages/doc/movepart.html
+++ b/www/templates/pages/doc/movepart.html
@@ -15,7 +15,7 @@ <h3> Перемiщення партiй ТМЦ</h3>
                     </div>
                     <div class="form-group">
                         <label for="document_date"> Дата</label>
-                        <input class="form-control" type="text" zippy="document_date" required="required">
+                        <input class="form-control" type="text" zippy="document_date"  required >
                     </div>
 
 
@@ -39,7 +39,7 @@ <h3> Перемiщення партiй ТМЦ</h3>
                         </div>  
                         <div class="form-group  ">
                           <label for="qty">Кiл. </label>
-                          <input style="width:100px" pattern="[0-9,\.]+" class="form-control qtyprice" type="text" zippy="qty" required="required">
+                          <input style="width:100px" pattern="[0-9,\.]+" class="form-control qtyprice" type="text" zippy="qty"  required >
 
                     </div>
                    </div>
diff --git a/www/templates/pages/doc/officedoc.html b/www/templates/pages/doc/officedoc.html
index 0ccc63ae7..bcfb5ce7b 100644
--- a/www/templates/pages/doc/officedoc.html
+++ b/www/templates/pages/doc/officedoc.html
@@ -23,7 +23,7 @@
                             <label for="document_number">Номер </label>
                         </div>
                          <div class="col-7">
-                            <input style="width:150px" class="form-control" type="text" zippy="document_number" required="required">
+                            <input style="width:150px" class="form-control" type="text" zippy="document_number"  required >
                         </div>
                     </div>
                     <div class="form-group row">
@@ -31,7 +31,7 @@
                            <label for="document_date"> Дата</label>
                         </div>
                          <div class="col-7">
-                           <input class="form-control" type="text" zippy="document_date" required="required">
+                           <input class="form-control" type="text" zippy="document_date"  required >
                         </div>                        
                     </div>
                     <div class="form-group  ">
@@ -125,7 +125,7 @@ <h3>&nbsp;Новий конрагент </h3>
 
                     <div class="form-group">
                         <label for="editcustname">Назва </label>
-                        <input class="form-control " zippy="editcustname" required="required"/>
+                        <input class="form-control " zippy="editcustname"  required />
                     </div>
                     <div class="form-group">
                         <label for="editphone">Телефон</label>
@@ -178,7 +178,10 @@ <h5>&nbsp;Право перегляду </h5>
                </div> 
                 <div class="form-group">
                   <table class="table table-sm">
-                     <tr zippy="accshowlist">  <td zippy="accshowuser">  </td><td  class="text-right"> <a zippy="delshowuser"><i class="fa fa-trash"></i></a> </td>
+                     <tr zippy="accshowlist">  
+                       <td zippy="accshowuser">  </td>
+                       <td  class="text-right"> <a zippy="delshowuser"><i class="fa fa-trash"></i></a> </td>
+                       </tr>
                   </table>
                </div>           
              
@@ -196,7 +199,7 @@ <h5>&nbsp;Право редагування </h5>
                </div> 
                 <div class="form-group">
                   <table class="table table-sm">
-                     <tr zippy="acceditlist">  <td zippy="accedituser">  </td><td class="text-right" > <a zippy="deledituser"><i class="fa fa-trash"></i></a> </td>
+                     <tr zippy="acceditlist">  <td zippy="accedituser">  </td><td class="text-right" > <a zippy="deledituser"><i class="fa fa-trash"></i></a> </td></tr>
                   </table>
                </div>                   
             <h5>&nbsp;Мають пiдписати (затвердети) </h5>
@@ -214,7 +217,7 @@ <h5>&nbsp;Мають пiдписати (затвердети) </h5>
                </div> 
                 <div class="form-group">
                   <table class="table table-sm">
-                     <tr zippy="accapprlist">  <td zippy="accappruser">  </td><td class="text-right" > <a zippy="delappruser"><i class="fa fa-trash"></i></a> </td>
+                     <tr zippy="accapprlist">  <td zippy="accappruser">  </td><td class="text-right" > <a zippy="delappruser"><i class="fa fa-trash"></i></a> </td></tr>
                   </table>
                </div>                   
 
diff --git a/www/templates/pages/doc/order.html b/www/templates/pages/doc/order.html
index 474fff020..b7787f3d9 100644
--- a/www/templates/pages/doc/order.html
+++ b/www/templates/pages/doc/order.html
@@ -12,7 +12,7 @@ <h3>Замовлення </h3>
                 <div class="col-12 col-md-3">
                     <div class="form-group">
                         <label for="document_number">Номер документа</label>
-                        <input class="form-control" type="text" zippy="document_number" required="required">
+                        <input class="form-control" type="text" zippy="document_number"  required >
                     </div>
                     <div class="form-group  ">
                         <label for="customer">Покупець</label>
@@ -52,7 +52,7 @@ <h3>Замовлення </h3>
                 <div class="col-12 col-md-3">
                     <div class="form-group">
                         <label for="document_date"> Дата</label>
-                        <input class="form-control" type="text" zippy="document_date" required="required">
+                        <input class="form-control" type="text" zippy="document_date"  required >
                     </div>
                     <div class="form-group  ">
                         <label for="salesource">Джерело продаж</label>
@@ -80,7 +80,7 @@ <h3>Замовлення </h3>
 
 
                          <div style="width:150px" class="input-group  ">
-                             <input  readonly="readonly" zippy="promocode" class="form-control">
+                             <input  readonly  zippy="promocode" class="form-control">
                              <div class="input-group-append">
                                  <a data-toggle="modal" data-label="promocode" data-target="#modalpromo" href="javascript:void(0);" title="Ввести промо" class="btn btn-success"   >+</a>
                             </div>                    
@@ -362,12 +362,12 @@ <h4>Введення товару </h4>
                     </div>
                     <div class="form-group">
                         <label for="editquantity">Кількість</label>
-                        <input autocomplete="off" class="form-control qtyprice" type="text" zippy="editquantity" required="required"                               pattern="[0-9,\.\s]+" style="width: 100px;">
+                        <input autocomplete="off" class="form-control qtyprice" type="text" zippy="editquantity"  required                                pattern="[0-9,\.\s]+" style="width: 100px;">
 
                     </div>
                     <div class="form-group">
                         <label for="editprice">Ціна </label>
-                        <input autocomplete="off" class="form-control qtyprice" type="text" zippy="editprice" required="required"                               pattern="[0-9,\.\s]+"                               style="width: 100px;">
+                        <input autocomplete="off" class="form-control qtyprice" type="text" zippy="editprice"  required                                pattern="[0-9,\.\s]+"                               style="width: 100px;">
 
                     </div>
 
@@ -401,7 +401,7 @@ <h3>&nbsp;Новий контрагент </h3>
 
                     <div class="form-group">
                         <label for="editcustname">Назва </label>
-                        <input class="form-control " zippy="editcustname" required="required"/>
+                        <input class="form-control " zippy="editcustname"  required />
                     </div>
                     <div class="form-group">
                         <label for="editcustphone">Телефон</label>
@@ -427,7 +427,7 @@ <h3>&nbsp;Новий товар </h3>
 
                     <div class="form-group">
                         <label for="editnewitemname">Назва </label>
-                        <input class="form-control " zippy="editnewitemname" required="required"/>
+                        <input class="form-control " zippy="editnewitemname"  required />
                     </div>
                     <div class="form-group">
                         <label for="editnewitemcode">Код</label>
diff --git a/www/templates/pages/doc/ordercust.html b/www/templates/pages/doc/ordercust.html
index 7795a9cbc..7b72df68a 100644
--- a/www/templates/pages/doc/ordercust.html
+++ b/www/templates/pages/doc/ordercust.html
@@ -14,7 +14,7 @@ <h3> Заявка постачальнику </h3>
                    <div class="form-group row">
                         <label class="col-5 col-form-label" for="document_number">Номер документа</label>
                         <div class="col-7">
-                            <input  class="form-control" required="required" zippy="document_number"  />
+                            <input  class="form-control"  required  zippy="document_number"  />
                         </div>
                   </div>
                   <div class="form-group row">
@@ -39,7 +39,7 @@ <h3> Заявка постачальнику </h3>
                    <div class="form-group row">
                         <label class="col-5 col-form-label" for="document_date">Дата документа</label>
                         <div class="col-7">
-                            <input  type="date" style="width:120px" class="form-control" required="required" zippy="document_date"  />
+                            <input  type="date" style="width:120px" class="form-control"  required  zippy="document_date"  />
                         </div>
                   </div>
                   <div class="form-group row">
@@ -82,7 +82,7 @@ <h3> Заявка постачальнику </h3>
 
                             <td zippy="amount" class="text-right"></td>
 
-                            <td><a zippy="edit"><i class="fa fa-edit"></i></a> &nbsp;&nbsp;&nbsp;<a zippy="delete"><i class="fa fa-trash"></i></a>
+                            <td><a zippy="edit"><i class="fa fa-edit"></i></a> &nbsp;&nbsp;&nbsp;<a zippy="delete"><i class="fa fa-trash"></i></a></td>
 
                         </tr>
                         <tr style="font-weight: bolder;">
@@ -131,7 +131,7 @@ <h4>Введення товару </h4>
                 <div class="form-group row">
                     <label class="col-7 col-form-label" for="editquantity">Кількість</label>
                     <div class="col-4" >
-                    <input autocomplete="off" class="form-control qtyprice" type="text" zippy="editquantity"   required="required"
+                    <input autocomplete="off" class="form-control qtyprice" type="text" zippy="editquantity"    required 
                            pattern="[0-9,\.]+"    />
                      </div>      
                 </div>
@@ -140,7 +140,7 @@ <h4>Введення товару </h4>
                 <div class="form-group row">
                     <label class="col-7 col-form-label" for="editprice">Ціна </label>
                     <div class="col-4" >
-                    <input autocomplete="off" class="form-control qtyprice" type="text" zippy="editprice"   required="required"
+                    <input autocomplete="off" class="form-control qtyprice" type="text" zippy="editprice"    required 
                            pattern="[0-9,\.]+"                               >
                         </div>    
                 </div>
@@ -181,7 +181,7 @@ <h3>&nbsp;Новий товар </h3>
                                  
                     <div class="form-group">
                         <label for="editnewitemname">Назва </label>
-                        <input zippy="editnewitemname" class="form-control "   required="required"/>
+                        <input zippy="editnewitemname" class="form-control "    required />
                     </div>
                     <div class="form-group">
                         <label for="editnewitemcode">Код</label>
@@ -223,7 +223,7 @@ <h5>&nbsp;Новий постачальник </h5>
         
                     <div class="form-group">
                         <label for="editcustname">Назва </label>
-                        <input autofocus="on"   class="form-control " zippy="editcustname" required="required"/>
+                        <input autofocus="on"   class="form-control " zippy="editcustname"  required />
                     </div>
                     <div class="form-group">
                         <label for="editphone">Телефон</label>
diff --git a/www/templates/pages/doc/orderfood.html b/www/templates/pages/doc/orderfood.html
index 989f37690..50850ae30 100644
--- a/www/templates/pages/doc/orderfood.html
+++ b/www/templates/pages/doc/orderfood.html
@@ -13,7 +13,7 @@ <h3>Замовлення (Кафе) </h3>
                 <div class="col-12 col-md-4 col-xl-3">
                     <div class="form-group">
                         <label for="document_number">Номер документа</label>
-                        <input class="form-control" type="text" zippy="document_number" required="required">
+                        <input class="form-control" type="text" zippy="document_number"  required >
                     </div>
 
                     <div class="form-group  ">
@@ -48,7 +48,7 @@ <h3>Замовлення (Кафе) </h3>
                 <div class="col-12 col-md-4  col-xl-3">
                     <div class="form-group">
                         <label for="document_date"> Дата</label>
-                        <input style="width:120px;" class="form-control" type="text" zippy="document_date" required="required">
+                        <input style="width:120px;" class="form-control" type="text" zippy="document_date"  required >
                     </div>
                     <div class="form-group  ">
                         <label for="pos">POS термінал</label>
@@ -297,14 +297,14 @@ <h4>Введення товару </h4>
 
                     <div class="form-group">
                         <label for="editquantity">Кількість</label>
-                        <input class="form-control qtyprice" type="text" zippy="editquantity" required="required" pattern="[0-9,\.]+"
+                        <input class="form-control qtyprice" type="text" zippy="editquantity"  required  pattern="[0-9,\.]+"
                                style="width: 70px;">
 
                     </div>
 
                     <div class="form-group">
                         <label for="editprice">Ціна </label>
-                        <input class="form-control qtyprice" type="text" zippy="editprice" required="required" pattern="[0-9,\.]+"
+                        <input class="form-control qtyprice" type="text" zippy="editprice"  required  pattern="[0-9,\.]+"
                                style="width: 70px;">
 
                     </div>
@@ -328,7 +328,7 @@ <h3>&nbsp;Новий клієнт </h3>
 
                     <div class="form-group">
                         <label for="editcustname">Назва </label>
-                        <input class="form-control " zippy="editcustname" required="required"/>
+                        <input class="form-control " zippy="editcustname"  required />
                     </div>
                     <div class="form-group">
                         <label for="editphone">Телефон</label>
diff --git a/www/templates/pages/doc/outcomeitem.html b/www/templates/pages/doc/outcomeitem.html
index c28b83328..9a52fa004 100644
--- a/www/templates/pages/doc/outcomeitem.html
+++ b/www/templates/pages/doc/outcomeitem.html
@@ -15,7 +15,7 @@ <h3> Списання ТМЦ</h3>
                     </div>
                     <div class="form-group">
                         <label for="document_date"> Дата</label>
-                        <input style="width:150px" class="form-control"   zippy="document_date" required="required">
+                        <input style="width:150px" class="form-control"   zippy="document_date"  required >
                     </div>
 
 
@@ -100,7 +100,7 @@ <h3> Списання ТМЦ</h3>
 
                         </tr>
                         <tr>
-                          <td colspan="5"  class="text-right"><b>Всього:<a></td>
+                          <td colspan="5"  class="text-right">Всього: </td>
                           <td zippy="amount" class="text-right"></td>
                           <td  ></td>
                          
@@ -157,7 +157,7 @@ <h4>Введення товару </h4>
                     <label for="editquantity">Кількість</label>
 
                     <input onkeydown="onItem()" style="width:100px;" type="text" zippy="editquantity" class="form-control qtyprice"
-                           required="required" pattern="[0-9,\.]+"/>
+                            required  pattern="[0-9,\.]+"/>
 
                 </div>
 
diff --git a/www/templates/pages/doc/outcomemoney.html b/www/templates/pages/doc/outcomemoney.html
index aa3456279..5cf53e7ee 100644
--- a/www/templates/pages/doc/outcomemoney.html
+++ b/www/templates/pages/doc/outcomemoney.html
@@ -15,7 +15,7 @@ <h3> Видатковий ордер</h3>
                     </div>
                     <div class="form-group">
                         <label for="document_date"> Дата</label>
-                        <input class="form-control" type="text" zippy="document_date" required="required">
+                        <input class="form-control" type="text" zippy="document_date"  required >
                     </div>
 
                     <div class="form-group  ">
diff --git a/www/templates/pages/doc/outsalary.html b/www/templates/pages/doc/outsalary.html
index be026d9e7..16ce929eb 100644
--- a/www/templates/pages/doc/outsalary.html
+++ b/www/templates/pages/doc/outsalary.html
@@ -15,7 +15,7 @@ <h3> Виплата зарплати</h3>
                     </div>
                     <div class="form-group">
                         <label for="document_date"> Дата</label>
-                        <input class="form-control" type="text" zippy="document_date" required="required">
+                        <input class="form-control" type="text" zippy="document_date"  required >
                     </div>
                     <div class="form-check">
                          <input zippy="advance" type="checkbox" class="form-check-input">
@@ -84,15 +84,17 @@ <h3> Виплата зарплати</h3>
 
              <table class="table table-sm">
                    <tr>
-                      <th></th>
+                    <th style="width:20px"><i onclick=" $('.seldel').prop('checked', $('.seldel').prop('checked') == false);"
+                                style=";cursor:pointer" title="Зняти/виставити прапорець"
+                                    class="fa fa-check-double "></i></th>
                       <th>П I Б</th>
                                   
                       <th  >Сума</th>
                     
                    </tr>
                   <tr zippy="elist">
-                      <td style="width:20px" >
-                       <input tabindex="-1"  type="checkbox" zippy="emp_ch">
+                      <td   >
+                       <input tabindex="-1" class="seldel" type="checkbox" zippy="emp_ch">
                       </td>
                       <td zippy="emp_name"></td>
                                 
diff --git a/www/templates/pages/doc/poscheck.html b/www/templates/pages/doc/poscheck.html
index 13a385364..f4f414394 100644
--- a/www/templates/pages/doc/poscheck.html
+++ b/www/templates/pages/doc/poscheck.html
@@ -12,7 +12,7 @@ <h3>Касовий чек </h3>
                 <div class="col-12 col-md-4 col-xl-3">
                     <div class="form-group">
                         <label for="document_number">Номер документа</label>
-                        <input class="form-control" type="text" zippy="document_number" required="required">
+                        <input class="form-control" type="text" zippy="document_number"  required >
                     </div>
 
                     <div class="form-group  ">
@@ -40,11 +40,11 @@ <h3>Касовий чек </h3>
                 <div class="col-12 col-md-4  col-xl-3">
                     <div class="form-group">
                         <label for="document_date"> Дата</label>
-                        <input style="width:120px;" class="form-control" type="text" zippy="document_date" required="required">
+                        <input style="width:120px;" class="form-control" type="text" zippy="document_date"  required >
                     </div>
                     <div class="form-group">
                         <label for="order">Замовлення</label>
-                        <input readonly="readonly" class="form-control-plaintext" type="text" zippy="order">
+                        <input readonly  class="form-control-plaintext" type="text" zippy="order">
                     </div>
                     <div class="form-group  ">
                         <label for="salesource">Джерело продаж</label>
@@ -311,14 +311,14 @@ <h4>Введення товару </h4>
                     {{/usesnumber}}
                     <div class="form-group">
                         <label for="editquantity">Кількість</label>
-                        <input class="form-control qtyprice" type="text" zippy="editquantity" required="required" pattern="[0-9,\.\s]+"
+                        <input class="form-control qtyprice" type="text" zippy="editquantity"  required  pattern="[0-9,\.\s]+"
                                style="width: 70px;">
 
                     </div>
 
                     <div class="form-group">
                         <label for="editprice">Ціна </label>
-                        <input class="form-control qtyprice" type="text" zippy="editprice" required="required" pattern="[0-9,\.\s]+"
+                        <input class="form-control qtyprice" type="text" zippy="editprice"  required  pattern="[0-9,\.\s]+"
                                style="width: 70px;">
 
                     </div>
@@ -348,14 +348,14 @@ <h4>Введення послуги </h4>
 
                     <div class="form-group">
                         <label for="editserquantity">Кількість</label>
-                        <input class="form-control qtyprice" type="text" zippy="editserquantity" required="required" pattern="[0-9,\.]+"
+                        <input class="form-control qtyprice" type="text" zippy="editserquantity"  required  pattern="[0-9,\.]+"
                                style="width: 70px;">
 
                     </div>
 
                     <div class="form-group">
                         <label for="editserprice">Вартість </label>
-                        <input class="form-control qtyprice" type="text" zippy="editserprice" required="required" pattern="[0-9,\.]+"
+                        <input class="form-control qtyprice" type="text" zippy="editserprice"  required  pattern="[0-9,\.]+"
                                style="width: 70px;">
 
                     </div>
@@ -378,7 +378,7 @@ <h3>&nbsp;Новий контрагент </h3>
 
                     <div class="form-group">
                         <label for="editcustname">Назва </label>
-                        <input class="form-control " zippy="editcustname" required="required"/>
+                        <input class="form-control " zippy="editcustname"  required />
                     </div>
                     <div class="form-group">
                         <label for="editphone">Телефон</label>
diff --git a/www/templates/pages/doc/prodissue.html b/www/templates/pages/doc/prodissue.html
index ee0cda3e7..75b77481b 100644
--- a/www/templates/pages/doc/prodissue.html
+++ b/www/templates/pages/doc/prodissue.html
@@ -12,7 +12,7 @@ <h3>Списання на виробництво </h3>
                 <div class="col-12 col-md-3">
                     <div class="form-group">
                         <label for="document_number">Номер документа</label>
-                        <input class="form-control" type="text" zippy="document_number" required="required">
+                        <input class="form-control" type="text" zippy="document_number"  required >
                     </div>
                     <div class="form-group  ">
                         <label for="store">Зі складу</label>
@@ -31,7 +31,7 @@ <h3>Списання на виробництво </h3>
                 <div class="col-12 col-md-3">
                     <div class="form-group">
                         <label for="document_date"> Дата</label>
-                        <input class="form-control" type="text" zippy="document_date" required="required">
+                        <input class="form-control" type="text" zippy="document_date"  required >
                     </div>
                     <div class="form-group  ">
                         <label for="parea">Виробнича ділянка</label>
@@ -128,7 +128,7 @@ <h4>Введення ТМЦ </h4>
                     {{/usesnumber}}
                     <div class="form-group">
                         <label for="editquantity">Кількість</label>
-                        <input class="form-control qtyprice" type="text" zippy="editquantity" required="required" pattern="[0-9,\.]+"
+                        <input class="form-control qtyprice" type="text" zippy="editquantity"  required  pattern="[0-9,\.]+"
                                style="width: 70px;">
 
                     </div>
diff --git a/www/templates/pages/doc/prodreceipt.html b/www/templates/pages/doc/prodreceipt.html
index 9ba77f61f..031f4e79d 100644
--- a/www/templates/pages/doc/prodreceipt.html
+++ b/www/templates/pages/doc/prodreceipt.html
@@ -11,7 +11,7 @@ <h3> Оприбуткування з виробництва </h3>
                 <div class="col-12 col-md-3">
                     <div class="form-group">
                         <label for="document_number">Номер документа</label>
-                        <input class="form-control" type="text" zippy="document_number" required="required">
+                        <input class="form-control" type="text" zippy="document_number"  required >
                     </div>
                     <div class="form-group  ">
                         <label for="store">На склад</label>
@@ -29,7 +29,7 @@ <h3> Оприбуткування з виробництва </h3>
                 <div class="col-12 col-md-3">
                     <div class="form-group">
                         <label for="document_date"> Дата</label>
-                        <input class="form-control" type="text" zippy="document_date" required="required">
+                        <input class="form-control" type="text" zippy="document_date"  required >
                     </div>
 
                     <div class="form-group  ">
@@ -134,14 +134,14 @@ <h4>Введення ТМЦ </h4>
                     {{/usesnumber}}
                     <div class="form-group">
                         <label for="editquantity">Кількість</label>
-                        <input class="form-control qtyprice" type="text" zippy="editquantity" required="required" pattern="[0-9,\.]+"
+                        <input class="form-control qtyprice" type="text" zippy="editquantity"  required  pattern="[0-9,\.]+"
                                style="width: 100px;"/>
                     </div>
 
 
                     <div class="form-group">
                         <label for="editprice">Облікова ціна </label>
-                        <input class="form-control qtyprice" type="text" zippy="editprice" required="required" pattern="[0-9,\.]+"
+                        <input class="form-control qtyprice" type="text" zippy="editprice"  required  pattern="[0-9,\.]+"
                                style="width: 100px;">
                     </div>
 
diff --git a/www/templates/pages/doc/prodreturn.html b/www/templates/pages/doc/prodreturn.html
index 0ca15c047..25b512b44 100644
--- a/www/templates/pages/doc/prodreturn.html
+++ b/www/templates/pages/doc/prodreturn.html
@@ -14,7 +14,7 @@ <h3>Повернення з виробництва </h3>
                 <div class="col-12 col-md-3">
                     <div class="form-group">
                         <label for="document_number">Номер документа</label>
-                        <input class="form-control" type="text" zippy="document_number" required="required">
+                        <input class="form-control" type="text" zippy="document_number"  required >
                     </div>
                     <div class="form-group  ">
                         <label for="store">На склад</label>
@@ -33,7 +33,7 @@ <h3>Повернення з виробництва </h3>
                 <div class="col-12 col-md-3">
                     <div class="form-group">
                         <label for="document_date"> Дата</label>
-                        <input class="form-control" type="text" zippy="document_date" required="required">
+                        <input class="form-control" type="text" zippy="document_date"  required >
                     </div>
                     <div class="form-group  ">
                         <label for="parea">Виробнича ділянка</label>
@@ -122,7 +122,7 @@ <h4>Введення ТМЦ </h4>
                     {{/usesnumber}}
                     <div class="form-group">
                         <label for="editquantity">Кількість</label>
-                        <input class="form-control qtyprice" type="text" zippy="editquantity" required="required" pattern="[0-9,\.]+"
+                        <input class="form-control qtyprice" type="text" zippy="editquantity"  required  pattern="[0-9,\.]+"
                                style="width: 70px;">
 
                     </div>
diff --git a/www/templates/pages/doc/retcustissue.html b/www/templates/pages/doc/retcustissue.html
index 978781597..ebacd19b6 100644
--- a/www/templates/pages/doc/retcustissue.html
+++ b/www/templates/pages/doc/retcustissue.html
@@ -12,7 +12,7 @@ <h3>Повернення постачальнику </h3>
                 <div class="col-12 col-md-4 col-xl-3">
                     <div class="form-group">
                         <label for="document_number">Номер документа</label>
-                        <input class="form-control" type="text" zippy="document_number" required="required">
+                        <input class="form-control" type="text" zippy="document_number"  required >
                     </div>
                     <div class="form-group  ">
                         <label for="store">Зі складу</label>
@@ -42,7 +42,7 @@ <h3>Повернення постачальнику </h3>
                 <div class="col-12 col-md-4 col-xl-3">
                     <div class="form-group">
                         <label for="document_date"> Дата</label>
-                        <input style="width:120px;" class="form-control" type="text" zippy="document_date" required="required">
+                        <input style="width:120px;" class="form-control" type="text" zippy="document_date"  required >
                     </div>
                     <div class="form-group  ">
                         <label for="payment">Каса, рахунок</label>
@@ -170,13 +170,13 @@ <h4>Введення товару </h4>
                     </div>
                     <div class="form-group">
                         <label for="editquantity">Кількість</label>
-                        <input class="form-control qtyprice" type="text" zippy="editquantity" required="required" pattern="[0-9,\.]+"
+                        <input class="form-control qtyprice" type="text" zippy="editquantity"  required  pattern="[0-9,\.]+"
                                style="width: 70px;">
 
                     </div>
                     <div class="form-group">
                         <label for="editprice">Ціна </label>
-                        <input class="form-control qtyprice" type="text" zippy="editprice" required="required" pattern="[0-9,\.]+"
+                        <input class="form-control qtyprice" type="text" zippy="editprice"  required  pattern="[0-9,\.]+"
                                style="width: 70px;">
 
                     </div>
diff --git a/www/templates/pages/doc/returnissue.html b/www/templates/pages/doc/returnissue.html
index 75d1c5e01..ec4057594 100644
--- a/www/templates/pages/doc/returnissue.html
+++ b/www/templates/pages/doc/returnissue.html
@@ -12,7 +12,7 @@ <h3>Повернення, накладна </h3>
                 <div class="col-12 col-md-3">
                     <div class="form-group">
                         <label for="document_number">Номер документа</label>
-                        <input class="form-control" type="text" zippy="document_number" required="required">
+                        <input class="form-control" type="text" zippy="document_number"  required >
                     </div>
                     <div class="form-group  ">
                         <label for="customer">Покупець</label>
@@ -40,7 +40,7 @@ <h3>Повернення, накладна </h3>
                 <div class="col-12 col-md-3">
                     <div class="form-group">
                         <label for="document_date"> Дата</label>
-                        <input class="form-control" type="text" zippy="document_date" required="required">
+                        <input class="form-control" type="text" zippy="document_date"  required >
                     </div>
                     <div class="form-group  ">
                         <label for="store">На склад</label>
@@ -192,13 +192,13 @@ <h4>Введення товару </h4>
                     </div>
                     <div class="form-group">
                         <label for="editquantity">Кількість</label>
-                        <input class="form-control qtyprice" type="text" zippy="editquantity" required="required" pattern="[0-9,\.]+"
+                        <input class="form-control qtyprice" type="text" zippy="editquantity"  required  pattern="[0-9,\.]+"
                                style="width: 100px;">
 
                     </div>
                     <div class="form-group">
                         <label for="editprice">Ціна </label>
-                        <input class="form-control qtyprice" type="text" zippy="editprice" required="required" pattern="[0-9,\.]+"
+                        <input class="form-control qtyprice" type="text" zippy="editprice"  required  pattern="[0-9,\.]+"
                                style="width: 100px;">
 
                     </div>
diff --git a/www/templates/pages/doc/serviceact.html b/www/templates/pages/doc/serviceact.html
index 7d262374b..5b7f17f4b 100644
--- a/www/templates/pages/doc/serviceact.html
+++ b/www/templates/pages/doc/serviceact.html
@@ -20,7 +20,7 @@ <h3> Замовлення (послуги)
                         <div class="form-group  ">
                             <label for="customer">Замовник</label>
                             <div class="input-group  ">
-                            <typeahead v-model="customer_id" required="required"      ref="cust"  :onquery="oncusttext"   placeholder="Почнiть вводити ..."></typeahead>   
+                            <typeahead v-model="customer_id"  required       ref="cust"  :onquery="oncusttext"   placeholder="Почнiть вводити ..."></typeahead>   
                                  <div v-show="customer_id>0" class="input-group-append"  >
                                      <a  v-on:click.prevent="customerInfo(customer_id)" class="btn btn-success"><i class="fa fa-info-circle"></i></a>
                                 </div>  
@@ -71,11 +71,11 @@ <h3> Замовлення (послуги)
                     <div class="col-6 col-md-4 col-lg-3">
                        <div class="form-group">
                             <label for="document_number">Номер документа</label>
-                            <input class="form-control" type="text" v-model="document_number" name="document_number" required="required">
+                            <input class="form-control" type="text" v-model="document_number" name="document_number"  required >
                         </div>                   
                         <div class="form-group">
                             <label for="document_date"> Дата</label>
-                            <input class="form-control" type="date" v-model="document_date"  name="document_date" required="required">
+                            <input class="form-control" type="date" v-model="document_date"  name="document_date"  required >
                         </div>
                         <div class="form-group  ">
                             <label for="store">Склад  комплектуючих</label>
@@ -233,7 +233,7 @@ <h5 class="modal-title">Редагування</h5>
 
                             <div class="form-group">
                                 <label for="editprice">Вартість </label>
-                                <input class="form-control qtyprice"   v-model="editserviceprice" required="required" pattern="[0-9,\.]+"
+                                <input class="form-control qtyprice"   v-model="editserviceprice"  required  pattern="[0-9,\.]+"
                                        value="0" style="width: 100px;">
                             </div>                           
 
@@ -263,7 +263,7 @@ <h5 class="modal-title">Редагування</h5>
                                       
                             <div class="form-group">
                               <label for="edititem">Назва </label>
-                               <typeahead  v-model="item"  :onquery="onitemtext"   required="required"  ref="edititem" placeholder="Почніть вводити..."   />
+                               <typeahead  v-model="item"  :onquery="onitemtext"    required   ref="edititem" placeholder="Почніть вводити..."   />
                                 <a v-on:click.prevent="onOpenItemSel">Відкрити довідник</a>
                                <br>Наявність: <span  >{{qtystock}}</span>
                  
@@ -281,7 +281,7 @@ <h5 class="modal-title">Редагування</h5>
 
                             <div class="form-group">
                                 <label for="edititemprice">Ціна </label>
-                                <input class="form-control qtyprice" type="text" v-model="edititemprice" required="required" pattern="[0-9,\.]+"
+                                <input class="form-control qtyprice" type="text" v-model="edititemprice"  required  pattern="[0-9,\.]+"
                                        value="0" style="width: 100px;">
                             </div>                              
                               
@@ -313,7 +313,7 @@ <h5 class="modal-title">Новий контрагент</h5>
                           <form id="newcustform" >
                                 <div class="form-group">
                                     <label for="editcustname">Назва </label>
-                                    <input v-model="ncustname" class="form-control " name="editcustname" required="required"/>
+                                    <input v-model="ncustname" class="form-control " name="editcustname"  required />
                                 </div>
                                 <div class="form-group">
                                     <label for="editphone">Телефон</label>
diff --git a/www/templates/pages/doc/task.html b/www/templates/pages/doc/task.html
index 07380cd43..4d13091ad 100644
--- a/www/templates/pages/doc/task.html
+++ b/www/templates/pages/doc/task.html
@@ -22,7 +22,7 @@ <h3> Наряд на виконання робіт
                      <div class="col-12">
                     <div class="form-group">
                         <label for="document_number">Номер документа</label>
-                        <input style="width:120px;" class="form-control" type="text" zippy="document_number" required="required">
+                        <input style="width:120px;" class="form-control" type="text" zippy="document_number"  required >
                     </div>
 
                     <div class="form-group  ">
@@ -37,9 +37,9 @@ <h3> Наряд на виконання робіт
                     <div class="form-group">
                         <label for="document_date"> Дата початку</label>
                         <div class="input-group">
-                            <input   class="form-control"   zippy="document_date" required="required">
+                            <input   class="form-control"   zippy="document_date"  required >
                             <span class="input-group-text">:</span>
-                            <input   class="form-control"   zippy="document_time" required="required">
+                            <input   class="form-control"   zippy="document_time"  required >
                         </div>                        
                     </div>
 
diff --git a/www/templates/pages/doc/transitem.html b/www/templates/pages/doc/transitem.html
index 5731220b8..3e00b5f7f 100644
--- a/www/templates/pages/doc/transitem.html
+++ b/www/templates/pages/doc/transitem.html
@@ -15,7 +15,7 @@ <h3> Перекомплектація (розфасовка) </h3>
                     </div>
                     <div class="form-group">
                         <label for="document_date"> Дата</label>
-                        <input class="form-control" type="text" zippy="document_date" required="required">
+                        <input class="form-control" type="text" zippy="document_date"  required >
                     </div>
  
                     <div class="form-group  ">
@@ -42,7 +42,7 @@ <h3> Перекомплектація (розфасовка) </h3>
                         <label for="fromquantity">Кількість</label>
                         <div>
                             <input style="width:100px;" type="text" zippy="fromquantity" class="form-control qtyprice"
-                                   required="required" pattern="[0-9,\.]+"/>
+                                    required  pattern="[0-9,\.]+"/>
                         </div>
                     </div>
                  </div>
@@ -61,7 +61,7 @@ <h3> Перекомплектація (розфасовка) </h3>
                         <label for="toquantity">Кількість</label>
                         <div>
                             <input style="width:100px;" type="text" zippy="toquantity" class="form-control qtyprice"
-                                   required="required" pattern="[0-9,\.]+"/>
+                                    required  pattern="[0-9,\.]+"/>
                         </div>
                     </div>
                                     
diff --git a/www/templates/pages/doc/ttn.html b/www/templates/pages/doc/ttn.html
index f162da35e..26a2130e8 100644
--- a/www/templates/pages/doc/ttn.html
+++ b/www/templates/pages/doc/ttn.html
@@ -12,11 +12,11 @@ <h3>Товарно-транспорта накладна </h3>
                 <div class="col-12 col-md-4 col-xl-3">
                     <div class="form-group">
                         <label for="document_number">Номер документа</label>
-                        <input class="form-control" type="text" zippy="document_number" required="required">
+                        <input class="form-control" type="text" zippy="document_number"  required >
                     </div>
                     <div class="form-group">
                         <label for="order">Замовлення</label>
-                        <input readonly="readonly" class="form-control-plaintext" type="text" zippy="order">
+                        <input readonly  class="form-control-plaintext" type="text" zippy="order">
 
                         <small zippy="notesfromorder"></small>
                     </div>
@@ -60,7 +60,7 @@ <h3>Товарно-транспорта накладна </h3>
                 <div class="col-12 col-md-4  col-xl-3">
                     <div class="form-group">
                         <label for="document_date"> Дата</label>
-                        <input style="width:120px;" class="form-control" type="text" zippy="document_date" required="required">
+                        <input style="width:120px;" class="form-control" type="text" zippy="document_date"  required >
                     </div>
                     <div class="form-group  ">
                         <label for="salesource">Джерело продаж</label>
@@ -128,11 +128,11 @@ <h3>Товарно-транспорта накладна </h3>
 
                     <div class="form-group">
                         <label data-label="sent_date" for="sent_date">Орієнтовна дата відправки</label>
-                        <input style="width:120px;" class="form-control" type="text" zippy="sent_date" required="required">
+                        <input style="width:120px;" class="form-control" type="text" zippy="sent_date"  required >
                     </div>
                     <div class="form-group">
                         <label data-label="delivery_date" for="delivery_date">Орієнтовна дата доставки</label>
-                        <input style="width:120px;" class="form-control" type="text" zippy="delivery_date" required="required">
+                        <input style="width:120px;" class="form-control" type="text" zippy="delivery_date"  required >
                     </div>
 
                 </div>
@@ -249,14 +249,14 @@ <h4>Введення товару </h4>
                     {{/usesnumber}}
                     <div class="form-group">
                         <label for="editquantity">Кількість</label>
-                        <input class="form-control qtyprice" type="text" zippy="editquantity" required="required" pattern="[0-9,\.]+"
+                        <input class="form-control qtyprice" type="text" zippy="editquantity"  required  pattern="[0-9,\.]+"
                                style="width: 70px;">
 
                     </div>
 
                     <div class="form-group">
                         <label for="editprice">Ціна </label>
-                        <input class="form-control qtyprice" type="text" zippy="editprice" required="required" pattern="[0-9,\.]+"
+                        <input class="form-control qtyprice" type="text" zippy="editprice"  required  pattern="[0-9,\.]+"
                                style="width: 70px;">
 
                     </div>
@@ -285,7 +285,7 @@ <h3>&nbsp;Новий покупець </h3>
 
                     <div class="form-group">
                         <label for="editcustname">Назва </label>
-                        <input class="form-control " zippy="editcustname" required="required"/>
+                        <input class="form-control " zippy="editcustname"  required />
                     </div>
                     <div class="form-group">
                         <label for="editphone">Телефон</label>
diff --git a/www/templates/pages/doc/warranty.html b/www/templates/pages/doc/warranty.html
index 014102cdf..ca163aad2 100644
--- a/www/templates/pages/doc/warranty.html
+++ b/www/templates/pages/doc/warranty.html
@@ -13,11 +13,11 @@ <h3>Гарантійний талон</h3>
                 <div class="col-3">
                     <div class="form-group">
                         <label for="document_number">Номер документа</label>
-                        <input class="form-control" type="text" zippy="document_number" required="required">
+                        <input class="form-control" type="text" zippy="document_number"  required >
                     </div>
                     <div class="form-group">
                         <label for="document_date"> Дата</label>
-                        <input class="form-control" type="text" zippy="document_date" required="required">
+                        <input class="form-control" type="text" zippy="document_date"  required >
                     </div>
 
                     <div class="form-group">
@@ -85,13 +85,13 @@ <h4>Введення товару </h4>
                     </div>
                     <div class="form-group">
                         <label for="editquantity">Кількість</label>
-                        <input class="form-control qtyprice" type="text" zippy="editquantity" required="required" pattern="[0-9,\.]+"
+                        <input class="form-control qtyprice" type="text" zippy="editquantity"  required  pattern="[0-9,\.]+"
                                style="width: 70px;">
 
                     </div>
                     <div class="form-group">
                         <label for="editprice">Ціна </label>
-                        <input class="form-control qtyprice" type="text" zippy="editprice" required="required" pattern="[0-9,\.]+"
+                        <input class="form-control qtyprice" type="text" zippy="editprice"  required  pattern="[0-9,\.]+"
                                style="width: 70px;">
 
                     </div>
diff --git a/www/templates/pages/firmlist.html b/www/templates/pages/firmlist.html
index 589f5da45..9d9ea8b3f 100644
--- a/www/templates/pages/firmlist.html
+++ b/www/templates/pages/firmlist.html
@@ -47,7 +47,7 @@ <h3>Перелік компанiй </h3>
 
                 <div class="form-group">
                     <label for="editfirm_name">Назва</label>
-                    <input required="required" class="form-control" zippy="editfirm_name"/>
+                    <input  required  class="form-control" zippy="editfirm_name"/>
                 </div>
 
                 <div class="form-group">
diff --git a/www/templates/pages/jobs.html b/www/templates/pages/jobs.html
index 6cd02639e..83a729764 100644
--- a/www/templates/pages/jobs.html
+++ b/www/templates/pages/jobs.html
@@ -67,15 +67,15 @@ <h3>Мої завдання </h3>
                     <div class="form-group row">
                         <label  class="col-3 col-form-label" for="addeventdate">Дата, час</label>
                         <div class="col-4">
-                            <input   class="form-control"   zippy="addeventdate" required="required">
+                            <input   class="form-control"   zippy="addeventdate"  required >
                         </div>   
                         <div class="col-3">    
-                            <input   class="form-control"   zippy="addeventtime" required="required">
+                            <input   class="form-control"   zippy="addeventtime"  required >
                         </div>
                     </div>
                     <div class="form-group">
                         <label for="addeventtitle">Заголовок, тип подiї</label>
-                        <input required="required" class="form-control" zippy="addeventtitle">
+                        <input  required  class="form-control" zippy="addeventtitle">
                     </div>
                     <div class="form-group">
                         <label for="addeventdesc">Коментар</label>
@@ -120,14 +120,14 @@ <h3>Мої завдання </h3>
                     <div class="form-group">
                         <label for="editeventdate">Дата, час</label>
                         <div class="input-group">
-                            <input   class="form-control"   zippy="editeventdate" required="required">
+                            <input   class="form-control"   zippy="editeventdate"  required >
                             <span class="input-group-text">:</span>
-                            <input   class="form-control"   zippy="editeventtime" required="required">
+                            <input   class="form-control"   zippy="editeventtime"  required >
                         </div>
                     </div>
                     <div class="form-group">
                         <label for="editeventtitle">Заголовок, тип подiї</label>
-                        <input required="required" class="form-control" zippy="editeventtitle">
+                        <input  required  class="form-control" zippy="editeventtitle">
                     </div>
                     <div class="form-group">
                         <label for="editeventdesc">Коментар</label>
diff --git a/www/templates/pages/menulist.html b/www/templates/pages/menulist.html
index d7ccff9d6..6df79e0ff 100644
--- a/www/templates/pages/menulist.html
+++ b/www/templates/pages/menulist.html
@@ -77,11 +77,11 @@ <h5> Редагування пункту меню</h5>
 
                         <div class="form-group">
                             <label for="edit_description">Найменування</label>
-                            <input class="form-control" zippy="edit_description" required="required">
+                            <input class="form-control" zippy="edit_description"  required >
                         </div>
                         <div class="form-group">
                             <label for="edit_meta_name">Ім'я PHP класу</label>
-                            <input class="form-control" zippy="edit_meta_name" required="required">
+                            <input class="form-control" zippy="edit_meta_name"  required >
                         </div>
                         <div class="form-group">
                             <label for="edit_menugroup">Група підменю</label>
diff --git a/www/templates/pages/notifylist.html b/www/templates/pages/notifylist.html
index 8bd803e17..ca74d535a 100644
--- a/www/templates/pages/notifylist.html
+++ b/www/templates/pages/notifylist.html
@@ -27,8 +27,8 @@ <h4>Повідомлення</h4>
                         <td><i class="fa fa-clock"> </i> <span zippy="ndate"></span>
                             &nbsp;&nbsp;&nbsp;<i zippy="sendericon" ></i> <span zippy="sender"></span>
                             <p zippy="msg">
-                            <p>
-                            <span zippy="nanswer"  style="cursor:pointer" >Вiдповiсти</span>
+                            </p>
+                            <span zippy="nanswer"  style="cursor:pointer" >Відповісти</span>
     
                         </td>
                         <td><span zippy="newn" class="badge badge-info">Нове</span></td>
diff --git a/www/templates/pages/options.html b/www/templates/pages/options.html
index 0532fd1ae..1a726c5bf 100644
--- a/www/templates/pages/options.html
+++ b/www/templates/pages/options.html
@@ -28,18 +28,18 @@ <h4>Загальнi налаштування</h4>
                                 <label for="qtydigits">Знаків після крапки в кількості</label>
 
                                 <select style="width:75px;" class="form-control" zippy="qtydigits">
-                                    <option value='0'>0</option>
-                                    <option value='1'>1</option>
-                                    <option value='2'>2</option>
-                                    <option value='3'>3</option>
+                                    <option value="0">0</option>
+                                    <option value="1">1</option>
+                                    <option value="2">2</option>
+                                    <option value="3">3</option>
                                 </select>
                             </div>
                             <div class="form-group  ">
                                 <label for="amdigits">Округлення вартості</label>
 
                                 <select class="form-control" zippy="amdigits">
-                                    <option value='0'>Без копійок</option>
-                                    <option value='1'>До 1 копійки</option>
+                                    <option value="0">Без копійок</option>
+                                    <option value="1">До 1 копійки</option>
                                 </select>
                             </div>
                        
@@ -54,12 +54,12 @@ <h4>Загальнi налаштування</h4>
                                 <label for="dateformat">Формат дати</label>
 
                                 <select class="form-control" zippy="dateformat">
-                                    <option value='d.m.Y'>dd.mm.yyyy</option>
-                                    <option value='d-m-Y'>dd-mm-yyyy</option>
-                                    <option value='d/m/Y'>dd/mm/yyyy</option>
-                                    <option value='Y.m.d'>yyyy.mm.dd</option>
-                                    <option value='Y-m-d'>yyyy-mm-dd</option>
-                                    <option value='Y/m/d'>yyyy/mm/dd</option>
+                                    <option value="d.m.Y">dd.mm.yyyy</option>
+                                    <option value="d-m-Y">dd-mm-yyyy</option>
+                                    <option value="d/m/Y">dd/mm/yyyy</option>
+                                    <option value="Y.m.d">yyyy.mm.dd</option>
+                                    <option value="Y-m-d">yyyy-mm-dd</option>
+                                    <option value="Y/m/d">yyyy/mm/dd</option>
 
                                 </select>
                             </div>
@@ -152,44 +152,44 @@ <h4>Підключення модулів</h4>
                             <div class="form-check">
                                 <input zippy="modshop" type="checkbox" class="form-check-input">
                                 <label class="form-check-label" for="modshop"> Онлайн каталог</label>
-                                <a href="https://zippy.com.ua/ext#3" target="_blank"><i class="fa fa-info-circle  "  ></i></a>
+                                <a href="https://zippy.com.ua/ext#id3" target="_blank"><i class="fa fa-info-circle  "  ></i></a>
                             </div>
                             <div class="form-check">
                                 <input zippy="modnote" type="checkbox" class="form-check-input">
                                 <label class="form-check-label" for="modnote"> Органайзер (база знань)</label>
-                                <a href="https://zippy.com.ua/ext#2" target="_blank"><i class="fa fa-info-circle  "  ></i></a>
+                                <a href="https://zippy.com.ua/ext#id2" target="_blank"><i class="fa fa-info-circle  "  ></i></a>
                             </div>
                             <div class="form-check">
                                 <input zippy="modissue" type="checkbox" class="form-check-input">
                                 <label class="form-check-label" for="modissue"> Проекти та завдання</label>
-                                <a href="https://zippy.com.ua/ext#4" target="_blank"><i class="fa fa-info-circle  "  ></i></a>
+                                <a href="https://zippy.com.ua/ext#id4" target="_blank"><i class="fa fa-info-circle  "  ></i></a>
                             </div>
                             <div class="form-check">
                                 <input zippy="modocstore" type="checkbox" class="form-check-input">
                                 <label class="form-check-label" for="modocstore"> Iнтеграція з опенкарт</label>
-                                <a href="https://zippy.com.ua/ext#1" target="_blank"><i class="fa fa-info-circle  "  ></i></a>
+                                <a href="https://zippy.com.ua/ext#id1" target="_blank"><i class="fa fa-info-circle  "  ></i></a>
                             </div>
 
                             <div class="form-check">
                                 <input zippy="modwoocomerce" type="checkbox" class="form-check-input">
                                 <label class="form-check-label" for="modwoocomerce"> Iнтеграція з woocomerce</label>
-                                <a href="https://zippy.com.ua/ext#5" target="_blank"><i class="fa fa-info-circle  "  ></i></a>
+                                <a href="https://zippy.com.ua/ext#id5" target="_blank"><i class="fa fa-info-circle  "  ></i></a>
                             </div>
                             <div class="form-check">
                                 <input zippy="modpromua" type="checkbox" class="form-check-input">
                                 <label class="form-check-label" for="modpromua"> Iнтеграція з PromUA</label>
-                                <a href="https://zippy.com.ua/ext#9" target="_blank"><i class="fa fa-info-circle  "  ></i></a>
+                                <a href="https://zippy.com.ua/ext#id9" target="_blank"><i class="fa fa-info-circle  "  ></i></a>
                             </div>
                             <div class="form-check">
                                 <input zippy="modhoroshop" type="checkbox" class="form-check-input">
                                 <label class="form-check-label" for="modhoroshop"> Iнтеграція з Хорошоп</label>
-                                <a href="https://zippy.com.ua/ext#15" target="_blank"><i class="fa fa-info-circle  "  ></i></a>
+                                <a href="https://zippy.com.ua/ext#idid15" target="_blank"><i class="fa fa-info-circle  "  ></i></a>
                             </div>
 
                             <div class="form-check">
                                 <input zippy="modnp" type="checkbox" class="form-check-input">
                                 <label class="form-check-label" for="modnp"> Iнтеграція з Нова Пошта</label>
-                                <a href="https://zippy.com.ua/ext#8" target="_blank"><i class="fa fa-info-circle  "  ></i></a>
+                                <a href="https://zippy.com.ua/ext#id8" target="_blank"><i class="fa fa-info-circle  "  ></i></a>
                             </div>
                          
                          
@@ -198,7 +198,7 @@ <h4>Підключення модулів</h4>
                            <div class="form-check">
                                 <input zippy="modvdoc" type="checkbox" class="form-check-input">
                                 <label class="form-check-label" for="modvdoc"> Iнтеграція з Вчасно Документооборот</label>
-                                <a href="https://zippy.com.ua/ext#16" target="_blank"><i class="fa fa-info-circle  "  ></i></a>
+                                <a href="https://zippy.com.ua/ext#id16" target="_blank"><i class="fa fa-info-circle  "  ></i></a>
                             </div>
                               
                               
@@ -210,10 +210,10 @@ <h4>Підключення модулів</h4>
                                    <option value="2">Iнтеграція з CheckBox</option>
                                    <option value="3">Iнтеграція з ВчасноКаса </option>
                                 </select>
-                                <small><a title="Опис" href="https://zippy.com.ua/ext#6" target="_blank"><i class="fa fa-info-circle  "  ></i> Вбудований ПРРО</a>
-                                <br><a title="Опис" href="https://zippy.com.ua/ext#12" target="_blank"><i class="fa fa-info-circle  "  ></i> CheckBox</a>
-                                <br><a title="Опис" href="https://zippy.com.ua/ext#14" target="_blank"><i class="fa fa-info-circle  "  ></i> ВчасноКаса</a>
-                                <small>
+                                <small><a title="Опис" href="https://zippy.com.ua/ext#id6" target="_blank"><i class="fa fa-info-circle  "  ></i> Вбудований ПРРО</a>
+                                <br><a title="Опис" href="https://zippy.com.ua/ext#id12" target="_blank"><i class="fa fa-info-circle  "  ></i> CheckBox</a>
+                                <br><a title="Опис" href="https://zippy.com.ua/ext#id14" target="_blank"><i class="fa fa-info-circle  "  ></i> ВчасноКаса</a>
+                                </small>
                             </div>      
                           
                         
@@ -234,6 +234,7 @@ <h4>Джерела продаж</h4>
                                 <tr zippy="salesourceslist">
                                     <td><input class="form-control" style="width:100%;" zippy="salesourcename"  ></td>
                                     <td><a zippy="delsalesource"> <i class="fa fa-trash"></i></a></td>
+                                 </tr>   
                             </table>
                             <input zippy="salesourcesave"  type="submit"  value="Зберегти" class="btn  btn-success">
 
@@ -284,7 +285,7 @@ <h4>Налаштування бізнес-процесів</h4>
                 
                              <div class="form-group  ">
                                 <label>Типи відпускних цін</label>
-                                <input class="form-control" type="text" zippy="price1" required="required">
+                                <input class="form-control" type="text" zippy="price1"  required >
                                 <input class="form-control" type="text" zippy="price2">
                                 <input class="form-control" type="text" zippy="price3">
                                 <input class="form-control" type="text" zippy="price4">
@@ -365,16 +366,7 @@ <h4>Налаштування бізнес-процесів</h4>
                                {{/fiscal}} 
                             
 
-
-
-                        
-                        
-                            <div class="form-check">
-                                <input zippy="numberttn" type="checkbox" class="form-check-input">
-                                <label class="form-check-label" for="numberttn">Кiлька вiдправок на одне замовлення</label>
-                                <i class="fa fa-info-circle  " data-toggle="tooltip" data-placement="top"
-                                   title=" Можливiсть створити кiлька накладних на одне замовлення, але якщо увiмкнено - не виконується перевiрка наявностi ТТН та автоматичної змiни статусу замовленя по ТТН "></i>
-                            </div>
+                           
                        
                         
                              <div class="form-check">
@@ -428,10 +420,11 @@ <h4>Курси валют </h4>
                           <table class="table table-sm">
                              <tr><th>Код</th><th>Назва</th><th>Курс</th><th></th>
                              <tr zippy="vallist">
-                             <td><input zippy="valcode" pattern="[A-Z]+" style="width:75px" class="form-control" required="required">  </td>
-                             <td><input zippy="valname"   class="form-control" required="required">  </td>
-                             <td><input zippy="valrate" pattern="[0-9,\.]+" style="width:75px" class="form-control qtyprice" required="required">  </td>
+                             <td><input zippy="valcode" pattern="[A-Z]+" style="width:75px" class="form-control"  required >  </td>
+                             <td><input zippy="valname"   class="form-control"  required >  </td>
+                             <td><input zippy="valrate" pattern="[0-9,\.]+" style="width:75px" class="form-control qtyprice"  required >  </td>
                              <td><a  zippy="valdel"><i class="fa fa-trash"></i></a></td>
+                            </tr>  
                             
                             </table>                           
                             <div class="form-check">
@@ -458,7 +451,7 @@ <h4>Параметри для етикеток і цінників</h4>
                        <details>
                             <summary>Перелік тегів шаблону</summary>
                             <small>Файл шаблону этикеток /templates/printforms/item_tag.tpl. (item_tag_ps.tpl для  принт сервера)
-                            <br>Детально  про  роботу  з  принтерами  <a href="https://zippy.com.ua/ext#10" target="_blank">тут</a></small>
+                            <br>Детально  про  роботу  з  принтерами  <a href="https://zippy.com.ua/ext#id10" target="_blank">тут</a></small>
                             <table class="ctable">
                               <tr><td><b>name</b></td><td>Назва ТМЦ</td></tr>
                               <tr><td><b>price</b></td><td>Ціна</td></tr>
@@ -592,7 +585,7 @@ <h4>Громадське харчування</h4>
                              <div class="form-check mt-4">
                                 <input zippy="foodmenu" type="checkbox" class="form-check-input">
                                 <label class="form-check-label" for="foodmenu">Сторiнка меню.</label>
-                                <br><small>Доступ до сторiнки меню за адресою &lt;адреса  сайту>/menu. Детальнiше <a href="https://zippy.com.ua/zstoreusage#food" target="_blank">тут</a>
+                                <br><small>Доступ до сторiнки меню за адресою &lt;адреса  сайту&gt;/menu. Детальнiше <a href="https://zippy.com.ua/zstoreusage#food" target="_blank">тут</a>
                                 <br> Параметри нижче в  основному  для  сторiнки меню
                                 </small>
                             </div>
@@ -747,11 +740,11 @@ <h4>Телеграм бот</h4>
                         <form zippy="tbform">
                              <div class="form-group">
                                 <label for="tbname">Назва бота </label>
-                                <input required="required" class="form-control" type="text" zippy="tbname">
+                                <input  required  class="form-control" type="text" zippy="tbname">
                             </div>
                              <div class="form-group">
                                 <label for="tbtoken">Токен бота </label>
-                                <input required="required" class="form-control" type="text" zippy="tbtoken">
+                                <input  required  class="form-control" type="text" zippy="tbtoken">
                             </div>
               
                             <input    type="submit"  value="Зберегти" class="btn  btn-success">
diff --git a/www/templates/pages/poslist.html b/www/templates/pages/poslist.html
index 6b3ee5baa..2f52736b9 100644
--- a/www/templates/pages/poslist.html
+++ b/www/templates/pages/poslist.html
@@ -65,7 +65,7 @@ <h3>Довідник кас (POS терміналів) </h3>
 
                             <div class="form-group">
                                 <label for="editpos_name">Назва, номер</label>
-                                <input required="required" class="form-control" zippy="editpos_name"/>
+                                <input  required  class="form-control" zippy="editpos_name"/>
                             </div>
                             <div class="form-group">
                                 <label for="editcomp">Компанія</label>
@@ -77,7 +77,7 @@ <h3>Довідник кас (POS терміналів) </h3>
                             <div class="form-group">
                                 <label for="editbranch">Філія</label>
                                 <select class="form-control" zippy="editbranch">
-                                    <option value="0">Не обрано
+                                    <option value="0">Не обрано </option>
                                 </select>
                             </div>
                             {{/usebranch}}
@@ -185,7 +185,7 @@ <h3>Довідник кас (POS терміналів) </h3>
             
             <form class="col-6 col-md-6  col-xl-4" zippy="keyform" enctype="multipart/form-data">
                 <h5>Завантаження ключа та сертифiкату</h5>
-            <small>Опис роботи з ключами <a  target="_blank" href="https://zippy.com.ua/ext#6">тут</a> </small>
+            <small>Опис роботи з ключами <a  target="_blank" href="https://zippy.com.ua/ext#id6">тут</a> </small>
                   <div class="form-group">
                     <label for="signtype">Метод пiдпису </label>
                     <select   class="form-control" type="text" zippy="signtype">
@@ -200,7 +200,7 @@ <h5>Завантаження ключа та сертифiкату</h5>
                              
                 <div class="form-group">
                     <label for="password">Пароль </label>
-                    <input required="required" class="form-control" type="password" zippy="password">
+                    <input  required  class="form-control" type="password" zippy="password">
                     <small>Пароль не буде записаний в системi</small>
                 </div>
                 <div class="form-group">
diff --git a/www/templates/pages/reference/categorylist.html b/www/templates/pages/reference/categorylist.html
index 2de5013ec..118385e6c 100644
--- a/www/templates/pages/reference/categorylist.html
+++ b/www/templates/pages/reference/categorylist.html
@@ -83,7 +83,7 @@ <h3>Категорії товарів
                     <form zippy="categorydetail" enctype="multipart/form-data">
                         <div class="form-group">
                             <label for="editcat_name">Назва</label>
-                            <input autofocus="on"   required="required" class="form-control" zippy="editcat_name"/>
+                            <input autofocus="on"    required  class="form-control" zippy="editcat_name"/>
                         </div>
                        <div class="form-group">
                             <label for="editcat_desc">Примiтка</label>
@@ -93,7 +93,7 @@ <h3>Категорії товарів
                         <div class="form-group">
                             <label for="editparent">Батькiвська</label>
                             <select   class="form-control" zippy="editparent">
-                                <option value=0>Не вказано</option>
+                                <option value="0">Не вказано</option>
                             </select>
                             <small>Категорiя  не повинна мати ТМЦ</small>
                         </div>
@@ -161,7 +161,7 @@ <h5 zippy="catprname"></h5>
                         </div>                     
                     <div class="form-group  ">
                          <label   for="editprice">Змiнити на  суму або процент</label>
-                             <input required="required" style="width: 100px"   class="form-control" zippy="chprice"/>
+                             <input  required  style="width: 100px"   class="form-control" zippy="chprice"/>
 
                              <small class="form-text text-muted">Наприклад  5, -2, 3%, -0.5%. </small>
 
diff --git a/www/templates/pages/reference/contractlist.html b/www/templates/pages/reference/contractlist.html
index 8e733c0f8..9218511fd 100644
--- a/www/templates/pages/reference/contractlist.html
+++ b/www/templates/pages/reference/contractlist.html
@@ -1,7 +1,8 @@
 <html>
     <head>
+      <title> Договори</title>
     </head>
-           <title> Договори</title>
+         
  
     <body>
         <div class="row">
@@ -87,18 +88,18 @@ <h3>Договори </h3>
                 <div class="col-12 col-md-4 col-xl-3">
                     <div class="form-group">
                         <label for="editcontract_number">Номер</label>
-                        <input autofocus="on"   required="required" class="form-control" zippy="editcontract_number"/>
+                        <input autofocus="on"    required  class="form-control" zippy="editcontract_number"/>
                     </div>
                     <div class="form-group">
                         <label for="editcreatedon">Дата початку</label>
-                        <input style="width: 120px;" required="required" class="form-control" zippy="editcreatedon"/>
+                        <input style="width: 120px;"  required  class="form-control" zippy="editcreatedon"/>
                     </div>
                     <div class="form-group">
                         <label for="editenddate">Дата закiнчення</label>
-                        <input style="width: 120px;" required="required" class="form-control" zippy="editenddate"/>
+                        <input style="width: 120px;"  required  class="form-control" zippy="editenddate"/>
                     </div>
                     <div class="form-group">
-                        <label required="required" for="editshortdesc">Скорочений опис, призначення</label>
+                        <label  required  for="editshortdesc">Скорочений опис, призначення</label>
                         <input class="form-control" zippy="editshortdesc"/>
                     </div>
                     <div class="form-group">
diff --git a/www/templates/pages/reference/customerlist.html b/www/templates/pages/reference/customerlist.html
index 1b1ce9e29..bc29b38c4 100644
--- a/www/templates/pages/reference/customerlist.html
+++ b/www/templates/pages/reference/customerlist.html
@@ -148,7 +148,7 @@ <h4>&nbsp; Редагувати  </h4>
 
                 <div class="form-group">
                     <label for="editcustomername">Назва</label>
-                    <input autofocus="on"   required="required" class="form-control" zippy="editcustomername"/>
+                    <input autofocus="on"    required  class="form-control" zippy="editcustomername"/>
                     {{#leadmode}}  
                     <small>Можна використати контакт як тимчасове ім'я</small>
                     {{/leadmode}}  
@@ -360,7 +360,7 @@ <h5> Розклад подій </h5>
                             </div>
                             <div class="form-group">
                                 <label for="addeventtitle">Заголовок, тип події</label>
-                                <input required="required" class="form-control" zippy="addeventtitle">
+                                <input  required  class="form-control" zippy="addeventtitle">
                             </div>
                             <div class="form-group">
                                 <label for="addeventdesc">Коментар</label>
@@ -399,7 +399,7 @@ <h5> Коментарі </h5>
                         <form zippy="addmsgform">
                             <div class="form-group">
                                 <label for="addmsg">Коментар</label>
-                                <textarea required="required" class="form-control" zippy="addmsg"
+                                <textarea  required  class="form-control" zippy="addmsg"
                                           style=" height:120px;"></textarea>
                             </div>
                             <input class="btn btn-outline-success  " type="submit" value="Додати">
@@ -417,7 +417,7 @@ <h5> Прикріплені файли </h5>
                         <form zippy="addfileform" enctype="multipart/form-data">
                             <div class="form-group">
                                 <label for="addfile">Вибрати файл</label>
-                                <input type="file" class="form-control" required="required" zippy="addfile">
+                                <input type="file" class="form-control"  required  zippy="addfile">
 
                             </div>
 
diff --git a/www/templates/pages/reference/employeelist.html b/www/templates/pages/reference/employeelist.html
index ba9dff1dc..4837a352d 100644
--- a/www/templates/pages/reference/employeelist.html
+++ b/www/templates/pages/reference/employeelist.html
@@ -66,7 +66,7 @@ <h3>Довідник співробітників </h3>
                       
                             <div class="form-group">
                                 <label for="editemp_name">Прізвище ім'я</label>
-                                <input autofocus="on"   required="required" zippy="editemp_name" class="form-control">
+                                <input autofocus="on"    required  zippy="editemp_name" class="form-control">
 
                             </div>
                             <div class="form-group">
@@ -233,7 +233,7 @@ <h5> Коментарі </h5>
                         <form zippy="addmsgform">
                             <div class="form-group">
                                 <label for="addmsg">Коментар</label>
-                                <textarea required="required" class="form-control" zippy="addmsg"
+                                <textarea  required  class="form-control" zippy="addmsg"
                                           style=" height:120px;"></textarea>
                             </div>
                             <input class="btn btn-outline-success  " type="submit" value="Додати">
diff --git a/www/templates/pages/reference/eqlist.html b/www/templates/pages/reference/eqlist.html
index 386d3819e..f93206cde 100644
--- a/www/templates/pages/reference/eqlist.html
+++ b/www/templates/pages/reference/eqlist.html
@@ -72,7 +72,7 @@ <h4>Редагування </h4>
                 <div class="form-group  ">
                     <label   for="editname">Найменування</label>
                    
-                    <input  autofocus="on"   required="required" class="form-control" zippy="editname"/>
+                    <input  autofocus="on"    required  class="form-control" zippy="editname"/>
                     
                 </div>
               
diff --git a/www/templates/pages/reference/itemlist.html b/www/templates/pages/reference/itemlist.html
index 46cbd636f..8ed896707 100644
--- a/www/templates/pages/reference/itemlist.html
+++ b/www/templates/pages/reference/itemlist.html
@@ -95,7 +95,7 @@ <h3>Довідник номенклатури
                  <div class="row "  >
                  <div class="col-2   "  >
                                 
-                <a zippy="addnew" class="btn btn-primary mr-4  "> <i class="fa fa-plus-circle"> Додати новий</a>
+                <a zippy="addnew" class="btn btn-primary mr-4  "> <i class="fa fa-plus-circle"></i> Додати новий</a>
                  </div>  
                  <div class="col-4  "  >
                  
@@ -106,8 +106,8 @@ <h3>Довідник номенклатури
                 <form zippy="listform">
                     <table class="table table-hover  table-sm  ">
                         <tr>
-                            <th><i onclick=" $('.seldel').prop('checked', $('.seldel').prop('checked') == false);"
-                                style="width:30px;cursor:pointer" title="Зняти/виставити прапорець"
+                            <th style="width:20px"><i onclick=" $('.seldel').prop('checked', $('.seldel').prop('checked') == false);"
+                                style="cursor:pointer" title="Зняти/виставити прапорець"
                                     class="fa fa-check-double "></i></th>                    
                             {{#useimages}}
                             <th></th>
@@ -190,7 +190,7 @@ <h3>Довідник номенклатури
                         <tr><td colspan="9">
                                 <a class="text-danger" zippy="deleteall" title="Видалити (деактивувати)"><i class="fa fa-trash"></i></a>&nbsp;&nbsp;
                                 <a  zippy="printall" title="Друк етикеток"><i class="fa fa-print"></i></a>&nbsp;&nbsp;  &nbsp;&nbsp;
-                                перемiстити в <select   zippy="allcat"><option value="0">Не вказано</select>
+                                перемiстити в <select   zippy="allcat"><option value="0">Не вказано </option></select>
                             </td> </tr>                 
                     </table>
                     <div style="width:50%" zippy="pag"></div>   
@@ -375,7 +375,7 @@ <h4>Редагування   </h4>
                                     <input list="manlist" class="form-control" zippy="editmanufacturer"/>
                                     <datalist id="manlist">
                                         {{#manlist}}
-                                        <option label='{{mitem}}' value='{{mitem}}'>
+                                        <option label="{{mitem}}" value="{{mitem}}"></option>
                                             {{/manlist}}
 
                                     </datalist>
@@ -552,7 +552,7 @@ <h4 zippy="stitle"></h4>
                     <input placeholder="Почніть вводити.." class="form-control  mr-sm-2" zippy="editsname"/>
 
                     <label for="editsqty">Кіл.</label>
-                    <input autocomplete="off" class="form-control  qtyprice  mr-sm-2" type="text" zippy="editsqty" required="required"
+                    <input autocomplete="off" class="form-control  qtyprice  mr-sm-2" type="text" zippy="editsqty"  required 
                            pattern="[0-9,\.]+" style="width:60px">
                     <input zippy="setformbtn" class="btn btn-outline-success  " type="submit" value="Додати">
                 </form>
@@ -578,7 +578,7 @@ <h4 zippy="stitle"></h4>
                     </select>
 
                     <label class="ml-sm-2" for="editscost">Вартість</label>
-                    <input autocomplete="off" class="form-control  qtyprice  mr-sm-2" type="text" zippy="editscost" required="required"
+                    <input autocomplete="off" class="form-control  qtyprice  mr-sm-2" type="text" zippy="editscost"  required 
                            pattern="[0-9,\.]+" style="width:60px">
                            
                     <input zippy="setsformbtn" class="btn btn-outline-success  " type="submit" value="Додати">
@@ -737,12 +737,12 @@ <h4>Друк стікера</h4>
                         <table>
                             <tr>
                                 <td align="center" id="tag"></td>
-                            <tr>
+                            </tr>
                             <tr>
                                 <td align="center"><a href="javascript:void(0)"
                                                       onclick="$('#tag').printThis();$('#pform').modal('hide')"
                                                       class="btn btn-success  ">Друк</a></td>
-                            <tr>
+                            </tr>
                         </table>
                     </div>
                 </div>
diff --git a/www/templates/pages/reference/prodarealist.html b/www/templates/pages/reference/prodarealist.html
index a32f7975f..ea3de5bf5 100644
--- a/www/templates/pages/reference/prodarealist.html
+++ b/www/templates/pages/reference/prodarealist.html
@@ -27,7 +27,7 @@ <h3>Виробничі дільниці </h3>
                 <form class="col-6 col-md-4" zippy="padetail">
                     <div class="form-group">
                         <label for="editpa_name">Назва</label>
-                        <input autofocus="on"   required="required" class="form-control" zippy="editpa_name"/>
+                        <input autofocus="on"    required  class="form-control" zippy="editpa_name"/>
                     </div>
                   <div class="form-group">
                         <label for="editpa_notes">Примітка</label>
diff --git a/www/templates/pages/reference/salarytypelist.html b/www/templates/pages/reference/salarytypelist.html
index ec96c5738..48b5e7637 100644
--- a/www/templates/pages/reference/salarytypelist.html
+++ b/www/templates/pages/reference/salarytypelist.html
@@ -50,16 +50,16 @@ <h3>Довідник нарахувань та утримань </h3>
                 <form class="col-6 col-md-6 col-xl-4" zippy="editform">
                     <div class="form-group">
                         <label for="editstname">Найменування</label>
-                        <input autofocus="on"   required="required" class="form-control" zippy="editstname"/>
+                        <input autofocus="on"    required  class="form-control" zippy="editstname"/>
                     </div>
                     <div class="form-group">
                         <label for="editshortname">Скорочене позначення</label>
-                        <input maxlength="10"  style="width:200px;" required="required" class="form-control" zippy="editshortname"/>
+                        <input maxlength="10"  style="width:200px;"  required  class="form-control" zippy="editshortname"/>
                         <small>До 10 символів. Використовується для заголовків таблиць у документах та звітах</small>
                     </div>
                     <div class="form-group">
                         <label for="editcode">Код                        </label>
-                        <input style="width:75px;" pattern="[0-9]{3}" required="required" class="form-control" zippy="editcode"/>
+                        <input style="width:75px;" pattern="[0-9]{3}"  required  class="form-control" zippy="editcode"/>
                         <small>Тризначний код   для використання у формулах. Колонки в документах та звітах будуть розміщені у порядку, заданому кодом.
                          </small>
                     </div>
@@ -145,7 +145,7 @@ <h5>Коди контексту      </h5>
               <br>Формули зберігаються як налаштування, тобто може бути заданий алгоритм для будь якого
               типу бізнесу та/або будь якого законодавства будь якої країни.
                <br>  Розрахунок  може не  працювати  зза  помилки  в  формулах, наприклад  неіснуюча змінна  або  який  спецсимвол.
-               помилки скрипта   можна побачити  в  devtools (для  хрома  F12->console)
+               помилки скрипта   можна побачити  в  devtools (для  хрома  F12-&gt;console)
              </p>
          </details>        
        </div>
diff --git a/www/templates/pages/reference/servicelist.html b/www/templates/pages/reference/servicelist.html
index e583d71fd..6fcf69e8e 100644
--- a/www/templates/pages/reference/servicelist.html
+++ b/www/templates/pages/reference/servicelist.html
@@ -74,7 +74,7 @@ <h3>Послуги, роботи </h3>
                 <div class="form-group row">
                     <label class="col-5 col-form-label" for="editservice_name">Назва</label>
                    <div class="col-7"> 
-                    <input autofocus="on"   required="required" class="form-control" zippy="editservice_name"/>
+                    <input autofocus="on"    required  class="form-control" zippy="editservice_name"/>
                   </div>
                 </div>
                 <div class="form-group row">
@@ -128,7 +128,7 @@ <h4 zippy="stitle"></h4>
                     <input placeholder="Почніть вводити.." class="form-control  mr-sm-2" zippy="editsname"/>
 
                     <label for="editsqty">Кіл.</label>
-                    <input autocomplete="off" class="form-control  qtyprice  mr-sm-2" type="text" zippy="editsqty" required="required"
+                    <input autocomplete="off" class="form-control  qtyprice  mr-sm-2" type="text" zippy="editsqty"  required 
                            pattern="[0-9,\.]+" style="width:60px">
                     <input zippy="setformbtn" class="btn btn-outline-success  " type="submit" value="Додати">
                 </form>
diff --git a/www/templates/pages/reference/storelist.html b/www/templates/pages/reference/storelist.html
index c9af2875e..4713211cd 100644
--- a/www/templates/pages/reference/storelist.html
+++ b/www/templates/pages/reference/storelist.html
@@ -44,7 +44,7 @@ <h2>Довідник складів</h2>
 
                 <div class="form-group">
                     <label for="storeeditname"> Назва</label>
-                    <input autofocus="on"   class="form-control" type="text" zippy="storeeditname" required="required">
+                    <input autofocus="on"   class="form-control" type="text" zippy="storeeditname"  required >
                 </div>
                 {{#usebranch}}
                 <div class="form-group">
diff --git a/www/templates/pages/register/custitems.html b/www/templates/pages/register/custitems.html
index 7ce900001..26732519d 100644
--- a/www/templates/pages/register/custitems.html
+++ b/www/templates/pages/register/custitems.html
@@ -34,7 +34,7 @@ <h3>Товари у постачальникiв               </h3>
                 </div>
                 <div class="navbar nav w-50" >
                
-                <a zippy="addnew" class="btn btn-success mr-4 ml-2" > </i> Додати</a>
+                <a zippy="addnew" class="btn btn-success mr-4 ml-2" >   Додати</a>
                 <a zippy="csv" class="mr-4 "><i  class="fa fa-upload" ></i> Експорт у Excel</a>
                 <a zippy="imports" class="mr-4"><i  class="fa fa-download" ></i> Iмпорт</a>
                 <a zippy="options"  class="mr-4" ><i  class="fa fa-cog" ></i> Налаштування</a>
diff --git a/www/templates/pages/register/doclist.html b/www/templates/pages/register/doclist.html
index 01e3bad78..79c29d879 100644
--- a/www/templates/pages/register/doclist.html
+++ b/www/templates/pages/register/doclist.html
@@ -122,7 +122,7 @@ <h3>Журнал документів
                 </div>
                 <a zippy="csv">Експорт в Excel</a>
                 <table class="table   table-sm  table-hover   ">
-                    <tr>
+                  <thead>  <tr>
                         <th></th>
 
                          <th class="text-nowrap  "><a zippy="sortdoc">Тип документа</a></th>
@@ -145,7 +145,7 @@ <h3>Журнал документів
                         <th></th>
                         <th></th>
                         <th></th>
-                    </tr>
+                    </tr>  </thead>
                     <tbody>
                         <tr zippy="doclist">
                             <td>
@@ -240,12 +240,12 @@ <h3>Журнал документів
                         <table>
                             <tr>
                                 <td align="center" id="tag"></td>
-                            <tr>
+                            </tr>
                             <tr>
                                 <td align="center"><a href="javascript:void(0)"
                                                       onclick="$('#tag').printThis();$('#pform').modal('hide')"
                                                       class="btn btn-success btn-sm">Друк</a></td>
-                            <tr>
+                            </tr>
                         </table>
                     </div>
                 </div>
diff --git a/www/templates/pages/register/gilist.html b/www/templates/pages/register/gilist.html
index 9755de76c..43d698479 100644
--- a/www/templates/pages/register/gilist.html
+++ b/www/templates/pages/register/gilist.html
@@ -342,9 +342,9 @@ <h4>Створення експрес-накладної НП</h4>
                         </div>
 
                          <div class="form-group row">
-                             <label data-label="npgw" class="mt-2"> Ш:</label> <input zippy="npgw" required="required"  class="form-control" style="width:75px"  type="number">  
-                             <label data-label="npgh" class="mt-2"> В:</label> <input zippy="npgh" required="required"  class="form-control" style="width:75px"  type="number">  
-                             <label data-label="npgd" class="mt-2"> Г:</label> <input zippy="npgd" required="required"  class="form-control" style="width:75px"  type="number">  
+                             <label data-label="npgw" class="mt-2"> Ш:</label> <input zippy="npgw"  required   class="form-control" style="width:75px"  type="number">  
+                             <label data-label="npgh" class="mt-2"> В:</label> <input zippy="npgh"  required   class="form-control" style="width:75px"  type="number">  
+                             <label data-label="npgd" class="mt-2"> Г:</label> <input zippy="npgd"  required   class="form-control" style="width:75px"  type="number">  
  
                         </div>
                         <div class="form-group">
diff --git a/www/templates/pages/register/itemlist.html b/www/templates/pages/register/itemlist.html
index f4f0dcef8..261ad683d 100644
--- a/www/templates/pages/register/itemlist.html
+++ b/www/templates/pages/register/itemlist.html
@@ -250,7 +250,7 @@ <h5> Партiї облiку  </h5>
                  
                      <form zippy="iformbay" class="form-inline mt-4">
                        <label>Кiл.</label> 
-                       <input required="required" style="width:120px;" zippy="iformbayqty"  pattern="[0-9\.]+" class="form-control priceqty" >
+                       <input  required  style="width:120px;" zippy="iformbayqty"  pattern="[0-9\.]+" class="form-control priceqty" >
                        <input title="Додати в заявку постачальнику"   type="submit" value="В закупку"  class="btn btn-info" >
                      </form>
                      
@@ -274,12 +274,12 @@ <h5> Партiї облiку  </h5>
                         <table>
                             <tr>
                                 <td align="center" id="tag"></td>
-                            <tr>
+                            </tr>
                             <tr>
                                 <td align="center"><a href="javascript:void(0)"
                                                       onclick="$('#tag').printThis();$('#pform').modal('hide')"
                                                       class="btn btn-success  ">Друк</a></td>
-                            <tr>
+                            </tr>
                         </table>
                     </div>
                 </div>
diff --git a/www/templates/pages/register/orderlist.html b/www/templates/pages/register/orderlist.html
index aa862c9eb..360cf6871 100644
--- a/www/templates/pages/register/orderlist.html
+++ b/www/templates/pages/register/orderlist.html
@@ -219,7 +219,7 @@ <h3>Журнал замовлень </h3>
                      <td> {{dnum}}</td>
                      <td>{{dc}} </td>
                      <td  >{{dd}} </td>
-                     <tr> 
+                     </tr> 
                       {{/sitems}} 
                        </table> 
                 </details>
@@ -312,11 +312,11 @@ <h5>Замовлення <span zippy="editdn"></span></h5>
                                     class="fa fa-check-double "></i>                   
                    </th><th colspan="4"></th></tr>
                    <tr  zippy="edititemlist">
-                      <td style="width:20px"><input zippy="checkscan" class="seldel mt-1" type="checkbox"><td>
-                      <td zippy="editlistname"><td>
-                      <td zippy="editlistcode"><td>
-                      <td zippy="editlistbarcode"><td>
-                      <td class="text-right" zippy="editlistqty"><td>
+                      <td style="width:20px"><input zippy="checkscan" class="seldel mt-1" type="checkbox"></td>
+                      <td zippy="editlistname"></td>
+                      <td zippy="editlistcode"></td>
+                      <td zippy="editlistbarcode"></td>
+                      <td class="text-right" zippy="editlistqty"></td>
                    </tr> 
                  </table>         
                  <div class="form-group">
@@ -356,11 +356,11 @@ <h5 class="modal-title">Чат  з замовником</h5>
                                 <summary>Перелiк товарiв</summary>
                                 <table class="ctable" style="font-size:smaller">
                                     <tr v-for="item in cchatitemlist">
-                                        <td>{{item.itemname}} <td>
-                                        <td>{{item.item_code}} <td>
-                                        <td align="right">{{item.quantity}} <td>
-                                        <td align="right">{{item.price}} <td>
-                                        <td  >  <td>
+                                        <td>{{item.itemname}} </td>
+                                        <td>{{item.item_code}} </td>
+                                        <td align="right">{{item.quantity}} </td>
+                                        <td align="right">{{item.price}} </td>
+                                        <td  >  </td>
                                     </tr>
                                 </table>
                                 </details> 
diff --git a/www/templates/pages/register/paylist.html b/www/templates/pages/register/paylist.html
index 4d5281d47..2bae34c8e 100644
--- a/www/templates/pages/register/paylist.html
+++ b/www/templates/pages/register/paylist.html
@@ -11,31 +11,71 @@ <h3>Журнал платежів </h3>
 
 
                 <div class="navbar nav">
-                    <form zippy="filter" class="form-inline ">
-                         <label for="from">З </label>
-                        <input type="text" class="form-control mr-sm-1  " zippy="from" style="width:110px">
-
-
-                        <label for="to"> по </label>
-                        <input type="text" class="form-control mr-sm-1 " style="width:110px" zippy="to">
-
-            
-
-                        <label for="fmfund"> рахунок </label>
-                        <select class="form-control mr-2" zippy="fmfund">
+                    <form zippy="filter" class="row   g-2 align-items-center">
+                      <div class="col-auto">
+                       <div class="  row no-gutters"> 
+                         <label class="col-auto mt-2" for="from">З </label>
+                          <div class="col-auto">
+                            <input type="text" class="form-control mr-sm-1  " zippy="from" style="width:110px">
+                         </div>
+                       </div>
+                      </div>     
+                       <div class="col-auto">
+                        <div class="  row no-gutters"> 
+ 
+                         <label class="col-auto mt-2" for="to"> по </label>
+                            <div class="col-auto">
+                           <input type="text" class="form-control mr-sm-1 " style="width:110px" zippy="to">
+                          </div>
+                       </div>
+                      </div>     
+                       <div class="col-auto">
+                        <div class="  row no-gutters"> 
+    
+                        <label class="col-auto mt-2" for="fmfund"> рахунок </label>
+                            <div class="col-auto">
+                      <select class="form-control mr-2" zippy="fmfund">
                             <option value="0">Не обрано</option>
                         </select>
-                        <label for="fuser"> створив </label>
-                        <select class="form-control mr-2" zippy="fuser">
+                     </div>
+                      </div>   
+                     </div>     
+                       <div class="col-auto">
+                        <div class="  row no-gutters"> 
+                        
+                        <label class="col-auto mt-2" for="fuser"> створив </label>
+                               <div class="col-auto">
+                         <select class="form-control mr-2" zippy="fuser">
                             <option value="0">Не обрано</option>
                         </select>
-
-                        <label for="fcustomer"> контрагент </label>
-                        <input placeholder="Почніть вводити..." type="text" class="form-control  mr-2 " zippy="fcustomer">
-
-
+                        </div>
+                      </div>   
+                      </div>    
+                       <div class="col-auto">
+                        <div class="  row no-gutters"> 
+
+                        <label class="col-auto mt-2" for="fcustomer"> контрагент </label>
+                               <div class="col-auto">
+                          <input placeholder="Почніть вводити..." type="text" class="form-control  mr-2 " zippy="fcustomer">
+                       </div>
+                      </div>     
+                     </div>
+                    <div class="col-auto">
+                        <div class="  row no-gutters"> 
+                        
+                        <label class="col-auto mt-2" for="fsort"> сортувати </label>
+                           <div class="col-auto">
+                             <select class="form-control mr-2" zippy="fsort">
+                                <option value="0">За датою</option>
+                                <option value="1">За прибутком</option>
+                                <option value="2">За видатком</option>
+                            </select>
+                        </div>
+                      </div>   
+                      </div>    
+                       <div class="col-auto">   
                         <input type="submit" class="  btn btn-outline-success  " value="ОК">
-
+                      </div> 
                     </form>
                 </div>
             </div>
diff --git a/www/templates/pages/register/paytable.html b/www/templates/pages/register/paytable.html
index 77ad48c43..f3f9c2541 100644
--- a/www/templates/pages/register/paytable.html
+++ b/www/templates/pages/register/paytable.html
@@ -65,16 +65,16 @@ <h3>Платіжний календар </h3>
                    </div>      
                     <div class="form-group  ">
                         <label for="addeventdate">Дата платежу</label>
-                        <input style="width:150px"  class="form-control "   zippy="addeventdate" required="required">
+                        <input style="width:150px"  class="form-control "   zippy="addeventdate"  required >
                     </div>
 
                     <div class="form-group  ">
                         <label for="addeventamount">Сума платежу</label>
-                        <input style="width:150px"  class="form-control qtyprice"   zippy="addeventamount" required="required">
+                        <input style="width:150px"  class="form-control qtyprice"   zippy="addeventamount"  required >
                     </div>
                     <div class="form-group">
                         <label for="addeventtitle">Призначення </label>
-                        <input required="required" class="form-control" zippy="addeventtitle">
+                        <input  required  class="form-control" zippy="addeventtitle">
                     </div>
                     <div class="form-group">
                         <label for="addeventcust">Контрагент </label>
@@ -95,11 +95,11 @@ <h3>Платіжний календар </h3>
               
                     <div class="form-group">
                         <label for="editeventdate">Дата платежу</label>
-                        <input style="width:150px" required="required" class="form-control" zippy="editeventdate">
+                        <input style="width:150px"  required  class="form-control" zippy="editeventdate">
                     </div>
                     <div class="form-group">
                         <label for="editeventamount">Сума платежу</label>
-                        <input style="width:150px" required="required" class="form-control" zippy="editeventamount">
+                        <input style="width:150px"  required  class="form-control" zippy="editeventamount">
                     </div>
                     <div class="form-group">
                         <label for="editeventdesc">Коментар</label>
diff --git a/www/templates/pages/register/prodproclist.html b/www/templates/pages/register/prodproclist.html
index d7ae82465..c0121416a 100644
--- a/www/templates/pages/register/prodproclist.html
+++ b/www/templates/pages/register/prodproclist.html
@@ -139,7 +139,7 @@ <h4>Редагування процесу</h4>
                 <div class="col-12 col-md-4 col-xl-3">
                     <div class="form-group">
                         <label for="editname">Найменування</label>
-                        <input required="required" class="form-control" zippy="editname"/>
+                        <input  required  class="form-control" zippy="editname"/>
                     </div>
                     <div class="form-group">
                         <label for="editbasedoc">Замовлення, договір</label>
@@ -196,7 +196,7 @@ <h5>Запланована готова продукція</h5>
                         <td zippy="proditemname"></td>
                         <td class="text-right" zippy="proditemqty"></td>
                         <td><a zippy="proditemdel"><i class="fa fa-trash"></i></a></td>
-                    <tr>
+                    </tr>
                 </table>
                 <a zippy="cancelprods" class="btn btn-outline-success" >Скасувати</a>&nbsp;&nbsp;&nbsp;
                 <a zippy="saveprods"  class="btn  btn-success">Зберегти</a>
@@ -229,9 +229,9 @@ <h5>Виробничі етапи </h5>
                         <td zippy="stagehours"></td>
 
                         <td><a title="Редагувати" zippy="stageedit"><i class="fa fa-edit"></i></a></td>
-                        <td><a title="Тех. карта" zippy="stagecard"><i class="fa fa fa-wrench"></i></a></td>
+                        <td><a title="Тех. карта" zippy="stagecard"><i class="fa fa-wrench"></i></a></td>
                         <td><a title="Видалити" zippy="stagedel"><i class="fa fa-trash"></i></a></td>
-                    <tr>
+                    </tr>
                 </table>               
             </div>
         </div>
@@ -243,7 +243,7 @@ <h4>Редагування етапу</h4>
                 <div class="col-12 col-md-4 col-xl-3">
                     <div class="form-group">
                         <label for="editstagename">Найменування</label>
-                        <input required="required" class="form-control" zippy="editstagename"/>
+                        <input  required  class="form-control" zippy="editstagename"/>
                     </div>
                     <div class="form-group">
                         <label for="editstagearea">Виробнича дільниця  </label>
@@ -254,11 +254,11 @@ <h4>Редагування етапу</h4>
 
                     <div class="form-group">
                         <label for="editstagestartdateplan">Початок (план)</label>
-                        <input required="required"  class="form-control" zippy="editstagestartdateplan"/>
+                        <input  required   class="form-control" zippy="editstagestartdateplan"/>
                     </div>
                     <div class="form-group">
                         <label for="editstageenddateplan">Кінець (план)</label>
-                        <input required="required"   class="form-control" zippy="editstageenddateplan"/>
+                        <input  required    class="form-control" zippy="editstageenddateplan"/>
                     </div>
 
                     <div class="form-group">
@@ -283,7 +283,7 @@ <h4>Редагування етапу</h4>
         </form> 
 
         <form zippy="editcardform"  >
-            <h4 zippy=stagenameh4></h4>    
+            <h4 zippy="stagenameh4"></h4>    
             <div class="row"  >
                 <div class="col-12 col-md-8 col-xl-6">
                     <div class="form-group">
diff --git a/www/templates/pages/register/serlist.html b/www/templates/pages/register/serlist.html
index 964d3b876..3cdd7de5d 100644
--- a/www/templates/pages/register/serlist.html
+++ b/www/templates/pages/register/serlist.html
@@ -133,9 +133,9 @@ <h3>Журнал послуг  </h3>
                                &nbsp;Коментар
                                <input  type="text"  class="form-control" zippy="sdesc"  >
                                &nbsp;Кiл.
-                               <input required="required" style="width:100px"  type="text"  class="form-control priceqty" zippy="sqty"  >
+                               <input  required  style="width:100px"  type="text"  class="form-control priceqty" zippy="sqty"  >
                                &nbsp;Цiна
-                               <input required="required" style="width:100px"  type="text"  class="form-control priceqty" zippy="sprice"  >
+                               <input  required  style="width:100px"  type="text"  class="form-control priceqty" zippy="sprice"  >
                                &nbsp;
                               <input  zippy="ssubmit" type="submit"  value="+" class="btn btn-success"   >
                          </form>
@@ -162,9 +162,9 @@ <h3>Журнал послуг  </h3>
                                <input zippy="isn"  class="form-control">
                                {{/usesnumberitem}}
                                &nbsp;Кiл.
-                               <input required="required" style="width:100px"  type="text"  class="form-control priceqty" zippy="iqty"  >
+                               <input  required  style="width:100px"  type="text"  class="form-control priceqty" zippy="iqty"  >
                                &nbsp;Цiна
-                               <input required="required" style="width:100px"  type="text"  class="form-control priceqty" zippy="iprice"  >
+                               <input  required  style="width:100px"  type="text"  class="form-control priceqty" zippy="iprice"  >
                            
                               <input  zippy="isubmit" type="submit"  value="+" class="btn btn-success"   >
                             </form>                    
diff --git a/www/templates/pages/register/stocklist.html b/www/templates/pages/register/stocklist.html
index fcfeb83de..366b277e7 100644
--- a/www/templates/pages/register/stocklist.html
+++ b/www/templates/pages/register/stocklist.html
@@ -25,7 +25,12 @@ <h3>Журнал руху ТМЦ </h3>
                         </select>
                         <label for="fitem"> ТМЦ </label>
                         <input placeholder="Почніть вводити..." class="form-control mr-sm-2" zippy="fitem">
-
+                         {{#usesnumber}}
+               
+                        <label data-label="fsnumber" for="fsnumber">Серія, с/н </label>
+                        <input class="form-control mr-sm-2" zippy="fsnumber">
+                             {{/usesnumber}}
+                   
 
                         <input type="submit" class="  btn btn-outline-success  " value="ОК">
 
diff --git a/www/templates/pages/register/tasklist.html b/www/templates/pages/register/tasklist.html
index df0b5780d..765df1785 100644
--- a/www/templates/pages/register/tasklist.html
+++ b/www/templates/pages/register/tasklist.html
@@ -2,8 +2,7 @@
    <head>
         <title>  Журнал нарядів </title>
 
-    </head>
-    <head>
+ 
         <link rel="stylesheet" type="text/css" href="/vendor/leon-mbs/zippy/zcl/gantt/jquery.ganttView.css"/>
 
         <link href="/assets/css/ekko-lightbox.css" rel="stylesheet" type="text/css">
@@ -156,7 +155,7 @@ <h3>Журнал нарядів</h3>
                 </div> <!-- tasktab -->
                 <div zippy="caltab" class="tab-pane    ">
 
-                    <div zippy='calendar'></div>
+                    <div zippy="calendar"></div>
 
 
                 </div>
diff --git a/www/templates/pages/roles.html b/www/templates/pages/roles.html
index 659f33a82..4dba16e87 100644
--- a/www/templates/pages/roles.html
+++ b/www/templates/pages/roles.html
@@ -34,7 +34,7 @@ <h4> Редагування ролі</h4>
                 <form zippy="editformname" role="form">
                     <div class="form-group">
                         <label for="editname">Им'я</label>
-                        <input class="form-control" zippy="editname" required="required">
+                        <input class="form-control" zippy="editname"  required >
 
                     </div>
                     <div class="form-group">
diff --git a/www/templates/pages/service/armfood.html b/www/templates/pages/service/armfood.html
index 7c3445e1b..c66ce4073 100644
--- a/www/templates/pages/service/armfood.html
+++ b/www/templates/pages/service/armfood.html
@@ -411,7 +411,7 @@ <h5 class="modal-title">Кількість</h5>
                             <div class="form-group  row ">
                                 <label class="col-7 col-form-label"  for="pfforpay" >До сплати</label>
                                  <div class="col-5">
-                                <input zippy="pfforpay" readonly="readonly" style="width:100px;" class="form-control  qtyprice "  pattern="[0-9,\.]+">
+                                <input zippy="pfforpay" readonly  style="width:100px;" class="form-control  qtyprice "  pattern="[0-9,\.]+">
                                 </div>
 
                             </div>
@@ -429,7 +429,7 @@ <h5 class="modal-title">Кількість</h5>
 
                                 <label class="col-7 col-form-label" for="pfrest"  >Решта   </label>
                                   <div class="col-5">
-                                <input readonly="readonly" zippy="pfrest" style="width:100px;" class="form-control-plaintext    "  pattern="[0-9,\.]+">
+                                <input readonly   zippy="pfrest" style="width:100px;" class="form-control-plaintext    "  pattern="[0-9,\.]+">
                                  </div>
                             </div>
                             <div class="form-group row">
@@ -614,7 +614,7 @@ <h3>&nbsp;Новий покупець </h3>
 
                     <div class="form-group">
                         <label for="editcustname">Ім'я </label>
-                        <input class="form-control " zippy="editcustname" required="required"/>
+                        <input class="form-control " zippy="editcustname"  required />
                     </div>
                     <div class="form-group">
                         <label for="editphone">Телефон</label>
diff --git a/www/templates/pages/service/armpos.html b/www/templates/pages/service/armpos.html
index 42740497d..abde5ddb8 100644
--- a/www/templates/pages/service/armpos.html
+++ b/www/templates/pages/service/armpos.html
@@ -407,14 +407,14 @@ <h4 class="mb-2  ">Оформлення чеку</h4>
                         <div class="form-group row">
                             <label class="col-4" for="document_number">Номер документа</label>
                             <div class="col-6">
-                            <input class="form-control" type="text" zippy="document_number" required="required">
+                            <input class="form-control" type="text" zippy="document_number"  required >
                             </div>
                         </div>
 
                         <div class="form-group row">
                             <label class="col-4" for="document_date"> Дата</label>
                             <div class="col-6">
-                           <input style="width:120px;" class="form-control" type="text" zippy="document_date" required="required">
+                           <input style="width:120px;" class="form-control" type="text" zippy="document_date"  required >
                             </div>
                         </div>
                    
@@ -508,7 +508,7 @@ <h4>Введення товару </h4>
                         <div class="form-group row">
                             <label class="col-5 col-form-label" for="editquantity">Кількість</label>
                              <div class="col-5">
-                                <input class="form-control qtyprice" type="text" zippy="editquantity" required="required" pattern="[0-9,\.]+"  >
+                                <input class="form-control qtyprice" type="text" zippy="editquantity"  required  pattern="[0-9,\.]+"  >
                              </div>
                          {{#showscalebtn}}
                           <div class="col-2">
@@ -520,7 +520,7 @@ <h4>Введення товару </h4>
                         <div class="form-group row">
                             <label class="col-5 col-form-label" for="editprice">Ціна </label>
                             <div class="col-5">
-                            <input autocomplete="off" class="form-control" type="text" zippy="editprice" required="required"    pattern="[,0-9\.]+" >
+                            <input autocomplete="off" class="form-control" type="text" zippy="editprice"  required     pattern="[,0-9\.]+" >
                              </div>
                         </div>
 
@@ -555,14 +555,14 @@ <h4>Введення послуги </h4>
 
                         <div class="form-group">
                             <label for="editserquantity">Кількість</label>
-                            <input class="form-control qtyprice" type="text" zippy="editserquantity" required="required" pattern="[0-9,\.]+"
+                            <input class="form-control qtyprice" type="text" zippy="editserquantity"  required  pattern="[0-9,\.]+"
                                    style="width: 70px;">
 
                         </div>
 
                         <div class="form-group">
                             <label for="editserprice">Вартість </label>
-                            <input class="form-control" type="text" zippy="editserprice" required="required" pattern="[,0-9\.]+"
+                            <input class="form-control" type="text" zippy="editserprice"  required  pattern="[,0-9\.]+"
                                    style="width: 70px;">
 
                         </div>
@@ -680,7 +680,7 @@ <h3>&nbsp;Новий контрагент </h3>
 
                     <div class="form-group">
                         <label for="editcustname">Назва </label>
-                        <input class="form-control " zippy="editcustname" required="required"/>
+                        <input class="form-control " zippy="editcustname"  required />
                     </div>
                     <div class="form-group">
                         <label for="editphone">Телефон</label>
diff --git a/www/templates/pages/service/discounts.html b/www/templates/pages/service/discounts.html
index 3368fd908..aa346a4d3 100644
--- a/www/templates/pages/service/discounts.html
+++ b/www/templates/pages/service/discounts.html
@@ -469,7 +469,7 @@ <h4>Новий  промо код</h4>
                                             <div class="form-group row">
                                                <label class="col-5 col-form-label" for="peditcode">Код</label>
                                                 <div class="col-7">
-                                                  <input readonly="readonly"   class="form-control"   zippy="peditcode"   >
+                                                  <input readonly    class="form-control"   zippy="peditcode"   >
                                                </div>
                                            </div>      
                                             <div class="form-group row">
@@ -594,7 +594,7 @@ <h5 class="modal-title">Додати (відняти) бонуси</h5>
 
                                 </div>
                                 
-                            </div>
+                          
                          </form>       
                         </div>
 
diff --git a/www/templates/pages/service/import.html b/www/templates/pages/service/import.html
index 25d3cdf8c..8a4c024b8 100644
--- a/www/templates/pages/service/import.html
+++ b/www/templates/pages/service/import.html
@@ -524,7 +524,7 @@ <h3>Імпорт контрагентів
                                 <td>{{colemail}}</td>
                                 <td>{{colcity}}</td>
                                 <td>{{coladdress}}</td>
-
+                              </tr>
                                 {{/list2}}
                         </table>
                     </div>
diff --git a/www/templates/pages/subscribes.html b/www/templates/pages/subscribes.html
index 3fd299a0e..aa6789ab4 100644
--- a/www/templates/pages/subscribes.html
+++ b/www/templates/pages/subscribes.html
@@ -202,7 +202,7 @@ <h5 class="modal-title">Опис тегiв шаблонізатора</h5>
                         <br>
                         <br>
                         Для виведення списків, наприклад, позицій документа, потрібно додати інформацію мiж тегами
-                        {#list}  та  {/list>}  
+                        {#list}  та  {/list&gt;}  
                         <br>  Всередині рядка списку допускаються наступні теги:
 
                         <table  >
@@ -217,16 +217,16 @@ <h5 class="modal-title">Опис тегiв шаблонізатора</h5>
                         </table>
                         Наприклад:<br>
                         <p class="text-bold">
-                            Привiт {customer_name}&lt;br> <br> 
+                            Привiт {customer_name}&lt;br&gt; <br> 
                             Ми впарили тобi наступне <br>
-                            &lt;table>  <br>
-                            &lt;tr> &lt;th>Товар&lt;/th> &lt;th align="right" >Кiл. &lt;/th> &lt;/tr><br>
+                            &lt;table&gt;  <br>
+                            &lt;tr&gt; &lt;th&gt;Товар&lt;/th&gt; &lt;th align="right" &gt;Кiл. &lt;/th&gt; &lt;/tr&gt;<br>
                             {#list} <br>
-                            &lt;tr> &lt;td>{item_name} &lt;/td> &lt;td align="right" >{qty} &lt;/td>&lt;/tr> <br>
+                            &lt;tr&gt; &lt;td&gt;{item_name} &lt;/td&gt; &lt;td align="right" &gt;{qty} &lt;/td&gt;&lt;/tr&gt; <br>
                             {/list} <br>
-                            &lt;/table>&lt;br>   <br> 
-                            До сплати {forpay} чистоганом &lt;br><br> 
-                            Прайси за &lt;a href="https://price.com/">посиланням&lt;/a>&lt;br><br>
+                            &lt;/table&gt;&lt;br&gt;   <br> 
+                            До сплати {forpay} чистоганом &lt;br&gt;<br> 
+                            Прайси за &lt;a href="https://price.com/"&gt;посиланням&lt;/a&gt;&lt;br&gt;<br>
                             Пока, лошара
                         </p>
 
diff --git a/www/templates/pages/systemlog.html b/www/templates/pages/systemlog.html
index 1ec0a350c..21c21896e 100644
--- a/www/templates/pages/systemlog.html
+++ b/www/templates/pages/systemlog.html
@@ -30,7 +30,7 @@ <h5>Системнi повiдомлення</h5>
                         <td><i class="fa fa-clock"> </i> <span zippy="ndate" > </span>
 
                             <p zippy="msg" >
-                            <p>
+                            </p>
                         </td>
                         <td><span  zippy="newn" class="badge badge-info">Нове</span></td>
 
@@ -56,11 +56,11 @@ <h5>Файловий лог</h5>
 
                     </tr>
                 </table> 
-                 <small     >    
-                 <pre zippy="fc"  >    
+                    
+                 <pre style="font-size:smaller" zippy="fc"  >    
               
                 </pre>
-                </small>
+               
               </div>
         </div>
  
diff --git a/www/templates/pages/timesheet.html b/www/templates/pages/timesheet.html
index 416262902..274bc633a 100644
--- a/www/templates/pages/timesheet.html
+++ b/www/templates/pages/timesheet.html
@@ -2,8 +2,7 @@
  <head>
         <title>  Табель облiку робочого часу  </title>
 
-    </head>
-    <head>
+ 
         <link rel="stylesheet" type="text/css" href="/assets/js/fullcalendar/main.css"/>
 
         <script language="javascript" src="/assets/js/moment/moment.min.js"></script>
@@ -119,14 +118,14 @@ <h4 v-show="edited==0">Новий запис</h4>
                     
                     <div class="form-group">
                         <label for="editdate">Дата</label>
-                        <input v-model="editdate" required="required" class="form-control"  type="date" />
+                        <input v-model="editdate"  required  class="form-control"  type="date" />
                     </div>
                     <div class="form-group row">
                          
                        <div class="col-auto pt-1"> <label for="editfrom">З</label> </div>
-                       <div class="col-auto"> <input v-model="editfrom" required="required"  class="form-control"  type="time" /></div>
+                       <div class="col-auto"> <input v-model="editfrom"  required   class="form-control"  type="time" /></div>
                        <div class="col-auto pt-1"> <label for="editto">По</label></div>
-                       <div class="col-auto"> <input  v-model="editto" required="required" type="time" class="form-control" /></div>
+                       <div class="col-auto"> <input  v-model="editto"  required  type="time" class="form-control" /></div>
                     </div>
                     <div class="form-group">
                         <label for="edittype">Тип</label>
@@ -137,7 +136,7 @@ <h4 v-show="edited==0">Новий запис</h4>
                     </div>
                     <div class="form-group">
                         <label for="editbreak">Перерва, хв.</label>
-                        <input   v-model="editbreak" required="required" style="width:75px;" pattern="[0-9]+" class="form-control" />
+                        <input   v-model="editbreak"  required  style="width:75px;" pattern="[0-9]+" class="form-control" />
                     </div>
                     <div class="form-group">
                         <label for="editnote">Примiтка</label>
diff --git a/www/templates/pages/userlogin.html b/www/templates/pages/userlogin.html
index d540a304f..a41a43c86 100644
--- a/www/templates/pages/userlogin.html
+++ b/www/templates/pages/userlogin.html
@@ -51,17 +51,17 @@ <h3>{{appname}}</h3>
                     <form zippy="loginform">
                         <div class="form-group  ">
                             <label for="userlogin">Логін</label>
-                            <input autofocus="on"  zippy="userlogin" required="required" class="form-control"  >
+                            <input autofocus="on"  zippy="userlogin"  required  class="form-control"  >
                            
                         </div>
                         <div class="form-group  ">
                           <label for="userpassword">Пароль</label>
-                          <input zippy="userpassword" required="required" type="password" class="form-control"     >
+                          <input zippy="userpassword"  required  type="password" class="form-control"     >
                          
                         </div>
                         {{#capcha}}
                         <div class="input-group mb-3">
-                            <input zippy="capchacode" required="required" class="form-control mr-4"
+                            <input zippy="capchacode"  required  class="form-control mr-4"
                                    placeholder="Введiть код">
                             <div class="input-group-append">
                                 <img zippy="capcha" style="cursor:pointer" title="Оновити..."/>
diff --git a/www/templates/pages/userprofile.html b/www/templates/pages/userprofile.html
index 7dd3bbb5a..987267695 100644
--- a/www/templates/pages/userprofile.html
+++ b/www/templates/pages/userprofile.html
@@ -19,28 +19,28 @@ <h4>Мій профіль</h4>
                                 <label for="defstore">Компанія за замовчуванням</label>
 
                                 <select class="form-control" zippy="deffirm">
-                                    <option value='0'>Не встановлено</option>
+                                    <option value="0">Не встановлено</option>
                                 </select>
                             </div>
                             <div class="form-group  ">
                                 <label for="defstore">Склад за замовчуванням</label>
 
                                 <select class="form-control" zippy="defstore">
-                                    <option value='0'>Не встановлено</option>
+                                    <option value="0">Не встановлено</option>
                                 </select>
                             </div>
                             <div class="form-group  ">
                                 <label for="defmf">Грошовий рахунок за замовчуванням</label>
 
                                 <select class="form-control" zippy="defmf">
-                                    <option value='0'>Не встановлено</option>
+                                    <option value="0">Не встановлено</option>
                                 </select>
                             </div>
                             <div class="form-group  ">
                                 <label for="defsalesource">Джерело продаж за замовчуванням</label>
 
                                 <select class="form-control" zippy="defsalesource">
-                                    <option value='0'>Не встановлено</option>
+                                    <option value="0">Не встановлено</option>
                                 </select>
                             </div>
                             <div class="form-group  ">
@@ -55,7 +55,7 @@ <h4>Мій профіль</h4>
                                     <label for="mainpage">Головна сторiнка</label>
 
                                     <select class="form-control" zippy="mainpage">
-                                        <option value='\App\Pages\Main'>Дашборд (вiджети)</option>
+                                        <option value="\App\Pages\Main">Дашборд (вiджети)</option>
                                     </select>
                                 </div>
 
@@ -133,7 +133,7 @@ <h4>Мій профіль</h4>
         
             <div class="col-10  col-md-4 col-xl-3">
                          <h4>Принтер чеків</h4>
-                         <small><a href="https://zippy.com.ua/ext#10">Опис</a></small>
+                         <small><a href="https://zippy.com.ua/ext#id10">Опис</a></small>
                          <form zippy="printer">
                             <div class="form-group  ">
                                 <label for="prtype">Тип підключення</label>
@@ -141,7 +141,7 @@ <h4>Принтер чеків</h4>
                                      <option value="0">Системний принтер</option>
                                      <option value="1">Print сервер</option>
                                 </select>
-                                <small data-label="pserver">Опис <a href="https://zippy.com.ua/ext#10" target="_blank">тут</a>  </small>
+                                <small data-label="pserver">Опис <a href="https://zippy.com.ua/ext#id10" target="_blank">тут</a>  </small>
                             </div>    
                                  
                                 
@@ -181,7 +181,7 @@ <h4>Принтер етикеток</h4>
                                      <option value="1">Print сервер (режим  receipt)</option>
                                      <option value="2">Print сервер (режим  label)</option>
                                 </select>
-                                <small data-label="prtypelabel" data-label="pserverlabel">Опис <a href="https://zippy.com.ua/ext#10" target="_blank">тут</a>  </small>
+                                <small data-label="prtypelabel"  >Опис <a href="https://zippy.com.ua/ext#id10" target="_blank">тут</a>  </small>
                             </div>    
                                  
                                 
@@ -220,7 +220,7 @@ <h4>Принтер етикеток</h4>
                          </form>   
                          <h4>Електронні ваги</h4>
                        
-                        <small>Мають бути реалізовані в  POS сервері. Опис <a  href="https://zippy.com.ua/ext#10">тут</a> </small>
+                        <small>Мають бути реалізовані в  POS сервері. Опис <a  href="https://zippy.com.ua/ext#id10">тут</a> </small>
                   
                          <form zippy="scaleform">
                              <div class="form-group  ">
@@ -243,13 +243,13 @@ <h4>Зміна пароля</h4>
 
                     <div class="form-group">
                         <label for="userpassword">Новий пароль</label>
-                        <input type="password" class="form-control" zippy="userpassword" required="required">
+                        <input type="password" class="form-control" zippy="userpassword"  required >
                         <small>Перед введенням перевірте розкладку та регістр клавіатури </small>
                     </div>
 
                     <div class="form-group">
                         <label for="userpassword">Підтвердження</label>
-                        <input type="password" class="form-control " zippy="confirmpassword" required="required">
+                        <input type="password" class="form-control " zippy="confirmpassword"  required >
                     </div>
 
                     <button type="submit"   class="btn btn-primary">Зберегти</button>
diff --git a/www/templates/pages/users.html b/www/templates/pages/users.html
index 456f732c1..85eb4c3bc 100644
--- a/www/templates/pages/users.html
+++ b/www/templates/pages/users.html
@@ -68,7 +68,7 @@ <h4> Редагування користувача</h4>
                     <div class="form-group">
                         <label for="editlogin">Логін</label>
                         <input pattern="[_a-zA-Z0-9]+" style="width:200px" class="form-control" zippy="editlogin"
-                               required="required">
+                                required >
                         <small>Допускаються латинські букви, цифри і підкреслення</small>
                     </div>
                     <div class="form-group">
@@ -79,7 +79,7 @@ <h4> Редагування користувача</h4>
                     <div class="form-group">
                         <label for="editrole">Роль</label>
                         <select class="form-control" zippy="editrole">
-                            <option value='0'>Не вказано</option>
+                            <option value="0">Не вказано</option>
                         </select>
                     </div>
 
diff --git a/www/templates/printforms/cinfo.tpl b/www/templates/printforms/cinfo.tpl
index d782ca93e..1291d59e5 100644
--- a/www/templates/printforms/cinfo.tpl
+++ b/www/templates/printforms/cinfo.tpl
@@ -39,7 +39,7 @@
    
    {{#last}}
      <tr><td colspan="2"> Останній документ: {{last}} від {{lastdate}} на суму  {{lastsum}}. Статус {{laststatus}}</td></tr>
-     <tr><td colspan="2"> Останні товари: <td></tr>
+     <tr><td colspan="2"> Останні товари: </td></tr>
      <tr><td colspan="2"> 
          <table      style="font-size:smaller">
             {{#goods}}
diff --git a/www/templates/printforms/doc/goodsissue.tpl b/www/templates/printforms/doc/goodsissue.tpl
index 79782a90a..90aae0469 100644
--- a/www/templates/printforms/doc/goodsissue.tpl
+++ b/www/templates/printforms/doc/goodsissue.tpl
@@ -190,7 +190,7 @@
                         <td> </td>
                         <td colspan="7">
                             {{#isstamp}}
-                            <img style="height:100px;" src='{{stamp}}'/>
+                            <img style="height:100px;" src="{{stamp}}"/>
                             {{/isstamp}}
 
                             {{^isstamp}}
diff --git a/www/templates/printforms/doc/invoice.tpl b/www/templates/printforms/doc/invoice.tpl
index 1bd0bb811..9035afa2e 100644
--- a/www/templates/printforms/doc/invoice.tpl
+++ b/www/templates/printforms/doc/invoice.tpl
@@ -4,7 +4,7 @@
     <tr>
 
         <td colspan="9">
-            <img style="height:100px;" src='{{logo}}'/>
+            <img style="height:100px;" src="{{logo}}"/>
         </td>
 
     </tr>
@@ -161,14 +161,14 @@
   {{/payamount}}
     <tr>                  <td colspan="5">
                             {{#isstamp}}
-                            <img style="height:100px;" src='{{stamp}}'/>
+                            <img style="height:100px;" src="{{stamp}}"/>
                             {{/isstamp}}
 
 
                         </td>
                         <td colspan="4">
                             {{#issign}}
-                            <img style="height:100px;" src='{{sign}}'/>
+                            <img style="height:100px;" src="{{sign}}"/>
                             {{/issign}}
 
 
diff --git a/www/templates/printforms/doc/serviceact.tpl b/www/templates/printforms/doc/serviceact.tpl
index 305e535e7..ef8066745 100644
--- a/www/templates/printforms/doc/serviceact.tpl
+++ b/www/templates/printforms/doc/serviceact.tpl
@@ -128,7 +128,7 @@
                         <td> </td>
                         <td colspan="4">
                             {{#isstamp}}
-                            <img style="height:100px;" src='{{stamp}}'/>
+                            <img style="height:100px;" src="{{stamp}}"/>
                             {{/isstamp}}
 
                             {{^isstamp}}
diff --git a/www/templates/printforms/item_sticker.tpl b/www/templates/printforms/item_sticker.tpl
index 382d10bcf..e3f3f5605 100644
--- a/www/templates/printforms/item_sticker.tpl
+++ b/www/templates/printforms/item_sticker.tpl
@@ -1,6 +1,6 @@
-    <div style="{{turn}}border: 1px solid   #ccc;width:100%;;">
+   <div style="{{turn}}border: 1px solid   #ccc;width:100%;;">
     <table class="ctable" border="0" cellpadding="2" cellspacing="0" style="width:100%"  > 
-       <td>
+    <tr>   <td>
            <table>
             <tr  >
                 <td   colspan="3"  ><b> {{name}}</b></td>
@@ -22,7 +22,7 @@
             <tr  >
                 <td style="padding:20px;" align="center" colspan="3">
                 <img style="width:80%" src="{{dataUri}}" >
-                
+                 </td>
                 </tr>
            
           
diff --git a/www/templates/printforms/item_tag.tpl b/www/templates/printforms/item_tag.tpl
index 48df71fdf..7d298fe10 100644
--- a/www/templates/printforms/item_tag.tpl
+++ b/www/templates/printforms/item_tag.tpl
@@ -1,6 +1,6 @@
     <div style="{{turn}}border: 1px solid   #ccc;width:100%;;">
     <table class="ctable" border="0" cellpadding="1" cellspacing="0" style="width:100%"  > 
-       <td>
+    <tr> <td>
            <table>
             <tr  >
                 <td colspan="2"  style="font-size:24px"><b> {{name}}</b></td>
diff --git a/www/templates/printforms/report/balance.tpl b/www/templates/printforms/report/balance.tpl
index 7ab0ce706..907612112 100644
--- a/www/templates/printforms/report/balance.tpl
+++ b/www/templates/printforms/report/balance.tpl
@@ -5,7 +5,7 @@
             Управлiнський  баланс
         </td>
     </tr>
-    <tr>
+  
     <tr>
 
         <td align="center" colspan="2">
diff --git a/www/templates/printforms/report/compareact.tpl b/www/templates/printforms/report/compareact.tpl
index 40f149556..7a32b848a 100644
--- a/www/templates/printforms/report/compareact.tpl
+++ b/www/templates/printforms/report/compareact.tpl
@@ -1,4 +1,4 @@
-<table class="ctable" border="0" class="ctable"  >
+<table class="ctable" border="0"    >
 
 
     <tr style="font-size:larger; font-weight: bolder;">
@@ -39,3 +39,5 @@
 
     </tr>
     {{/_detail}}
+    
+   </table> 
diff --git a/www/templates/printforms/report/custorder.tpl b/www/templates/printforms/report/custorder.tpl
index 5efd55816..283a324d0 100644
--- a/www/templates/printforms/report/custorder.tpl
+++ b/www/templates/printforms/report/custorder.tpl
@@ -1,4 +1,4 @@
-<table class="ctable" border="0" class="ctable" cellpadding="2" cellspacing="0">
+<table class="ctable" border="0"   cellpadding="2" cellspacing="0">
 
     <tr style="font-size:larger; font-weight: bolder;">
         <td align="center" colspan="3">
diff --git a/www/templates/printforms/report/emptask.tpl b/www/templates/printforms/report/emptask.tpl
index 5afe6e0a0..b3dcef0a1 100644
--- a/www/templates/printforms/report/emptask.tpl
+++ b/www/templates/printforms/report/emptask.tpl
@@ -1,4 +1,4 @@
-<table class="ctable" border="0" class="ctable" cellpadding="2" cellspacing="0">
+<table class="ctable" border="0"   cellpadding="2" cellspacing="0">
 
     <tr style="font-size:larger; font-weight: bolder;">
         <td align="center" colspan="5">
diff --git a/www/templates/printforms/report/income.tpl b/www/templates/printforms/report/income.tpl
index 3cbf1e32d..c041f120f 100644
--- a/www/templates/printforms/report/income.tpl
+++ b/www/templates/printforms/report/income.tpl
@@ -1,4 +1,4 @@
-<table class="ctable" border="0" class="ctable" cellpadding="2" cellspacing="0">
+<table class="ctable" border="0"   cellpadding="2" cellspacing="0">
 
 
     <tr>
diff --git a/www/templates/printforms/report/itemactivity.tpl b/www/templates/printforms/report/itemactivity.tpl
index b86e18e43..0e6cf7411 100644
--- a/www/templates/printforms/report/itemactivity.tpl
+++ b/www/templates/printforms/report/itemactivity.tpl
@@ -1,4 +1,4 @@
-<table class="ctable" border="0" class="ctable" cellpadding="2" cellspacing="0">
+<table class="ctable" border="0"   cellpadding="2" cellspacing="0">
 
     <tr style="font-size:larger; font-weight: bolder;">
         <td align="center" colspan="8">
diff --git a/www/templates/printforms/report/itemorder.tpl b/www/templates/printforms/report/itemorder.tpl
index fee4e9b03..cb03eac8a 100644
--- a/www/templates/printforms/report/itemorder.tpl
+++ b/www/templates/printforms/report/itemorder.tpl
@@ -1,4 +1,4 @@
-<table class="ctable" border="0" class="ctable" cellpadding="2" cellspacing="0">
+<table class="ctable" border="0"   cellpadding="2" cellspacing="0">
 
     <tr style="font-size:larger; font-weight: bolder;">
         <td align="center" colspan="3">
diff --git a/www/templates/printforms/report/noliq.tpl b/www/templates/printforms/report/noliq.tpl
index db4a37c42..d76ecc804 100644
--- a/www/templates/printforms/report/noliq.tpl
+++ b/www/templates/printforms/report/noliq.tpl
@@ -1,4 +1,4 @@
-<table class="ctable" border="0" class="ctable" cellpadding="2" cellspacing="0">
+<table class="ctable" border="0"   cellpadding="2" cellspacing="0">
 
     <tr style="font-size:larger; font-weight: bolder;">
         <td align="center" colspan="3">
diff --git a/www/templates/printforms/report/outcome.tpl b/www/templates/printforms/report/outcome.tpl
index 0892918b7..721b24c49 100644
--- a/www/templates/printforms/report/outcome.tpl
+++ b/www/templates/printforms/report/outcome.tpl
@@ -107,8 +107,8 @@
 <tr><td colspan="4"></td><td align="right" ><b>{{totsumma}}</b></td>
     {{^noshowpartion}}
 
-<td align="right" ><b>{{totnavar}}</b></b></td> 
-<td align="right" ><b>{{totnavarproc}}</b></b></td> 
+<td align="right" ><b>{{totnavar}}</b> </td> 
+<td align="right" ><b>{{totnavarproc}}</b> </td> 
 
     {{/noshowpartion}}
 
@@ -483,8 +483,8 @@
 <tr><td colspan="4"></td><td align="right" ><b>{{totsumma}}</b></td>
     {{^noshowpartion}}
 
-<td align="right" ><b>{{totnavar}}</b></b></td> 
-<td align="right" ><b>{{totnavarproc}}</b></b></td> 
+<td align="right" ><b>{{totnavar}}</b> </td> 
+<td align="right" ><b>{{totnavarproc}}</b> </td> 
 
     {{/noshowpartion}}
 
diff --git a/www/templates/printforms/report/outfood.tpl b/www/templates/printforms/report/outfood.tpl
index 27db1e055..b8bcf691c 100644
--- a/www/templates/printforms/report/outfood.tpl
+++ b/www/templates/printforms/report/outfood.tpl
@@ -29,7 +29,7 @@
         <th align="right" style="border: solid black 1px">Кіл.</th>
 
 
-   
+        </tr>
 
         {{#_detail}}
     <tr>
@@ -63,7 +63,7 @@
 
         <th align="right" style="border: solid black 1px">Кіл.</th>
         <th align="right" style="border: solid black 1px">На суму</th>
-
+       </tr>
         
         {{#_detail2}}
     <tr>
diff --git a/www/templates/printforms/report/paybalance.tpl b/www/templates/printforms/report/paybalance.tpl
index 8499334b6..d18a43fc9 100644
--- a/www/templates/printforms/report/paybalance.tpl
+++ b/www/templates/printforms/report/paybalance.tpl
@@ -5,14 +5,14 @@
             Прибутки та видатки
         </td>
     </tr>
-    <tr>
+   
     <tr>
 
         <td align="center" colspan="3">
             Перiод з {{datefrom}} по {{dateto}} <br>
         </td>
     </tr>
-
+     <tr>
         <td colspan="3">
             <b>Прибутки</b>
         </td>
@@ -93,6 +93,7 @@
    {{#is3}}    
     
     </tr>
+     <tr> 
         <td colspan="3"> <br>
             <b>Деталiзацiя по ТМЦ </b>
         </td>       
diff --git a/www/templates/printforms/report/prod.tpl b/www/templates/printforms/report/prod.tpl
index d34832d9e..9938b1db9 100644
--- a/www/templates/printforms/report/prod.tpl
+++ b/www/templates/printforms/report/prod.tpl
@@ -36,7 +36,7 @@
 
 
         <th align="right" style="border: solid black 1px">Сума</th>
-
+       </tr>
         {{#_detail}}
     <tr>
 
@@ -76,7 +76,7 @@
 
 
         <th align="right" style="border: solid black 1px">Сума</th>
-
+      </tr>
         {{#_detail2}}
     <tr>
 
@@ -103,9 +103,10 @@
 
         <td colspan="4"><br>
             <h5> Готово до виробництва </h5>
-            <small>Напівфабрикати та готова продукція, які можуть бути виготовлені на <b> {{currdate}} </b> <br>відповідно до комплектів. 
+            <small>Напівфабрикати та готова продукція, які можуть бути виготовлені на <b> {{currdate}} </b> 
+            <br>відповідно до комплектів. 
              Якщо матеріал або комплектуючі входять <br>в кілька позицій, будуть показані всі варіанти.
-            
+              </small>
         </td>
     </tr>
 
@@ -117,7 +118,7 @@
         <th style="border: solid black 1px">Код</th>
         <th colspan="2" align="right" style="border: solid black 1px">Кіл.</th>
 
-
+    </tr>
 
 
         {{#_detail3}}
diff --git a/www/templates/printforms/report/prrodoclist.tpl b/www/templates/printforms/report/prrodoclist.tpl
index a0a0b41f6..3349c8a69 100644
--- a/www/templates/printforms/report/prrodoclist.tpl
+++ b/www/templates/printforms/report/prrodoclist.tpl
@@ -22,7 +22,7 @@
         <th style="border: solid black 1px">ФН</th>
         <th style="border: solid black 1px">Тип</th>
         <th align="right" style="border: solid black 1px">Сума</th>
-  
+   </tr>
         {{#detail}}
     <tr>
 
@@ -48,7 +48,7 @@
         </td>
       
        
-    <tr> 
+   </tr> 
  
 
 </table>
diff --git a/www/templates/printforms/report/reserved.tpl b/www/templates/printforms/report/reserved.tpl
index 0f7998d32..8a45a1897 100644
--- a/www/templates/printforms/report/reserved.tpl
+++ b/www/templates/printforms/report/reserved.tpl
@@ -1,4 +1,4 @@
-<table class="ctable" border="0" class="ctable" cellpadding="2" cellspacing="0">
+<table class="ctable" border="0"   cellpadding="2" cellspacing="0">
 
 
     <tr style="font-size:larger; font-weight: bolder;">
@@ -31,3 +31,4 @@
 
     </tr>
     {{/_detail}}
+    </table>
diff --git a/www/templates/widgets/docview.html b/www/templates/widgets/docview.html
index ba203be0c..90d4e0e28 100644
--- a/www/templates/widgets/docview.html
+++ b/www/templates/widgets/docview.html
@@ -60,7 +60,7 @@
   
   <div class="tab-pane  " id="tdocs">
               <div class="row">
-              <div class="col-12 col-md-4 col-xl-3">
+              <div class="col-12 col-md-6 col-xl-4">
               <table class="table table-sm"   >
                 <tr>
                     <td colspan="2" v-show="docdata.pdoc_id>0">
@@ -69,6 +69,7 @@
                 </tr>
                 <tr v-for="item   in  reldocs" >
                     <td><a v-on:click="opendoc(item.id)"  href="javascript:void(0)">{{item.name}}</a></td>
+                    <td> {{item.status}} </td>
                     <td><a v-show="item.candel"   v-on:click="delchilddoc(item.id)" href="javascript:void(0)"><i class="fa fa-trash"></i></a></td>
                 </tr>
             </table>
@@ -76,7 +77,7 @@
             <form onsubmit="return  false"     >
 
                 <label for="addrel">Додати дочiрнiй документ:</label>
-                <div class="form-group">
+                <div style="width:200px" class="form-group">
                     <typeahead v-model="childdocid" ref="docth"  :onquery="ontext"    placeholder="Почнiть вводити номер..."></typeahead>   
 
                 </div>
diff --git a/www/templates/widgets/itemlist.html b/www/templates/widgets/itemlist.html
index 076bf558f..742172470 100644
--- a/www/templates/widgets/itemlist.html
+++ b/www/templates/widgets/itemlist.html
@@ -27,7 +27,7 @@ <h5 class="modal-title">Вибiр ТМЦ</h5>
                                 <label for="wissearchmanufacturer">Бренд </label>
                                 <input v-model="wissearchbrand" autocomplete="off" list="wissearchmanlist" class="form-control mr-sm-2" zippy="wissearchmanufacturer"/>
                                 <datalist id="wissearchmanlist">
-                                      <option v-for="br in brands" v-bind:value="br.value" v-bind:label="br.value" >
+                                      <option v-for="br in brands" v-bind:value="br.value" v-bind:label="br.value" ></option>
             
                                 </datalist>
                                    <div class="form-check  mr-sm-2">
diff --git a/www/templates/widgets/itemsel.html b/www/templates/widgets/itemsel.html
index 149b9e257..723eb5b9f 100644
--- a/www/templates/widgets/itemsel.html
+++ b/www/templates/widgets/itemsel.html
@@ -16,7 +16,7 @@
                 <input autocomplete="off" list="wissearchmanlist" class="form-control mr-2" zippy="wissearchmanufacturer"/>
                 <datalist id="wissearchmanlist">
                     {{#manlist}}
-                    <option label='{{mitem}}' value='{{mitem}}'>
+                    <option label="{{mitem}}" value="{{mitem}}">  </option>
                         {{/manlist}}
                 </datalist>