Andrey
|
aacd041543
|
Merge branch 'sales_features' into 'dev'
finance email
See merge request !274
|
8 years ago |
|
Andrey
|
3e55aca89c
|
finance email
|
8 years ago |
|
Andrey
|
f3526352cd
|
Merge branch 'sales_features' into 'dev'
finance email
See merge request !273
|
8 years ago |
|
Andrey
|
432f52255d
|
finance email
|
8 years ago |
|
Andrey
|
da6331c8b8
|
Merge branch 'sales_features' into 'dev'
finance email
See merge request !272
|
8 years ago |
|
Andrey
|
f3bc397b99
|
finance email
|
8 years ago |
|
Andrey
|
a224a60d72
|
Merge branch 'sales_features' into 'dev'
finance logging
See merge request !271
|
8 years ago |
|
Andrey
|
ef5baf777a
|
finance logging
|
8 years ago |
|
Andrey
|
82926708b7
|
Merge branch 'sales_features' into 'dev'
finance logging
See merge request !270
|
8 years ago |
|
Andrey
|
91f9fdde67
|
finance logging
|
8 years ago |
|
Andrey
|
d1bccffaee
|
Merge branch 'sales_features' into 'dev'
finance logging
See merge request !269
|
8 years ago |
|
Andrey
|
a609141dd4
|
finance logging
|
8 years ago |
|
Andrey
|
3ab14c1404
|
Merge branch 'sales_features' into 'dev'
finance logging
See merge request !268
|
8 years ago |
|
Andrey
|
19e5565c0a
|
finance logging
|
8 years ago |
|
Andrey
|
af7e8f64b6
|
Merge branch 'sales_features' into 'dev'
Sales features
See merge request !267
|
8 years ago |
|
Andrey
|
684e255f90
|
Merge remote-tracking branch 'origin/sales_features' into sales_features
|
8 years ago |
|
Andrey
|
c0b6d529bb
|
finance logging
|
8 years ago |
|
Andrey
|
fef04d9ae1
|
Merge branch 'sales_features' into 'dev'
Sales features
See merge request !266
|
8 years ago |
|
Andrey
|
11aa0e2b20
|
Merge branch 'dev' into 'sales_features'
# Conflicts:
# .gitignore
# lms/settings.py
|
8 years ago |
|
Andrey
|
031ab8914e
|
finance logging
|
8 years ago |
|
Andrey
|
c67385c21c
|
finance logging
|
8 years ago |
|
Andrey
|
866855ddd2
|
finance logging
|
8 years ago |
|
Andrey
|
6cf99a0a7e
|
Merge branch 'sales_features' into 'dev'
finance logging
See merge request !265
|
8 years ago |
|
Andrey
|
610500446a
|
finance logging
|
8 years ago |
|
Andrey
|
fc76f58f17
|
Merge branch 'sales_features' into 'dev'
Sales features
See merge request !264
|
8 years ago |
|
Andrey
|
b815f04472
|
finance logging
|
8 years ago |
|
Andrey
|
f027b109a5
|
finance logging
|
8 years ago |
|
Andrey
|
7bf6eca3c4
|
Merge branch 'sales_features' into 'dev'
finance logging
See merge request !263
|
8 years ago |
|
Andrey
|
32e76a32a8
|
finance logging
|
8 years ago |
|
Andrey
|
cbb20966cc
|
Merge branch 'sales_features' into 'dev'
finance logging
See merge request !262
|
8 years ago |
|
Andrey
|
08b4a28e6e
|
finance logging
|
8 years ago |
Evgeniy Shabanov
|
3976bbf2ff
|
Миграции
|
8 years ago |
|
Andrey
|
2239a94edf
|
Merge branch 'sales_features' into 'dev'
Sales features
See merge request !261
|
8 years ago |
|
Andrey
|
7506946cd4
|
finance logging
|
8 years ago |
|
Evgeniy Shabanov
|
55ace09705
|
Merge remote-tracking branch 'origin/dev' into pm_payments_repeat
# Conflicts:
# finance/views.py
|
8 years ago |
|
Evgeniy Shabanov
|
6c61b81e13
|
Повторные платежи
|
8 years ago |
 Dmitriy Shesterkin
|
da4c7fc3c1
|
refactor for new code
|
8 years ago |
|
Dmitriy Shesterkin
|
41de0175e9
|
merge dev
|
8 years ago |
|
Dmitriy Shesterkin
|
73d02e862a
|
refactor
|
8 years ago |
|
Andrey
|
d7e89aff1d
|
finance logging
|
8 years ago |
|
Andrey
|
11c7f750d0
|
Merge branch 'current_branch' into 'dev'
finance logging
See merge request !257
|
8 years ago |
|
Andrey
|
a3a5011a06
|
finance logging
|
8 years ago |
|
Andrey
|
b79883cee4
|
Merge branch 'current_branch' into 'dev'
pay
See merge request !255
|
8 years ago |
|
Andrey
|
8c4aec26fa
|
pay
|
8 years ago |
|
Andrey
|
29ec341c47
|
Merge branch 'current_branch' into 'dev'
pay
See merge request !253
|
8 years ago |
|
Andrey
|
a0fc46bdb2
|
pay
|
8 years ago |
|
Andrey
|
53441959d8
|
Merge branch 'current_branch' into 'dev'
pay
See merge request !251
|
8 years ago |
|
Andrey
|
63ccf9f085
|
pay
|
8 years ago |
|
Andrey
|
cd7dfed780
|
Merge branch 'current_branch' into 'dev'
pay
See merge request !250
|
8 years ago |
|
Andrey
|
77bcaa95f6
|
pay
|
8 years ago |
