nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-09-14 17:33:09 +00:00
Code Issues Packages Projects Releases Wiki Activity
40,400 Commits 650 Branches 1,810 Tags
096dcf0e54dcaed5bf6fd9050e7da565e08fd440
Commit Graph

411 Commits

Author SHA1 Message Date
mergify[bot]
a0e39db200 fix(pos): creating pos returns resets pricing rules & discounts (#30936) 2022-05-09 17:43:36 +05:30
Saqib Ansari
b01f8555e5 fix(pos): number pad translations 
(cherry picked from commit b1ac5ff9d2)
 2022-04-26 09:18:11 +00:00
Saqib Ansari
edbf5513da fix(pos): search field doesn't reset on checkout 
(cherry picked from commit 03a6103fe5)
 2022-04-26 09:18:11 +00:00
mergify[bot]
e69849d333 fix(pos): cannot change paid amount in pos payments (#30661) 2022-04-09 16:28:25 +05:30
mergify[bot]
b524e657e2 fix(pos): do not reset search input on item selection (backport #30537) 2022-04-04 16:35:46 +05:30
Saqib Ansari
9335578a0b fix: linting errors 2022-04-01 11:02:18 +05:30
Saqib Ansari
76f83ea559 fix(pos): allow validating stock on save 
(cherry picked from commit aff7408775)

# Conflicts:
#	erpnext/accounts/doctype/pos_invoice/pos_invoice.py
 2022-03-31 08:47:13 +00:00
Saqib Ansari
3b583c6c48 fix(pos): specific case when serialized item not removed 
(cherry picked from commit 4afb47e869)
 2022-03-31 08:47:11 +00:00
Saqib Ansari
a3a7dc9ce6 fix(pos): customer group filter in customer selector 
(cherry picked from commit 2f82e237ef)
 2022-03-31 08:47:10 +00:00
Saqib Ansari
bd2061d6f3 fix: prevent multiple save on applying coupon code 
(cherry picked from commit d5fd8e0ba6)
 2022-03-31 08:47:09 +00:00
Ankush Menat
c07713b860 style: bulk format code with black 
v13 port because otherwise backports will result in conflicts always
 2022-03-29 17:29:34 +05:30
Saqib Ansari
f2264fa58d fix(pos): coupon code is applied even if ignore pricing rule is check 
(cherry picked from commit 81514516f3)

# Conflicts:
#	erpnext/public/js/controllers/transaction.js
 2022-02-25 10:06:21 +00:00
Saqib Ansari
8d24cb44a8 fix(pos): removal of coupon code 
(cherry picked from commit fa38c291bd)
 2022-02-21 06:19:24 +00:00
Saqib Ansari
63079f3e07 fix: coupon code is applied even if ignore_pricing_rule is enabled 
(cherry picked from commit 2743999785)
 2022-02-17 10:42:15 +00:00
Saqib Ansari
03248ea483 Merge pull request #29598 from frappe/mergify/bp/version-13-hotfix/pr-29597 
fix(pos): pricing rule on transactions doesn't work (backport #29597)
 2022-02-02 21:45:49 +05:30
Saqib Ansari
e2f5ddb20a fix(pos): pricing rule on transactions doesn't work 
(cherry picked from commit e082e3f702)
 2022-02-02 14:18:46 +00:00
Subin Tom
7815ffb842 fix: remove qty indicator from non stock items 
(cherry picked from commit 845c02a989)
 2022-02-01 11:07:31 +00:00
Subin Tom
c57d184576 fix: sider fix 
(cherry picked from commit 27b35d72e2)
 2022-02-01 11:07:30 +00:00
Subin Tom
8ed2a7bc2c fix: removing get_value call by returning is_stock_item in get_stock_availability method 
(cherry picked from commit ac9a9fb229)
 2022-02-01 11:07:30 +00:00
Subin Tom
15c6b93ee3 fix: Removed validate_non_stock_items, filter_service_items methods 
(cherry picked from commit 9e20fa85c1)
 2022-02-01 11:07:29 +00:00
Subin Tom
0aff20e85c fix: sider issues 
(cherry picked from commit 6b973d658c)
 2022-02-01 11:07:28 +00:00
Subin Tom
75faa151fd fix: Allowing non stock items in POS 
(cherry picked from commit ec37930404)
 2022-02-01 11:07:28 +00:00
mergify[bot]
06c0313a26 fix: POS items added to cart despite low qty (#29141) 2022-01-04 19:20:19 +05:30
mergify[bot]
f4670a86a0 fix: minor issues (#29140) 2022-01-04 19:16:52 +05:30
mergify[bot]
20f9b621e4 feat(pos): Total item qty field to POS screen (backport #28331) 2021-11-29 20:46:47 +05:30
Ankush Menat
fbfaf75b66 chore: remove __future__ py2 compatibility imports 2021-11-25 17:42:24 +05:30
mergify[bot]
b7c63212cd fix: POS Item cart only taxes with amount displayed (#28515) 2021-11-23 11:41:24 +05:30
mergify[bot]
b6b45c6275 fix: POS string translation (#28490) 2021-11-22 13:58:47 +05:30
Saqib
3cac39c584 fix: pos payment mode selection issue (#27409) (#27417) 2021-09-09 19:36:01 +05:30
Chillar Anand
4b2be2999f chore: Cleanup imports (#27320) 
* chore: Added isort to pre-commit config

* chore: Sort imports with isort

* chore: Remove imports with pycln

* chore: Sort imports with isort

* chore: Fix import issues

* chore: Fix sider issues

* chore: linting

* chore: linting / sorting import

from ecommerce refactor merge

* ci: dont allow unused imports

* chore: sort / clean ecommerce imports

Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
 2021-09-03 18:57:43 +05:30
Ankush Menat
1c63cbb1e4 fix: remove duplicate imports 2021-09-01 20:18:45 +05:30
Sun Howwrongbum
63cf012c24 fix: pos payment methods not setting rounded_total (#27251) 2021-08-31 18:26:20 +05:30
Ankush Menat
9bb69e711a chore: whitespace cleanup from codebase 2021-08-19 14:33:03 +05:30
Frappe PR Bot
25b705e2ad fix: sales pipeline graph issue (#26626) (#27018) 
(cherry picked from commit 34353df48c)

Co-authored-by: Anupam Kumar <anupamvns0099@gmail.com>
 2021-08-19 11:46:55 +05:30
Frappe PR Bot
5b5a365aaf fix: POS payment modes displayed wrong total (#26808) 2021-08-05 11:15:16 +05:30
Subin Tom
4597f151f5 fix: POS Item Cart non-stop scroll issue (#26693) 2021-08-02 11:38:31 +05:30
Afshan
9b9b18c286 fix: improving ux for additional discount field (#26502) 2021-07-15 18:11:22 +05:30
Saqib
cbf7e1b676 fix: pos item cart dom updates (#26460) 2021-07-14 11:40:47 +05:30
Saqib
432d8efa3d fix(pos): taxes amount in pos item cart (#26411) 2021-07-12 10:47:40 +05:30
Subin Tom
9ac63da457 fix: value fetching for custom field in POS (#26367) 2021-07-09 14:35:11 +05:30
Saqib Ansari
3b12601461 fix: sider issues 2021-06-24 15:03:04 +05:30
Saqib Ansari
e39c3f2e69 fix: add missing semicolons 2021-06-24 15:02:59 +05:30
Saqib Ansari
ea70f6f933 fix: hide images from cart & details 2021-06-24 15:02:53 +05:30
Saqib Ansari
54cc1dedf2 refactor(pos): use pos invoice item name as unique identifier 2021-06-24 15:02:43 +05:30
Afshan
8c73f6f19e fix(pos): pos loyalty card alignment (#26051) 2021-06-16 14:28:26 +05:30
Saqib
1fd80992d7 fix(pos): 'NoneType' object is not iterable (#26066) 2021-06-16 13:27:34 +05:30
Saqib Ansari
3f32969bee fix(pos): broken image in item details section 2021-06-06 11:18:20 +05:30
Saqib Ansari
bc46a9772d fix(pos): cash shortcuts not working 2021-06-06 11:11:07 +05:30
Saqib Ansari
a85c2c16b4 fix(pos): item rate precision in item selector 2021-06-06 11:07:20 +05:30
Saqib Ansari
311b378328 fix(pos): searching items with barcode or serial no 2021-06-03 12:58:53 +05:30