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

45899 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Deepesh Garg
e0fb398be1 Merge pull request #36488 from frappe/mergify/bp/version-14-hotfix/pr-36333 
fix: AP report does not show expense claim payables (#36333)
 2023-08-04 17:52:52 +05:30
mergify[bot]
cf2a3e2fc5 Contact Doctype don't have any field job_title. (#36156) 
fix: Contact Doctype doesn't have any field called `job_title`

fix: Contact Doctype doesn't have any field called `job_title`
(cherry picked from commit 49be740736)

Co-authored-by: Sumit Jain <59503001+sumitjain236@users.noreply.github.com>
 2023-08-04 17:52:29 +05:30
Gursheen Anand
a79b30e45f refactor: future payments query 
(cherry picked from commit f5761e7965)
 2023-08-04 12:14:04 +00:00
Gursheen Anand
769d7d7554 fix: AP and AR summary 
(cherry picked from commit e355dea4b5)
 2023-08-04 12:14:03 +00:00
Gursheen Anand
674dba8cd7 fix: fetch ple for all party types 
(cherry picked from commit fd5c4e0a64)
 2023-08-04 12:14:03 +00:00
Gursheen Anand
1ca9aca0d5 fix: fetch ple with party type employee in AP 
(cherry picked from commit c47a37c3ab)
 2023-08-04 12:14:02 +00:00
Deepesh Garg
8e8e59cecb Merge pull request #36484 from frappe/mergify/bp/version-14-hotfix/pr-36458 
test: balance sheet report  (backport #36458)
 2023-08-04 10:59:11 +05:30
Gursheen Anand
47d0e76999 test: balance sheet report 
(cherry picked from commit 002bf77314)
 2023-08-04 04:26:17 +00:00
Gursheen Anand
46bb309b8a fix: check root type only when not none 
(cherry picked from commit cd98be6088)
 2023-08-04 04:26:17 +00:00
mergify[bot]
dfd356a174 chore: better cost center validation for assets (backport #36477) (#36479) 
chore: better cost center validation for assets (#36477)

(cherry picked from commit 38a612c62e)

Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>
 2023-08-03 17:18:56 +05:30
Frappe PR Bot
2d43ba0c90 chore(release): Bumped to Version 14.33.2 
## [14.33.2](https://github.com/frappe/erpnext/compare/v14.33.1...v14.33.2) (2023-08-03)

### Bug Fixes

* serial no not able to reject for the internal transfer (backport [#36467](https://github.com/frappe/erpnext/issues/36467)) ([#36475](https://github.com/frappe/erpnext/issues/36475)) ([a09777c](a09777c406))
v14.33.2 		2023-08-03 07:48:49 +00:00
mergify[bot]
a09777c406 fix: serial no not able to reject for the internal transfer (backport #36467) (#36475) 
fix: serial no not able to reject for the internal transfer (#36467)

(cherry picked from commit c1819a4b21)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2023-08-03 13:16:55 +05:30
rohitwaghchaure
c1819a4b21 fix: serial no not able to reject for the internal transfer (#36467) 2023-08-03 12:19:25 +05:30
mergify[bot]
caa4f33169 fix: don't allow negative rate (backport #36027) (#36465) 
* fix: don't allow negative rates (#36027)

* fix: don't allow negative rate

* test: don't allow negative rate

* fix: only check for -rate on items child table

(cherry picked from commit dedf24b86d)

# Conflicts:
#	erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py

* chore: resolve merge conflict

---------

Co-authored-by: Devin Slauenwhite <devin.slauenwhite@gmail.com>
Co-authored-by: ruthra kumar <ruthra@erpnext.com>
 2023-08-02 17:13:22 +05:30
ruthra kumar
e6dca0668c Merge pull request #36464 from frappe/mergify/bp/version-14-hotfix/pr-36455 
fix: handle None value in payment_term_outstanding (backport #36455)
 2023-08-02 16:54:38 +05:30
Husam Hammad
b033b3b0d6 fix: handle None value in payment_term_outstanding 
* Fix payment entry bug: Handle None value in payment_term_outstanding

* fix: Handle None value in payment_term_outstanding V2

fix linting issue

(cherry picked from commit 27ebf14f9d)
 2023-08-02 10:59:43 +00:00
Frappe PR Bot
75012c17d4 chore(release): Bumped to Version 14.33.1 
## [14.33.1](https://github.com/frappe/erpnext/compare/v14.33.0...v14.33.1) (2023-08-02)

### Bug Fixes

* search not working for so in the Production Plan (backport [#36459](https://github.com/frappe/erpnext/issues/36459)) ([#36460](https://github.com/frappe/erpnext/issues/36460)) ([4605bc5](4605bc51ae))
v14.33.1 		2023-08-02 07:31:21 +00:00
mergify[bot]
4605bc51ae fix: search not working for so in the Production Plan (backport #36459) (#36460) 
fix: search not working for so in the Production Plan (#36459)

fix: search not working for so
(cherry picked from commit 8c57d56240)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2023-08-02 12:59:31 +05:30
rohitwaghchaure
8c57d56240 fix: search not working for so in the Production Plan (#36459) 
fix: search not working for so
 2023-08-02 12:47:12 +05:30
Anand Baburajan
8501a1182a fix: cross connect delivery note and sales invoice (#36183) 
* fix: cross connect delivery note and sales invoice

* chore: remove unnecessary non_standard_fieldname
 2023-08-02 09:07:04 +05:30
Deepesh Garg
fb32120e36 Merge pull request #36454 from frappe/mergify/bp/version-14-hotfix/pr-36450 
fix: Fix query for financial statement report (backport #36450)
 2023-08-01 23:39:44 +05:30
Corentin Flr
d1590f266b fix: Fix query for financial statement report 
(cherry picked from commit bd3fc7c434)
 2023-08-01 18:07:16 +00:00
Frappe PR Bot
710ec18086 chore(release): Bumped to Version 14.33.0 
# [14.33.0](https://github.com/frappe/erpnext/compare/v14.32.1...v14.33.0) (2023-08-01)

### Bug Fixes

* allow fully depreciated existing assets ([#36378](https://github.com/frappe/erpnext/issues/36378)) ([43b85c5](43b85c5711))
* change fieldtype from Currency to Float for the valuation rate in the stock report ([93bd4c7](93bd4c7ff3))
* cost center filter for fetching payments ([c9daa85](c9daa85985))
* Defined "Open" Status as default (backport [#36421](https://github.com/frappe/erpnext/issues/36421)) ([#36424](https://github.com/frappe/erpnext/issues/36424)) ([33a9477](33a947726d))
* filter by cost center in trial balance ([02428b4](02428b446d))
* german translations ([9c8e2a3](9c8e2a33e9))
* GL Entries should not be splitted based on cost center allocation in PCV ([ade13e6](ade13e6d36))
* group item reorder by (warehouse, material_request_type) (backport [#35818](https://github.com/frappe/erpnext/issues/35818)) ([#36425](https://github.com/frappe/erpnext/issues/36425)) ([516191b](516191bf2b))
* Ignore account closing balance for financial statement ([800417e](800417eeed))
* in payment_entry 'Unallocated Amount' cal is broken ([#36369](https://github.com/frappe/erpnext/issues/36369)) ([cd3b85c](cd3b85ccff))
* incorrect `idx` on JE's after reconciliation ([80eb875](80eb8754db))
* incorrect qty set in the serial no picker ([57b19a5](57b19a523e))
* incorrect usage `get_cached_value` on single doctypes ([8f72a68](8f72a6814b))
* **Item Group:** allow root deletion ([1a6be5e](1a6be5e19b))
* job card suggest holiday as start date (backport [#35958](https://github.com/frappe/erpnext/issues/35958)) ([#36423](https://github.com/frappe/erpnext/issues/36423)) ([29ddd26](29ddd26ba1))
* Job Card validation fixed when displaying total completed quantity ([7b3bcd3](7b3bcd3bc4))
* multiple issues related to Production Plan (backport [#36377](https://github.com/frappe/erpnext/issues/36377)) ([#36381](https://github.com/frappe/erpnext/issues/36381)) ([a799e1b](a799e1b217))
* not able to make material request (backport [#36416](https://github.com/frappe/erpnext/issues/36416)) ([#36426](https://github.com/frappe/erpnext/issues/36426)) ([99e7406](99e7406b5b))
* only publish repost progress to doc subscriber (backport [#36400](https://github.com/frappe/erpnext/issues/36400)) ([#36402](https://github.com/frappe/erpnext/issues/36402)) ([32bdb7c](32bdb7cccd))
* overallocation validation misfire on normal invoices ([#36349](https://github.com/frappe/erpnext/issues/36349)) ([09af485](09af485d54))
* paid_amount when the group is mode of payment ([50ef358](50ef35845a))
* process_owner is not link User (backport [#36420](https://github.com/frappe/erpnext/issues/36420)) ([#36422](https://github.com/frappe/erpnext/issues/36422)) ([289dc36](289dc36696))
* removed "fetch_from" (backport [#36365](https://github.com/frappe/erpnext/issues/36365)) ([#36386](https://github.com/frappe/erpnext/issues/36386)) ([6d051f5](6d051f5732))
* root type in account map for balance sheet ([#36303](https://github.com/frappe/erpnext/issues/36303)) ([5b56296](5b562961e3))
* show invoices name instead of object address ([e802f0c](e802f0c352))
* show tds & tcs separately ([619b0fe](619b0feb5f))
* test with None conditon in PE ([479cab0](479cab0336))
* typo in loyalty program throw message ([#36432](https://github.com/frappe/erpnext/issues/36432)) ([782a4d1](782a4d1fa8))

### Features

* add party type filter ([32fea64](32fea643cd))

### Performance Improvements

* avoid full table scan in sle count check ([#36428](https://github.com/frappe/erpnext/issues/36428)) ([04f9915](04f9915009))
* move project status reminder to hourly (backport [#36372](https://github.com/frappe/erpnext/issues/36372)) ([#36373](https://github.com/frappe/erpnext/issues/36373)) ([4ac60cd](4ac60cd73b))
* use `LEFT JOIN` instead of `NOT EXISTS` (backport [#36221](https://github.com/frappe/erpnext/issues/36221)) ([#36383](https://github.com/frappe/erpnext/issues/36383)) ([26a0b3b](26a0b3b380))
v14.33.0 		2023-08-01 18:06:33 +00:00
Deepesh Garg
a9dcf46882 Merge pull request #36442 from frappe/version-14-hotfix 
chore: release v14
 2023-08-01 23:34:31 +05:30
ruthra kumar
e8f24b8b4e Merge pull request #36437 from frappe/mergify/bp/version-14-hotfix/pr-36349 
fix: overallocation validation misfire on normal invoices (backport #36349)
 2023-08-01 15:55:42 +05:30
ruthra kumar
fcda6818ed Merge branch 'version-14-hotfix' into mergify/bp/version-14-hotfix/pr-36349 2023-08-01 15:08:06 +05:30
ruthra kumar
f748eb74f1 Merge pull request #36367 from frappe/mergify/bp/version-14-hotfix/pr-36126 
fix: incorrect `idx` on Journals after reconciliation (backport #36126)
 2023-08-01 15:07:23 +05:30
ruthra kumar
5f677b9629 Merge branch 'version-14-hotfix' into mergify/bp/version-14-hotfix/pr-36126 2023-08-01 14:38:52 +05:30
ruthra kumar
d34f1c1776 Merge pull request #36439 from ruthra-kumar/merge_conflict_in_sr_sp_csv 
chore: remove merge conflict
 2023-08-01 14:31:11 +05:30
ruthra kumar
2dee97aa70 chore: remove merge conflict 
remove merge conflict in sr-SP.csv
 2023-08-01 14:18:14 +05:30
ruthra kumar
5ac7dca2ec Merge branch 'version-14-hotfix' into mergify/bp/version-14-hotfix/pr-36126 2023-08-01 13:53:39 +05:30
ruthra kumar
ee02cde58d Merge pull request #36438 from ruthra-kumar/remove_merge_conflict_in_v14_hotfix 
chore: remove merge conflict in translation file 'tr.csv'
 2023-08-01 13:52:02 +05:30
ruthra kumar
14dc40360d chore: remove merge conflict in translation file 
Remove merge conflict in v14-hotfix branch
 2023-08-01 13:48:03 +05:30
ruthra kumar
09af485d54 fix: overallocation validation misfire on normal invoices (#36349) 
* fix: overallocation validation misfire on normal invoices

* test: assert misfire doesn't happen

(cherry picked from commit ab933df5bb)
 2023-08-01 07:43:04 +00:00
ruthra kumar
80eb8754db fix: incorrect idx on JE's after reconciliation 
(cherry picked from commit 72f577aad2)
 2023-08-01 11:49:27 +05:30
Anand Baburajan
43b85c5711 fix: allow fully depreciated existing assets (#36378) 2023-08-01 11:47:48 +05:30
mergify[bot]
04f9915009 perf: avoid full table scan in sle count check (#36428) 
perf: avoid full table scan in sle count check (#36428)

(cherry picked from commit f31d07554d)

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2023-08-01 11:20:26 +05:30
mergify[bot]
782a4d1fa8 fix: typo in loyalty program throw message (#36432) 
* fix: typo in loyalty program throw message (#36432)

(cherry picked from commit 4f473eb090)

# Conflicts:
#	erpnext/translations/sr-SP.csv
#	erpnext/translations/tr.csv
#	erpnext/translations/zh-TW.csv

* chore: Resolve conflicts

---------

Co-authored-by: abdosaeed95 <118386543+abdosaeed95@users.noreply.github.com>
Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
 2023-08-01 11:19:38 +05:30
ruthra kumar
07f1b42c64 Merge pull request #36390 from frappe/mergify/bp/version-14-hotfix/pr-36382 
refactor(test): introduce and make use of mixins in unit tests (backport #36382)
 2023-08-01 11:08:20 +05:30
ruthra kumar
3a024294a9 Merge pull request #36436 from frappe/mergify/bp/version-14-hotfix/pr-36434 
fix: incorrect usage `get_cached_value` on single doctypes (backport #36434)
 2023-08-01 10:42:03 +05:30
mergify[bot]
5b562961e3 fix: root type in account map for balance sheet (#36303) 
* fix: root type in account map for balance sheet (#36303)

* fix: root type in account map

* fix: fetch gle by root type in consolidated financial statement

* refactor: consolidated financial statement gle query

* fix: filter accounts by root type

(cherry picked from commit 11bd15e580)

# Conflicts:
#	erpnext/accounts/report/consolidated_financial_statement/consolidated_financial_statement.py

* chore: Resolve conflicts

---------

Co-authored-by: Gursheen Kaur Anand <40693548+GursheenK@users.noreply.github.com>
Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
 2023-08-01 10:14:34 +05:30
ruthra kumar
8f72a6814b fix: incorrect usage get_cached_value on single doctypes 
(cherry picked from commit ba15810639)
 2023-08-01 10:12:55 +05:30
mergify[bot]
99e7406b5b fix: not able to make material request (backport #36416) (#36426) 
fix: not able to make material request (#36416)

(cherry picked from commit f83a100a8d)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2023-07-31 19:43:29 +05:30
mergify[bot]
516191bf2b fix: group item reorder by (warehouse, material_request_type) (backport #35818) (#36425) 
fix: group item reorder by (warehouse, material_request_type) (#35818)

* fix: group item reorder by (warehouse, material_request_type)

* fix: update reorder error message

* chore: linter

* fix: correct error message

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>

* chore: linter

---------

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
(cherry picked from commit e8eeeb16e2)

Co-authored-by: Devin Slauenwhite <devin.slauenwhite@gmail.com>
 2023-07-31 18:36:09 +05:30
mergify[bot]
33a947726d fix: Defined "Open" Status as default (backport #36421) (#36424) 
fix: Defined "Open" Status as default (#36421)

Defined "Open" Status as default of the child doctype (Quality Review Objective), because without it the main doctype (Quality Review) has "Passed" status.
This happens because in the "set_status" function, the status is updated according to the status of the child records.

(cherry picked from commit 652398fad2)

Co-authored-by: xdlumertz <alexandrelumertz@gmail.com>
 2023-07-31 18:32:29 +05:30
mergify[bot]
29ddd26ba1 fix: job card suggest holiday as start date (backport #35958) (#36423) 
fix: job card suggest holiday as start date (#35958)

(cherry picked from commit ce36d1f668)

Co-authored-by: Vimal <mailtovimal@gmail.com>
 2023-07-31 18:22:44 +05:30
mergify[bot]
26a0b3b380 perf: use LEFT JOIN instead of NOT EXISTS (backport #36221) (#36383) 
* perf: use `LEFT JOIN` instead of `NOT EXISTS`

(cherry picked from commit 58d867503b)

# Conflicts:
#	erpnext/manufacturing/doctype/bom_update_log/bom_updation_utils.py

* fix: long queue `process_boms_cost_level_wise`

(cherry picked from commit 148d466ae5)

* chore: `conflicts`

---------

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
 2023-07-31 17:39:11 +05:30
mergify[bot]
289dc36696 fix: process_owner is not link User (backport #36420) (#36422) 
fix: process_owner is not link User (#36420)

-Changed "fetch from" since field is not a binding field
-Change field "full_name" from Hidden to Read Only

(cherry picked from commit 05b07e098a)

Co-authored-by: xdlumertz <alexandrelumertz@gmail.com>
 2023-07-31 17:38:02 +05:30
mergify[bot]
cd3b85ccff fix: in payment_entry 'Unallocated Amount' cal is broken (#36369) 
fix: in payment_entry 'Unallocated Amount' cal is broken

(cherry picked from commit f9fa34ff40)

Co-authored-by: Ashish Shah <mr.ashish.shah@gmail.com>
 2023-07-30 18:43:01 +05:30
Deepesh Garg
09966d10d4 Merge pull request #36409 from frappe/mergify/bp/version-14-hotfix/pr-36320 
fix(Supplier): german translations (#36320)
 2023-07-30 18:42:33 +05:30