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

29645 Commits

Author SHA1 Message Date
Alan
05831b18ad
fix: update production plan status #27567 
fix: update production plan status
 2021-10-27 11:36:37 +05:30
mergify[bot]
25d1c1ce86
fix: add filter to query to avoid send reminder for zero years (#28092) (#28096) 
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
(cherry picked from commit 8cad23b8fb4d830a5703e107c371ae9319bc003d)

Co-authored-by: gsi-maruiz <62341390+gsi-maruiz@users.noreply.github.com>
 2021-10-27 11:21:26 +05:30
Dany Robert
2920f2f614
fix: change modified timestamp to apply changes on migrate #28095 
fix: change modified timestamp to apply changes on migrate
 2021-10-27 11:17:48 +05:30
Ankush Menat
479ecb8de0 test: picklist item grouping 2021-10-27 11:10:52 +05:30
Ankush Menat
6942900555 refactor: use defaultdict and enumeration 2021-10-27 11:10:52 +05:30
Diksha Jadhav
f2d136e574 feat(pick list): group items based on item code and warehouse before printing picklist 2021-10-27 11:10:52 +05:30
Ankush Menat
6ec047cba9
fix(ux): overbiling message in SO->SI, PO->PI (#28088) 2021-10-27 10:30:05 +05:30
GangaManoj
06c505ddc2 fix: Linters 2021-10-27 05:23:01 +05:30
GangaManoj
cde0dae987 fix: Add flag for reverse depreciation entries 2021-10-26 21:04:06 +05:30
Deepesh Garg
7ab7753bfa Merge branch 'develop' of https://github.com/frappe/erpnext into lower_deduction_cetificate_fixes 2021-10-26 20:56:40 +05:30
GangaManoj
82bf5e5539 fix: Replace post_depreciation_entries() with make_depreciation_entry() 2021-10-26 20:53:47 +05:30
Deepesh Garg
a87c201785
Merge pull request #28054 from deepeshgarg007/tax_withholding_category_filters 
fix(minor): Filters and validations in Tax Withholding Category
 2021-10-26 20:51:24 +05:30
Deepesh Garg
0c28b477af
Merge pull request #28074 from deepeshgarg007/pan_field_hide_develop 
fix: Move PAN field from standard doctype to fixtures for India
 2021-10-26 20:44:11 +05:30
Deepesh Garg
6b22894275
Merge pull request #28052 from deepeshgarg007/company_address_update 
fix: Auto update company address check on linking with company
 2021-10-26 20:40:13 +05:30
Deepesh Garg
277dfeaf4e
Merge pull request #28057 from deepeshgarg007/company_change_fixes 
fix: Update receivable/payable account on company change
 2021-10-26 20:36:52 +05:30
Deepesh Garg
0136aedfdc
Merge pull request #28055 from deepeshgarg007/payment_entry_ux 
fix(UX): Add mandatory depends on condition for reference no and date fields
 2021-10-26 20:02:34 +05:30
Deepesh Garg
1165a8ac3a
Merge branch 'develop' into company_change_fixes 2021-10-26 19:52:45 +05:30
Deepesh Garg
89d5e494dd fix: Reload customer and supplier doctype 2021-10-26 19:51:03 +05:30
Deepesh Garg
9c1705205f fix: Payment Terms validation precision 2021-10-25 20:06:24 +05:30
Ganga Manoj
0515b4b6f6
Merge branch 'develop' into fix-depr-after-sale 2021-10-25 19:11:19 +05:30
Anuja Pawar
59b5987030
Merge branch 'develop' into gst-category 2021-10-25 18:28:06 +05:30
Subin Tom
fc8307621c
fix: POS Closing Entry without linked invoices (#28042) 2021-10-25 13:18:08 +05:30
Deepesh Garg
cd4b20313e fix: Test case fixes and linting issues 2021-10-25 11:21:55 +05:30
Anuja Pawar
a1213006a1
Merge branch 'develop' into gst-category 2021-10-25 10:50:03 +05:30
GangaManoj
9e7022830e fix: Only add additional depreciation schedule row on sale if depreciation_amount > 0 2021-10-25 01:34:42 +05:30
Deepesh Garg
e3ae8d5a1e fix: Move PAN field from standard doctype to fixtures for India 2021-10-24 17:24:25 +05:30
Noah Jacob
fdaf93f76c
refactor: shows opening balance from filtered from_date (#26877) 
* refactor: shows opening balance from filtered from_date

* refactor: opening balance considered from filtered from_date in stock ledger

* fix: check if stock reco is opening and misc cleanups
 2021-10-23 21:04:42 +05:30
Deepesh Garg
bf13d183d8 fix: Replace section code with tax withholding category in LDC 2021-10-23 19:00:03 +05:30
Deepesh Garg
e6e804e7d7 fix: Get LTDS based on tax withholding category 2021-10-23 18:58:41 +05:30
Deepesh Garg
7f2dde7d94 fix: Check for supplier name 
(cherry picked from commit 944e3d467c5ab0a2a4a76a8b532e53bca77f8e61)
 2021-10-23 07:47:18 +00:00
Deepesh Garg
881e091b85 fix: Check for other properties 
(cherry picked from commit b7befe49dc83b938b74b7a63d31787734d7857f8)
 2021-10-23 07:47:18 +00:00
Deepesh Garg
2ea4c95f86 fix: Error in TDS computation summary 
(cherry picked from commit f12deae24b7ab164edd0868a1254bdf28bfeac09)
 2021-10-23 07:47:18 +00:00
Anuja Pawar
6a3bd882b4 fix: sider 2021-10-22 20:44:49 +05:30
Anuja Pawar
4f53837624 fix: sider 2021-10-22 20:43:54 +05:30
Anuja Pawar
59c31bb124 fix: check if gst_category exist 2021-10-22 19:26:31 +05:30
Raffael Meyer
2bdaf7bb23
fix: don't reset rates in Timesheet Detail when Activity Type is cleared (#28056) 
* fix: don't reset rates when activity type is cleared

* refactor: suggestions from review

Co-authored-by: Sagar Vora <sagar@resilient.tech>

* refactor: suggestions from review (fix)

* style: fix sider

* fix: sider issue

Co-authored-by: Sagar Vora <sagar@resilient.tech>
 2021-10-21 23:53:04 +05:30
Deepesh Garg
65025fb628 fix: Update receivable/payable account on company change 2021-10-21 19:30:06 +05:30
Deepesh Garg
a20058a343 fix(minor): Add mandatory depends on condition for reference no and date fields 2021-10-21 17:52:13 +05:30
Deepesh Garg
7733afc0ae fix(minor): Filters and fixes in Tax Withholding Category 2021-10-21 16:13:00 +05:30
Deepesh Garg
c6d06816cf fix: Auto update company address check on linking with company 2021-10-21 15:37:59 +05:30
Faris Ansari
8b547e39a8 feat: Taxes template for selling/buying doctypes 
Depends on the new Print Format Builder
frappe/frappe#14134
 2021-10-21 12:06:02 +05:30
Alan
2849297471
refactor: move process loss report to manufacturing (#28043) 
* refactor: move process loss report to manufacturing

* test: fix process loss report test

Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
 2021-10-21 11:07:47 +05:30
mergify[bot]
1a31d5856f
fix: useless validation message (#28029) (#28046) 
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
(cherry picked from commit 152f9b0a432361f1c801364d1c85c42a16691a8a)

Co-authored-by: Devin Slauenwhite <devin.slauenwhite@gmail.com>
 2021-10-21 11:05:50 +05:30
Mohammed Yusuf Shaikh
03bfc77940
feat: employee initial work history updated when transfer is performed (#27768) 
* feat: employee initial work history updated when transfer is performed

* fix: sider

* fix: remove commit statement

* fix: tests and code formatting

* fix: tests

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2021-10-21 10:15:09 +05:30
rohitwaghchaure
871cb1157f
fix: consolidated report issue #28035 
fix: consolidated report issue
 2021-10-20 21:08:15 +05:30
Rohit Waghchaure
311bafb23b fix: incorrect fieldname 2021-10-20 20:51:57 +05:30
Ankush Menat
da3635b94f test: execute manufacturing reports 2021-10-20 20:35:11 +05:30
Ankush Menat
126ba16740 fix: remove debug from query 2021-10-20 20:35:11 +05:30
Ankush Menat
8221e7e01f fix: remove employee_name from job card summary 
This field doesn't exist and it's moved on individual line level logs.
 2021-10-20 20:35:11 +05:30
Deepesh Garg
ddacff38ba
Merge pull request #28002 from ankush/dont_recompute_item_tax 
fix: dont recompute item wise taxes from front end
 2021-10-20 19:19:44 +05:30
Sagar Vora
8d9d0987fe
fix: incorrect status being set in Invoices (#28019) 
Co-authored-by: Pruthvi Patel <pruthvipatel145@gmail.com>
 2021-10-20 19:15:35 +05:30
Rucha Mahabal
261f80c5ca
fix: avoid resetting employee on amending timesheets (#28025) 2021-10-20 16:58:32 +05:30
Nabin Hait
2ef4844a3c
feat: Tax for recurring additional salary (#27459) 
* fix: Logic for tax calculation on recurring additional salary

* fix: Get actual amount always in case of overwritten additional salary even if based on payment days

* feat: Test case added for recurring additional salary

* fix: use query builder to get additional salaries instead of raw SQL

* fix: query formatting and remove trailing spaces

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2021-10-20 15:50:30 +05:30
Govind S Menokee
4f2cf43db7 YTD and MTD Messed up in Salary Slip 
The filter for YTD, MTD etc are based on employee name. This seems like an amateur mistake. It should be based on employee id.

(cherry picked from commit efc292a5ddc00e433d75b87d6b3378455bac4438)
 2021-10-20 07:11:26 +00:00
Jannat Patel
9a409df8fa
Merge pull request #27728 from itechstro/develop 
fix: Employee Leave Balance report should only consider ledgers of transaction type Leave Allocation
 2021-10-20 12:27:22 +05:30
Jannat Patel
d81f811349
fix: map missing fields in opportunity (#27904) 2021-10-20 10:53:39 +05:30
Chillar Anand
73ae504721
fix(healthcare): Add patch for removing healthcare doctypes (#27995) 
* fix(healthcare): Add patch for healthcare doctypes

* fix: Update healthcare patch

* fix: Reload stale doctypes

* fix: Reload doc fix
 2021-10-19 18:59:23 +05:30
Deepesh Garg
21ba9ac744 fix: Totals row incorrect value in GL Entry (#27867) 
(cherry picked from commit ebe68c1a7a47f5e711cc9fc1d40c07e140b76888)
 2021-10-19 09:38:40 +00:00
Dany Robert
d734da9337
Merge branch 'develop' into patch-8 2021-10-19 14:14:07 +05:30
Ankush Menat
393749a611
fix: dont recompute item wise taxes from front end 2021-10-19 14:13:34 +05:30
Dany Robert
4c499e804a
fix: wrong vat amount 2021-10-19 14:12:59 +05:30
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