tanshu/brewman
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Update: to 7.0.4

Browse Source 
Fix: Balance Sheet was showing account in random heads
Fix: Batch was not showing in issue
Fix: At times, the Product Ledger created error on rounding and did not show.
This commit is contained in:
Amritanshu Agrawal 2020-07-16 13:09:22 +05:30
parent ad8a2d2cc3
commit a04cb4cd4d
5 changed files with 21 additions and 21 deletions
brewman
models
master.py
routers
batch.py
schemas
reports.py
overlord
package.json
setup.py

24
brewman/models/master.py

@ -479,18 +479,18 @@ class AccountType:
@classmethod @classmethod
def list(cls): def list(cls):
return [ return [
AccountType(1, "Cash", True, True, "Cash", 10, True), AccountType(1, "Cash", True, True, "Cash", 10000, True),
AccountType(2, "Purchase", False, True, "Operating", 20, True), AccountType(2, "Purchase", False, True, "Operating", 20000, True),
AccountType(3, "Sale", False, False, "Operating", 10, True), AccountType(3, "Sale", False, False, "Operating", 10000, True),
AccountType(4, "Assets", True, True, "Investing", 20, True), AccountType(4, "Assets", True, True, "Investing", 20000, True),
AccountType(5, "Capital", True, False, "Financing", 70, True), AccountType(5, "Capital", True, False, "Financing", 70000, True),
AccountType(6, "Debtors", True, True, "Operating", 30, True), AccountType(6, "Debtors", True, True, "Operating", 30000, True),
AccountType(7, "Expenses", False, True, "Operating", 40, True), AccountType(7, "Expenses", False, True, "Operating", 40000, True),
AccountType(9, "Creditors", True, False, "Operating", 60, True), AccountType(9, "Creditors", True, False, "Operating", 60000, True),
AccountType(10, "Salary", True, True, "Operating", 40, False), AccountType(10, "Salary", True, True, "Operating", 40000, False),
AccountType(11, "Liabilities", True, False, "Operating", 50, True), AccountType(11, "Liabilities", True, False, "Operating", 50000, True),
AccountType(12, "Revenue", False, False, "Operating", 30, True), AccountType(12, "Revenue", False, False, "Operating", 30000, True),
AccountType(13, "Tax", True, False, "Operating", 80, True), AccountType(13, "Tax", True, False, "Operating", 80000, True),
] ]
# list.append(AccountType(8, 'Discount', False, False, True, 30, True)) # list.append(AccountType(8, 'Discount', False, False, True, 30, True))
# list.append(AccountType(14, 'Total', False, False, False, 900, False)) # list.append(AccountType(14, 'Total', False, False, False, 900, False))

2
brewman/routers/batch.py

@ -27,7 +27,7 @@ def batch_term(
filter_ = q if q is not None and q.strip() != "" else None filter_ = q if q is not None and q.strip() != "" else None
date = None if not d else datetime.datetime.strptime(d, "%d-%b-%Y") date = None if not d else datetime.datetime.strptime(d, "%d-%b-%Y")
list_ = [] list_ = []
for index, item in enumerate(Batch.list(filter_, include_nil=False, date=date, dbsession=db)): for index, item in enumerate(Batch.list(filter_, include_nil=False, date=date, db=db)):
text = f"{item.product.name} ({item.product.units}) {item.quantity_remaining:.2f}@{item.rate:.2f} from {item.name.strftime('%d-%b-%Y')}" text = f"{item.product.name} ({item.product.units}) {item.quantity_remaining:.2f}@{item.rate:.2f} from {item.name.strftime('%d-%b-%Y')}"
list_.append( list_.append(
{ {

12
brewman/schemas/reports.py

@ -245,12 +245,12 @@ class ProductLedgerItem(BaseModel):
url: List[str] url: List[str]
type_: str type_: str
narration: str narration: str
debit_quantity: Optional[Decimal] = Field(multiple_of=0.01) debit_quantity: Optional[Decimal]
debit_amount: Optional[Decimal] = Field(multiple_of=0.01) debit_amount: Optional[Decimal]
credit_quantity: Optional[Decimal] = Field(multiple_of=0.01) credit_quantity: Optional[Decimal]
credit_amount: Optional[Decimal] = Field(multiple_of=0.01) credit_amount: Optional[Decimal]
running_quantity: Decimal = Field(multiple_of=0.01) running_quantity: Decimal
running_amount: Decimal = Field(multiple_of=0.01) running_amount: Decimal
posted: bool posted: bool
@validator("date_", pre=True) @validator("date_", pre=True)

2
overlord/package.json

@ -1,6 +1,6 @@
{ {
"name": "overlord", "name": "overlord",
"version": "7.0.3", "version": "7.0.4",
"scripts": { "scripts": {
"ng": "ng", "ng": "ng",
"start": "ng serve", "start": "ng serve",

2
setup.py

@ -11,7 +11,7 @@ with open(os.path.join(here, 'requirements.txt'), "r") as r:
requires = r.read().splitlines() requires = r.read().splitlines()
setup(name='brewman', setup(name='brewman',
version='7.0.3', version='7.0.4',
description='brewman', description='brewman',
long_description=README + '\n\n' + CHANGES, long_description=README + '\n\n' + CHANGES,
classifiers=[ classifiers=[