Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
39,439 Commits 3 Branches 0 Tags 1 GiB
de002005ac
Commit Graph

29838 Commits

Author SHA1 Message Date
Noah Jacob
e08a0992b2
Merge branch 'develop' into maint_schedule_fix 2021-10-19 13:12:45 +05:30
Noah Jacob
af1b9e100e fix: changes in schedules gets overwritten on save 2021-10-19 12:08:32 +05:30
Himanshu
7717b99edb
feat: add enabled field in UOM (#27993) 2021-10-19 10:19:40 +05:30
Dany Robert
1aa34d1780
fix: incorrect VAT Amount in UAT VAT 201 report 2021-10-18 18:46:45 +05:30
Rucha Mahabal
8eacaddde7
fix: flaky Org Chart Test (#27971) 2021-10-18 11:06:16 +05:30
Saqib
ac381d21fe
fix: sider 2021-10-18 10:43:15 +05:30
Deepesh Garg
9c54d6df13
Merge pull request #27967 from deepeshgarg007/account_name_number_error 
fix: Account number and name incorrectly imported using COA importer
 2021-10-18 09:16:09 +05:30
Deepesh Garg
46e80095c6
Merge pull request #27934 from deepeshgarg007/tds_round_off_error 
fix: TDS round off not working from second transaction
 2021-10-18 08:53:37 +05:30
Deepesh Garg
30e6f4dfed
Merge pull request #27970 from deepeshgarg007/gstr_1_interstate_internal_transfer 
fix (India): Interstate internal transfer invoices not visible in GSTR-1
 2021-10-18 08:52:41 +05:30
Deepesh Garg
b7a08535b5 fix: TDS round off not working from second transaction 2021-10-16 20:58:24 +05:30
Deepesh Garg
d9d42b13ab fix: Interstate internal transfer invoices not visible in GSTR-1 2021-10-16 17:09:37 +05:30
Deepesh Garg
17a8649500 fix: Account number and name incorrectly import using COA importer 2021-10-15 21:19:41 +05:30
Subin Tom
f3cf36f613
fix: POS Profile payment methods table (#27956) 
Co-authored-by: Afshan <33727827+AfshanKhan@users.noreply.github.com>
 2021-10-15 12:39:52 +05:30
GangaManoj
0b8cb5dd47 fix: Add missing digit 2021-10-15 04:56:00 +05:30
GangaManoj
fdeb273fa0 fix: Sider issues 2021-10-15 04:53:23 +05:30
GangaManoj
60aae4423d fix: Add missing digit 2021-10-15 04:03:30 +05:30
GangaManoj
371b621364 fix: Compare date strings 2021-10-15 04:02:27 +05:30
GangaManoj
e9d310a13e fix: Format tests 2021-10-15 01:45:53 +05:30
Ganga Manoj
5a0289a810
Merge branch 'develop' into fix-depr-after-sale 2021-10-14 22:37:07 +05:30
GangaManoj
968be70bd1 fix: Remove PR creation from all tests in TestDepreciationBasics 2021-10-14 22:33:35 +05:30
GangaManoj
09215a9781 fix: Remove PR creation from all tests for Depreciation Methods 2021-10-14 22:32:55 +05:30
GangaManoj
4bf01bb4b7 fix: Move Purchase Receipt creation to setUpClass 2021-10-14 22:32:54 +05:30
Marica
c0e632842a
Merge pull request #27962 from marination/clean-serial-no-logic 
fix: Retain space inside Serial no string while cleaning serial nos
 2021-10-14 20:17:42 +05:30
Ankush Menat
4437eb0c4b
fix: remove bad description (#27963) 2021-10-14 20:03:37 +05:30
marination
a9341672cf test: Include serial no with spaces in it in sanitation test 2021-10-14 19:49:13 +05:30
Marica
8cf188d9c0
fix: Use strip instead of lstrip and rstrip 
Co-authored-by: Ankush Menat <ankushmenat@gmail.com>
 2021-10-14 19:21:41 +05:30
marination
41035b0330 fix: Retain space inside Serial no string while cleaning serial nos 2021-10-14 18:31:37 +05:30
Ankush Menat
9c1d828b1b
chore: formatting 2021-10-14 17:18:24 +05:30
rohitwaghchaure
1233725b64
Merge pull request #27957 from rohitwaghchaure/patch-to-enable-scheduler-job 
fix: patch to enable scheduled job for reposting
 2021-10-14 17:14:43 +05:30
rohitwaghchaure
230a5d4b39
Update enable_scheduler_job_for_item_reposting.py 2021-10-14 16:57:54 +05:30
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
Ganga Manoj
8cc81a96fc
Merge branch 'develop' into fix-depr-after-sale 2021-10-14 03:12:44 +05:30
GangaManoj
e8986df3ca fix: Move test for Finance Books to Depreciation test suite 2021-10-13 21:36:10 +05:30
GangaManoj
83ec9879ee fix: Add test to validate available_for_use_date 2021-10-13 21:21:50 +05:30
GangaManoj
749d1b6ee6 fix: Enable cwip accounting 2021-10-13 20:49:07 +05:30
GangaManoj
8ea1ad9232 fix: Only validate against JV if it's not a reverse depreciation entry 2021-10-13 20:47:39 +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
Ankush Menat
4ebae7c5dc
Merge branch 'develop' into optimize-get-item-details 2021-10-12 20:39:49 +05:30
Ankush Menat
7bafa11d57
fix: undo changes to allow negative stock flag 2021-10-12 20:39:10 +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
Saqib Ansari
c7fc609236 perf: skip insertion of stock ledger entry 2021-10-12 13:30:40 +05:30
Saqib Ansari
eb3aae870f perf: get total company stock only for purchase order 2021-10-12 13:29:32 +05:30
Saqib Ansari
7b691beabb perf: fetch mode of payments data in single query 2021-10-12 13:28: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
Saqib Ansari
a500252570 perf: skip get_pricing_rules if no pricing rule exists 2021-10-12 13:25:55 +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
GangaManoj
a7ec007dcf fix: Add tests to validate item 2021-10-12 01:33:46 +05:30
GangaManoj
d8aaf3d389 fix: Add tests to validate Asset values 2021-10-12 01:07:11 +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
GangaManoj
4918e9533b fix: Add tearDownClass() 2021-10-10 03:51:35 +05:30
GangaManoj
ef3f2fcb3a fix: Replace setUp() with setUpClass() 2021-10-10 03:50:45 +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
GangaManoj
273fccf0dd fix: Add test for depreciation on return of sold Asset 2021-10-06 02:08:28 +05:30
GangaManoj
adebf2d71b fix: Adjust depreciation_amount in final row 2021-10-06 02:04:05 +05:30
GangaManoj
f51bd44929 fix: Unlink Depreciation Entry made on sale if the Asset is returned 2021-10-06 01:18:05 +05:30
GangaManoj
62fea8a5aa fix: Rename tests 2021-10-05 21:38:39 +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
Afshan
4c16bd5c73
Merge branch 'develop' into fix-so-cancellation-message 2021-10-05 11:52:48 +05:30
Saqib
74c8e7bb97
Merge branch 'develop' into pay-received-amt-fix 2021-10-05 11:14:41 +05:30
Saqib
065a2ce983
fix(asset): expected value after useful life validation (#27539) 2021-10-05 11:14:16 +05:30
GangaManoj
38c7e42f0c fix: Delete linked Transaction Deletion Record docs on deleting company 2021-10-05 10:14:01 +05:30
Alan
5c372202d5
fix: set item uom as stock_uom if it isn't set (#27623) 
* fix: set item uom as stock_uom if it isn't set
 2021-10-04 22:38:04 +05:30
Sagar Vora
09ccdee2db
feat: add total_billing_hours to Sales Invoice (fp #26783) (#27742) 
* feat: add `total_billing_hours` to Sales Invoice

* fix: re-save doctypes

* fix: indentation

* fix: replace reference to old function
 2021-10-04 16:41:24 +05:30
Rucha Mahabal
5905cf9002
refactor!: Removed healthcare module from ERPNext (#27362) 
* chore: Removed healthcare module

* chore: Removed healthcare demo, patch files

* chore: Rename imports from erpnext to healthcare

* chore: Added healthcare deprecation warning patch

* chore: Removed healthcare module code in other modules

* chore: Code clean up

* refactor: Remove sales invoice custom js related to healthcare

* fix: sider

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2021-10-04 15:46:40 +05:30
Komal-Saraf0609
b483f173a6
fix: Merge "Accounting Ledger" and "Accounts Receivable" in "View" button (#27769) 
* fix: Added a new button "View" and merged "Accounting Ledger" and "Accounts Receivable" into it

* fix: sider issues

* chore: dead code
 2021-10-04 15:42:43 +05:30
Saqib
9051735529
perf: fetching of account balance in chart of accounts (#27661) 2021-10-04 11:44:46 +05:30
Saqib Ansari
1b7414e948 fix: cannot add deductions in internal transfer payment entry 2021-10-04 11:24:02 +05:30
Deepesh Garg
4abb43a425
Merge pull request #27749 from GangaManoj/fix-pe-payment-term 
fix: Display appropriate message for Payment Term discrepancies in Payment Entry
 2021-10-04 11:06:20 +05:30
Deepesh Garg
a1c4c62fac
Merge pull request #27739 from nextchamp-saqib/sla-migrate-fix 
fix: sync_jobs fails
 2021-10-04 11:04:12 +05:30
Rucha Mahabal
01bea14622
fix: sider 2021-10-04 09:58:38 +05:30
ChillarAnand
a1d3a09d3c Merge branch 'develop' into care 2021-10-04 09:46:34 +05:30
Deepesh Garg
da47fe2cfb fix(India): Internal transfer check fix 
(cherry picked from commit f0af24fc6d26040fa34fd7248bf38301897d9ca1)
 2021-10-03 08:09:39 +00:00
Deepesh Garg
f109f6fd16 fix: Linting issues 
(cherry picked from commit ff570f48a0ba56925528eb8696b8b7d862252d8f)
 2021-10-02 16:10:09 +00:00
Deepesh Garg
237b1a91de fix: Remove unwanted comments 
(cherry picked from commit e4b89d2fcd6c1eb788f94ad5f9563ccec07a0f2a)
 2021-10-02 16:10:09 +00:00
Deepesh Garg
9244fe563a fix: Chart Of Accounts import button not visible 
(cherry picked from commit 3529622a0d28e9cdd6e602b5450ca79d13cfa0ed)
 2021-10-02 16:10:08 +00:00
Deepesh Garg
197e97d9d6
Merge pull request #27665 from nextchamp-saqib/trim-custom-field-length 
fix: trim sales invoice custom field lengths
 2021-10-02 21:36:38 +05:30
GangaManoj
9f14695743 fix: Display appropriate message if different Payment Terms are used in PE and its Payment References 2021-10-02 21:02:07 +05:30
Marica
4e7ec8a068
fix: Hero Slider Control & Alignment fixes (#27611) 
* fix: Creating unique hash for slider id instead of slider name

* fix: Fixed alignment of Title, Subtitle, Action Button

* chore: linter fix
 2021-10-02 17:06:33 +05:30
mergify[bot]
418b9f8545
feat(HR): Some Enhancements and Onboarding (backport #25741) (#27741) 
* feat(HR): Some Enhancements and Onboarding (#25741)

* feat: Hr settings restructure

* feat: remove validation and make As warning

* feat: made leave policy Assignment feild read only

* feat: send leave Notification via 'Notification'

* patch: for field name change

* feat: removed defaults value for removed field

* feat: removed leave Notification fields

* feat: better label and description

* feat: Hr Module onboarding and Onboarding slides

* fix: sider, test, translations

* chore: remove unnecessary code formatting changes

* refactor: HR Onboarding

* refactor: HR Settings

* revert: Notification changes

* chore: remove unnecessary descriptions from leave type

* fix: linter issues

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
(cherry picked from commit 4837238f3dbbad336bcd21fcbfa19b438cbad16a)

# Conflicts:
#	erpnext/hr/doctype/employee/employee.js

* fix: conflicts

* fix: conflicts

Co-authored-by: Anurag Mishra <32095923+Anurag810@users.noreply.github.com>
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2021-10-02 13:28:39 +05:30
Saqib Ansari
7ac02de613 fix: sync_jobs fails 2021-10-02 11:34:47 +05:30
GangaManoj
6e5a3c0ea4 fix: Display draft invoices only once in error message 2021-10-02 02:15:17 +05:30
GangaManoj
99edc9c83a fix: Display message to delete linked invoices in the draft state 2021-10-02 02:03:29 +05:30
Alan
ece446ffe5
fix: update variant qty in BOM, Create Work Order dialog (#27686) 2021-10-01 20:32:13 +05:30
Goh Yan Chang
632f7848a3
Update employee_leave_balance.py 
fix: Employee Leave Balance report showing wrong figures
 2021-10-01 16:30:33 +08:00
mergify[bot]
b9942ad639
feat: Tracking Multi-round interview (#25482) (#27724) 
* feat: Tracking Multi-round interview

* fix: releted to scheduler event and formating

* fix: job applicant UI/UX and conflicts

* test: Interview Round

* fix(test): Employee referral, Employee Onboarding, Job Offer

* fix: sider

* feat: set default value in Hr settings

* feat: added validation for designation

* test: Interview

* test: Added validatiolns for skill

* test: Interview feedback

* fix: sider

* fix: remove unnecessary validations and form label cleanups

* chore: clean-up Interview Round and Interview Type doctype

* fix: remove redundant Rating Value, only keep Rating

* fix: update interview details on feedback submission

- make interview feedback submission dialog minimizable

* fix: show submit feedback button only if feedback doesn't exist

* refactor: Interview and Feedback statuses and workflow

* fix(HR Settings): clean up interview settings

* refactor: Interview

* refactor: Interview Feedback, remove unnecessary validations

* chore: update notification messages

* chore: remove unnecessary formatting changes in attendance list and leave application

* refactor: Job Applicant to Interview mapping

* chore: sorted imports

* chore: sorted imports

* fix: sider issues

* fix: linter issues

* fix: sider issues

* fix: tests

* fix: sorted imports

* fix: tests, sider

* fix: therapy plan test

* fix: sider issues

* feat: Include From Time and To Time fields in Interview for cleaner data

* feat: Interview Calendar

* fix: allow renaming masters

* fix: add more fields to list view and standard filter

* fix: validate overlapping interviews

* fix: update tests

* fix: linter issues

* refactor: replace reminder messages with Email Templates

* fix: sider issues

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
(cherry picked from commit 57e66f958cd57d66a6fd3b19f6cd3593eab63666)

Co-authored-by: Anurag Mishra <32095923+Anurag810@users.noreply.github.com>
 2021-10-01 13:15:40 +05:30
Ankush Menat
a04f9c904e
fix: option to limit reposting in certain timeslot (#27725) 2021-10-01 13:05:36 +05:30
Rucha Mahabal
9e08229b7b
fix(Org Chart): use attribute selectors instead of ID selector for node IDs with special characters (#27717) 
* fix(Org Chart): use attribute selectors instead of ID selector for node IDs with special chars

* fix: UI tests
 2021-09-30 18:32:10 +05:30
marination
cbffbc3894 fix: reload doc in patch 2021-09-30 14:53:47 +05:30
HENRY Florian
0bc213ed17
Merge branch 'develop' into dev_fix_27359 2021-09-30 11:08:44 +02:00
Marica
b1a4e040be
Merge branch 'develop' into scan-batch 2021-09-30 14:22:45 +05:30
marination
73ac3e0c40 fix: Add patch to patches.txt for https://github.com/frappe/erpnext/pull/27554 2021-09-30 14:22:01 +05:30
Marica
754626a102
fix: Delete accidental __init__.py file 2021-09-30 14:12:19 +05:30
Marica
cc143bca0d
fix: Maintenance Schedule child table status for legacy data (#27554) 
* fix: Maintenance Schedule child table status for legacy data

* fix: Include legacy draft schedules in patch

* fix: Pre-commit formatting
 2021-09-30 14:08:45 +05:30
Marica
c75c709114
Merge branch 'develop' into scan-batch 2021-09-30 14:07:54 +05:30
marination
abf450dc70 fix: Increment batch qty if pre-existing batch is scanned 2021-09-30 14:03:40 +05:30
Saqib Ansari
83cc597594 fix: do not set length for date field 2021-09-30 12:37:04 +05:30
mergify[bot]
9df5df4d94
fix: wrong company selected when marking attendance for all employees (#27685) (#27707) 
* fix: wrong company selected when marking attendance for all employees

* fix: enable caching for repeated queries of the same employee


(cherry picked from commit b478e72cefbdffd3e906fdd1ef822becdead78d7)

Co-authored-by: Mohammed Yusuf Shaikh <49878143+mohammedyusufshaikh@users.noreply.github.com>
 2021-09-30 12:07:38 +05:30
Ankush Menat
4685ed5a8c
fix: distribution of additional costs in mfg stock entry (#27629) 
* refactor: remove unnecessary list comprehensions

* fix: correct cost distribution logic

While apportioning costs same condition should be present on both sides
so total value is representative of all items to be apportioned.

Here while calculating incoming_items_cost only FG items are considered,
but while apportioning all items with to_warehouse are considered.

Solution: only apportion additional cost on FG items

* test: test cost distribution

* fix: patch for additional cost

fix(patch): consider PCV while patching

- consider Period closing voucher while patching
- recomute rates for SLE of affected stock entries

consider only FG/scrap item SLEs for recomputation of rates

* fix: remove client side logic for addn cost

All of this is done in python code hence removed client side code.
 2021-09-30 09:58:59 +05:30
Deepesh Garg
f1a669c2f7 fix: Test case 
(cherry picked from commit 23863c7663a94e32e32812301a7efca79575c470)
 2021-09-30 03:06:02 +00:00
Deepesh Garg
774cd68f4c fix: Test Case 
(cherry picked from commit 846d128c5d536b5003dc3055f3239e6f92a3146c)
 2021-09-30 03:06:01 +00:00
Deepesh Garg
13d2e7b198 fix: Deferred revenue entries post account freezing 
(cherry picked from commit e2eb72eb5ba1aaadddf8278dd77bfe75a178ef01)
 2021-09-30 03:06:00 +00:00
rohitwaghchaure
104d107659
Merge pull request #27701 from rohitwaghchaure/minor-added-project-name-in-purchase-order-analysis 
fix: added project name in the purchase order analysis
 2021-09-29 23:41:31 +05:30
Rohit Waghchaure
c1f9997a67 fix: added project name in the purchase order analysis 2021-09-29 23:26:19 +05:30
Saqib
a84cd2674c
Merge branch 'develop' into trim-custom-field-length 2021-09-29 19:56:56 +05:30
Saqib Ansari
f1fcb385f5 patch: trim sales invoice custom field lengths 2021-09-29 19:56:02 +05:30
Deepesh Garg
b39f8a6215
fix: Ignore user permission for Represents Company field in Sales and Purchase docs (#27684) 
* fix: Ignore user permission for Represents Company field in Sales and Purchase docs

* fix: Ignore user permission for fiscal year company
 2021-09-29 15:54:35 +05:30
Subin Tom
254b20bc09 minor fixes 2021-09-29 13:34:50 +05:30
Dany Robert
2b4959fb3b
fix: return tax rate since fetch is removed 2021-09-29 13:01:40 +05:30
Subin Tom
d3bb920e71 fix: dt instead of document in set_value query 2021-09-29 11:26:04 +05:30
Subin Tom
8675ca5bdd fix: using db.exists and get_value instead of get_doc 2021-09-29 11:11:55 +05:30
Saqib
0b040c7437
fix: cannot delete a project if linked with sales order (#27536) 2021-09-28 18:13:01 +05:30
Saqib
424efd41e5
feat(regional): toggle for reduced depreciation rate as per IT Act (#27600) 2021-09-28 18:12:02 +05:30
Subin Tom
0a28fed679 fix: patch fix, fields disabling 2021-09-28 13:54:01 +05:30
Alan
72c081fd8f
fix: apply price list after batch or serial no insertion (#27566) 2021-09-28 12:56:26 +05:30
Alan
b91333afdd
fix: set item.qty as mandatory in picklist (#27680) 2021-09-28 06:41:37 +00:00
GangaManoj
c84c983073 fix: Categorize into test suites 2021-09-28 01:22:38 +05:30
Noah Jacob
5c249decbb
fix(ux): added exception of template item in filters (#27560) 2021-09-27 22:34:27 +05:30
Ganga Manoj
28bdd6d2e3
Merge branch 'develop' into fix-depr-after-sale 2021-09-27 22:18:04 +05:30
GangaManoj
40ec2d622b fix: Add tests for depreciation 2021-09-27 22:14:42 +05:30
GangaManoj
fdd9e6cc3c fix: Replace asset.schedules with asset.get('schedules') 2021-09-27 22:14:16 +05:30
Deepesh Garg
cc5dd5c67d
feat: TDS deduction using journal entry and other fixes (#27451) 
* fix: TDS deduction using journal entry

* fix: Multi category application against single supplier

* refactor: TDS payable monthly report

* fix: Server side handling for default tax withholding category

* fix: Supplier filter for Journal Entry

* refactor: TDS computation summary report
 2021-09-27 21:43:20 +05:30
marination
596cf3951d fix: Batch scans get overwritten on the same row 2021-09-27 15:06:46 +05:30
Saqib
b68ac24cd5
chore: add shipping address in eway bill test (#27662) 2021-09-27 15:03:58 +05:30
Saqib
f2fca59ba7
fix: cannot set custom label for 'total' field in print format (#27664) 2021-09-27 14:28:16 +05:30
Shariq Ansari
18918e1b4f chore: linter fix 2021-09-27 14:08:44 +05:30
Saqib Ansari
a7df4227da fix: trim sales invoice custom field lengths 2021-09-27 13:56:16 +05:30
Shariq Ansari
0de735f20b fix: Fixed alignment of Title, Subtitle, Action Button 2021-09-27 13:50:19 +05:30
Subin Tom
54754f4eb8 fix: updated patch, add fields only if fields are checked 2021-09-27 12:51:54 +05:30
Saqib
711395db22
fix: linting errors 2021-09-27 12:26:18 +05:30
Saqib
1f8ad72418
fix: indentation 2021-09-27 12:21:06 +05:30
Saqib
30f59b09fd
chore: log modified invoices 2021-09-27 12:20:16 +05:30
ChillarAnand
765a9bb731 refactor: Remove sales invoice custom js related to healthcare 2021-09-27 07:34:54 +05:30
Saqib Ansari
18e5d59d24 fix: unknown column 'ref_exchange_rate' 2021-09-26 20:26:45 +05:30
Dany Robert
5ce6a4c107
fix: tax rate being overridden in case of 0.00 
Tax rate could be different for different expenses.
Therefore, rate is kept as 0.00 and tax amount entered manually. 
But fetching used to override the rate(upon saving) and mess up the amount.
 2021-09-26 18:31:27 +05:30
Saqib
e8ff649298
Merge branch 'develop' into fix-32644 2021-09-26 17:07:46 +05:30
Saqib Ansari
e6b4d33f4b chore: hide exchange gain loss if empty 2021-09-26 17:07:13 +05:30
Saqib Ansari
beebfb323a patch: invalid gain loss gl entry 2021-09-26 16:58:55 +05:30
Saqib
f8c1c73953
fix: local variable 'fiscal_year_details' referenced before assignment (#27656) 2021-09-26 16:27:56 +05:30
Saqib Ansari
78ad50efc2 fix: cost center in exchange gain loss gl entry 2021-09-26 16:08:15 +05:30
Saqib Ansari
dd2d039ca8 chore: hide exchange gain loss if empty 2021-09-26 15:51:03 +05:30
Saqib Ansari
64efe8bf15 fix: setting of gain/loss if party account is in company currency 2021-09-26 15:46:13 +05:30
escix
dafe99b6e2
fix: holiday message reminder 
Minor grammatical change
 2021-09-26 11:09:13 +05:30
GangaManoj
796ed947ce fix: Reverse depreciation entry made on sale if asset that was set to be sold in the future gets returned 2021-09-25 19:11:29 +05:30
GangaManoj
b9fb59da58 fix: Reset depreciation schedule on returning asset 2021-09-25 19:04:16 +05:30
Sagar Vora
c8b9a55e96
feat: add Partly Paid status in Invoices (#27625) 2021-09-22 12:11:35 +05:30
Frappe PR Bot
2af6ea68ae
fix: remove unknown field employee_name from query (bp #27634) 
* fix: remove unknown field employee_name from query

* fix: remove unknown fieldname

Co-authored-by: root <root@vultr.guest>
Co-authored-by: Ankush Menat <ankushmenat@gmail.com>
(cherry picked from commit 9ebabb86b3d28e2c94eb2761f1864c88b6eb1e59)

Co-authored-by: Bhavesh Maheshwari <34086262+bhavesh95863@users.noreply.github.com>
 2021-09-21 20:33:09 +05:30
Ankush Menat
c302c7ab42
fix: remove bad default for anniversary reminders (#27632) 
🤦
 2021-09-21 17:51:46 +05:30
Marica
9110223341
fix: (ux) Use subassembly schedule date while making WO from Prod Plan (#27628) 
- Set subassemply WO's planned start date from Production Plan
 2021-09-21 16:50:14 +05:30
Kenneth Sequeira
abded895f3
fix: update default KSA VAT rate for setup (#27614) 2021-09-21 10:58:18 +05:30
François de Ryckel
5c400da4e2
Update training_result.js (#27615) 
cur_frm is deprecated
 2021-09-21 09:29:15 +05:30
GangaManoj
7ab3b9dd5a fix: Add test for depreciation on sale of a depreciated Asset 2021-09-21 07:11:40 +05:30
GangaManoj
249672c35d fix: Add depreciation_schedule details in create_asset() 2021-09-21 07:11:40 +05:30
GangaManoj
700e78d69b fix: Remove extra brackets 2021-09-21 07:11:40 +05:30
Ganga Manoj
eb8122baba
Merge branch 'develop' into fix-depr-after-sale 2021-09-21 06:29:41 +05:30
GangaManoj
3c8879e777 fix: Calculate depreciation_amount accurately 2021-09-21 06:07:06 +05:30
GangaManoj
244d9dee04 fix: Correct expected_values 2021-09-21 06:06:21 +05:30
Abdullah A. Zaqout
6d8e869a92
fix(pos): check if item exists before fetching available qty (#27581) 2021-09-20 21:35:37 +05:30
Anuja Pawar
190c2d84da
fix: reference row added in allocation table (#27602) 2021-09-20 21:32:38 +05:30
GangaManoj
e77534fe13 fix: Unlink PO on cancelling SO 2021-09-20 21:18:18 +05:30
Ganga Manoj
41678faeee
Merge branch 'develop' into unlink-po-on-cancelling-so 2021-09-20 21:16:31 +05:30
Shariq Ansari
3e8e6ac4e2 fix: Creating unique hash for slider id instead of slider name 2021-09-20 20:52:08 +05:30
GangaManoj
8396f24e70 fix: Unlink PO on cancelling SO 2021-09-20 19:01:46 +05:30
Ankush Menat
4f01115f2f
Merge pull request #27601 from ankush/overbill_warn 
fix(ux): warn when overbilling allowance was bypassed due to role
 2021-09-20 17:42:29 +05:30
Ankush Menat
21a955d20b
fix(ux): better error message 
Co-authored-by: Saqib <nextchamp.saqib@gmail.com>
 2021-09-20 17:14:35 +05:30
Ankush Menat
5e4fbba753
refactor: add guard clause in for loop 
Reduce overly indented code/improve readability.
 2021-09-20 16:40:51 +05:30
Ankush Menat
43bf82b58b
fix: warn when overbilling checks are skipped. 2021-09-20 16:31:20 +05:30
Subin Tom
0ff7367f39
fix: Tax Breakup table headers fix (#27596) 2021-09-20 16:13:36 +05:30
Saqib
ef66beec51
fix(plaid): query to check if bank account exists 2021-09-20 15:33:29 +05:30
ChillarAnand
aa580769a6 chore: Code clean up 2021-09-20 15:27:43 +05:30
Ankush Menat
648b2d72a5
perf: extract loop invariant db calls 2021-09-20 15:27:12 +05:30
Deepesh Garg
f07ff92a35
fix: Improvements in COA Importer (#27584) 2021-09-20 11:12:39 +05:30
GangaManoj
164a2ad28d fix: Calculate depreciation_left accurately 2021-09-20 04:33:30 +05:30
Frappe PR Bot
4f7af79c31
fix: PO/PINV - Check if doctype has company_address field before setting the value (#27441) (#27576) 
Co-authored-by: Vama Mehta <vama.mehta@inqubit.in>
(cherry picked from commit 666eaae6ce976c5d820b3b9f91d23a0ed28a263a)

Co-authored-by: vama <vamagithub@gmail.com>
 2021-09-18 13:34:27 +05:30
rohitwaghchaure
bf2a590332
fix: View Stock / Accounting Ledger button not showing in the stock entry (#27570) 2021-09-17 18:39:21 +05:30
Saqib
e03d9aa889
fix: unecessary keyword args were passed in mapper functions (#27563) 2021-09-17 13:03:27 +05:30
Subin Tom
d49346ac45
fix: Tax breakup based on items, missing GST fields (#27524) 
* fix: Tax breakup based on items

* fix: added gst fields,warehouse validation to pos inv,patch

* fix: tax breakup test fix, eway bill hsn fix

Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
 2021-09-17 10:39:03 +05:30
Marica
41f11eca72
fix: Remove duplicates from customer_code field (#27555) 2021-09-17 10:27:29 +05:30
Ahmad
0ab57d49c1 fix: pre-commit hooks 2021-09-17 01:54:59 +05:00
Ahmad
9dae36b81d fix: pre-commit hooks 2021-09-17 01:51:32 +05:00
Ahmad
4ec733fcc0 fix: pre-commit hooks 2021-09-17 01:46:45 +05:00
Ahmad
f1e5a64c61 refactor (regional): KSA utils 2021-09-17 01:33:32 +05:00
Ahmad
05321d7f4e
Update erpnext/regional/saudi_arabia/utils.py 
Co-authored-by: Saqib <nextchamp.saqib@gmail.com>
 2021-09-17 01:28:52 +05:00
Ahmad
95b3b9c8f5
Update erpnext/regional/saudi_arabia/utils.py 
Co-authored-by: Saqib <nextchamp.saqib@gmail.com>
 2021-09-17 01:27:37 +05:00
Ahmad
940db71a82 fix: indentations 2021-09-17 01:14:41 +05:00
Subin Tom
5c18654113 fix: Renamed child table doctype, delete taxes for non nexus state 2021-09-17 00:10:41 +05:30
Deepesh Garg
c9c8957250
feat: Merge POS invoices based on customer group (#27471) 
* feat: Merge POS invoices based on customer group

* fix: Linting Issues

* fix: fieldname

Co-authored-by: Saqib <nextchamp.saqib@gmail.com>
 2021-09-16 19:33:57 +05:30
Saqib
5eba1ccd51
fix: no validation on item defaults (#27393) 
* fix: no validation on item defaults

* fix: cache value while validating

* test: item default company relation

* fix: reorder validations

* refactor: add guard conditions on update_defaults

* test: add default warehouse for item group

* fix: validate item defaults for item groups

Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
 2021-09-16 17:31:37 +05:30
Marica
9b388883d3
fix: Validate if item exists on uploading items in stock reco (#27538) 
* fix: Validate if item exists on uploading items in stock reco

- Uploading non existent item in stock reco and then changing warehouse or batch gave an error
- Check for non existent item

* chore: translation

Co-authored-by: Ankush Menat <ankushmenat@gmail.com>
 2021-09-16 15:47:17 +05:30
Ankush Menat
78fe92542c
fix(ProdPlan): Get SubAssy Items does not work (#27537) 
* fix(ProdPlan): Get SubAssy Items does not work

This button wasn't working unless the document was saved already.

* fix: make form dirty when subassy item are fetched
 2021-09-16 15:34:50 +05:30
Subin Tom
11bd42467e
Update erpnext/erpnext_integrations/taxjar_integration.py 
Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
 2021-09-16 14:42:15 +05:30
Subin Tom
435a5e4fa3
Update erpnext/erpnext_integrations/doctype/taxjar_settings/taxjar_settings.js 
Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
 2021-09-16 14:42:06 +05:30
Subin Tom
486d7c3a39
Update erpnext/erpnext_integrations/doctype/taxjar_settings/taxjar_settings.py 
Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
 2021-09-16 14:41:48 +05:30
Subin Tom
0e527311b9
Update erpnext/erpnext_integrations/taxjar_integration.py 
Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
 2021-09-16 14:41:38 +05:30
Rucha Mahabal
866763c16a
fix(minor): Employee filter in Unpaid Expense Claims report (#27530) 2021-09-16 00:05:16 +05:30
rohitwaghchaure
e6a1ad8016
fix: not able to submit stock entry with 350 items (#27523) 2021-09-15 20:42:47 +05:30
Ankush Menat
70c203d19e
test: automated test for running all stock reports (#27510) 
* test: automated test for running all stock reports

These test do not assert correctness, they just check that "execute" function
is working with sane filters.

* test: make report execution test modular
 2021-09-15 19:24:35 +05:30
Frappe PR Bot
29dab0699c
fix(minor): Remove b2c limit check from CDNR Invoices (#27516) (#27520) 
* fix(minor): Remove b2c limit check from CDNR Invoices

* fix: Remove unnecessary format

(cherry picked from commit 978028c880445362afc0cfca9118424174541cc7)

Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
 2021-09-15 19:12:02 +05:30
Noah Jacob
5e0b21582a
fix: table data deleted on submitted maintenance schedule (#27513) 2021-09-15 17:37:52 +05:30
Frappe PR Bot
d4d5e2786f
fix: Maintain same rate in Stock Ledger until stock become positive (#27227) (#27478) 
* fix: Maintain same rate in Stock Ledger until stock become positive

* fix: Maintain same rate in Stock Ledger until stock become positive

(cherry picked from commit 10754831c33b3459d5a45c98f875afa48a444627)

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2021-09-15 17:07:58 +05:30
rohitwaghchaure
c5a77f60ed
feat: provision to add scrap item in job card (#27483) 2021-09-15 16:45:57 +05:30
Frappe PR Bot
6e7945fbb7
fix: Tags getting fetched correctly in Get Supplier in RFQ (Request For Quotation) (#27499) (#27506) 
* fix: Tags getting fetched correctly in Get Supplier in RFQ( Request For Quotation ) #26343

* fix: Linting issues

* fix: remove unnecessary caching

[skip ci]


Co-authored-by: Vama Mehta <vama.mehta@inqubit.in>
Co-authored-by: Ankush Menat <ankush@iwebnotes.in>

(cherry picked from commit 50fe23308acad58ab2db2056ea6dd163913725ef)
 2021-09-15 11:10:11 +05:30
Deepesh Garg
759f2b7920
fix: Autoname for customer and supplier (#27398) 2021-09-15 10:24:26 +05:30
Deepesh Garg
625626b973
fix: Values with same account and different account number in consolidated balance sheet report (#27493) 2021-09-15 10:10:54 +05:30
rohitwaghchaure
2e2985e4f1
fix: calculate operating cost based on BOM Quantity (#27464) 
* fix: calculate operating cost based on BOM Quantity

* fix: added test cases
 2021-09-15 00:37:41 +05:30
Subin Tom
3bb60a439a fix: sales_tax attribute in api call before submit 2021-09-14 22:04:57 +05:30
Subin Tom
b01fe1c3e2 fix: TaxJar update - nexus, selective api call 2021-09-14 20:42:47 +05:30
Deepesh Garg
c53b78e712
fix: Patch for updating tax withholding category dates (#27489) 2021-09-14 20:28:48 +05:30
Ankush Menat
fea51f4082
chore: isort 
[skip ci]
 2021-09-14 19:04:47 +05:30
Marica
de9f78350b
Merge branch 'develop' into job-card-excess-transfer 2021-09-14 16:50:06 +05:30
marination
469bb8d977 test: Work Order Material Transfer against Job Card 
- Tests for multiple items transfer and excess transfer against JC
- Remove unused __future__ imports
- Changed Copyright year
- Sider: (js) Added space before if
 2021-09-14 16:27:39 +05:30
Ahmad
8a42570c96 refactor(regional): moved methos to region specific utils for KSA 2021-09-14 14:45:23 +05:00
Ahmad
de01066ef5
Update erpnext/regional/saudi_arabia/setup.py 
Method name updated

Co-authored-by: Saqib <nextchamp.saqib@gmail.com>
 2021-09-14 14:29:45 +05:00
Ahmad
0950713e4c
Update erpnext/regional/saudi_arabia/setup.py 
Method name updated

Co-authored-by: Saqib <nextchamp.saqib@gmail.com>
 2021-09-14 14:29:33 +05:00
Ahmad
6985ca210e
Refactor erpnext/regional/__init__.py 
Co-authored-by: Saqib <nextchamp.saqib@gmail.com>
 2021-09-14 14:28:57 +05:00
Ahmad
b5b61b3a3d
Update erpnext/regional/report/ksa_vat/ksa_vat.py 
String made translatable

Co-authored-by: Saqib <nextchamp.saqib@gmail.com>
 2021-09-14 14:26:44 +05:00
DeeMysterio
aa82624f31
Merge pull request #27281 from DeeMysterio/party-specific-items 
feat: link items to supplier / customer
 2021-09-14 13:58:18 +05:30
Shariq Ansari
9aa6f52edd
fix: Webform Permission for custom doctype (#26232) 
* fix: Webform Permission for custom doctype

* fix: sider fix

* fix: app check condition for getting correct list_context

* chore: Better naming convention

* test: Added test case to check permission for webform of custom doctype

* chore: linting issue

* chore: linting issue

* fix: sider fix

* test: minor changes

* chore: linter and better naming method

* chore: linter fix

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2021-09-14 12:49:08 +05:30
marination
9520215e2b feat: Handle Excess/Multiple Item Transfer against Job Card 
- Hide MR/Material Transfer buttons in JC if cancelled
- Show MR/Material transfer buttons if pending to transfer or excess transfer allowed
- Renamed ‘Transferred Qty’ to ‘FG Qty from Transferred Raw Materials’ in JC
- Set status to Completed in JC in case of excess transfer too
- During excess transfer against JC, avoid negative ‘For Quantity’. Set to 0 instead
- Job card section and excess transfer allowance checkbox in Manufacturing Settings
- Renamed ’Allow Multiple Material Consumption’ to ‘Allow Continuous Material Consumption’ (fiedname is same)
- Secured denominator variables in `get_transfered_raw_materials` to avoid ZeroDivisionError
 2021-09-14 12:33:21 +05:30
Chillar Anand
95460d9818
fix(HR): Ignore invalid fields when updating employee details (#27456) 2021-09-14 12:00:34 +05:30
Faris Ansari
1c1b476d67
perf: Optimize get_attribute_filters (#26729) 
* perf: Optimize get_attribute_filters

* fix: handle when filter attributes are undefined

* chore: unused imports

Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
 2021-09-14 11:41:19 +05:30
Rucha Mahabal
b98740b44a
fix: employee advance return through multiple additional salaries (#27438) 
* fix: employee advance return through multiple additional salaries

* test: test repay unclaimed amount from salary

* fix: sorting in imports
 2021-09-14 11:20:15 +05:30
Deepesh Garg
c7ceb37b63
Merge pull request #27465 from nextchamp-saqib/so-analytics-report-fix 
fix: cancelled sales invoices are considered in billed qty calculation
 2021-09-14 10:05:36 +05:30
Saqib Ansari
44139fbac5 fix: cancelled sales invoices are considered in billed quantity calculation 2021-09-13 16:50:11 +05:30
Saqib
a5baf909b7
fix: editable price list rate field in sales transactions (#27455) 2021-09-13 15:50:20 +05:30
Rucha Mahabal
bab644a249
fix(Payroll): incorrect component amount calculation if dependent on another payment days based component (#27349) 
* fix(Payroll): incorrect component amount calculation if dependent on another payment days based component

* fix: set component amount precision at the end

* fix: consider default amount during taxt calculations

* test: component amount dependent on another payment days based component

* fix: test
 2021-09-13 13:24:27 +05:30
Saqib
7292f5476d
feat: (get_items_from) filter material request item in purchase order (#27449) 2021-09-13 12:13:43 +05:30
Ankush Menat
d743c41b54
fix(ux): apply proper filtering in stock reports (#27411) 
* fix(ux): apply proper filtering in stock reports

Stock Balance: apply company filter to warehouse field
Stock Ageing: apply company filter to warehouse field

* fix: unnecessary parens

Co-authored-by: Alan <2.alan.tom@gmail.com>
 2021-09-12 16:38:18 +05:30
Ankush Menat
6ef879fca2
fix(ux): clean invalid fields from variant setting (#27412) 2021-09-12 16:36:51 +05:30
Frappe PR Bot
a52d4c25ff
fix: fail migration due to None type during v13_0.update_returned_qty_in_pr_dn (#27430) (#27436) 
* fix: fail migration due to None type

* fix: incorrect key: value pair in filter.

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

Co-authored-by: Devin Slauenwhite <devin.slauenwhite@gmail.com>
 2021-09-11 17:54:55 +05:30
Sagar Vora
dae0a1c1d6
fix: Template Error due to use of single quote (#27433) 2021-09-11 17:54:21 +05:30
Ankush Menat
62fc544280
test: basic tests for controllers/queries (#27422) 2021-09-10 12:46:35 +05:30
Anuja Pawar
a58e309297
fix: fix to fetch customers and billing email in PSOA (#27363) 2021-09-09 19:37:52 +05:30
Subin Tom
8b4c57ee09
fix: pos payment mode selection issue (#27409) 2021-09-09 19:33:34 +05:30
Anupam Kumar
7edac5a5d7
fix: removing duplicate currency() from sales_invoice.js (#27410) 2021-09-09 19:17:01 +05:30
Noah Jacob
acdb10377f
refactor: .doc missing and empty row on new doc (#27408) 
* refactor: .doc missing and empty row on new doc

* fix: let -> const
 2021-09-09 18:54:00 +05:30
Ankush Menat
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
 2021-09-09 12:24:23 +05:30
Deepesh Garg
9104796eb8
Merge pull request #27258 from deepeshgarg007/tds_validity 
feat: Validity dates in Tax Withholding Rates
 2021-09-09 12:17:36 +05:30
Anuja Pawar
3576668638
fix: added Show Remarks checkbox in AR & AP reports (#27374) 2021-09-09 11:57:29 +05:30
Deepesh Garg
e7e2ce1271 fix: Linting Issues 2021-09-09 11:36:57 +05:30
Deepesh Garg
c33bbd4f39 fix: Test Case 2021-09-09 11:13:29 +05:30
rohitwaghchaure
295020451f
fix: added delivery date filters to get sales orders in production plan (#27367) 2021-09-08 19:28:30 +05:30
Alan
81d3524d27
fix: auto complete sales order rows in production plan (#27352) 
* fix: auto complete sales order rows in production plan

* fix: sider
 2021-09-08 16:48:42 +05:30
Saqib
9c27f9be1e
fix: document naming rule not working for subscription invoices (#27386) 2021-09-08 16:47:04 +05:30
Dany Robert
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>
 2021-09-08 16:28:05 +05:30
Saqib
df3e4ce1c0
fix: scan barcode fields input length (#27389) 
* fix: undo unintentional changes

* fix: scan barcode fields input length
 2021-09-08 16:04:13 +05:30
Deepesh Garg
ee1486209d Merge branch 'develop' of https://github.com/frappe/erpnext into tds_validity 2021-09-08 11:33:42 +05:30
Marica
61a1356109
fix: Check if Item is serialised before trying to fetch SN and set SO in it (#27358) 2021-09-07 14:42:17 +05:30
rohitwaghchaure
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>
 2021-09-07 12:14:40 +05:30
Deepesh Garg
8f6d22b7ea
Merge pull request #27373 from deepeshgarg007/gstin_filter_issue 
fix: GSTR-1 Reports not showing any data
 2021-09-07 11:09:14 +05:30
Deepesh Garg
6dfcc1e2ae fix: Remove print and debug 2021-09-07 11:08:30 +05:30
Deepesh Garg
e1f55df4d7 fix: GSTR-1 Reports not showing any data 2021-09-07 11:07:22 +05:30
Mohammed Yusuf Shaikh
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>
 2021-09-07 10:49:34 +05:30
Ahmad
69470fc15a
Merge branch 'develop' into ksa-vat 2021-09-07 00:02:12 +05:00
Anupam Kumar
88c9fe35bd
fix: employee remider settings (#27365) 2021-09-07 00:15:58 +05:30
Ahmad
87380d021d feat(regional): QR Code generation for Saudi Arabia Sales Invoices 2021-09-06 23:36:55 +05:00
Ahmad
b42d63e526 Merge remote-tracking branch 'refs/remotes/havenir/ksa-vat' into ksa-vat 2021-09-06 23:26:52 +05:00
Ahmad
cb0c2d1477 feat(Regional): KSA VAT Report 2021-09-06 23:25:20 +05:00
ChillarAnand
c8565c7090 chore: Removed healthcare module code in other modules 2021-09-06 20:47:27 +05:30
Anupam Kumar
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>
 2021-09-06 16:54:28 +05:30
Florian HENRY
aa7ee3ca03 fix: link in dashboard missing on SI from DN 2021-09-06 11:40:44 +02:00
Ankush Menat
14b01619de
fix: patch failure for vat audit report (#27355) 2021-09-06 13:47:56 +05:30
Marica
0f2a52078c
fix: Dont fetch Stopped/Cancelled MRs in Stock Entry Get Items dialog (#27326) 2021-09-06 13:14:09 +05:30
Deepesh Garg
25d208aa8a fix: GL Entries on advance TDS allocation 2021-09-06 10:37:41 +05:30
Deepesh Garg
51d9572fe7 fix: Hardcode fiscal year and posting date 2021-09-05 17:56:12 +05:30
Deepesh Garg
ceaa804f04
fix: Presentation currency conversion in reports (#27316) 2021-09-05 17:21:29 +05:30
rohitwaghchaure
7b4a65484a
fix: manually added weight per unit reset to zero after save (#27330) 2021-09-03 22:00:14 +05:30
Ankush Menat
73b3a2f685
chore: whitespace 2021-09-03 21:57:38 +05:30
Deepesh Garg
092d41ecda fix: Debug CI 2021-09-03 20:04:18 +05:30
Deepesh Garg
41392acd18 Merge branch 'develop' of https://github.com/frappe/erpnext into tds_validity 2021-09-03 19:19:35 +05:30
Deepesh Garg
8f5a77446e
Merge pull request #27279 from deepeshgarg007/gstr_1_cdnr_unregistered_json_develop 
feat: CDNR Unreg json generation
 2021-09-03 13:55:00 +05:30
Deepesh Garg
a06a70d1a4 fix: Patch error and tests 2021-09-03 13:13:37 +05:30
Deepesh Garg
79d250845e fix: Patch 2021-09-03 13:13:37 +05:30
Deepesh Garg
2b34028acd fix: Patch and linting errors 2021-09-03 13:13:37 +05:30
Ganga Manoj
64fcd1a092
fix: make datetime objects readable (#27301) 
* fix: Make datetime objects readable

* fix: Remove unused imports
 2021-09-03 12:54:47 +05:30
Subin Tom
798b464ee3
fix: braintree payment processed twice (#27300) 2021-09-03 12:30:57 +05:30
Saqib
98696c0ec9
Merge pull request #27306 from GangaManoj/fix-selling-settings 
fix: Move related fields together in Selling Settings
 2021-09-03 12:30:02 +05:30
Ankush Menat
d1fe060e4a
fix: south africa vat patch failure (#27323) 
reload doc is necessary on new doctypes
 2021-09-03 12:02:32 +05:30
Shariq Ansari
e68c55ce83
fix: Removing first Spacer from home page (#27321) 2021-09-03 11:00:33 +05:30
ChillarAnand
66e92d423e chore: Added healthcare deprecation warning patch 2021-09-02 20:02:11 +05:30
ChillarAnand
e913e277d9 chore: Rename imports from erpnext to healthcare 2021-09-02 19:47:39 +05:30
GangaManoj
ebdc568e85 fix: Rename 'Action if Same Rate is Not Maintained' to 'Action if Same Rate is Not Maintained Throughout Sales Cycle' 2021-09-02 19:32:51 +05:30
Deepesh Garg
e1fffdb262 fix: Linting issues 2021-09-02 19:10:49 +05:30
Deepesh Garg
c85242e03d Merge branch 'develop' of https://github.com/frappe/erpnext into gstr_1_cdnr_unregistered_json_develop 2021-09-02 18:59:59 +05:30
Deepesh Garg
e8a5dc371b fix: Add payment entry custom fields 2021-09-02 18:56:04 +05:30
ChillarAnand
5d4133ecac chore: Removed healthcare demo, patch files 2021-09-02 18:25:36 +05:30
ChillarAnand
bcb3f0fedb chore: Removed healthcare module 2021-09-02 18:14:34 +05:30
Ankush Menat
eec40513be
fix: minor linting issues (#27314) 
* fix: syntax error in gratuity

* fix: unpacking None into three variables

* fix: unexpected kwarg for delete_accounting_dimensions
 2021-09-02 17:42:45 +05:30
Ankush Menat
60185c8c71
chore: linting 
[skip ci]
 2021-09-02 17:36:05 +05:30
Chillar Anand
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
 2021-09-02 16:44:59 +05:30
Ankush Menat
b25d28e023
fix(patch): delete stale shopify doctypes (#27313) 2021-09-02 14:53:06 +05:30
Saqib
366012817f
Merge branch 'develop' into fix-selling-settings 2021-09-02 11:13:52 +05:30
Saqib
a158b825fc
Merge pull request #27124 from GangaManoj/gross-profit-product-bundle 
feat: Improve Product Bundle handling
 2021-09-02 11:12:56 +05:30
Devin Slauenwhite
43c476ddf7
fix: (Backport-develop) track salary slip ytd gross salary. (#27242) 
* fix: track salary slip ytd gross salary.

* fix: ytd gross salary unique label

* Revert "fix: ytd gross salary unique label"

This reverts commit a68b387ac21e32c250d042caf75ef301b5a49a1a.

* fix: gross ytd salary unique label
 2021-09-02 09:39:35 +05:30
Anupam Kumar
c25367f107
Merge pull request #27292 from anupamvs/comany-name-field-issue-develop 
fix: mapping for company name lead->contact
 2021-09-02 09:32:47 +05:30
Rucha Mahabal
f828d853e3
fix: Org Chart fixes (#27290) 
* fix(org chart): multiple root nodes not expanding on clicking Expand All

* fix: unstable filter inserts duplicate nodes
 2021-09-01 23:07:26 +05:30
GangaManoj
799d67d785 fix: Only display 'Role Allowed to Override Stop Action' if 'Maintain Same Rate Throughout Sales Cycle' is checked 2021-09-01 22:55:10 +05:30
GangaManoj
f2a7fbd126 fix: Remove redundant description 2021-09-01 22:49:05 +05:30
GangaManoj
06484321d1 fix: Move related fields to the same section 2021-09-01 22:48:09 +05:30
Deepesh Garg
d5a736d11e test: Update test case 2021-09-01 21:15:24 +05:30
Ankush Menat
dea5c34d8d
chore: whitespace 2021-09-01 19:59:22 +05:30
Ankush Menat
81eb6fde07
Merge pull request #27288 from ankush/strict_linting 
chore: cleanup linting errors and introduce strict linting checks
 2021-09-01 19:32:49 +05:30
Raffael Meyer
605f73b4d4
feat: add voucher-specific data to DATEV export (bp #26589) (#27287) 
* feat: add voucher-specific data to datev export

* refactor: def instead of lambda
 2021-09-01 19:27:54 +05:30
rohitwaghchaure
2a8cd05b44
fix: production plan UX and validation message (#27278) 2021-09-01 19:16:03 +05:30
Marica
9506c14d35
fix: Zero division error while fetching unconsumed materials (#27293) 
`
 2021-09-01 18:49:12 +05:30
Jannat Patel
696fa6c8fe
Merge branch 'develop' into comany-name-field-issue-develop 2021-09-01 18:25:46 +05:30
Anupam
821f6a6178 fix: mapping for company name lead->contact 2021-09-01 17:49:05 +05:30
Ankush Menat
b147b85e6a
chore: whitespace / eof fixes 2021-09-01 16:57:21 +05:30
Ankush Menat
e46567192a
fix: invalid escape sequences in regex 2021-09-01 16:57:17 +05:30
GangaManoj
bc79084dac fix: Add Product Bundle field in Items table 2021-09-01 16:06:47 +05:30
GangaManoj
bbb9fa4bf8 fix: Remove Rate from field_no_map 2021-09-01 16:00:59 +05:30
GangaManoj
471fd9718c fix: Set Product Bundle's Delivery Dates in SO as Bundle Items' Delivery Dates in PO 2021-09-01 15:36:07 +05:30
Ankush Menat
55b24345a0
fix: remove unused format from query 
doctype is not used in query and parent alone is enough to identify
packed items.
 2021-09-01 15:33:37 +05:30
Ankush Menat
7d9819f352
fix: remove duplicate imports 2021-09-01 15:33:35 +05:30
GangaManoj
4d8f833cc9 fix: Remove Add Row and Delete Row options for Packed Items table 2021-09-01 15:20:40 +05:30
GangaManoj
17a6a9b036 fix: Uncheck read-only for Packed Items table 2021-09-01 15:13:29 +05:30
GangaManoj
816ba55b74 fix: Make Rate read-only by default 2021-09-01 15:11:08 +05:30
Ankush Menat
2d62c500c4
fix: undefined variables 2021-09-01 15:05:00 +05:30
Ankush Menat
9fec0a5c68
refactor: itemgetter instead of assigned lambda 2021-09-01 15:02:29 +05:30
Ankush Menat
010060d92e
chore: correct indentation 2021-09-01 15:02:29 +05:30
Ankush Menat
694ae81618
fix: remove bare excepts 2021-09-01 15:02:28 +05:30
Alan
9dc0843cbd
fix: translate labels (#27282) 
[skip ci]
 2021-09-01 12:58:34 +05:30
Deepesh Garg
8b644d8889 fix: Report and JSON generation for Advances received 2021-09-01 10:28:15 +05:30
Deepesh Garg
5e22405c45 feat: CDNR Unreg json generation 2021-09-01 10:26:55 +05:30
Deepesh Garg
b6d0b17ed6 fix: Linting and patch fixes 2021-09-01 10:11:18 +05:30
Deepesh Garg
d06221ad7a fix: Advance TDS test case 2021-09-01 10:05:10 +05:30
GangaManoj
0e457265b7 fix: Test Product Bundle price calculation 2021-09-01 02:50:29 +05:30
GangaManoj
0c3d3bb357 fix: Test if Product Bundles are mapped properly on creating a Sales Order 2021-09-01 02:33:53 +05:30
GangaManoj
912bfb234f fix: Test if Product Bundles in SOs are replaced with their child items on creating POs 2021-09-01 02:09:46 +05:30
Ganga Manoj
82118975e2
Merge branch 'develop' into gross-profit-product-bundle 2021-08-31 22:08:10 +05:30
Rucha Mahabal
ef76f62bc1
fix: Healthcare Service Unit fixes (#27273) 
* fix: validate service unit setup against practitioner schedule

* fix: service unit properties getting overwritten
 2021-08-31 21:06:53 +05:30
GangaManoj
65796853f3 fix: Map Packed Items to Items table of PO 2021-08-31 20:31:22 +05:30
Ankush Menat
c1d986a0c6
fix: revert "refactor: simplify initialize_previous_data" (#27270) 
This reverts commit 2f5624e588541103adb4a3170f2886590dcee42e.
 2021-08-31 19:43:42 +05:30
Afshan
763450dcf8
Revert "fix: add child item groups into the filters (#26997)" (#27266) 
This reverts commit c60d5523bc.
 2021-08-31 19:07:20 +05:30
Frappe PR Bot
81fb493850
fix: payment terms on Sales Order when Invoice Portion field is empty (#27259) 2021-08-31 19:01:03 +05:30
Anuja Pawar
3e404f15ff
refactor: payment reconciliation tool (#27128) 2021-08-31 18:59:29 +05:30
Deepesh Garg
c37cec9b9d
fix(minor): Incorrect unallocated amount on type receive (#27262) 2021-08-31 18:50:23 +05:30
GangaManoj
eb24e87637 fix: Replace Product Bundles in the Items table with their child items 2021-08-31 18:44:29 +05:30
Frappe PR Bot
6281c33dd4
fix: pos payment methods not setting rounded_total (#27260) 2021-08-31 18:39:51 +05:30
Subin Tom
7004944cc0
feat: Taxjar Integration update (#27143) 
* feat: Taxjar Integration update

* added taxable_amount,taxable_amount fields in setup.py

* Update taxjar_integration.py

Sider issues fix

* Sider issues fix

* Sider issues fix

* sider issue fix: unused import

* sider issue fix

* Update erpnext/erpnext_integrations/taxjar_integration.py

Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>

* Removed permission for 'All'

Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
 2021-08-31 18:33:16 +05:30
Deepesh Garg
5e10e10329 feat: Validity dates in Tax Withholding Rates 2021-08-31 18:23:28 +05:30
Anurag Mishra
ab47409e91
feat: Full and Final Settlement and Gratuity Fix (#26364) 
* feat: Full and Final Settlement

* removed option to pay via salary slip

* feat: Create JV

* test:fnf

* fix: tracking asset movement

* fix: sider and test

* fix: changes Requested

* fix: changes requested

* fix: valication for Asset

* fix: add filter for reference document only if relevant field is present

* fix: doctype cleanup

- add more fields to the list view and standard filter

- set title field

- incorrect field labels

* feat: add list view settings for FNF

* fix: incorrect reference type set in Journal Entry

* fix: validation message

* chore: add Full and Final Statement link to Workspace

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2021-08-31 17:59:26 +05:30
Jannat Patel
48f2e5ac1d
fix: email digest original_user issue (#27191) 2021-08-31 17:43:30 +05:30
Frappe PR Bot
e958ae9002
feat: color and leave type in leave application calendar (#27246) (#27255) 
* feat: color and leave type in leave application calendar

* fix: sider + use cstring

(cherry picked from commit 366eb86fdfd9bb204bce677b01b8d5bb5ffa4d6d)

Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
 2021-08-31 17:34:48 +05:30
Dany Robert
94dcbf851a
fix: update get_exchange_rate for test mode (#26847) 
* fix: no api calls on test mode

* fix: make api call, but return 1.0 incase of invalid currency

* feat: patch request.get

* fix: clear cache after test

* fix: add missing test_exchange_value

* fix: avoid api call in implicit function call during test

* fix: returning 1 while in test causes failure

Returning 1.00 causes failure of exchange rate tests.

* chore: retab

* chore: style
 2021-08-31 17:19:12 +05:30
Alan
88aa7b824e
fix: pass labels through translation function (#27252) 2021-08-31 15:16:04 +05:30
Chillar Anand
88d849320f
fix(payroll): Fixed issue with accessing last salary slip for new employee (#27247) 2021-08-31 14:42:21 +05:30
GangaManoj
a067d55865 fix: Add Product Bundle field in Items table 2021-08-30 20:07:06 +05:30
GangaManoj
055ac82b39 fix: Remove Bundle Items table 2021-08-30 20:04:24 +05:30
Rucha Mahabal
1682402a9f
refactor: Healthcare Redesign Changes (#27236) 2021-08-30 18:26:56 +05:30
Dany Robert
5fd04101d4
fix: Stock Ageing report issues for serialized items (#27228) 
* fix: incorrect calculation in get_range_age

* fix: remove serial numbers not in stock from fifo_queue

* refactor: make serial_no condition explicit

* refactor: reduce code duplication

Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
 2021-08-30 18:11:33 +05:30
Deepesh Garg
fd467e6d32
fix: Correct company address not getting copied from Purchase Order to Invoice (#27217) 
* fix: Correct company adderess not getting copied from Purchase Order to Invoice

* fix: Linting issues
 2021-08-30 17:53:59 +05:30
Ankush Menat
7d2a0fe38e
Merge pull request #27197 from marination/supplier-primary-address 
feat: (consistency) Add Primary Address and Contact section in Supplier
 2021-08-30 14:03:09 +05:30
Subin Tom
9cb642238f
fix: expense claim reimbursed amount update (#27204) 2021-08-30 13:17:22 +05:30
Rucha Mahabal
212eb4bc1a
feat(Healthcare): Capacity for Service Unit, concurrent appointments based on capacity, Patient Appointments (#27219) 
* feat(Healthcare): Capacity for Service Unit, concurrent appointments based on Capacity, Patient enhancements

* fix: appointment test

Co-authored-by: Anoop <3326959+akurungadam@users.noreply.github.com>
 2021-08-30 13:10:18 +05:30
Marica
fbcf82f788
Merge branch 'develop' into supplier-primary-address 2021-08-30 12:51:37 +05:30
marination
7b78473da3 fix: Indentation and removed f-strings 
- Sider: fixed indentation in js
- Dont use f-strings in queries
 2021-08-30 12:50:24 +05:30
Deepesh Garg
f5cdbf161d
fix: LTV ratio comparison (#27207) 2021-08-28 14:55:51 +05:30
François de Ryckel
327071cb90
replace cur_frm with frm (#27210) 2021-08-28 14:55:11 +05:30
GangaManoj
e44567754d fix: Display Packed/Bundle Items table only if it exists 2021-08-27 20:16:13 +05:30