nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-02-16 16:15:02 +00:00
Code Issues Packages Projects Releases Wiki Activity
50,644 Commits 398 Branches 1,698 Tags
0e088dde36b2ccb2fdd17b2e2f5a76ca9f9170a1
Commit Graph

50644 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
mahsem
0e088dde36 fix: postal_code_move_and_fixes 
(cherry picked from commit 185bbb4c20)
 2025-01-23 10:48:01 +00:00
Diptanil Saha
546da29761 chore: quickbooks migrator integration removal (#45393) 2025-01-23 14:17:14 +05:30
rohitwaghchaure
0eac720182 Merge pull request #45395 from frappe/mergify/bp/version-15-hotfix/pr-45394 
fix: JobCardTimeLog' object has no attribute 'remaining_time_in_mins' (backport #45394)
 2025-01-23 13:40:16 +05:30
Rohit Waghchaure
ef15429d98 fix: JobCardTimeLog' object has no attribute 'remaining_time_in_mins' 
(cherry picked from commit 41dda35db7)
 2025-01-23 07:53:24 +00:00
Diptanil Saha
b9b4f6316d feat: pos configuration for print receipt on complete order (#45392) 2025-01-23 13:07:27 +05:30
mergify[bot]
04f5a72e08 perf: optimize DB calls with frappe.get_all (backport #45289) (#45391) 
perf: optimize DB calls with frappe.get_all (#45289)

* perf: reduce multiple db queries

* fix: use frappe._dict instread of extra iteration

---------

Co-authored-by: Sanket322 <shahsanket322003.com>
(cherry picked from commit 2a400dd3f8)

Co-authored-by: Sanket Shah <113279972+Sanket322@users.noreply.github.com>
 2025-01-23 13:01:12 +05:30
mergify[bot]
412e22fb4e fix: added item_group filter in item_code field in stock balance report (backport #45340) (#45389) 
fix: added item_group filter in item_code field in stock balance report (#45340)

* fix: added item_group filter in item_code field in stock balance report

* feat: added filter to not show non stock items

(cherry picked from commit fe43d20545)

Co-authored-by: Mihir Kandoi <kandoimihir@gmail.com>
 2025-01-23 11:25:33 +05:30
mergify[bot]
767529f0ec fix: batch qty calculation (backport #45367) (#45388) 
fix: batch qty calculation

(cherry picked from commit f07a71a882)

Co-authored-by: Rohit Waghchaure <rohitw1991@gmail.com>
 2025-01-23 11:17:14 +05:30
mergify[bot]
2403cdc4d7 fix: System was allowing to save payment schedule amount less than grand total (backport #45322) (#45381) 
fix: System was allowing to save payment schedule amount less than grand total (#45322)

* fix: System was allowing to save payment schedule amount less than grand_total

* style: After run pre-commit

(cherry picked from commit b26f0b6633)

Co-authored-by: Diógenes Souza <103958767+devdiogenes@users.noreply.github.com>
 2025-01-23 11:16:09 +05:30
mergify[bot]
4e367dedec fix: validate non-stock item for exchange loss/gain (backport #45306) (#45380) 
fix: validate non-stock item for exchange loss/gain (#45306)

* fix: validate non-stock item

* test: add unit test to validate non-stock item exchange difference

* fix: use usd supplier

(cherry picked from commit 05579959f2)

Co-authored-by: Rethik M <85231069+rs-rethik@users.noreply.github.com>
 2025-01-23 11:15:51 +05:30
mergify[bot]
f8099a6847 fix: set preferred email in Employee via backend controller (backport #45320) (#45379) 
fix: set preferred email in Employee via backend controller (#45320)

fix: set preferred email in Employee (backend)

Set "Preferred Email" for Employee via validate. Unset value when
prefered_contact_email is also unset.

(cherry picked from commit 4481ca83ff)

Co-authored-by: gavin <gavin18d@gmail.com>
 2025-01-23 11:15:22 +05:30
rohitwaghchaure
e7f1cda3c1 Merge pull request #45385 from frappe/mergify/bp/version-15-hotfix/pr-45382 
fix: precision issue causing incorrect status (backport #45382)
 2025-01-22 20:48:30 +05:30
Rohit Waghchaure
46a2b7a07e fix: precision issue causing incorrect status 
(cherry picked from commit 4a7586cc01)
 2025-01-22 14:48:23 +00:00
mergify[bot]
bdc65daadd fix: added debounce to prevent multiple clicks (backport #45369) (#45376) 
fix: added debounce to prevent multiple clicks (#45369)

* fix: added debounce to prevent multiple clicks

* fix: linters check

(cherry picked from commit 9ff3101b2d)

Co-authored-by: Khushi Rawat <142375893+khushi8112@users.noreply.github.com>
 2025-01-22 17:53:04 +05:30
Deepesh Garg
7848f1146b Merge pull request #45372 from frappe/mergify/bp/version-15-hotfix/pr-45371 
fix: Do no query GLs if no PCVs are posted (backport #45371)
 2025-01-22 14:22:28 +05:30
Deepesh Garg
ad06652ed5 fix: Do no query GLs if no PCVs are posted 
(cherry picked from commit f4d1a54588)
 2025-01-22 08:33:40 +00:00
ruthra kumar
98797fa918 Merge pull request #45368 from frappe/mergify/bp/version-15-hotfix/pr-45202 
fix: Correct Party Bank Account mapping in `Payment Entry` from Transactional Doctypes (backport #45202)
 2025-01-22 13:00:13 +05:30
DaizyModi
4a390ae3de fix: Correct Party Bank Account mapping in Payment Entry 
(cherry picked from commit 376bdc75f4)
 2025-01-22 07:12:16 +00:00
mergify[bot]
bf8d6ae6bf feat: add option to update modified on communication recieved (backport #45307) (#45310) 
* feat: add option to update modified on communication recieved (#45307)

(cherry picked from commit aa38895caf)

# Conflicts:
#	erpnext/crm/doctype/crm_settings/crm_settings.json

* chore: resolve conflict

---------

Co-authored-by: Ejaaz Khan <67804911+iamejaaz@users.noreply.github.com>
Co-authored-by: ruthra kumar <ruthra@erpnext.com>
 2025-01-21 20:21:46 +05:30
mergify[bot]
96a3a45078 fix: updated modified timestamp for stock entry type (backport #45280) (#45315) 
* fix: updated modified timestamp for stock entry type (#45280)

(cherry picked from commit 2d45d0e5d5)

# Conflicts:
#	erpnext/stock/doctype/stock_entry_type/stock_entry_type.json

* fix: resolved conflict

---------

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2025-01-21 20:20:58 +05:30
Dany Robert
53468202de fix: precision on work order total qty (#45341) 
* fix: precision on work order total qty

* chore: linters
 2025-01-21 20:18:26 +05:30
ruthra kumar
10d99f4bc9 Merge pull request #45360 from frappe/mergify/bp/version-15-hotfix/pr-45242 
fix: include pos invoice in modifing key for returned item validation (backport #45242)
 2025-01-21 16:58:21 +05:30
venkat102
70ed8b78d2 fix: include pos invoice in modifing key for returned item validation 
(cherry picked from commit 2936139c79)
 2025-01-21 11:06:17 +00:00
ruthra kumar
abf93693e9 Merge pull request #45356 from frappe/mergify/bp/version-15-hotfix/pr-45215 
fix: calculate AED exchange rate based on pegged value with USD (backport #45215)
 2025-01-21 14:55:27 +05:30
ruthra kumar
61a506927f Merge pull request #45355 from frappe/mergify/bp/version-15-hotfix/pr-45327 
perf: Ignore is_opening column in GL Queries (backport #45327)
 2025-01-21 14:34:08 +05:30
ruthra kumar
87f1376d86 refactor: use dictionary for better expandability 
(cherry picked from commit 2e535955b3)
 2025-01-21 08:29:26 +00:00
ruthra kumar
05e5e43c06 refactor: fix type error 
(cherry picked from commit dd923332cb)
 2025-01-21 08:29:26 +00:00
Kavin
05e42558d1 fix: calculate AED exchange rate based on pegged value with USD 
(cherry picked from commit 455ef6f084)
 2025-01-21 08:29:26 +00:00
ruthra kumar
06c0547ca4 Merge pull request #45312 from frappe/mergify/bp/version-15-hotfix/pr-45175 
fix(Project): re-phrase welcome email (backport #45175)
 2025-01-21 13:56:51 +05:30
ruthra kumar
f97f7cead4 Merge pull request #45317 from frappe/mergify/bp/version-15-hotfix/pr-45262 
fix: fetching items from blanket order to sales/purchase order (backport #45262)
 2025-01-21 13:55:51 +05:30
ruthra kumar
c76ac04ddd Merge pull request #45314 from frappe/mergify/bp/version-15-hotfix/pr-45271 
fix: round off tax withholding amount (backport #45271)
 2025-01-21 13:55:03 +05:30
Deepesh Garg
b7de26d123 perf: Ignore is_opening column in GL Queries (#45327) 
* perf: Ignore is_opening column in GL Queries

* chore: Remove unwanted changes

* chore: Remove unwanted changes

* chore: Remove unwanted changes

* chore: Remove unwanted changes

* chore: Remove unwanted changes

* chore: Remove unwanted changes

(cherry picked from commit 993f40fa43)
 2025-01-21 08:20:18 +00:00
ruthra kumar
e63d3257a7 Merge pull request #45338 from frappe/mergify/bp/version-15-hotfix/pr-44453 
feat: Create Syscohada charts of accounts (backport #44453)
 2025-01-21 13:17:17 +05:30
mergify[bot]
7045c2cc3d fix: set invoice start date to subscription start date (backport #45342) (#45343) 
fix: set invoice start date to subscription start date (#45342)

(cherry picked from commit 68fb1b28eb)

Co-authored-by: Diptanil Saha <diptanil@frappe.io>
 2025-01-20 17:34:20 +05:30
ruthra kumar
03219142e0 Merge pull request #45339 from frappe/mergify/bp/version-15-hotfix/pr-45334 
fix: translation fixes (backport #45334)
 2025-01-20 13:11:34 +05:30
ruthra kumar
085d80521c Merge pull request #45316 from frappe/mergify/bp/version-15-hotfix/pr-45275 
fix: Ambiguous column error while creating Sales Return (backport #45275)
 2025-01-20 12:13:39 +05:30
mahsem
61303db16d fix: linters 
(cherry picked from commit 3697ba0772)
 2025-01-20 06:42:02 +00:00
mahsem
e4f09ce543 fix: translation fixes 
(cherry picked from commit 1d81a9f933)
 2025-01-20 06:42:02 +00:00
Nelly Traore
26676491e5 feat: add Syscohada charts of accounts 
(cherry picked from commit aa8254963c)
 2025-01-20 06:39:12 +00:00
ruthra kumar
6120999632 Merge pull request #45337 from frappe/mergify/bp/version-15-hotfix/pr-45167 
fix: validate linked sales person (backport #45167)
 2025-01-20 12:08:26 +05:30
Sudharsanan11
85910ec2f9 fix: validate linked sales person 
(cherry picked from commit e614f07795)
 2025-01-20 06:20:29 +00:00
rohitwaghchaure
011519e3ea Merge pull request #45325 from frappe/mergify/bp/version-15-hotfix/pr-44783 
fix: do not reset picked items (backport #44783)
 2025-01-19 13:49:08 +05:30
Rohit Waghchaure
fd83b52513 fix: do not reset picked items 
(cherry picked from commit 34a80bfcd3)
 2025-01-18 08:54:05 +00:00
rohitwaghchaure
5b3a97d8a5 Merge pull request #45324 from frappe/mergify/bp/version-15-hotfix/pr-45298 
fix: company in quality inspection (backport #45298)
 2025-01-18 12:48:59 +05:30
Rohit Waghchaure
c0cf1fed00 fix: company in quality inspection 
(cherry picked from commit 397cd79e1e)
 2025-01-18 06:45:58 +00:00
rohitwaghchaure
9e353e218b Merge pull request #45321 from frappe/mergify/bp/version-15-hotfix/pr-45238 
fix: fixed typo in manufacturing settings and field rename (backport #45238)
 2025-01-17 19:50:55 +05:30
barredterra
93e3847e36 revert: avoid change to translatable string 2025-01-17 14:34:44 +01:00
rohitwaghchaure
2226cc556f Merge pull request #45309 from frappe/mergify/bp/version-15-hotfix/pr-45303 
fix: sales return for multi-uom (backport #45303)
 2025-01-17 18:41:04 +05:30
ruthra kumar
e84fdd9a7a Merge pull request #45319 from frappe/mergify/bp/version-15-hotfix/pr-44811 
fix!: ensure multiple PCVs in same fiscal year are considered in patch (backport #44811)
 2025-01-17 17:29:53 +05:30
Diptanil Saha
7641627b71 fix: fixed typo in manufacturing settings and field rename (#45238) 
* chore: field rename and patch entry

* chore: patch file rename and description improvement

---------

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
(cherry picked from commit 97e3770872)
 2025-01-17 11:56:17 +00:00