Compare commits
4 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| c26f433182 | |||
| 84728eb037 | |||
| c0458ed96e | |||
| b62bf1bcca |
@ -1 +1 @@
|
||||
__version__ = "11.3.0"
|
||||
__version__ = "11.3.1"
|
||||
|
||||
@ -2,12 +2,12 @@ from datetime import date, datetime
|
||||
from decimal import Decimal
|
||||
|
||||
from pydantic import (
|
||||
BaseModel,
|
||||
ConfigDict,
|
||||
FieldSerializationInfo,
|
||||
field_serializer,
|
||||
field_validator,
|
||||
)
|
||||
from pydantic.main import BaseModel
|
||||
|
||||
from . import to_camel
|
||||
|
||||
|
||||
@ -4,12 +4,12 @@ from datetime import date, datetime
|
||||
from decimal import Decimal
|
||||
|
||||
from pydantic import (
|
||||
BaseModel,
|
||||
ConfigDict,
|
||||
FieldSerializationInfo,
|
||||
field_serializer,
|
||||
field_validator,
|
||||
)
|
||||
from pydantic.main import BaseModel
|
||||
|
||||
from . import to_camel
|
||||
|
||||
|
||||
@ -2,12 +2,12 @@ from datetime import date, datetime
|
||||
from decimal import Decimal
|
||||
|
||||
from pydantic import (
|
||||
BaseModel,
|
||||
ConfigDict,
|
||||
FieldSerializationInfo,
|
||||
field_serializer,
|
||||
field_validator,
|
||||
)
|
||||
from pydantic.main import BaseModel
|
||||
|
||||
from . import to_camel
|
||||
|
||||
|
||||
@ -3,12 +3,12 @@ import uuid
|
||||
from datetime import datetime
|
||||
|
||||
from pydantic import (
|
||||
BaseModel,
|
||||
ConfigDict,
|
||||
FieldSerializationInfo,
|
||||
field_serializer,
|
||||
field_validator,
|
||||
)
|
||||
from pydantic.main import BaseModel
|
||||
|
||||
from . import to_camel
|
||||
|
||||
|
||||
@ -4,12 +4,12 @@ from datetime import date, datetime
|
||||
from decimal import Decimal
|
||||
|
||||
from pydantic import (
|
||||
BaseModel,
|
||||
ConfigDict,
|
||||
FieldSerializationInfo,
|
||||
field_serializer,
|
||||
field_validator,
|
||||
)
|
||||
from pydantic.main import BaseModel
|
||||
|
||||
from . import to_camel
|
||||
from .cost_centre import CostCentreLink
|
||||
|
||||
@ -4,12 +4,12 @@ from datetime import date, datetime
|
||||
from decimal import Decimal
|
||||
|
||||
from pydantic import (
|
||||
BaseModel,
|
||||
ConfigDict,
|
||||
FieldSerializationInfo,
|
||||
field_serializer,
|
||||
field_validator,
|
||||
)
|
||||
from pydantic.main import BaseModel
|
||||
|
||||
from . import to_camel
|
||||
|
||||
|
||||
@ -4,12 +4,12 @@ from datetime import date, datetime
|
||||
from decimal import Decimal
|
||||
|
||||
from pydantic import (
|
||||
BaseModel,
|
||||
ConfigDict,
|
||||
FieldSerializationInfo,
|
||||
field_serializer,
|
||||
field_validator,
|
||||
)
|
||||
from pydantic.main import BaseModel
|
||||
|
||||
from . import to_camel
|
||||
from .account import AccountLink
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
from pydantic.main import BaseModel
|
||||
from pydantic import BaseModel
|
||||
|
||||
|
||||
class Message(BaseModel):
|
||||
|
||||
@ -2,12 +2,12 @@ from datetime import date, datetime
|
||||
from decimal import Decimal
|
||||
|
||||
from pydantic import (
|
||||
BaseModel,
|
||||
ConfigDict,
|
||||
FieldSerializationInfo,
|
||||
field_serializer,
|
||||
field_validator,
|
||||
)
|
||||
from pydantic.main import BaseModel
|
||||
|
||||
from . import to_camel
|
||||
|
||||
|
||||
@ -2,12 +2,12 @@ from datetime import date, datetime
|
||||
from decimal import Decimal
|
||||
|
||||
from pydantic import (
|
||||
BaseModel,
|
||||
ConfigDict,
|
||||
FieldSerializationInfo,
|
||||
field_serializer,
|
||||
field_validator,
|
||||
)
|
||||
from pydantic.main import BaseModel
|
||||
|
||||
from . import to_camel
|
||||
|
||||
|
||||
@ -1,8 +1,7 @@
|
||||
import uuid
|
||||
|
||||
from brewman.schemas import to_camel
|
||||
from pydantic import ConfigDict
|
||||
from pydantic.main import BaseModel
|
||||
from pydantic import BaseModel, ConfigDict
|
||||
|
||||
|
||||
class PermissionItem(BaseModel):
|
||||
|
||||
@ -4,12 +4,12 @@ from datetime import date, datetime
|
||||
from decimal import Decimal
|
||||
|
||||
from pydantic import (
|
||||
BaseModel,
|
||||
ConfigDict,
|
||||
FieldSerializationInfo,
|
||||
field_serializer,
|
||||
field_validator,
|
||||
)
|
||||
from pydantic.main import BaseModel
|
||||
|
||||
from . import to_camel
|
||||
from .product import ProductLink
|
||||
|
||||
@ -2,12 +2,12 @@ from datetime import date, datetime
|
||||
from decimal import Decimal
|
||||
|
||||
from pydantic import (
|
||||
BaseModel,
|
||||
ConfigDict,
|
||||
FieldSerializationInfo,
|
||||
field_serializer,
|
||||
field_validator,
|
||||
)
|
||||
from pydantic.main import BaseModel
|
||||
|
||||
from . import to_camel
|
||||
|
||||
|
||||
@ -2,12 +2,12 @@ from datetime import date, datetime
|
||||
from decimal import Decimal
|
||||
|
||||
from pydantic import (
|
||||
BaseModel,
|
||||
ConfigDict,
|
||||
FieldSerializationInfo,
|
||||
field_serializer,
|
||||
field_validator,
|
||||
)
|
||||
from pydantic.main import BaseModel
|
||||
|
||||
from . import to_camel
|
||||
|
||||
|
||||
@ -2,12 +2,12 @@ from datetime import date, datetime
|
||||
from decimal import Decimal
|
||||
|
||||
from pydantic import (
|
||||
BaseModel,
|
||||
ConfigDict,
|
||||
FieldSerializationInfo,
|
||||
field_serializer,
|
||||
field_validator,
|
||||
)
|
||||
from pydantic.main import BaseModel
|
||||
|
||||
from . import to_camel
|
||||
|
||||
|
||||
@ -4,12 +4,12 @@ from datetime import date, datetime
|
||||
from decimal import Decimal
|
||||
|
||||
from pydantic import (
|
||||
BaseModel,
|
||||
ConfigDict,
|
||||
FieldSerializationInfo,
|
||||
field_serializer,
|
||||
field_validator,
|
||||
)
|
||||
from pydantic.main import BaseModel
|
||||
|
||||
from . import to_camel
|
||||
|
||||
|
||||
@ -3,12 +3,12 @@ import uuid
|
||||
from datetime import date, datetime
|
||||
|
||||
from pydantic import (
|
||||
BaseModel,
|
||||
ConfigDict,
|
||||
FieldSerializationInfo,
|
||||
field_serializer,
|
||||
field_validator,
|
||||
)
|
||||
from pydantic.main import BaseModel
|
||||
|
||||
from . import to_camel
|
||||
|
||||
|
||||
@ -4,12 +4,12 @@ from datetime import date, datetime
|
||||
from decimal import Decimal
|
||||
|
||||
from pydantic import (
|
||||
BaseModel,
|
||||
ConfigDict,
|
||||
FieldSerializationInfo,
|
||||
field_serializer,
|
||||
field_validator,
|
||||
)
|
||||
from pydantic.main import BaseModel
|
||||
|
||||
from . import to_camel
|
||||
from .account import AccountLink
|
||||
|
||||
@ -1,8 +1,7 @@
|
||||
import uuid
|
||||
|
||||
from brewman.schemas import to_camel
|
||||
from pydantic import ConfigDict, Field
|
||||
from pydantic.main import BaseModel
|
||||
from pydantic import BaseModel, ConfigDict, Field
|
||||
|
||||
from .permission import PermissionItem
|
||||
|
||||
|
||||
@ -4,12 +4,12 @@ from datetime import date, datetime
|
||||
from decimal import Decimal
|
||||
|
||||
from pydantic import (
|
||||
BaseModel,
|
||||
ConfigDict,
|
||||
FieldSerializationInfo,
|
||||
field_serializer,
|
||||
field_validator,
|
||||
)
|
||||
from pydantic.main import BaseModel
|
||||
|
||||
from . import to_camel
|
||||
|
||||
|
||||
@ -2,12 +2,12 @@ from datetime import date, datetime
|
||||
from decimal import Decimal
|
||||
|
||||
from pydantic import (
|
||||
BaseModel,
|
||||
ConfigDict,
|
||||
FieldSerializationInfo,
|
||||
field_serializer,
|
||||
field_validator,
|
||||
)
|
||||
from pydantic.main import BaseModel
|
||||
|
||||
from . import to_camel
|
||||
|
||||
|
||||
@ -3,13 +3,13 @@ import uuid
|
||||
from datetime import datetime
|
||||
|
||||
from pydantic import (
|
||||
BaseModel,
|
||||
ConfigDict,
|
||||
Field,
|
||||
FieldSerializationInfo,
|
||||
field_serializer,
|
||||
field_validator,
|
||||
)
|
||||
from pydantic.main import BaseModel
|
||||
|
||||
from . import to_camel
|
||||
from .role import RoleItem
|
||||
|
||||
@ -1,13 +1,13 @@
|
||||
[tool.poetry]
|
||||
name = "brewman"
|
||||
version = "11.3.0"
|
||||
version = "11.3.1"
|
||||
description = "Accounting plus inventory management for a restaurant."
|
||||
authors = ["tanshu <git@tanshu.com>"]
|
||||
|
||||
[tool.poetry.dependencies]
|
||||
python = "^3.11"
|
||||
uvicorn = {extras = ["standard"], version = "^0.23.2"}
|
||||
fastapi = {extras = ["all"], version = "^0.101.0"}
|
||||
fastapi = {extras = ["all"], version = "^0.101.1"}
|
||||
python-jose = {extras = ["cryptography"], version = "^3.3.0"}
|
||||
passlib = {extras = ["bcrypt"], version = "^1.7.4"}
|
||||
psycopg2-binary = "^2.9.7"
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "overlord",
|
||||
"version": "11.3.0",
|
||||
"version": "11.3.1",
|
||||
"scripts": {
|
||||
"ng": "ng",
|
||||
"start": "ng serve",
|
||||
|
||||
@ -95,13 +95,13 @@ export class LedgerComponent implements OnInit, AfterViewInit {
|
||||
this.running = 0;
|
||||
this.info.body.forEach((item) => {
|
||||
if (item.type !== 'Opening Balance') {
|
||||
this.debit += item.debit;
|
||||
this.credit += item.credit;
|
||||
this.debit += +item.debit;
|
||||
this.credit += +item.credit;
|
||||
if (item.posted) {
|
||||
this.running += item.debit - item.credit;
|
||||
this.running += +item.debit - +item.credit;
|
||||
}
|
||||
} else {
|
||||
this.running += item.debit - item.credit;
|
||||
this.running += +item.debit - +item.credit;
|
||||
}
|
||||
item.running = this.running;
|
||||
});
|
||||
|
||||
@ -2,5 +2,5 @@ export const environment = {
|
||||
production: true,
|
||||
// eslint-disable-next-line @typescript-eslint/naming-convention
|
||||
ACCESS_TOKEN_REFRESH_MINUTES: 10, // refresh token 10 minutes before expiry
|
||||
version: '11.3.0',
|
||||
version: '11.3.1',
|
||||
};
|
||||
|
||||
@ -6,7 +6,7 @@ export const environment = {
|
||||
production: false,
|
||||
// eslint-disable-next-line @typescript-eslint/naming-convention
|
||||
ACCESS_TOKEN_REFRESH_MINUTES: 10, // refresh token 10 minutes before expiry
|
||||
version: '11.3.0',
|
||||
version: '11.3.1',
|
||||
};
|
||||
|
||||
/*
|
||||
|
||||
Reference in New Issue
Block a user