This commit is contained in:
Xuan Loi
2026-01-04 09:55:57 +07:00
parent 7416b0e6ee
commit 960ab65fa1

View File

@@ -2,7 +2,7 @@ from app.models import *
from rest_framework.decorators import api_view from rest_framework.decorators import api_view
from rest_framework.response import Response from rest_framework.response import Response
from django.db import transaction from django.db import transaction
from django.db.models import F from datetime import datetime
decimal = 0 decimal = 0
@@ -21,16 +21,12 @@ def getcode(code, Model):
#========================================================================================== #==========================================================================================
def account_entry_api(code, amount, content, type, category, userid, ref=None, product=None, customer=None): def account_entry_api(code, amount, content, type, category, userid, ref=None, product=None, customer=None, date=None):
try: try:
user = User.objects.get(id=userid) user = User.objects.get(id=userid)
entry_type = Entry_Type.objects.get(code=type) entry_type = Entry_Type.objects.get(code=type)
entry_category = Entry_Category.objects.get(id=category) entry_category = Entry_Category.objects.get(id=category)
system_date = date if date else datetime.now.strftime("%Y-%m-%d")
row = System_Setting.objects.filter(category='system', classify='current', code='date').first()
if not row:
return {'error': 'Không tìm thấy cài đặt ngày hệ thống.'}
system_date = row.detail
with transaction.atomic(): with transaction.atomic():
account = Internal_Account.objects.select_for_update().get(code=code) account = Internal_Account.objects.select_for_update().get(code=code)
@@ -93,7 +89,8 @@ def account_entry(request):
userid=request.data['user'], userid=request.data['user'],
ref=ref, ref=ref,
product=request.data['product'], product=request.data['product'],
customer=request.data['customer'] customer=request.data['customer'],
date=request.data.get('date')
) )
if 'error' in data: if 'error' in data:
@@ -118,7 +115,8 @@ def account_multi_entry(request):
userid=request.data.get('user'), userid=request.data.get('user'),
ref=obj['ref'], ref=obj['ref'],
product=obj['product'], product=obj['product'],
customer=obj['customer'] customer=obj['customer'],
date=obj['date']
) )
result.append(row) result.append(row)