Skip to content

Commit

Permalink
Merge pull request #320 from yrestom/version-13-hotfix
Browse files Browse the repository at this point in the history
Version 3.6.0
  • Loading branch information
yrestom authored Jun 5, 2023
2 parents 84360d2 + 363a94b commit 0c59447
Show file tree
Hide file tree
Showing 7 changed files with 375 additions and 126 deletions.
2 changes: 1 addition & 1 deletion posawesome/__init__.py
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.1"
__version__ = "3.6.0"


def console(*data):
Expand Down
110 changes: 108 additions & 2 deletions posawesome/fixtures/custom_field.json
Original file line number Diff line number Diff line change
Expand Up @@ -438,7 +438,7 @@
"dt": "Batch",
"fetch_from": null,
"fetch_if_empty": 0,
"fieldname": "posa_btach_price",
"fieldname": "posa_batch_price",
"fieldtype": "Float",
"hidden": 0,
"hide_border": 0,
Expand All @@ -455,7 +455,7 @@
"length": 0,
"mandatory_depends_on": null,
"modified": "2020-10-26 02:31:58.913688",
"name": "Batch-posa_btach_price",
"name": "Batch-posa_batch_price",
"no_copy": 0,
"non_negative": 0,
"options": null,
Expand Down Expand Up @@ -3550,6 +3550,112 @@
"unique": 0,
"width": null
},
{
"allow_in_quick_entry": 0,
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"collapsible_depends_on": null,
"columns": 0,
"default": null,
"depends_on": null,
"description": null,
"docstatus": 0,
"doctype": "Custom Field",
"dt": "POS Profile",
"fetch_from": null,
"fetch_if_empty": 0,
"fieldname": "posa_limit_search",
"fieldtype": "Check",
"hidden": 0,
"hide_border": 0,
"hide_days": 0,
"hide_seconds": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_global_search": 0,
"in_list_view": 0,
"in_preview": 0,
"in_standard_filter": 0,
"insert_after": "posa_search_serial_no",
"label": "Limit Search Result",
"length": 0,
"mandatory_depends_on": null,
"modified": "2020-10-30 03:54:32.270370",
"name": "POS Profile-posa_limit_search",
"no_copy": 0,
"non_negative": 0,
"options": null,
"parent": null,
"parentfield": null,
"parenttype": null,
"permlevel": 0,
"precision": "",
"print_hide": 0,
"print_hide_if_no_value": 0,
"print_width": null,
"read_only": 0,
"read_only_depends_on": null,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
"translatable": 0,
"unique": 0,
"width": null
},
{
"allow_in_quick_entry": 0,
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"collapsible_depends_on": null,
"columns": 0,
"default": "500",
"depends_on": "eval:(doc.posa_limit_search)",
"description": "For best performance keep this under 1500",
"docstatus": 0,
"doctype": "Custom Field",
"dt": "POS Profile",
"fetch_from": null,
"fetch_if_empty": 0,
"fieldname": "posa_search_limit",
"fieldtype": "Int",
"hidden": 0,
"hide_border": 0,
"hide_days": 0,
"hide_seconds": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_global_search": 0,
"in_list_view": 0,
"in_preview": 0,
"in_standard_filter": 0,
"insert_after": "posa_limit_search",
"label": "Set the limit number for the search result",
"length": 0,
"mandatory_depends_on": null,
"modified": "2020-10-30 03:54:32.270370",
"name": "POS Profile-posa_search_limit",
"no_copy": 0,
"non_negative": 0,
"options": null,
"parent": null,
"parentfield": null,
"parenttype": null,
"permlevel": 0,
"precision": "",
"print_hide": 0,
"print_hide_if_no_value": 0,
"print_width": null,
"read_only": 0,
"read_only_depends_on": null,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
"translatable": 0,
"unique": 0,
"width": null
},
{
"allow_in_quick_entry": 0,
"allow_on_submit": 0,
Expand Down
2 changes: 1 addition & 1 deletion posawesome/hooks.py
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@
"POS Profile-posa_allow_partial_payment",
"POS Profile-posa_allow_credit_sale",
"POS Profile-posa_pos_awesome_advance_settings",
"Batch-posa_btach_price",
"Batch-posa_batch_price",
"POS Profile-posa_max_discount_allowed",
"POS Profile-posa_allow_return",
"POS Profile-posa_col_1",
Expand Down
Loading

0 comments on commit 0c59447

Please sign in to comment.