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