Ankush Menat
3f97413814
chore: formatting
2021-10-14 16:45:27 +05:30
Saqib
1f70dd6e98
fix: value_after_depreciation calculation ( #27954 )
2021-10-14 16:23:12 +05:30
Rohit Waghchaure
efc60ec2b5
fix: patch to enable scheduled job for reposting
2021-10-14 16:03:48 +05:30
Marica
ee25ba07a2
Merge pull request #27947 from marination/si-dn-sn-mismatch
...
fix: Improve error message for Serial No mismatch between SI and DN
2021-10-14 13:49:04 +05:30
Jannat Patel
8de5f1f04d
Merge pull request #27850 from pateljannat/auto-attendance-issue
...
fix: exclude inactive employees from auto attendance
2021-10-14 12:48:22 +05:30
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
Noah Jacob
2bb383b178
fix: not authorized to update entries after freezing accounts ( #27937 )
...
* fix: not authorized to update entries after freezing accounts
* fix: Add test case
* fix(patch): patched to requeue failed reposts(check_freezing_date)
* chore: misc fixes
Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
Co-authored-by: Ankush Menat <ankushmenat@gmail.com>
2021-10-13 16:20:08 +05:30
Shariq Ansari
790c1cda6f
fix: Removing unused fields from workspace JSON files #27612
...
fix: Removing unused fields from workspace JSON files
2021-10-13 16:18:20 +05:30
Deepesh Garg
bd310e2816
Merge pull request #27783 from hrwX/subscription_generation_fix_develop
...
fix(Subscription): reorder updation of end date
2021-10-13 15:21:50 +05:30
Deepesh Garg
bd8dda2de4
Merge pull request #27497 from nemesis189/taxjar-nexus-update
...
fix: TaxJar update - added nexus list, making api call only for nexus
2021-10-13 15:08:48 +05:30
Deepesh Garg
bd8cfb2e30
fix: Move product tax category folder to taxjar settings
2021-10-13 13:40:53 +05:30
Jannat Patel
00f7f97dc9
Merge branch 'develop' into auto-attendance-issue
2021-10-13 13:28:25 +05:30
Deepesh Garg
2d19e2d54b
fix: Patch
2021-10-13 13:24:19 +05:30
Deepesh Garg
2b9b158448
Merge pull request #27907 from nemesis189/gst-setts-hsn-wise-tax-breakup
...
feat: HSN based tax breakup table check in GST Settings
2021-10-13 12:07:29 +05:30
Deepesh Garg
ca0067212d
fix: TDS round off not working from second transaction
2021-10-13 12:00:25 +05:30
Deepesh Garg
0b263c5100
Merge pull request #27927 from Anuja-pawar/invoice-sections
...
fix: minor ux fixes in Sales & Purchase Invoice
2021-10-12 23:05:48 +05:30
Deepesh Garg
b990d5b112
Merge pull request #27545 from nextchamp-saqib/pay-received-amt-fix
...
fix: cannot add deductions in internal transfer payment entry
2021-10-12 23:04:04 +05:30
Deepesh Garg
3b9514d6e1
fix: Update message string
2021-10-12 21:49:51 +05:30
Anuja Pawar
b7769c733e
Merge branch 'develop' into invoice-sections
2021-10-12 21:32:01 +05:30
Anuja Pawar
d181cc42a1
fix: set collapsible & print hide
2021-10-12 20:57:08 +05:30
Marica
b6da7ff1b1
Merge pull request #27914 from marination/avoid-auto-customer-creation-website
...
fix: Avoid automatic customer creation on website user login
2021-10-12 20:24:12 +05:30
Deepesh Garg
6f107da165
perf: Add indexes in stock queries and speed up bin updation #27758
...
perf: Add indexes in stock queries and speed up bin updation
2021-10-12 20:15:55 +05:30
Ankush Menat
8d69ec72a6
fix: remove transaction commit from tests
2021-10-12 16:17:15 +05:30
Ankush Menat
acdb26a4bb
refactor: rollback after full test
2021-10-12 16:17:15 +05:30
Ankush Menat
06fa35a9c1
test: add custom TestCase class and use in stock
2021-10-12 16:17:15 +05:30
Anuja Pawar
2bc1ca993a
fix: keeping sections consistent across sales & purchase invoice
2021-10-12 14:52:40 +05:30
Deepesh Garg
c6a56a8f53
Merge pull request #27884 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 ( #27896 )
...
* fix: Status check for closed loans
* fix: Incorrect maximum loan amount update
* fix: Linting issues
2021-10-12 13:40:31 +05:30
marination
a780f78f38
fix: Sider, Linter
...
- Moved return to next line
- Space between function import and body
2021-10-12 13:28:12 +05:30
Afshan
569dc5f6b1
fix: add cost center in gl entry for advance payment entry ( #27840 )
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
5d4c919c5c
fix: Update pacthes.txt
2021-10-12 13:04:25 +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 ( #27892 )
2021-10-12 10:28:36 +05:30
Anuja Pawar
e1967870a9
Merge pull request #27906 from Anuja-pawar/accounts-settings
...
fix(Accounts Settings): Update label
2021-10-12 10:27:23 +05:30
marination
d824a90fac
fix: Avoid automatic customer creation on website user login
2021-10-11 23:14:28 +05:30
Ankush Menat
ad444153cc
fix: force reload custom field doctype ( #27909 )
...
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
Subin Tom
fc4facc5dc
added new section in gst settings page
2021-10-11 18:19:58 +05:30
Subin Tom
530de12b07
feat: HSN wise tax breakup check in GST Settings
2021-10-11 17:33:41 +05:30
Noah Jacob
4bbe434d43
Merge pull request #27800 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’ ( #27897 )
...
* 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 #27863 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 #27369 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 #27890
...
fix: bom item query
2021-10-11 12:10:33 +05:30
Chillar Anand
f0c4ea14a9
fix(hr): Update expense account after company is updated ( #27843 )
2021-10-11 11:59:26 +05:30
Subin Tom
ea2038489f
fix: 'Taxjar' type fix
2021-10-11 11:11:01 +05:30
Subin Tom
1b25e69af4
fix: patch fixes- force reload doc, check for company
2021-10-11 10:20:23 +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
Himanshu
4f5d82c817
Merge branch 'develop' into subscription_generation_fix_develop
2021-10-09 09:39:27 +01:00
Himanshu
44306bd0e5
Update subscription.py
2021-10-09 09:37:54 +01:00
Jannat Patel
128709155b
Merge branch 'develop' into auto-attendance-issue
2021-10-08 20:15:40 +05:30
Ankush Menat
6019f60d0a
fix(perf): index creation on voucher_detail_no ( #27866 )
...
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 #27872 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 ( #27865 )
...
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 ( #27860 )
2021-10-08 13:27:16 +05:30
mergify[bot]
e85c6e3fc5
fix: SO delivery Date not getting set via data import ( #27862 ) ( #27864 )
...
* 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 ( #27779 )
...
* 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 ( #27856 )
2021-10-07 20:27:10 +05:30
Kenneth Sequeira
646fd29f0e
fix: update help links for Sales Invoice page ( #27853 )
2021-10-07 18:38:37 +05:30
rohitwaghchaure
e740fec8d0
Merge pull request #27851 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
Jannat Patel
c07dfbc08b
Merge branch 'develop' into auto-attendance-issue
2021-10-07 17:22:28 +05:30
pateljannat
921b4be348
fix: exclude inactive employees from auto attendance
2021-10-07 17:12:46 +05:30
Saqib
64c1347d1e
refactor!: remove abbreviation renaming ( #27766 )
...
Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
2021-10-07 07:05:34 +00:00
Subin Tom
eaa3614155
fix: patch fix added reload_doctype
2021-10-07 12:20:56 +05:30
Himanshu
951ab9f78f
Merge branch 'develop' into subscription_generation_fix_develop
2021-10-06 19:22:40 +01:00
Chillar Anand
772d4753e7
refactor: Clean up mutable defaults and add CI check ( #27828 )
...
* refactor: Clean up mutable defaults and add CI check
2021-10-06 16:58:48 +00:00
hrwx
ae657c7e4e
fix: create past invoices
2021-10-06 17:32:39 +01:00
Subin Tom
3ece05a9f7
fix: linters fix
2021-10-06 21:35:04 +05:30
Subin Tom
7114659ecc
fix: improved on_update method, added validation for tax calculation, sandbox mode checks
2021-10-06 21:31:19 +05:30
Sagar Vora
656015d99d
test: use test_dependencies
instead of duplication
2021-10-06 16:46:01 +01:00
Sagar Vora
fc375c5bde
fix: remove newline
2021-10-06 16:46:01 +01:00
hrwx
0f03b19109
fix: reorder updation of end date
2021-10-06 16:46:01 +01:00
Alan
d4b2471cea
fix: use ceil in case of whole uoms for reorder qty ( #27834 )
...
* 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
( #27836 )
2021-10-06 17:13:34 +05:30
Marica
ff7506d4a6
fix: revert "fix: missing link in dashboard missing on SI from DN" ( #27832 )
2021-10-06 13:35:22 +05:30
Marica
2691a15c91
Merge pull request #27360 from FHenry/dev_fix_27359
...
fix: missing link in dashboard missing on SI from DN
2021-10-06 13:04:50 +05:30
Deepesh Garg
91bf40d692
Merge pull request #27811 from frappe/mergify/bp/develop/pr-27792
...
fix: COA Importer showing blank validations (backport #27792 )
2021-10-05 21:23:21 +05:30
Afshan
cec66d2d10
fix: removed redundant piece of code ( #27817 )
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 #27813 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 #27798 ) (backport #27805 ) ( #27807 )
...
* fix: using DN for transfer w/o internal customer (backport #27798 ) (#27805 )
* fix: using DN for transfer w/o internal customer (#27798 )
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
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
Deepesh Garg
020f94532b
fix: COA Importer showing blank validations
...
(cherry picked from commit 0660d6ed01e0668ce828cf9bae9790aead874233)
2021-10-05 09:49:05 +00:00
Anupam
340859cb3c
fix: broken lead form actions
2021-10-05 15:11:45 +05:30
Noah Jacob
3132dcd94a
fix: batch_no not mapped from PR to Stock Entry ( #27794 )
2021-10-05 14:40:40 +05:30
Deepesh Garg
aa0698078f
Merge pull request #27660 from rtdany10/patch-8
...
fix: tax rate being overridden in case of 0.00
2021-10-05 14:11:27 +05:30
Noah Jacob
f5e0cad6a1
refactor: updated onboarding cards and tours
2021-10-05 13:24:22 +05:30
Alan
7da777880b
fix: add (uom, brand) Item details in an Item Price ( #27561 )
...
* fix: add (uom, brand) and update (uom) Item details in an Item Price
* fix: order of query interpolation args
Co-authored-by: Marica <maricadsouza221197@gmail.com>
* fix: named interpolation, remove item price
* fix: sql error
Co-authored-by: Marica <maricadsouza221197@gmail.com>
Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
2021-10-05 12:35:23 +05:30
Ganga Manoj
ad03eb25df
fix: Only calculate first_respone_time if SLA is set ( #27789 )
...
Co-authored-by: Afshan <33727827+AfshanKhan@users.noreply.github.com>
2021-10-05 12:26:59 +05:30
Saqib
74c8e7bb97
Merge branch 'develop' into pay-received-amt-fix
2021-10-05 11:14:41 +05:30