Commit Graph

1424 Commits

Author SHA1 Message Date
Zarrar
2b2712bb9e [Minor] Create default department on country setup (#15206)
* make default department when creating new company

* remove departments and tds entry for the company
2018-08-24 11:26:51 +05:30
Benji
363dd2773e Update email_digest.py (#15144) 2018-08-22 21:57:51 +05:30
Zarrar
2b0ecbed2b python3 based fix for sorted (#15159) 2018-08-20 11:15:06 +05:30
Rushabh Mehta
5f33b69f2f fixes(minor): clean item group html and hide image 2018-08-16 14:48:02 +05:30
rohitwaghchaure
5c5688b374 Added provision to disabled in stock in products settings (#15133) 2018-08-16 10:33:28 +05:30
Rushabh Mehta
8705371ef0 fix(product-listing): fix variant selection in website 2018-08-16 09:22:45 +05:30
Nabin Hait
3b5f18231a fix(item_defaults): Item name was overwriting by child name 2018-08-13 17:45:29 +05:30
Nabin Hait
8bf52fef42 minor fixes 2018-08-09 19:45:33 +05:30
Nabin Hait
e07bf15de2 minor fix 2018-08-09 17:38:04 +05:30
Rushabh Mehta
708e47aadf optimize(various) 2018-08-08 16:37:31 +05:30
Nabin Hait
84c7c77009 [optimize] Get defaults from item group based on doc 2018-08-08 14:30:44 +05:30
Faris Ansari
796ca56f85 Use frappe.utils.md_to_html instead of manual import (#15087) 2018-08-07 11:53:36 +05:30
Zarrar
7f8024c516 [Enhancement] Tax Withholding Category (#15064)
* add single, cumulative threshold, remove checkboxes

* remove tds child table from supplier & add tds link field

* add description field in tax withholding category

* add tax withholding data for indian setup, some fixes

* add a checkbox for tax withholding in purchase invoice

* remove supplier's child table for tds

* enable tds field if supplier has tds set inits master

* move rates data to child table - adding fiscal year support

* change bootstrap data according to child table config of tds

* show category name in list view

* loyalty program fixes

* moved tax calculation to tax_withholding.py
- calculation for tds amount for cumulative threshold from gl entry

* add fiscal year dependency in company test

* minor loyalty program fix

* minor tier calculation fix

* minor handling duplicate exception

* toggle apply_tds according to supplier, code rectify

* minor fixes for loyalty program

* test case for single and cumulative threshold

* codacy fix
2018-08-01 17:45:05 +05:30
Shreya
21ce5e0609 Fix typo in label 2018-07-30 12:07:46 +05:30
Shreya Shah
749094dd52 Translatable UOMs (#15024) 2018-07-27 12:54:34 +05:30
Zarrar
4282729c72 delete version log while deleting company transaction (#15021) 2018-07-27 10:32:17 +05:30
Saurabh
d7897f1c53 Resolved merge conflicts 2018-07-18 17:08:16 +05:30
Shreya Shah
3c9839f832 Defaults in Item Group (#14874)
* Add Defaults table in Item Group

* Fetch defaults from Item group if not found in Item

* Add patch

* Remove default fields from Item Group

* Set query for defaults

* Fix Codacy

* Modify test records

* Modify budget.py and sales_order.py

* Remove join from query

* Else condition to avoid error if no defaults found

* refrain from making item test records before item_group

* default cost center fetch correction

* Remove tab item group from query
2018-07-17 18:01:44 +05:30
rohitwaghchaure
5fe88ea93e [Fix] Not able to update the current value of the prefixes which are defined in the autoname field (#14918) 2018-07-17 12:45:25 +05:30
Ameya Shenoy
5c3b69476d shift to self-hosted frankfurter api (#14792) 2018-07-13 12:46:07 +05:30
rohitwaghchaure
cc9c7d5e2a [Fix] GSTIN not displaying in the address print (#14855)
* [Fix] GSTIN not displaying in the address print

* Made changes in the patch and set Patch as False

* Update update_address_template_for_india.py
2018-07-10 15:41:42 +05:30
Saurabh
db7324890f Merge branch 'master' into develop 2018-07-09 15:53:51 +05:30
Shreya
83ad646af4 Filter out pending orders based on company 2018-07-09 12:14:03 +05:30
Andrew McLeod
686284261d Added check to get_parent_item_groups; if called without an item group, return a default parents list of 'Home' only. (#14811) 2018-07-06 10:41:37 +05:30
Zarrar
dfe897b888 [ Fix ] UOM Conversion fix (#14768)
* increase precision for conversion value

* inverse the conversion data

* update uom data

* rectify conversion logic according to inversion of values

* rectify test case for uom conversion

* patch improv to correct conversion data
2018-07-01 16:45:53 +05:30
Himanshu Mishra
7aabef2026 Add configurable frequency in Selling Settings for update of project … (#14670)
* Add configurable frequency in Selling Settings for update of project and company

* remove redundant code

* remove redundant code, only trigger calculation if order/invoice is present

* removed dangling commas as per common convention in hooks

* fix:handling multiple documents

* Update selling_settings.json
2018-06-28 23:43:23 +05:30
rohitwaghchaure
34c187706d [Enhance] Added Budget exception approver role in company (#14645)
* [Enhance] Added Budget exception approver role in company

* Added test cases for budget
2018-06-25 10:31:08 +05:30
Siddhi Sawant
51e4d641c8 Job Applicant Source (#14543)
* New doctype - Job Applicant Source

* Source and source name field in job applicant

* Updated install_fixtures with default options

* Update install_fixtures.py

* Fixes codacy
2018-06-21 10:47:54 +05:30
Charles-Henri Decultot
fc2292f08c Email alert renamed to Notification (#14618) 2018-06-21 09:17:52 +05:30
Saurabh
59798b4e88 resolved merge conflict 2018-06-20 15:23:25 +05:30
Zarrar
ba1cdc6c57 fix opening invoice related authorization control - item=None (#14567) 2018-06-19 10:45:47 +05:30
Ranjith Kurungadam
a8e047afc8 HRA tax exemption Indian regional (#14520)
* remove HRA fields fom declaration, proof submission

* HRA fields, methods India regional

* Company - remove Payroll Settings

* HRA India regional, override methods

* Patch to add HRA fields for India
2018-06-14 17:56:16 +05:30
Zarrar
14a9c0706b
Merge pull request #14461 from mntechnique/sales_partner_type
Partner Type as Link field added in Sales Partner
2018-06-14 12:48:24 +05:30
Rushabh Mehta
0d19744b17 [fix] for notification 2018-06-14 09:23:32 +05:30
rohitwaghchaure
fb997d6539 [Fix] Woocommerce test cases (#14513) 2018-06-14 09:13:39 +05:30
deepak-mnt
4ec283d775 patch for sales partner type field 2018-06-11 14:53:25 +05:30
Zarrar
7ab70ca2d7 [ Fixes ] v11 Tree based doctype testing (#14419)
* location tree fixes
validate if child present while deleting, filter lists down only group enabled node

* department tree fixes
Adding child fix if added from rootnode with company filter applied. Rename consistency added. Validation added in on_trash

* Company tree fix
Check if child exist while deleting a node validation added.

* Supplier Group tree fixes
on_trash validation added if child node present

* Cost Center tree fixes
Adding child to root node throws error because parent_cost_center picks up root name
2018-06-08 14:33:15 +05:30
Zarrar
13f9851609 [Docs] Update doc for Supplier Group (#14373)
* add breadcrumb for Supplier Group tree

* change occurrences of supplier-type to supplier-group

* update supplier-group doc, update pngs
2018-06-07 16:47:30 +05:30
Ameya Shenoy
873e28d9b8
Merge branch 'master' into develop 2018-06-06 05:53:19 +00:00
Shreya Shah
59af3a0296 [Enhancement] UOM Conversion Factors (#13853)
* new doctype UOM category

* new doctype UOM Conversion Factor

* bootstrap json data for uom conversions

* uom conversion in item

* Patch to add all conversions and categories

* Fetch conversions multi-way

* fix codacy

* Rebase with develop

* [minor] Fix

* Add a test case

* Improvise as per review comment

* Add json data for UOMs

* Commonify function and call from patch

* Update uom_conversion_data.py
2018-06-06 09:44:46 +05:30
Manas Solanki
dabe21051c Update test_company.py (#14360) 2018-06-05 16:28:27 +05:30
Shreya Shah
6ff3a094e2 Fix currency exchange tests (#14356) 2018-06-05 14:16:10 +05:30
Shreya Shah
630721aacc Travis (#14354)
* Fix Purchase Receipt tests

* Fix Item test

* Fix daily work summary test

* Modify currency exchange test cases

* Fix Leave Application test

* Update working hours when making salary slip from timesheet

* Replace fixer.io with exchangeratesapi

* Fix codacy
2018-06-05 12:56:10 +05:30
rohitwaghchaure
7cf01e7c75 Replaced fixer api with exchangeratesapi (#14347) 2018-06-05 10:30:20 +05:30
rohitwaghchaure
c1cf495a93 [Fix] Special character issue (#14322) 2018-06-03 16:00:31 +05:30
Ranjith
fb257ba19c Company - Payroll Settings- fields 2018-05-29 13:57:27 +05:30
Rushabh Mehta
f7414519bb [fix] set default supplier group in test 2018-05-23 16:14:35 +05:30
Zarrar
c141eb00ee [Enhance] Department added wherever applicable (#14121)
* set All Department as default parent_department

* add department field in employee_transfer

* copied data from options to fetch_from

* add department field wherever employee's link field present

* empty options field where fetch_from is added
2018-05-23 11:11:36 +05:30
Prateeksha Singh
2f69254e56 [company][dashboard] implement heatmap with linked doctypes (#14185)
* [company][dashboard] implement heatmap with linked doctypes

* [company][dashboard] cache transaction history data, schedule query daily
2018-05-23 10:41:26 +05:30
Faris Ansari
26eb513274 Rename occurences of max_days_allowed to max_continuous allowed (#14180) 2018-05-23 10:31:39 +05:30
Zarrar
42231df33a [Minor] Supplier Group test fix & default supplier in item fix (#14150)
* fix supplier group test

* item - default_supplier fix
2018-05-20 10:46:10 +05:30
Rohit Waghchaure
f689d01a0c Added finance book in Asset Depreciation Ledger report, fixed asset issue 2018-05-17 23:29:37 +05:30
rohitwaghchaure
eff678d2d6
Merge pull request #13918 from manassolanki/item-level-defualts
[enhancement] add the item defaults in the child-table for multi-company
2018-05-16 14:04:47 +05:30
Manas Solanki
b16a4ec79e changes for the default cost center 2018-05-16 13:00:56 +05:30
Rushabh Mehta
0b628386de [minor] remove in_dialog old property 2018-05-16 12:51:22 +05:30
Manas Solanki
087a2259d9 update for default warehouse 2018-05-16 12:44:07 +05:30
rohitwaghchaure
e8358f33a3 Refactor party type (#13831) 2018-05-16 11:02:26 +05:30
Charles-Henri Decultot
471dea0d10 Digest translation improvement (#14026) 2018-05-16 10:45:03 +05:30
Ranjith
c60c6981a5 Merge remote-tracking branch 'frappe/develop' into encash 2018-05-15 20:00:26 +05:30
rohitwaghchaure
c3b9eabe5e
Merge pull request #14048 from shreyashah115/exchange-rate
[Enhancement] Buying and Selling checkboxes in Currency Exchange
2018-05-15 17:55:09 +05:30
Shreya
b547cdd8fa Add buying or selling to filters in get_exchange_rate 2018-05-15 16:58:45 +05:30
Manas Solanki
1879f08c7c
Merge branch 'develop' into deferred-account 2018-05-15 15:20:44 +05:30
Zlash65
7f5ebbe494 call post company fixture after setting up company 2018-05-15 13:53:40 +05:30
Zlash65
667f846bdb bifurcate data into pre & post company fixtures 2018-05-15 13:53:40 +05:30
Manas Solanki
0393848f60 deferred account in the item and company master 2018-05-15 13:04:01 +05:30
Shreya
0db85067b2 Add For Buying and For Selling checkboxes in Currency Exchange 2018-05-15 12:48:10 +05:30
anoop
067b5574ce duplicate field is_encash removed, fixed in install fixtures 2018-05-15 12:27:23 +05:30
Saurabh
2ca83d61ea Resolve merge conflicts from enterprise_sprint branch 2018-05-14 21:15:46 +05:30
rohitwaghchaure
7c6bef4905
Merge branch 'enterprise_sprint' into supplier-group 2018-05-14 20:39:01 +05:30
Rohit Waghchaure
f41e1ed191 Added default asset accounts in COA, CWIP account in asset category 2018-05-14 19:07:40 +05:30
Rohit Waghchaure
c6deb13fb4 Added account fields in the company, fixes in auto creation of the asset from PR 2018-05-14 19:07:39 +05:30
Rohit Waghchaure
ab84254188 Asset linked to purchase receipt and serial no 2018-05-14 19:07:39 +05:30
Zlash65
366ca92ba7 move default_currency on top 2018-05-14 16:07:27 +05:30
Zlash65
39097c7fbe codacy fix 2018-05-14 15:34:45 +05:30
Zlash65
f665189ab3 tree based changes 2018-05-14 11:45:38 +05:30
Zlash65
93d6b555d7 added fixtures for supplier-group, changed analytics report accordingly 2018-05-14 11:45:38 +05:30
Zlash65
c88ce364ce treeview implemented for supplier group 2018-05-14 11:45:38 +05:30
Zlash65
890707854d config/utility level changes 2018-05-14 11:45:38 +05:30
Zlash65
3387a35fed rename supplier-type to supplier-group 2018-05-14 11:42:30 +05:30
Rah Yuliantoro
b3882cacd9 update coa and company default (#13937)
* Update standard_chart_of_accounts.py

adding account for employee advances

* Update standard_chart_of_accounts_with_account_number.py

adding account for employee advances

* Update company.py

adding accounts for default fields in company doctypes

* Update company.py

Missing some default accounts for fields in company doctype
2018-05-07 11:39:35 +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
Nabin Hait
abd0325acd Fixed merge conflict 2018-05-05 12:19:14 +05:30
Suraj Shetty
00cced12a0 Success Action (#13666)
* success action config for  sales invoice

* remove "Notification Control" doctype and its usage

* add default success action after_install or while migration (patch)

* rename for_doctype to ref_doctype

* case change

* minor fix

* Remove unnecessary code

* Replace message with translatable message

* Fix 'cannot import error'
2018-05-03 19:06:32 +05:30
Nabin Hait
ed376cacc8
Set Qty in transactions based on serial no via Stock Settings (#13897) 2018-05-03 16:24:52 +05:30
Saurabh
e85a43c1c6 Merge branch 'master' into develop 2018-05-02 14:48:10 +05:30
Prateeksha Singh
9b2078feab [fix] setup_website, fixes #11143 2018-04-30 18:11:20 +05:30
Gaurav Naik
c925a38f79 Ignore mandatory for default warehouses (#13812) 2018-04-27 15:31:11 +05:30
Siddhi Sawant
a16c8d0a2b Establishment / Effective Date field in the Company master (#13723) 2018-04-26 12:16:38 +05:30
Nabin Hait
ee09408dcc Minor fixes 2018-04-26 12:16:18 +05:30
rohitwaghchaure
efff6e53de Consolidated financial statement (#13678)
* added fields to support treeview

* tree file added, nestedset implemented

* patch added to reload doc and configure lft rgt

* Added consolidated financial statement report
2018-04-26 12:16:18 +05:30
Shreya Shah
3cf35f2496 fix syntax (#13773) 2018-04-24 12:20:21 +05:30
Shreya Shah
44e719d64c [Enhancement] Leave Application and Expense Claim (#13645)
* child table employee expense approver

* set query in department

* mandatory approver check in hr settings

* triggers on leave and expense approver

* fetch all parent approvers from department hierarchy

* fixes

* patch to move employee approvers from employee to department

* removed hard coding of roles

* modify approvers list query

* commonified functions

* patch

* renamed standard reply occurrences

* removed leave approvers table from Employee master

* email templates for leave application notification

* set default email templates for leave in hr settings

* notify by email template

* approval status in expense claim

* render template in patch

* removed unused code

* Single child table department approver

* read instead of render template
2018-04-19 20:58:52 -08:00
Shreya Shah
6bf4e5b73b Department Tree (#13567)
* Department Tree

* print hide fields

* create 'All Departments' as parent on setup

* patch to set lft rgt

* fix translatable string
2018-04-13 15:09:26 +05:30
Rushabh Mehta
fb5d678b0c
[minor] cache refactor and workflow docs (#13598) 2018-04-11 00:38:19 -08:00
Nabin Hait
2b682c82e8 Fixed merge conflict 2018-04-04 11:40:16 +05:30
Rohit Waghchaure
395d61b998 [Fix] Travis 2018-04-02 15:11:47 +05:30
Nabin Hait
c825e914d1
Added indexes for lft, rgt on nestedset doctypes (#13420) 2018-04-02 10:43:46 +05:30
Shreya Shah
562227db8f db escape as single quote in address causes error (#13451) 2018-04-02 10:12:37 +05:30
Nabin Hait
061d912749 Fixed merge conflict 2018-03-23 16:20:27 +05:30
Manas Solanki
c711445b91 add the student as party type (#13348) 2018-03-21 10:12:27 +05:30