Nabin Hait
|
cf72d7f135
|
Fixed merge conflict
|
2018-02-22 14:47:26 +05:30 |
|
rohitwaghchaure
|
554f2de23d
|
Code cleanup online POS (#12985)
|
2018-02-20 11:18:01 +05:30 |
|
rohitwaghchaure
|
7e75165826
|
Merge branch 'develop' into fixes_12829
|
2018-02-09 12:01:41 +05:30 |
|
pawan
|
735b8c6094
|
[fix] #12829
|
2018-02-08 16:20:46 +05:30 |
|
Saurabh
|
ab8c7e616e
|
resolved merge conflicts
|
2018-02-08 15:17:15 +05:30 |
|
Saurabh
|
056c1709c6
|
Fixes #12810
|
2018-02-08 00:22:53 +05:30 |
|
Nabin Hait
|
c224d34a2c
|
Merge branch 'master' into develop
|
2018-02-07 16:07:20 +05:30 |
|
rohitwaghchaure
|
a4c40e0fd6
|
[Fix] After accesing POS page, it does not work when going back from another page (#12763)
|
2018-02-05 12:24:06 +05:30 |
|
Nabin Hait
|
2ef1f84041
|
Fixed merge conflict
|
2018-02-03 09:14:53 +05:30 |
|
rohitwaghchaure
|
cf6360d825
|
Merge pull request #12739 from jay-parikh/hotfix
Enable/Disable Discount in POS using POS Profile #11748
|
2018-02-02 13:12:38 +05:30 |
|
Jay Parikh
|
2c95ab3897
|
Code fix for Enable/Disable Discount in POS using POS Profile #11748
|
2018-02-01 22:52:58 -08:00 |
|
Jay Parikh
|
171e5af995
|
Fixed indentation issue in pull # 11748
|
2018-02-01 21:39:20 -08:00 |
|
Jay Parikh
|
d4359faa31
|
Enable/Disable Discount in POS using POS Profile #11748
|
2018-02-01 04:26:24 -08:00 |
|
Rohit Waghchaure
|
d85247cd7a
|
[Fix] Pay button not working in pos
|
2018-02-01 17:18:38 +05:30 |
|
Nabin Hait
|
ec2c9ec897
|
Merge branch 'master' into develop
|
2018-01-31 15:39:16 +05:30 |
|
rohitwaghchaure
|
ce5b93ca77
|
[Fix] Allow user to edit rate in online POS (#12701)
|
2018-01-30 10:39:46 +05:30 |
|
Saurabh
|
a2076a1ff0
|
Multiple changes:
[Mod] Used async-await for asynchronous save in draft mode
[Fix] Fixed bug that din't allow to submit a new POS Invoice
|
2018-01-23 17:23:26 +05:30 |
|
Saurabh
|
c5a6cf3a0e
|
[Mod] Allows print only when the check value exists and the cart isn't empty
|
2018-01-23 17:23:26 +05:30 |
|
Saurabh
|
32695a938f
|
[Mod] Refactored the code for fetching allow_print_before_pay check value
|
2018-01-23 17:23:26 +05:30 |
|
deepak-mnt
|
d7da89bf5a
|
[Fix] Resolved issues suggested by Codacy
|
2018-01-23 17:21:44 +05:30 |
|
deepak-mnt
|
8f3d394485
|
Minor changes:Removed extra spaces in py code
|
2018-01-23 17:21:44 +05:30 |
|
deepak-mnt
|
cc813d2286
|
[Mod] Ensured that a single POS Sales Invoice is created even when its printed(saved) in Draft mode
|
2018-01-23 17:21:44 +05:30 |
|
deepak-mnt
|
1ccb0cfa2f
|
[Mod] point_of_sale.js: Allowed print before pay and saved the invoice before print
[New] test_point_of_sale.js: Test Cases to check the print before pay functionality in Online POS
|
2018-01-23 17:21:44 +05:30 |
|
deepak-mnt
|
29abe291c9
|
Allow draft mode print in online POS
|
2018-01-23 17:21:44 +05:30 |
|
rohitwaghchaure
|
7b78f6bee6
|
Added rounded total in the POS and fix rounded issue in js side (#12457)
|
2018-01-12 16:28:16 +05:30 |
|
rohitwaghchaure
|
7fcc21bc8b
|
[Fix] Cart remain same even if pos profile change (#12371)
|
2018-01-08 15:22:22 +05:30 |
|
rohitwaghchaure
|
3f784a7a49
|
[minor] POS profile mandatory, to set as default (#12307)
|
2018-01-05 12:26:33 +05:30 |
|
Nabin Hait
|
92615901a7
|
Fixed merge conflict
|
2017-12-25 13:41:04 +05:30 |
|
rohitwaghchaure
|
b725affe0c
|
[fix] Mobile no search issue in the pos (#12090)
|
2017-12-19 11:21:00 +05:30 |
|
rohitwaghchaure
|
e067beda49
|
[fix] Promise issue, in cart against item displaying zero values (#12078)
|
2017-12-18 12:32:49 +05:30 |
|
rohitwaghchaure
|
78a17355be
|
[fix] Item search in POS (#12037)
|
2017-12-15 15:38:12 +05:30 |
|
rohitwaghchaure
|
2b95a5438b
|
POS batch fixes (#12005)
|
2017-12-14 16:06:23 +05:30 |
|
rohitwaghchaure
|
d19be49889
|
[fix] Error opening the POS (#11929)
|
2017-12-11 14:57:43 +05:30 |
|
Saurabh
|
34a0e90115
|
[fix] merge conflicts
|
2017-11-30 16:45:01 +05:30 |
|
tundebabzy
|
ce63ab7602
|
Show Batch Selector Dialog Only If There Are Multiple Batches (#11794)
* check if multiple batches available before showing dialog
* Update point_of_sale.js
|
2017-11-30 11:38:53 +05:30 |
|
Rushabh Mehta
|
0154538c06
|
[fix] [minor] pos.js
|
2017-11-29 16:42:02 +05:30 |
|
rohitwaghchaure
|
1b344ca81e
|
[Fix] POS not loading if pos profile not defined (#11778)
|
2017-11-29 16:21:51 +05:30 |
|
rohitwaghchaure
|
f591a220c9
|
Fetch items of item groups defined in the pos profile (#11763)
|
2017-11-29 13:55:13 +05:30 |
|
tunde
|
0d82b6979e
|
add missing field and value parameters
|
2017-11-28 23:30:03 +01:00 |
|
rohitwaghchaure
|
c037dc775e
|
Refactor multi pos profile selection in the pos invoice (#11721)
|
2017-11-28 16:11:15 +05:30 |
|
Rohit Waghchaure
|
09b39f06ea
|
Code cleanup
|
2017-11-23 16:30:10 +05:30 |
|
Saurabh
|
ed4191ec5b
|
[fix] merge-conflicts
|
2017-11-22 18:01:56 +05:30 |
|
rohitwaghchaure
|
834541a7e8
|
[fix] Added primary action in the modal which will show on the submission in the pos (#11575)
|
2017-11-20 11:31:53 +05:30 |
|
Rohit Waghchaure
|
77940493a8
|
[fix] Price list not loaded from pos profile, auto set outstanding amount in the mode of payment
|
2017-11-18 19:06:31 +05:30 |
|
Saurabh
|
66e65dc104
|
[fix] merge-conflicts
|
2017-11-17 14:03:13 +05:30 |
|
Rohit Waghchaure
|
44f7b157ff
|
[fix] POS redirect issue
|
2017-11-17 13:52:11 +05:30 |
|
Saurabh
|
a5275a1ba9
|
Merge branch 'master' into develop
|
2017-11-10 15:53:44 +05:30 |
|
Rohit Waghchaure
|
a5e3c3a79f
|
Add item directly in the cart only if serial no, batch, barcode has enter in the search field
|
2017-11-10 15:29:26 +05:30 |
|
Nabin Hait
|
ff73646212
|
Made POS Profile mandatory and changed test order
|
2017-11-08 14:34:38 +05:30 |
|
Saurabh
|
f41b13b736
|
[fix] merge-conflicts
|
2017-11-08 12:18:41 +05:30 |
|