Devin Slauenwhite
dbf245c687
fix: display customer name on picking list
...
(cherry picked from commit 0a633a212d
2022-07-21 13:08:40 +00:00
Nihantra C. Patel
5cdc267aee
fix: Route condition set with proper filter ( #31556 )
...
* fix: Redirect to report with proper filter
* Update member.js
* fix: Route condition set with proper filter
* fix: Route condition set with proper filter
* fix: Route condition set with proper filter
Co-authored-by: Marica <maricadsouza221197@gmail.com >
2022-07-21 18:29:06 +05:30
mergify[bot]
95e1021caf
fix: update fr translations (backport #31526 ) ( #31666 )
...
fix: update fr translations (#31526 )
* fix: update fr translations
* fix: update fr translations
* fix: update fr translations
* fix: update fr translations
* chore: Update french translation
Co-authored-by: Marica <maricadsouza221197@gmail.com >
(cherry picked from commit 3ba0d6cc5cflorian.henry@open-concept.pro >
2022-07-21 18:11:32 +05:30
mergify[bot]
7d50f8798a
Update de.csv (backport #31596 ) ( #31667 )
...
Update de.csv (#31596 )
IN,IM to IN,EIN
Co-authored-by: Marica <maricadsouza221197@gmail.com >
(cherry picked from commit 8629d01dd548571007+billy995@users.noreply.github.com >
2022-07-21 18:10:46 +05:30
Marica
dd751c6e92
Merge pull request #31664 from frappe/mergify/bp/version-13-hotfix/pr-31544
...
FIX: quality inspection quick creation from purchase receipt: pre-fill sample size if available (backport #31544 )
2022-07-21 14:13:48 +05:30
Frappe PR Bot
69087b8790
chore(release): Bumped to Version 13.36.1
...
## [13.36.1](https://github.com/frappe/erpnext/compare/v13.36.0...v13.36.1 ) (2022-07-21)
### Bug Fixes
* ensure defaults removed in bad frappe patch get set again (backport [#31659 ](https://github.com/frappe/erpnext/issues/31659 )) ([2ae3bd92ae3bd9fed
2022-07-21 08:26:20 +00:00
mergify[bot]
763787b0a5
fix: ensure defaults removed in bad frappe patch get set again (backport #31659 ) ( #31661 )
...
fix: ensure defaults removed in bad frappe patch get set again (#31659 )
(cherry picked from commit bf2833b8eesagar@resilient.tech >
2022-07-21 13:54:55 +05:30
mergify[bot]
2ae3bd9fed
fix: ensure defaults removed in bad frappe patch get set again (backport #31659 )
...
fix: ensure defaults removed in bad frappe patch get set again (#31659 )
(cherry picked from commit bf2833b8ee9071018e4esagar@resilient.tech >
2022-07-21 13:54:40 +05:30
Marc de Lima Lucio
1998223ee3
FIX: quality inspection quick creation from purchase receipt: pre-fill sample size if available ( #31544 )
...
FIX: quality inspection quick creation from transaction documents: pre-fill sample size if available
Co-authored-by: Marica <maricadsouza221197@gmail.com >
(cherry picked from commit 048c037842
2022-07-21 08:17:48 +00:00
mergify[bot]
794fd0819f
fix: correct Brazilian portuguese translations (backport #31498 ) ( #31660 )
...
fix: correct Brazilian portuguese translations (#31498 )
* fix brazilian portuguese translations
* minor adjustments
* fix minor adjustments
* fix: remove legacy pt_br.csv
* chore: Fix translation quotation marks
Co-authored-by: Marica <maricadsouza221197@gmail.com >
(cherry picked from commit d30f8387d962901164+treasuryesc@users.noreply.github.com >
2022-07-21 13:47:18 +05:30
Maharshi Patel
1d69ce1932
fix: (india) add overseas in HSN wise report
...
SQL query had WHERE `tabSales Taxes and Charges`.parent = `tabSales Invoice`.name. However, In overseas, there is no `tabSales Taxes and Charges` so I changed the query to use a combination of INNER JOIN and LEFT JOIN to fetch all entries.
2022-07-21 13:27:30 +05:30
Maharshi Patel
8e23c6ad69
fix: assign duplicate_items_msg outside conditional ( #31639 )
...
duplicate_items_msg was defined inside if the statement of stock_item so when duplicate was found in non_stock_item it raised referenced before assignment
2022-07-20 21:25:36 +05:30
Frappe PR Bot
32ba8c7d6d
chore(release): Bumped to Version 13.36.0
...
# [13.36.0](https://github.com/frappe/erpnext/compare/v13.35.3...v13.36.0 ) (2022-07-20)
### Bug Fixes
* (india) (e-invoice) allow generation for UIN Holders ([82539fc82539fc18a84f260e84f260e1d81f4d4341f4d4346756e6b55e6e6b55ece0b0efb98b0efb98237844758a844758a27c#31608 ](https://github.com/frappe/erpnext/issues/31608 )) ([#31616 ](https://github.com/frappe/erpnext/issues/31616 )) ([12d3d6a12d3d6ab499ac9c469ac9c46dabb147ce4b147ce4206f0ecdbef0ecdbef5a9a3c8469a3c84663f8eb9aaa8eb9aaafe98237d948237d94b11cb80bcdcb80bcd0ee55399f255399f2e58711501b711501be5e616e3c6616e3c66b91180135118013506772e8c0272e8c02ae0def622cdef622c13e04b077a04b077a89fa5dae92a5dae9264d#31599 ](https://github.com/frappe/erpnext/issues/31599 )) ([431d79f431d79f51690c751f90c751f6489631ffd9631ffd215d5ce780e8769380256938025952903e42f903e42fbdd85c554e85c554eab5abb7ac5abb7ac5a0b8c9035d8c9035d914
2022-07-20 15:21:11 +00:00
Deepesh Garg
4d67695294
Merge pull request #31647 from frappe/version-13-hotfix
...
chore: weekly version-13 release
2022-07-20 20:49:09 +05:30
Deepesh Garg
50fbfd9839
Merge pull request #31649 from frappe/mergify/bp/version-13-hotfix/pr-31648
...
fix: Patch to make accounting dimension in orders (backport #31648 )
2022-07-20 20:01:27 +05:30
Deepesh Garg
e36c74ac44
chore: resolve conflicts
2022-07-20 19:39:18 +05:30
Deepesh Garg
45e25b2d56
chore: do not re run patch
...
(cherry picked from commit cad2035e07
2022-07-20 13:32:41 +00:00
Deepesh Garg
55399f2e58
fix: Patch to make accounting dimension in orders
...
(cherry picked from commit d46e406db7
2022-07-20 13:32:41 +00:00
Deepesh Garg
a5cd81c73c
Merge branch 'version-13' into version-13-hotfix
2022-07-20 17:52:28 +05:30
Nabin Hait
52c8e0a6ea
Merge pull request #31644 from nabinhait/asset-monthly-depreciation-v13-hotfix
...
fix: Removed 'Allow Monthly Depreciation' checkbox
2022-07-20 17:33:15 +05:30
Nabin Hait
616e3c66b9
fix: Removed 'Allow Monthly Depreciation' checkbox and fixed wdv depreciation rate
2022-07-20 17:32:28 +05:30
Nabin Hait
a6e97ea9ab
Merge pull request #31626 from nabinhait/pcv-perf-enhancements
...
perf: Optimization of gl entry processing logic in period closing voucher
2022-07-20 15:39:39 +05:30
Deepesh Garg
2c5e117f01
Merge pull request #31629 from maharshivpatel/fix-einvoice-discounts
...
fix: (india) (e-invoice) convert discount to absolute value
2022-07-20 13:18:14 +05:30
Marica
a65dd58444
Merge pull request #31416 from frappe/mergify/bp/version-13-hotfix/pr-31412
...
fix: set default_bom for item (backport #31412 )
2022-07-20 11:31:55 +05:30
Nabin Hait
04b077a89f
fix: set status on submit/cancel
2022-07-20 11:10:36 +05:30
Nabin Hait
1180135067
fix: Renamed status field to gle_processing_status
2022-07-20 10:50:44 +05:30
Rucha Mahabal
eae4b06a80
Merge pull request #31630 from ruchamahabal/auto-attendance-perf
2022-07-20 10:25:02 +05:30
Maharshi Patel
b0efb98237
fix: (india) (e-invoice) qty should not be changed to 1
...
Qty of 0 is allowed so can't change item.qty to 1 instead created item_qty and used it.
2022-07-19 22:29:38 +05:30
rohitwaghchaure
e7e1847ec9
Merge pull request #31634 from frappe/mergify/bp/version-13-hotfix/pr-31631
...
fix: slow stock reposting (backport #31631 )
2022-07-19 19:26:35 +05:30
Rohit Waghchaure
a5dae9264d
fix: slow stock reposting
...
(cherry picked from commit 1d80d37ccf
2022-07-19 13:18:13 +00:00
Marica
284095106c
Merge pull request #31588 from SolufyPrivateLimited/Solufyin-oict
...
fix: Opening Invoice Creation Tool msgprint
2022-07-19 17:47:44 +05:30
Rucha Mahabal
8eb9aaafe9
fix: move auto attendance job to long queue
2022-07-19 16:07:18 +05:30
Rucha Mahabal
6938025952
perf: index shift type and employee in checkins and assignment to avoid full table scans
2022-07-19 16:02:31 +05:30
Maharshi Patel
6e6b55ece0
fix: (india) (e-invoice) discount in CN/DN
...
discount fixes
2022-07-19 15:31:34 +05:30
Rucha Mahabal
8c9035d914
perf: Use get_cached_value and get_cached_doc
2022-07-19 14:47:14 +05:30
Nabin Hait
cfb11f4b84
test: Added test for PCV cancellation
2022-07-19 14:31:02 +05:30
Marica
feffc3af27
Merge pull request #31627 from frappe/mergify/bp/version-13-hotfix/pr-31515
...
fix: LCV updates wrong future qty/Bin qty (backport #31515 )
2022-07-19 14:21:33 +05:30
marination
ca9c6e1651
test: LCV impact on future stock balancees
...
(cherry picked from commit de9ea70ce3
2022-07-19 08:10:22 +00:00
marination
f0ecdbef5a
fix: LCV updates wrong future qty/Bin qty
...
- As -ve LCV SLE case is returned from `repost_current_voucher`, future qty is not updated
- This just doubly shifts all future qty which is then fixed by a repost
- Until the repost balance values are wrong
- Bin continues to show wrong projected qty even after repost, this is fixed by next SLE that recalculates Bin
(cherry picked from commit 7a5fd71a6c
2022-07-19 08:10:21 +00:00
Marica
31930a16fa
Merge pull request #31624 from marination/sub-contract-amount
...
fix: Set `amount` in Raw Supplied Items table
2022-07-19 12:55:20 +05:30
Deepesh Garg
4f55fef782
Merge pull request #31623 from frappe/mergify/bp/version-13-hotfix/pr-31599
...
fix: Supplier details in TDS monthly report (backport #31599 )
2022-07-19 12:20:29 +05:30
marination
72e8c02ae0
fix: Set Amount in Supplied Item table
2022-07-19 11:47:25 +05:30
Deepesh Garg
f02596242c
Merge pull request #31609 from deepeshgarg007/gstr_3b_gst_category
...
fix(India): Inward supplies from Composition Supplier in GST 3B report
2022-07-19 10:23:44 +05:30
Deepesh Garg
431d79f516
fix: Supplier details in TDS monthly report ( #31599 )
...
(cherry picked from commit a6ff4db2ec
2022-07-19 04:45:28 +00:00
Rucha Mahabal
711501be5e
fix: Remove unnecessary list comprehensions
2022-07-18 21:32:04 +05:30
Rucha Mahabal
abb7ac5a0b
perf: Replace get_doc with db.get_value in get_shift_details
2022-07-18 21:13:02 +05:30
Rucha Mahabal
85c554eab5
perf: Replace db.get_all with db.exists in is_holiday
...
- widely used function call, fetching all rows for holidays
2022-07-18 21:08:15 +05:30
Nabin Hait
903e42fbdd
perf: Optimization of gl entry processing logic in period closing voucher
2022-07-18 17:59:42 +05:30
mergify[bot]
12d3d6ab49
fix: added Section translation in German for Salary Slip (backport #31608 ) ( #31616 )
...
Co-authored-by: Wolfram Schmidt <wolfram.schmidt@phamos.eu >
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com >
2022-07-18 13:41:42 +05:30
Rucha Mahabal
26497f9c0e
Merge pull request #31614 from ruchamahabal/fix-claim-payment
...
fix: Tax amount not considered in Expense Claim Journal Entry
2022-07-18 13:24:12 +05:30
