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

45689 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Suraj Shetty
881e95b440 chore: Update required node version to v18 2023-06-26 13:02:08 +05:30
Anand Baburajan
36d26d40a0
perf: improve asset depr schedule creation patch (#35867) 2023-06-26 10:58:36 +05:30
ruthra kumar
a90fe25cc4
Merge pull request #35868 from ruthra-kumar/get_base_grand_total_while_pulling_reference_details 
fix: incorrect outstanding and total amount in reference table of payment entry
 2023-06-25 18:29:54 +05:30
Deepesh Garg
ebeb5e0cb7
Merge pull request #35594 from nikkothari22/make-accounting-dimension-filter-values-optional 
feat: added support for mandatory dimensions per account without applying restrictions on dimension values
 2023-06-25 17:55:26 +05:30
Deepesh Garg
63b126967e chore: Linting Issues 2023-06-25 16:24:22 +05:30
Deepesh Garg
bcff4b0e5a
chore: linting issues 2023-06-25 16:03:58 +05:30
Deepesh Garg
c7186ff95c
Merge pull request #35789 from GursheenK/Provision-to-send-Accounts-Receivable-Reports 
feat: Provision to send Accounts Receivable Reports using Process SOA
 2023-06-24 17:10:50 +05:30
Patrick Eissler
feafa956f7
feat: add German translations for new email template feature (#35865) 2023-06-24 16:35:52 +05:30
HarryPaulo
1e20016059
fix: POS Closing Entry load all invoices with one request on save (#35819) 
fix: load all invoices with one request
 2023-06-24 16:34:24 +05:30
Deepesh Garg
4de7a4c571 chore: update typo in patch 2023-06-24 16:31:19 +05:30
Devin Slauenwhite
f9ed8c10ab
fix: make reorder_level not required (#35831) 
* fix: make reorder_level not required

* fix: allow material request to be made if projected_qty <= reorder_level
 2023-06-24 16:03:15 +05:30
Devin Slauenwhite
802c89ffb3
feat: allow Sales Invoice as data source (#35855) 
* feat: allow Sales Invoice as data source

* chore: linter
 2023-06-24 12:31:16 +05:30
Deepesh Garg
1894dc8197 fix: Test case and code cleanup 2023-06-23 21:53:34 +05:30
Deepesh Garg
da6bc1a13e refactor: Redo workflows 2023-06-23 20:57:51 +05:30
ruthra kumar
2f638ae32a
Merge pull request #35604 from pps190/fix-reconcile-invoice-return 
fix: reconcile invoice against credit note.
 2023-06-23 17:44:25 +05:30
ruthra kumar
9655d78642 test: test reference details response 2023-06-23 17:24:19 +05:30
Marica
2868baebab
fix: Payment Term must be mandatory if Allocate Payment based on .. is checked (#35798) 
- Front and Back end validation of condition
- Fix test to accomodate fix
 2023-06-23 16:00:20 +05:30
Deepesh Garg
df035f6b19
Merge branch 'develop' into Provision-to-send-Accounts-Receivable-Reports 2023-06-23 15:58:38 +05:30
ruthra kumar
9e73af891d fix: get base grand total while pulling reference details in PE 2023-06-23 14:50:14 +05:30
Gursheen Anand
cde82bc0cc fix: modify patch 2023-06-23 12:12:32 +05:30
Gursheen Anand
555c126eb9 fix: add patch for setting default value of report field 2023-06-23 10:52:25 +05:30
mergify[bot]
9a993b0364
fix: show non-depreciable assets in fixed asset register (backport #35858) (#35860) 
fix: show non-depreciable assets in fixed asset register (#35858)

fix: show non-depr assets in fixed asset register
(cherry picked from commit 42d09448eed316268d9a5a2c9e25791bc48fa326)

Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>
 2023-06-23 08:25:00 +05:30
Anand Baburajan
f37484c6fe
chore: better err msg on cancelling JE for asset scrap [dev] (#35850) 
chore: better err msg on cancelling JE for asset scrap
 2023-06-22 22:32:06 +05:30
rohitwaghchaure
f4f8df6cfe
Merge pull request #35842 from rohitwaghchaure/fixed-multiple-work-orders-against-sigle-production-order 
fix: multiple Work Orders against same production plan
 2023-06-22 22:11:09 +05:30
Deepesh Garg
904f835d4a
Merge pull request #35602 from deepeshgarg007/pl_account_balance 
fix: Remove special treatment for P&L Accounts
 2023-06-22 21:11:23 +05:30
Deepesh Garg
05c2198569 test: Update order 2023-06-22 21:08:58 +05:30
Deepesh Garg
13c0c129df
Merge pull request #35828 from phot0n/pr-fieldname-item-wise-purchase-register 
fix: use correct fieldname for purchase receipt column in item_wise_purchase_register report
 2023-06-22 20:40:14 +05:30
Deepesh Garg
e8dff30973
Merge pull request #35846 from deepeshgarg007/patch_workflow_update 
ci: use multiple python version in patch test
 2023-06-22 20:38:05 +05:30
Deepesh Garg
11a9bd523d test: Add posting date parameter 2023-06-22 20:26:12 +05:30
Deepesh Garg
56e81ada56 ci: use multiple python version in patch test 2023-06-22 19:57:23 +05:30
Deepesh Garg
b101dceb2a test: GL Entry order 2023-06-22 19:38:33 +05:30
mergify[bot]
e745312a10
fix: asset capitalization (backport #35832) (#35843) 
* fix: asset capitalization (#35832)

* fix: misc asset capitalisation fixes

* chore: add location in tests and remove unnecessary code

* chore: more fixes and removals

* chore: show company and fix tests

* chore: make target qty read only on capitalization

(cherry picked from commit fb823b53d1d9a631035016fa3b33003bf8ce297a)

# Conflicts:
#	erpnext/assets/doctype/asset_capitalization/asset_capitalization.json
#	erpnext/assets/doctype/asset_capitalization/asset_capitalization.py

* chore: fixing conflicts

---------

Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>
 2023-06-22 19:21:52 +05:30
Deepesh Garg
754eb6bdb6
Merge pull request #35650 from deepeshgarg007/ledger_preview 
feat: Ledger Preview
 2023-06-22 18:30:03 +05:30
Deepesh Garg
d81d6069fb fix: JV query 2023-06-22 18:28:16 +05:30
Deepesh Garg
d9e7bc545e fix: Do full rollback 2023-06-22 16:07:32 +05:30
Deepesh Garg
5c6e3269fb fix: Use GET request 2023-06-22 15:58:41 +05:30
Rohit Waghchaure
80fffbd64b fix: multiple Work Orders agaist same production plan 2023-06-22 15:57:28 +05:30
Deepesh Garg
b523c779f5 Merge branch 'develop' of https://github.com/frappe/erpnext into ledger_preview 2023-06-22 15:43:43 +05:30
Deepesh Garg
0e68da5a2a feat: Show stock ledger preview 2023-06-22 15:43:32 +05:30