Manas Solanki
|
d77fac113f
|
Make All Assessment Group parent in assessment group tree
|
2017-02-24 15:30:22 +05:30 |
|
Nabin Hait
|
da73e1b806
|
Merge pull request #7851 from rohitwaghchaure/account_paid_to_payment_entry
[Fix] Payment entry account Paid To Show receivable accounts for supplier
|
2017-02-24 15:18:50 +05:30 |
|
Kanchan Chauhan
|
26b79f108a
|
Leave Application Enchancement
|
2017-02-24 15:13:06 +05:30 |
|
Rohit Waghchaure
|
b983f26b98
|
[Fix] Payment entry account Paid To Show receivable accounts for supplier
|
2017-02-24 15:07:54 +05:30 |
|
Nabin Hait
|
8ad26c7d26
|
Merge pull request #7848 from manassolanki/neilLasrado-ass-redesign
Neil lasrado assessment redesign
|
2017-02-24 14:14:22 +05:30 |
|
Neil Trini Lasrado
|
c15b5db030
|
Added 'All Assessment Group' to fixtures
|
2017-02-24 13:16:46 +05:30 |
|
Neil Trini Lasrado
|
e4903b77b6
|
Added New Doctype - Assessment Code
|
2017-02-24 13:16:46 +05:30 |
|
Neil Trini Lasrado
|
15944b9ecf
|
Added Academic Term to Assessment Group
|
2017-02-24 13:16:46 +05:30 |
|
Nabin Hait
|
2bcacec5c6
|
Merge pull request #7576 from RobertSchouten/compact_dev
[fix] compact print format not longer ignores format builder
|
2017-02-24 13:09:18 +05:30 |
|
Nabin Hait
|
d3d2daab4b
|
Merge pull request #7838 from manassolanki/shishuvan
[Fix] Student Doctype
|
2017-02-24 12:53:21 +05:30 |
|
Manas Solanki
|
230df2c9d3
|
Link the sibling child table with the student doctype
|
2017-02-24 12:09:55 +05:30 |
|
Manas Solanki
|
53259fb91f
|
Change in student master should reflect in every linked doctype and child doctype
|
2017-02-24 11:25:04 +05:30 |
|
Nabin Hait
|
5278da8901
|
Merge pull request #7830 from mbauskar/develop
[minor] eval conditions for recurring sections and lead fields
|
2017-02-23 16:54:20 +05:30 |
|
Nabin Hait
|
8ec1b565f5
|
Merge pull request #7823 from KanchanChauhan/payroll-currency
[Minor] Company default currency in Salary Slip and Structure
|
2017-02-23 16:52:23 +05:30 |
|
Nabin Hait
|
89f7767b51
|
Merge pull request #7818 from KanchanChauhan/product-bundle-fix
[Fix] Disappearing Dropdown fixed
|
2017-02-23 16:49:49 +05:30 |
|
Nabin Hait
|
60db08fd7f
|
Merge pull request #7817 from KanchanChauhan/loan-management-fix
[Minor] Field label rename
|
2017-02-23 16:09:11 +05:30 |
|
Kanchan Chauhan
|
951e31667b
|
[Minor] Company default currency in Salary Slip and Structure
|
2017-02-23 11:16:53 +05:30 |
|
Nabin Hait
|
97b3be6f9d
|
Update salary_structure_employee.json
|
2017-02-23 11:10:05 +05:30 |
|
KanchanChauhan
|
90b42c4fa2
|
Merge pull request #7826 from KanchanChauhan/landed-cost-voucher-test
[Minor] Landed Cost Voucher test case fixed
|
2017-02-23 09:58:40 +05:30 |
|
Kanchan Chauhan
|
1d45a4312e
|
[Minor] Landed Cost Voucher test case fixed
|
2017-02-23 08:44:02 +05:30 |
|
mbauskar
|
ddb9f0bf78
|
[minor] lead hide/unhide campain_name, customer field depending on source
|
2017-02-22 18:54:47 +05:30 |
|
mbauskar
|
d6e409ea92
|
[minor] hide recurring section if document is in __local state
|
2017-02-22 18:22:14 +05:30 |
|
Kanchan Chauhan
|
fe61c314b7
|
[Minor] Landed Cost Voucher test case fixed
|
2017-02-22 17:25:26 +05:30 |
|
Manas Solanki
|
7a61f12572
|
Fixes for attendance reports
|
2017-02-22 16:19:57 +05:30 |
|
Kanchan Chauhan
|
b249a6e6f7
|
[Fix] Disappearing Dropdown fixed
|
2017-02-22 15:39:07 +05:30 |
|
Nabin Hait
|
5079c9ef47
|
Fixed merge conflict
|
2017-02-22 15:31:31 +05:30 |
|
Nabin Hait
|
10ec553859
|
Merge branch 'hotfix'
|
2017-02-22 15:05:27 +05:30 |
|
Nabin Hait
|
633698affc
|
bumped to version 7.2.23
|
2017-02-22 15:35:27 +06:00 |
|
Nabin Hait
|
1965949c67
|
Merge pull request #7816 from mbauskar/hotfix
[minor] minor fixes for journal entry get_exchange_rate trigger
|
2017-02-22 15:03:32 +05:30 |
|
Kanchan Chauhan
|
6af7140763
|
[Minor] Field label rename
|
2017-02-22 14:58:34 +05:30 |
|
mbauskar
|
a8fa10d2a9
|
[minor] minor fixes for journal entry get_exchange_rate trigger
|
2017-02-22 14:51:09 +05:30 |
|
Nabin Hait
|
79dd816359
|
Merge branch 'manassolanki-shishu' into develop
|
2017-02-22 13:06:01 +05:30 |
|
Nabin Hait
|
08847bd06a
|
minor fix
|
2017-02-22 13:05:46 +05:30 |
|
Nabin Hait
|
1e3a0b4632
|
Merge branch 'shishu' of https://github.com/manassolanki/erpnext into manassolanki-shishu
|
2017-02-22 12:12:58 +05:30 |
|
Nabin Hait
|
753c8dedde
|
Update api.py
|
2017-02-22 11:53:13 +05:30 |
|
Nabin Hait
|
2d8047837c
|
Merge pull request #7802 from KanchanChauhan/multiple-items-purchase
[Fix] Throw error if item is added multiple time
|
2017-02-22 11:43:17 +05:30 |
|
Nabin Hait
|
1bdb6a57f2
|
Merge pull request #7809 from rohitwaghchaure/financial_statement_company_issue
[Fix] Company fiscal year issue in financial statement
|
2017-02-22 11:41:16 +05:30 |
|
Kanchan Chauhan
|
f2803ac427
|
[Fix] Throw error if item is added multiple time
|
2017-02-22 10:40:38 +05:30 |
|
Manas Solanki
|
47aba953e2
|
Added student language doctype
|
2017-02-21 18:49:00 +05:30 |
|
Manas Solanki
|
f869a679ae
|
Fixed Student Attendence
|
2017-02-21 18:49:00 +05:30 |
|
Nabin Hait
|
8c9bc8edbb
|
Merge pull request #7807 from nabinhait/hotfix
Company, Currency, Conversion Rate fields are mandatory in BOM
|
2017-02-21 16:06:20 +05:30 |
|
Nabin Hait
|
293158db6e
|
Merge pull request #7808 from KanchanChauhan/attendance-rename-field
[Patch] Attendance Date field renamed
|
2017-02-21 16:01:50 +05:30 |
|
Nabin Hait
|
0142fdc0d7
|
Update rename_att_date_attendance.py
|
2017-02-21 16:01:21 +05:30 |
|
Rohit Waghchaure
|
49523d7f80
|
[Fix] Company fiscal year issue in financial statement
|
2017-02-21 14:20:26 +05:30 |
|
Kanchan Chauhan
|
42f55cf4b1
|
[Patch] Attendance Date rename field
|
2017-02-21 13:44:01 +05:30 |
|
Nabin Hait
|
6e1a2b16a5
|
Company, Currency, Conversion Rate fields are mandatory in BOM
|
2017-02-21 13:11:02 +05:30 |
|
Nabin Hait
|
d5442b5544
|
Merge pull request #7791 from nabinhait/pro_order_stock_qty
Build Qty considering quantity for which bom is created
|
2017-02-21 09:58:13 +05:30 |
|
Nabin Hait
|
7056ce54d7
|
Update salary_structure.py
|
2017-02-20 23:28:47 +05:30 |
|
Nabin Hait
|
16a4b58676
|
Merge branch 'pratu16x7-bom-view' into develop
|
2017-02-20 19:38:36 +05:30 |
|
Nabin Hait
|
391eca18c7
|
Fixed merge conflict
|
2017-02-20 19:38:22 +05:30 |
|