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 |
|
Stavros Anastasiadis
|
58b587834e
|
Provide a minor warning message if no stock levels are availiable (#11074)
* Provide a minor warning message if no stock levels are availiable
* Update item_dashboard.js
|
2017-10-05 18:44:50 +05:30 |
|
Stavros Anastasiadis
|
e31757b001
|
Show Stock Level section only to stock maintain items (#11073)
|
2017-10-05 18:41:51 +05:30 |
|
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 |
|
Nabin Hait
|
bf3b54f658
|
Merge branch 'schilgod-material_request' into develop
|
2017-10-05 18:30:11 +05:30 |
|
Nabin Hait
|
395cf4689b
|
Cleanup of schedule date functionality in Material Request
|
2017-10-05 18:27:37 +05:30 |
|
Prateeksha Singh
|
925e9776e8
|
[hub] rename is_hub_item to is_item_from_hub (#11069)
* [hub] rename is_hub_item to is_item_from_hub
* [rename] is_hub_item to is_item_from_hub
|
2017-10-05 17:17:41 +05:30 |
|
AravindPranera
|
9c0d30a087
|
Fetching Document ID also in Email Subject while clicking "Send Supplier Emails" button (#10874)
|
2017-10-05 17:08:32 +05:30 |
|
Utkarsh Goswami
|
4cb4d2f155
|
Tests for payment entry against purchase invoice (#10930)
|
2017-10-05 16:51:42 +05:30 |
|
Utkarsh Goswami
|
975d28307a
|
Payroll feature (#10900)
|
2017-10-05 15:59: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 |
|
Stavros Anastasiadis
|
ea390effa5
|
Add multirows in Attendees selection (#11067)
|
2017-10-05 15:31:25 +05:30 |
|
Nabin Hait
|
31e6f75dbf
|
Merge branch 'Helkyd-develop' into develop
|
2017-10-05 15:29:05 +05:30 |
|
Nabin Hait
|
34ad2e6a60
|
Use format_currency only if fieldtype is currency
|
2017-10-05 15:28:43 +05:30 |
|
Nabin Hait
|
f8ad0cbe70
|
Merge branch 'develop' of https://github.com/Helkyd/erpnext-1 into Helkyd-develop
|
2017-10-05 15:02:50 +05:30 |
|
Manas Solanki
|
0518001bdc
|
Changes in Student Admission (#11019)
* configurable student admission
* validate dob and admission date from student admission
* add in hooks and fix codacy
|
2017-10-05 14:31:31 +05:30 |
|
Doridel Cahanap
|
25db832be1
|
[minor] Add "Attendance" in grid view for Training Event Employee (#11063)
|
2017-10-05 14:20:43 +05:30 |
|
Makarand Bauskar
|
f23788bb7d
|
[hotfix] Show Make button only for Email communication (#10876)
|
2017-10-05 14:19:45 +05:30 |
|
mbauskar
|
74ce391303
|
Merge branch 'master' into develop
|
2017-10-05 13:36:50 +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 #11066 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
|
26507d7867
|
Removed deprecated hub functions
|
2017-10-05 13:10:32 +05:30 |
|