nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-02-17 16:45:02 +00:00
Code Issues Packages Projects Releases Wiki Activity
45,442 Commits 401 Branches 1,700 Tags
b56c9b91f11dd9e84d02b82ea2b0b2f727c5d4e1
Commit Graph

45442 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
mergify[bot]
b56c9b91f1 fix: accepted warehouse and rejected warehouse can't be same (backport #36973) (#37071) 
* fix: ignore user permissions for `From Warehouse` in PR

(cherry picked from commit d2f3286115)

# Conflicts:
#	erpnext/buying/doctype/purchase_order/purchase_order.json
#	erpnext/buying/doctype/purchase_order_item/purchase_order_item.json

* chore: `conflicts`

* chore: `conflicts`

---------

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
 2023-09-13 11:26:13 +00:00
mergify[bot]
c2a0c1e989 fix: + btn not appearing for delivery note connection (backport #36980) (#37070) 
fix: move SI and DI connected links to internal_and_external_links

(cherry picked from commit e1a94a9ba1)

Co-authored-by: anandbaburajan <anandbaburajan@gmail.com>
 2023-09-13 16:06:08 +05:30
Deepesh Garg
461b607a6a Merge pull request #37060 from frappe/mergify/bp/version-14-hotfix/pr-37055 
fix: Apply dimension filter, irrespective of dimension columns (#37055)
 2023-09-13 11:20:39 +05:30
Deepesh Garg
9bc44a3b40 fix: Apply dimension filter, irrespective of dimesion columns 
(cherry picked from commit 769db0b3bc)
 2023-09-13 04:36:57 +00:00
ruthra kumar
50cfc68d2c Merge pull request #37058 from frappe/mergify/bp/version-14-hotfix/pr-37057 
fix: Packed item incorrectly picks expired price on Sales Order (backport #37057)
 2023-09-13 08:47:13 +05:30
ruthra kumar
aa0a756111 test: expired item price should not be picked 
(cherry picked from commit 055156d28a)
 2023-09-13 02:50:24 +00:00
ruthra kumar
413b40f5a7 fix: packed item using expired price 
(cherry picked from commit 47ffa4983c)
 2023-09-13 02:50:23 +00:00
rohitwaghchaure
d278b11603 feat: provision to set required by from Production Plan (#37039) 
* feat: provision to set the Required By date from production plan

* test: added test case for validate schedule_date
 2023-09-12 13:32:56 +05:30
mergify[bot]
66027877d3 fix: Parent Task link with Project Task (backport #37025) (#37033) 
* feat: new field in `Task` to hold ref of Template Task

(cherry picked from commit b4bcd9ba3f)

# Conflicts:
#	erpnext/projects/doctype/task/task.json

* fix: set `Template Task` ref in `Project Task`

(cherry picked from commit d3295c43e3)

* fix: reload task before save

(cherry picked from commit 5cae2e79bd)

* test: add test case for Task having common subject

(cherry picked from commit 0d5c8f03bd)

* chore: `conflicts`

---------

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
 2023-09-12 09:04:37 +05:30
Deepesh Garg
1492ce507c Merge pull request #37011 from frappe/mergify/bp/version-14-hotfix/pr-36843 
fix: show customer name for naming series in process soa (#36843)
 2023-09-11 21:52:57 +05:30
mergify[bot]
21be889a77 fix(ux): docstatus filter for Reference Name in QI (backport #37024) (#37028) 
fix(ux): docstatus filter for `Reference Name` in QI (#37024)

(cherry picked from commit d739ab6ee3)

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
 2023-09-11 18:56:20 +05:30
Gursheen Kaur Anand
a35abf8403 chore: linting issues 2023-09-11 12:06:24 +05:30
Gursheen Kaur Anand
619644af04 chore: resolve conflicts 2023-09-11 11:25:30 +05:30
mergify[bot]
acd9c69201 feat: Add half-yearly asset maintenance periodicity. (backport #37006) (#37014) 
feat: Add half-yearly asset maintenance periodicity. (#37006)

(cherry picked from commit 846ae32d92)

Co-authored-by: Bernd Oliver Sünderhauf <46800703+bosue@users.noreply.github.com>
 2023-09-10 17:26:41 +05:30
Gursheen Anand
284181d766 fix: remove report field db set 
(cherry picked from commit 060da2c5bc)
 2023-09-10 06:51:58 +00:00
Gursheen Anand
f9f1ac3601 test: auto email for ar report 
(cherry picked from commit a006b66e45)
 2023-09-10 06:51:58 +00:00
Gursheen Anand
53270dd933 fix: generate pdf only when result exists 
(cherry picked from commit f07f4ce86f)
 2023-09-10 06:51:57 +00:00
Gursheen Anand
657ca7ff22 feat: add field for specifying pdf name 
(cherry picked from commit 5c2a949593)

# Conflicts:
#	erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.py
 2023-09-10 06:51:57 +00:00
Gursheen Anand
2077b2cde4 fix: show letterhead and terms for AR pdf 
(cherry picked from commit 0a9187ea42)
 2023-09-10 06:51:57 +00:00
Deepesh Garg
7ea53cc316 Merge pull request #36964 from GursheenK/test_tds_payable_monthly 
test: TDS payable monthly report
 2023-09-10 11:42:19 +05:30
Deepesh Garg
7acf732a9c Merge pull request #36976 from frappe/mergify/bp/version-14-hotfix/pr-36898 
fix: `company` is ambiguous (#36898)
 2023-09-10 11:41:46 +05:30
Deepesh Garg
43d9a10093 Merge pull request #36985 from deepeshgarg007/employee_loan_repayment 
fix: Update party type for payroll payable account
 2023-09-07 10:17:19 +05:30
Anand Baburajan
2ae4463b76 fix: correct asset daily depr schedule calculation [v14] (#36991) 
fix: correct asset daily depr schedule calculation
 2023-09-06 22:20:29 +05:30
Deepesh Garg
62569b1b41 Merge pull request #36986 from frappe/mergify/bp/version-14-hotfix/pr-36983 
chore: Update employee for tests (backport #36983)
 2023-09-06 18:01:17 +05:30
Deepesh Garg
24a4815250 chore: Update employee for tests 
(cherry picked from commit ae01d70b33)
 2023-09-06 11:02:18 +00:00
Deepesh Garg
1894371b68 chore: Update function 2023-09-06 16:29:12 +05:30
mergify[bot]
e210b28f0d chore: asset finance books validation (backport #36979) (#36981) 
* chore: asset finance books validation (#36979)

(cherry picked from commit 0077659e93)

* chore: fix tests

---------

Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>
 2023-09-06 15:39:46 +05:30
Deepesh Garg
f251d6cb69 fix: Update party type for payroll payable account 2023-09-06 15:18:21 +05:30
mergify[bot]
4fede56d98 fix: use primary key for link lookup (backport #36919) (#36978) 
fix: use primary key for link lookup (#36919)

(cherry picked from commit 8ce6b8179e)

Co-authored-by: Devin Slauenwhite <devin.slauenwhite@gmail.com>
 2023-09-06 06:45:58 +00:00
Dany Robert
fe69d5364d fix: company is ambiguous 
(cherry picked from commit 3e1065a561)
 2023-09-06 04:58:54 +00:00
mergify[bot]
58163d5aa8 fix: ask for asset related accounts only when needed (backport #36960) (#36971) 
fix: ask for asset related accounts only when needed (#36960)

* fix: only ask for asset_received_but_not_billed account when needed

* chore: remove unnecessary if condition

* fix: only ask for expenses_included_in_asset_valuation account when needed

(cherry picked from commit 174f95d699)

Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>
 2023-09-05 18:14:44 +05:30
Gursheen Anand
dbeb132688 refactor: use accounts mixin 2023-09-05 17:33:30 +05:30
mergify[bot]
e3d64fc553 fix: index error on Receivable report based on payment terms (#36963) 
fix: index error on Receivable report based on payment terms

cr note's don't have payment terms. So, skip for them.

(cherry picked from commit b9c556c4a9)

Co-authored-by: ruthra kumar <ruthra@erpnext.com>
 2023-09-05 16:32:58 +05:30
mergify[bot]
c125dea0f1 fix: ignore mandatory fields while saving WO (backport #36954) (#36970) 
fix: ignore mandatory fields while saving WO (#36954)

(cherry picked from commit f809e12747)

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
 2023-09-05 16:29:03 +05:30
mergify[bot]
119273639c fix: added validation for unique serial numbers in pos invoice (#36302) 
fix: added validation for unique serial numbers in pos invoice (#36302)

* fix: added validation for unique serial numbers in pos invoice

* fix: updated title of validation

* fix: removed extra whitespace

* fix: added validation for duplicate batch numbers

---------

Co-authored-by: Ritvik Sardana <ritviksardana@Ritviks-MacBook-Air.local>
(cherry picked from commit a165b37fd7)

Co-authored-by: RitvikSardana <65544983+RitvikSardana@users.noreply.github.com>
 2023-09-05 16:21:33 +05:30
Gursheen Kaur Anand
fc79af5926 fix: prorate factor for subscription plan (#36953) 2023-09-05 16:14:16 +05:30
Gursheen Anand
035eaa5e40 test: tds payable monthly 2023-09-05 15:24:59 +05:30
Anand Baburajan
09e2f24329 fix: allow payment_account of loan repayment to be edited (#36948) 2023-09-05 12:44:14 +05:30
ruthra kumar
a0c65342a1 Merge pull request #36952 from frappe/mergify/bp/version-14-hotfix/pr-36950 
refactor: gain/loss je should use same posting date as payment (backport #36950)
 2023-09-05 09:24:10 +05:30
ruthra kumar
01eae2b758 refactor: gain/loss should use same posting date as payment 
(cherry picked from commit f7865da4d2)
 2023-09-05 03:00:02 +00:00
ruthra kumar
b43c6ff1ae Merge pull request #36946 from GursheenK/tds_payable_monthly_si_withholding_category 
fix: TDS payable monthly SI withholding category
 2023-09-04 19:01:00 +05:30
Gursheen Anand
18f8f7f09c fix: remove withholding category from common fields 2023-09-04 17:30:10 +05:30
ruthra kumar
2d2bcd37cb Merge pull request #36942 from frappe/mergify/bp/version-14-hotfix/pr-36940 
fix: invalid gain/loss JE created on base currency Expense Claim (backport #36940)
 2023-09-04 15:20:23 +05:30
ruthra kumar
068f1b5a6b fix: invalid gain/loss JE created on base currency Expense Claim 
(cherry picked from commit 75d95acb23)
 2023-09-04 08:27:37 +00:00
Ankush Menat
fca154fd60 Merge pull request #36939 from frappe/mergify/bp/version-14-hotfix/pr-36869 
fix: ignore_user_permissions set to 1 for parent field of tree doctypes (backport #36869)
 2023-09-04 13:27:13 +05:30
RitvikSardana
451cc7bc12 fix: added ignore_user_permissions to parent field of tree doctypes 
(cherry picked from commit de433d8626)
 2023-09-04 07:17:07 +00:00
mergify[bot]
11e67c7dc0 refactor: remove Recalculate Rate from SCR Item (backport #36929) (#36931) 
* refactor: remove `Recalculate Rate` from SCR Item (#36929)

(cherry picked from commit cd8ddae7c5)

# Conflicts:
#	erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js
#	erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py
#	erpnext/subcontracting/doctype/subcontracting_receipt_item/subcontracting_receipt_item.json

* chore: `conflicts`

---------

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
 2023-09-03 19:05:05 +05:30
mergify[bot]
5c8bee0a95 fix: when create doc from item dashboard default uom (buying or selling) is not correctly selected (backport #36892) (#36928) 
fix: when create doc from item dashboard default uom (buying or selling) is not correctly selected (#36892)

fix: when create doc from item dashboard defaut uom is not correctly selected
(cherry picked from commit 24e1144de5)

Co-authored-by: HENRY Florian <florian.henry@open-concept.pro>
 2023-09-03 16:38:44 +05:30
ruthra kumar
553ff11de6 Merge pull request #36925 from frappe/mergify/bp/version-14-hotfix/pr-36911 
fix: deduplicate gain/loss JE creation for journals as payment (backport #36911)
 2023-09-03 10:56:36 +05:30
ruthra kumar
5523bc5081 chore: resolve merge conflict 2023-09-03 10:28:58 +05:30