Commit Graph

869 Commits

Author SHA1 Message Date
Doridel Cahanap
c893268dea Add Health Insurance Doctype and link to Employee (#13257) 2018-03-20 12:37:02 +05:30
Kenneth Sequeira
89795c3f69 Doc imp (#13148)
* added intro, item and prices video, fixed image links in item and prices

* update 2: first 5 videos added

* added all videos to the user manual

* updated .gitignore
2018-03-05 11:06:44 +05:30
Charles-Henri Decultot
bc7a549fdb Gocardless integration (#13008)
* GoCardless integration

* Addition of a method for determining if the email should be sent or not

* Correction for Tests

* Codacy fix

* Documents moved to ERPNext

* Codacy fix

* Codacy fixes

* Remove method where not necessary and replace with hasattr
2018-03-01 10:59:21 +05:30
Nabin Hait
cf72d7f135 Fixed merge conflict 2018-02-22 14:47:26 +05:30
tundebabzy
cad22dbe39 Cutomisable Cash Flow Reports (#12969)
* add child doctype - Cash Flow Mapping Account

* adds new doctype - Cash Flow Mapping

* adds new doctype - Cash Flow Mapper

* adds new doctype Cash Flow Mapping Template

* adds new doctype Cash Flow Mapping Template

* adds adjustments to Cash Flow Mapper:
- remove fields from Cash Flow Mapping Template Details
- update in Cash FLow Mapper

* get cash_flow_accouts from Cash Flow Mapping

* change `tmp` to `mappers` and make sure `mappers` is sorted by its `position` field

* changes description from 'Net Profit/Loss' to 'Profit for the year'

* set `net_profit_loss` `parent_account` properly

* modify `get_account_type_based_data`:
- changed signature such that `account_type` parameter is now `account_name`
- where clause in query is now based on `name`

* remove zero rows

* de-duplicates row, summing similar accounts in the process

* makes gl sum calculation use `parent_account` as a condition

* add the `section_leader` immediately after adding net profit, sorts `accounts` by `is_working_capital` field

* adds `is_working_capital` to "account_types" so that we can use this to determine when to add "Changes in working capital" for operating activities

* add "Movement in working capital" subheader

* refactor code for readability

* adds new fields to `Cash Flow Mapping`:
- `is_interest_paid` to allow me recognise accounts for 'Interest Paid'
- `is_income_tax_paid` to allow me recognise accounts for 'Income Taxes Paid'

* allow `Cash Flow Mapping` to be renamable

* adds new field - `section_subtotal` useful for only Operating Activities

* changes `Cash Flow Mapping` doctype fields:
- remove `is_income_tax`_field
- add `is_income_tax_liability` field to identify tax payable accounts
- add `is_income_tax_expense` field to identify tax expense accounts in P or L

* calculates and shows tax paid adjustment in cash flow statement

* renames `is_interest_paid` to `is_finance_cost`

* - adds finance costs calculation
- correctly sets opening balance dates

* prevents users from selecting extra options in Cash Flow Mapping

* adds validation to prevent selecting multiple options

* adds new fields to Cash Flow Mapping

* calculate non cash p or l items (2nd pass)

* separates default cash flow generation from custom

* adds new setting to Accounts Settings:
- allow user elect to use customised cash flow report

* clean up

* removes mandatory constraint from accounts field

* allow rename, disallow create and delete

* adds patch to add default Cash Flow Mappers

* refactors custom_cashflow

* add article to explain configuration

* refactor

* further refactor

* final clean up (hopefully)

* clean up for codacy

* more codacy fixes

* more codacy fixes

* fix broken patch

* rename article to .md

* create default mappers after install

* PEP 8

* create the tables in `after_install` call
2018-02-22 11:08:36 +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
Charles-Henri Decultot
b8c088edb7 Transaction Log for France (#12795)
* Regional overrides for France

* Addition of tests and documentation
2018-02-21 11:07:33 +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
f718b0c0df Currency filter in Pricing Rule (#11776)
* added currency filter

* modified files

* pull margin only if currency matches

* Renamed price to rate in pricing rule

* fetch rate only if currency matches

* rebase with develop

* rebase with develop

* patch to set currency in existing docs

* currency field mandatory in pricing rule

* modified test cases

* rebase with develop

* fixed test case
2018-02-20 11:26:46 +05:30
Charles-Henri Decultot
894ab7a664 Braintree integration documentation (#12775)
* Braintree integration documentation

* Cleanup documentation
2018-02-16 15:16:47 +05:30
Shreya Shah
394b7a2fa3 Rename Offer Letter to Job Offer (#12934) 2018-02-16 10:49:34 +05:30
PrakashH
908af53fcd Update stock-reconciliation-for-non-serialized-item.md (#12908) 2018-02-14 13:16:25 +05:30
PrakashH
0c4c2981c8 Update journal-entry.md (#12909) 2018-02-14 13:15:53 +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
Manas Solanki
458a4e13bd updated the docs for education 2018-02-08 20:12:41 +05:30
Bassam Ramadan
fd044a0d5e docs-fixes (#12805) 2018-02-07 18:59:06 +05:30
Nabin Hait
ed26028a93 Minor fixes for depr based on FY 2018-02-07 18:25:45 +05:30
Kenneth Sequeira
f6daf56054 Added Tutorial Videos for Education in User Manual (#12678)
* added erpnext education tutorial videos to the manual

* testing with div

* Update program-enrollment.md

Properly ended YouTube video.

* removed group assessment criteria page
2018-01-31 12:49:58 +05:30
Charles-Henri Decultot
241b09ee11 Addition of index.txt 2018-01-26 07:53:59 +00:00
Charles-Henri Decultot
d0c2f7b754 Doc file rename 2018-01-26 07:09:11 +00:00
Saurabh
9c6bf08e77
Merge pull request #12547 from joshreeder/patch-1
Update dropbox-backup.md
2018-01-24 07:57:15 +05:30
Charles-Henri Decultot
90657fb566 FEC report for France (#12446)
* FEC report for France

* Codacy correction
2018-01-23 15:40:14 +05:30
Shreya Shah
3191951bff Updated docs for Payroll Entry (#12552)
* updated docs for payroll entry

* fixed a link in employee-advance doc
2018-01-23 15:37:23 +05:30
Josh Reeder
c8b9648c53
Changed instructions
No need to copy and paste into text editor, problems with error message have to do with the form needing saved before Allow Access button is used.
2018-01-20 15:56:15 -06:00
Josh Reeder
4c38e67f1a
Update dropbox-backup.md
Steps for open source users were wrong and there were many work arounds. i have updated the instructions with the most streamlined process.
2018-01-18 15:38:59 -06:00
Kenneth Sequeira
7030817bf2 fixed image links in role based permissions and user permisissions. Fixed a spelling mistake in user permissions (#12500) 2018-01-17 16:13:28 +05:30
Umair Sayed
d8b4c8bd5b Update index.txt (#12507) 2018-01-17 16:12:00 +05:30
Pawan Mehta
d0e7367525 [fix] #12390 (#12391) 2018-01-09 14:33:25 +05:30
Charles-Henri Decultot
34e335ba34 Prorated Asset Depreciation 2018-01-05 17:49:06 +00:00
Nabin Hait
cb495fb33b Merge branch 'master' into develop 2018-01-05 13:17:00 +05:30
James Robertson
46196c4ad3 Setup Wizard Updates (#12337)
Changes to support v10 ERPNext Setup Wizard
2018-01-05 12:50:04 +05:30
Doridel Cahanap
291b26ad04 Training Documentation in DE (#12309) 2018-01-05 12:47:40 +05:30
Manas Solanki
171157f1b3 Fix + Enhancement in Program Enrollment Tool (#12291)
* Fix + Enhancement in Program Enrollment Tool

* updated the docs
2018-01-05 12:42:39 +05:30
Manas Solanki
76ea7a9227
Merge pull request #12301 from kennethsequeira/cust-report-vid
Updated youtube video link for custom reports article
2018-01-02 21:53:47 +05:30
Kenneth Sequeira
82bd3302ee updated youtube video link for custom reports article 2018-01-02 21:41:48 +05:30
Kenneth Sequeira
13e5689bd9 Updated the image paths for Custom Doctype manual 2018-01-01 17:33:57 +05:30
Manas Solanki
91017cba8d Additional fields in the instructor doctype for the academics log and minor permission changes (#12204) 2017-12-28 12:34:36 +05:30
Manas Solanki
e20a0f1115 [Fix] make PE unique for the combination of academic year and academic term (#12214) 2017-12-28 12:29:11 +05:30
Umair Sayed
82035c6c7a Update index.md (#12118) 2017-12-21 11:55:05 +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
Umair Sayed
4667cb2f62 Update implementation-strategy.md (#12002) 2017-12-14 12:21:47 +05:30
Charles-Henri Decultot
d18423d9c7 Project Margin Calculation Improvement (#11911)
* Project Margin Calculation Improvement

* Documentation modification

* Change Total Planned Sales to Total Sales Amount

* Change documentation screenshot
2017-12-12 14:59:59 +05:30
rohitwaghchaure
4e17fae63b [enhance] UAE/KSA VAT/Excise implementation (#11923) 2017-12-12 14:40:52 +05:30
Ameya Shenoy
396feba874 agri_docs fix links (#11870) 2017-12-07 12:53:57 +05:30
Ameya Shenoy
e0d461c2eb [Agriculture] documentaion (#11867) 2017-12-07 11:53:12 +05:30
KanchanChauhan
f6aff3de96 [New Feature] Sample Retention from a Batch of item recieved (#11624) 2017-12-06 18:38:01 +05:30
Vishal Dhayagude
d4e439906c [fix] Modification in Non Profit docs (#11862) 2017-12-06 18:02:31 +05:30
Vishal
5ade836713 [new] Non Profit Documentation Modified 2017-12-05 16:41:09 +05:30
Vishal
1ebdeacee3 UI Test Added for Membership Type 2017-12-05 16:41:09 +05:30