CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-20 02:34:41 +00:00
Code Issues Packages Projects Releases Wiki Activity
44,011 Commits 424 Branches 1,723 Tags
be2ddd153641709f5d4d3ce43550323df5c7cb5e
Commit Graph

44011 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
anandbaburajan
be2ddd1536 chore: break look if je processed 
(cherry picked from commit a220dc0c9c)
 2023-02-15 08:36:28 +00:00
anandbaburajan
4a209fcb7c fix: opening_accumulated_depreciation and precision in charts 
(cherry picked from commit 47cc8ab6c6)
 2023-02-15 08:36:28 +00:00
Frappe PR Bot
26c9782960 chore(release): Bumped to Version 14.16.0 
# [14.16.0](https://github.com/frappe/erpnext/compare/v14.15.1...v14.16.0) (2023-02-14)

### Bug Fixes

* `amount` in `Material Request` ([f1dd923](f1dd923a50))
* `get_picked_items_details` ([7afbd92](7afbd9201d))
* `pymysql.err.ProgrammingError` ([aa3dd33](aa3dd33f56))
* Add missing 1 required positional argument: 'bill_date' ([ced9274](ced9274d1b))
* add payment hook to point of sale JS ([#33988](https://github.com/frappe/erpnext/issues/33988)) ([49fd712](49fd712966))
* allow PI cancel if linked asset is cancelled ([c98b2b5](c98b2b5918))
* Amount for debit and credit notes with 0 qty line items ([#33902](https://github.com/frappe/erpnext/issues/33902)) ([87a8c17](87a8c17314))
* Amount validation in Payment Request against Purchase Order ([#34042](https://github.com/frappe/erpnext/issues/34042)) ([c7c6123](c7c61239a3))
* BOM import failed as importer use same label field for Raw MaterialsItem table and Scrap Item table ([47d17f4](47d17f4136))
* Concurrency issues in Sales and Purchase returns ([#34019](https://github.com/frappe/erpnext/issues/34019)) ([087333a](087333abcb))
* consider `stock_qty` if `picked_qty` is zero ([df72e4a](df72e4a221))
* consider existing pick list ([466a791](466a791f68))
* currency formatting in item-wise sales history ([#33903](https://github.com/frappe/erpnext/issues/33903)) ([8e2d7bb](8e2d7bb44a))
* default due_date was wrong calculated on template "_Test Payment Term Template 1" (last day of next month) ([c8c9c50](c8c9c50993))
* **ecommerce:** throw invalid doctype error in shop by category ([#33901](https://github.com/frappe/erpnext/issues/33901)) ([1d0e71b](1d0e71bfe5))
* failed test, convert date time to string ([7228a49](7228a492ef))
* german chart of accounts "SKR03" ([#33909](https://github.com/frappe/erpnext/issues/33909)) ([02c4c55](02c4c55adc))
* Ignore mandatory fields while creating tax templates for new companies ([#34005](https://github.com/frappe/erpnext/issues/34005)) ([b0ed3c8](b0ed3c8aed))
* Ignore Payment Ledger Entry on dunning cancel (backport [#34025](https://github.com/frappe/erpnext/issues/34025)) ([#34028](https://github.com/frappe/erpnext/issues/34028)) ([699e93e](699e93e17f))
* incorrect actual qty in Bin ([01ff6a1](01ff6a1f19))
* IntegrityError while cancelling journals against cr note ([c71d035](c71d03555f))
* list view for Terms and Conditions ([#33925](https://github.com/frappe/erpnext/issues/33925)) ([bb8e232](bb8e232aea))
* negative stock error ([e0cd6c2](e0cd6c20a3))
* set per_billed based on hours when amounts are zero ([#33984](https://github.com/frappe/erpnext/issues/33984)) ([5270fbe](5270fbe01a))
* should never get cutomer price on purchase document ([#34002](https://github.com/frappe/erpnext/issues/34002)) ([6fe7600](6fe7600844)), closes [#33998](https://github.com/frappe/erpnext/issues/33998)
* stock entry from item dashboard (stock levels) ([04a474d](04a474d0a1))
* **test:** `test_pick_list_for_items_with_multiple_UOM()` ([7124c0c](7124c0ca30))
* unwanted difference amount calculation on cr note and invoice with same currency ([#34020](https://github.com/frappe/erpnext/issues/34020)) ([cbafc51](cbafc51e75))

### Features

* Add filters in Loan Interest Report ([#33907](https://github.com/frappe/erpnext/issues/33907)) ([52bfb66](52bfb66729))
* add incoterm named place to RFQ ([68a1615](68a1615eae))
* mandatory and mandatory depends on in inventory dimension ([3aca84c](3aca84c43f))
* Setting to allow Sales Order creation against expired quotation ([#33952](https://github.com/frappe/erpnext/issues/33952)) ([4d0e27e](4d0e27ed2b))

### Performance Improvements

* reduce memory usage by paging through records ([3ce8dc7](3ce8dc70cb))
* reduce memory usage while migrating remarks ([c191a3f](c191a3f7c6))
v14.16.0 		2023-02-14 10:38:44 +00:00
Deepesh Garg
7dee5207df Merge pull request #34051 from frappe/version-14-hotfix 
chore: release v14
 2023-02-14 16:06:52 +05:30
rohitwaghchaure
e214a336be Merge pull request #34049 from frappe/mergify/bp/version-14-hotfix/pr-34046 
fix: BOM import failed as use same label field for Raw Materials Item table and Scrap Item table (backport #34046)
 2023-02-14 11:55:29 +05:30
Florian HENRY
47d17f4136 fix: BOM import failed as importer use same label field for Raw MaterialsItem table and Scrap Item table 
(cherry picked from commit 86be259341)
 2023-02-14 05:00:25 +00:00
mergify[bot]
6fe7600844 fix: should never get cutomer price on purchase document (#34002) 
fix: should never get cutomer price on purchase document (#34002)

* fix: never get cutomer price on purchase document

chores: syntax

chore: typo in stock_entry get_uom_details (#33998)

fix: typo in stock_entry get_uom_details

chores: syntax

* feat: add test for get_item_detail price list oriented

* feat: add test for get_item_detail price price oriented

* feat: add test for get_item_detail price price oriented

* chore: clean test code

(cherry picked from commit 231fe4156f)

Co-authored-by: HENRY Florian <florian.henry@open-concept.pro>
 2023-02-14 08:59:25 +05:30
mergify[bot]
c7c61239a3 fix: Amount validation in Payment Request against Purchase Order (#34042) 
fix: Amount validation in Payment Request against Purchase Order (#34042)

(cherry picked from commit ce748cec3a)

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
 2023-02-14 08:59:03 +05:30
mergify[bot]
087333abcb fix: Concurrency issues in Sales and Purchase returns (#34019) 
fix: Concurrency issues in Sales and Purchase returns (#34019)

(cherry picked from commit a67284e96d)

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
 2023-02-13 16:30:03 +05:30
ruthra kumar
80c83f14e9 Merge pull request #34034 from frappe/mergify/bp/version-14-hotfix/pr-34021 
fix: rare instances of IntegrityError while cancelling journals against cr note (backport #34021)
 2023-02-13 14:59:12 +05:30
ruthra kumar
c71d03555f fix: IntegrityError while cancelling journals against cr note 
(cherry picked from commit b9a7ff7c3d)
 2023-02-13 08:45:18 +00:00
mergify[bot]
1540aea21d refactor: filter only immediate upcoming payment term for each SO (#33923) 
refactor: filter only immediate upcoming payment term for each SO (#33923)

* fix: ignore closed or 'on hold' orders

* refactor: filter immediate upcoming term

---------

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
(cherry picked from commit 192a3395a5)

Co-authored-by: ruthra kumar <ruthra@erpnext.com>
 2023-02-13 13:29:41 +05:30
mergify[bot]
cbafc51e75 fix: unwanted difference amount calculation on cr note and invoice with same currency (#34020) 
fix: unwanted difference amount calculation on cr note and invoice with same currency (#34020)

* fix: incorrect difference amount while reconiling cr/dr notes

* fix(test): catch incorrect difference amount calculation

Fixed issues where difference amount was calculated for Cr Notes and Invoices of
the same currency.

---------

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
(cherry picked from commit e5a2b15fba)

Co-authored-by: ruthra kumar <ruthra@erpnext.com>
 2023-02-13 13:29:18 +05:30
mergify[bot]
4d0e27ed2b feat: Setting to allow Sales Order creation against expired quotation (#33952) 
feat: Setting to allow Sales Order creation against expired quotation (#33952)

* feat: Setting to allow Sales Order creation against expired quotation

* chore: linting issues

(cherry picked from commit 148703bfc2)

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
 2023-02-13 11:08:55 +05:30
mergify[bot]
699e93e17f fix: Ignore Payment Ledger Entry on dunning cancel (backport #34025) (#34028) 
fix: Ignore Payment Ledger Entry on dunning cancel (#34025)

* fix: Ignore Payment Ledger Entry on dunning cancel

* chore: fix translation issue

(cherry picked from commit 48bb2c942b)

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
 2023-02-13 10:19:19 +05:30
mergify[bot]
1d0e71bfe5 fix(ecommerce): throw invalid doctype error in shop by category (#33901) 
fix(ecommerce): throw invalid doctype error in shop by category (#33901)

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
(cherry picked from commit 0df28c7174)

Co-authored-by: Sabu Siyad <hello@ssiyad.com>
 2023-02-12 13:35:54 +05:30
mergify[bot]
49fd712966 fix: add payment hook to point of sale JS (#33988) 
fix: add payment hook to point of sale JS (#33988)

(cherry picked from commit a0eb5e5535)

Co-authored-by: Richard Case <110036763+casesolved-co-uk@users.noreply.github.com>
 2023-02-12 09:02:40 +05:30
ruthra kumar
679b16e1bc Merge pull request #33934 from frappe/mergify/bp/version-14-hotfix/pr-33777 
fix(patch): reduce memory usage while migrating remarks (backport #33777)
 2023-02-11 17:50:15 +05:30
ruthra kumar
24cac4ff22 Merge pull request #33935 from frappe/mergify/bp/version-14-hotfix/pr-33776 
patch: reduce memory usage by paging through records (backport #33776)
 2023-02-11 17:49:55 +05:30
mergify[bot]
dd31bd5254 refactor: install fixtures (#33964) 
refactor: install fixtures (#33964)

* refactor: install fixtures

* style: disable semgrep for install_defaults signature

(cherry picked from commit 201573ab9a)

Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
 2023-02-11 16:22:26 +05:30
mergify[bot]
5270fbe01a fix: set per_billed based on hours when amounts are zero (#33984) 
fix: set per_billed based on hours when amounts are zero (#33984)

* fix: set per_billed based on hours when amounts are zero

* test: calculate_percentage_billed

(cherry picked from commit e4953df4a3)

Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
 2023-02-11 14:54:22 +05:30
mergify[bot]
b0ed3c8aed fix: Ignore mandatory fields while creating tax templates for new companies (#34005) 
fix: Ignore mandatory fields while creating tax templates for new companies (#34005)

(cherry picked from commit 0efdc6c13a)

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
 2023-02-11 12:27:06 +05:30
mergify[bot]
02c4c55adc fix: german chart of accounts "SKR03" (#33909) 
fix: german chart of accounts "SKR03" (#33909)

* fix: german chart of accounts "SKR03"

- Added some missing account types and tax rates
- Added some missing accounts

* style: convert indentation to tabs

* fix: space before percentage sign

* feat: add some expense accounts

* refactor: replace unicode characters with utf-8

for better readability

* revert: add back groups for Bank and Cash accounts

Removed in 7d0d9c6900

(cherry picked from commit 3c7b460fd8)

Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
 2023-02-11 11:59:23 +05:30
mergify[bot]
8e2d7bb44a fix: currency formatting in item-wise sales history (#33903) 
fix: currency formatting in item-wise sales history (#33903)

* fix(item-sales-history): currency formatting

* chore: linting issues

* fix: convert raw sql to qb

(cherry picked from commit 2cc7239dd5)

Co-authored-by: Dany Robert <danyrt@wahni.com>
Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
 2023-02-11 11:54:12 +05:30
mergify[bot]
87a8c17314 fix: Amount for debit and credit notes with 0 qty line items (#33902) 
fix: Amount for debit and credit notes with 0 qty line items (#33902)

(cherry picked from commit 47c91324b1)

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
 2023-02-11 11:53:47 +05:30
mergify[bot]
bb8e232aea fix: list view for Terms and Conditions (#33925) 
fix: list view for Terms and Conditions (#33925)

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
(cherry picked from commit ab7293bcd3)

Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
 2023-02-11 11:53:27 +05:30
Deepesh Garg
dc8fc813ff Merge branch 'version-14-hotfix' into mergify/bp/version-14-hotfix/pr-33777 2023-02-11 11:20:53 +05:30
mergify[bot]
52bfb66729 feat: Add filters in Loan Interest Report (#33907) 
* feat: Add filters in Loan Interest Report (#33907)

(cherry picked from commit e478a5d0ce)

* chore: remove flaky tests

---------

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
 2023-02-11 11:20:10 +05:30
mergify[bot]
6e8a985bc6 chore: typo in stock_entry get_uom_details (backport #33998) (#34003) 
chore: typo in stock_entry get_uom_details (#33998)

fix: typo in stock_entry get_uom_details
(cherry picked from commit 185c543b73)

Co-authored-by: Akshay <60477442+akshayitzme@users.noreply.github.com>
 2023-02-10 20:55:03 +05:30
Anand Baburajan
eab3c41a7b Merge pull request #33962 from frappe/mergify/bp/version-14-hotfix/pr-33946 
fix: allow cancelling purchase invoice if linked asset is already cancelled (backport #33946)
 2023-02-05 17:11:53 +05:30
anandbaburajan
68df9ad83c chore: use continue, not break 
(cherry picked from commit 3380dc5dea)
 2023-02-05 10:37:40 +00:00
anandbaburajan
c98b2b5918 fix: allow PI cancel if linked asset is cancelled 
(cherry picked from commit b961321de5)
 2023-02-05 10:37:40 +00:00
rohitwaghchaure
18a1707df9 Merge pull request #33955 from frappe/mergify/bp/version-14-hotfix/pr-33936 
fix: negative stock error (backport #33936)
 2023-02-05 12:13:30 +05:30
Sagar Sharma
6f8ff6f41d Merge pull request #33958 from frappe/mergify/bp/version-14-hotfix/pr-33942 
fix: stock entry from item dashboard (stock levels) (backport #33942)
 2023-02-05 10:05:13 +05:30
s-aga-r
04a474d0a1 fix: stock entry from item dashboard (stock levels) 
(cherry picked from commit dc0ddf8d7e)
 2023-02-05 04:17:17 +00:00
Rohit Waghchaure
388cc31e9e test: test case 
(cherry picked from commit 9ae7578b07)
 2023-02-04 18:05:47 +00:00
Rohit Waghchaure
e0cd6c20a3 fix: negative stock error 
(cherry picked from commit 6d513e2519)
 2023-02-04 18:05:47 +00:00
rohitwaghchaure
6df730ce96 Merge pull request #33954 from frappe/mergify/bp/version-14-hotfix/pr-33941 
fix: default due_date was wrong calculated on template "_Test Payment Term Template 1" (last day of next month) (backport #33941)
 2023-02-04 23:34:32 +05:30
developsessions
d2836c16a7 style: apply results of lint run 
(cherry picked from commit c8cd351b39)
 2023-02-04 17:05:39 +00:00
developsessions
7228a492ef fix: failed test, convert date time to string 
(cherry picked from commit 9d0096ad9e)
 2023-02-04 17:05:39 +00:00
developsessions
ced9274d1b fix: Add missing 1 required positional argument: 'bill_date' 
(cherry picked from commit be1f941996)
 2023-02-04 17:05:38 +00:00
developsessions
76c4dc8177 style: lint wrong from position 
(cherry picked from commit c80aaad437)
 2023-02-04 17:05:38 +00:00
developsessions
c8c9c50993 fix: default due_date was wrong calculated on template "_Test Payment Term Template 1" (last day of next month) 
(cherry picked from commit ce8a1086a7)
 2023-02-04 17:05:38 +00:00
Sagar Sharma
bccfb8184e Merge pull request #33950 from frappe/mergify/bp/version-14-hotfix/pr-33940 
chore: report `Warehouse wise Item Balance Age and Value` (backport #33940)
 2023-02-04 18:59:28 +05:30
s-aga-r
00e93dc076 chore: add Item Name column in Warehouse wise Item Balance Age and Value report 
(cherry picked from commit 56356ffbb9)
 2023-02-04 07:58:41 +00:00
s-aga-r
9f3bb84990 chore: column width in Warehouse wise Item Balance Age and Value report 
(cherry picked from commit d7a665cb84)
 2023-02-04 07:58:41 +00:00
ruthra kumar
3ce8dc70cb perf: reduce memory usage by paging through records 
While migrating GL entries to Payment Ledger, page through records using
primary key to reduce memory usage.

(cherry picked from commit fee0ca8cd9)
 2023-02-02 11:19:17 +00:00
ruthra kumar
c191a3f7c6 perf: reduce memory usage while migrating remarks 
Page through records using primary key

(cherry picked from commit 9bb64107c5)
 2023-02-02 11:18:12 +00:00
Sagar Sharma
6e7eee7fa3 Merge pull request #33913 from frappe/mergify/bp/version-14-hotfix/pr-33910 
feat: add incoterm named place to RFQ (backport #33910)
 2023-02-02 10:33:15 +05:30
Sagar Sharma
bf23984b4f Merge branch 'version-14-hotfix' into mergify/bp/version-14-hotfix/pr-33910 2023-02-02 10:30:22 +05:30