Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
38,864 Commits 3 Branches 0 Tags 1 GiB
401e22fb8d
Commit Graph

5094 Commits

Author SHA1 Message Date
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
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
Rohit Waghchaure
19d14da0d4 fix: opening balance to calculate 'Unclosed Fiscal Years Profit / Loss (Credit)' 2021-10-10 14:00:25 +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
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
Marica
ff7506d4a6
fix: revert "fix: missing link in dashboard missing on SI from DN" (#27832) 2021-10-06 13:35:22 +05:30
Marica
2691a15c91
Merge pull request #27360 from FHenry/dev_fix_27359 
fix: missing link in dashboard missing on SI from DN
 2021-10-06 13:04:50 +05:30
Deepesh Garg
91bf40d692
Merge pull request #27811 from frappe/mergify/bp/develop/pr-27792 
fix: COA Importer showing blank validations (backport #27792)
 2021-10-05 21:23:21 +05:30
Afshan
cec66d2d10
fix: removed redundant piece of code (#27817) 2021-10-05 19:14:39 +05:30
Deepesh Garg
fee54023a6
Merge branch 'develop' into mergify/bp/develop/pr-27792 2021-10-05 17:22:24 +05:30
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
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
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
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
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
Sagar Vora
c8b9a55e96
feat: add Partly Paid status in Invoices (#27625) 2021-09-22 12:11:35 +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
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
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
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
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
092d41ecda fix: Debug CI 2021-09-03 20:04:18 +05:30