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

46152 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Florian HENRY
da72bd9819 feat: add Lead to Adresse And contact report 2023-06-30 15:11:45 +02:00
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
s-aga-r
fa3ab678e1
Merge pull request #35945 from s-aga-r/BATCH-DISABLE-FILTER 
fix: add filter for disabled batch
 2023-06-30 13:39:11 +05:30
Marica
0a67a3a9c4
Merge branch 'develop' into payments-based-dunning 2023-06-30 13:32:50 +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
Deepesh Garg
1e078d03bb fix: Partial PLE cancellation 2023-06-29 12:18:25 +05:30
RJPvT
1d1103f39c
chore: update translations 
chore: update translations
 2023-06-29 11:02:08 +05:30
Deepesh Garg
06821f9781
Merge pull request #35904 from GursheenK/voucher-wise-balance-report 
feat: add voucher-wise balance report for unequal dr/cr GL entries
 2023-06-29 09:07:45 +05:30
Anand Baburajan
50cbdc778f
Merge pull request #35923 from frappe/mergify/bp/develop/pr-35918 
fix: asset movement (backport #35918)
 2023-06-28 20:59:50 +05:30
Anand Baburajan
a4d6f2eba6 fix: asset movement (#35918) 
fix: asset movement fixes
(cherry picked from commit e16c14863b52aaa7856c799ad64fe977d4a4fbbe)
 2023-06-28 14:46:27 +00:00
Ankush Menat
86f453593a perf: avoid perm checks from background jobs 2023-06-28 20:15:29 +05:30
Ankush Menat
9e1736e027
fix: index collect_progress and project date (#35920) 
There's background job to send progress update, this ends up scanning
entire table.
 2023-06-28 19:19:14 +05:30
marination
5a952987a3 fix: Use this.frm (Linter) 2023-06-28 17:13:34 +05:30
Marica
0498a31c42
Merge branch 'develop' into payments-based-dunning 2023-06-28 16:48:22 +05:30
Gursheen Kaur Anand
b9e9204e52
fix: create multiple variants button count and status (#35915) 
fix: change class for fetching columns in multiple variants
 2023-06-28 15:39:00 +05:30
Gursheen Kaur Anand
5113a417a1
fix!: UX of supplier linking with supplier users on portal pages (#35836) 
* fix: create and add Portal Users child table in Supplier/Customer

Issue #35772

* fix: modify the original permission check hook

* fix: auto-add role for portal users

* fix: added patch for auto-populating portal users

* fix: modify patch to fetch users correctly

* fix: remove unnecessary code for updating naming_series

* fix(UX): show portal user in list view

Also split columns to reduce whitespace.

* refactor: simpler role checking

* fix: consider parenttype while fetching portal user

* refactor: simpler code, rename variable

* test: supplier portal user can access their docs

* refactor: only add role if not added

* refactor: rename and move patch to supplier

* refactor: dont add role if no perm or existing doc

* fix: add role before save

* refactor: run query directly

* refactor: split patch and apply roles

- if role isn't present dont add portal user
- ignore failure as it's not critical

* test: fix permission creation for webform test

---------

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2023-06-28 11:22:40 +05:30
mergify[bot]
e832455790
perf: improve item wise register reports (backport #35908) (#35911) 
perf: improve item wise register reports (#35908)

(cherry picked from commit 33ee01174bb909ee46bb3d714d6f94fa0aefe48f)

Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>
 2023-06-28 10:25:03 +05:30
Gursheen Anand
6b9f9f9b0e fix: remove debug flag from sql 2023-06-27 21:59:35 +05:30
Deepesh Garg
7312827d4d fix: On cancel flow 2023-06-27 18:25:10 +05:30
Deepesh Garg
f2edc91dc6 fix: Multi invoice reconciliation 2023-06-27 18:11:47 +05:30
Gursheen Anand
5d726ef037 feat: add voucher-wise balance report logic 2023-06-27 16:49:28 +05:30
HLD
af418d2342
fix: filter parent warehouses not showing (#35897) 2023-06-27 13:17:52 +05:30
s-aga-r
77d08b6dbe
Merge pull request #35894 from s-aga-r/FIX-35888 
fix(ux): PO Get Items From Open Material Requests
 2023-06-27 11:56:46 +05:30
s-aga-r
3a00bf83d6 fix(ux): PO Get Items From Open Material Requests 2023-06-27 11:55:45 +05:30
David Arnold
742df8a25e
fix: delivery trip driver is only required on submit (#35876) 
This allows drafting trips and stops without yet deciding on the
assignable driver which, in real life, may well be decided on after
preparing and planning the trip.
 2023-06-27 11:36:44 +05:30
Deepesh Garg
2d2f0f02d6
Merge pull request #35886 from deepeshgarg007/ldc_breach_fix 
fix: TDS amount calculation post LDC breach
 2023-06-27 09:39:06 +05:30
Deepesh Garg
62c3ca8286 fix: Paid invoice in AR report 2023-06-26 23:53:55 +05:30
Deepesh Garg
1f9ef6c48f fix: TDS amount calculation post LDC breach 2023-06-26 22:01:12 +05:30
Deepesh Garg
d5bdd9387a chore: Do not update shopping cart settings on install 2023-06-26 18:35:01 +05:30
Deepesh Garg
490b64575b test: Add basic test for demo data 2023-06-26 18:33:51 +05:30
ruthra kumar
84ea0a828c
Merge pull request #35882 from ruthra-kumar/refactor_cr_note_reconciliation_with_exchange_gain_loss 
refactor: simplify exchange logic on cr/dr note reconciliation
 2023-06-26 17:32:12 +05:30
rohitwaghchaure
0e14ea4e32
Merge pull request #35881 from rohitwaghchaure/fixed-serial-batch-bundle-print 
fix: serial and batch bundle values in the standard print format
 2023-06-26 16:21:34 +05:30
ruthra kumar
af75f6cea7 refactor: simplify exchange logic on cr/dr note reconciliation 2023-06-26 16:09:54 +05:30
Rohit Waghchaure
9cf645e07f fix: serial and batch bundle values in the standard print format 2023-06-26 16:00:53 +05:30
Suraj Shetty
f0a0f078fc
Merge pull request #35880 from surajshetty3416/update-node-version 2023-06-26 13:10:30 +05:30