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

45493 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Florian HENRY
ab8a4f7f7b Merge branch 'version-14-hotfix' of https://github.com/frappe/erpnext into 14_warning_depreciation_regional_france 2023-09-25 10:19:55 +02:00
mergify[bot]
25f800d3f5 fix(Material Request): consider project for item details (backport #37215) (#37221) 
fix(Material Request): consider project for item details (#37215)

fix(Material Request): project in item details

(cherry picked from commit 7c4ebe2733)

Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
 2023-09-24 22:24:56 +05:30
Deepesh Garg
2b8118c5e6 Merge pull request #37218 from frappe/mergify/bp/version-14-hotfix/pr-37211 
feat: Toggle net values in Trial Balance report (#37211)
 2023-09-24 20:19:06 +05:30
Deepesh Garg
4250a7c4d1 Merge pull request #37217 from frappe/mergify/bp/version-14-hotfix/pr-37213 
fix: filter gl entries in process soa (#37213)
 2023-09-24 20:18:51 +05:30
Deepesh Garg
81d52b16d9 Merge pull request #37220 from frappe/mergify/bp/version-14-hotfix/pr-37167 
fix: set customer currency in pos_invoice if exists (#37167)
 2023-09-24 20:18:09 +05:30
milanpethani
e0da8d261f fix: set customer currency in pos_invoice if exists 
if currency exists in the profile and customer currency doesn't exists still it will update currency to None, so update customer currency only if exists

(cherry picked from commit 041d52e828)
 2023-09-24 12:24:02 +00:00
Deepesh Garg
57c82c1800 feat: Toggle net values in Trial Balance report 
(cherry picked from commit 06a45897de)
 2023-09-24 12:15:57 +00:00
Gursheen Anand
b4bc44db4a fix: apply gl report filters 
(cherry picked from commit 5346c67b02)
 2023-09-24 12:15:44 +00:00
ruthra kumar
d3c9a6d975 Merge pull request #37206 from frappe/mergify/bp/version-14-hotfix/pr-37202 
refactor: ignore PLE's on PCV cancellation (backport #37202)
 2023-09-22 13:57:53 +05:30
ruthra kumar
9d5fce9091 refactor: ignore PLE's on PCV cancellation 
(cherry picked from commit 301092dad1)
 2023-09-22 08:00:36 +00:00
ruthra kumar
139a7ce911 Merge pull request #37196 from frappe/mergify/bp/version-14-hotfix/pr-37069 
fix: Recalculate `advance_paid` in SO/PO after unlinking from advance entry (backport #37069)
 2023-09-22 10:18:00 +05:30
marination
591c720e51 test: Impact on SO of advance PE submit and unlinking/replacement by SI 
(cherry picked from commit 8a4954d713)
 2023-09-22 03:06:31 +00:00
marination
1181dcf521 fix: Update advance_paid in SO/PO after unlinking from advance entry 
(cherry picked from commit 426350eee6)
 2023-09-22 03:06:31 +00:00
mergify[bot]
02fc67c83c feat: Stock Ledger Variance report (backport #37165) (#37183) 
feat: `Stock Ledger Variance` report (#37165)

* feat: `Stock Ledger Variance` report

* refactor: `get_data()`

(cherry picked from commit acda72d616)

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
 2023-09-21 07:49:02 +00:00
Deepesh Garg
43f3779f10 Merge pull request #37156 from frappe/mergify/bp/version-14-hotfix/pr-37122 
fix: german translation of Sales and Purchase Invoice (backport #37122)
 2023-09-20 22:15:43 +05:30
mergify[bot]
f2bcfb5f97 fix: labels for Stock Ledger Invariant Check report (backport #37150) (#37176) 
fix: labels for `Stock Ledger Invariant Check` report (#37150)

refactor: `Stock Ledger Invariant Check` report
(cherry picked from commit f0859ecc60)

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
 2023-09-20 19:21:54 +05:30
Raffael Meyer
03e52d3859 chore: resolve conflicts 2023-09-20 14:38:42 +02:00
mergify[bot]
56657b6122 fix: allow to select parent warehouse in the website item (backport #37047) (#37173) 
fix: allow to select parent warehouse in the website item (#37047)

(cherry picked from commit e6199dc802)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2023-09-20 18:06:30 +05:30
mergify[bot]
c5df164e1c chore: translations dutch (#37042) 
chore: translations dutch (#37042)

update: translations dutch
(cherry picked from commit c35dea7177)

Co-authored-by: RJPvT <48353029+RJPvT@users.noreply.github.com>
 2023-09-19 20:41:53 +05:30
HENRY Florian
8c14dbd7ac chore: translation manual backport of #35697 (#37053) 
chore: translation manual backport of #35697
 2023-09-19 20:26:05 +05:30
Raffael Meyer
8236814270 fix: german translation of Sales and Purchase Invoice (#37122) 
* fix: german translation of Purchase Invoice

* fix: german translation of Sales Invoice

(cherry picked from commit 84a9000db2)

# Conflicts:
#	erpnext/translations/de.csv
 2023-09-19 14:29:56 +00:00
mergify[bot]
1cb8c64c94 fix: after applying coupon code, field in_words not updated (#37133) 
fix: after applying coupon code, field in_words not updated (#37133)

* fix: after applying coupon code, field in_words not updated

* fix: changed the order of the function set_total_in_words

(cherry picked from commit 03f0abf6de)

Co-authored-by: RitvikSardana <65544983+RitvikSardana@users.noreply.github.com>
 2023-09-19 19:44:29 +05:30
mergify[bot]
699ad80802 fix: incorrect stock ledger entries in DN (backport #36944) (#37066) 
fix: incorrect stock ledger entries in DN (#36944)

(cherry picked from commit 0e83190c19)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2023-09-19 19:30:47 +05:30
Anand Baburajan
480a0ca7a8 fix: fetch logic for repay_from_salary in loan_repayment [v14] (#37135) 
* fix: fetch logic for repay_from_salary in loan_repayment

* chore: only fetch repay_from_salary if field exists
 2023-09-19 15:18:35 +05:30
mergify[bot]
29ff0ce286 feat: provision to create RIV from Stock Ledger Invariant Check report (backport #37115) (#37147) 
feat: provision to create RIV from `Stock Ledger Invariant Check` report (#37115)

* feat: provision to create RIV from `Stock Ledger Invariant Check` report

* fix: `linter`

(cherry picked from commit 9c9d0ecb73)

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
 2023-09-19 14:01:47 +05:30
RitvikSardana
af05864e6d fix: POS opening Issue if Product Bundle is available (#37138) 
fix: POS opening issue because of Product Bundle
 2023-09-19 13:09:35 +05:30
mergify[bot]
dfe5f63f59 refactor: more generic filters in Accounts Receivable report (backport #37131) (#37137) 
* refactor: replace 'customer' filter with 'party_type' and 'party'

(cherry picked from commit ac650d2e7a)

* chore: remove stale code

(cherry picked from commit 083c82c206)

* refactor(test): AR output filtered on USD customers

(cherry picked from commit 08d91ab831)

---------

Co-authored-by: ruthra kumar <ruthra@erpnext.com>
 2023-09-19 13:07:30 +05:30
RitvikSardana
366325ca3c fix: Duplicate Serial Nos validation in POS (#36927) 
* fix: added validation for duplicate serial nos in pos

* chore: code cleanup

* chore: code cleanup

* fix: removed duplicate batch number validation

* chore: code cleanup
 2023-09-18 16:32:45 +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