Commit Graph

981 Commits

Author SHA1 Message Date
Saurabh
2ca83d61ea Resolve merge conflicts from enterprise_sprint branch 2018-05-14 21:15:46 +05:30
Saurabh
1f1dd96f57
Merge branch 'enterprise_sprint' into jam_enterprise_sprint 2018-05-14 20:57:40 +05:30
Pawan Mehta
c53e35368d Shift Management - Documentation and Tests (#13997)
* [fix] #13996

* codacy fix
2018-05-11 21:03:50 +05:30
Jamsheer
9032c9d91d Documentation - updated 2018-05-09 19:19:34 +05:30
Jamsheer
63a8f83076 Leaves - Documentation 2018-05-08 18:45:41 +05:30
Shreya Shah
204c3bc37e Remove Production Planning Tool docs (#13946)
* Remove Production Planning Tool docs

* Remove Offer Letter Occurrences

* Rename Employee Loan Occurrences
2018-05-07 18:21:03 +05:30
Nabin Hait
01f5df72cc Merge branch 'employee_promotion_transfer' of https://github.com/ESS-LLP/erpnext-healthcare into ESS-LLP-employee_promotion_transfer 2018-05-07 11:55:52 +05:30
Nabin Hait
ba70ff0904
Exchange rate revaluation (#13932)
* Added account data on child table

* Added Journal Entry button and functionality

* Add docs

* Refactoring and cleanup of Exchange Rate Revaluation
2018-05-05 18:22:56 +05:30
Ranjith
715780b78b Employee Promotion, Transfer - documentation 2018-05-05 13:51:34 +05:30
Suraj Shetty
57fbebb630 Update user permission doc (#13695) 2018-05-03 19:07:07 +05:30
Shreya Shah
ecb9315ea1 Inter Company Journal Entry (#13683)
* rebase with enterprise_sprint

* Add Inter company account checkbox in Account master

* Add Inter Company Journal Entry Voucher Type in Journal Entry

* Make Inter Company Journal Entry button

* Dialog to select company for Inter Company Journal Entry

* Map relevant fields in the Inter Company Journal Entry and reference links

* Rebase

* Add Documentation
2018-05-03 19:04:36 +05:30
Umair Sayed
cd00f8f458 Updated domain pages (only content) and added few new help pages. (#13835)
* domain pages update

* domain docs

* domain pages

* help and domain pages
2018-05-02 12:21:35 +05:30
Nabin Hait
3652a62b55 minor fixes 2018-04-30 19:32:29 +05:30
Adam Dawoodjee
3cd4fce710 Typo fix (#13809) 2018-04-30 11:13:18 +05:30
Kenneth Sequeira
b01f998b49 Update tracking-project-profitability-using-cost-center.md (#13792)
Fixed typo in the title.
2018-04-26 18:40:14 +05:30
Nabin Hait
f914bd374d Added links in HR module 2018-04-26 12:13:24 +05:30
Kenneth Sequeira
70330e8379 fixed user permission video link (#13774) 2018-04-24 14:12:41 +05:30
Shreya Shah
4dc453d131 Loan Management for the Members (Non Profit Module) (#13149)
* Renamed - Employee Loan Application to Loan Application, Employee Loan to Loan and field Employee Loan Account to Loan Account

* Patch added

* Dynamic link fields 'applicant' and 'applicant_type'

* Member link visible only if domain non profit is active

* Modified loan_dashboard

* Make Repayment Entry button

* Common file loan_common.js for loan and loan_application

* repayment schedule rows selection in dialog

* validation if repayment amount > total paid amount

* repayment only if disbursement is done, make repayment by selecting the installment which falls in the current month

* fetch nowdate if disbursement date not found

* Rebased with develop

* updated non-profit module page

* updated patch for renamed fields

* dialog to select repayment entries

* hidden field to store reschedule paid status

* update paid check in loan on journal entry updation

* calculate total paid

* updated docs

* codacy fix
2018-04-24 12:19:36 +05:30
Kenneth Sequeira
5becde7a45 embedded social login keys set up videos (#13659) 2018-04-24 12:11:29 +05:30
Saurabh
2e7a45dbb4 resolved merge conflicts 2018-04-24 11:16:13 +05:30
Kenneth Sequeira
d4991cc49f Assets Docs Update (#13749)
* asset depreciation auto booking image added

* commit 3
2018-04-23 11:35:24 +05:30
Julian Robbins
78869f1e77 Update manual-feedback-request.md (#13709)
Changed wording to reflect current wording of Feedback Request rather than 'Ask a Feedback'
2018-04-18 03:12:30 -08:00
tundebabzy
caae0f4dcc Merge branch 'develop' into new-subscription 2018-04-17 09:34:04 +01:00
Rushabh Mehta
fb5d678b0c
[minor] cache refactor and workflow docs (#13598) 2018-04-11 00:38:19 -08:00
Doridel Cahanap
ad76f9ad70 [Enhancement] Work Order Material Consumption (#13384)
* Work Order Material Consumption

* Test cases and other minor fixes

* Test cases fixes

* Travis Fixes

* Work Order Material Consumption Request Changes

* Update work_order.js
2018-04-09 10:31:28 +05:30
Kenneth Sequeira
2d79e46fbd updated images for print format (#13498) 2018-04-06 11:22:37 +05:30
Nabin Hait
2b682c82e8 Fixed merge conflict 2018-04-04 11:40:16 +05:30
Vinayak Jethe
df83148d7c Woocommerce Integration (#13217)
* WIP for WooCommerce Integration

* WIP for WooComm Integration

* WIP WooComm

* Added Woocommerce Settings

* Woocommerce Settings

Enable Sync Makes fields mandatory

* Woocommerce whitelisted endpoints

* [Clean Up] Woocommerce Settings

* Verify Webhook Data

* Fix Verify Webhook

* WIP WooComm

* WIP and working few modules

* Customer creating partially

* Customer creation successful

* Refactored Customer code

* WIP Address

* Fixed address and customer bug. Now working fine

* WIP for products. Creation of items successful

* Handling json for product

* Products creating and updating properly

* Custom checkbox for required doctypes

* Product feature fully completed

* WIP orders

* Sales order working properly

* Orders mapping successfully

* New version Customer Working Properly

* Items creation properly

* Working on sales order

* Orders comming successfully

* Bug fixes

* Fixed date format for delivery date

* Code Cleanup

* Woo setting page modified

* Fixed minor bug

* Fixes

* Minimum Viable Product

* Cleanup

* Removed duplicate file from erpnext config

* Added more default changes to woo settings

* Fixes as per required

* Fixes

* Bug fix

* few changes and fix

* Fixing

* Fixes with test

* Added Test for Woocommerce - Emulates request

* Fix woocommerce test

* fix woocommerce test

* verify_request: py3 ready

* Codacy fixes

* WooCommerce Integration Docs

* Codacy changes

* Codacy fixes

* User set tax account

* Fixes for account

* Fix for warehouse issue

* Docs updated

* Codacy fix

* Updated Docs

* Minor changes

* Tested added for repeat order and cleanup

* Minor change

* docs and gifs renamed according to convention

* Doc updated
2018-04-03 11:17:03 +05:30
Suraj Shetty
c5effbf009 Data export tool doc (#13419)
* data export tool docs

* change doc gif path
2018-04-03 10:43:08 +05:30
Kenneth Sequeira
84fe32d05c removed pos-view article since it is deprecated (#13456) 2018-04-02 10:26:43 +05:30
Shreya Shah
a8df73c263 typo in landed cost voucher doc (#13472) 2018-04-02 10:16:27 +05:30
rohitwaghchaure
a3c3dec5a2 [enhance] Item Alternative (#13121)
* [enhance] Item Alternative

* Added two way provision in item alternative

* Test Cases

* documentation
2018-03-28 11:51:44 +05:30
Zarrar
7f4cd3f5ea Update Docs for Work Order (#13403)
* update docs

* rename files, update pngs

* update pngs for timesheet, leftover changes
2018-03-27 14:59:49 +05:30
Shreya
7619cd2e14 updated docs for timesheet 2018-03-23 11:41:56 +05:30
Kenneth Sequeira
6a92cdc358 Update cost-center.md (#13354)
Fixed link to missing image for cost centre.
2018-03-21 17:52:52 +05:30
Charles-Henri Decultot
d0ac69704f Chained log report doc (#13314) 2018-03-20 13:12:28 +05:30
Doridel Cahanap
c893268dea Add Health Insurance Doctype and link to Employee (#13257) 2018-03-20 12:37:02 +05:30
Kenneth Sequeira
b48557fdc6 payment terms video tutorial in videos/learn (#13258)
* payment terms video tutorial in videos/learn

* Update payment-terms.md
2018-03-12 13:07:21 +05:30
tundebabzy
8889b70ba1 Merge branch 'develop' into new-subscription 2018-03-09 09:10:48 +01:00
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
tundebabzy
9e863b9572 Merge branch 'develop' into new-subscription 2018-03-02 11:10:27 +01:00
tundebabzy
4499e5351c add article 2018-03-02 06:51:33 +01:00
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