CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-11 14:29:12 +00:00
Code Issues Packages Projects Releases Wiki Activity
49,425 Commits 411 Branches 1,717 Tags
7aeadcbf98622590f73cdc93a40e4eb51ad87484
Commit Graph

49425 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
ruthra kumar
7aeadcbf98 Merge pull request #43268 from frappe/mergify/bp/version-15-hotfix/pr-43239 
fix: add currency in options for rate field in pricing rule (backport #43239)
 2024-09-18 12:28:59 +05:30
ruthra kumar
82982e25c6 chore: resolve conflict 2024-09-18 12:10:42 +05:30
krishna
782c9dda1a fix: add currency in options for rate field in pricing rule 
(cherry picked from commit 636c0131fa)

# Conflicts:
#	erpnext/accounts/doctype/pricing_rule/pricing_rule.json
 2024-09-18 06:29:42 +00:00
ruthra kumar
dfe47261ae Merge pull request #43266 from frappe/mergify/bp/version-15-hotfix/pr-43216 
fix: get cost center allocation percentage only from the applicable allocation (backport #43216)
 2024-09-18 11:40:02 +05:30
venkat102
3d29007aeb fix: cancel cost center allocation and journal entry after test 
(cherry picked from commit 3c65b98b49)
 2024-09-18 05:49:34 +00:00
venkat102
52a161f076 test: add unit test for validating multiple cost center allocation with different child cost center 
(cherry picked from commit 4d5d6150e1)
 2024-09-18 05:49:34 +00:00
venkat102
0fe901a137 fix: fetch cost center allocation percentage only from the applicable allocation 
(cherry picked from commit 36e5945c66)
 2024-09-18 05:49:34 +00:00
Khushi Rawat
8c28cb6b25 Merge pull request #43264 from frappe/mergify/bp/version-15-hotfix/pr-43210 
fix: updated filtering in depreciation and balances report (backport #43210)
 2024-09-18 02:13:54 +05:30
Khushi Rawat
4ba37e49d8 chore: resolved failing check 
(cherry picked from commit af52f0e71f)
 2024-09-17 20:27:32 +00:00
Khushi Rawat
1e89c007ed chore: resolved linter check with #nosemgrep 
(cherry picked from commit 8c8e25214c)
 2024-09-17 20:27:32 +00:00
Khushi Rawat
78c68397d9 fix: updated filtering in depreciation and balances report 
(cherry picked from commit 3a34eecdcf)
 2024-09-17 20:27:32 +00:00
ruthra kumar
f61cec27ae Merge pull request #43259 from frappe/mergify/bp/version-15-hotfix/pr-43226 
fix: map rows on journal entry by validating account, party, debit and credit value (backport #43226)
 2024-09-17 20:22:59 +05:30
Navin-S-R
78768f883c fix: create fiscal year without overlapping existing Fiscal Years 
(cherry picked from commit 720a330617)
 2024-09-17 14:35:39 +00:00
Navin-S-R
edcdfdd194 refactor: update formatting changes 
(cherry picked from commit 768bb0312a)
 2024-09-17 14:35:39 +00:00
ruthra kumar
861edb438b refactor(test): make use existing test data and dynamic fy creation 
(cherry picked from commit f45638015f)
 2024-09-17 14:35:39 +00:00
ruthra kumar
d91013a467 fix: ignore repost logic on Payment Reconciliation 
(cherry picked from commit 75babd4c18)
 2024-09-17 14:35:39 +00:00
Navin-S-R
310b131469 test: reconcile payment jv from closed fiscal year 
(cherry picked from commit f47ea46806)
 2024-09-17 14:35:39 +00:00
Navin-S-R
86e1818420 fix: map rows on journal entry by validating account, party, debit and credit value 
(cherry picked from commit b634aa9cfb)
 2024-09-17 14:35:38 +00:00
ruthra kumar
5fe347c909 Merge pull request #43249 from frappe/mergify/bp/version-15-hotfix/pr-43188 
fix: invalid gp calculation (backport #43188)
 2024-09-17 14:34:58 +05:30
Khushi Rawat
44dde1c58d Merge pull request #43243 from frappe/mergify/bp/version-15-hotfix/pr-43233 
fix: do not validate purchase document for composite asset (backport #43233)
 2024-09-17 12:31:24 +05:30
Dany Robert
291f0a580b fix: invalid gp calculation 
(cherry picked from commit c79851239c)
 2024-09-17 06:33:19 +00:00
ruthra kumar
9c4eaa230c Merge pull request #43246 from frappe/mergify/bp/version-15-hotfix/pr-42969 
fix: A project without tasks should be able to complete (backport #42969)
 2024-09-17 10:43:18 +05:30
ruthra kumar
53c4c153ca Merge pull request #43245 from frappe/mergify/bp/version-15-hotfix/pr-43225 
fix(ux): set amount based on account currency while adding new row (backport #43225)
 2024-09-17 10:26:43 +05:30
ruthra kumar
bee27f314f Merge pull request #43230 from frappe/mergify/bp/version-15-hotfix/pr-43212 
fix: prevent KeyError by checking `report_filter` existence (backport #43212)
 2024-09-17 10:23:58 +05:30
ruthra kumar
c9b6b0d868 refactor(test): fix linter 
(cherry picked from commit 4eeae8011e)
 2024-09-17 04:49:45 +00:00
lukas.brandhoff
dea735de4d fix: A project without tasks should be able to complete 
(cherry picked from commit 268962c25f)
 2024-09-17 04:49:44 +00:00
Navin-S-R
f7cedac526 fix(ux): set amount based on account currency while adding new row 
(cherry picked from commit 0ff04f774d)
 2024-09-17 04:48:42 +00:00
Khushi Rawat
c5051561e4 fix: do not validate purchase document for composite asset 
(cherry picked from commit 5fd058dde9)
 2024-09-16 18:48:26 +00:00
Shariq Ansari
48158fbde0 Merge pull request #43242 from frappe/mergify/bp/version-15-hotfix/pr-43238 
fix: create and link address while creating prospect & customer (backport #43238)
 2024-09-16 22:47:00 +05:30
Shariq Ansari
d6a3d0d468 fix: create and link address while creating prospect & customer 
(cherry picked from commit 035c15794c)
 2024-09-16 16:46:01 +00:00
Smit Vora
30e9f08f37 Merge pull request #43241 from frappe/mergify/bp/version-15-hotfix/pr-43176 
fix: hide and reset discount control on new POS order (backport #43176)
 2024-09-16 20:01:26 +05:30
ljain112
42494db3c7 fix: hide and reset discount control on new POS order 
(cherry picked from commit 5b0053f8dd)
 2024-09-16 14:25:20 +00:00
Smit Vora
a6a2b2daae Merge pull request #43237 from frappe/mergify/bp/version-15-hotfix/pr-42849 
fix: TDS workflow consistency in Purchase Order (backport #42849)
 2024-09-16 19:41:33 +05:30
ljain112
741c18b144 fix: do not auto apply tds in purchase order 
(cherry picked from commit 0b942a0614)
 2024-09-16 13:16:15 +00:00
ljain112
7027be8fbc fix: set tax_withholding_category from Purchase Order while creating pi form po 
(cherry picked from commit b9048ca6fa)
 2024-09-16 13:16:15 +00:00
ljain112
01f30682ee fix: consistent behaviour on refresh 
(cherry picked from commit b216d71278)
 2024-09-16 13:16:15 +00:00
ljain112
5edebb28a5 fix: do not check appy_tds in Purchase Order Automatically 
(cherry picked from commit be6c174b43)
 2024-09-16 13:16:14 +00:00
ljain112
11359bd235 fix: tds workflow in purchase order 
(cherry picked from commit a7888b26a7)
 2024-09-16 13:16:13 +00:00
ljain112
2ad6d637ee fix: revert 091c5496b2 
(cherry picked from commit eeb6e75dcf)
 2024-09-16 13:16:12 +00:00
ruthra kumar
564ff034b7 Merge pull request #43232 from frappe/mergify/bp/version-15-hotfix/pr-43224 
fix(ux): set amount on foreign currency when foreign currency account… (backport #43224)
 2024-09-16 13:49:32 +05:30
venkat102
d8d4cd23a5 fix(ux): set amount on foreign currency when foreign currency account is selected on last row of journal 
(cherry picked from commit 2b66842d34)
 2024-09-16 06:16:09 +00:00
ljain112
984acb661d fix: prevent KeyError by checking report_filter existence 
(cherry picked from commit c1d2cc2c14)
 2024-09-16 03:48:37 +00:00
Shariq Ansari
00f144ed68 Merge pull request #43223 from frappe/mergify/bp/version-15-hotfix/pr-43198 
feat: API for crm integration (backport #43198)
 2024-09-14 14:46:14 +05:30
Nabin Hait
f060534625 feat: API for crm integration 
(cherry picked from commit b7bf9f80f2)
 2024-09-14 08:59:51 +00:00
mergify[bot]
f101a1ce3b fix(holiday-list): use same date format for same holiday error message (backport #42606) (#43222) 
fix(holiday-list): use same date format for same holiday error message (#42606)

* fix(holiday-list): use same date format for same holiday error message

* chore: fix formatting

---------

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
(cherry picked from commit a435441536)

Co-authored-by: Ananyobrata Pal <74728797+ananyo141@users.noreply.github.com>
 2024-09-14 13:36:26 +05:30
mergify[bot]
ef6b172616 fix: currency changing while making PO from Supplier Quotation (backport #43187) (#43205) 
fix: currency changing while making PO from Supplier Quotation (#43187)

(cherry picked from commit 2b96e37c34)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-09-13 13:30:36 +05:30
mergify[bot]
61a42ea5d7 fix: batch based item price not working (backport #43172) (#43206) 
* fix: batch based item price not working (#43172)

(cherry picked from commit d9e4ed13cb)

# Conflicts:
#	erpnext/stock/get_item_details.py

* chore: fix conflicts

---------

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-09-13 13:30:12 +05:30
mergify[bot]
c1a6c56217 fix: item list view in website (backport #43165) (#43207) 
fix: item list view in website (#43165)

(cherry picked from commit ce34bb9793)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-09-13 13:29:58 +05:30
ruthra kumar
b7e95bfd22 Merge pull request #43202 from frappe/mergify/bp/version-15-hotfix/pr-43191 
fix: delete exchange gain loss journal entry while deleting payment entry (backport #43191)
 2024-09-13 11:22:46 +05:30
ruthra kumar
7989bc23e1 Merge pull request #43204 from frappe/mergify/bp/version-15-hotfix/pr-43192 
refactor(test): use test fixture on pricing rule test suite (backport #43192)
 2024-09-13 11:22:13 +05:30