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

9109 Commits

Author SHA1 Message Date
Deepesh Garg
70c5df056d Merge branch 'develop' of https://github.com/frappe/erpnext into demo_data_on_install 2023-07-31 13:02:34 +05:30
Deepesh Garg
c6d8f15b10
Merge pull request #36389 from AlexandreLumertz/patch-2 
fix: Party type translation in error message
 2023-07-30 18:42:01 +05:30
Deepesh Garg
eeddeeeeb3
Merge pull request #36369 from ashish-greycube/patch-11 
fix: in payment_entry 'Unallocated Amount' cal is broken
 2023-07-30 14:37:24 +05:30
Deepesh Garg
3698af834b Merge branch 'develop' of https://github.com/frappe/erpnext into demo_data_on_install 2023-07-29 17:12:06 +05:30
Deepesh Garg
f999b75ed6 Merge branch 'develop' of https://github.com/frappe/erpnext into balancing-accounting-dimensions 2023-07-29 11:53:03 +05:30
Deepesh Garg
ecca9cb023 fix: Add company filters for account 2023-07-29 11:52:54 +05:30
ruthra kumar
3b58055410
refactor(test): introduce and make use of mixins in unit tests (#36382) 
* refactor(test): create and use test mixin

* chore(test): replace get_user_default with variable
 2023-07-28 21:02:21 +05:30
xdlumertz
bc470591ac
fix: translate 
fix: translate
 2023-07-28 12:31:29 -03:00
Gursheen Anand
f5761e7965 refactor: future payments query 2023-07-28 16:01:30 +05:30
Gursheen Anand
e355dea4b5 fix: AP and AR summary 2023-07-28 14:51:28 +05:30
Gursheen Anand
fd5c4e0a64 fix: fetch ple for all party types 2023-07-28 11:41:03 +05:30
Ashish Shah
f9fa34ff40
fix: in payment_entry 'Unallocated Amount' cal is broken 2023-07-28 11:10:51 +05:30
ruthra kumar
50d294fd1e
Merge pull request #36126 from ruthra-kumar/idx_issue_upon_journal_reconciliation 
fix: incorrect `idx` on Journals after reconciliation
 2023-07-28 09:33:29 +05:30
ruthra kumar
46ea814400 chore: cancel gain/loss je while posting reverse gl 2023-07-28 08:34:36 +05:30
ruthra kumar
567c0ce1e8 chore: don't make gain/loss journal for base currency transactions 2023-07-28 08:12:44 +05:30
rohitwaghchaure
dac9fd64a8
Merge pull request #36328 from rohitwaghchaure/fixed-purchase-receipt-timeout-on-cancel-develop 
fix: timeout error while cancelling the Purchase Receipt
 2023-07-27 23:26:59 +05:30
Deepesh Garg
829387c2bc
Merge pull request #36360 from deepeshgarg007/fy_default_dates 
fix: Default year start and end dates in reports
 2023-07-27 22:35:35 +05:30
Deepesh Garg
fff83bc847
Merge pull request #36092 from HarryPaulo/fix-paid-amount-payment-method-group 
fix: paid_amount when the group is mode of payment
 2023-07-27 21:21:52 +05:30
Deepesh Garg
ebdf1959fd
Merge pull request #36254 from deepeshgarg007/remove_auto_repeat 
fix: Remove auto repeat (subscription) button from Sales and Purchase documents
 2023-07-27 21:18:03 +05:30
Deepesh Garg
2341061852 fix: Default year start and end date in reports 2023-07-27 21:03:32 +05:30
Deepesh Garg
4496a6760e fix: Default year start and end dates in reports 2023-07-27 20:54:55 +05:30
Deepesh Garg
dacf013170
Merge pull request #36347 from deepeshgarg007/ac_ignore 
fix: Ignore account closing balance for financial statement
 2023-07-27 19:54:01 +05:30
Deepesh Garg
cf50bb45ad
Revert "fix: Default year start and end dates in reports" 2023-07-27 19:13:11 +05:30
Deepesh Garg
3db6ac5ac9
Merge pull request #36069 from GursheenK/purchase-sales-register-with-PE/JE 
feat: include payments in purchase / sales register report
 2023-07-27 18:13:37 +05:30
Gursheen Anand
4f9242d699 fix: dimension name in remark 2023-07-27 15:45:48 +05:30
Deepesh Garg
ccf1920a78 fix: Ignore account closing balance for financial statement 2023-07-27 15:40:36 +05:30
Deepesh Garg
5dc8195d91
Merge pull request #36249 from deepeshgarg007/default_dates 
fix: Default year start and end dates in reports
 2023-07-27 12:19:44 +05:30
Ankush Menat
1d7dbd3456
perf: don't use ifnull where it's not required (#36336) 
ifnull isn't really required when doing `!= 'anything'` because if it's null then value will be falsy.
ifnull is only required when checking `= ''` if you treat `null = ''`

Actuall better fix would be make things explcitly non-nullable, then we won't ever have to add this on such fields.

ref: https://github.com/frappe/frappe/pull/21822
 2023-07-27 06:06:07 +00:00
Nabin Hait
56e7cc7e05
Merge pull request #36327 from nabinhait/pcv-fix 
fix: GL Entries should not be split based on cost center allocation in PCV
 2023-07-27 11:33:06 +05:30
Gursheen Anand
b1818137e7 fix: PE in sales register 2023-07-27 10:08:26 +05:30
ruthra kumar
d9d6856153 chore: rename some internal variables 2023-07-27 08:02:46 +05:30
ruthra kumar
025091161e refactor(test): assert ledger outstanding 2023-07-27 05:53:12 +05:30
ruthra kumar
bfa54d5335 fix(test): test case breakage in Github Actions 2023-07-26 22:33:58 +05:30
ruthra kumar
95543225cf fix: cr/dr note should be posted for exc gain/loss 2023-07-26 22:33:58 +05:30
ruthra kumar
506a5775f9 fix: incorrect gain/loss on allocation change on reconciliation tool 2023-07-26 22:33:58 +05:30
ruthra kumar
ba1f065765 refactor: create gain/loss on Cr/Dr notes with different exc rates 2023-07-26 22:33:58 +05:30
ruthra kumar
1ea1bfebc4 refactor: convert class method to standalone function 2023-07-26 22:33:58 +05:30
ruthra kumar
c87332d5da refactor: cr/dr note will be on single exchange rate 2023-07-26 22:33:58 +05:30
ruthra kumar
37895a361c chore(test): fix broken test case 2023-07-26 22:33:58 +05:30
ruthra kumar
70dd9d0671 chore(test): fix broken unit test 2023-07-26 22:33:58 +05:30
ruthra kumar
6e18bb6456 refactor: cancel gain/loss JE on Journal as payment cancellation 2023-07-26 22:33:58 +05:30
ruthra kumar
f119a1e115 refactor: linkage between journal as payment and gain/loss journal 2023-07-26 22:33:58 +05:30
ruthra kumar
cd42b26839 chore: code cleanup 2023-07-26 22:33:58 +05:30
ruthra kumar
1bcb728c85 refactor: remove call for setting deductions in payment entry 2023-07-26 22:33:58 +05:30
ruthra kumar
72bc5b3a11 refactor(test): difference amount no updated for exchange gain/loss 2023-07-26 22:33:58 +05:30
ruthra kumar
5b06bd1af4 refactor(test): exc gain/loss journal for advance in purchase invoice 2023-07-26 22:33:58 +05:30
ruthra kumar
ee2d1fa36e refactor(test): payment will have same exch rate - no gain/loss 
while making payment entry using reference to sales/purchase invoice,
it herits the parent docs exchange rate. so, there will be no exchange
gain/loss
 2023-07-26 22:33:58 +05:30
ruthra kumar
389cadf157 refactor(test): assert Exc journal when reconciling Journa to invoic 2023-07-26 22:33:58 +05:30
ruthra kumar
7b516f8463 refactor: exc booking logic for Journal Entry 2023-07-26 22:33:58 +05:30
ruthra kumar
00a2e42a47 refactor(test): exc gain/loss booked through journal 2023-07-26 22:33:58 +05:30