518f827d87
chore: remove snyk from devdependencies
3 years ago
678335f8ac
fix: job card overlap unknown column `jc.employee` ( #27403 )
* fix: incorrect query for job card overlap
* test: employee overlap in job cards
* test: simplify/refactor job card tests
3 years ago
9670490a1d
chore(deps): bump axios from 0.21.1 to 0.21.4 ( #27402 )
Bumps [axios](https://github.com/axios/axios ) from 0.21.1 to 0.21.4.
- [Release notes](https://github.com/axios/axios/releases )
- [Changelog](https://github.com/axios/axios/blob/master/CHANGELOG.md )
- [Commits](https://github.com/axios/axios/compare/v0.21.1...v0.21.4 )
---
updated-dependencies:
- dependency-name: axios
dependency-type: indirect
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
[skip ci]
3 years ago
9104796eb8
Merge pull request #27258 from deepeshgarg007/tds_validity
feat: Validity dates in Tax Withholding Rates
3 years ago
3576668638
fix: added Show Remarks checkbox in AR & AP reports ( #27374 )
3 years ago
e7e2ce1271
fix: Linting Issues
3 years ago
c33bbd4f39
fix: Test Case
3 years ago
295020451f
fix: added delivery date filters to get sales orders in production plan ( #27367 )
3 years ago
81d3524d27
fix: auto complete sales order rows in production plan ( #27352 )
* fix: auto complete sales order rows in production plan
* fix: sider
3 years ago
9c27f9be1e
fix: document naming rule not working for subscription invoices ( #27386 )
3 years ago
fa819f2fb0
fix: General Ledger translation issues ( #27298 )
* fix: remove translations from GL report options
Options need not be translated, their display label gets translated
client side.
* fix: make group by options translatable
* ci: semgrep rule for translated options in report
Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
3 years ago
df3e4ce1c0
fix: scan barcode fields input length ( #27389 )
* fix: undo unintentional changes
* fix: scan barcode fields input length
3 years ago
ee1486209d
Merge branch 'develop' of https://github.com/frappe/erpnext into tds_validity
3 years ago
5596988c94
ci: fix docs checker for wiki based docs ( #27380 )
3 years ago
61a1356109
fix: Check if Item is serialised before trying to fetch SN and set SO in it ( #27358 )
3 years ago
058d98342a
fix: missed to add voucher_type, voucher_no to get GL Entries ( #27368 )
* fix: missed to add voucher_type, voucher_no to get gl entries
* test: get voucherwise details utilities
Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
3 years ago
8f6d22b7ea
Merge pull request #27373 from deepeshgarg007/gstin_filter_issue
fix: GSTR-1 Reports not showing any data
3 years ago
6dfcc1e2ae
fix: Remove print and debug
3 years ago
e1f55df4d7
fix: GSTR-1 Reports not showing any data
3 years ago
d795e55694
feat(CRM): Sales Pipeline Analytics Report and Opportunity Summary by Sales Stage Report ( #26639 )
* feat: Sales Pipeline Analytics Report
* fix: sider Issues and added tests
* fix: Semgrep Issue
* feat: Opportunity Summary by Sales Stage Report
* fix: add some checks and tests
* fix: sider issues and test
* fix: additional checks for error handling and minor changes
* fix: remove unused conditions
* fix: Changes mentioned on PR
* fix: currency conversions and other changes
* fix: remove unused imports
* fix: correction for failing test case
* fix: recorrected failing test case
* fix: sider issues and resolve test case errors
* fix: rewrite query using query builder
* fix: test case changes
* fix: sider fixes and other changes
* fix: clear data before running test
* fix: test case fixed
* refactor: code formatting
- smaller functions
- variable and function naming
* refactor: improve code formatting
* fix: linter issues
* fix: linter issues
* fix: change indentation to tabs
* fix: linter issues
* fix: naming, code formatting
* fix: quarterly values not showing up in Sales Pipeline Analytics
* fix: typo in tests
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
3 years ago
88c9fe35bd
fix: employee remider settings ( #27365 )
3 years ago
b0d970001a
feat: multi-currency in Opportunity ( #26590 )
* feat: multi-currency
* refactor: lead form
* fix: test case for opportunity item
* fix: removing local changes
* fix: test cases
* fix: test cases
* fix: review changes
* fix: reverting lead.json chnages
* fix: toggle display for currency fields
* review changes
* fix: test case
* fix: linter issues
* fix: unused import
* feat: grand total in opportunity
* fix: patch
* fix: sort imports
* fix: reload opportunity item doctype
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
3 years ago
14b01619de
fix: patch failure for vat audit report ( #27355 )
3 years ago
0f2a52078c
fix: Dont fetch Stopped/Cancelled MRs in Stock Entry Get Items dialog ( #27326 )
3 years ago
51d9572fe7
fix: Hardcode fiscal year and posting date
3 years ago
ceaa804f04
fix: Presentation currency conversion in reports ( #27316 )
3 years ago
7b4a65484a
fix: manually added weight per unit reset to zero after save ( #27330 )
3 years ago
73b3a2f685
chore: whitespace
3 years ago
092d41ecda
fix: Debug CI
3 years ago
41392acd18
Merge branch 'develop' of https://github.com/frappe/erpnext into tds_validity
3 years ago
8f5a77446e
Merge pull request #27279 from deepeshgarg007/gstr_1_cdnr_unregistered_json_develop
feat: CDNR Unreg json generation
3 years ago
a06a70d1a4
fix: Patch error and tests
3 years ago
79d250845e
fix: Patch
3 years ago
2b34028acd
fix: Patch and linting errors
3 years ago
64fcd1a092
fix: make datetime objects readable ( #27301 )
* fix: Make datetime objects readable
* fix: Remove unused imports
3 years ago
798b464ee3
fix: braintree payment processed twice ( #27300 )
3 years ago
98696c0ec9
Merge pull request #27306 from GangaManoj/fix-selling-settings
fix: Move related fields together in Selling Settings
3 years ago
d1fe060e4a
fix: south africa vat patch failure ( #27323 )
reload doc is necessary on new doctypes
3 years ago
e68c55ce83
fix: Removing first Spacer from home page ( #27321 )
3 years ago
ebdc568e85
fix: Rename 'Action if Same Rate is Not Maintained' to 'Action if Same Rate is Not Maintained Throughout Sales Cycle'
3 years ago
e1fffdb262
fix: Linting issues
3 years ago
c85242e03d
Merge branch 'develop' of https://github.com/frappe/erpnext into gstr_1_cdnr_unregistered_json_develop
3 years ago
e8a5dc371b
fix: Add payment entry custom fields
3 years ago
eec40513be
fix: minor linting issues ( #27314 )
* fix: syntax error in gratuity
* fix: unpacking None into three variables
* fix: unexpected kwarg for delete_accounting_dimensions
3 years ago
60185c8c71
chore: linting
[skip ci]
3 years ago
8b1a61be29
chore: ignore import cleanup commit in blame
3 years ago
915b34391c
chore: Clean up imports ( #27302 )
* chore: Added isort to pre-commit config
* chore: Sort imports with isort
* chore: Clean up imports with pycln
* chore: Sort imports with isort
* chore: Fix import issues
* chore: Clean up sider issues
* chore: Remove import errors from flake8 ignore list
* chore: Clean up lint issues
3 years ago
b25d28e023
fix(patch): delete stale shopify doctypes ( #27313 )
3 years ago
366012817f
Merge branch 'develop' into fix-selling-settings
3 years ago
a158b825fc
Merge pull request #27124 from GangaManoj/gross-profit-product-bundle
feat: Improve Product Bundle handling
3 years ago
Ankush Menat
dependabot[bot]
Deepesh Garg
Anuja Pawar
Deepesh Garg
rohitwaghchaure
Alan
Saqib
Dany Robert
Marica
Mohammed Yusuf Shaikh
Anupam Kumar
Ganga Manoj
Subin Tom
Shariq Ansari
Chillar Anand