Commit Graph

38032 Commits

Author SHA1 Message Date
mergify[bot]
dff3decd56 fix: Closed status error in Work Order Summary (backport #28460)
* fix: Closed status error in Work Order Summary (#28460)

* fix: Closed status error in Work Order Summary

* chore: use get_meta to get status options

* refactor: simplify code

Co-authored-by: Ankush Menat <ankush@frappe.io>
(cherry picked from commit aa689874e3)

# Conflicts:
#	erpnext/manufacturing/report/work_order_summary/work_order_summary.py

* fix: resolve conflict

Co-authored-by: Sagar Sharma <63660334+s-aga-r@users.noreply.github.com>
Co-authored-by: Ankush Menat <ankush@frappe.io>
2021-11-22 13:24:25 +05:30
Saqib
2a7ca32296 Merge pull request #28480 from frappe/mergify/bp/version-13-hotfix/pr-28402
fix: Gross Profit report totals (backport #28402)
2021-11-22 13:15:30 +05:30
mergify[bot]
d8025b37cd feat: create party link from customer/supplier (#28481) 2021-11-22 13:15:12 +05:30
mergify[bot]
464428b15a fix: cost center wise ledger posting for pcv (#28482) 2021-11-22 13:14:53 +05:30
mergify[bot]
7c731147ba fix: Add extra column to display Invoice or Item when grouped by Invoice (#28483) 2021-11-22 13:14:38 +05:30
Ankush Menat
f4797ac5e3 fix: don't use cached doc while reposting
(cherry picked from commit c436e30ee6)
2021-11-22 13:08:21 +05:30
Ankush Menat
636a6fcae0 fix: ignore permissions while creating repost
If user reached this code then they already have permission to create
stock transaction, hence ignore permission checks while
creating/cancelling repost item valuation entries.

(cherry picked from commit aa024fc9da)
2021-11-22 13:08:21 +05:30
Ankush Menat
1267543064 fix: restrict repost valuation to manager roles
(cherry picked from commit 42f1dd98dd)
2021-11-22 13:08:21 +05:30
mergify[bot]
705319e563 fix: Filter out cancelled and non-depreciable Assets in Asset Value Adjustment (#28478) 2021-11-22 12:22:16 +05:30
mergify[bot]
c3c35c5ab5 fix: add child button in coa tree (#28479) 2021-11-22 12:21:56 +05:30
GangaManoj
46621bc3b1 fix: Replace 'Totals' with 'Total'
(cherry picked from commit 1affa12b74)
2021-11-22 06:51:55 +00:00
GangaManoj
53d1733162 fix: Display totals row in bold
(cherry picked from commit 508a2301ee)
2021-11-22 06:51:55 +00:00
GangaManoj
e9f599de5d fix: Remove unnecessary condition
(cherry picked from commit c7ffe3a7b4)
2021-11-22 06:51:54 +00:00
GangaManoj
85bf2574be fix: Add totals row when Grouped By Invoice
(cherry picked from commit 582a7ae964)
2021-11-22 06:51:54 +00:00
GangaManoj
826d4051a8 fix: Remove default Totals row
(cherry picked from commit 3aaf7cb408)
2021-11-22 06:51:54 +00:00
mergify[bot]
063d474cd0 refactor!: remove abbreviation renaming (#28441) 2021-11-22 11:36:56 +05:30
Deepesh Garg
707c41af3b Merge pull request #28475 from frappe/mergify/bp/version-13-hotfix/pr-28471
fix: bug with qrcode generation due to default print format name (backport #28471)
2021-11-22 11:17:10 +05:30
Saqib
5266b34010 fix(e-invoicing): totals validation of e-invoices (#28418) 2021-11-22 10:57:05 +05:30
Saqib Ansari
9d58613159 fix: bug with qrcode generation due to default print format name
(cherry picked from commit ac27391a1f)
2021-11-22 05:08:36 +00:00
mergify[bot]
cca51f5a6e fix: coa balance rendering bug (#28472) 2021-11-20 15:47:02 +05:30
Deepesh Garg
b4f20a43d8 Merge pull request #28459 from deepeshgarg007/gst_category_set_fix
fix(India): GST category not getting auto updated
2021-11-19 12:21:12 +05:30
Deepesh Garg
cdbc991e3f fix: Add test for gst category check 2021-11-19 11:58:44 +05:30
Deepesh Garg
f8a26a9fac fix(India): GST category not getting auto updated 2021-11-19 11:03:13 +05:30
Marica
4a4b327026 Merge pull request #28412 from frappe/mergify/bp/version-13-hotfix/pr-28269
refactor:  (ux) Accepted/Rejected/Received Qty UX (backport #28269)
2021-11-18 15:40:15 +05:30
marination
1d706fd0f7 fix: (server test) Missing variable declaration 2021-11-18 15:19:12 +05:30
Ankush Menat
5052989957 test: basic test for serialize reco cancel
(cherry picked from commit ed99aca36f)
2021-11-18 14:35:36 +05:30
Ankush Menat
098d6ccedf fix: can not cancel stock reconciliation with sr no
(cherry picked from commit 8c85012a70)
2021-11-18 14:35:36 +05:30
mergify[bot]
840256ee31 chore: remove manual collapsing of section (#28435) (#28450)
(cherry picked from commit 8102e4a210)

Co-authored-by: Ankush Menat <ankush@frappe.io>
2021-11-18 14:12:27 +05:30
mergify[bot]
a60c64857a fix: unchecking the "With Operations" in BOM clears operations table (backport #28446) (#28447)
* fix: unchecking the "With Operations" in BOM clears operations table #28446

(cherry picked from commit 488d34af1f)

# Conflicts:
#	erpnext/manufacturing/doctype/bom/bom.js

* fix: resolve conflict

Co-authored-by: Sagar Sharma <63660334+s-aga-r@users.noreply.github.com>
Co-authored-by: Ankush Menat <ankush@frappe.io>
2021-11-18 14:11:45 +05:30
Ankush Menat
38d956f9f9 Merge branch 'version-13-hotfix' into mergify/bp/version-13-hotfix/pr-28269 2021-11-17 19:38:57 +05:30
mergify[bot]
3359c547d6 fix: (style) Warehouse Capacity Dashboard UI (#28438)
- Made refresh button icon visible
- Edit Capacity button size and alignment
- Medium font on dashboard

(cherry picked from commit 23486a929d)

Co-authored-by: marination <maricadsouza221197@gmail.com>
2021-11-17 19:37:38 +05:30
mergify[bot]
b961ad6789 fix: added job_card_item link in material request (#28222) (#28433)
* fix: added job_card_item links in material request

* fix: add no copy to row references

(cherry picked from commit cb064b06ad)

Co-authored-by: Noah Jacob <noahjacobkurian@gmail.com>
2021-11-17 19:37:08 +05:30
rohitwaghchaure
31be9aa8be Merge pull request #28429 from frappe/mergify/bp/version-13-hotfix/pr-28417
fix: currency wise pricing rule not working (backport #28417)
2021-11-17 14:39:08 +05:30
Rohit Waghchaure
b3a86976a1 fix: currency wise pricing rule not working
(cherry picked from commit 43aeb541c2)
2021-11-17 08:33:08 +00:00
rohitwaghchaure
c7cfce7628 Merge pull request #28427 from frappe/mergify/bp/version-13-hotfix/pr-28425
fix: performance issue while submitting the Journal Entry (backport #28425)
2021-11-17 13:33:48 +05:30
Rohit Waghchaure
7a76db4335 fix: performance to submit the JV
(cherry picked from commit 7472760ea3)
2021-11-17 07:26:52 +00:00
Marica
e6451a3a85 Merge pull request #28414 from frappe/mergify/bp/version-13-hotfix/pr-28228
fix: Pull only Items that are in Job Card in a Stock Entry against Job Card (backport #28228)
2021-11-16 19:09:13 +05:30
marination
af430bb590 fix: Merge conflicts 2021-11-16 18:58:36 +05:30
marination
a34eae7bc7 fix: test_job_card_partial_material_transfer test
- Use a specific BOM for JC tests
- Utility to create said BOM
- Sider: unused variable

(cherry picked from commit a5f8274d79)
2021-11-16 13:08:31 +00:00
marination
d086039f1b fix: Server side test
- make `tests_that_skip_setup` a tuple (added comma)
- remove manual teardown in `test_job_card_material_transfer_correctness` to avoid premature committing
- transfer_material_against = "Job Card" while making BOM with mulitple operations

(cherry picked from commit bb561ba7a8)
2021-11-16 13:08:30 +00:00
marination
619c066f67 fix: (travis) Production Plan Summary Report breaks if no WO
- `get_cached_value` throws a DoesNotExistError if non-existent value, used `get_value` instead
- accomodate production plan items that dont have WO/PO against them as well (blank values)
- added some None value handling to avoid AttributeError

(cherry picked from commit 1eb3ca2b86)
2021-11-16 13:08:29 +00:00
marination
0ee54b0779 fix: Partial Trabsfers against JC
- Fixed transferred qty not back updating on JC if partial transfer
- Partial transfer not mapping pending qty from JC correctly in SE
- tests for above cases
- minor code cleanup

(cherry picked from commit e8d0c25dff)
2021-11-16 13:08:28 +00:00
marination
e3dcccdd18 test: Stock Entry from JC correctness (items mapping and qty)
(cherry picked from commit 0aa237f38c)
2021-11-16 13:08:26 +00:00
marination
f3c562bd5b fix: Pull Items that are in JC in Stock Entry against JC
- Check if items pulled in stock entry are present in Job Card
- Code cleanup and removed redundant checks

Co-authored-by: Gavin D'souza <gavin18d@gmail.com>
(cherry picked from commit 3da03028f3)
2021-11-16 13:08:24 +00:00
mergify[bot]
0c65206d69 fix: POS idx issue in taxes table while merging (#28411) 2021-11-16 18:19:57 +05:30
marination
7bc705fb3c fix: Sider, Linter and Server Side Test
- Fix Server side PR test
- linter: re-arrange imports
- sider: avoid single line multi statement
- Code cleanup: Improve code readability and avoid horizontal scroll in test_purchase_receipt
- Removed unused variables in test_purchase_receipt

(cherry picked from commit 293f6cbafd)

# Conflicts:
#	erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py
2021-11-16 12:43:33 +00:00
marination
d83038a2ff test: Purchase Invoice Received Qty
(cherry picked from commit e9c75d6eea)
2021-11-16 12:43:31 +00:00
marination
149da71f6d test: Purchase Receipt Received Qty
(cherry picked from commit 05ec7cce82)
2021-11-16 12:43:31 +00:00
marination
852b2e3af8 fix: Sider + Fields UX
- remove extra space (sider)
- PR: Bring rejected qty in grid view
- PI: Rename `Stock Qty` to `Accepted Qty in Stock UOM`
- PI: Move `Accepted Qty in Stock UOM` under Stock UOM

(cherry picked from commit afe1c45f7f)
2021-11-16 12:43:30 +00:00
marination
4441f4d93a refactor: (ux) Accepted/Rejected/Received Qty UX
(cherry picked from commit 5fb5a757cf)

# Conflicts:
#	erpnext/public/js/controllers/buying.js
2021-11-16 12:43:29 +00:00