Rushabh Mehta
|
94c4d7014d
|
[fix] item_name in stock reco
|
2016-12-28 06:56:09 +05:30 |
|
Rushabh Mehta
|
5cb1b6bf3f
|
[minor] translation fix
|
2016-12-27 16:30:20 +05:30 |
|
Nabin Hait
|
3bcf9b5e70
|
Fixed merge conflict
|
2016-12-27 14:30:17 +05:30 |
|
Nabin Hait
|
a6be7c71ed
|
Merge branch 'hotfix'
|
2016-12-27 14:27:19 +05:30 |
|
Nabin Hait
|
89c8b4d6ae
|
bumped to version 7.2.2
|
2016-12-27 14:57:19 +06:00 |
|
Nabin Hait
|
e5f5017973
|
Merge pull request #7333 from rmehta/variant-website-fix
[fix] item variants not directly shown in website due to route clash
|
2016-12-27 13:31:30 +05:30 |
|
Rushabh Mehta
|
174c3478a1
|
[fix] item variants not directly shown in website due to route clash
|
2016-12-27 12:30:30 +05:30 |
|
Rushabh Mehta
|
512b85e040
|
[minor] replace autocomplete with awesomplete
|
2016-12-27 12:14:37 +05:30 |
|
Rushabh Mehta
|
e60c2c7b7a
|
[minor] dashboard cleanups
|
2016-12-27 12:14:37 +05:30 |
|
Nabin Hait
|
9007815ddc
|
Merge pull request #7326 from neilLasrado/develop
Improved Student Dashboard
|
2016-12-26 18:33:19 +05:30 |
|
Neil Trini Lasrado
|
22239ac610
|
Improved Student Dashboard
|
2016-12-26 17:14:16 +05:30 |
|
Nabin Hait
|
88817b40df
|
Merge pull request #7284 from mntechnique/develop
Report : Batch Item Expiry Status
|
2016-12-26 16:10:46 +05:30 |
|
Nabin Hait
|
4573029a5e
|
Merge pull request #7292 from frappe/bcornwellmott-patch-1
Add hours to calendar labels
|
2016-12-26 16:09:11 +05:30 |
|
Nabin Hait
|
0631d516ce
|
Merge pull request #7290 from netchampfaris/pos-item-area-scroll
pos item area scrollable
|
2016-12-26 16:07:38 +05:30 |
|
Nabin Hait
|
c2690425e3
|
Merge pull request #7310 from bhupennewalkar1337/hotfix
Fix #7202 unchecking pos will reflect automatically
|
2016-12-26 16:07:19 +05:30 |
|
Nabin Hait
|
488ad54bbc
|
Merge pull request #7280 from neilLasrado/leave
Added mark as present to student leave application
|
2016-12-26 16:06:44 +05:30 |
|
Nabin Hait
|
0d49cdf024
|
Merge pull request #7324 from nabinhait/lcv_testcase
[test] Fixed test cases for LCV
|
2016-12-26 15:52:40 +05:30 |
|
Neil Trini Lasrado
|
df4b9ab630
|
Optimised code for Student Monthly Attendance Report
|
2016-12-26 15:40:01 +05:30 |
|
Nabin Hait
|
7b2177a544
|
[test] Fixed test cases for LCV
|
2016-12-26 15:31:05 +05:30 |
|
Neil Trini Lasrado
|
94f42ea145
|
Added from date and to date to student leave application
|
2016-12-26 12:09:27 +05:30 |
|
Neil Trini Lasrado
|
9a7cb6ce92
|
Added mark as present to student leave application
|
2016-12-26 12:09:27 +05:30 |
|
Nabin Hait
|
61a190dd69
|
Merge branch 'master' into develop
|
2016-12-24 11:01:26 +05:30 |
|
Nabin Hait
|
3322fafdbe
|
Merge branch 'hotfix'
|
2016-12-24 11:01:25 +05:30 |
|
Nabin Hait
|
8b3e39ed27
|
bumped to version 7.2.1
|
2016-12-24 11:31:25 +06:00 |
|
Nabin Hait
|
1d90b41aea
|
[fix] Fetch serial nos on change of Warehouse
|
2016-12-24 10:42:23 +05:30 |
|
bhupen
|
bcf63a2a8f
|
unchecking pos will reflect automatically
|
2016-12-23 18:00:18 +05:30 |
|
Nabin Hait
|
ba95fc4fa0
|
Fixed version conflict
|
2016-12-23 17:44:05 +05:30 |
|
Nabin Hait
|
58291c77e9
|
Fixed version conflict
|
2016-12-23 17:43:42 +05:30 |
|
Nabin Hait
|
90c57e5ffd
|
bumped to version 7.2.0
|
2016-12-23 18:13:13 +06:00 |
|
Nabin Hait
|
aad8527ff3
|
Update __init__.py
|
2016-12-23 17:00:17 +05:30 |
|
Nabin Hait
|
c2d66bdfb2
|
Merge branch 'master' into develop
|
2016-12-23 16:45:09 +05:30 |
|
Nabin Hait
|
c1d31baece
|
Merge branch 'hotfix'
|
2016-12-23 16:45:08 +05:30 |
|
Nabin Hait
|
11c5da1d8c
|
bumped to version 7.1.29
|
2016-12-23 17:15:07 +06:00 |
|
Nabin Hait
|
aa2d949f61
|
Merge pull request #7295 from bhupennewalkar1337/lcv
Fix#3717 entering amount in lcv is enabled
|
2016-12-23 15:49:07 +05:30 |
|
Nabin Hait
|
1e1e28b0ae
|
Update landed_cost_voucher.js
|
2016-12-23 15:48:57 +05:30 |
|
Nabin Hait
|
06c6628481
|
Merge pull request #7279 from KanchanChauhan/automate-user-creation
Create User button in Employee if no User ID selected
|
2016-12-23 15:31:55 +05:30 |
|
Nabin Hait
|
0177c02c0f
|
Merge pull request #7286 from rohitwaghchaure/pos_letter_head_issue
minor fix
|
2016-12-23 15:19:32 +05:30 |
|
Nabin Hait
|
0e9f16f59d
|
Merge pull request #7289 from rohitwaghchaure/enhancement_timesheet_v7_2
[Enhancement] Setting to maintain the work hours and bill hours same on the timesheet
|
2016-12-23 15:18:28 +05:30 |
|
Nabin Hait
|
6104fdc579
|
Update repost_stock_for_deleted_bins_for_merging_items.py
|
2016-12-22 17:49:46 +05:30 |
|
bhupen
|
a83de5eac1
|
applicabe charges field is now editable
|
2016-12-22 16:24:14 +05:30 |
|
bhupen
|
914ae77a22
|
Limit instead of Allowance in stock settings
|
2016-12-22 16:24:14 +05:30 |
|
bhupen
|
5bb85e7a95
|
partially orderd status will be shown in material request
|
2016-12-22 16:24:14 +05:30 |
|
bcornwellmott
|
e549984a42
|
Grabs title from SQL
Gets a concatenated title label for the Calendar event that includes the number of hours
|
2016-12-21 12:36:45 -08:00 |
|
bcornwellmott
|
3385bd4921
|
Add hours to label in calendar view
Adds a label for the number of hours to each calendar event
|
2016-12-21 12:33:32 -08:00 |
|
Rohit Waghchaure
|
1af1a43616
|
[Enhancement] Setting to maintain the work hours and bill hours same on the timesheet
|
2016-12-21 19:19:16 +05:30 |
|
Faris Ansari
|
0822e41f96
|
pos item area scrollable
|
2016-12-21 18:17:00 +05:30 |
|
Nabin Hait
|
a216f50114
|
Merge pull request #7287 from rohitwaghchaure/pos_issue_for_serialized_item
[Fix] POS issue for serialized items
|
2016-12-21 18:05:18 +05:30 |
|
Revant Nandgaonkar
|
1c00b1fb21
|
Merge branch 'develop' of https://github.com/frappe/erpnext into develop
|
2016-12-21 18:01:35 +05:30 |
|
Rohit Waghchaure
|
dd58d537d5
|
[Fix] POS issue for serialized items
|
2016-12-21 17:55:40 +05:30 |
|
Rushabh Mehta
|
0632ee3da9
|
Merge branch 'v7.2.0-beta' into develop
|
2016-12-21 17:31:09 +05:30 |
|