Nabin Hait
|
3ddc26060a
|
Merge pull request #7876 from KanchanChauhan/salary-slip-fix
[Fix] Update totals on salary component deletion
|
2017-02-27 17:26:39 +05:30 |
|
Kanchan Chauhan
|
c02745c826
|
[Fix] Update totals on salary component deletion
|
2017-02-27 17:21:41 +05:30 |
|
Nabin Hait
|
b9741b6ed5
|
Merge branch 'master' into develop
|
2017-02-27 15:41:44 +05:30 |
|
Nabin Hait
|
d39b012981
|
Merge branch 'hotfix'
|
2017-02-27 15:41:43 +05:30 |
|
Nabin Hait
|
b99a38d6ae
|
bumped to version 7.2.25
|
2017-02-27 16:11:43 +06:00 |
|
Nabin Hait
|
a2afc4e11c
|
Update activation.py
|
2017-02-27 15:39:29 +05:30 |
|
Nabin Hait
|
c642f76a4d
|
Fixed merge conflict
|
2017-02-27 14:40:53 +05:30 |
|
Nabin Hait
|
e0d661f433
|
Merge branch 'hotfix'
|
2017-02-27 14:31:10 +05:30 |
|
Nabin Hait
|
79c5ee0a65
|
bumped to version 7.2.24
|
2017-02-27 15:01:10 +06:00 |
|
Nabin Hait
|
afd0d086a7
|
Merge pull request #7872 from rohitwaghchaure/delivery_note_serail_no_issue
[Fix] Serial nos not pulling on the delivery note, for spanish language add serial no button is not working
|
2017-02-27 14:11:30 +05:30 |
|
Nabin Hait
|
704b6a3e1f
|
Merge pull request #7756 from mlisb0n/master
[Translation] Revised and updated all translations to meet european portuguese business/accounting terminology
|
2017-02-27 14:10:51 +05:30 |
|
Rohit Waghchaure
|
2087e574aa
|
[Fix] Serial nos not pulling on the delivery note, for language spanish add serial no button was not working
|
2017-02-27 13:43:04 +05:30 |
|
Nabin Hait
|
c238016aff
|
Merge pull request #7871 from KanchanChauhan/add-serial-no
[Fix] Add Serial No fix for other langauges
|
2017-02-27 13:14:57 +05:30 |
|
Kanchan Chauhan
|
6981870a40
|
[Fix] Add Serial No fix for other langauges
|
2017-02-27 12:54:13 +05:30 |
|
Nabin Hait
|
7e15afbf45
|
Merge pull request #7868 from RobertSchouten/patch-34
[fix] typo on get product bundle
|
2017-02-27 12:27:03 +05:30 |
|
robert schouten
|
4766562ff0
|
fix typo on get product bundle
|
2017-02-27 13:30:18 +08:00 |
|
Nabin Hait
|
72c7e73ce0
|
Merge pull request #7852 from rohitwaghchaure/production_order_issue
[Fix] Production order operations scheduling issue
|
2017-02-25 11:03:43 +05:30 |
|
Nabin Hait
|
7553e72014
|
Merge pull request #7860 from nabinhait/develop
Leave application overlap validation for half day and test cases
|
2017-02-25 11:02:53 +05:30 |
|
Rohit Waghchaure
|
94c30d81b1
|
[Fix] Production order operations scheduling issue
|
2017-02-24 19:21:40 +05:30 |
|
Nabin Hait
|
697150f339
|
Leave application overlap validation for half day and test cases
|
2017-02-24 18:53:34 +05:30 |
|
Nabin Hait
|
a8d02bfd4a
|
Merge pull request #7850 from manassolanki/shishuvan
Patch for making All Assessment Group parent in assessment group tree
|
2017-02-24 17:01:05 +05:30 |
|
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
|
ff5bd680c2
|
Merge pull request #7840 from rmehta/new-buttons
[enhance] connect new buttons on dashboard to custom make buttons and fix text for payment request
|
2017-02-24 12:57:13 +05:30 |
|
Nabin Hait
|
d9afd7e4aa
|
Merge pull request #7822 from rmehta/desktop-messages
[enhance] desktop messages
|
2017-02-24 12:55:34 +05:30 |
|
Nabin Hait
|
d3d2daab4b
|
Merge pull request #7838 from manassolanki/shishuvan
[Fix] Student Doctype
|
2017-02-24 12:53:21 +05:30 |
|
Nabin Hait
|
9f0d64b679
|
Merge pull request #7841 from mbauskar/hotfix
[minor] fixed assessment module icon
|
2017-02-24 12:50:16 +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 |
|
mbauskar
|
cea7d32b31
|
[minor] fixed assessment module icon
|
2017-02-23 20:28:47 +05:30 |
|
Rushabh Mehta
|
509543752c
|
[enhance] connect new buttons on dashboard to custom make buttons and fix text for payment request
|
2017-02-23 17:03:46 +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
|
4c27ec5618
|
Merge pull request #7839 from KanchanChauhan/holiday-cal-fix
[Fix] Holiday Calendar Fix
|
2017-02-23 16:36:35 +05:30 |
|
Kanchan Chauhan
|
52a5cb9ae3
|
[Fix] Holiday Calendar Fix
|
2017-02-23 16:15:12 +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 |
|