Commit Graph

157 Commits

Author SHA1 Message Date
Nabin Hait
1df9a23e7b
Merge pull request from rohitwaghchaure/remove_zero_qty_items_on_click_os_pay
feat: on click of pay button and on focus out of qty field remove the zero qty items from the cart
2019-01-29 13:02:56 +05:30
Rohit Waghchaure
07f75a3e54 feat: on click of pay button and on focus out of qty field remove the zero qty items from the cart 2019-01-29 13:00:18 +05:30
deepeshgarg007
f0cfe98860 fix: Added missing semicolon and removed null from parameter 2019-01-28 17:58:44 +05:30
deepeshgarg007
c2ffcc5e71 feat(POS): Customer wise price list in offline mode and enhancement in POS closing voucher 2019-01-27 16:09:07 +05:30
Himanshu
79d4400c16 fix: Offline pos fix ()
* Offline POS fix

* Fixed items search and load items
2019-01-19 14:01:38 +05:30
Charles-Henri Decultot
052033a76e [Fix] Pos bugs ()
* Remove hard-coded values

* Fix change pos profile + add campaign

* Test case for coveralls

* Remove unnecessary method
2018-12-24 14:39:30 +05:30
Britlog
9e9e37d39b [Fix] Conversion factor in offline POS () 2018-11-13 11:34:27 +05:30
Rohit Waghchaure
152a0c86b0 [Fix] Delete button not working in POS for Ipad 2018-10-29 16:50:18 +05:30
Bassam Ramadan
574cd46e41 Adding cashier closing feature ()
* adding cashier closing feature

cashier closing feature has been added as now the cashier can make a
closure to record every thing from his pos as the expenses which has
been paid and the custody which he had at the starting and the amount
which is in his save and the system will record the date and time and
the user and the total net amount automatically which supposed be equal
to all of his sales invoices totals

* add cashier closing link at pos menu

* add cashier closing link to accounts config file

adding cashier closing link at accounts config file to show it at the
accounts module page

* adding more features to cashier closing

adding from time to the cashier closing in case the cashier working more
than one shift also giving him the ability to add the type of payments
to his cashier closure ,
also adding validation to be sure the from time is less than to time.

* Update cashier_closing.py
2018-09-06 19:02:25 +05:30
Rushabh Mehta
69fa808def [minor] fixes + patch () 2018-07-17 18:22:51 +05:30
Mohammed R Abukhamseen
8662a4f677 POS - Translate some text & numpad ()
* make label & placeholder translatable

* numpad translatable

* Update point_of_sale.js

remove debugger
2018-07-01 16:44:09 +05:30
Valmik Jangla
b52d5b21a1 Add UOM to Item View with Price 2018-05-17 00:09:21 -07:00
Rohit Waghchaure
eee830eafe Fixed spelling 2018-05-13 16:17:18 +05:30
Shreya Shah
44e719d64c [Enhancement] Leave Application and Expense Claim ()
* child table employee expense approver

* set query in department

* mandatory approver check in hr settings

* triggers on leave and expense approver

* fetch all parent approvers from department hierarchy

* fixes

* patch to move employee approvers from employee to department

* removed hard coding of roles

* modify approvers list query

* commonified functions

* patch

* renamed standard reply occurrences

* removed leave approvers table from Employee master

* email templates for leave application notification

* set default email templates for leave in hr settings

* notify by email template

* approval status in expense claim

* render template in patch

* removed unused code

* Single child table department approver

* read instead of render template
2018-04-19 20:58:52 -08:00
Britlog
220864b4f7 Allow decimal quantities in pos () 2018-04-02 10:55:04 +05:30
pawan
53a4d2c430 [fix] 2018-03-21 09:19:36 +05:30
Nabin Hait
5e63c265db Fixed merge conflict 2018-03-09 17:34:39 +05:30
rohitwaghchaure
a32e57ae82 [Fix] Discount in offline POS is enabled even is it's disabled in POS Profile () 2018-03-08 16:21:13 +05:30
Nabin Hait
e21e59614f Fixed merge conflict 2018-02-12 15:59:55 +05:30
Saurabh
ab8c7e616e resolved merge conflicts 2018-02-08 15:17:15 +05:30
Saurabh
1a4d77a962 Fixes for Offline POS 2018-02-08 01:32:48 +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 () 2018-02-05 12:24:06 +05:30
rohitwaghchaure
441032d39c
Merge branch 'develop' into develop 2018-02-01 16:54:10 +05:30
Giovanni
2144e02d3c - Added multiple barcode feature per item 2017-12-10 17:27:09 +01:00
Helkyd
0195528798 Merge branch 'develop' of https://github.com/Helkyd/erpnext-1 into develop 2017-11-22 14:51:18 +01:00
Helkyd
2b6bf82d61 Default Payment Mode
POS drafted, user retrieves the record and sets the default payment mode so that Zero payment is not done.
2017-11-22 14:49:51 +01:00
augustinfotech
135a54ca93 Allow print before pay in POS () 2017-11-16 15:28:42 +05:30
rohitwaghchaure
f688af3809 [fix] Offline pos name is not defined issue in the POS () 2017-11-08 11:33:39 +05:30
rohitwaghchaure
5fdd26f1e7 [fix] Discount amount not reset for new order in offline pos () 2017-10-21 11:23:45 +05:30
rohitwaghchaure
88491715e0 [Fix] select batch not displaying in the modal, duplicate invoice making after sync () 2017-10-02 12:13:36 +05:30
mbauskar
f41cff27e6 resolved merge conflicts 2017-09-14 15:32:55 +05:30
rohitwaghchaure
9a0db392de [Fix] Only typed keywords displying in the field on selection of customer () 2017-09-14 10:51:21 +05:30
Nabin Hait
231c324589 Merge branch 'master' into staging 2017-09-12 16:26:31 +05:30
Rohit Waghchaure
1a77922e85 rename Is Online field to Use POS in Offline Mode in pos settings 2017-09-12 11:01:48 +05:30
Rohit Waghchaure
06b22e9ac1 [Fix] Customer search optimization for the offline POS 2017-09-07 17:44:42 +05:30
Faris Ansari
e4434d3200 Merge branch 'develop' into pos-refactor 2017-09-05 17:18:04 +05:30
rohitwaghchaure
56e31d05e9 [Fix] POS customer field is hang while searching customer, make error log if sync has failed () 2017-08-31 14:19:58 +05:30
Faris Ansari
c70bbacd34 Add online, offline option, fix search 2017-08-29 15:27:17 +05:30
Faris Ansari
8fbc08f91f Decrease timeout to 400 2017-08-28 16:52:20 +05:30
Revant Nandgaonkar
2558daf6b7 Allow search without keypress enter 2017-08-26 15:52:35 +05:30
Revant Nandgaonkar
2f7cb82ca0 [Fix] POS Scanner
Search item based on key press instead of 1sec wait
Fast Scanning needs this to avoid 1sec delay
2017-08-26 09:58:15 +05:30
Faris Ansari
6e7db034f2 [wip] New POS UI 2017-08-17 12:56:14 +05:30
rohitwaghchaure
e2176b852e [Fix] Error in sales invoice and POS if customer group not defined in the customer () 2017-07-28 20:52:02 +05:30
Nabin Hait
b962fc1573 Show hsn code in tax breakup for India and render via template ()
* Show hsn code in tax breakup for India and render via template

* tax breakup if gst_tax_field does not exists

* Fixed tax-breakup test cases
2017-07-17 18:02:31 +05:30
rohitwaghchaure
860144feb7 [Fix] User not able to search an Item if description is null in the item () 2017-07-12 15:01:56 +05:30
rohitwaghchaure
8f51a5e527 In POS on click of delete button, remove the selected item from the cart () 2017-06-23 18:17:04 +05:30
mbauskar
66e2a510b9 [minor] deleted deprecated reprots and changed the lead.json modified time 2017-06-22 16:57:46 +05:30
Charles-Henri Decultot
2305eda82e Addition of new fields for POS Profile in Sales Invoice and POS Profile User link modification () 2017-06-19 09:25:54 +05:30
Nabin Hait
d0ac0bdc18 Merge branch 'master' into develop 2017-06-12 13:50:12 +05:30