Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Version 13 hotfix #261

Merged
merged 4 commits into from
Mar 11, 2023
Merged

Version 13 hotfix #261

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e58add7
chore: clean up the code
yrestom Mar 11, 2023
c5a2103
fix: Unknown column 'batch_no' in 'where clause' #260
yrestom Mar 11, 2023
baa6fac
fix: Duplicate key price list #252
yrestom Mar 11, 2023
4c6462a
Version: 3.5.1
yrestom Mar 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion posawesome/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
from __future__ import unicode_literals
import frappe

__version__ = "3.5.0"
__version__ = "3.5.1"


def console(*data):
Expand Down
6 changes: 4 additions & 2 deletions posawesome/posawesome/api/posapp.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -805,9 +805,11 @@ def get_item_detail(item, doc=None, warehouse=None, price_list=None):
item = json.loads(item)
item_code = item.get("item_code")
if warehouse and item.get("has_batch_no") and not item.get("batch_no"):
item["batch_no"] = get_batch_no(
batch_no = get_batch_no(
item_code, warehouse, item.get("qty"), False, item.get("d")
)
if batch_no:
item["batch_no"] = batch_no.get("batch_no")
item["selling_price_list"] = price_list
max_discount = frappe.get_value("Item", item_code, "max_discount")
res = get_item_details(
Expand Down Expand Up @@ -1517,7 +1519,7 @@ def set_payment_schedule(doc):
base_payment_amount=base_grand_total,
)
doc.append("payment_schedule", data)
frappe.msgprint(str(doc.outstanding_amount))

for d in doc.get("payment_schedule"):
if d.invoice_portion:
d.payment_amount = flt(
Expand Down
1 change: 0 additions & 1 deletion posawesome/public/js/posapp/components/pos/Invoice.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1399,7 +1399,6 @@ export default {
currency: this.pos_profile.currency,
// plc_conversion_rate: 1,
pos_profile: this.pos_profile.name,
price_list: this.pos_profile.selling_price_list,
uom: item.uom,
tax_category: '',
transaction_type: 'selling',
Expand Down