Neil Trini Lasrado
|
b444d5d81b
|
Rename Scheduling Tool to Course scheduling Tool, Batch Name to Student Batch Name and Batch Creation tool to Student Batch Creation tool
|
2016-11-21 17:04:23 +05:30 |
|
Neil Trini Lasrado
|
6566431fc5
|
Rearranged scheduling Tool
|
2016-11-21 16:21:25 +05:30 |
|
Neil Trini Lasrado
|
defdd784f4
|
Added Student Batch Name & Batch Creation Tool in Schools Module.
|
2016-11-21 16:21:25 +05:30 |
|
Rushabh Mehta
|
75d455422a
|
[fix] [patch] rename_quality_inspection_field
|
2016-11-21 16:19:50 +05:30 |
|
Nabin Hait
|
d50d6a559c
|
Merge pull request #7012 from rmehta/remove-count-star
[optimize] remove count(*) from queries
|
2016-11-21 15:28:01 +05:30 |
|
Rushabh Mehta
|
5a258cbc2d
|
[optimize] remove count(*) from queries
|
2016-11-21 14:57:36 +05:30 |
|
Nabin Hait
|
5f166c11fc
|
Merge pull request #6971 from ShraddhaRanjane/patch-2
Update naming-series.md
|
2016-11-21 14:52:22 +05:30 |
|
Nabin Hait
|
2d5b48c4f2
|
Update naming-series.md
|
2016-11-21 14:52:10 +05:30 |
|
Nabin Hait
|
d7faefc739
|
Merge pull request #7004 from KanchanChauhan/bom-error-fix
[Fix] Better error message if default BOM not found
|
2016-11-21 14:51:03 +05:30 |
|
Nabin Hait
|
c2f8dd71d7
|
Merge pull request #6965 from manassolanki/qa_redesign
[Fix] [Enhancement] Quality Inspection
|
2016-11-21 14:49:18 +05:30 |
|
Rushabh Mehta
|
8042aa4b52
|
[minor] fixes to docs
|
2016-11-21 13:53:02 +05:30 |
|
Nabin Hait
|
e3649ec43c
|
Merge pull request #7005 from rmehta/ux-fixes-for-daily-works-summary
[minor] UX fixes for Daily Work Summary
|
2016-11-21 12:42:32 +05:30 |
|
Rushabh Mehta
|
557e7f787b
|
[minor] UX fixes for Daily Work Summary
|
2016-11-21 12:10:44 +05:30 |
|
Kanchan Chauhan
|
fdcfe180ad
|
[Fix] Better error message if default BOM not found
|
2016-11-21 11:29:18 +05:30 |
|
Manas Solanki
|
60db98aaff
|
[Minor] Variable assignment before reference
Variable = 'inspection_required_fieldname'
|
2016-11-18 14:52:13 +05:30 |
|
Nabin Hait
|
5f453e7779
|
Merge pull request #6992 from rmehta/daily-work-summary
[Feature] Daily Work Summary
|
2016-11-18 14:00:08 +05:30 |
|
KanchanChauhan
|
49a50fef63
|
Group same item in SO print (#6959)
|
2016-11-18 13:57:53 +05:30 |
|
KanchanChauhan
|
dc2195c52a
|
[Documentation] Shopping Cart (#6911)
|
2016-11-18 13:56:06 +05:30 |
|
Nabin Hait
|
8704dd3134
|
Merge pull request #6970 from komsel2228/develop
fix bugs uom and conversion factor on stock entry
|
2016-11-18 12:56:41 +05:30 |
|
Manas Solanki
|
99dac07a56
|
[Fix] Minor fix for field rename
|
2016-11-18 12:52:34 +05:30 |
|
Rushabh Mehta
|
9dd58d42df
|
[fix] test cases and final wiring for daily work summary
|
2016-11-18 12:40:18 +05:30 |
|
Rushabh Mehta
|
c10d2a0025
|
[wip] daily work summary
|
2016-11-18 12:40:18 +05:30 |
|
Rushabh Mehta
|
fe816c3852
|
[fix] [wip] daily work summary
|
2016-11-18 12:40:18 +05:30 |
|
Nabin Hait
|
52f101d776
|
Merge pull request #6981 from neilLasrado/develop
Added ability to mark attendance against a Student Batch
|
2016-11-17 17:10:05 +05:30 |
|
Nabin Hait
|
652743b26e
|
Merge branch 'master' into develop
|
2016-11-17 16:41:52 +05:30 |
|
Nabin Hait
|
d79cca3ba7
|
Merge branch 'hotfix'
|
2016-11-17 16:41:51 +05:30 |
|
Nabin Hait
|
f83302836c
|
bumped to version 7.1.15
|
2016-11-17 17:11:51 +06:00 |
|
Nabin Hait
|
bd99a7cb5d
|
Merge pull request #6980 from shreyasp/setup-wizard-domain
[Fix] Updated 'FR' translation to prevent setup wizard failure
|
2016-11-17 16:07:43 +05:30 |
|
Nabin Hait
|
46753de6d7
|
fixed merge conflict
|
2016-11-17 15:55:11 +05:30 |
|
Nabin Hait
|
29570d1ecb
|
Merge branch 'hotfix'
|
2016-11-17 15:54:07 +05:30 |
|
Nabin Hait
|
f2b7ec919a
|
bumped to version 7.1.14
|
2016-11-17 16:24:07 +06:00 |
|
Nabin Hait
|
f76aab6021
|
Merge pull request #6976 from saurabh6790/advance_payment_entry_cancellation_fix
[fix] on advance payment entry cancellation delink invoice and pyamen…
|
2016-11-17 15:41:31 +05:30 |
|
Neil Trini Lasrado
|
d9bc5598b6
|
Added ability to mark attendance against a Student Batch
|
2016-11-17 15:36:14 +05:30 |
|
robert schouten
|
2b63e14089
|
dh drop guest from student attendance so disabling acedemic user disables all school doctypes (#6974)
|
2016-11-17 15:23:38 +05:30 |
|
Saurabh
|
1d210968de
|
[fix] on advance payment entry cancellation delink invoice and pyament entry references
|
2016-11-17 15:21:46 +05:30 |
|
Nabin Hait
|
d4e8b297cd
|
Merge pull request #6784 from RobertSchouten/calendar_fix
[fix] calendar range fixes
|
2016-11-17 14:45:59 +05:30 |
|
shreyas
|
0c93445be0
|
[Fix] Updated 'FR' translation to prevent setup wizard failure
|
2016-11-17 14:31:32 +05:30 |
|
Nabin Hait
|
7fc05d6432
|
Update update_missing_salary_component_type.py
|
2016-11-17 12:16:52 +05:30 |
|
ShraddhaRanjane
|
045bfe641e
|
Update naming-series.md
|
2016-11-17 11:22:58 +05:30 |
|
Ignatius Cuknoris
|
6471057df4
|
fix bugs uom and conversion factor on stock entry
|
2016-11-17 10:31:19 +07:00 |
|
Nabin Hait
|
aa68058910
|
Updated modified_datetime in production planning tool
|
2016-11-16 17:41:08 +05:30 |
|
Nabin Hait
|
8dd859920f
|
Merge pull request #6960 from KanchanChauhan/thumbnail-in-shoppingcart
[Fix]Product thumbnail in Shopping Cart
|
2016-11-16 17:34:17 +05:30 |
|
Nabin Hait
|
7f6b99aca4
|
Merge pull request #6962 from KanchanChauhan/payroll-fixes
[Fix] Filters to get employee in Payroll
|
2016-11-16 17:34:00 +05:30 |
|
Nabin Hait
|
01dc2e412d
|
Merge pull request #6964 from mbauskar/hotfix
[minor] fixes in validate selling price
|
2016-11-16 17:32:11 +05:30 |
|
Nabin Hait
|
8af429da1f
|
Cleanup and fixes in quality inspection feature
|
2016-11-16 17:22:38 +05:30 |
|
Manas Solanki
|
55756d71b6
|
[Fix] Change of module of quality inspection
|
2016-11-16 17:22:38 +05:30 |
|
Manas Solanki
|
dbc2511a39
|
[Fix] Delivery Note fixed
|
2016-11-16 17:22:38 +05:30 |
|
Manas Solanki
|
34feab1b25
|
[Fix] Redesign of quality inspection doctype
|
2016-11-16 17:22:38 +05:30 |
|
Manas Solanki
|
a8d1bc7ff4
|
[Fix] Quality Inspection in Purchase Invoice fixed
|
2016-11-16 17:22:38 +05:30 |
|
Manas Solanki
|
c2cd3fd2c6
|
Function in parent transaction.js and call from corresponding files
|
2016-11-16 17:22:38 +05:30 |
|