Product templates and extra stock management features

src/asm3/animal.py

@@ -1327,6 +1327,7 @@ def get_alerts(dbo: Database, lf: LocationFilter = None, age: int = 120) -> Resu
         "(SELECT COUNT(*) FROM stocklevel WHERE Balance > 0 AND Expiry Is Not Null AND Expiry > %(today)s AND Expiry <= %(futuremonth)s) AS stexpsoon, " \
         "(SELECT COUNT(*) FROM stocklevel WHERE Balance > 0 AND Expiry Is Not Null AND Expiry <= %(today)s) AS stexp, " \
         "(SELECT COUNT(*) FROM stocklevel WHERE Balance < Low) AS stlowbal, " \
+        "(SELECT COUNT(*) FROM product WHERE (SELECT SUM(stocklevel.Balance) FROM stocklevel WHERE stocklevel.ProductID = product.ID) <= product.GlobalMinimum) AS globallows, " \
         "(SELECT COUNT(*) FROM animaltransport WHERE (DriverOwnerID = 0 OR DriverOwnerID Is Null) AND Status < 10) AS trnodrv, " \
         "(SELECT COUNT(*) FROM animal LEFT OUTER JOIN internallocation il ON il.ID = animal.ShelterLocation " \
             "WHERE Archived = 0 AND HasPermanentFoster = 0 AND DaysOnShelter > %(longterm)s %(locfilter)s) AS lngterm, " \

src/asm3/configuration.py

@@ -1407,6 +1407,9 @@ def pdf_zoom(dbo: Database) -> int:
 def person_search_columns(dbo: Database) -> str:
     return cstring(dbo, "OwnerSearchColumns", DEFAULTS["OwnerSearchColumns"])
 
+def product_movement_usage_type(dbo: Database) -> int:
+    return cint(dbo, "StockMovementUsageTypeID", 1)
+
 def event_search_columns(dbo: Database) -> str:
     return cstring(dbo, "EventSearchColumns", DEFAULTS["EventSearchColumns"])
 

src/asm3/html.py

@@ -615,7 +615,6 @@ def menu_structure(l: str, publisherlist: Dict, reports: MenuItems, mailmerges:
         )),
         ("", "financial", _("Financial", l), (
             ( asm3.users.VIEW_ACCOUNT, "alt+shift+x", "tagaccounts", "accounts", "asm-icon-accounts", _("Accounts", l) ),
-            ( asm3.users.VIEW_STOCKLEVEL, "", "tagstock", "stocklevel", "asm-icon-stock", _("Stock", l) ),
             ( asm3.users.VIEW_VOUCHER, "", "", "voucher", "asm-icon-blank", _("Voucher book", l) ),
             ( asm3.users.VIEW_BOARDING, "", "tagboarding", "--cat", "", _("Boarding", l) ),
             ( asm3.users.VIEW_BOARDING, "", "tagboarding", "boarding", "asm-icon-boarding", _("Boarding book", l) ),
@@ -625,7 +624,11 @@ def menu_structure(l: str, publisherlist: Dict, reports: MenuItems, mailmerges:
             ( asm3.users.VIEW_DONATION, "", "", "calendarview?ev=p", "asm-icon-calendar", _("Payment calendar", l) ),
             ( asm3.users.ADD_DONATION, "", "", "donation_receive", "asm-icon-blank", _("Receive a payment", l) ),
             ( asm3.users.VIEW_DONATION, "", "taggb", "--cat", "", "HMRC" ),
-            ( asm3.users.VIEW_DONATION, "", "taggb", "giftaid_hmrc_spreadsheet", "asm-icon-report", "Generate HMRC Gift Aid spreadsheet" )
+            ( asm3.users.VIEW_DONATION, "", "taggb", "giftaid_hmrc_spreadsheet", "asm-icon-report", "Generate HMRC Gift Aid spreadsheet" ),
+            ( asm3.users.VIEW_DONATION, "", "", "--cat", "", _("Stock control", l) ),
+            ( asm3.users.VIEW_STOCKLEVEL, "", "", "product", "asm-icon-stock", _("Products", l) ),
+            ( asm3.users.VIEW_STOCKLEVEL, "", "tagstock", "stocklevel", "asm-icon-stock", _("Stock levels", l) ),
+            ( asm3.users.VIEW_STOCKLEVEL, "", "tastock", "stock_movement", "asm-icon-stock", _("Stock movements", l) )
         )),
         (asm3.users.USE_INTERNET_PUBLISHER, "publishing", _("Publishing", l), [
             ("", "", "", "--cat", "asm-icon-settings", _("Configuration", l) ),

src/asm3/lookups.py

@@ -54,6 +54,7 @@
     "lksmovementtype":  (_("Movement Types"), "MovementType", _("Type"), "", "", ("adoption.MovementType", "animal.ActiveMovementType",)),
     "lksoutcome":       (_("Outcomes"), "Outcome", _("Outcome"), "", "", ""),
     "lkownerflags":     (_("Person Flags"), "Flag", _("Flag"), "", "add del ret", ""),
+    "lkproducttype":    (_("Product Types"), "ProductTypeName", _("Name"), _("Description"), "add del ret", ""),
     "lksrotatype":      (_("Rota Types"), "RotaType", _("Type"), "", "", ("ownerrota.RotaTypeID",)),
     "lksex":            (_("Sexes"), "Sex", _("Sex"), "", "", ("animal.Sex", "animallost.Sex", "animalfound.Sex")),
     "lksize":           (_("Sizes"), "Size", _("Size"), "", "", ("animal.Size",)),
@@ -68,6 +69,7 @@
     "stocklocation":    (_("Stock Locations"), "LocationName", _("Location"), "LocationDescription", "add del ret", ("stocklevel.StockLocationID",)),
     "stockusagetype":   (_("Stock Usage Type"), "UsageTypeName", _("Usage Type"), "UsageTypeDescription", "add del ret", ("stockusage.StockUsageTypeID",)),
     "lkurgency":        (_("Urgencies"), "Urgency", _("Urgency"), "", "", ("animalwaitinglist.Urgency",)),
+    "lktaxrate":        (_("Tax Rate"), "TaxRateName", _("Name"), _("Description"), "add del ret", ("lktaxrate.TaxRate",)),
     "testtype":         (_("Test Types"), "TestName", _("Type"), "TestDescription", "add del ret cost sched", ("animaltest.TestTypeID",)),
     "testresult":       (_("Test Results"), "ResultName", _("Result"), "ResultDescription", "add del ret", ("animaltest.TestResultID",)),
     "lkstransportstatus": (_("Transport Statuses"), "Name", _("Status"), "", "", ("animaltransport.Status",)),
@@ -805,7 +807,7 @@ def _merge_db_flags(dbflags: Results, flags: str = "") -> Results:
     """
     BUILTINS = [ "aco", "adopter", "banned", "coordinator", "dangerous", "deceased", "donor", "driver", 
         "excludefrombulkemail", "fosterer", "giftaid", "homechecked", "homechecker", "member", "padopter", 
-        "retailer", "shelter", "staff", "sponsor", "vet", "volunteer", 
+        "retailer", "shelter", "staff", "sponsor", "vet", "volunteer", "supplier",
         "courtesy", "crueltycase", "nonshelter", "notforadoption", "notforregistration", "quarantine" ]
     if flags is None or flags == "" or flags == "|": return dbflags
     out = dbflags.copy()
@@ -992,7 +994,7 @@ def get_lookup(dbo: Database, tablename: str, namefield: str) -> Results:
 def insert_lookup(dbo: Database, username: str, lookup: str, name: str, desc: str = "", 
                   speciesid: int = 0, pfbreed: str = "", pfspecies: str = "", apcolour: str = "", 
                   units: str = "", site: int = 1, rescheduledays: int = 0, accountid: int = 0, 
-                  defaultcost: int = 0, vat: int = 0, retired: int = 0) -> int:
+                  defaultcost: int = 0, vat: int = 0, retired: int = 0, taxrate: float = 0) -> int:
     t = LOOKUP_TABLES[lookup]
     nid = 0
     if lookup == "basecolour":
@@ -1073,6 +1075,13 @@ def insert_lookup(dbo: Database, username: str, lookup: str, name: str, desc: st
             t[LOOKUP_NAMEFIELD]:    name,
             "IsRetired":            retired
         }, username, setCreated=False)
+    elif lookup == "lktaxrate":
+        return dbo.insert(lookup, {
+            t[LOOKUP_NAMEFIELD]:    name,
+            t[LOOKUP_DESCFIELD]:    desc,
+            "TaxRate":              taxrate,
+            "IsRetired":            retired
+        }, username, setCreated=False)
     elif t[LOOKUP_DESCFIELD] == "":
         # No description
         if t[LOOKUP_MODIFIERS].find("ret") != -1:
@@ -1089,7 +1098,7 @@ def insert_lookup(dbo: Database, username: str, lookup: str, name: str, desc: st
 def update_lookup(dbo: Database, username: str, iid: int, lookup: str, name: str, desc: str = "", 
                   speciesid: int = 0, pfbreed: str = "", pfspecies: str = "", apcolour: str = "", units: str = "", 
                   site: int = 1, rescheduledays: int = 0, accountid: int = 0, 
-                  defaultcost: int = 0, vat: int = 0, retired: int = 0) -> None:
+                  defaultcost: int = 0, vat: int = 0, retired: int = 0, taxrate: float = 0) -> None:
     t = LOOKUP_TABLES[lookup]
     if lookup == "basecolour":
         dbo.update("basecolour", iid, { 
@@ -1163,6 +1172,13 @@ def update_lookup(dbo: Database, username: str, iid: int, lookup: str, name: str
             dbo.execute("UPDATE owner SET AdditionalFlags = %s WHERE AdditionalFlags LIKE ?" % dbo.sql_replace("AdditionalFlags"), (f"{oldflag}|", f"{newflag}|", f"%{oldflag}|%"))
         elif lookup == "lkanimalflags":
             dbo.execute("UPDATE animal SET AdditionalFlags = %s WHERE AdditionalFlags LIKE ?" % dbo.sql_replace("AdditionalFlags"), (f"{oldflag}|", f"{newflag}|", f"%{oldflag}|%"))
+    elif lookup == "lktaxrate":
+        dbo.update(lookup, iid, {
+            t[LOOKUP_NAMEFIELD]:    name,
+            t[LOOKUP_DESCFIELD]:    desc,
+            "TaxRate":              taxrate,
+            "IsRetired":            retired
+        }, username, setLastChanged=False)
     elif t[LOOKUP_DESCFIELD] == "":
         # No description
         if t[LOOKUP_MODIFIERS].find("ret") != -1:
@@ -1265,6 +1281,9 @@ def get_pickup_locations(dbo: Database) -> Results:
 def get_posneg(dbo: Database) -> Results:
     return dbo.query("SELECT * FROM lksposneg ORDER BY Name")
 
+def get_product_types(dbo: Database) -> Results:
+    return dbo.query("SELECT * FROM lkproducttype ORDER BY ProductTypeName")
+
 def get_reservation_statuses(dbo: Database) -> Results:
     return dbo.query("SELECT * FROM reservationstatus ORDER BY StatusName")
 
@@ -1325,13 +1344,19 @@ def get_stock_usage_types(dbo: Database) -> Results:
 def get_trap_types(dbo: Database) -> Results:
     return dbo.query("SELECT * FROM traptype ORDER BY TrapTypeName")
 
+def get_unit_types(dbo: Database) -> Results:
+    return dbo.query("SELECT * FROM lksunittype ORDER BY ID")
+
 def get_urgencies(dbo: Database) -> Results:
     return dbo.query("SELECT * FROM lkurgency ORDER BY ID")
 
 def get_urgency_name(dbo: Database, uid: int) -> str:
     if id is None: return ""
     return dbo.query_string("SELECT Urgency FROM lkurgency WHERE ID = ?", [uid])
 
+def get_tax_rates(dbo: Database) -> Results:
+    return dbo.query("SELECT * FROM lktaxrate ORDER BY TaxRateName")
+
 def get_test_types(dbo: Database) -> Results:
     return dbo.query("SELECT * FROM testtype ORDER BY TestName")
 

src/asm3/person.py

@@ -642,7 +642,8 @@ def get_person_find_simple(dbo: Database, query: str, username: str = "", classf
         "member":           " AND o.IsMember = 1",
         "donor":            " AND o.IsDonor = 1",
         "driver":           " AND o.IsDriver = 1",
-        "sponsor":          " AND o.IsSponsor = 1"
+        "sponsor":          " AND o.IsSponsor = 1",
+        "supplier":         " AND o.IsSupplier = 1"
     }
     typefilters = {
         "":             "",
@@ -723,6 +724,7 @@ def get_person_find_advanced(dbo: Database, criteria: Dict[str, str], username:
             elif flag == "giftaid": ss.ands.append("o.IsGiftAid=1")
             elif flag == "vet": ss.ands.append("o.IsVet=1")
             elif flag == "volunteer": ss.ands.append("o.IsVolunteer=1")
+            elif flag == "supplier": ss.ands.append("o.IsSupplier=1")
             elif flag == "padopter": ss.ands.append("EXISTS(SELECT OwnerID FROM adoption WHERE OwnerID = o.ID AND MovementType=1)")
             else: 
                 ss.ands.append("LOWER(o.AdditionalFlags) LIKE ?")
@@ -1098,6 +1100,7 @@ def insert_person_from_form(dbo: Database, post: PostedData, username: str, geoc
         "IsVet":                    0,
         "IsGiftAid":                0,
         "IsSponsor":                0,
+        "IsSupplier":               0,
         "AdditionalFlags":          "|"
     }, username, generateID=False)
 
@@ -1310,6 +1313,7 @@ def bi(b):
     retailer = bi("retailer" in flags)
     vet = bi("vet" in flags)
     giftaid = bi("giftaid" in flags)
+    supplier = bi("supplier" in flags)
     excludefrombulkemail = bi("excludefrombulkemail" in flags)
     sponsor = bi("sponsor" in flags)
     flagstr = "|".join(sorted(flags)) + "|"
@@ -1342,6 +1346,7 @@ def bi(b):
         "IsVet":                    vet,
         "IsSponsor":                sponsor,
         "IsGiftAid":                giftaid,
+        "IsSupplier":               supplier,
         "AdditionalFlags":          flagstr
     }, username)
 
@@ -2044,11 +2049,12 @@ def update_check_flags(dbo: Database) -> str:
         "retailer": "IsRetailer",
         "vet": "IsVet",
         "giftaid": "IsGiftAid",
-        "sponsor": "IsSponsor"
+        "sponsor": "IsSponsor",
+        "supplier": "IsSupplier"
     }
     people = dbo.query("SELECT ID, AdditionalFlags, ExcludeFromBulkEmail, IDCheck, IsBanned, IsDangerous, IsVolunteer, " \
         "IsHomeChecker, IsMember, IsAdopter, IsAdoptionCoordinator, IsDonor, IsDriver, " \
-        "IsShelter, IsACO, IsStaff, IsFosterer, IsRetailer, IsVet, IsGiftAid, IsSponsor FROM owner ORDER BY ID")
+        "IsShelter, IsACO, IsStaff, IsFosterer, IsRetailer, IsVet, IsGiftAid, IsSponsor, IsSupplier FROM owner ORDER BY ID")
     lookupflags = [x["FLAG"] for x in dbo.query("SELECT Flag from lkownerflags ORDER BY Flag")]
     batch = []
     asm3.asynctask.set_progress_max(dbo, len(people))
@@ -2118,7 +2124,7 @@ def remove_people_only_cancelled_reserve(dbo: Database, years: int = None, usern
         return
     cutoff = dbo.today(offset=-365 * retainyears)
     people = dbo.query("SELECT ID FROM owner WHERE "
-        "MatchActive=0 AND IsACO=0 AND IsAdoptionCoordinator=0 AND IsRetailer=0 AND IsHomeChecker=0 AND IsMember=0 AND IsDriver=0 " \
+        "MatchActive=0 AND IsACO=0 AND IsAdoptionCoordinator=0 AND IsRetailer=0 AND IsHomeChecker=0 AND IsMember=0 AND IsDriver=0 AND IsSupplier=0 " \
         "AND IsShelter=0 AND IsFosterer=0 AND IsStaff=0 AND IsVet=0 AND IsVolunteer=0 AND IsAdopter=0 AND IsBanned=0 " \
         "AND EXISTS(SELECT ID FROM adoption WHERE OwnerID = owner.ID AND MovementType = 0) " \
         "AND NOT EXISTS(SELECT ID FROM adoption WHERE OwnerID = owner.ID AND MovementType > 0) " \
@@ -2162,7 +2168,7 @@ def update_anonymise_personal_data(dbo: Database, years: int = None, username: s
     people = dbo.query_named_params("SELECT ID FROM owner " \
         "WHERE OwnerSurname <> :anonymised AND CreatedDate <= :cutoff " \
         "AND IsACO=0 AND IsAdoptionCoordinator=0 AND IsRetailer=0 AND IsHomeChecker=0 AND IsMember=0 AND IsDriver=0 " \
-        f"AND IsShelter=0 AND IsFosterer=0 AND IsStaff=0 AND IsVet=0 AND IsVolunteer=0 {adopterclause} " \
+        f"AND IsShelter=0 AND IsFosterer=0 AND IsStaff=0 AND IsVet=0 AND IsVolunteer=0 AND IsSupplier=0 {adopterclause} " \
         "AND NOT EXISTS(SELECT ID FROM animal WHERE (OriginalOwnerID = owner.ID OR BroughtInByOwnerID = owner.ID) AND DateBroughtIn > :cutoff) " \
         "AND NOT EXISTS(SELECT ID FROM animalboarding WHERE OwnerID = owner.ID AND OutDateTime > :cutoff) " \
         "AND NOT EXISTS(SELECT ID FROM animalcontrol WHERE (CallerID = owner.ID OR VictimID = owner.ID OR OwnerID = owner.ID OR Owner2ID = owner.ID OR Owner3ID = owner.ID) AND IncidentDateTime > :cutoff) " \