CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-19 10:14:59 +00:00
Code Issues Packages Projects Releases Wiki Activity
45,899 Commits 423 Branches 1,723 Tags
8dbf2ced797ff8fb9a9ed5ffbbbbdcb4968ef4e7
Commit Graph

45899 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
barredterra
9c8e2a33e9 fix: german translations 
(cherry picked from commit 3558c3d24e)
 2023-07-30 09:11:08 +00:00
mergify[bot]
a799e1b217 fix: multiple issues related to Production Plan (backport #36377) (#36381) 
* fix: multiple issues related to Production Plan

(cherry picked from commit 1c2148b637)

# Conflicts:
#	erpnext/selling/doctype/sales_order_item/sales_order_item.json

* chore: fixed conflicts

---------

Co-authored-by: Rohit Waghchaure <rohitw1991@gmail.com>
 2023-07-30 10:56:49 +05:30
rohitwaghchaure
4fad4c3fa4 Merge pull request #36404 from rohitwaghchaure/fixed-incorrect-qty-set-based-on-serial-no 
fix: incorrect qty set in the serial no picker
 2023-07-30 10:56:04 +05:30
Rohit Waghchaure
57b19a523e fix: incorrect qty set in the serial no picker 2023-07-29 19:42:23 +05:30
rohitwaghchaure
b72232b358 Merge pull request #36401 from frappe/mergify/bp/version-14-hotfix/pr-36375 
fix: Job Card validation fixed when displaying total completed quantity (backport #36375)
 2023-07-29 19:03:54 +05:30
mergify[bot]
32bdb7cccd fix: only publish repost progress to doc subscriber (backport #36400) (#36402) 
* fix: only publish repost progress to doc subscriber (#36400)

Huge size of string gets blasted to everyone on site. Due to some memory
leak (cause unknown) till sockets are open the strings are also in
process' memory.

related https://github.com/frappe/frappe/issues/21863

(cherry picked from commit c0642cf528)

# Conflicts:
#	erpnext/stock/stock_ledger.py

* chore: conflicts

---------

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2023-07-29 18:14:51 +05:30
ramonalmato
7b3bcd3bc4 fix: Job Card validation fixed when displaying total completed quantity 
(cherry picked from commit 49981fecc7)
 2023-07-29 09:32:10 +00:00
rohitwaghchaure
cfa07bed74 Merge pull request #36388 from frappe/mergify/bp/version-14-hotfix/pr-36380 
fix: change fieldtype from Currency to Float for the valuation rate in reports (backport #36380)
 2023-07-29 12:06:37 +05:30
ruthra kumar
2844d849e0 refactor(test): introduce and make use of mixins in unit tests (#36382) 
* refactor(test): create and use test mixin

* chore(test): replace get_user_default with variable

(cherry picked from commit 3b58055410)
 2023-07-28 15:33:20 +00:00
Rohit Waghchaure
93bd4c7ff3 fix: change fieldtype from Currency to Float for the valuation rate in the stock report 
(cherry picked from commit c82cb379a5)
 2023-07-28 15:06:59 +00:00
mergify[bot]
6d051f5732 fix: removed "fetch_from" (backport #36365) (#36386) 
fix: removed "fetch_from"

* fix: removed ("fetch_from": "goal.objective")
The field ended up being disabled because of this.

(cherry picked from commit 1c687a4afd)

Co-authored-by: xdlumertz <alexandrelumertz@gmail.com>
 2023-07-28 18:15:06 +05:30
mergify[bot]
4ac60cd73b perf: move project status reminder to hourly (backport #36372) (#36373) 
perf: move project status reminder to hourly (#36372)

Only used for sending daily/weekly/bi-daily

[skip ci]

(cherry picked from commit e36c8ce5be)

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2023-07-28 12:54:39 +05:30
Deepesh Garg
e8b93ef32f Merge pull request #36362 from frappe/mergify/bp/version-14-hotfix/pr-36092 
fix: paid_amount when the group is mode of payment (backport #36092)
 2023-07-27 22:35:13 +05:30
Deepesh Garg
ddcd2cfe80 Merge pull request #36358 from frappe/mergify/bp/version-14-hotfix/pr-36347 
fix: Ignore account closing balance for financial statement (#36347)
 2023-07-27 22:34:52 +05:30
Deepesh Garg
e25f4ffa50 Merge pull request #36361 from frappe/mergify/bp/version-14-hotfix/pr-36313 
fix(Item Group): allow root deletion (#36313)
 2023-07-27 22:24:56 +05:30
HarryPaulo
50ef35845a fix: paid_amount when the group is mode of payment 
(cherry picked from commit 2268f7db43)
 2023-07-27 15:53:00 +00:00
barredterra
1a6be5e19b fix(Item Group): allow root deletion 
It was not possible to delete an empty, unused Item Group without any
children, if it was one of possibly multiple roots of the Item Group tree.
This fix allows deleting a root Item Group.

(cherry picked from commit fd2c272bed)
 2023-07-27 15:45:34 +00:00
Deepesh Garg
be94402338 chore: resolve conflicts 2023-07-27 21:12:58 +05:30
Deepesh Garg
800417eeed fix: Ignore account closing balance for financial statement 
(cherry picked from commit ccf1920a78)

# Conflicts:
#	erpnext/accounts/doctype/accounts_settings/accounts_settings.json
 2023-07-27 14:25:06 +00:00
Deepesh Garg
dc603c3df0 Merge pull request #36297 from GursheenK/cost-center-check-for-payment-reconciliation 
fix: cost center filter for fetching payments
 2023-07-27 18:36:12 +05:30
Deepesh Garg
8bf957b9a1 Merge pull request #36342 from frappe/mergify/bp/version-14-hotfix/pr-36327 
fix: GL Entries should not be split based on cost center allocation in PCV (#36327)
 2023-07-27 12:00:59 +05:30
Nabin Hait
ade13e6d36 fix: GL Entries should not be splitted based on cost center allocation in PCV 
(cherry picked from commit 666d961875)
 2023-07-27 06:03:56 +00:00
Deepesh Garg
c3c7dd89fb Merge pull request #36321 from frappe/mergify/bp/version-14-hotfix/pr-36318 
chore(Item Group): remove redundant autoname (backport #36318)
 2023-07-26 22:27:29 +05:30
mergify[bot]
b105ba11b8 chore: adding totals in asset reports (backport #36334) (#36335) 
chore: adding totals in asset reports (#36334)

(cherry picked from commit 5e7b05e566)

Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>
 2023-07-26 22:25:39 +05:30
Deepesh Garg
faf692d344 Merge pull request #36325 from GursheenK/tds-tcs-payable-monthly-report 
fix: show TDS & TCS separately in TDS payable monthly
 2023-07-26 16:20:01 +05:30
ruthra kumar
aadd3f9e69 Merge pull request #36323 from frappe/mergify/bp/version-14-hotfix/pr-36298 
fix: show invoices name instead of object address (backport #36298)
 2023-07-26 12:20:15 +05:30
Frappe PR Bot
d9aa4057d7 chore(release): Bumped to Version 14.32.1 
## [14.32.1](https://github.com/frappe/erpnext/compare/v14.32.0...v14.32.1) (2023-07-26)

### Bug Fixes

* filter by cost center in trial balance ([a20d78a](a20d78ad9e))
v14.32.1 		2023-07-26 06:28:35 +00:00
Deepesh Garg
bc2c7fe315 Merge pull request #36326 from frappe/mergify/bp/version-14/pr-36324 
fix: filter by cost center in trial balance (#36324)
 2023-07-26 11:57:02 +05:30
Gursheen Anand
a20d78ad9e fix: filter by cost center in trial balance 
(cherry picked from commit 02428b446d)
 2023-07-26 06:25:51 +00:00
Deepesh Garg
4b49864995 Merge pull request #36324 from GursheenK/cost-center-filter-in-TB 
fix: filter by cost center in trial balance
 2023-07-26 11:55:03 +05:30
gouravengineer
e802f0c352 fix: show invoices name instead of object address 
comma_and function in expecting a list but it gets a tuple so it is returning a object instead of a string

(cherry picked from commit cf93714a7c)
 2023-07-26 11:39:13 +05:30
Gursheen Anand
619b0feb5f fix: show tds & tcs separately 2023-07-26 11:35:02 +05:30
Gursheen Anand
32fea643cd feat: add party type filter 2023-07-26 11:34:27 +05:30
Gursheen Anand
02428b446d fix: filter by cost center in trial balance 2023-07-26 11:04:46 +05:30
Gursheen Anand
479cab0336 fix: test with None conditon in PE 2023-07-26 09:56:48 +05:30
barredterra
f07b87c5eb chore(Item Group): remove redundant autoname 
(cherry picked from commit 1691eee26e)
 2023-07-26 04:15:22 +00:00
Frappe PR Bot
c4b0790003 chore(release): Bumped to Version 14.32.0 
# [14.32.0](https://github.com/frappe/erpnext/compare/v14.31.3...v14.32.0) (2023-07-26)

### Bug Fixes

* added missing option Partially Received in the status dropdown field ([4fa93b0](4fa93b05c6))
* allocation logic on 'Get Outstanding Invoices' btn in PE ([14600fa](14600fa190))
* allow both custodian and location while creating asset ([#36263](https://github.com/frappe/erpnext/issues/36263)) ([2b47f58](2b47f5815e))
* Ambiguous column error while submitting stock entry (backport [#36209](https://github.com/frappe/erpnext/issues/36209)) ([#36222](https://github.com/frappe/erpnext/issues/36222)) ([844ec58](844ec58f6b))
* apply discount on item after applying price list ([#36316](https://github.com/frappe/erpnext/issues/36316)) ([cff6e72](cff6e72838))
* apply terms validaton only in Sales/Purchase documents ([8f24292](8f24292155))
* broken overallocation validation in payment entry ([e1d31aa](e1d31aad4d))
* clear accounting dimension value when based on field changes ([1fe6d4e](1fe6d4ef1f))
* customer filter in process soa ([5938af9](5938af9c3f))
* Default fiscal year in accounting, buying and sellingcharts ([8ca3d6b](8ca3d6b7f3))
* fetch acc dimension fieldname ([542c804](542c80433d))
* FY in naming series variable for orders ([6a6a3ae](6a6a3ae3c3))
* group by in fixed asset register ([#36310](https://github.com/frappe/erpnext/issues/36310)) ([6cca18e](6cca18e168))
* Ignore permissions while submitting account closing balance record ([#35536](https://github.com/frappe/erpnext/issues/35536)) ([c2976ef](c2976ef643))
* itemised tax breakup ([6f2e639](6f2e639182))
* made item or warehouse filter mandatory (backport [#36208](https://github.com/frappe/erpnext/issues/36208)) ([#36215](https://github.com/frappe/erpnext/issues/36215)) ([57cf3c2](57cf3c28f8))
* no default email account causing reposting issue ([026f9f5](026f9f5a69))
* **regional:** set `frappe.flags.company` temporarily, where required ([73e9b38](73e9b38cda))
* set new purchase_receipt_amount on asset split ([#36272](https://github.com/frappe/erpnext/issues/36272)) ([e867fe7](e867fe77a4))
* timeout error while cancelling the Purchase Receipt ([0575005](0575005c87))
* Trial Balance report considering cancelled entries ([ca4f86d](ca4f86d5af))

### Features

* filter based on accounting dimension in profitability analysis ([ba95df2](ba95df2a74))
v14.32.0 		2023-07-26 04:10:45 +00:00
Deepesh Garg
55f553fb09 Merge pull request #36293 from frappe/version-14-hotfix 
chore: release v14
 2023-07-26 09:39:11 +05:30
Anand Baburajan
cff6e72838 fix: apply discount on item after applying price list (#36316) 2023-07-25 21:55:26 +05:30
Anand Baburajan
6cca18e168 fix: group by in fixed asset register (#36310) 2023-07-25 20:58:18 +05:30
ruthra kumar
2e5c531bbf Merge pull request #36298 from gouravengineer/show_invoice_name_instead_of_object 
fix:show invoices name instead of object address
 2023-07-25 20:38:53 +05:30
rohitwaghchaure
80e5a47ff6 Merge pull request #36300 from rohitwaghchaure/fixed-added-missing-options-partially-received 
fix: added missing option Partially Received in the status field
 2023-07-25 18:08:18 +05:30
Rohit Waghchaure
4fa93b05c6 fix: added missing option Partially Received in the status dropdown field 2023-07-25 17:22:56 +05:30
rohitwaghchaure
ab757cbd82 Merge pull request #36289 from rohitwaghchaure/fixed-purchase-receipt-timeout-on-cancel 
fix: timeout error while cancelling the Purchase Receipt
 2023-07-25 17:13:18 +05:30
Gursheen Anand
c3b21a6c30 chore: linting issues 2023-07-25 17:04:03 +05:30
Gursheen Anand
c9daa85985 fix: cost center filter for fetching payments 2023-07-25 16:50:46 +05:30
gouravengineer
cf93714a7c fix:show invoices name instead of object address 
comma_and function in expecting a list but it gets a tuple so it is returning a object instead of a string
 2023-07-25 16:23:36 +05:30
Deepesh Garg
82f05bf11a Merge pull request #36292 from frappe/mergify/bp/version-14-hotfix/pr-36107 
feat: filtering based on accounting dimensions in profitability analysis (backport #36107)
 2023-07-25 15:18:23 +05:30
Gursheen Anand
542c80433d fix: fetch acc dimension fieldname 
(cherry picked from commit 1c5c310f5a)
 2023-07-25 08:59:30 +00:00
Gursheen Anand
1fe6d4ef1f fix: clear accounting dimension value when based on field changes 
(cherry picked from commit 21c993a7b3)
 2023-07-25 08:59:30 +00:00