Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
44,494 Commits 3 Branches 0 Tags 1 GiB
6e9d001819
Commit Graph

8375 Commits

Author SHA1 Message Date
Suraj Shetty
6cd2ba5c66 fix: Resolve conflicts 
(cherry picked from commit f6469d83981386a7bb57b41178055eae5cda30bf)
 2023-03-01 10:59:21 +00:00
Suraj Shetty
46a722d51c fix: Wrap unexpectedly long text in remark 
(cherry picked from commit ba66a6714c495f9d70dad79344342779c8011c6e)

# Conflicts:
#	erpnext/accounts/report/general_ledger/general_ledger.html
(cherry picked from commit b13bf1ebc517ccd9c5b6b079208ca3883e7418fd)
 2023-03-01 10:59:20 +00:00
rohitwaghchaure
2942cee31e
Merge pull request #34235 from rohitwaghchaure/feat-adjust-valuation-rate 
feat: adjust purchase receipt valuation rate as per purchase invoice rate
 2023-02-28 17:34:53 +05:30
Rohit Waghchaure
a8445da02a fix: labels name 2023-02-28 15:47:45 +05:30
Rohit Waghchaure
8e86553717 test: added test cases 2023-02-28 14:57:04 +05:30
Rohit Waghchaure
eab775ef32 feat: adjust purchase receipt valuation rate as per purchase invoice rate 2023-02-28 14:11:55 +05:30
Vishal
a51bec0269 chore: minor change 2023-02-28 11:03:26 +05:30
Vishal
3ebe7d861d chore: minor changes added to code 2023-02-28 11:03:26 +05:30
Vishal
1de531e56e fix: multiple pos conversion issue resolved 2023-02-28 11:03:25 +05:30
Deepesh Garg
81651beaef
Merge pull request #34174 from Vishnu7025/coa-import-currency 
fix: currency in coa import
 2023-02-27 11:48:44 +05:30
ruthra kumar
a9920715ab
Merge pull request #34022 from ruthra-kumar/gross_profit_memory_and_performance_issue 
perf: Gross Profit report will fetch SLE's on demand and memoize
 2023-02-23 11:55:08 +05:30
ruthra kumar
88d888d9d0 refactor: use docstatus from Delivery Note Item 2023-02-23 11:15:56 +05:30
vishnu
e3c000d0be chore: change column label 2023-02-22 10:53:11 +00:00
vishnu
19c0b7a523 fix: currency in coa import 2023-02-22 10:24:45 +00:00
ruthra kumar
dde5bbc9a7
Merge pull request #34102 from ruthra-kumar/pos_validate_for_duplicate_pos_invoices 
fix: check for duplicate pos invoices in closing entry
 2023-02-21 18:45:39 +05:30
ruthra kumar
47add0b751 fix: check for duplicate in pos closing and pos merge log entry 2023-02-21 17:50:57 +05:30
Deepesh Garg
35cdd996a9
fix: Use normal rounding for Tax Withholding Category (#34114) 2023-02-21 12:57:49 +05:30
rohitwaghchaure
3871cf7110
Merge pull request #33722 from rohitwaghchaure/purchase-invoice-performance-issue 
fix: purchase invoice performance issue
 2023-02-20 12:47:07 +05:30
Alirio Castro
183e42af1a
fix: differency entry journal debit/credit missing (#34104) 
* fix: difference entry journal is wrong

* fix: difference entry journal is wrong
 2023-02-19 19:40:13 +05:30
ruthra kumar
c722f2819c
fix: ignore repost payment ledger on basic documents cancellation (#34054) 
fix: ignore repost payment ledger on cancel/delete of Inv/Pay/JE's

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
 2023-02-19 12:09:10 +05:30
Richard Case
5b7d23de15
feat: bank reconciliation and plaid changes (#33986) 
fix: plaid link refresh: update account ids
fix: plaid transactions for credit cards & add accounts on link refresh if they don't exist
fix: bank reconciliation amount matching
fix: bank reconciliation dialog usability
feat: rewrite bank transaction reconciliation to allow multiple transactions to reconcile against vouchers before clearance
fix: matching transaction amounts and race condition bug
fix: ensure there is a reference number in plaid transactions and other tweaks
feat: add references to Payroll Entry Bank Journal Entry
feat: only clear Voucher once all Bank GLEs are allocated to Bank Transactions
fix: strange type error
feat: add payment method field to bank and plaid transactions and prepopulate relevant bank reconciliation new voucher fields
feat: bank reconciliation - allow bank transactions to reconcile against themselves for when there are banking amendments
fix: bank transaction self-reconcile bug and tidy
fix: bank reconciliation datatable index update
 2023-02-19 11:50:17 +05:30
ruthra kumar
9c6466f15b
fix: consider rounded total amount while making payment request (#34110) 2023-02-19 11:41:41 +05:30
rohitwaghchaure
47264481ad
Merge branch 'develop' into purchase-invoice-performance-issue 2023-02-17 16:41:30 +05:30
anandbaburajan
e50bd52162 fix: asset repair status after deletion and asset status after manual depr entry 2023-02-17 15:32:24 +05:30
HENRY Florian
4d79ffe3c6
fix: rename duplicate field name with same type into a DocType to avoid import Error (#34053) 
* fix: Delivery Note field label set

* fix: Item field label de-duplicate name

* fix: Payment Entry field label de-duplicate name

* fix: Pruicing Rule field label de-duplicate name

* fix: Project field label de-duplicate name

* fix: Timesheet field label de-duplicate name

* Update erpnext/accounts/doctype/pricing_rule/pricing_rule.json

Co-authored-by: Sagar Sharma <sagarsharma.s312@gmail.com>

* Update erpnext/stock/doctype/item/item.json

Co-authored-by: Sagar Sharma <sagarsharma.s312@gmail.com>

---------

Co-authored-by: Sagar Sharma <sagarsharma.s312@gmail.com>
 2023-02-16 13:46:19 +05:30
Anand Baburajan
b0cfb0b9ef
Merge branch 'develop' into more_asset_bug_fixes 2023-02-14 18:09:55 +05:30
anandbaburajan
a58f2e6c03 fix: asset_depreciation_and_balances report doesn't reflect manual depr entries 2023-02-14 17:59:16 +05:30
Deepesh Garg
ce748cec3a
fix: Amount validation in Payment Request against Purchase Order (#34042) 2023-02-13 20:56:24 +05:30
Deepesh Garg
ff4ae69408
Merge branch 'develop' into gross_profit_memory_and_performance_issue 2023-02-13 15:38:26 +05:30
ruthra kumar
4f2553e7b6
Merge pull request #34021 from ruthra-kumar/handle_rare_cases_of_null_in_outstanding_calculation 
fix: rare instances of IntegrityError while cancelling journals against cr note
 2023-02-13 14:14:27 +05:30
ruthra kumar
e5a2b15fba
fix: unwanted difference amount calculation on cr note and invoice with same currency (#34020) 
* fix: incorrect difference amount while reconiling cr/dr notes

* fix(test): catch incorrect difference amount calculation

Fixed issues where difference amount was calculated for Cr Notes and Invoices of
the same currency.

---------

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
 2023-02-13 12:08:42 +05:30
Deepesh Garg
ce3f9622cb
Merge branch 'develop' into handle_rare_cases_of_null_in_outstanding_calculation 2023-02-13 09:42:41 +05:30
Deepesh Garg
48bb2c942b
fix: Ignore Payment Ledger Entry on dunning cancel (#34025) 
* fix: Ignore Payment Ledger Entry on dunning cancel

* chore: fix translation issue
 2023-02-13 09:42:01 +05:30
ruthra kumar
3e5691072a perf: fetch SLE's on demand and memoize 2023-02-12 14:49:17 +05:30
ruthra kumar
b9a7ff7c3d fix: IntegrityError while cancelling journals against cr note 2023-02-12 14:06:40 +05:30
Anand Baburajan
f8270f093d
Merge branch 'develop' into manual_depr_entries_develop 2023-02-05 12:19:17 +05:30
Anand Baburajan
2d54bf7199
Merge branch 'develop' into manual_depr_entries_develop 2023-02-03 22:25:27 +05:30
anandbaburajan
8ea9e4576f fix: asset value for manual depr entries 2023-02-03 21:43:18 +05:30
developsessions
ce8a1086a7 fix: default due_date was wrong calculated on template "_Test Payment Term Template 1" (last day of next month) 2023-02-03 11:30:29 +01:00
ruthra kumar
cb1d33880c
Merge pull request #33502 from ruthra-kumar/toggle_account_balances_in_coa 
feat: Toggle display of Account Balance in Chart of Accounts
 2023-02-02 09:20:53 +05:30
Gokulnath
2884738864
feat: adding warehouse filter for gross profit report (#33397) 
Co-authored-by: ruthra kumar <ruthra@erpnext.com>
 2023-02-01 18:44:15 +05:30
Raffael Meyer
3c7b460fd8
fix: german chart of accounts "SKR03" (#33909) 
* fix: german chart of accounts "SKR03"

- Added some missing account types and tax rates
- Added some missing accounts

* style: convert indentation to tabs

* fix: space before percentage sign

* feat: add some expense accounts

* refactor: replace unicode characters with utf-8

for better readability

* revert: add back groups for Bank and Cash accounts

Removed in 7d0d9c690068481a9730e0132c7aff34c1f56100
 2023-02-01 12:16:58 +05:30
Deepesh Garg
b3dc22de29
fix: Fetch commission rate from sales partner (#33851) 2023-01-31 09:33:33 +05:30
ruthra kumar
5f38859a04
Merge pull request #33736 from rtdany10/gp-report-fix 
fix(gp): fetch buying amount from dn related to so
 2023-01-30 19:04:36 +05:30
Dany Robert
d69c839369 chore: linting issues 2023-01-30 10:45:08 +00:00
Dany Robert
1f6ab86a65 feat(gp): test for inv and dn related via so 2023-01-30 10:35:43 +00:00
Deepesh Garg
a34a1f8fd2
fix: Amount validation in Payment Request against Purchase Order (#33855) 
fix: Amount validation in Payment Request againt Purchase Order
 2023-01-29 21:34:28 +05:30
Deepesh Garg
6674edface
chore: Resize numeric and date columns (#33858) 2023-01-29 21:25:26 +05:30
Deepesh Garg
428b099f63
fix: Ignore linked JE on JE cancellation (#33852) 2023-01-29 17:27:17 +05:30
Deepesh Garg
8abe0ce0ec
fix: Currency symbol for tax withholding net total field (#33850) 
* fix: Currency symbol for tax withholding net total field

* chore: Update display depends on property
 2023-01-29 17:08:11 +05:30