Commit Graph

20036 Commits

Author SHA1 Message Date
Makarand Bauskar
80f333950b [minor] fixed AttributeError: 'GrossProfitGenerator' object has no attribute 'grouped_data' () 2017-10-16 11:27:22 +05:30
mbauskar
d3214fed57 Merge branch 'hotfix' 2017-10-15 19:10:55 +05:30
mbauskar
bbbce58884 bumped to version 9.1.5 2017-10-15 19:40:55 +06:00
rohitwaghchaure
8bf7230fcc [Fix] New invoice showing old paid amount if POS Profile is not created () 2017-10-15 19:09:14 +05:30
rohitwaghchaure
496174bbdf [Fix] Naming series not copy from referebce document to new document in subscription () 2017-10-15 19:08:42 +05:30
Saurabh
8854438830 Merge branch 'hotfix' 2017-10-11 14:39:10 +05:30
Saurabh
15411fcf70 bumped to version 9.1.4 2017-10-11 15:09:10 +06:00
rohitwaghchaure
76a9cefc9c Merge pull request 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 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
Saurabh
41e2b98b63 Merge pull request from mbauskar/healthcare
[hotfix] passed localise item_group value for create_lab_test_itemsfield
2017-10-11 12:00:12 +05:30
rohitwaghchaure
4eb5286c4b Merge pull request from rohitwaghchaure/total_amount_and_barcode_issue_pos
[Fix] Barcode and total amount issue in online POS
2017-10-11 11:13:30 +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
Makarand Bauskar
4cdb9dee09 [minor] changed the modified date for the subscription doctype () 2017-10-10 18:41:00 +05:30
mbauskar
ee9da67173 [hotfix] passed localize item_group value for create_lab_test_itemsfield 2017-10-10 12:20:45 +05:30
Saurabh
e78601b040 Merge branch 'hotfix' 2017-10-10 11:22:38 +05:30
Saurabh
47b2a5f7d1 bumped to version 9.1.3 2017-10-10 11:52:38 +06:00
Saurabh
5ba4c4c49c Merge pull request from saurabh6790/upload_attendance_tool
[fix] upload attendance with with no_socketio param
2017-10-10 11:15:27 +05:30
Saurabh
f347e23556 [fix] upload attendacne with with no_socketio param 2017-10-09 16:13:21 +05:30
mbauskar
fbbb8695f3 Merge branch 'hotfix' 2017-10-09 15:18:52 +05:30
mbauskar
f9577652a0 bumped to version 9.1.2 2017-10-09 15:48:51 +06: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
tundebabzy
2622d370c6 deal zero division possibility () 2017-10-09 12:44:24 +05:30
rohitwaghchaure
e181dd4c24 [patch] To add healthcare domain () 2017-10-09 12:43:36 +05:30
tundebabzy
7f9d75521e Confirmation desired before cancelling appointment () ()
* shows confirm dialog when user clicks cancel

* indentation and frm as per review
2017-10-09 12:43:18 +05:30
Makarand Bauskar
eaf0abedd4 [hotfix] ignore if student email address field value is None () 2017-10-09 12:42:18 +05:30
rohitwaghchaure
6f5853b97a Merge pull request from rohitwaghchaure/pos_total_issue
Show total instead of net total
2017-10-06 11:17:24 +05:30
Rohit Waghchaure
62ce218fc2 Show total instead of net total 2017-10-06 11:16:46 +05:30
rohitwaghchaure
1b0f3ec666 Merge pull request from rohitwaghchaure/offline_pos_v9
[Fix] Discount field not displaying in offline POS
2017-10-06 09:51:30 +05:30
Rohit Waghchaure
beeba8b37a [Fix] Discount field not displaying in offline POS 2017-10-06 09:50:43 +05:30
rohitwaghchaure
d7636b2b19 Merge pull request from rohitwaghchaure/pos_print_format_issue
[fix] Online print format in pos profile field not displaying
2017-10-06 09:44:27 +05:30
Rohit Waghchaure
b870d0081b [fix] Online print format in pos profile field not displaying 2017-10-06 09:31:40 +05:30
rohitwaghchaure
e0dfd1608e [Fix] Auto add item in the cart if sinfle items found in the serach () 2017-10-05 18:30:51 +05:30
rohitwaghchaure
607b5d4985 [Fix] Negative qty issue in POS ()
* [Fix] Negative qty issue in POS

* Update point_of_sale.js
2017-10-05 15:57:58 +05:30
Makarand Bauskar
f23788bb7d [hotfix] Show Make button only for Email communication () 2017-10-05 14:19:45 +05:30
mbauskar
671c6610de Merge branch 'hotfix' 2017-10-05 13:36:49 +05:30
mbauskar
8c3d19e2ab bumped to version 9.1.1 2017-10-05 14:06:49 +06:00
rohitwaghchaure
4a5ac7cea6 Merge pull request from rohitwaghchaure/pos_loading_issue
[Fix] Rate not fetched in the POS, User trying to add an item in the cart before loading of frm
2017-10-05 13:34:22 +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
Nabin Hait
7d4fd35aa3 Add POS Settings link in Accounts module () 2017-10-05 12:20:33 +05:30
rohitwaghchaure
e87a076f1d Update link in the pos for offline and online mode from pos settings () 2017-10-05 12:20:20 +05:30
Nabin Hait
ff689a658f Merge branch 'staging' 2017-10-04 18:21:35 +05:30
Nabin Hait
b290e3a4e7 bumped to version 9.1.0 2017-10-04 18:51:34 +06:00
Nabin Hait
77f0822abe Merge branch 'develop' into staging 2017-10-04 18:11:16 +05:30
Nabin Hait
f83bc51e81 Merge branch 'master' into staging 2017-10-04 18:05:21 +05:30
Nabin Hait
fc712aea32 Merge branch 'master' into develop 2017-10-04 18:05:20 +05:30
Nabin Hait
7105c4b76c Merge branch 'hotfix' 2017-10-04 18:05:19 +05:30
Nabin Hait
54c725dcd1 bumped to version 9.0.9 2017-10-04 18:35:19 +06:00
rohitwaghchaure
1e2c554e61 [Fix] Stock entry multi uom batch validation issue () 2017-10-04 17:52:49 +05:30