Merge branch 'develop' into payroll_entry

This commit is contained in:
Nabin Hait
2017-12-06 19:18:40 +05:30
committed by GitHub
328 changed files with 20877 additions and 3508 deletions

View File

@@ -0,0 +1,5 @@
Disease
Crop
Land Unit
Crop Cycle
Soil Texture

View File

@@ -0,0 +1,7 @@
erpnext/agriculture/doctype/land_unit/test_land_unit.js
erpnext/agriculture/doctype/fertilizer/test_fertilizer.js
erpnext/agriculture/doctype/water_analysis/test_water_analysis.js
erpnext/agriculture/doctype/disease/test_disease.js
erpnext/agriculture/doctype/soil_texture/test_soil_texture.js
erpnext/agriculture/doctype/crop/test_crop.js
erpnext/agriculture/doctype/crop_cycle/test_crop_cycle.js

View File

@@ -141,3 +141,17 @@ erpnext/selling/doctype/quotation/tests/test_quotation_with_margin.js
erpnext/accounts/doctype/sales_invoice/tests/test_sales_invoice_with_margin.js
erpnext/hr/doctype/payroll_entry/test_set_salary_components.js
erpnext/hr/doctype/payroll_entry/test_payroll_entry.js
erpnext/agriculture/doctype/land_unit/test_land_unit.js
erpnext/agriculture/doctype/fertilizer/test_fertilizer.js
erpnext/agriculture/doctype/water_analysis/test_water_analysis.js
erpnext/agriculture/doctype/disease/test_disease.js
erpnext/agriculture/doctype/soil_texture/test_soil_texture.js
erpnext/agriculture/doctype/crop/test_crop.js
erpnext/agriculture/doctype/crop_cycle/test_crop_cycle.js
erpnext/non_profit/doctype/membership_type/test_membership_type.js
erpnext/non_profit/doctype/member/test_member.js
erpnext/non_profit/doctype/volunteer_type/test_volunteer_type.js
erpnext/non_profit/doctype/volunteer/test_volunteer.js
erpnext/non_profit/doctype/donor_type/test_donor_type.js
erpnext/non_profit/doctype/donor/test_donor.js
erpnext/non_profit/doctype/grant_application/test_grant_application.js