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

Fix: Trim the narration of vouchers to remove cruft 

Fix: Do no tabstop on row edit buttons for a more consistent feel.
This commit is contained in:
Amritanshu 2019-04-18 16:04:42 +05:30
parent 403b9a207a
commit 017c828474
10 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
brewman/views/services/voucher/issue.py
View File

@ -11,7 +11,7 @@ def issue_create_voucher(json, user, dbsession):
dt = datetime.datetime.strptime(json["date"], "%d-%b-%Y")
voucher = Voucher(
date=dt,
narration=json["narration"],
narration=json["narration"].strip(),
user_id=user.id,
type=VoucherType.by_name("Issue"),
)
@ -105,7 +105,7 @@ def issue_create_journals(inventories, source, destination):
def issue_update_voucher(voucher, json, user, dbsession):
voucher.date = datetime.datetime.strptime(json["date"], "%d-%b-%Y")
voucher.narration = json["narration"]
voucher.narration = json["narration"].strip()
voucher.user_id = user.id
voucher.last_edit_date = datetime.datetime.utcnow()

4
brewman/views/services/voucher/journal.py
View File

@ -11,7 +11,7 @@ def journal_create_voucher(json, files, user, dbsession):
dt = datetime.datetime.strptime(json["date"], "%d-%b-%Y")
voucher = Voucher(
date=dt,
narration=json["narration"],
narration=json["narration"].strip(),
is_starred=json["isStarred"],
user_id=user.id,
type=VoucherType.by_name(json["type"]),
@ -45,7 +45,7 @@ def journal_create_voucher(json, files, user, dbsession):
def journal_update_voucher(voucher, json, files, user, dbsession):
voucher.date = datetime.datetime.strptime(json["date"], "%d-%b-%Y")
voucher.is_starred = json["isStarred"]
voucher.narration = json["narration"]
voucher.narration = json["narration"].strip()
voucher.user_id = user.id
voucher.posted = False
voucher.last_edit_date = datetime.datetime.utcnow()

4
brewman/views/services/voucher/purchase.py
View File

@ -21,7 +21,7 @@ def purchase_create_voucher(json, files, user, dbsession):
dt = datetime.datetime.strptime(json["date"], "%d-%b-%Y")
voucher = Voucher(
date=dt,
narration=json["narration"],
narration=json["narration"].strip(),
is_starred=json["isStarred"],
user_id=user.id,
type=VoucherType.by_name(json["type"]),
@ -116,7 +116,7 @@ def purchase_create_journals(inventories, account_id, dbsession):
def purchase_update_voucher(voucher, json, files, user, dbsession):
voucher.date = datetime.datetime.strptime(json["date"], "%d-%b-%Y")
voucher.is_starred = json["isStarred"]
voucher.narration = json["narration"]
voucher.narration = json["narration"].strip()
voucher.user_id = user.id
voucher.posted = False
voucher.last_edit_date = datetime.datetime.utcnow()

4
brewman/views/services/voucher/purchase_return.py
View File

@ -19,7 +19,7 @@ def purchase_return_create_voucher(json, files, user, dbsession):
dt = datetime.datetime.strptime(json["date"], "%d-%b-%Y")
voucher = Voucher(
date=dt,
narration=json["narration"],
narration=json["narration"].strip(),
is_starred=json["isStarred"],
user_id=user.id,
type=VoucherType.by_name(json["type"]),
@ -112,7 +112,7 @@ def purchase_return_create_journals(inventories, account_id, dbsession):
def purchase_return_update_voucher(voucher, json, files, user, dbsession):
voucher.date = datetime.datetime.strptime(json["date"], "%d-%b-%Y")
voucher.is_starred = json["isStarred"]
voucher.narration = json["narration"]
voucher.narration = json["narration"].strip()
voucher.user_id = user.id
voucher.posted = False
voucher.last_edit_date = datetime.datetime.utcnow()

4
overlord/src/app/issue/issue.component.html
View File

@ -86,10 +86,10 @@
<ng-container matColumnDef="action">
<mat-header-cell *matHeaderCellDef class="center">Action</mat-header-cell>
<mat-cell *matCellDef="let row" class="center">
<button mat-icon-button (click)="editRow(row)">
<button mat-icon-button tabindex="-1" (click)="editRow(row)">
<mat-icon>edit</mat-icon>
</button>
<button mat-icon-button color="warn" (click)="deleteRow(row)">
<button mat-icon-button tabindex="-1" color="warn" (click)="deleteRow(row)">
<mat-icon>delete</mat-icon>
</button>
</mat-cell>

4
overlord/src/app/journal/journal.component.html
View File

@ -68,10 +68,10 @@
<ng-container matColumnDef="action">
<mat-header-cell *matHeaderCellDef class="center">Action</mat-header-cell>
<mat-cell *matCellDef="let row" class="center">
<button mat-icon-button (click)="editRow(row)">
<button mat-icon-button tabindex="-1" (click)="editRow(row)">
<mat-icon>edit</mat-icon>
</button>
<button mat-icon-button color="warn" (click)="deleteRow(row)">
<button mat-icon-button tabindex="-1" color="warn" (click)="deleteRow(row)">
<mat-icon>delete</mat-icon>
</button>
</mat-cell>

4
overlord/src/app/payment/payment.component.html
View File

@ -70,10 +70,10 @@
<ng-container matColumnDef="action">
<mat-header-cell *matHeaderCellDef class="center">Action</mat-header-cell>
<mat-cell *matCellDef="let row" class="center">
<button mat-icon-button (click)="editRow(row)">
<button mat-icon-button tabindex="-1" (click)="editRow(row)">
<mat-icon>edit</mat-icon>
</button>
<button mat-icon-button color="warn" (click)="deleteRow(row)">
<button mat-icon-button tabindex="-1" color="warn" (click)="deleteRow(row)">
<mat-icon>delete</mat-icon>
</button>
</mat-cell>

4
overlord/src/app/purchase-return/purchase-return.component.html
View File

@ -94,10 +94,10 @@
<ng-container matColumnDef="action">
<mat-header-cell *matHeaderCellDef class="center">Action</mat-header-cell>
<mat-cell *matCellDef="let row" class="center">
<button mat-icon-button (click)="editRow(row)">
<button mat-icon-button tabindex="-1" (click)="editRow(row)">
<mat-icon>edit</mat-icon>
</button>
<button mat-icon-button color="warn" (click)="deleteRow(row)">
<button mat-icon-button tabindex="-1" color="warn" (click)="deleteRow(row)">
<mat-icon>delete</mat-icon>
</button>
</mat-cell>

4
overlord/src/app/purchase/purchase.component.html
View File

@ -106,10 +106,10 @@
<ng-container matColumnDef="action">
<mat-header-cell *matHeaderCellDef class="center">Action</mat-header-cell>
<mat-cell *matCellDef="let row" class="center">
<button mat-icon-button (click)="editRow(row)">
<button mat-icon-button tabindex="-1" (click)="editRow(row)">
<mat-icon>edit</mat-icon>
</button>
<button mat-icon-button color="warn" (click)="deleteRow(row)">
<button mat-icon-button tabindex="-1" color="warn" (click)="deleteRow(row)">
<mat-icon>delete</mat-icon>
</button>
</mat-cell>

4
overlord/src/app/receipt/receipt.component.html
View File

@ -70,10 +70,10 @@
<ng-container matColumnDef="action">
<mat-header-cell *matHeaderCellDef class="center">Action</mat-header-cell>
<mat-cell *matCellDef="let row" class="center">
<button mat-icon-button (click)="editRow(row)">
<button mat-icon-button tabindex="-1" (click)="editRow(row)">
<mat-icon>edit</mat-icon>
</button>
<button mat-icon-button color="warn" (click)="deleteRow(row)">
<button mat-icon-button tabindex="-1" color="warn" (click)="deleteRow(row)">
<mat-icon>delete</mat-icon>
</button>
</mat-cell>