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
|
488ad54bbc
|
Merge pull request #7280 from neilLasrado/leave
Added mark as present to student leave application
|
2016-12-26 16:06:44 +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
|
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 |
|
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
|
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 |
|
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 |
|
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 |
|
Rushabh Mehta
|
c6bd7ade2f
|
[fix] inclusive tax + total bug and cleanup in stock entry get_uom, fixes #7253
|
2016-12-21 17:30:29 +05:30 |
|
Kanchan Chauhan
|
58ed0c6efa
|
Create User button in Employee if no User ID selected
|
2016-12-21 16:18:59 +05:30 |
|
Rohit Waghchaure
|
9df946e96c
|
[Fix] Warehouse is mandatory for packing materials on the sales invoice
|
2016-12-21 13:27:54 +05:30 |
|
Rohit Waghchaure
|
d567e57f82
|
minor fix
|
2016-12-21 13:18:36 +05:30 |
|
Nabin Hait
|
e7939fd87b
|
Merge branch 'master' into develop
|
2016-12-21 12:18:38 +05:30 |
|
Nabin Hait
|
399e414909
|
bumped to version 7.1.28
|
2016-12-21 12:48:37 +06:00 |
|
Nabin Hait
|
b3943cb53a
|
Update repost_stock_for_deleted_bins_for_merging_items.py
|
2016-12-21 12:04:39 +05:30 |
|
Nabin Hait
|
2b8aafb08d
|
Merge pull request #7276 from neilLasrado/develop
Allow Data Import for Student Guardian
|
2016-12-21 11:17:13 +05:30 |
|
rohitwaghchaure
|
34e820d02d
|
[Enhancement] Added letter head for the report (#7250)
|
2016-12-20 16:54:24 +05:30 |
|
Rushabh Mehta
|
17d05b4fd7
|
Merge branch 'v7.2.0-beta' into develop
|
2016-12-20 12:59:29 +05:30 |
|
Rushabh Mehta
|
5a3f421453
|
[fix] expand all for treeview, fixes https://github.com/frappe/frappe/issues/2474
|
2016-12-20 12:59:09 +05:30 |
|
Rushabh Mehta
|
89af62a680
|
Merge branch 'v7.2.0-beta' into develop
|
2016-12-20 12:21:03 +05:30 |
|
Rushabh Mehta
|
2a86c32267
|
[minor] [patch] remove icon if present, fixes #6949
|
2016-12-20 12:20:39 +05:30 |
|
Neil Trini Lasrado
|
8979e1c7a5
|
Allow Data Import for Student Guardian
|
2016-12-20 11:53:52 +05:30 |
|
Nabin Hait
|
f573d43b90
|
fixed version conflict
|
2016-12-20 11:40:15 +05:30 |
|
Nabin Hait
|
1cc2d7403b
|
bumped to version 7.1.27
|
2016-12-20 12:09:46 +06:00 |
|
Nabin Hait
|
778c1a022d
|
Merge pull request #7236 from rohitwaghchaure/item_variant_issue
[Fix] Timeout error in item attribute validation
|
2016-12-20 11:31:50 +05:30 |
|
Rushabh Mehta
|
f944fb9e46
|
Merge branch 'v7.2.0-beta' into develop
|
2016-12-19 17:06:56 +05:30 |
|
Rushabh Mehta
|
827588adf2
|
[minor] fixes to job opening
|
2016-12-19 17:06:26 +05:30 |
|
Rushabh Mehta
|
4c210527b2
|
[fix] https for SMS gateway, now using requests fixes #5404
|
2016-12-19 16:22:34 +05:30 |
|
Rushabh Mehta
|
688f2284af
|
[minor] [patch]
|
2016-12-19 13:15:52 +05:30 |
|
Rushabh Mehta
|
c3d8479443
|
[minor] allow website user to be selected as employee
|
2016-12-19 12:32:11 +05:30 |
|