Marica
3fcf0ec81d
Merge branch 'develop' into so-mr-wo-back-update
2022-02-16 12:44:56 +05:30
Sagar Vora
08a391fa88
test: set correct DocType ( #29819 )
2022-02-16 10:56:57 +05:30
Marica
e6fa33012f
Merge branch 'develop' into so-mr-wo-back-update
2022-02-15 17:51:54 +05:30
Ankush Menat
f89a64db48
fix: dont attempt to set batch number if item doesn't have batch no ( #29812 )
...
This causes other triggers and unnecessary changes (e.g. price list)
2022-02-15 16:10:35 +05:30
Deepesh Garg
4a33cdab34
Merge pull request #29791 from deepeshgarg007/tds_payable_cancelled_entries
...
fix: Fixes in TDS payable monthly report
2022-02-15 15:39:47 +05:30
marination
0ca58d7627
chore: Patch to update SO work_order_qty and Linter fix
2022-02-15 14:28:00 +05:30
marination
f9d52e7346
test: SO > MR > WO flow
2022-02-15 13:38:15 +05:30
marination
18731622c4
fix: Update SO via Work Order made from MR (attached to SO)
...
- Add SO Item reference in WO from MR (that was made from SO)
2022-02-15 12:50:56 +05:30
Deepesh Garg
10629f78fa
Merge branch 'develop' into reverse_entry_dead_lock
2022-02-15 11:59:50 +05:30
Ankush Menat
1e9766433a
fix: get_item_details overrides parentype ( #29799 )
2022-02-15 10:57:06 +05:30
Saqib Ansari
67a7802f0d
Merge pull request #29789 from nextchamp-saqib/fix-opening-inv-tool
...
fix: disable rounded total in opening invoice creation tool
2022-02-15 10:38:11 +05:30
Marica
728545d147
Merge pull request #29788 from marination/fifo-slot-by-wh
...
fix: Generate Warehouse wise FIFO Queue always and later aggregate if required
2022-02-14 23:04:44 +05:30
Marica
599f4b1412
Merge pull request #29705 from marination/pending-qty-in-prod-plan
...
fix: Set Pending Qty in Prod Plan after updating Work Order
2022-02-14 23:01:51 +05:30
marination
e46a1bc80f
fix: Server Tests and sider
2022-02-14 21:00:51 +05:30
Marica
cd728fc9e7
Merge branch 'develop' into fifo-slot-by-wh
2022-02-14 20:42:57 +05:30
Deepesh Garg
04cbde2e52
fix: Filter out bank payment entries
2022-02-14 20:38:04 +05:30
marination
f221a0d253
test: Cover back to back recos from different warehouses
2022-02-14 20:14:14 +05:30
Deepesh Garg
2ff6b3560e
fix: Fixes in TDS payable monthly report
2022-02-14 19:51:58 +05:30
Sagar Sharma
19a6c21eec
refactor!: amazon mws integration ( #29438 )
...
* remove: amazon mws integration
* add patch to remove doctype
* remove old patch
2022-02-14 19:43:26 +05:30
Saqib Ansari
a8309c5183
Merge branch 'develop' into fix-opening-inv-tool
2022-02-14 19:14:03 +05:30
Saqib Ansari
18d0a59a9d
fix: disable rounded total in opening invoice creation tool
2022-02-14 18:38:02 +05:30
Saqib Ansari
3713ae75ab
fix: incorrect pricing rule filtering on selecting first item
2022-02-14 13:31:37 +05:30
Dany Robert
85adb947bf
fix: show user id in emp group table ( #29776 )
2022-02-14 09:22:21 +05:30
Deepesh Garg
65711dbde8
test: Update account type in payroll payable account
...
(cherry picked from commit a54e0fe42b38f571396e88b3ebcc46fd3b389301)
2022-02-12 13:17:33 +00:00
Deepesh Garg
988dee04fa
fix: Loan repayment via Salary Slip
...
(cherry picked from commit 2572480554db265e2e93a5dfba75749675b46d14)
2022-02-12 13:17:32 +00:00
Deepesh Garg
19e281a54f
Merge pull request #29700 from vorasmit/gstr-1-fixes
...
fix(India): Report GSTR-1 minor fixes
2022-02-12 17:16:24 +05:30
Wolfram Schmidt
a0d163ebff
chore: changed Region zu Gebiet ( #29651 )
...
"Region" is more fitting when talking about a geographical area or region. Gebiet is more accurate translation in this case of territory as we are talking about sales territory which would be a "Verkaufsgebiet".
2022-02-12 14:50:48 +05:30
Wolfram Schmidt
7338641791
chore: added DocType Translation #29730
...
frappe.cloud/app/doctype/Email Digest Recipient
..it's just a table
[skip ci]
2022-02-12 14:49:31 +05:30
Ankush Menat
eb8b424722
feat: item-wise negative stock setting ( #29761 )
2022-02-12 13:08:28 +05:30
mergify[bot]
749005eb8b
fix: list mutation within loop ( #29766 )
...
Prevent list mutation within loop leading to incorrect data
(cherry picked from commit 894a406ed406f8e6fa3efed9315609ffc33075f6)
Co-authored-by: Govind S Menokee <govindsmenokee@gmail.com>
2022-02-12 12:14:19 +05:30
Saqib Ansari
80944e666f
Merge pull request #29754 from resilient-tech/remove-format
...
chore: remove deprecated print format
2022-02-12 12:08:23 +05:30
Saqib Ansari
ef971e160a
Merge pull request #29729 from resilient-tech/allow_regional
...
fix: allow `regional_overrides` hook to be set in subsequent apps
2022-02-12 12:05:25 +05:30
Rucha Mahabal
961467c389
fix: revert removal of gratuity payment via salary slip ( #29589 )
2022-02-12 00:29:53 +05:30
Rucha Mahabal
10ee2fbeac
Merge branch 'develop' into leave-policy-assgn-fixes
2022-02-11 21:00:49 +05:30
Rucha Mahabal
cbaadcf113
fix(test): reset test setup
2022-02-11 20:59:19 +05:30
Rucha Mahabal
9b0f9c3442
test: earned leave allocations based on DOJ
2022-02-11 20:08:01 +05:30
marination
f62b3207ff
fix: Generate Wh wise FIFO Queue and later aggregate if required
...
- Back to back stock recos cause incorrect qty calculation across warehouses
- Hard to differentiate how much of the qty is reset by the reco
- Maintain Queue and balances warehouse wise and later aggregate for accurate values
2022-02-11 18:14:28 +05:30
Rucha Mahabal
51e6086829
chore: clean-up leave policy assignment tests
2022-02-11 17:40:20 +05:30
Deepesh Garg
ea20c63182
Revert "fix(India): Tax calculation for overseas suppliers"
2022-02-11 17:38:37 +05:30
rohitwaghchaure
ce79434a9b
Merge pull request #29736 from rohitwaghchaure/performance-issue-while-making-wo
...
fix: time out error while making work orders from production plan
2022-02-11 16:12:21 +05:30
Sagar Vora
d93d2a80b1
chore: remove deprecated print format
2022-02-11 15:21:17 +05:30
Saqib Ansari
8128b33d4f
Merge pull request #29732 from alyf-de/encode-filters
...
fix: encode filters for URI
2022-02-11 14:44:46 +05:30
Saqib Ansari
2d8e03e059
Merge pull request #29748 from nextchamp-saqib/fix-gp-report-columns
...
fix: cannot jump to sales invoice in gross profit report
2022-02-11 14:38:40 +05:30
Rucha Mahabal
c7be9ef5d2
fix: consider leaves for past months if assignment is based on joining date too
2022-02-11 13:52:46 +05:30
Saqib Ansari
78dd364b0b
fix: cannot jump to sales invoice in gross profit report
2022-02-11 12:32:45 +05:30
Ankush Menat
77be98295c
fix: update bin modified timestamp when updating qty
...
These timestamps are used for writing integrations hence whenever bin is
updated timestamp should update to reliabily use Bin for integration
logic.
2022-02-11 11:54:58 +05:30
Ankush Menat
1553fa9c90
refactor!: drop deprecated and dead code
2022-02-11 11:23:37 +05:30
marination
86ca41b14a
test: Production Plan Pending Qty impact tests
...
- Two tests to check impact on pending qty: From SO and independent Prod Plan
- Added docstring to each test case for brief summary
- Changed helper function args to fallback to 0 instead of 1 if no arg is passed
- Removed unnecessary `get_doc()`
- Made helper function actions optional depending on args passed
2022-02-10 20:14:28 +05:30
Rohit Waghchaure
eec2f87088
fix: time out error while making work orders from prodcution plan
2022-02-10 12:30:41 +05:30
Ankush Menat
c371b52d27
fix: restrict filetypes to csv for rename tool
2022-02-10 10:26:00 +05:30
