Commit Graph

305 Commits

Author SHA1 Message Date
rohitwaghchaure
4e8fdf7b3f [Enhance] Quality Inspection Template (#12988)
* [Enhance] Quality Inspection Template

* Test case and patch

* Update make_quality_inspection_template.py
2018-02-22 11:03:48 +05:30
Suraj Shetty
d3069fee4d Daily work summary refactor (#12944)
* added daily work summary setting doctype and code to support feature

this will allow multiple setting for daily work summary

* added daily work summary setting user doctype

* made changes in daily work summary code

* [minor] entry change in hr config file

* deleted previous daily work summary settings (and its company) doctype

* removed unwanted permission check

* toggled read_only option for enabled field

* removed print statements

* add patch for the changes

* doc changes

* [minor] indentation fix

* fixed tests

* indentation fixes

* codacy issue fix

* formatting fixes

* renamed doctype

Renamed Daily Work Summary Setting to  Daily Work Summary Group and did related code and doc changes

* fixed typo

* updated doc

* codacy issue fix

* [minor] renamed doctype name in json

* Renamed old doctype

* fixed indentation

* codacy fix

* indentation fix

* renamed doctype

* handled patch exception

* fixed exception

* Update daily_work_summary_group.py

* rename patch file

removed abbreviation in file name

* handled exception in patch code

* removed Unnecessary pass statement

* [minor] indentation fix
2018-02-21 15:15:43 +05:30
rohitwaghchaure
e2558308f6 [enhance] Production Plan (#12160)
* [enhance] Production plan

* Test cases

* Removed production planning tool

* Documentation

* Added actual qty in material request production item

* Renamed field 'Use Multilevel BOM' to 'Include Exploded Items'
2018-02-20 12:20:00 +05:30
Shreya Shah
278af1befb remove deprecated processing payroll video links (#12947) 2018-02-16 12:58:04 +05:30
Shreya Shah
394b7a2fa3 Rename Offer Letter to Job Offer (#12934) 2018-02-16 10:49:34 +05:30
Saurabh
2735701aab resolved merge conflicts 2018-02-14 11:51:09 +05:30
Revant Nandgaonkar
2dee8fc255 Hotels (#11907)
* [new-module] hotels, start

* Multiple Changes

Hotel Settings Added
Make invoice on Hotel Reservation

* Hotel Room validation for overbooking

* Added test fixtures and test for Hotels

* Added Tests for Hotels

Overbooking
Pricing not set

* [WIP] Documentation

Hotel Room and Screenshot

* Added Calendar view for Hotel Room Reservation

* Added Report - Hotel Room Occupancy

* Added Hotel Reservation User in Hospitality domain
2018-02-12 11:57:12 +05:30
Ameya Shenoy
5c33a04043 Shareholder and related doctypes (#12215)
* Added doctypes related to shares

- Shareholder doctype, the entity who does the transaction
- Share doctype, a child table to kepp list of all shares
- Share Transfer doctype, Logs of all made transactions

* Added logic for share transfer

- update shareholder automatically on share transfer/issue/purchase
- purchase and transfer have method remove_share which doesn't get executed because of some bug

* Added report view for share ledger

* Removed share number tracking

- removed share number tracking from Share Ledger child table for Shareholder doctype
- new doctype Share Type created

* Share Balance report added

- math behind Share Balance report needs fixing

* Changes in shareholder

- Share numbers are not tracked in Shareholder
- Share Ledger doctype deleted
- Share Balance Report bug fixed

* Shareholder

- fixed report for share balance
- remove bug from share transfer by making share type mandatory
- added buttons to shareholder for direct link to report

* Added tests for Share Transfer

* minor codacy fixes

* Added Shareholder to Party Type

* rate in share ledger & balance report is currency

* First attempt at modelling shares after Item

* Share Manager changes

- on creation of shareholder party it should check if the same combo exists
- in shareholder party make report button visible iff folio no exists
- create folio no on creation of share transfer iff it doesnt already exist
- move reports from shareholder to shareholder party

* Shareholder chages

- delete share child table doctype
- autoname added to folio no
- modify tests for share transfer

* minor changes

* removed share_no child doctype

* Restructured Share Transfer Logic (not tested)

- Everything revolves around Share Balance child table in Shareholder Party
- is_company flag still to be utilized

* Tested Share Tranfer

* minor fixes

* started new shareholder structure

* modified shareholder

* renamed Shareholder Party to Shareholder

* Shareholder rewrite complete

* new tests for shareholder written

* codacy fixes

* Added documentation
2018-02-12 11:32:47 +05:30
Jamsheer
00c1cf0a5a Healthcare Menu Fixes (#12830) 2018-02-12 11:24:12 +05:30
Manas Solanki
37b2aa2b11 changes in the education module (#12827)
update the module page
    remove fee from beta
2018-02-08 19:00:51 +05:30
Prateeksha Singh
152bf37e7f
Merge pull request #12813 from pratu16x7/hub-fixes
Hub listing and entity page
2018-02-08 10:47:16 +05:30
Nabin Hait
ed26028a93 Minor fixes for depr based on FY 2018-02-07 18:25:45 +05:30
Faris Ansari
9b64620bc0 [hub] hub page using BaseList 2018-02-05 12:57:49 +05:30
Nabin Hait
2ef1f84041 Fixed merge conflict 2018-02-03 09:14:53 +05:30
Rushabh Mehta
82fa04ce32
Update projects.py 2018-01-31 22:20:14 +05:30
system19
4e195d97c7 Minor - Healthcare Desktop UI (#12657)
* Minor - Healthcare Desktop UI

Minor - Healthcare Desktop UI

* Update desktop.py
2018-01-30 13:48:24 +05:30
Raghavendra Kamath
2967ec3d45 Add desk icons for healthcare - fixes 11838 (#12518)
* Add desk icons for healtcare - fixes 11838

* Remove unnecessary white spaces
2018-01-17 16:11:09 +05:30
Charles-Henri Decultot
34e335ba34 Prorated Asset Depreciation 2018-01-05 17:49:06 +00:00
Jamsheer
c90195de29 Patient medical record and Consulatation (#12198)
* Patient Medical Record - Subject field reqd=0, Subject text formated

* Consultation - remove patient details section

* Search fields are updated for Consultation and Appointment

* Translations applied on menu
2017-12-29 14:32:13 +05:30
Prateeksha Singh
9a57049faa
Merge pull request #12113 from pratu16x7/leaderboard
Add Leaderboard to desktop
2017-12-20 11:39:05 +05:30
Prateeksha Singh
04c4ce353c Add leaderboard to desktop 2017-12-20 10:51:25 +05:30
Manas Solanki
2bca5a98ae add the data import icon in the desktop.py (#12062) 2017-12-18 13:55:30 +05:30
Kenneth Sequeira
9bceb388c8 changed dead YouTube link for videos (#12053) 2017-12-16 10:50:29 +05:30
Nabin Hait
d0249b0880
Employee advance (#11875)
* Employee Advances against Expense Claim

* added employee advance test cases and docs

* Default Employee Advance Account field in company

* Cleanup and fixes of employee advance
2017-12-14 13:25:57 +05:30
Manas Solanki
56f5b5f75c Update the desktop.py (#11974)
Remove the data import desktop icons
2017-12-13 11:28:18 +05:30
Pawan Mehta
bb7fab52d1 [fix] #11880- Item wise report showing price list and stock available (#11885)
* [fix] #11880

* review comments

* codacy fixes
2017-12-12 15:05:03 +05:30
Manas Solanki
6a415bd32d set desktop icons (#11953) 2017-12-12 13:24:13 +05:30
Shreya Shah
88dbc26a98 replace process payroll (#11873) 2017-12-07 18:24:42 +05:30
Ameya Shenoy
5c62368a65 [Agriculture Domain] (#11663)
* created Soil Analysis, Water Analysis, Weather and Fertilizer doctype

* soil doctype edited and crop doctype added

* minor stuff

* Land Unit + Leaflet

* crop cycle added

* Land Unit changes + Crop cycle

* autoname for plant_analysis

* created Agriculture Task

* minor stuff

* - deleted agriculture_task
- current state after the call

* [Agriculture] modified fertilizer doctype to have a link to Item
This was done so that the `Fertilizer` doctype could track the contents exclusive to the fertilizer, whereas the `Fertilizer Item` could be a seperate entity, so as to leverage the existing ERPNext doctypes

* Added fields to `Water Analysis` doctype
- Collection Datetime
- Laboratory Testing Datetime
- Results Datetime (default to Laboratory Testing Datetime)

* Edited the doctypes `Agrivulture Task`, `Pest` and `Soil Texture`
- Created `agriculture task` doctype
- added fields `Common Name`, `Scientific Name`, `Treatment` and `Treatment Options` to `Pest` doctype
- edited `Soil Texture` doctype to contain a soil texture ternary plot diagram made using SnapSVG. The code was put in public folder so as to be accessible by the entire agriculture module

* Recursively reflect child land unit feature changes on parents

* fixed feature repition bug

* added legeneds to ternary plot

* added stuff

* changes

* fix Task

* reverted the Task Doctype to have naming in the form TASK.#####

* fixed modifications made to TASK doctype

* [dirty commit] added auto create Task from Crop on creation of Crop Cycle

* Changed the Crop Cycle Doctype
- Deleted the "Crop Cycly Task" doctype and its link from "Crop Cycle"
- Creation of a new Project with the same name as the Crop Cycle on creation of a new Crop Cycle
- Creation of all the tasks imported from Agriculture Task doctype of the Crop in the Crop Cycle

* [Agriculture Module] Modifications
- Created childtable doctype "Pest Detected"
- Added childtable "Pest Detected" to Pest
- Modified "Agriculture Task" to include "Start Day" and "End Day" of task
- Modified the code in "Crop Cycle" to create a parent task with same name as Crop Cycle

* [Agriculture Module] fixed Pest doctype not saving issue

* [Agrcilture Module] Changes in Crop Cycle
- removed the creation of a master task on creation of a new crop cycle
- temporary fix to add the pest tasks from the pests added in crop cycle

* land_unit_tree.js fields modified to have field objects instead of just field names

* Revert "land_unit_tree.js modified"

* land_unit_tree.js fields modified to have field objects instead of just field names

* [Agriculture Domain] Converted Agriculture Module to a Domain
- Converted into a Domain field from Select to Link field in Company doctype, linked to Domain doctype
- Agriculture (alpha) is now a Domain

* land_unit area aggregation enabled

* land_unit.py checks feature diff for every ancestor and not just the parent

* Removed unnecessary print messages

* agriculture.py modified to include fixtures

* fixtures added to setup.py inside agriculture module

* [Agriculture Domain] UI tests added
- 'materials' table renamed to 'materials_required' in 'Crop'
- wrote UI test for Crop, Fertilizer, Crop Cycle, Pest, Water Analysis, Soil Texture
- moved creation of tasks from client side to server side in Crop Cycle
- Plant Analysis, Water Analysis, Soil Analysis, Soil Texture docs are now autonamed in the format PAnalysis.#####, WAnalysis.#####, SAnalysis.#####, STexture.##### respectively
- company_name changed in domains.py from 'Schrute Farms.' to 'Schrute Farms'

* [Agriculture Domain] Mostly written server side tests and moved client side code to server side
- moved client side code to server side for Crop, Water Analysis, Pest, Soil Texture,
- wrote server side tests for Crop, Crop Cycle, Fertilizer, Soil Texture, Pest
- NOTE: none of the server side codes were tested

* [Agriculture Domain] All server side tests working locally

* [Agriculture Domain] Testing
- added sample test for Land Unit, which needs to be modified to test multiple things
- modified tests to be independant of each other

* Land Units tests added and area aggregation code migrated to server side

* added land_unit server side tests and on_trash added to land_unit

* Changing field location for start date

* [Agriculture Domain] deleted unnecessary comments

* [Agriculture Domain] reverted changes

* [Agriculture Domain] Modified the code to replace Pest doctype with Land Unit doctype
- Deleted the Pest doctype and replaced it with the more generic Disease doctype
- Deleted the Detected Pest doctype and replaced it with Detected Disease doctype

* [Agriculture Domain] resolves #11654, resolves #11653

* [Agriculture] Added links to soil analysis, soil texture, plant analysis in crop cycle and land unit
- not working perfectly yet
- docs are fetched but not appended

* [Agricuture] Crop Cycle modifed to link with relevent analysis docs, not fully functional

* [Agriculture] added seperate stage for client side agriculture tests

* [Agriculture] minor modification to crop_cycle.js test

* [Agriculture] fixed tests

* upgrade chromedriver in .travis.yml from 2.32 to 2.33

* [Agriculture] added land unit ui test

* [Agriculture] added Agriculture server side test as a seperate stage in travis

* tesing travis.yml

* [Agriculture] Crop Cycle is able to fetch linked analysis docs

* Modified travis.yml for modular server side testing

* [minor fix][Agriculture] in soil_texture

- fixed multiple soil_texture ternary plot creation on refresh
- fixed error on soil composition change

* Update .travis.yml

* removed location field from linked doctypes

* minor fixes and cleanup of agri

* minor fix in agriculture and domain patches

* permissions added to agriculture

- Agriculture Manager and Agriculture User roles were added to all Agriculture doctypes

* [Agriculture]

- Created Agiculture Analysis Criteria and added sample records to it
- All the analysis doctypes now fetch their fields inside a child table, form Agriculture Analysis Criteria
- Also Fertilizer does the same
  This was introduced so that, new parameters could be added on demand

* minor changes requested in Agriculture

* minor changes

* minor fix

* Update desktop.py

* Update .travis.yml
2017-12-06 18:36:27 +05:30
Nabin Hait
419db49806 non-profit module cleanups 2017-12-06 12:57:53 +05:30
Vishal
74116172b8 [fix] Reviewed Chapter Doctype Modification 2017-12-05 16:41:09 +05:30
Vishal
a68234d345 [new] Fontawesome icon added 2017-12-05 16:41:09 +05:30
Vishal
d5d0813b2d [new] Modified Doctypes for list view 2017-12-05 16:41:09 +05:30
Vishal
2c9ce190eb [new] Grant Application Doctype Added 2017-12-05 16:41:09 +05:30
Vishal
7525bc6f1d [new] Doctype Donor and Volunteer Added 2017-12-05 16:41:09 +05:30
Vishal
b4cda1b4a1 [fix] Address field removed in Member 2017-12-05 16:41:09 +05:30
Vishal
10608e8c65 [fix] Removed address field in Member doctype 2017-12-05 16:41:09 +05:30
Vishal
e01846051d Membership Type shows under memberhip section 2017-12-05 16:41:09 +05:30
Vishal
cc06d291c6 link member in dynamic link table 2017-12-05 16:41:09 +05:30
Vishal
ca61453fa3 [new] Non Profit module Added 2017-12-05 16:41:09 +05:30
KanchanChauhan
2d1cbd0b2e Delete old asset doctypes from Accounts module and minor changes (#11766) 2017-11-29 16:03:00 +05:30
Nabin Hait
46e285efe9 Merge branch 'add_delivery' of https://github.com/creamdory/erpnext into creamdory-add_delivery 2017-11-29 14:15:16 +05:30
Nabin Hait
cf9573ab2f Removed asset doctypes files from accounts module and patches 2017-11-28 16:56:53 +05:30
Kanchan Chauhan
e58a41a8a2 Added maintenance to Asset and enhanced maintenance for Asset Maintenance 2017-11-28 15:14:56 +05:30
Manas Solanki
966f141f62 Rename schools to Education (#11524)
* renaming for the docs, demo data and patch

* changes in the doctypes and reports

* rename the config file

* Few name changes in messages and license

* rename the school settings to education settings

* changes in the documentation

* added the setup file for the fixtures

* corrected the ui tests file path

* fix the codacy

* add the patch for renaming few doctypes and fields

* changes in the patch
2017-11-23 15:22:10 +05:30
creamdory
fd1503c6a5 [New Feature] Delivery 2017-11-20 10:28:49 +08:00
Prateeksha Singh
744ff0010b Variant report (#11618)
* Item Variant Details Report

* remove queries from inside for loop

* make attribute value map

* Update item_variant_details.py
2017-11-17 12:00:29 +05:30
Rushabh Mehta
d3f5d0961a
[feature] Opening Invoice Creation Tool (#11589)
* [enhance] Opening Invoice Tool create Opening Sales/Purchase Invoices

* [minor] added progress bar while creating invoice

* [minor] allow bulk upload for the invoices

* [minor] calculate item rate from net total

* [minor] added defaults for invoices fields, create gl entries only if grand_total is greater than 0

* [minor] check mandatory values before making opening invoices

* [minor] enable primary button if there is any error while creating invoices

* [minor] minor fixes, set company currency as invoice currency added tests

* [dashboard] added Opening Invoice Summery section in Dashboard

* [minor] added total invoices count on dashboard

* [minor] don't show dashboard if there are no opening invoices available

* [minor] added Opening Invoice Tools to Account's Tools section

* [minor] codecy fixes

* [fix] refactored general ledger and buttons on charts

* [fix] tests
2017-11-15 16:29:53 +05:30
Rushabh Mehta
cc1262c36d
Add option to clean description html in item description. (#11565)
* [fix] add item settings

* [docs] Item Settings

* [fix] enqueue in item_settings.py

* [refactor] move to stock settings

* [refactor] move to stock settings
2017-11-14 16:36:25 +05:30
Manas Solanki
e5aa9c5f2f new report - assessment plan status (#11504)
* new report - assessment plan status

* add the report in the school dashboard

* fix for the print format
2017-11-13 18:56:53 +05:30