Ivan 3a8f4f90bf Resolved merge conflicts hai 1 mes
..
__init__.py 13572a9f0b loading project hai 2 meses
auth.py 406673acb5 fix import hai 5 meses
base.py 62287eec7d format code using pycharm hai 5 meses
company.py 7ad496cbce add tax_method hai 5 meses
document.py 62287eec7d format code using pycharm hai 5 meses
job_request.py 6d872b3555 new menu structure and old pages adaptation for furhter testing hai 1 mes
resource.py b315e8e4fb add resource_list hai 1 mes
service.py bf3a6ad5de rename filed price_alg to price_type hai 5 meses