Commit Graph

38875 Commits

Author SHA1 Message Date
marination
60f35ad8a2 fix: Remove trailing space and line break in translatable string 2021-10-13 16:50:10 +05:30
marination
646acb6b46 fix: Improve error message for Serial No mismatch between SI and DN 2021-10-13 16:41:11 +05:30
Deepesh Garg
c6a56a8f53
Merge pull request from nextchamp-saqib/invalid-gl-entry-patch-fix
fix: patch fails if accounts are frozen
2021-10-12 13:44:18 +05:30
Deepesh Garg
3750a88568
fix: Status check for closed loans ()
* fix: Status check for closed loans

* fix: Incorrect maximum loan amount update

* fix: Linting issues
2021-10-12 13:40:31 +05:30
Afshan
569dc5f6b1
fix: add cost center in gl entry for advance payment entry () 2021-10-12 13:23:20 +05:30
Saqib Ansari
c103f72fad fix: rollback on exception 2021-10-12 13:13:48 +05:30
Deepesh Garg
af14ba43de fix: Linting issues 2021-10-12 12:58:42 +05:30
Deepesh Garg
8355af6dcf fix: Incorrect maximum loan amount update 2021-10-12 12:44:40 +05:30
Chillar Anand
401e22fb8d
fix(accounts): Fix issue with fetching loyalty point entries () 2021-10-12 10:28:36 +05:30
Anuja Pawar
e1967870a9
Merge pull request from Anuja-pawar/accounts-settings
fix(Accounts Settings): Update label
2021-10-12 10:27:23 +05:30
Ankush Menat
ad444153cc
fix: force reload custom field doctype ()
custom_field.json has the same modified key in both versions but not the same content. This can happen again if something is backported, safe solution is to force reload.
2021-10-11 22:14:28 +05:30
Noah Jacob
4bbe434d43
Merge pull request from noahjacob/buy_on
refactor: updated buying onboarding tours.
2021-10-11 15:33:58 +05:30
Dany Robert
7acdcc70ad
fix: v12 migrate error - unknown column ‘mandatory_depends_on’ ()
* fix: v12 doesn't have mandatory_depends_on field

* fix: move update_vehicle_no_reqd_condition to v13

* fix: move update_vehicle_no_reqd_condition to v13

* fix: file name missing .py

* refactor!: add back empty line

* fix: linters issue
2021-10-11 15:05:55 +05:30
rohitwaghchaure
3f99a87e3d
Merge pull request from rohitwaghchaure/multi-currency-issue-for-consolidated-report
fix: consolidated report not consider company currency
2021-10-11 14:06:08 +05:30
Deepesh Garg
3337ae120c fix: Status check for closed loans 2021-10-11 13:12:02 +05:30
Deepesh Garg
1aba3592fa
Merge pull request from Havenir/ksa-vat
feat(regional): KSA E-Invoicing and VAT Report
2021-10-11 12:16:51 +05:30
Ankush Menat
0a3dd3e954
fix: bom item query
fix: bom item query
2021-10-11 12:10:33 +05:30
Chillar Anand
f0c4ea14a9
fix(hr): Update expense account after company is updated () 2021-10-11 11:59:26 +05:30
ChillarAnand
4dc17a856e fix(CI): Use bugbear instead of flake8-mutable 2021-10-11 11:17:55 +05:30
Ahmad
cb2213ef0c refactor: make strings translate 2021-10-10 21:17:59 +02:00
Rohit Waghchaure
19d14da0d4 fix: opening balance to calculate 'Unclosed Fiscal Years Profit / Loss (Credit)' 2021-10-10 14:00:25 +05:30
Saqib Ansari
353ad5f6ff feat: handle exceptions 2021-10-10 11:47:48 +05:30
Saqib Ansari
b0aa4a6e1c fix: patch fails if accounts are frozen 2021-10-10 11:42:39 +05:30
Ankush Menat
6019f60d0a
fix(perf): index creation on voucher_detail_no ()
voucher_detail_no is supposed to have an index, it was added on
on_doctype_update function of table, however this function is only
called if DocType itself is updated and `on_update` is called on
DocType. Stock ledger Entry doctype hasn't changed since addition of
this index in function.

Before: Lack of this index was causing full table scan in
get_future_sle_to_fix function. (~50 seconds in a reposting job)

After: Single row is fetched (~0.5 second in full reposting job)

Learnings:
1. Add simple indexes via doctype only
2. For complex indexes always change doctype.json file for it to take
   effect.
2021-10-08 16:12:15 +05:30
Deepesh Garg
fabbf68e0e
Merge pull request from 18alantom/fix-make-billing-address-not-read-only
fix: remove readonly from billing address
2021-10-08 15:07:15 +05:30
18alantom
41fefa356f fix: remove readonly from billing address 2021-10-08 14:31:13 +05:30
yadavyk
d3d4a3da62
fix: Salary Slip Label fixes ()
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
2021-10-08 13:39:33 +05:30
Kenneth Sequeira
90a249527d
fix: update dead links in help_links.js () 2021-10-08 13:27:16 +05:30
mergify[bot]
e85c6e3fc5
fix: SO delivery Date not getting set via data import () ()
* fix: SO delivery Date not getting set via data import

* fix: logic to add delivery dates

* fix: linting issue

Co-authored-by: Afshan <33727827+AfshanKhan@users.noreply.github.com>
Co-authored-by: Afshan <afshan13k@gmail.com>
(cherry picked from commit d9a219850a02539f82929b5d5490554835fcde8b)

Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
2021-10-08 13:19:56 +05:30
Rohit Waghchaure
dc4206428d fix: consolidated report not consider company currency 2021-10-08 12:10:35 +05:30
Anuja Pawar
5cc3ea0aa7
fix(Payment Reconciliation): minor ux fixes ()
* fix: minor fixes

* fix: Linters check

* fix: sider check

* fix: kept unallocated payment amount hidden in allocation

* fix: removed Add row button from the tables (redundant)

Co-authored-by: Afshan <33727827+AfshanKhan@users.noreply.github.com>
Co-authored-by: Saqib <nextchamp.saqib@gmail.com>
2021-10-07 21:09:15 +05:30
Kenneth Sequeira
07c680d7cc
fix: help links for purchase cycle and JV () 2021-10-07 20:27:10 +05:30
Kenneth Sequeira
646fd29f0e
fix: update help links for Sales Invoice page () 2021-10-07 18:38:37 +05:30
rohitwaghchaure
e740fec8d0
Merge pull request from rohitwaghchaure/option-to-set-size-for-multi-select-dialog
feat: option to set the width for the multi-select dialog box
2021-10-07 17:38:19 +05:30
Rohit Waghchaure
69ffddf747 feat: option to set the width for the multi-select dialog box 2021-10-07 17:33:58 +05:30
Saqib
64c1347d1e
refactor!: remove abbreviation renaming ()
Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
2021-10-07 07:05:34 +00:00
Chillar Anand
772d4753e7
refactor: Clean up mutable defaults and add CI check ()
* refactor: Clean up mutable defaults and add CI check
2021-10-06 16:58:48 +00:00
Alan
d4b2471cea
fix: use ceil in case of whole uoms for reorder qty ()
* fix: use ceil in case of whole uoms for reorder qty

* fix: cache uom query
2021-10-06 18:16:33 +05:30
Sagar Vora
d36849e4f8
test: optimise test_component_amount_dependent_on_another_payment_days_based_component () 2021-10-06 17:13:34 +05:30
Marica
ff7506d4a6
fix: revert "fix: missing link in dashboard missing on SI from DN" () 2021-10-06 13:35:22 +05:30
Marica
2691a15c91
Merge pull request from FHenry/dev_fix_27359
fix: missing link in dashboard missing on SI from DN
2021-10-06 13:04:50 +05:30
Ankush Menat
35e30bdcaf
ci: fail build if asset bundling fails () 2021-10-05 21:44:34 +05:30
Deepesh Garg
91bf40d692
Merge pull request from frappe/mergify/bp/develop/pr-27792
fix: COA Importer showing blank validations (backport )
2021-10-05 21:23:21 +05:30
Afshan
cec66d2d10
fix: removed redundant piece of code () 2021-10-05 19:14:39 +05:30
Deepesh Garg
fee54023a6
Merge branch 'develop' into mergify/bp/develop/pr-27792 2021-10-05 17:22:24 +05:30
Noah Jacob
ae5b2f37b1
Merge pull request from ankush/maintenance_random_period
fix: ignore random periodicity in validations
2021-10-05 16:57:43 +05:30
mergify[bot]
233bf5dd29
fix: using DN for transfer w/o internal customer (backport ) (backport ) ()
* fix: using DN for transfer w/o internal customer (backport ) ()

* fix: using DN for transfer w/o internal customer ()

This used to be work before though not "advertised", since a lot of
users have started using it as feature, it can't be broken now.

(cherry picked from commit df1f8fddf6e2f4106c1a2778614ba9a1dc5ff67e)

* fix(ux): use toast instead of popup

Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
(cherry picked from commit fa944382c53bdeeb92f2dcc876e2c11ed03e20cc)

# Conflicts:
#	erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py

* fix: resolve conflict

* fix: resolve conflicts

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
2021-10-05 16:16:21 +05:30
Ankush Menat
3d3655ed73
fix: ignore random periodicity in validations 2021-10-05 15:52:11 +05:30
Anupam Kumar
85e23ced05
Merge pull request from anupamvs/lead-issues
fix: broken lead form actions
2021-10-05 15:21:08 +05:30
Deepesh Garg
a2b5e678fe fix: Use get_list instead of get_all to avoid perm issues
(cherry picked from commit 9507b2d752a40c0dd9e8b43ae3ef64435457c85e)
2021-10-05 09:49:05 +00:00