nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-07 23:31:20 +00:00
Code Issues Packages Projects Releases Wiki Activity
41,457 Commits 459 Branches 1,746 Tags
896bac10bcc9d45f3c8be7eb33ea9435d43cdd3a
Commit Graph

41457 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Deepesh Garg
8ef649f65d fix: Item rate reset on changing posting date (#30990) 
* fix: Item rate reset on changing posting date

* chore: Remove debugger

(cherry picked from commit 54d6cf18fc)

# Conflicts:
#	erpnext/public/js/controllers/transaction.js
 2022-05-13 07:37:57 +00:00
mergify[bot]
a94b5c0d8b fix(patch): avoid checking for return field if it doesnt exits (backport #30995) (#30997) 
(cherry picked from commit b08180092e)

Co-authored-by: Ankush Menat <me@ankush.dev>
 2022-05-13 13:07:51 +05:30
Marica
a829072353 Merge pull request #31001 from frappe/mergify/bp/version-13-hotfix/pr-30911 
fix: German translations for Employee doctype (backport #30911)
 2022-05-13 12:55:11 +05:30
Marica
eb1245e9f8 Merge pull request #30998 from frappe/mergify/bp/version-13-hotfix/pr-30818 
feat: request_for_quotation - show supplier name (backport #30818)
 2022-05-13 12:24:02 +05:30
barredterra
b9bda04a83 fix: german translations for Employee 
(cherry picked from commit 02b38a439f)
 2022-05-13 06:54:02 +00:00
Wolfram Schmidt
24851a8577 chore: added RFQ Link to Opportunity Dashboard (#30894) 
added Link to Dashboard

added backlink to Request for Quotation in the Quotation dashboard for transparency and ease of navigation.

(cherry picked from commit c4a2778359)
 2022-05-13 06:48:34 +00:00
Wolfram Schmidt
bc23bc738e feat: add Link to Opportunity (#30614) 
Adding Link to Opportunity

Following the process of Opportunity to Quotation I added a section and link field to Opportunity for a backlink when using "create"-> Request for Quotation from Opportunity.

(cherry picked from commit 0bbed414f8)
 2022-05-13 06:48:08 +00:00
Ahmad
b6a3e693ae feat: request_for_quotation - refactor 
- Set supplier as link in while selecting supplier to create quotation

(cherry picked from commit 04c96b547e)
 2022-05-13 06:47:19 +00:00
Ahmad
db4e264d92 feat: request_for_quotation 
- Show supplier name if supplier ID is not equal to supplier name

(cherry picked from commit b226e7d2ac)
 2022-05-13 06:47:18 +00:00
Saqib Ansari
1ecbf33960 Merge pull request #30991 from frappe/mergify/bp/version-13-hotfix/pr-30968 
fix(accounts): minor fixes & validations (backport #30968)
 2022-05-13 12:03:52 +05:30
Saqib Ansari
013ac26231 test: sales_invoice_with_disabled_account 
(cherry picked from commit 6c16422beb)
 2022-05-12 16:37:27 +00:00
Saqib Ansari
7c750571cd test: payment_entry_against_onhold_purchase_invoice 
(cherry picked from commit 92613777b9)
 2022-05-12 16:37:26 +00:00
Saqib Ansari
515e49bb90 fix: validate disabled accounts before posting ledger entries 
(cherry picked from commit 95b059a98c)
 2022-05-12 16:37:26 +00:00
Saqib Ansari
047c879bec fix: user can select disabled accounts in taxes table 
(cherry picked from commit a1e3ae8869)
 2022-05-12 16:37:25 +00:00
Saqib Ansari
9fbd170fa4 fix: validate on hold purchase invoices in payment entry 
(cherry picked from commit b0f302e579)
 2022-05-12 16:37:24 +00:00
Frappe PR Bot
a89612e448 chore(release): Bumped to Version 13.29.1 
## [13.29.1](https://github.com/frappe/erpnext/compare/v13.29.0...v13.29.1) (2022-05-12)

### Bug Fixes

* Failing accounting dimension patch ([b9a5575](b9a557599e))
v13.29.1 		2022-05-12 10:01:53 +00:00
Deepesh Garg
1def38dba0 Merge pull request #30985 from frappe/version-13-pre-release 
chore: version-13 patch release
 2022-05-12 15:29:21 +05:30
Deepesh Garg
bed1a218a2 Merge pull request #30984 from frappe/mergify/bp/version-13-pre-release/pr-30982 
fix: Failing accounting dimension patch (backport #30982)
 2022-05-12 15:28:05 +05:30
Deepesh Garg
b9a557599e fix: Failing accounting dimension patch 
(cherry picked from commit b14a7b8a5d)
 2022-05-12 09:48:53 +00:00
Deepesh Garg
43ebe946f1 Merge pull request #30982 from deepeshgarg007/failing_patch_for_dimensisons 
fix: Failing accounting dimension patch
 2022-05-12 14:57:01 +05:30
Deepesh Garg
b14a7b8a5d fix: Failing accounting dimension patch 2022-05-12 13:54:47 +05:30
mergify[bot]
295ffb3f1a fix: stock analytics report shows incorrect data there's no stock movement in a period (backport #30945) (#30980) 
* test: basic test for stock analytics report

(cherry picked from commit d81422fb58)

* fix: consider previous balance is missing

Also remove `total`, total of total is a meaningless value.

(cherry picked from commit 6ab0046e9c)

* fix: batch_no doesn't maintain qty_after_transaction

(cherry picked from commit 287b255ad6)

* fix: only carry-forward balances till today's period

Showing data in future doesn't make sense. Only carry-forward till last
bucket that contains today's day.

(cherry picked from commit 198b91f8d4)

Co-authored-by: Ankush Menat <me@ankush.dev>
 2022-05-12 13:06:52 +05:30
Marica
d697515125 Merge pull request #30975 from frappe/mergify/bp/version-13-hotfix/pr-30950 
fix: Set actual qty and basic rate in SE on warehouse triggers (`get_warehouse_details`) (backport #30950)
 2022-05-12 12:54:12 +05:30
marination
6ef1261afd test: Test for mapped SE and fix for failing tests 
- Remove `set_missing_values` from mapper util function since a lot of item data is set after this function is run
- `split_batch` can skip `set_missing_values` since no warehouses are set on mapping and relies on user input

(cherry picked from commit 4fa15b50ca)
 2022-05-11 14:44:42 +00:00
marination
fe52c1f354 fix: set_missing_values in SE and re-use the same on all SE mappings 
- `set_missing_values` in SE will set actual qty, transfer qty and calculate rate/amount
- Re-use `set_missing_values` wherever SE is doc is being mapped

(cherry picked from commit 90a8e924f5)
 2022-05-11 14:44:42 +00:00
marination
678a01d4bd fix: Calculate totals even though pricing rule is not applied on mapped doc 
- `apply_pricing_rule` is triggered due to change in some data which most likely contributes to Total.

(cherry picked from commit 494ddd1eb4)
 2022-05-11 14:44:38 +00:00
marination
30b0aee013 fix: Set actual qty and basic rate in SE on warehouse triggers (get_warehouse_details) 
- set `actual_qty` on source and target warehouse change

(cherry picked from commit 1ce45f623e)
 2022-05-11 14:44:37 +00:00
mergify[bot]
97ea1f5123 fix: per_billed for return DN (backport #30868) (#30971) 
This is a semi-automatic backport of pull request #30868 done by [Mergify](https://mergify.com).
 2022-05-11 14:33:58 +00:00
rohitwaghchaure
60964a48c4 Merge pull request #30947 from frappe/mergify/bp/version-13-hotfix/pr-30938 
fix: allow to use formatting for the field to_discuss in opportunity (backport #30938)
 2022-05-11 17:48:23 +05:30
rohitwaghchaure
87fd93370a fix: conflicts 2022-05-11 16:07:24 +05:30
rohitwaghchaure
fb62bbf61a fix: conflicts 2022-05-11 16:05:19 +05:30
Ankush Menat
b008efbfdb Merge pull request #30970 from frappe/mergify/bp/version-13-hotfix/pr-30969 
chore: fifo queue vs qty after transaction comparison report (backport #30969)
 2022-05-11 15:55:17 +05:30
Ankush Menat
78f694ca4e chore: incompatible changes 2022-05-11 15:22:33 +05:30
Ankush Menat
8c2bfe1d5c chore: fifo queue vs qty after transaction comparison report 
(cherry picked from commit f6d6463a33)
 2022-05-11 09:43:15 +00:00
Marica
c873950f41 Merge pull request #30967 from frappe/mergify/bp/version-13-hotfix/pr-30962 
fix: Block 0 Qty via Update Items to be consistent with form validation (backport #30962)
 2022-05-11 13:04:10 +05:30
marination
56478752e4 fix: Block 0 Qty via Update Items to be consistent with form validation 
(cherry picked from commit 0c9154389b)
 2022-05-11 07:12:29 +00:00
gavin
a761c5c62c Merge pull request #30961 from frappe/mergify/bp/version-13-hotfix/pr-30958 
fix(charts): Pass fieldtype for chart data in selling reports (backport #30958)
 2022-05-10 17:55:19 +05:30
Gavin D'souza
917e7c34af fix(charts): Pass fieldtype for chart data in selling reports 
(cherry picked from commit 7bf0e4f8e5)
 2022-05-10 12:10:48 +00:00
Frappe PR Bot
974f2a85ea chore(release): Bumped to Version 13.29.0 
# [13.29.0](https://github.com/frappe/erpnext/compare/v13.28.0...v13.29.0) (2022-05-10)

### Bug Fixes

* Consider paryt and party type as well in group by consolidated view ([189fc89](189fc89e2d))
* disable form save on naming series tool ([#30909](https://github.com/frappe/erpnext/issues/30909)) ([#30910](https://github.com/frappe/erpnext/issues/30910)) ([d60a6cb](d60a6cb2f8))
* double future qty updates ([0db3013](0db3013c9b))
* HSN-wise-summary of outward supplies Updated Report ([3637525](363752510e))
* Ignore loan repayments made from salary slip ([b7e1d40](b7e1d40e43))
* **india:** invoice type for a debit note e-invoice ([#30948](https://github.com/frappe/erpnext/issues/30948)) ([c46add3](c46add3760))
* **india:** keyerror while generating e-way bill from an e-invoice ([#30879](https://github.com/frappe/erpnext/issues/30879)) ([98d799e](98d799e7cc))
* **india:** re-arrange e-way bill dialog fields ([#30941](https://github.com/frappe/erpnext/issues/30941)) ([7ce5c93](7ce5c93f44))
* Item Alternative Test ([964de1f](964de1fc69))
* patch for renaming membership settings ([#30929](https://github.com/frappe/erpnext/issues/30929)) ([9189653](9189653f2e))
* **pos:** creating pos returns resets pricing rules & discounts ([#30936](https://github.com/frappe/erpnext/issues/30936)) ([a0e39db](a0e39db200))
* remove check for already allocated earned leaves ([#30931](https://github.com/frappe/erpnext/issues/30931)) ([#30932](https://github.com/frappe/erpnext/issues/30932)) ([80f7d66](80f7d66255))
* Remove commit from stock entry test. The assertion is not important ([c449b35](c449b35cc1))
* Set available-for-use date if missing ([#30838](https://github.com/frappe/erpnext/issues/30838)) ([bf2eaec](bf2eaecb1d))
* show group warehouse in Sales Order ([#30891](https://github.com/frappe/erpnext/issues/30891)) ([#30893](https://github.com/frappe/erpnext/issues/30893)) ([c458e14](c458e14e68))
* Show linked time sheets in sales invoice dashboard ([4f4af52](4f4af523e0))
* sort before picking next stock reco ([e27fb58](e27fb58130))
* subtract change_amount from paid_amount field on POS Register ([#30937](https://github.com/frappe/erpnext/issues/30937)) ([b7e873b](b7e873b55d))
* Unlink and delete batch created from stock reco on cancel ([fc35323](fc35323106))
* Wrap SLE actual_qty in `flt` to avoid NoneType operation ([d53228b](d53228b153))

### Features

* **HR:** Leave Type configuration to allow over allocation (backport [#30940](https://github.com/frappe/erpnext/issues/30940)) ([#30944](https://github.com/frappe/erpnext/issues/30944)) ([64440fc](64440fc4fb))
* **india:** cancel e-way bill is enabled with e-invoicing APIs. ([#30924](https://github.com/frappe/erpnext/issues/30924)) ([4ef2ffd](4ef2ffd14c))
* **india:** generate qrcode button for e-invoice ([#30946](https://github.com/frappe/erpnext/issues/30946)) ([7bd5b2b](7bd5b2ba29))
* **india:** store e-way bill auto calculated distance in sales invoice ([#30923](https://github.com/frappe/erpnext/issues/30923)) ([b96f156](b96f1565c5))
v13.29.0 		2022-05-10 10:27:19 +00:00
Deepesh Garg
705a21a0f0 Merge pull request #30952 from frappe/version-13-pre-release 
chore: Release for version-13
 2022-05-10 15:55:39 +05:30
Ankush Menat
6863a59472 Merge branch 'version-13-hotfix' into version-13-pre-release 2022-05-10 15:20:35 +05:30
Ankush Menat
f64ba80913 Merge pull request #30953 from frappe/mergify/bp/version-13-hotfix/pr-30913 
fix: double future qty updates (backport #30913)
 2022-05-10 15:16:37 +05:30
mergify[bot]
b7e873b55d fix: subtract change_amount from paid_amount field on POS Register (#30937) 
Co-authored-by: HarryPaulo <paulo_fabris@hotmail.com>
Co-authored-by: Saqib Ansari <nextchamp.saqib@gmail.com>
 2022-05-10 14:54:19 +05:30
Ankush Menat
4d682face2 chore: remove datettime formatting from debug report 
This hides some information that would otherwise help during debugging

(cherry picked from commit ae842d8145)
 2022-05-10 14:51:02 +05:30
Ankush Menat
6312938fed chore: conflicts 2022-05-10 14:50:35 +05:30
Ankush Menat
e27fb58130 fix: sort before picking next stock reco 
(cherry picked from commit 7e2fbc050a)
 2022-05-10 14:50:35 +05:30
Ankush Menat
0db3013c9b fix: double future qty updates 
update_qty_in_future_sle is reprocessing rows which are already
processed by process_sle_against_current_voucher

(cherry picked from commit 7c839c4503)

# Conflicts:
#	erpnext/stock/doctype/stock_ledger_entry/test_stock_ledger_entry.py
 2022-05-10 09:17:34 +00:00
Deepesh Garg
a85fe517df Merge pull request #30951 from frappe/version-13-hotfix 
chore: Pre release for version-13
 2022-05-10 14:42:16 +05:30
Deepesh Garg
3373ce5c47 Merge pull request #30949 from frappe/mergify/bp/version-13-hotfix/pr-30948 
fix(india): invoice type for a debit note e-invoice (backport #30948)
 2022-05-10 14:13:48 +05:30
Saqib Ansari
c46add3760 fix(india): invoice type for a debit note e-invoice (#30948) 
(cherry picked from commit 8dd046cc51)
 2022-05-10 08:10:34 +00:00