Marica
c3c9a8d445
Merge branch 'develop' into so-mr-wo-back-update
2022-02-16 13:39:58 +05:30
Marica
f044b1ef27
Merge pull request #29639 from marination/item-variants-perf
...
perf: Weed out disabled variants via sql query instead of pythonic looping separately
2022-02-16 13:39:08 +05:30
Marica
201a38bfbf
Merge branch 'develop' into item-variants-perf
2022-02-16 13:03:32 +05:30
Kenneth Sequeira
a26183e205
fix: add supported currencies ( #29805 )
2022-02-16 13:02:36 +05:30
Marica
0ba72b133f
Merge branch 'develop' into repack-entry-stock-ageing
2022-02-16 12:48:51 +05:30
Marica
3fcf0ec81d
Merge branch 'develop' into so-mr-wo-back-update
2022-02-16 12:44:56 +05:30
marination
29c576e144
chore: Remove commented out code
2022-02-16 12:41:39 +05:30
Sagar Vora
08a391fa88
test: set correct DocType ( #29819 )
2022-02-16 10:56:57 +05:30
Deepesh Garg
2f5bfcc055
Merge branch 'develop' into payment_terms_report
2022-02-16 10:06:12 +05:30
marination
f6233e77c6
chore: Add transfer bucket working to .md file
2022-02-15 20:30:16 +05:30
marination
ea3b7de867
test: Stock Ageing FIFO buckets for Repack entry with same item
2022-02-15 18:41:42 +05:30
marination
799671c748
fix: Transfer Bucket logic for Repack Entry with split batch rows
2022-02-15 18:41:08 +05:30
Marica
e6fa33012f
Merge branch 'develop' into so-mr-wo-back-update
2022-02-15 17:51:54 +05:30
ruthra kumar
48f37c7659
test: added test for alternate currency
...
- Sales Order and Invoice will be submitted in USD with exchange rate
of 70 with the default company currency
- Report will display in defauly company currency
2022-02-15 17:21:08 +05:30
ruthra kumar
49fdc6c52e
test: refactor and fix failing test case
2022-02-15 17:20:29 +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
4bc286d284
Merge pull request #29593 from deepeshgarg007/reverse_entry_dead_lock
...
fix: Deadlock on making reverse GL Entries
2022-02-15 12:23:16 +05:30
ruthra kumar
a4b8d67323
refactor: create invoices list without if else
2022-02-15 12:20:41 +05:30
ruthra kumar
85ed0fb8d6
fix: default to company currency in report output
2022-02-15 12:20:06 +05:30
Deepesh Garg
fec40aac7a
fix: Linting issues
2022-02-15 12:15:35 +05:30
Deepesh Garg
42cdd6d237
fix: Remove commented out code
2022-02-15 12:05:51 +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
Ankush Menat
13a60fb258
ci: ignore bugs identified in QA process for stalebot
...
[skip ci]
2022-02-15 10:43:58 +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
Deepesh Garg
973f6b1bbd
fix: Gross profit for credit notes
2022-02-14 22:14:17 +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
60b55f0d5c
Merge pull request #29778 from nextchamp-saqib/fix-pricing-rule-filtering
...
fix: incorrect pricing rule filtering on selecting first item
2022-02-14 18:40:59 +05:30
Saqib Ansari
18d0a59a9d
fix: disable rounded total in opening invoice creation tool
2022-02-14 18:38:02 +05:30
ruthra kumar
bc244d0740
refactor: currency field and code cleanup
2022-02-14 17:48:16 +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
615dd9decd
fix: Patch fixes
2022-02-13 19:24:10 +05:30
Wolfram Schmidt
dbd29da189
Translation for DocType
...
https://testsystem.frappe.cloud/app/milestone
2022-02-13 13:11:31 +01:00
Deepesh Garg
3557bbc539
Merge pull request #29770 from frappe/mergify/bp/develop/pr-29716
...
fix: Loan repayment via Salary Slip (backport #29716 )
2022-02-12 21:55:23 +05:30
Deepesh Garg
ae613008be
fix: Error in consolidated financial statements
2022-02-12 21:54:22 +05:30
Deepesh Garg
07bcbc6c7e
fix: Remove unused param
2022-02-12 19:05:03 +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
