Zarrar
5899d98077
[ Major ] Loyalty Program Fixes ( #14863 )
...
* fix checking of customer_group & territory of customer in loyalty program
* fetch and set applicable loyalty program
- in customer.py if found 1 program, set it or show a message to set it manually
- in sales invoice, if found 1 program for selected customer with no program set, set it else open a dialog with applicable options
* removed disabled field, added from_date & to_date
* loyalty program section made collapsible, added redeem check in it
* setting loyalty program improvised, manual selection if multiple found
* get_query added, amount calculation updated
* args passed rectified for expiry_date
* get loyalty_points logic improv, redemption_details logic added
* improv based on from/to date and other rectification
* code rectified based on different scenarios
- is_return, cancel, make loyalty points entry improv
2018-07-11 14:35:43 +05:30
Manas Solanki
da486eeebd
Loyalty Program ( #12631 )
...
* First Cut for the Loyalty Program
* finished the collection part
* redmeption for the loyalty point
update the loyalty point entry in the FIFO style
make the accounting entry knocking the debtors account against the expense account selected in the loyalty program
update the outstanding balance in the client side
* completed for the desk viewe
* wrap up for the desk and shopping cart
* pos
* fix and test the travis
2018-07-06 12:36:57 +05:30
Mohammed R Abukhamseen
8662a4f677
POS - Translate some text & numpad ( #14765 )
...
* make label & placeholder translatable
* numpad translatable
* Update point_of_sale.js
remove debugger
2018-07-01 16:44:09 +05:30
rohitwaghchaure
ae276bcaa1
Don't allow to sale asset item from POS ( #14623 )
2018-06-21 13:18:01 +05:30
Charles-Henri Decultot
a774f3d7a0
POS closing voucher ( #14270 )
...
* POS closing voucher
* Codacy corrections + improvements
* Codacy corrections
* POS Closing Voucher improvements
2018-06-06 10:22:13 +05:30
Saurabh
2e7a45dbb4
resolved merge conflicts
2018-04-24 11:16:13 +05:30
Rohit Waghchaure
8441dd9184
[Fix] Item with special character not adding in the POS cart
2018-04-19 12:55:06 +05:30
Nabin Hait
642d39098a
Fixed merge conflict
2018-04-13 14:38:57 +05:30
rohitwaghchaure
e72bde5159
Removed expired items from the list of POS items ( #13582 )
2018-04-12 13:26:11 +05:30
Rohit Waghchaure
920a3ff0b8
[Fix] POS freeze when rate button pushed
2018-04-04 18:06:19 +05:30
Rohit Waghchaure
5e0cabc538
[Fix] POS not opening
2018-03-30 14:29:18 +05:30
rohitwaghchaure
68ba4fd697
[Fix] Multi-batch selection issue in POS ( #13407 )
2018-03-28 12:33:15 +05:30
Nabin Hait
c43c95e0aa
Fixed merge conflict
2018-03-05 14:54:44 +05:30
Rohit Waghchaure
3edc101957
[Fix] POS discount issue
2018-02-26 13:25:58 +05:30
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
Achilles Rasquinha
1697a7aa81
replaced string_types with basestring
2018-02-15 11:39:45 +05:30
Nabin Hait
e21e59614f
Fixed merge conflict
2018-02-12 15:59:55 +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
b665baec72
Used cint instead of int
2018-01-23 18:28:05 +05:30
Saurabh
a5c9fc3705
Removed commented code
2018-01-23 17:36:41 +05:30
Saurabh
cbbee47625
[Fix] Resolved the type issue of 'is_saved' flag variable
2018-01-23 17:23:27 +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
tundebabzy
76dddbf26e
Merge branch 'develop' into multi-barcode
2018-01-10 21:49:27 +01:00
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
Giovanni
2144e02d3c
- Added multiple barcode feature per item
2017-12-10 17:27:09 +01:00
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
Nabin Hait
32a62a02df
Fixed merge conflict
2017-11-21 20:18:03 +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
tunde
ffa659fd2c
Merge branch 'develop' into payment-terms
2017-11-14 09:59:45 +01:00
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
Rohit Waghchaure
57cc924d29
[Fix] Fast clicking on an item, showing invalid grand total and quantity in the POS cart
2017-11-06 18:42:37 +05:30
Faris Ansari
cbaa0e629c
fix codacy
2017-11-03 11:35:49 +05:30
Faris Ansari
3d59179205
Load default pos profile if not found
2017-10-31 21:56:16 +05:30
Faris Ansari
895aa7b7ac
fix codacy
2017-10-30 17:12:50 +05:30
Faris Ansari
7095de03ef
Merge branch 'develop' into multiple-users-pos-profile
2017-10-30 15:00:55 +05:30
tunde
14e97ce0c8
Merge branch 'develop' into payment-terms
2017-10-26 13:35:42 +01:00
Faris Ansari
6887cedaea
[fix] item qty trigger ( #11349 )
2017-10-26 14:34:15 +05:30
rohitwaghchaure
c65f1d7745
Search item using name instead of item code ( #11327 )
2017-10-25 17:04:56 +05:30
Nabin Hait
4d22b6db30
Fixed Merge Conflict
2017-10-25 14:09:46 +05:30
rohitwaghchaure
4a60554b91
Green indicator in the cart for non stock item ( #11325 )
2017-10-25 13:59:29 +05:30
tunde
09ce68ec19
Merge branch 'develop' into payment-terms
2017-10-19 17:47:31 +01:00
Rushabh Mehta
bc4e2cd9c1
[added] hospitality domain ( #11020 )
...
* [added] hospitality domain
* [tests] wip
* [tests] for restaurant
* [fix] tests for new naming
* [docs] added restaurant docs
* [docs] added restaurant docs
2017-10-17 12:30:34 +05:30
rohitwaghchaure
8bf7230fcc
[Fix] New invoice showing old paid amount if POS Profile is not created ( #11160 )
2017-10-15 19:09:14 +05:30
rohitwaghchaure
76a9cefc9c
Merge pull request #11151 from rohitwaghchaure/minor_fix_title
...
[minor] Title not showing in payment modal
2017-10-11 12:05:29 +05:30
Rohit Waghchaure
4f7873b9df
[minor] Title not showing in payment modal
2017-10-11 12:03:49 +05:30
Saurabh
ad9afe68f3
Merge pull request #11119 from rohitwaghchaure/default_company_pos
...
[enhance] Provision to select company in the POS screen if company is not defined in the global defaults
2017-10-11 12:00:56 +05:30
Rohit Waghchaure
3f309e1c20
Multiple items showing for single barcode
2017-10-11 02:14:56 +05:30
Rohit Waghchaure
9bb81ee1cb
[fix] Total amount showing wrong in the payment modal if user has changed the qty after payment
2017-10-11 01:54:36 +05:30
tunde
37c2b6116c
Merge branch 'develop' into payment-terms
2017-10-09 15:42:47 +01:00
Rohit Waghchaure
d270748eea
[Fix] Provision to select company in the POS screen if company is not defined in the global defaults
2017-10-09 12:54:26 +05:30
Rohit Waghchaure
62ce218fc2
Show total instead of net total
2017-10-06 11:16:46 +05:30
tunde
d82677f1e6
Merge branch 'develop' into payment-terms
2017-10-06 02:23:45 +01:00
rohitwaghchaure
e0dfd1608e
[Fix] Auto add item in the cart if sinfle items found in the serach ( #11072 )
2017-10-05 18:30:51 +05:30
rohitwaghchaure
607b5d4985
[Fix] Negative qty issue in POS ( #11070 )
...
* [Fix] Negative qty issue in POS
* Update point_of_sale.js
2017-10-05 15:57:58 +05:30
Rohit Waghchaure
f7a856b913
[Fix] Rate not fetched in the POS, User trying to add an item in the cart before loading of frm
2017-10-05 13:31:29 +05:30
rohitwaghchaure
5049edb494
[Fix] Discount and serial no search issue ( #11040 )
2017-10-04 14:33:12 +05:30
tunde
19e63b73ed
Merge branch 'develop' into payment-terms
2017-10-03 12:02:38 +01:00
Rohit Waghchaure
c4e52e5f95
[Fix] Old invoice payment amount showing in the payment modal while making payment
2017-10-02 21:20:54 +05:30
rohitwaghchaure
88491715e0
[Fix] select batch not displaying in the modal, duplicate invoice making after sync ( #11005 )
2017-10-02 12:13:36 +05:30
Faris Ansari
8ac56b26e0
[Enhancement] Allow Multiple users in POS Profile
2017-09-29 16:15:15 +05:30
tunde
3415ac6e9c
Merge branch 'develop' into payment-terms
2017-09-29 10:10:24 +01:00
tunde
18764a12c4
increase point-of-sale timeout to fix UI test
2017-09-28 11:47:27 +01:00
rohitwaghchaure
94799a8b93
[fix] ‘NoneType’ object is not iterable onload of POS ( #10941 )
2017-09-28 10:56:27 +05:30
Rohit Waghchaure
87e994e0a2
[fixed] Disocunt amount not working for POS
2017-09-27 12:16:58 +05:30
rohitwaghchaure
d4c2d77bba
[fix] POS not working if user clicks on back button from form view ( #10912 )
2017-09-26 13:27:06 +05:30
Nabin Hait
de9eebe51c
Fixed multiple ui tests
2017-09-12 15:40:33 +05:30
Rohit Waghchaure
4e006b0bc5
rename Is Online field to Use POS in Offline Mode in pos settings
2017-09-11 14:51:50 +05:30
Nabin Hait
d4e57a38a4
Fixed multiple ui test cases
2017-09-07 19:16:38 +05:30
Rohit Waghchaure
c72d08e8b9
Added indicator to show stock is available or not
2017-09-06 14:56:08 +05:30
Rohit Waghchaure
7419c4b577
Fixed test cases
2017-09-06 12:44:51 +05:30
Faris Ansari
4bcaeb312c
fix codacy
2017-09-05 17:30:22 +05:30
Faris Ansari
62b1dc777e
Namespace PointOfSale class
2017-09-05 17:10:24 +05:30
Rohit Waghchaure
6ab630371d
Fixed serial no trigger not working from dialog box
2017-09-01 17:02:42 +05:30
Rohit Waghchaure
3e43927767
Test cases
2017-08-31 18:21:27 +05:30
Rohit Waghchaure
7e752c4ebf
Added patch, fixed codacy issue
2017-08-31 00:31:35 +05:30
Faris Ansari
1116f96aee
Grand Total Value width
2017-08-30 12:53:08 +05:30
Rohit Waghchaure
70aaff46be
minor fix in item group search
2017-08-29 19:19:58 +05:30
Faris Ansari
c70bbacd34
Add online, offline option, fix search
2017-08-29 15:27:17 +05:30
Faris Ansari
655f86d5e2
UI fixes
2017-08-29 14:27:01 +05:30
Rohit Waghchaure
ba3f0e6b70
Added serial no, batch no, item group functionality
2017-08-28 19:45:58 +05:30
Faris Ansari
3ae9e91bcd
Add memoization in search
2017-08-27 14:04:23 +05:30
Faris Ansari
d733b7d7d0
Styling and code fixes
2017-08-27 13:56:33 +05:30
Rohit Waghchaure
5e2d2059fe
Added email, edit on form view from POS, pay using numpad functionality
2017-08-27 08:54:40 +05:30
Faris Ansari
5d9196960e
new form improvements
2017-08-24 17:09:34 +05:30
Rohit Waghchaure
e5f6b4d640
Added print, make new invoice from POS functionality
2017-08-24 15:27:55 +05:30
Faris Ansari
6d2f6c2e4d
Search improved, code refactor
2017-08-23 16:25:16 +05:30
Faris Ansari
26df5b8c00
Connect Numpad events with POSCart
2017-08-23 13:12:12 +05:30
Rohit Waghchaure
b73321c577
Item search refactor
2017-08-23 12:15:10 +05:30
Faris Ansari
78c81d9c6c
Refactor payment code
2017-08-21 15:05:33 +05:30
Faris Ansari
eba50c6860
Merge branch 'pos-refactor' of https://github.com/netchampfaris/erpnext into pos-refactor
2017-08-18 17:00:02 +05:30
Rohit Waghchaure
f03a73466c
Added modal for multi mode payment, provision to add write off and change amount
2017-08-18 12:15:19 +05:30
Faris Ansari
0f3d431476
Update cart ui from cur_frm, Add number pad
2017-08-17 12:56:14 +05:30
Rohit Waghchaure
b1daab4284
Added functional part
2017-08-17 12:56:14 +05:30
Faris Ansari
a0f8687945
Styling for search fields
2017-08-17 12:56:14 +05:30
Faris Ansari
03e7ec29e7
Add clusterize, move customer field to POSCart, get POS profile
2017-08-17 12:56:14 +05:30
Faris Ansari
6e7db034f2
[wip] New POS UI
2017-08-17 12:56:14 +05:30
Faris Ansari
21fc26c2a2
Update cart ui from cur_frm, Add number pad
2017-08-14 18:25:59 +05:30
Rohit Waghchaure
854d335ab1
Added functional part
2017-08-14 11:34:42 +05:30
Faris Ansari
f7c7ff4aae
Styling for search fields
2017-08-10 18:28:05 +05:30
Faris Ansari
65c4bd6db6
Add clusterize, move customer field to POSCart, get POS profile
2017-08-10 17:17:49 +05:30
Faris Ansari
519cc09979
[wip] New POS UI
2017-08-10 17:17:49 +05:30
