Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
45,657 Commits 3 Branches 0 Tags 1 GiB
06dcc4ed96
Commit Graph

35541 Commits

Author SHA1 Message Date
rohitwaghchaure
06dcc4ed96
Merge pull request #36063 from rohitwaghchaure/fixed-valuation-for-dn-return 
fix: Delivery Note return valuation
 2023-07-10 17:48:41 +05:30
Rohit Waghchaure
6a10ae662c fix: Delivery Note return valuation 2023-07-10 17:06:02 +05:30
Dany Robert
5c820ecc20
fix: precision causing outstanding issue on partly paid invoices (#36030) 
* fix: precision causing outstanding issue on partly paid invoices

* chore: linters
 2023-07-10 16:20:45 +05:30
mergify[bot]
b3a99e38cc
chore: add asset depr posting error in error log (backport #36052) (#36055) 
chore: add asset depr posting error in error log (#36052)

(cherry picked from commit 0f9a6ee70acc88a1190fc66fb95a3bd5d6dea02f)

Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>
 2023-07-10 14:31:19 +05:30
rohitwaghchaure
22eee472dd
Merge pull request #36001 from rohitwaghchaure/fixed-added-validation-for-rejected-warerhouse 
fix: accepted warehouse and rejected warehouse can't be same
 2023-07-10 13:55:20 +05:30
rohitwaghchaure
b16f364866
Merge pull request #36054 from rohitwaghchaure/fixed-incorrect-stock-levels 
fix: incorrect stock levels in the Batch
 2023-07-10 13:35:59 +05:30
Rohit Waghchaure
d618aaef32 fix: accepted warehouse and rejected warehouse can't be same 2023-07-10 13:19:17 +05:30
Rohit Waghchaure
aeaf8fd89c fix: incorrect stock levels in the Batch 2023-07-10 13:03:10 +05:30
ruthra kumar
3ef034dda8
Merge pull request #36051 from ruthra-kumar/auto_exchange_rate_revaluation_creation 
feat: Provision to auto create Exchange Rate Revaluation
 2023-07-10 12:59:23 +05:30
aioaccount
46fe9ac5cd
fix: labels and translations (#35963) 
fix: labels and translations
* fix: Vietnamese translation of customer
* fix: Vietnamese translation of bill
 2023-07-09 20:41:52 +05:30
Gursheen Kaur Anand
674af15696
fix: deferred accounting entries on accounts frozen (#35978) 
* fix: accounts frozen entries in deferred accounting

* test: accounts frozen date in deferred accounting

* fix: reset account settings after running test

* fix: resolve conflicts

* fix: modify expected gle when deferred accounting is disabled through JE

* fix: change posting date when accounts not frozen
 2023-07-09 20:41:12 +05:30
Raffael Meyer
af28f95c60
refactor(Payment Entry): translatable strings (#36017) 
* refactor(Payment Entry): translatable strings

* fix: German translations
 2023-07-09 20:19:53 +05:30
aioaccount
ef7fd7548c
fix: Vietnamese translation of "Company" (#35887) 
fix: Vietnamese translation of "Company"
 2023-07-09 20:17:35 +05:30
Deepesh Garg
4d07e20b05
fix: Opening balance in presentation currency in Trial Balance report (#36036) 2023-07-09 20:16:12 +05:30
Raffael Meyer
353d765140
fix: German translations (#35990) 
* fix: add missing German translation

* fix: wrong German translation
 2023-07-09 14:14:34 +05:30
Navin Balaji
828e647019
fix: bank reconciliation tool variable issue (#36022) 
fix: bank reconciliation tool variable issue (#36022)
 2023-07-09 14:13:48 +05:30
ruthra kumar
4f51c5a433 refactor: submit and make JV through background job 2023-07-07 05:49:53 +05:30
Raffael Meyer
4badac8e9e
fix(Payment Entry): compare rounded amount (#36011) 2023-07-05 21:35:41 +05:30
mergify[bot]
98281341b9
fix: handle loan_repayment's posting_date datetime in bank_clearance_summary report (backport #36004) (#36005) 
* fix: handle loan_repayment's posting_date datetime in bank_clearance_summary report (#36004)

(cherry picked from commit 937e1fb0245af291789ccd88f168d0402d9a00d8)

# Conflicts:
#	erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py

* chore: resolving conflicts

---------

Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>
 2023-07-04 22:46:00 +05:30
Deepesh Garg
0a17c78a36
fix: Share ledger showing cancelled docs (#35993) 2023-07-04 17:49:07 +05:30
Sagar Vora
30e4052a76
feat(accounts): standardize additional columns implementation for sales/purchase reports (#36000) 2023-07-04 17:41:30 +05:30
Deepesh Garg
2f169575e9
fix: Netherlands - Grootboekschema COA structure (#35991) 
fix: Netherlands - Grootboekschema coa structure
 2023-07-04 15:30:27 +05:30
Ankush Menat
a449a4be29
chore: Add frappe school links (#35995) 
Frappe School provides plenty of free tutorial for learning ERPNext.
 2023-07-04 14:58:45 +05:30
rohitwaghchaure
8179d6a30d
Merge pull request #35977 from rohitwaghchaure/reserve-pos-invoice-batches 
fix: reserve the pos invoice batches
 2023-07-03 22:33:45 +05:30
Rohit Waghchaure
1e8f6c0840 fix: reserve the pos invoice batches 2023-07-03 17:38:48 +05:30
ruthra kumar
6644311c8b refactor: checkbox for enabling auto ERR creation 2023-07-03 14:31:13 +05:30
Anand Baburajan
dedb5e23f7
fix: delete loan module workspace properly after separation (#35971) 
* fix: delete loan module workspace properly after separation

* chore: run remove_loan_management_module patch again
 2023-07-03 13:06:46 +05:30
Deepesh Garg
5448859254
fix: Update no copy for received_qty field (#35965) 2023-07-03 13:03:52 +05:30
Vishnu VS
e05b33a6c2
feat: add method for ordered quantity in supplier scorecard (#35930) 
fix: add method for getting ordered quantity in the supplier scorecard variable.

Co-authored-by: vishnu <vishnuviswambara2002@gmail.com>
 2023-07-03 09:23:27 +05:30
rohitwaghchaure
232dfad13a
fix: conflicts 2023-07-02 10:45:12 +05:30
Rohit Waghchaure
b77a808921 fix: reposting has not changed valuation rate 
(cherry picked from commit c0c693d8b0faf42089314cf43f4fc117f45de4b4)

# Conflicts:
#	erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py
 2023-07-02 05:13:29 +00:00
Deepesh Garg
3df0c5e32f
Merge pull request #35609 from GursheenK/#34282-Record-advance-payment-as-a-liability 
feat: Record Advance Payment as a liability
 2023-07-01 17:49:49 +05:30
Deepesh Garg
d54f52474a
fix: Expense Account filter in Sales Invoice (#35944) 2023-06-30 20:02:46 +05:30
Deepesh Garg
be5cb1aa17
Merge pull request #35943 from GursheenK/company-specific-proj-filtering 
fix: project filtering based on company in P&L Report
 2023-06-30 20:01:24 +05:30
Deepesh Garg
fda2d2bd59 Merge branch 'develop' of https://github.com/frappe/erpnext into #34282-Record-advance-payment-as-a-liability 2023-06-30 19:35:34 +05:30
Deepesh Garg
80e6c90740 chore: precision in test 2023-06-30 19:35:22 +05:30
Deepesh Garg
7e7737d692 test: Update test account 2023-06-30 18:37:52 +05:30
Deepesh Garg
0a49213338 test: Update test records 2023-06-30 17:32:42 +05:30
Deepesh Garg
bbb6ebb84e fix: Outstanding amount validation 2023-06-30 13:25:22 +05:30
Gursheen Anand
84d4888f5f fix: make company field mandatory in project doctype 2023-06-30 12:54:45 +05:30
Gursheen Anand
ce252a0d45 fix: show projects with no company value set 2023-06-30 12:42:19 +05:30
s-aga-r
90a77030a7 fix: add filter for disabled batch 2023-06-30 12:34:39 +05:30
Gursheen Anand
904ca746a6 fix: project filtering in P&L Report 2023-06-30 12:11:23 +05:30
Anand Baburajan
988d755906
refactor!: removing loan management module (#35522) 
* chore: resolving conflicts

* refactor: bank_clearance and add hook for get_payment_entries_for_bank_clearance

* refactor: bank_reconciliation_tool and add hook for get_matching_vouchers_for_bank_reconciliation

* fix: remove sales invoice from bank_reconciliation_doctypes and use hook for voucher clearance

* refactor: remove loan tests from test_bank_transaction

* refactor: bank_clearance_summary and add hook for get_entries_for_bank_clearance_summary

* refactor: removed test_bank_reconciliation_statement

* refactor: bank_reconciliation_statement and add hook for get_amounts_not_reflected_in_system_for_bank_reconciliation_statement

* refactor: add missing hook and patches for module removal and deprecation warning

* refactor: remove loan management translations

* chore: add erpnext tests dependent on lending
 2023-06-30 11:02:49 +05:30
rohitwaghchaure
9f1cf0bbb0
Merge pull request #35921 from rohitwaghchaure/fixed-seperate-table-for-schedule 
refactor: separate table added to track scheduling in the job card.
 2023-06-29 22:24:47 +05:30
s-aga-r
fe4161e4d7
Merge pull request #35935 from s-aga-r/FIX-35898 
feat: allow the partial return of components against SCO
 2023-06-29 21:20:59 +05:30
Rohit Waghchaure
497c83eb7e refactor: separate table added to track scheduling in the job card 2023-06-29 20:51:44 +05:30
s-aga-r
2a60884abc fix: reduce return qty while calculating transferred qty 2023-06-29 18:59:18 +05:30
s-aga-r
2f6d56dd62 fix: don't update SCO status to closed until full return 2023-06-29 18:44:40 +05:30
Deepesh Garg
0408b6d655 Merge branch 'develop' of https://github.com/frappe/erpnext into #34282-Record-advance-payment-as-a-liability 2023-06-29 12:19:42 +05:30