danamir/asuinventory
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Resolve merge conflict by incorporating both suggestions

Browse Source
This commit is contained in:
Alex Danamir
2024-04-03 19:58:22 +03:00
parent 682b6c4ffd 4c6166c907
commit 0c6001b297
13 changed files with 18 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
models.py
View File

@@ -18,6 +18,7 @@ class Oboruds(db.Model):
nazvanie=db.Column(db.String(500))
raspologenie = db.Column(db.String(200))
numberved = db.Column(db.String(100))
<<<<<<< HEAD
<<<<<<< HEAD
buhnumberpp = db.Column(db.String(100))
kolichestvo = db.Column(db.Integer)
@@ -27,6 +28,14 @@ class Oboruds(db.Model):
kolichestvo = db.Column(db.Integer)
>>>>>>> dev
=======
kolichestvo = db.Column(db.Integer)
=======
buhnumberpp = db.Column(db.String(100))
kolichestvo = db.Column(db.Integer)
balancenumber = db.Column(db.String(30))
>>>>>>> 87c4ebe33e69ec19b443f976557a6f5fa2905476
>>>>>>> 4c6166c9078d5d913b83b681af7f7241af0399ca
aud_id = db.Column(db.Integer, db.ForeignKey(Auditory.id))