CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-02-13 01:34:10 +00:00
Code Issues Packages Projects Releases Wiki Activity
45,462 Commits 397 Branches 1,698 Tags
develop-ritvik-bundle-qty
Commit Graph

45462 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
RitvikSardana
3714b795d6 fix: POS opening issue because of Product Bundle 2023-09-18 17:22:02 +05:30
rohitwaghchaure
e62b783f34 fix: don't set from warehouse for purchase material request (#37132) 2023-09-18 16:10:21 +05:30
ruthra kumar
8ef548f999 Merge pull request #37129 from frappe/mergify/bp/version-14-hotfix/pr-37127 
refactor: better date filters in `Get Outstanding Invoices` dialog (backport #37127)
 2023-09-18 13:51:48 +05:30
ruthra kumar
4b700b726f refactor: better date filters in Get Outstanding Invoices dialog 
(cherry picked from commit 9004721859)
 2023-09-18 07:52:18 +00:00
mergify[bot]
c41cb3930c fix: Don't allow merging accounts with different currency (#37074) 
* fix: Don't allow merging accounts with different currency (#37074)

* fix: Don't allow merging accounts with different currency

* test: Update conflicting values

* test: Update conflicting values

(cherry picked from commit 5e21e7cd1d)

# Conflicts:
#	erpnext/accounts/doctype/account/account.js
#	erpnext/accounts/doctype/account/account.py

* chore: resolve conflicts

---------

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
 2023-09-18 13:03:08 +05:30
ruthra kumar
46f94cf387 Merge pull request #37125 from frappe/mergify/bp/version-14-hotfix/pr-33502 
feat: Toggle display of Account Balance in Chart of Accounts (backport #33502)
 2023-09-18 11:08:51 +05:30
ruthra kumar
79321f56ca chore: resolve conflicts 2023-09-18 10:39:22 +05:30
ruthra kumar
18702841af refactor: Show Balance in COA based on Accounts Settings 
(cherry picked from commit 23fbe86d51)
 2023-09-18 04:44:55 +00:00
ruthra kumar
8b2328c6d3 refactor: show balance checkbox in Accounts Settings 
(cherry picked from commit 1b78fae6fc)

# Conflicts:
#	erpnext/accounts/doctype/accounts_settings/accounts_settings.json
 2023-09-18 04:44:55 +00:00
mergify[bot]
13aaff30a5 fix: company wise deferred accounting fields in item (#37023) 
* fix: company wise deferred accounting fields in item (#37023)

* fix: move deferred accounts in accounting section

* fix: move deferred check boxes in item accounting

* fix: show company wise acc in filters

* fix: fetch item deferred account from child table

* fix: tests using deferred acc

* refactor: use cached value

* fix: cached value call

* feat: patch to migrate deferred acc

* fix: hardcode education module doctypes in patch

* chore: resolve conflicts

---------

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
(cherry picked from commit 099468e3cf)

# Conflicts:
#	erpnext/patches.txt
#	erpnext/patches/v14_0/delete_education_doctypes.py
#	erpnext/stock/doctype/item/item.json

* chore: resolve conflicts

* chore: resolve conflicts

---------

Co-authored-by: Gursheen Kaur Anand <40693548+GursheenK@users.noreply.github.com>
Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
 2023-09-18 09:57:11 +05:30
HENRY Florian
a563fed6dc fix(ux): move get_route_options_for_new_doc to refresh (#37092) 
fix: move `get_route_options_for_new_doc` to `refresh`
 2023-09-16 15:17:26 +05:30
s-aga-r
19a227a970 Merge pull request #37106 from s-aga-r/FIX-1334 
fix: validate duplicate serial no in DN
 2023-09-16 10:56:16 +05:30
mergify[bot]
727dcc5034 fix: ignore user permissions for Source Warehouse in MR (backport #37102) (#37110) 
fix: ignore user permissions for `Source Warehouse` in MR (#37102)

fix: ignore user permissions for Source Warehouse in MR
(cherry picked from commit fc016680c9)

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
 2023-09-15 21:47:15 +05:30
ruthra kumar
89b570ecf5 Merge pull request #37109 from frappe/mergify/bp/version-14-hotfix/pr-37108 
fix: asset validation misfire on debit notes (backport #37108)
 2023-09-15 21:44:45 +05:30
ruthra kumar
b33db6c79a fix: asset validation misfire on debit notes 
(cherry picked from commit 097b9892dc)
 2023-09-15 14:32:41 +00:00
s-aga-r
e5177a6e46 test: add test case for DN duplicate serial nos 2023-09-15 19:45:02 +05:30
s-aga-r
fffa13f22b fix: validate duplicate serial no in DN 2023-09-15 17:30:04 +05:30
rohitwaghchaure
f2395a9297 fix: precision issue and column name (#37073) 2023-09-14 14:28:05 +05:30
mergify[bot]
3ecdf028f2 fix: Remove redundant code (#37001) 
fix: Remove redundant code (#37001)

fix: Remove redundant code
(cherry picked from commit 96363dbb07)

Co-authored-by: ViralKansodiya <141210323+viralkansodiya@users.noreply.github.com>
 2023-09-13 21:03:45 +05:30
mergify[bot]
8772e40bae fix: Purchase Receipt Provisional Accounting GL Entries (backport #37046) (#37068) 
* fix: Purchase Receipt Provisional Accounting GL Entries

(cherry picked from commit 6bab0eeaa1)

* test: Purchase Receipt Provisional Accounting GL Entries

(cherry picked from commit 1c78a5a9aa)

* fix(test): PR Provisional Accounting

---------

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
 2023-09-13 18:16:33 +05:30
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