Nabin Hait
|
6ff0caa87a
|
Fixed merge conflict
|
2017-02-08 11:33:33 +05:30 |
|
Nabin Hait
|
efd5eadfea
|
Merge branch 'hotfix'
|
2017-02-08 11:32:47 +05:30 |
|
Nabin Hait
|
57e97c06e6
|
bumped to version 7.2.19
|
2017-02-08 12:02:47 +06:00 |
|
Nabin Hait
|
6f93cd5bd0
|
Merge pull request #7692 from rohitwaghchaure/minor_fixes_v_7_2
Minor fixes
|
2017-02-08 11:21:54 +05:30 |
|
Nabin Hait
|
533d22e88b
|
Merge pull request #7606 from rohitwaghchaure/data_import_tool_for_cost_center
[Fix] Allow data import tool for cost center
|
2017-02-08 11:21:25 +05:30 |
|
Rohit Waghchaure
|
b3489548a9
|
minor fix
|
2017-02-08 11:20:04 +05:30 |
|
Nabin Hait
|
ccd2e00331
|
Merge pull request #7676 from nabinhait/missing_val_rate
Get standard/historical valuation rate where missing, if item is not a sample item
|
2017-02-08 11:05:06 +05:30 |
|
Nabin Hait
|
70fd8546ce
|
Merge pull request #7677 from KanchanChauhan/serial-no-in-return
[Fix] Serial No if is_return
|
2017-02-07 13:28:30 +05:30 |
|
Nabin Hait
|
555279b6e6
|
Merge pull request #7680 from bcornwellmott/patch-7
Duplicate "title" field
|
2017-02-07 13:27:46 +05:30 |
|
Nabin Hait
|
ddcb514b65
|
Merge pull request #7685 from KanchanChauhan/employee-details-in-salary-preview
[Fix] Employee Details in Salary Slip preview
|
2017-02-07 13:27:24 +05:30 |
|
Nabin Hait
|
401ac7a5e5
|
Merge pull request #7686 from mbauskar/fixes
[minor] auto close issue using ORM (document save method)
|
2017-02-07 13:26:14 +05:30 |
|
Nabin Hait
|
0a6aaf4257
|
Get standard/historical valuation rate where missing: some minor fixes
|
2017-02-07 12:50:22 +05:30 |
|
mbauskar
|
9c0bf73d25
|
[minor] auto close issue using ORM (document save method)
|
2017-02-07 12:50:05 +05:30 |
|
Kanchan Chauhan
|
842ad55235
|
[Fix] Employee Details in Salary Slip preview
|
2017-02-07 12:07:55 +05:30 |
|
Kanchan Chauhan
|
4f3b0aa249
|
[Fix]Serial No if is_return
|
2017-02-07 11:28:34 +05:30 |
|
Nabin Hait
|
ea8fab52c6
|
Get standard/historical valuation rate where missing, if item is not a sample item
|
2017-02-07 01:24:32 +05:30 |
|
bcornwellmott
|
92b6ceec41
|
Duplicate "title" field
The title field was duplicated - removed first one.
|
2017-02-06 10:51:02 -08:00 |
|
Neil Trini Lasrado
|
2160638f36
|
Merge pull request #7679 from neilLasrado/stud-group
Added validation to check if Student in a student group exists in the…
|
2017-02-07 00:17:24 +05:30 |
|
Neil Trini Lasrado
|
c28598ae8b
|
Merge pull request #7678 from neilLasrado/stud-att
Added validations to Student Attendance
|
2017-02-07 00:17:14 +05:30 |
|
Neil Trini Lasrado
|
3ade874f9e
|
Added validations to Student Attendance
|
2017-02-06 20:07:02 +05:30 |
|
Neil Trini Lasrado
|
05dec9a880
|
Added validation to check if Studnet in a student group exists in the student batch specified
|
2017-02-06 20:05:16 +05:30 |
|
Nabin Hait
|
8200485baa
|
Merge pull request #7675 from mbauskar/hotfix
[minor] index out of range fixes for JE
|
2017-02-06 19:23:33 +05:30 |
|
mbauskar
|
c874a82559
|
[minor] index out of range fixes for JE
|
2017-02-06 15:41:34 +05:30 |
|
Rushabh Mehta
|
50862039dc
|
[minor] fixes to schools
|
2017-02-06 14:28:52 +05:30 |
|
Nabin Hait
|
259489572d
|
Merge pull request #7657 from rmehta/po-from-so
[enhance] production order from sales order
|
2017-02-06 11:41:56 +05:30 |
|
Nabin Hait
|
101aaed643
|
Merge pull request #7614 from KanchanChauhan/account-filters-payroll
[Fix] Account filter in Process Payroll and Salary Component
|
2017-02-06 11:36:48 +05:30 |
|
Nabin Hait
|
20d2d7548a
|
Update salary_component.js
|
2017-02-06 11:36:38 +05:30 |
|
rohitwaghchaure
|
ac65e956e8
|
Merge pull request #7659 from saurabh6790/demo_user_perm_fix
[minor][fix] demo user perm fix
|
2017-02-03 16:51:33 +05:30 |
|
Rushabh Mehta
|
e92a740b53
|
[minor] school patch fix
|
2017-02-03 16:05:53 +05:30 |
|
Saurabh
|
9ca3f2847a
|
a[minor][fix] demo user perm fix
|
2017-02-02 19:22:36 +05:30 |
|
Rushabh Mehta
|
6ede4a3809
|
[enhance] production order from sales order
|
2017-02-02 17:42:01 +05:30 |
|
KanchanChauhan
|
ed94aa4798
|
Merge pull request #7624 from neilLasrado/eval-group
Code Refractor.
|
2017-02-02 17:39:08 +05:30 |
|
Neil Trini Lasrado
|
f37d329cf5
|
Merge branch 'develop' into eval-group
|
2017-02-02 17:30:10 +05:30 |
|
rohitwaghchaure
|
3f10c7f4fc
|
Merge pull request #7609 from rmehta/remove-party-status
Remove Party Status
|
2017-02-02 16:10:26 +05:30 |
|
KanchanChauhan
|
6575a0a7e2
|
[Minor]ROI fix in Employee Loan (#7643)
|
2017-02-02 16:01:43 +05:30 |
|
Rushabh Mehta
|
a3d0bea375
|
Merge branch 'develop' into remove-party-status
|
2017-02-02 15:42:04 +05:30 |
|
Kanchan Chauhan
|
3e2ecc3423
|
[Fix] Account filter in Process Payroll and Salary Component
|
2017-02-02 14:41:48 +05:30 |
|
Nabin Hait
|
6b9902627d
|
Merge pull request #7638 from rohitwaghchaure/gross_profit_report_issue
[Fix] Buying rate in gross profit report
|
2017-02-02 13:41:32 +05:30 |
|
Nabin Hait
|
c62362f064
|
Merge pull request #7649 from KanchanChauhan/salary-struct-fix
[Fix] Employee name fixes in Salary Structure
|
2017-02-02 13:30:05 +05:30 |
|
Kanchan Chauhan
|
a0314f19ca
|
[Fix] Employee name fixes in Salary Structure
|
2017-02-02 12:56:56 +05:30 |
|
Neil Trini Lasrado
|
4aabe61197
|
Patch for renaming evaluation criteria
|
2017-02-01 19:32:28 +05:30 |
|
Saurabh
|
10eb123b49
|
Merge pull request #7645 from rohitwaghchaure/pos_minor_fix
Minor fix
|
2017-02-01 19:26:47 +05:30 |
|
Rohit Waghchaure
|
69060a8177
|
Minor fix
|
2017-02-01 19:14:53 +05:30 |
|
Neil Trini Lasrado
|
749516c22d
|
Renamed Evaluation Criteria to Assessment Criteria
|
2017-02-01 18:47:36 +05:30 |
|
Rushabh Mehta
|
3714626dd0
|
[minor] enhance BOM view
|
2017-02-01 18:35:53 +05:30 |
|
KanchanChauhan
|
98595dff0b
|
Merge pull request #7642 from frappe/revert-7641-employee-loan-fix
Revert "[Fix] Rate of Interest Fix"
|
2017-02-01 18:17:18 +05:30 |
|
KanchanChauhan
|
b499fe91fa
|
Revert "[Fix] Rate of Interest Fix"
|
2017-02-01 18:16:35 +05:30 |
|
rohitwaghchaure
|
c13dbd408f
|
[Enhancement] POS Redesign (#7639)
* item group, discount
* POS Redesign
* offline customer
* removed offline records from modal view
|
2017-02-01 18:07:22 +05:30 |
|
KanchanChauhan
|
929c3890a4
|
Merge pull request #7641 from KanchanChauhan/employee-loan-fix
[Fix] Rate of Interest Fix
|
2017-02-01 18:06:32 +05:30 |
|
KanchanChauhan
|
0e995adc44
|
Salary Structure Employee custom field can be used in Formula and Condition (#7615)
|
2017-02-01 18:05:57 +05:30 |
|