Nabin Hait
|
45a640df08
|
Update payment_entry_reference.json
|
2017-10-16 12:58:32 +05:30 |
|
Nabin Hait
|
53659cf0bd
|
Update payment_entry_reference.json
|
2017-10-16 12:57:51 +05:30 |
|
Makarand Bauskar
|
80f333950b
|
[minor] fixed AttributeError: 'GrossProfitGenerator' object has no attribute 'grouped_data' (#11195)
|
2017-10-16 11:27:22 +05:30 |
|
mbauskar
|
cd4202c2f7
|
Merge branch 'master' into develop
|
2017-10-15 19:10:56 +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 (#11160)
|
2017-10-15 19:09:14 +05:30 |
|
rohitwaghchaure
|
496174bbdf
|
[Fix] Naming series not copy from referebce document to new document in subscription (#11196)
|
2017-10-15 19:08:42 +05:30 |
|
Nabin Hait
|
4072d71769
|
Delete api.py
|
2017-10-11 23:53:57 +05:30 |
|
Faris Ansari
|
7997271368
|
[hub] fix company page routing
|
2017-10-11 15:46:21 +05:30 |
|
Saurabh
|
5ffed60916
|
Merge branch 'master' into develop
|
2017-10-11 14:39:11 +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 #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 |
|
Saurabh
|
41e2b98b63
|
Merge pull request #11137 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 #11147 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 (#11142)
|
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
|
9893a2d608
|
Merge branch 'master' into develop
|
2017-10-10 11:22:39 +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 #11132 from saurabh6790/upload_attendance_tool
[fix] upload attendance with with no_socketio param
|
2017-10-10 11:15:27 +05:30 |
|
Faris Ansari
|
172f28fa06
|
Merge pull request #11133 from netchampfaris/fix-hub-sync
fix Hub Sync plan
|
2017-10-09 19:31:08 +05:30 |
|
Faris Ansari
|
d635a2646b
|
fix Hub Sync plan
|
2017-10-09 19:30:11 +05:30 |
|
Saurabh
|
f347e23556
|
[fix] upload attendacne with with no_socketio param
|
2017-10-09 16:13:21 +05:30 |
|
mbauskar
|
966b3c156a
|
[conflicts] resolved merge conflicts
|
2017-10-09 15:20:30 +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 |
|
Doridel Cahanap
|
5ba39f3f83
|
Add has_certificate and level fields in Training Event (#11093)
|
2017-10-09 12:45:28 +05:30 |
|
tundebabzy
|
2622d370c6
|
deal zero division possibility (#11098)
|
2017-10-09 12:44:24 +05:30 |
|
rohitwaghchaure
|
e181dd4c24
|
[patch] To add healthcare domain (#11105)
|
2017-10-09 12:43:36 +05:30 |
|
tundebabzy
|
7f9d75521e
|
Confirmation desired before cancelling appointment (#10996) (#11106)
* 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 (#11116)
|
2017-10-09 12:42:18 +05:30 |
|
Manas Solanki
|
f91ad75b5a
|
test, patch, docs for student admission (#11075)
|
2017-10-09 12:41:24 +05:30 |
|
Doridel Cahanap
|
5cb6c38a34
|
Add Calendar in Training Event Doctype (#11090)
|
2017-10-06 11:50:05 +05:30 |
|
rohitwaghchaure
|
6f5853b97a
|
Merge pull request #11092 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 #11089 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 #11083 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 |
|
Nabin Hait
|
7eaeec951d
|
Merge branch 'schilgod-develop' into develop
|
2017-10-05 19:54:17 +05:30 |
|
Nabin Hait
|
5a834209d0
|
Cleanup of PO schedule date pull requests
|
2017-10-05 19:51:10 +05:30 |
|
Faris Ansari
|
e3a5899980
|
[hub] Add hub category filters, fix minor issues (#11079)
|
2017-10-05 19:43:08 +05:30 |
|
Stavros Anastasiadis
|
455c3ebb27
|
Add as optional field link Company (#11068)
|
2017-10-05 18:45:37 +05:30 |
|