Commit Graph

58 Commits

Author SHA1 Message Date
Anatoly
9dc8e34e3a Merge branch 'develop' into feature/transfer-guide
# Conflicts:
#	apps/establishment/models.py
#	apps/establishment/serializers/common.py
2019-12-04 20:16:21 +03:00
Anatoly
29ff10fb4b added wine origins 2019-12-04 20:13:09 +03:00
Dmitriy Kuzmenko
637903e613 fix scheduler 2019-12-03 15:15:02 +03:00
alex
749c4a637b artisan subtype fix 2019-11-28 09:19:53 +03:00
alex
78d4145336 artisan subtype 2019-11-28 09:13:38 +03:00
alex
9b35da1eca add artisan subtype 2019-11-27 17:03:27 +03:00
a.feteleu
0b1b89b6ba added merge migration 2019-11-19 17:38:53 +03:00
Anatoly
a8b3c9aa63 refactored galleries, added transfer script 2019-11-17 14:22:30 +03:00
Виктор Гладких
b590a762c1 Fix update 2019-11-15 10:48:04 +03:00
Виктор Гладких
2931381126 Fix update employee 2019-11-15 10:12:19 +03:00
alex
b94a6dfd62 social choices model 2019-11-14 09:14:36 +03:00
Виктор Гладких
c5ac47953c Merge branch 'develop' into feature/add_tag_product 2019-11-12 18:38:25 +03:00
Виктор Гладких
89fa7c5d56 Fix for merge 2019-11-12 18:37:43 +03:00
evgeniy-st
0dfa1c85d5 Recalculate toque number fallback 2019-11-12 18:15:53 +03:00
Виктор Гладких
ced49965f9 Fix employee name 2019-11-12 17:54:07 +03:00
Виктор Гладких
e702be2691 Fix employee name 2019-11-12 17:51:57 +03:00
Kuroshini
7bba5237dc Closed_at fill command 2019-11-12 15:12:47 +03:00
Виктор Гладких
429cc705a1 Fix add_empl_position 2019-11-12 10:42:15 +03:00
Dmitriy Kuzmenko
e4061996a8 fix model currency 2019-11-12 04:09:57 +03:00
Dmitriy Kuzmenko
ec96c32453 fix product type 2019-11-12 02:28:33 +03:00
Виктор Гладких
ba6d18d202 Fix account migration 2019-11-07 17:01:26 +03:00
Виктор Гладких
e04c621a3d Fix message 2019-11-06 11:50:42 +03:00
Виктор Гладких
545e9a249b Fix help 2019-11-05 17:32:18 +03:00
Виктор Гладких
6f4cd56fcd Add establishment employee 2019-11-05 17:28:13 +03:00
Виктор Гладких
22982f3332 Add employee fix 2019-11-05 16:33:38 +03:00
Виктор Гладких
ea1ddfa320 Add employee 2019-11-05 16:29:27 +03:00
Виктор Гладких
e7143f73c3 Add positions 2019-11-05 14:59:32 +03:00
Dmitriy Kuzmenko
b3345d612a renge_menu and carte 2019-11-04 02:25:04 +03:00
Dmitriy Kuzmenko
3462c74a65 modify add_menus 2019-11-04 00:50:37 +03:00
Dmitriy Kuzmenko
db6c93a72f add trensfer menus 2019-11-04 00:41:34 +03:00
alex
8eee337d34 fix last published establishment description 2019-11-03 19:12:47 +03:00
Dmitriy Kuzmenko
a30f863155 fix currency 2019-11-03 17:39:10 +03:00
Dmitriy Kuzmenko
924b4e68e9 fix currency 2019-11-03 17:13:27 +03:00
Dmitriy Kuzmenko
c47f659657 add fix currency 2019-11-03 15:34:53 +03:00
Dmitriy Kuzmenko
b88c0d5213 modify script add_currency 2019-11-03 15:24:03 +03:00
Dmitriy Kuzmenko
1856589427 disabled inline in est, and change currency creator 2019-11-03 14:55:08 +03:00
Dmitriy Kuzmenko
398a982c82 add fix currency 2019-11-03 14:09:07 +03:00
Dmitriy Kuzmenko
1ac3cf95ca add currency 2019-11-03 14:03:47 +03:00
Dmitriy Kuzmenko
c69ef65d79 add filter for description 2019-11-03 00:36:19 +03:00
Dmitriy Kuzmenko
22b4b94f1b add filter for description 2019-11-03 00:11:08 +03:00
alex
9da10acd8e fix none value establishment description 2019-11-02 22:52:20 +03:00
alex
cc2c475b4e add_establishment_description with elastic error 2019-11-02 22:45:57 +03:00
GladkihViktor
9acf2f5c5f Code style 2019-11-02 17:58:00 +03:00
GladkihViktor
56b3d0dcc2 Update transportation 2019-11-02 17:54:24 +03:00
GladkihViktor
ea830379fc Fix image url 2019-11-02 14:31:12 +03:00
Anatoly
4e76fc966e added fix link for establishment preview_image 2019-11-01 18:43:48 +03:00
alex
84cefefa0b fix add_establishment_description 2019-11-01 14:14:16 +03:00
alex
b3bd2a7141 add_establishment_social command 2019-11-01 10:48:46 +03:00
evgeniy-st
6d34e406db recalculate toque number 2019-10-31 19:09:57 +03:00
alex
55e68ec336 fix establishment mark 2019-10-31 17:19:07 +03:00