Commit Graph

10275 Commits

Author SHA1 Message Date
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
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
Nabin Hait
5079c9ef47 Fixed merge conflict 2017-02-22 15:31:31 +05:30
Nabin Hait
633698affc bumped to version 7.2.23 2017-02-22 15:35:27 +06:00
mbauskar
a8fa10d2a9 [minor] minor fixes for journal entry get_exchange_rate trigger 2017-02-22 14:51:09 +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
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
391eca18c7 Fixed merge conflict 2017-02-20 19:38:22 +05:30
Nabin Hait
6fd8cca135 Merge pull request #7587 from noussh/develop
updated missing navigation links in Docs - Accounts
2017-02-20 19:33:55 +05:30
Nabin Hait
6a85752ead Merge branch 'hotfix' into remove-joining-datep-validation 2017-02-20 19:31:38 +05:30
Nabin Hait
e17519accb Update salary_structure.py 2017-02-20 19:30:44 +05:30
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
cd837ecbac Merge branch 'develop' into develop 2017-02-20 19:09:20 +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
afd8df8a20 Build Qty considering quantity for which bom is created 2017-02-20 18:06:50 +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
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
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
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
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