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

7352 Commits

Author SHA1 Message Date
Saqib
ecbe4b16b8
perf(minor): general ledger report (#27987) 2021-11-11 13:55:21 +05:30
Saqib
6d05bb5274
fix(pos): get mode of payments query (#28321) 2021-11-10 13:06:55 +05:30
Anuja Pawar
2f004693c3
fix(Bank Reconciliation): get credit amount for bank account of type liability 2021-11-10 12:36:54 +05:30
Rohit Waghchaure
4d4bfa2333 fix: commision rate not fetch from sales person 2021-11-10 00:00:38 +05:30
Deepesh Garg
8a253ed1f3
Merge pull request #28238 from nextchamp-saqib/perf-financial-statements 
perf: improve financial statement loading time
 2021-11-09 16:29:58 +05:30
Saqib
4a3cef6436
fix: update 'current_invoice_end' after processing invoice (#28278) 2021-11-09 14:16:38 +05:30
Dany Robert
01e7076b65
Merge branch 'develop' into currency-exchange-settings 2021-11-06 09:59:00 +05:30
Ankush Menat
8fe5feb6a4 chore: remove all six compat code 2021-11-05 11:16:29 +05:30
Ankush Menat
897e90ac55 chore: remove past module dependencies 2021-11-05 11:16:29 +05:30
Ankush Menat
6098e92ba9 chore: remove utf-8 compat code 2021-11-05 11:16:29 +05:30
Dany Robert
4716523c77 fix: sider issues 2021-11-04 05:38:00 +00:00
Dany Robert
4a0f2175ad fix: pre-commit issues 2021-11-04 05:25:48 +00:00
Dany Robert
e65a76b214 chore: clean up 2021-11-04 05:04:10 +00:00
Dany Robert
08b2735a79 fix: make fields editable only when service provider is custom 2021-11-04 05:01:37 +00:00
Dany Robert
7291d9f236 feat: option for preconfigured selectable service providers 2021-11-03 14:13:22 +00:00
Saqib Ansari
b7a44fe0a3 perf: improve financial statement loading time 2021-11-03 18:17:31 +05:30
hrwx
2bce193b81 Merge branch 'develop' of https://github.com/frappe/erpnext into subscription_active_fixes 2021-11-02 14:05:10 +00:00
Saqib
ec0a72423a
fix: Calculate depreciation_amount accurately (#27585) 2021-11-02 18:45:03 +05:30
hrwx
890a786858 fix: do not generate multiple invoices 2021-11-02 11:58:01 +00:00
Anuja Pawar
d72709dd81
fix(Payment Entry): splitting outstanding rows as per payment terms (#27946) 2021-11-02 16:28:46 +05:30
Deepesh Garg
fb9e72cc8a
Merge pull request #28162 from deepeshgarg007/pan_field_missing_error 
fix: Error for missing PAN no field
 2021-10-30 19:29:26 +05:30
Deepesh Garg
541c892f97 fix: Error for missing PAN no field 2021-10-30 18:22:46 +05:30
Anuja Pawar
1a6e98ed48
fix(Payment Reconciliation): clear child tables on company/party change (#28008) 2021-10-29 20:52:47 +05:30
Deepesh Garg
eb720d18c3
Merge pull request #28145 from deepeshgarg007/coa_import_is_group 
fix: COA importer importing all accounts as group
 2021-10-29 17:04:20 +05:30
Subin Tom
75a76e634d
fix: POS consolidated invoice rounded total issue (#28006) 2021-10-29 16:45:04 +05:30
Deepesh Garg
8ccd3fee9e fix: COA importer importing all accounts as group 2021-10-29 16:08:52 +05:30
Deepesh Garg
d0e2b52f51
Merge pull request #28122 from nemesis189/consolidated-finan-report-empty-list-error 
fix: Consolidated Financial Report throws error for empty equity data list
 2021-10-29 12:11:16 +05:30
Deepesh Garg
812249e5d1 Merge branch 'develop' of https://github.com/frappe/erpnext into lower_deduction_cetificate_fixes 2021-10-28 19:01:51 +05:30
Ankush Menat
b01635e1da
refactor!: remove hub #28117 
refactor!: remove hub
 2021-10-28 14:07:15 +05:30
Subin Tom
d786855d94 fix: Consolidated Financial Report throws error for empty equity data list 2021-10-28 13:19:19 +05:30
Saqib
f530764105
Merge branch 'develop' into fix-depr-after-sale 2021-10-28 12:43:51 +05:30
Faris Ansari
c8d0d9ece9
Merge pull request #28048 from netchampfaris/print-format-builder-templates 
feat: Taxes template for selling/buying doctypes
 2021-10-28 12:33:21 +05:30
Saqib
a261d08dd8
fix: reset temporary flag after use 2021-10-27 18:30:37 +05:30
Saqib
470c07c6e9
Merge branch 'develop' into fix-depr-after-sale 2021-10-27 16:02:38 +05:30
Ganga Manoj
c9f3ea5fea
fix: Remove pointless buttons from Payment Order 
fix: Remove pointless buttons from Payment Order
 2021-10-27 15:16:38 +05:30
Saqib
2e61c5eb55
Merge branch 'develop' into fix-depr-after-sale 2021-10-27 15:12:51 +05:30
hendrik
f24ed6723e
fix(general_ledger): Order by in case Group by Account (#28093) 
* Update general_ledger.py

Fix order_by_statement if filter group by: Group by Account

* chore: whitespace

Co-authored-by: Ankush Menat <ankushmenat@gmail.com>
Co-authored-by: Afshan <33727827+AfshanKhan@users.noreply.github.com>
 2021-10-27 14:38:20 +05:30
Saqib
879a1fca76
perf(minor): improve sales invoice submission (#27916) 
* perf: skip get_pricing_rules if no pricing rule exists

* perf: fetch mode of payments data in single query

* perf: get total company stock only for purchase order

* perf: skip insertion of stock ledger entry

* fix: undo changes to allow negative stock flag

* fix: sider

Co-authored-by: Ankush Menat <ankushmenat@gmail.com>
Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
 2021-10-27 11:42:50 +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
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
Ganga Manoj
0515b4b6f6
Merge branch 'develop' into fix-depr-after-sale 2021-10-25 19:11:19 +05:30
Subin Tom
fc8307621c
fix: POS Closing Entry without linked invoices (#28042) 2021-10-25 13:18:08 +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
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
rohitwaghchaure
871cb1157f
fix: consolidated report issue #28035 
fix: consolidated report issue
 2021-10-20 21:08:15 +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
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
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
b7a08535b5 fix: TDS round off not working from second transaction 2021-10-16 20:58:24 +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
Ganga Manoj
5a0289a810
Merge branch 'develop' into fix-depr-after-sale 2021-10-14 22:37:07 +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
Ganga Manoj
8cc81a96fc
Merge branch 'develop' into fix-depr-after-sale 2021-10-14 03:12:44 +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
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
8d69ec72a6 fix: remove transaction commit from tests 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
Saqib Ansari
7b691beabb perf: fetch mode of payments data in single query 2021-10-12 13:28:31 +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
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
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
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
Rohit Waghchaure
19d14da0d4 fix: opening balance to calculate 'Unclosed Fiscal Years Profit / Loss (Credit)' 2021-10-10 14:00:25 +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
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
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
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
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
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
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
Deepesh Garg
020f94532b fix: COA Importer showing blank validations 
(cherry picked from commit 0660d6ed01e0668ce828cf9bae9790aead874233)
 2021-10-05 09:49:05 +00:00
Saqib
74c8e7bb97
Merge branch 'develop' into pay-received-amt-fix 2021-10-05 11:14:41 +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
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
ChillarAnand
a1d3a09d3c Merge branch 'develop' into care 2021-10-04 09:46:34 +05:30
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
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
HENRY Florian
0bc213ed17
Merge branch 'develop' into dev_fix_27359 2021-09-30 11:08:44 +02:00
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
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
Ganga Manoj
28bdd6d2e3
Merge branch 'develop' into fix-depr-after-sale 2021-09-27 22:18:04 +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
Saqib
b68ac24cd5
chore: add shipping address in eway bill test (#27662) 2021-09-27 15:03:58 +05:30
ChillarAnand
765a9bb731 refactor: Remove sales invoice custom js related to healthcare 2021-09-27 07:34:54 +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
dd2d039ca8 chore: hide exchange gain loss if empty 2021-09-26 15:51:03 +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
GangaManoj
7ab3b9dd5a fix: Add test for depreciation on sale of a depreciated Asset 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
244d9dee04 fix: Correct expected_values 2021-09-21 06:06:21 +05:30
Anuja Pawar
190c2d84da
fix: reference row added in allocation table (#27602) 2021-09-20 21:32:38 +05:30
ChillarAnand
aa580769a6 chore: Code clean up 2021-09-20 15:27:43 +05:30
Deepesh Garg
f07ff92a35
fix: Improvements in COA Importer (#27584) 2021-09-20 11:12:39 +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
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
Rucha Mahabal
866763c16a
fix(minor): Employee filter in Unpaid Expense Claims report (#27530) 2021-09-16 00:05:16 +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
Anuja Pawar
a58e309297
fix: fix to fetch customers and billing email in PSOA (#27363) 2021-09-09 19:37:52 +05:30
Anupam Kumar
7edac5a5d7
fix: removing duplicate currency() from sales_invoice.js (#27410) 2021-09-09 19:17:01 +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
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
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
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
Florian HENRY
aa7ee3ca03 fix: link in dashboard missing on SI from DN 2021-09-06 11:40:44 +02:00
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
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
Subin Tom
798b464ee3
fix: braintree payment processed twice (#27300) 2021-09-03 12:30:57 +05:30
ChillarAnand
e913e277d9 chore: Rename imports from erpnext to healthcare 2021-09-02 19:47:39 +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
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
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
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
Deepesh Garg
d5a736d11e test: Update test case 2021-09-01 21:15:24 +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
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
Ankush Menat
2d62c500c4
fix: undefined variables 2021-09-01 15:05:00 +05:30
Ankush Menat
694ae81618
fix: remove bare excepts 2021-09-01 15:02:28 +05:30
Deepesh Garg
8b644d8889 fix: Report and JSON generation for Advances received 2021-09-01 10:28:15 +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
Ganga Manoj
82118975e2
Merge branch 'develop' into gross-profit-product-bundle 2021-08-31 22:08:10 +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
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
Subin Tom
9cb642238f
fix: expense claim reimbursed amount update (#27204) 2021-08-30 13:17:22 +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
Devin Slauenwhite
072151e16d
feat: Payment reconciliation on accounts module workspace (#25925) 
* feat: add payment reconciliation to accounting workspace

* fix: update modified and duplicate the link

Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
 2021-08-27 19:44:57 +05:30
Shadrak Gurupnor
7433757489
fix: patches were breaking during migration (#27200) 
* fix: patches were breaking during migrating

* fix: patches were breaking during migration
 2021-08-27 18:00:16 +05:30
Kamal Johnson
a285b5b78b
feat: Accounts, Selling & Assets Onboarding cleanup (#27112) 
* refactor: company form fields arrangement

* refactor: accounts onboarding steps

* refactor: re-arrange fields & modify labels in company form

* feat: onbording steps for accounts module

* fix: updated onboarding steps for selling module

* fix: remove unwanted steps from accounts

* feat: add more onboarding steps

* feat: Refactor onboarding-module for accounting workspace

* feat: Add basic asset onboarding steps

* feat: Add basic asset item form tour

* feat: Add basic selling onboarding-steps

* feat: Add basic form tour for purchase recipt

* feat: Add basic form tour for existing asset

* feat: Adding asset category form tour

* feat: Add form tour for asset category

* feat: Refactor sales taxes and charges template form tour with new  method

* refactor: Remove old form tour for accounts settings

* refactor: Change asset category form tour with new tour method

* refactor: Change asset item form tour with new tour method

* refactor: Change purchase receipt form tour with new tour method

* refactor: Change asset form tour with new tour method

* refactor: Remove old form tour for selling settings

* refactor: general fix/typo in onboarding steps

* Apply suggestions from code review

Co-authored-by: Nabin Hait <nabinhait@gmail.com>

* refactor: Remove old form tour method for sales order.

* fix: removed duplicate section break

* fix: Removed duplicate fields

Co-authored-by: Saqib Ansari <nextchamp.saqib@gmail.com>
Co-authored-by: Anuja <anuja.pawar20@gmail.com>
Co-authored-by: Afshan <33727827+AfshanKhan@users.noreply.github.com>
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2021-08-27 15:47:11 +05:30
Saqib
08188f2ac7
Merge branch 'develop' into gross-profit-product-bundle 2021-08-27 15:41:41 +05:30