Nabin Hait
|
0d66579e83
|
Merge branch 'develop' into develop
|
2017-02-20 19:22:03 +05:30 |
|
Nabin Hait
|
aa968cd12e
|
Merge pull request #7751 from nick9822/patch-3
Next Depreciation Date is entered as past date
|
2017-02-20 19:11:31 +05:30 |
|
Nabin Hait
|
af6e41b637
|
Merge pull request #7467 from suyashphadtare/develop
[minor] Show Actual Item quantity in warehouse set query
|
2017-02-20 19:10:43 +05:30 |
|
Nabin Hait
|
cd837ecbac
|
Merge branch 'develop' into develop
|
2017-02-20 19:09:20 +05:30 |
|
Nabin Hait
|
5422329b84
|
Merge branch 'KanchanChauhan-accrual-payroll-system' into develop
|
2017-02-20 19:01:27 +05:30 |
|
Nabin Hait
|
8bb69ff8bf
|
Fixed merge conflict
|
2017-02-20 19:01:04 +05:30 |
|
Nabin Hait
|
e49d901907
|
Update process_payroll.py
|
2017-02-20 18:36:12 +05:30 |
|
Nabin Hait
|
78ef086b00
|
Merge branch 'bcornwellmott-prod_ana' into develop
|
2017-02-20 17:42:07 +05:30 |
|
Nabin Hait
|
6ffd77660b
|
Changed module for Production Analytics
|
2017-02-20 17:41:44 +05:30 |
|
Nabin Hait
|
3cdb65f782
|
Merge branch 'prod_ana' of https://github.com/bcornwellmott/erpnext into bcornwellmott-prod_ana
|
2017-02-20 17:25:01 +05:30 |
|
Nabin Hait
|
b44ae54813
|
Merge pull request #7785 from nabinhait/in_global_search
Added fields in global search
|
2017-02-20 15:05:01 +05:30 |
|
Nabin Hait
|
589f4656ad
|
Merge branch 'develop' into in_global_search
|
2017-02-20 15:04:52 +05:30 |
|
Nabin Hait
|
9f4cb0c097
|
Fixed merge conflict
|
2017-02-20 15:00:04 +05:30 |
|
Nabin Hait
|
f8cff128b3
|
Merge branch 'hotfix'
|
2017-02-20 14:52:01 +05:30 |
|
Nabin Hait
|
66b373033a
|
bumped to version 7.2.22
|
2017-02-20 15:22:01 +06:00 |
|
Nabin Hait
|
e6a5d5dc64
|
Merge pull request #7784 from mbauskar/minor-fixes
[minor] minor fixes for contact us page
|
2017-02-20 14:43:24 +05:30 |
|
Nabin Hait
|
da098222d7
|
Merge pull request #7780 from rohitwaghchaure/minor_fix_payment_entry
[Fix] Removed employee party type from the payment entry
|
2017-02-20 14:43:14 +05:30 |
|
Nabin Hait
|
fd3ec066ce
|
Added fields in global search
|
2017-02-20 13:38:31 +05:30 |
|
Makarand Bauskar
|
98f9427ba1
|
[minor] minor fixes for contact us page
|
2017-02-20 12:41:48 +05:30 |
|
bcornwellmott
|
97ab1d2eb3
|
Merge pull request #7691 from bcornwellmott/stock_reports
Stock reports
|
2017-02-19 14:36:35 -08:00 |
|
bcornwellmott
|
568dac3aad
|
Fixed Link Option for Warehouse
|
2017-02-19 14:04:20 -08:00 |
|
Rohit Waghchaure
|
f73d459c80
|
[Fix] Removed employee party type from the payment entry
|
2017-02-19 17:46:05 +05:30 |
|
Nabin Hait
|
02d987ed13
|
Minor fix for common tree view
|
2017-02-17 15:50:53 +05:30 |
|
Nabin Hait
|
83ba5c1319
|
Merge pull request #7770 from rohitwaghchaure/minor_issue_develop
[Fix] Payment entry fields issue, added total billed hours in timesheet
|
2017-02-17 15:20:06 +05:30 |
|
Nabin Hait
|
64e222697c
|
Merge pull request #7769 from nabinhait/setup_fy_dates
Set fiscal year start and end date based on country
|
2017-02-17 15:18:28 +05:30 |
|
Nabin Hait
|
e285258374
|
Merge pull request #7762 from mbauskar/hotfix
[minor] timestamp fixes for heatmap
|
2017-02-17 15:18:01 +05:30 |
|
Nabin Hait
|
a6eb1434b3
|
Merge pull request #7771 from rmehta/item-name
[minor] item name not mandatory and item price with quick edit
|
2017-02-17 15:17:24 +05:30 |
|
Rushabh Mehta
|
0c5375d0fa
|
[minor] item name not mandatory and item price with quick edit
|
2017-02-17 14:57:31 +05:30 |
|
mbauskar
|
90818080b1
|
[minor] Configured Auto Close days for Opportunity and Issue
|
2017-02-17 14:56:00 +05:30 |
|
mbauskar
|
e1e25a0c9d
|
[minor] auto close opportunity after 7 days
|
2017-02-17 14:54:50 +05:30 |
|
Rohit Waghchaure
|
a020e4eba4
|
Payment entry fields issue, added total billed hours in timesheet
|
2017-02-17 14:51:57 +05:30 |
|
Nabin Hait
|
6af7dd4e1b
|
Set fiscal year start and end date based on country
|
2017-02-17 14:47:33 +05:30 |
|
Nabin Hait
|
801fa80b39
|
Merge pull request #7764 from rohitwaghchaure/clean_supplied_items
[Fix] Cleanup supplied items if supply raw material is set as No
|
2017-02-17 12:36:05 +05:30 |
|
Nabin Hait
|
9e5b3dad29
|
Minor fix in assesment
|
2017-02-17 11:03:44 +05:30 |
|
Rohit Waghchaure
|
4b9d2f2733
|
[Fix] Cleanup supplied items if supply raw material is set as No
|
2017-02-16 18:53:23 +05:30 |
|
Kanchan Chauhan
|
1b204c8e4e
|
Accrual Payroll System
|
2017-02-16 16:30:51 +05:30 |
|
nick9822
|
23e174c270
|
Validation for purchase_date
Separate validation for purchase date.
|
2017-02-16 16:26:38 +05:30 |
|
mbauskar
|
e7b87ad071
|
[minor] timestamp fixes for heatmap
|
2017-02-16 16:05:46 +05:30 |
|
Nabin Hait
|
de45b0eddc
|
Merge branch 'master' into develop
|
2017-02-16 15:59:59 +05:30 |
|
Nabin Hait
|
1b59b624c3
|
Merge branch 'hotfix'
|
2017-02-16 15:59:58 +05:30 |
|
Nabin Hait
|
a7d6b68bc0
|
bumped to version 7.2.21
|
2017-02-16 16:29:58 +06:00 |
|
Nabin Hait
|
c70a4d2037
|
Merge pull request #7760 from rmehta/add-activation-1
[add] site activation level
|
2017-02-16 15:51:04 +05:30 |
|
Nabin Hait
|
d13d198dc8
|
Merge pull request #7747 from KanchanChauhan/item-name-asset
[Minor] Item Name in Asset
|
2017-02-16 15:15:23 +05:30 |
|
Rushabh Mehta
|
6dd461fec4
|
[add] site activation level
|
2017-02-16 14:53:21 +05:30 |
|
Nabin Hait
|
92c52f4623
|
Merge pull request #7732 from neilLasrado/student-left
Added ability to send newsletter to Student batch Guardians and Student Group Guardians
|
2017-02-16 14:40:14 +05:30 |
|
Nabin Hait
|
ea1cb68fe7
|
Merge branch 'master' into develop
|
2017-02-16 14:37:50 +05:30 |
|
Nabin Hait
|
d5d0b36973
|
Merge branch 'hotfix'
|
2017-02-16 14:37:49 +05:30 |
|
Nabin Hait
|
7677b56f7c
|
bumped to version 7.2.20
|
2017-02-16 15:07:48 +06:00 |
|
Nabin Hait
|
b280398626
|
Merge pull request #7739 from rohitwaghchaure/payment_entry_currency_symbol_issue
[Fix] Payment Entry currency symbol issue
|
2017-02-16 14:21:24 +05:30 |
|
Nabin Hait
|
99c6c79834
|
Update payment_entry.js
|
2017-02-16 14:21:04 +05:30 |
|