rohitwaghchaure
25e63e806c
fix: modified date ( #16520 )
2019-01-30 11:46:34 +05:30
Sagar Vora
f97c5dad82
Merge branch 'staging' into develop
2019-01-29 18:39:14 +05:30
Nabin Hait
1467962f8a
Merge pull request #16490 from nabinhait/gst_settings_perm
...
GST Settings permission and regional taxes creation
2019-01-29 11:27:18 +05:30
Nabin Hait
3ccc16e4e0
Merge pull request #16449 from scmmishra/remove-foundation
...
feat: Deprecated In App Help
2019-01-29 11:20:23 +05:30
Nabin Hait
e8190473f5
Merge branch 'staging-fixes' into unicode
2019-01-29 11:13:04 +05:30
scmmishra
3f9b231f31
[fix] Links now redirect to erpnext.com
2019-01-25 12:56:27 +05:30
Nabin Hait
f05d91d317
Merge branch 'develop' into Item-Tax-Template-V12
2019-01-25 11:26:47 +05:30
Nabin Hait
596c1b3489
Merge pull request #16220 from SaiFi0102/Party-Ledger-Summary
...
feat: Party Ledger Summary Report
2019-01-25 11:22:55 +05:30
Nabin Hait
ddc65dfb87
fix: delete taxes and charges template while deleting company
2019-01-25 11:04:14 +05:30
Nabin Hait
2a1aedfff1
fix(setup): Create regional taxes on creation on company
2019-01-24 17:56:19 +05:30
Faris Ansari
badf1c42e0
chore: Add error logging for failed get_exchange_rate call
2019-01-24 16:28:53 +05:30
deepeshgarg007
0c38cf06a5
fix: Wrong argument fix in email digest filters
2019-01-23 19:11:24 +05:30
Aditya Hase
f3c22f342c
fix(unicode): Import unicode_literals in every file
2019-01-22 18:36:10 +05:30
Saif Ur Rehman
74a3370095
Merge branch 'develop' of https://github.com/frappe/erpnext.git into Item-Tax-Template-V12
...
# Conflicts:
# erpnext/buying/doctype/purchase_order/purchase_order.json
# erpnext/patches.txt
# erpnext/selling/doctype/quotation/quotation.json
# erpnext/selling/doctype/sales_order/sales_order.json
2019-01-22 16:20:40 +05:00
Sagar Vora
4d1a9b10ed
Merge branch 'staging' into develop
2019-01-22 15:56:39 +05:30
Nabin Hait
f0ea152022
Merge pull request #16289 from Anurag810/Quality-inspection-fix
...
fix: validated quality inspection for delivery note(DN) and purchase receipt(PR)
2019-01-22 10:49:55 +05:30
Nabin Hait
a39f324682
fix: Disable rounded total field's value honours docfield's default value
2019-01-21 18:50:50 +05:30
deepeshgarg007
3565395e7a
Merge branch 'email_digest' of https://github.com/deepeshgarg007/erpnext into email_digest
2019-01-21 15:03:51 +05:30
deepeshgarg007
aab6d0e028
fix(email_digest): Linkes annual income and annual expense to profit and loss statement
2019-01-21 15:01:40 +05:30
Deepesh Garg
f7fe08c487
Merge branch 'develop' into email_digest
2019-01-20 16:53:41 +05:30
Saif Ur Rehman
fcaed12a53
Merge branch 'Party-Ledger-Summary' of https://saifi0102@github.com/SaiFi0102/erpnext.git into Party-Ledger-Summary
2019-01-19 13:18:23 +05:00
Saif Ur Rehman
398f593e5f
Merge branch 'develop' of https://github.com/frappe/erpnext.git into Item-Tax-Template-V12
...
# Conflicts:
# erpnext/patches.txt
2019-01-18 17:33:19 +05:00
deepeshgarg007
3c9dd73f91
Added company filters for reports
2019-01-18 11:29:37 +05:30
Nabin Hait
bef2c22d23
Fix: merge conflict
2019-01-18 10:15:47 +05:30
deepeshgarg007
00f989a916
fix(email_digest): fix in account heads
2019-01-17 17:59:52 +05:30
deepeshgarg007
753c5d7514
fix(Codacy): Possible Sql injections
2019-01-17 12:28:56 +05:30
deepeshgarg007
f8bbcc56b7
refactor(email_digest): Fixes in email digest links and reports
2019-01-16 22:22:48 +05:30
Nabin Hait
983d102a19
Merge branch 'staging-fixes' into Quality-inspection-fix
2019-01-16 17:52:30 +05:30
Nabin Hait
29552c1ec4
Merge pull request #16304 from netchampfaris/fix-item-group-pagination
...
fix(website): Pagination in child item groups
2019-01-16 10:31:48 +05:30
Saif Ur Rehman
f86123ad5a
feat(Party Ledger Summary): Include columns for discount and other adjustments
2019-01-15 15:18:43 +05:00
Saurabh
68ea608ca8
fix: import unicode_literals
2019-01-15 14:47:32 +05:30
Nabin Hait
187bdf08a6
Merge pull request #16319 from SaiFi0102/Gross-Profit-Exclude-Opening-Invoice
...
fix: Exclude Opening Invoice from Gross Profit Report and Company Dashboard Chart
2019-01-10 10:55:41 +05:30
Saif Ur Rehman
8d61794540
Merge branch 'Item-Tax-Template' of https://github.com/SaiFi0102/erpnext.git into Item-Tax-Template-V12
...
# Conflicts:
# erpnext/patches.txt
# erpnext/stock/doctype/item/item.json
2019-01-10 04:23:40 +05:00
deepeshgarg007
8621869d24
Created multiple reports and linked them to email digest
2019-01-09 21:56:45 +05:30
deepeshgarg007
2b47d39274
feat: Links for reports in email digest
2019-01-09 21:54:40 +05:30
Saif Ur Rehman
091cfba5fc
test: Added test for get_item_tax_template and get_item_tax_map
2019-01-09 11:24:30 +05:00
Saurabh
afec3ca89a
Merge branch 'staging' into develop
2019-01-08 17:09:36 +05:30
Saif Ur Rehman
380b4b0926
Merge branch 'staging-fixes' of https://github.com/frappe/erpnext.git into Item-Tax-Template
...
# Conflicts:
# erpnext/accounts/doctype/accounts_settings/accounts_settings.json
# erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
# erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json
# erpnext/accounts/doctype/sales_invoice/sales_invoice.json
# erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json
# erpnext/buying/doctype/purchase_order/purchase_order.json
# erpnext/buying/doctype/purchase_order_item/purchase_order_item.json
# erpnext/buying/doctype/supplier/supplier.json
# erpnext/buying/doctype/supplier_quotation/supplier_quotation.json
# erpnext/buying/doctype/supplier_quotation_item/supplier_quotation_item.json
# erpnext/selling/doctype/quotation/quotation.json
# erpnext/selling/doctype/quotation_item/quotation_item.json
# erpnext/selling/doctype/sales_order/sales_order.json
# erpnext/selling/doctype/sales_order_item/sales_order_item.json
# erpnext/setup/doctype/item_group/item_group.json
# erpnext/stock/doctype/delivery_note/delivery_note.json
# erpnext/stock/doctype/delivery_note_item/delivery_note_item.json
# erpnext/stock/doctype/item/item.json
# erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json
2019-01-08 13:41:46 +05:00
Saif
e5091cbc0f
chore: Updated DocType JSON Files to Clean Up Git Diff of Other PRs ( #16356 )
...
* chore: Updated DocType json files to clean up git diff of other PRs
* fix: remove auto-generated file
2019-01-07 18:19:30 +05:30
Saif Ur Rehman
e194a655df
fix: is_opening != 'Yes'
2019-01-02 16:09:34 +05:00
Anurag Mishra
0c8411d085
test cases sucess
2018-12-28 16:53:00 +05:30
Faris Ansari
af75d9a384
fix(website): Pagination in child item groups
...
Item groups pages which had child item groups were not paged at all
despite having next, prev buttons
2018-12-28 14:47:51 +05:30
Saif Ur Rehman
07acc2bf5a
Allow brand in quick entry
2018-12-27 23:10:20 +05:00
Saif Ur Rehman
c819ea38a0
-Added Item Default child table for Brand
...
-Item Default Precedence: Get defaults from Item Group, if no default, fetch from Brand
-Remove auto set Item's Item Defaults from Item Group: Item Default should be manually entered to override both Item Group and Brand defaults
2018-12-27 23:01:54 +05:00
Suraj Shetty
146be9f6a6
Merge branch 'develop' of github.com:frappe/erpnext into general-ui-fixes
2018-12-24 16:08:43 +05:30
Suraj Shetty
b2965001d1
Replace 'Make' with 'Create'
2018-12-23 13:25:58 +05:30
Saif Ur Rehman
8ac261750b
Add and Modified DocTypes for Item Tax Template
2018-12-22 02:51:59 +05:00
Saurabh
e165fc0e1b
Merge branch 'staging' into develop
2018-12-13 10:45:32 +05:30
Prateeksha Singh
4ba9594b04
[setup] domain not in array
2018-12-12 22:09:00 +05:30
Prateeksha Singh
9c5676292c
[setup] add defaults stage
2018-12-12 21:29:55 +05:30
Prateeksha Singh
58db3c1c7c
[setup] fix install_defaults
2018-12-12 21:29:55 +05:30
Prateeksha Singh
0e728972e9
[setup][minor] remove unused import
2018-12-12 21:29:55 +05:30
Prateeksha Singh
d59b61cbd9
[fixtures] re-add market_segments and sales_stages utils
2018-12-12 21:29:55 +05:30
Prateeksha Singh
4da8dced94
[setup] remove unused imports
2018-12-12 21:29:55 +05:30
Prateeksha Singh
b274f8cb2a
[fix] setup chart of accounts
2018-12-12 21:29:55 +05:30
Prateeksha Singh
47118ab72a
[setup] remove redundant code
...
- [fix] domain setup from dictionary
2018-12-12 21:29:55 +05:30
Prateeksha Singh
9282e08099
[fix] >.< call setup_taxes
2018-12-12 21:29:55 +05:30
Prateeksha Singh
c3a49b9cad
[fix] set default_bank_account in company
2018-12-12 21:29:55 +05:30
Prateeksha Singh
1aee75aadc
[setup] separate out setup_company
2018-12-12 21:29:55 +05:30
Prateeksha Singh
8469b27c3a
[setup] add get_country_and_charts()
2018-12-12 21:29:55 +05:30
Prateeksha Singh
aeb8abf1ed
[setup] add market segments and sales stages
2018-12-12 21:29:55 +05:30
Prateeksha Singh
6f7233229e
[setup][fix] company fixtures
2018-12-12 21:29:55 +05:30
Prateeksha Singh
6bf22fa7d7
[setup][fix] get newly created root Territory for children
2018-12-12 21:29:55 +05:30
Prateeksha Singh
c1c057611e
[setup] bundle up fixtures and setup docs
2018-12-12 21:29:54 +05:30
Prateeksha Singh
dabf349599
[setup] don't premake company fixtures
2018-12-12 21:29:54 +05:30
Prateeksha Singh
b422458224
[setup] set the default fiscal year that was made
2018-12-12 21:29:54 +05:30
Prateeksha Singh
179d82702e
[setup] fetch setup config
2018-12-12 21:29:54 +05:30
Prateeksha Singh
39b8765961
[setup][init] setup as document records
2018-12-12 21:29:54 +05:30
Ameya Shenoy
fe1f532bc0
Merge branch 'staging' into develop
2018-11-28 08:28:37 +00:00
Saif
6a9d9d76ef
Company rename abbr to consider more DocTypes
2018-11-26 19:56:13 +05:00
Frappe Bot
b5c7b96a73
Merge branch 'staging' into develop
2018-11-13 11:33:31 +00:00
rohitwaghchaure
849169e82b
Merge pull request #15969 from rohitwaghchaure/fix_company_dashbord_sales_count
...
[Fix] Company dashboard sales count condition
2018-11-13 11:37:26 +05:30
Rohit Waghchaure
14ffe8b935
[Fix] Company dashboard sales count condition
2018-11-13 11:35:38 +05:30
Ameya Shenoy
e8d3aa9cc9
Merge pull request #15966 from codingCoffee/frankfurter
...
fix: changed currency exchange API to frankfurter
2018-11-12 18:35:36 +05:30
Pawan Mehta
aa0bed16f6
[fix] #14038-Std hours at company level to calculate timesheet hours ( #15819 )
...
* [fix] #14038
* codacy fixes
* add end time calc method
* test case and rename function
* Update timesheet.py
2018-11-12 16:40:07 +05:30
Ameya Shenoy
47a1dbab96
fix: changed currency exchange API to frankfurter ( #15958 )
...
- Switched to Frankfurter's public API (frankfurter.app) from
self hosted API (frankfurter.erpnext.org)
2018-11-12 15:57:24 +05:30
Ameya Shenoy
438490fd29
fix: changed currency exchange API to frankfurter
...
- Switched to Frankfurter's public API (frankfurter.app) from
self hosted API (frankfurter.erpnext.org)
2018-11-12 15:15:06 +05:30
Frappe Bot
1ff9c691b7
Merge branch 'staging' into develop
2018-11-09 10:21:07 +00:00
Alchez
068ba191e7
[Feature] Route optimization for Delivery Trip stops ( #15566 )
...
* Minor improvements
* [Feature] Route optimization for Delivery Trip stops
* Process and optimize the entire route, with or without locks
* Form sets of routes for optimization based on applied lock positions
* Re-arrange stops based on the optimized routes and lock positions
* Set delay times between stops - offset estimation times by delays cumulatively
* Fix codacy errors
* Fix travis
* feat(route_optimization): Set estimated route distance from Google Maps
* feat(route_optimization): Add tests for route lists
* feat(route_optimization): Fix tests
2018-11-08 11:57:05 +05:30
Chinmay Pai
905c0ff978
File api ( #15637 )
...
* file-api: major refactor
migrate from file_manager.py to file.py
Signed-off-by: Chinmay Pai <chinmaydpai@gmail.com>
* file-api: migrate to file-api
remove file_manager stuff and migrate to file-api
Signed-off-by: Chinmay Pai <chinmaydpai@gmail.com>
2018-10-15 10:38:53 +05:30
Ameya Shenoy
f90af80344
Merge branch 'staging' into develop
2018-10-11 06:58:53 +00:00
Saurabh
99c064305f
Merge branch 'master' into staging-fixes
2018-10-09 17:55:33 +05:30
Zlash65
a1036ad50b
setup wizard failing fix
2018-10-09 17:38:28 +05:30
Ameya Shenoy
f5d3ce8846
Merge branch 'staging' into develop
2018-10-08 09:44:34 +00:00
Ameya Shenoy
ecba14e6cf
Merge branch 'master' into staging-fixes
2018-10-08 09:39:49 +00:00
Shreya Shah
37d3686372
fix(setup_taxes): Pop if frappe.message_log ( #15615 )
2018-10-08 14:17:16 +05:30
Ameya Shenoy
de5206ff43
Merge branch 'staging' into develop
2018-10-08 07:28:24 +00:00
Shreya Shah
c2857fd2cc
fix(setup_taxes): Pop if frappe.message_log ( #15611 )
2018-10-08 12:35:18 +05:30
Ameya Shenoy
6005a1eb89
fix(linting): indentation fix
...
Signed-off-by: Ameya Shenoy <shenoy.ameya@gmail.com>
2018-10-04 17:40:39 +05:30
Ameya Shenoy
da10f6ebd8
Merge branch 'staging' into develop
2018-10-04 11:51:30 +00:00
Sagar Vora
b13b9b4ed3
fix TabError in install_fixtures.py
2018-10-04 11:39:20 +05:30
Charles-Henri Decultot
75fa6b3ee8
[Enhancement] Improvement to the sales pipeline ( #15524 )
...
* Additions to sales pipeline
* Codacy corrections
* Codacy corrections
* Codacy corrections
* Replace _ with dummy for unused variable
* Performance + dates corrections
* Itertuples modification
* Removing trailing whitespaces
* Sales stage doctype
* Divide sales stages fixtures in separate functions
* Remove duplicate fixtures
* Add newline after method
* Missing requirement
2018-10-03 10:41:40 +05:30
Charles-Henri Decultot
b2281cc1fd
Lead to customer UX enhancement ( #15525 )
...
* Lead to customer UX enhancement
* Market segment
* Market Segment to DocType
* Specific function for fixtures
* Merge issue correction
* Doctype merge correction
2018-10-02 11:25:00 +05:30
RicardoJohann
f52ee27d8e
fix order labels and add purchase order items overdue ( #15436 )
2018-10-01 11:27:08 +05:30
Alchez
6ecb2556b7
Add Delivery Settings + improve 'Notify Customers' functionality ( #15322 )
...
* Add Delivery Settings + improve 'Notify Customers' functionality
* Minor improvements
* Add patch to create a default dispatch notification template
* Fix travis errors
2018-09-30 21:38:47 +05:30
Saif
c2dd9ab778
Fix the problem that naming series would remove trailing '-' from series prefix if ##### was not entered ( #15514 )
2018-09-27 15:48:04 +05:30
Suraj Shetty
4b404c4f1e
Avoid multiple escapes ( #15509 )
2018-09-27 15:39:34 +05:30
Ameya Shenoy
430c3c88ff
Merge branch 'staging' into develop
2018-09-26 07:32:45 +00:00
deepeshgarg007
86152eb5c8
Sales person Commission Report and more ( #15431 )
...
* Commission For Sales Person
* Changes Made
* Changes made in sales person dashboard and commission report
* Update sales_person_commission_summary.py
2018-09-25 19:08:16 +05:30
Ameya Shenoy
63ebeb432c
Merge branch 'staging' into develop
2018-09-21 11:04:20 +00:00
Zarrar
e83ff38c10
[Enhance] Deferred Expense ( #15437 )
...
* added section for deferred expense in item master
* added default expense account field in Company master
* added deferred expense section in purchase invoice item
* validation and getter code added
* scheduler event to book expense every month
* codacy, import fix and other minor fixes
* rectify debit credit logic for expense
* commonify js code for deferred expense and revenue
* remove deferred calculation and validation
* common file to calculate deferred revenue and expense
* codacy fixes
* expense account root_type - Asset, specific method naming
2018-09-21 15:45:40 +05:30
Suraj Shetty
bfc195dd8b
Changes to support refactor in frappe pg-poc branch ( #15287 )
...
* Remove quotes from sql to make it compatible with postgres as well
* Fix queries
- Replace mysql specifc queries with standard ones
* Make repo URL chages to test pg-poc
* Add root passowrd to test site config
* Fix quotes issue
* Remove debug flag from a pricing rule query
* Remove python 3.6 version from travis.yml
* Fix improper query issue
* Fix incorrect query
* Fix a query
- This fix need to be changed when we will start supporting postgres
since date_format is not supported by postgres
* Get price list map as dict
* Convert price_list_currency_map to dict
2018-09-21 10:20:52 +05:30
Nabin Hait
73165ebd33
fix(patch): create healthcare patch only if domain activated
2018-09-07 18:44:14 +05:30
Nabin Hait
ed643d5a12
fix(email digest): Income/expenses value in case of last period of a fiscal year ( #15320 )
2018-09-05 17:18:59 +05:30
Prateeksha Singh
b2b745fc7a
[hub] simplify marketplace settings, remove company fields
...
- Company attributes will be fetched/calculated to send to server
- removed them as fields in settings
- Added description in company, with existing logo field
- TODO: for things like logo and description, ask user to set in master
2018-09-01 17:20:08 +05:30
Rushabh Mehta
a2288ff8e7
fix(assessment_result): student must be in group ( #15255 )
...
* fix(assessment_result): student must be in group
* fix(test_student_group): raise correct exception
* fix(unused-import): assessment-plan.py
* fix(tests)
* fix(tests)
* fix(test)
* fix(tests)
2018-08-31 16:12:49 +05:30
Shreya Shah
ee8f8281b4
[py3] Convert filter object to list ( #15260 )
2018-08-30 19:22:22 +05:30
Charles-Henri Decultot
7e86d7b014
Add default payable account for expense claims ( #15246 )
2018-08-30 19:18:26 +05:30
Rushabh Mehta
49f9747385
major(manufacturing): fixes to ux, material requests to purchase order based on default supplier etc ( #15267 )
...
* major(manufacturing): fixes to ux, material requests to purchase order based on default supplier etc
* fix: remove debug
2018-08-30 18:50:48 +05:30
Rushabh Mehta
13bcc4e27e
perms: fix default import, export perms
2018-08-29 17:10:27 +05:30
Nabin Hait
a804d6d487
Fixed merge conflict
2018-08-29 13:34:58 +05:30
Shreya Shah
a5add289bb
Refactor Naming Series ( #15070 )
...
* Patch to create Property Setter for existing naming series
* Update existing naming series options with new
* Add patch link to patches.txt
* Update patch
* Fix codacy
* Fix as per suggestions
* Remove old patch for property setter
* Improve as per suggested
- Modified the naming
- Also refactored naming for doctypes having autoname with series
- Added a patch to make property setter for autoname
* Fix Travis
* Rebase with develop
2018-08-28 13:44:48 +05:30
Neil Trini Lasrado
771fbb8f01
Cleaned up welcome email code ( #15175 )
2018-08-24 15:15:56 +05:30
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