Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
45,624 Commits 3 Branches 0 Tags 1 GiB
3df0c5e32f
Commit Graph

340 Commits

Author SHA1 Message Date
mergify[bot]
78fbd6452b
fix: unsupported operand type(s) for //: 'float' and 'NoneType' for POS Barcode search (#35710) 
* fix: unsupported operand type(s) for //: 'float' and 'NoneType' for POS Barcode search (#35710)

(cherry picked from commit 58a6bbcf6d95f59821484ff29b585c10529a0fe4)

# Conflicts:
#	erpnext/selling/page/point_of_sale/point_of_sale.py

* chore: resolve conflicts

---------

Co-authored-by: Vishal Dhayagude <vishdha@users.noreply.github.com>
Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
 2023-06-19 09:14:43 +05:30
Rohit Waghchaure
1c2fe085b5 fix: test case and removed outward field 2023-06-15 12:56:41 +05:30
Rohit Waghchaure
c1132d1e6d fix: serial and batch selector and added deprecated decorator 2023-06-02 17:14:16 +05:30
Rohit Waghchaure
0eaf6de5de feat: serial and batch bundle for POS 2023-06-02 17:14:16 +05:30
Vishal Dhayagude
59f3fedbf7
fix: batch qty conversion factor issue fixed in pos transaction (#34917) 2023-04-19 15:57:28 +05:30
Shram Kadia
0cd870fc29
fix: get batch_no. for item automatically (#34473) 
* fix: default pos conversion factor set to 1

* fix:get-batch-no-of-item-automatically
 2023-03-24 12:05:26 +05:30
Shram Kadia
08fc686513
fix: default pos conversion factor set to 1 (#34437) 2023-03-21 15:51:18 +05:30
Vishal
f18ae5856f chore: minor changes in pos_controller 2023-02-28 11:03:26 +05:30
Vishal
1de531e56e fix: multiple pos conversion issue resolved 2023-02-28 11:03:25 +05:30
Richard Case
a0eb5e5535
fix: add payment hook to point of sale JS (#33988) 2023-02-11 20:40:15 +05:30
Sabu Siyad
9e50aa4833
feat(pos): multiple item prices (#33005) 
* fix(pos): multiple item prices

feat: show uom with product price
feat: multiple item (variant) depending on uom

Signed-off-by: Sabu Siyad <hello@ssiyad.com>

* feat(pos): consider uom for new item

Signed-off-by: Sabu Siyad <hello@ssiyad.com>

* feat(pos): uom based stock display

Signed-off-by: Sabu Siyad <hello@ssiyad.com>

* use `//` instead of `math.floor()`

Signed-off-by: Sabu Siyad <hello@ssiyad.com>

* feat(pos): uom by barcode

Signed-off-by: Sabu Siyad <hello@ssiyad.com>

* fix: replace `is not` with `!=`

Signed-off-by: Sabu Siyad <hello@ssiyad.com>

* fix(pos): barcode_info `next()`: fallback

Signed-off-by: Sabu Siyad <hello@ssiyad.com>

* chore: format

Signed-off-by: Sabu Siyad <hello@ssiyad.com>

* Update erpnext/selling/page/point_of_sale/point_of_sale.py

Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>

* chore: un-ignore unused local variable

Signed-off-by: Sabu Siyad <hello@ssiyad.com>

---------

Signed-off-by: Sabu Siyad <hello@ssiyad.com>
Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
 2023-01-28 10:28:31 +05:30
Sabu Siyad
2f4940cc26
fix(pos): item selector image border radius 
Signed-off-by: Sabu Siyad <hello@ssiyad.com>
 2022-11-17 13:21:47 +05:30
Ankush Menat
c013db6ea1
fix: cast POS query inputs to integers (#32975) 
fix: cast POS query inputs to integers
 2022-11-15 18:10:45 +05:30
Maharshi Patel
1328a45f2a fix: Create POS Opening Entry POS Profile filter. 
pos_profile_query was variable instead of function.
 2022-11-04 15:29:17 +05:30
Maharshi Patel
e392ea1104 fix: POS properly validate stock for bundle products 
Stock availability was not calculated properly for Product Bundle with non stock item so i have added logic to properly calculate that as well.
 2022-09-27 23:44:56 +05:30
ruthra kumar
3b4c0a3fc0
fix(minor): don't print tax rate if its '0' (#31838) 2022-08-16 16:35:46 +05:30
ruthra kumar
bb40e38451 fix: limit pos recent order page result 2022-08-09 19:35:43 +05:30
Deepesh Garg
80b354f1c7
Merge pull request #31656 from ruthra-kumar/use_current_profile_in_pos_return 
fix: use current pos profile on sales return
 2022-07-22 13:10:53 +05:30
Saqib Ansari
2eaa8b17bd
fix(pos): validate product bundles while submitting pos invoice (#31615) 2022-07-21 12:17:58 +05:30
ruthra kumar
5b85af5f1a fix: use current pos profile on sales return 2022-07-21 12:16:16 +05:30
Conor
00ef499739
refactor: use db independent offset syntax (#31345) 
* chore: use db independent offset syntax

* fix: typo

* style: reformat code to black spec

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2022-06-14 10:49:07 +05:30
Saqib Ansari
867494edad
fix(pos): creating pos returns resets pricing rules & discounts (#30935) 2022-05-09 15:05:05 +05:30
Saqib Ansari
b1ac5ff9d2 fix(pos): number pad translations 2022-04-26 14:41:36 +05:30
Saqib Ansari
03a6103fe5 fix(pos): search field doesn't reset on checkout 2022-04-26 14:28:33 +05:30
mergify[bot]
51d77cd85e
fix(pos): cannot change paid amount in pos payments (#30660) 2022-04-09 16:28:10 +05:30
Saqib Ansari
fed66038b5
fix(pos): do not reset search input on item selection (#30537) 2022-04-04 15:59:16 +05:30
Ankush Menat
47f27a5171 refactor: move scan api to stock utils; add item_info 2022-04-01 21:11:03 +05:30
Ankush Menat
767b827b59 feat: return batch code while scanning serial no 2022-04-01 21:11:03 +05:30
Ankush Menat
494bd9ef78 style: format code with black 2022-03-28 18:52:46 +05:30
Saqib Ansari
aff7408775 fix(pos): allow validating stock on save 2022-03-21 14:08:56 +05:30
Saqib Ansari
4afb47e869 fix(pos): specific case when serialized item not removed 2022-03-21 13:24:11 +05:30
Saqib Ansari
2f82e237ef fix(pos): customer group filter in customer selector 2022-03-21 12:47:35 +05:30
Saqib Ansari
d5fd8e0ba6 fix: prevent multiple save on applying coupon code 2022-03-21 11:36:30 +05:30
Saqib Ansari
81514516f3 fix(pos): coupon code is applied even if ignore pricing rule is check 2022-02-25 15:18:06 +05:30
Saqib Ansari
fa38c291bd fix(pos): removal of coupon code 2022-02-21 11:38:16 +05:30
Saqib Ansari
2743999785 fix: coupon code is applied even if ignore_pricing_rule is enabled 2022-02-17 16:03:43 +05:30
Saqib Ansari
e082e3f702 fix(pos): pricing rule on transactions doesn't work 2022-02-02 19:33:48 +05:30
Saqib Ansari
4557b6a150
Merge branch 'develop' into pos-service-items 2022-02-01 12:25:25 +05:30
Subin Tom
845c02a989 fix: remove qty indicator from non stock items 2022-01-17 20:49:11 +05:30
Subin Tom
27b35d72e2 fix: sider fix 2022-01-17 19:53:39 +05:30
Subin Tom
ac9a9fb229 fix: removing get_value call by returning is_stock_item in get_stock_availability method 2022-01-17 19:38:05 +05:30
Subin Tom
19bb01c973
fix: POS items added to cart despite low qty (#29126) 2022-01-04 19:14:40 +05:30
Saqib Ansari
f4db474be0
fix: minor issues (#29130) 2022-01-04 19:12:19 +05:30
Subin Tom
9e20fa85c1 fix: Removed validate_non_stock_items, filter_service_items methods 2022-01-03 14:46:53 +05:30
Subin Tom
6b973d658c
fix: sider issues 2022-01-03 10:47:13 +05:30
Subin Tom
ec37930404 fix: Allowing non stock items in POS 2021-12-22 19:14:47 +05:30
Subin Tom
2f6a6afaa8
feat(pos): Total item qty field to POS screen (#28331) 2021-11-29 20:35:49 +05:30
Subin Tom
1909bb569e
fix: POS Item cart only taxes with amount displayed (#28501) 2021-11-23 10:35:43 +05:30
Subin Tom
fce4f34325
fix: POS string translation (#28381) 2021-11-22 13:34:26 +05:30
Ankush Menat
6098e92ba9 chore: remove utf-8 compat code 2021-11-05 11:16:29 +05:30