Deepesh Garg
0d8c24f488
Merge branch 'develop' of https://github.com/frappe/erpnext into loan_bank_reco
2022-02-21 22:22:02 +05:30
Sagar Sharma
e4c4dc402e
fix: JobCard TimeLog to_date ( #29872 )
2022-02-21 19:49:19 +05:30
Deepesh Garg
0c6835eab2
Merge pull request #29740 from deepeshgarg007/gross_profit_non_stock_item
...
fix: Multiple fixes in Gross Profit report
2022-02-21 19:28:55 +05:30
Ankush Menat
9661058cc7
fix: only set batchwise valuation flag if new batch
2022-02-21 19:04:10 +05:30
Ankush Menat
af9fa049c7
fix: batchwise valuation can only be used by FIFO/LIFO
2022-02-21 18:02:40 +05:30
Ankush Menat
75fb561698
test: force correct flag in test data
2022-02-21 18:02:40 +05:30
Ankush Menat
f38690f703
fix: check if Moving average item can use batchwise valuation
2022-02-21 18:02:40 +05:30
Ankush Menat
6b0bc35063
test: mixed moving average items
2022-02-21 18:02:40 +05:30
Ankush Menat
609d2fccad
fix: reset stock value if no qty
2022-02-21 18:02:40 +05:30
Ankush Menat
35483242b3
fix: extend round_off_if_near_zero fix to other methods
2022-02-21 18:02:40 +05:30
Ankush Menat
76b395d62e
test: old/new mix batches valuation consumption
2022-02-21 18:02:40 +05:30
Ankush Menat
b1555fd477
chore: batch flag and consumption rate in invariant report
2022-02-21 18:02:40 +05:30
Ankush Menat
b534fee2c7
refactor: use queue difference instead of actual values
2022-02-21 18:02:40 +05:30
Ankush Menat
aba7a7ce4e
fix: handle negative inventory inside a batch
2022-02-21 18:02:40 +05:30
Ankush Menat
d7ca83ef0b
refactor: code duplication for fallback rates
2022-02-21 18:02:40 +05:30
Ankush Menat
c5bd34d238
test: multi-batch stock entry
2022-02-21 18:02:40 +05:30
Ankush Menat
60b8bae85f
test: batch wise valuation for transfer and intermediate
2022-02-21 18:02:40 +05:30
Ankush Menat
5718777a2b
fix: consider batch_no when getting incoming rate
2022-02-21 18:02:40 +05:30
18alantom
683ef8a603
test: more tests for batchwise valuation
...
Co-Authored-By: Ankush Menat <ankush@frappe.io>
2022-02-21 18:02:40 +05:30
Ankush Menat
312db429e4
refactor: use qb for patching flag
2022-02-21 18:02:40 +05:30
Ankush Menat
d130233ffc
test: fix expected test failures
2022-02-21 18:02:40 +05:30
Ankush Menat
102fff24c8
refactor: convert query to QB and make creation optional
2022-02-21 18:02:40 +05:30
Ankush Menat
ab926521bd
fix: correct incoming rate for batched items
2022-02-21 18:02:40 +05:30
Ankush Menat
342d09a671
feat: get_valuation_rate batch wise
...
This function is used to show valuation rate on frontend and also as
fallback in case values aren't available. Add "batch_no" param to get
batch specific valuation rates.
Co-Authored-By: Alan Tom <2.alan.tom@gmail.com>
2022-02-21 18:02:40 +05:30
Ankush Menat
ce0514c8db
feat: batch wise valuation rates
...
start with most used case: negative inventory isn't enabled
- simple addition of qty and value when new batch qty is added
- fetch outgoing rate from stock movement of specific batch
2022-02-21 18:02:40 +05:30
18alantom
f4af75f60b
feat: batchwise valuation flag
...
This is required to avoid breaking behaviour in valuation
of old batches
2022-02-21 18:02:40 +05:30
Saqib Ansari
05682af07a
Merge branch 'develop' into asset-fix-#3
2022-02-21 17:55:32 +05:30
Ankush Menat
00e8565868
fix: round off increments in numeric item variant
2022-02-21 17:42:34 +05:30
Deepesh Garg
a4c6cb9f12
fix: Remove print statements
2022-02-21 17:08:25 +05:30
Deepesh Garg
b7c388976d
Merge branch 'develop' of https://github.com/frappe/erpnext into loan_bank_reco
2022-02-21 16:58:52 +05:30
Deepesh Garg
6bf7bd6a9f
Merge branch 'develop' into gross_profit_non_stock_item
2022-02-21 16:56:49 +05:30
marination
530f9f7029
test: Item Merging with Product Bundles
2022-02-21 16:48:04 +05:30
marination
28cc2dbb72
fix: Block merging items if both have product bundles
2022-02-21 16:14:40 +05:30
Deepesh Garg
40a45a3139
Merge pull request #29907 from deepeshgarg007/tds_payable_total_amount
...
fix: Total Credit amount in TDS Payable monthly report
2022-02-21 15:33:58 +05:30
Ankush Menat
afc81351b7
test: only test erpnext doctypes
...
Co-authored-by: gavin <gavin18d@gmail.com>
2022-02-21 15:32:28 +05:30
Ankush Menat
e3ea431ef3
test: test all form loads
2022-02-21 15:32:28 +05:30
Ankush Menat
3a5dbfab50
fix: make cashflow mapping template child doctype
2022-02-21 15:32:28 +05:30
Saqib Ansari
cecaec2cc6
Merge branch 'develop' into asset-fix-#3
2022-02-21 14:54:56 +05:30
Deepesh Garg
170a657ed8
Merge pull request #29887 from deepeshgarg007/loan_interest_principal
...
fix: Ledger entries on LIA for term loans
2022-02-21 14:24:37 +05:30
Marica
e952cce17d
chore: Show 'Produced Qty' field in Sales Order Item ( #29903 )
2022-02-21 14:22:14 +05:30
Deepesh Garg
a82cf7214e
fix: Total Credit amount in TDS Payable monthly report
2022-02-21 13:58:56 +05:30
Deepesh Garg
e24242ee33
Merge branch 'develop' into loan_interest_principal
2022-02-21 13:39:45 +05:30
Saqib Ansari
780694f6e2
test: number_of_depr_booked = total_number_of_depr
2022-02-21 12:45:52 +05:30
Saqib Ansari
c5808543c8
fix(asset): no. of depreciation booked cannot be equal to total no. of depreciations
2022-02-21 12:41:08 +05:30
Deepesh Garg
e13d774e8e
Merge branch 'develop' into gross_profit_non_stock_item
2022-02-21 12:34:14 +05:30
Deepesh Garg
0b5e618e3a
fix: Update bank reconciliation statement
2022-02-21 11:46:44 +05:30
Deepesh Garg
295cbb0ff2
fix: Update queries in Bank Reconciliation Tool
2022-02-21 11:45:23 +05:30
Deepesh Garg
a0bdcbd0cd
fix: Add patch for account fields
2022-02-21 11:44:00 +05:30
Saqib Ansari
fa38c291bd
fix(pos): removal of coupon code
2022-02-21 11:38:16 +05:30
rohitwaghchaure
6956578339
Merge pull request #29771 from deepeshgarg007/consolidated_financial_statment_error
...
fix: Error in consolidated financial statements
2022-02-20 18:21:54 +05:30
Deepesh Garg
83a60a2a17
Merge pull request #29869 from deepeshgarg007/gstr_1_gstin_filter
...
fix: GSTIN filter for GSTR-1 report
2022-02-19 19:41:49 +05:30
Deepesh Garg
a28ec89507
Update gstr_1.js
2022-02-19 19:35:57 +05:30
Deepesh Garg
1aa12fb3f1
fix: Ledger entries on LIA for term loans
2022-02-19 19:19:32 +05:30
rohitwaghchaure
b9072eb9b8
Merge pull request #29773 from wojosc/patch-26
...
Translation for DocType
2022-02-19 16:37:25 +05:30
Deepesh Garg
5a2b571aa9
fix: Validate party account with company
2022-02-18 20:05:49 +05:30
Marica
d1a283fd79
Merge branch 'develop' into repack-entry-stock-ageing
2022-02-18 18:54:23 +05:30
marination
d5be536740
test: Negative Stock, over consumption & over production with split rows, balance precision
2022-02-18 18:53:05 +05:30
marination
ed4a6c6cc6
fix: Range Qty precision
2022-02-18 18:52:42 +05:30
marination
d3fbbcfed3
fix: Precision of available qty and negative stock in transfer bucket
...
- Maintain only positive values in transfer bucket
- Use it to neutralize/add stock to fifo queue
2022-02-18 16:33:28 +05:30
Deepesh Garg
8b3d9088df
Merge branch 'develop' into consolidated_financial_statment_error
2022-02-17 23:32:50 +05:30
Deepesh Garg
e1f8f034c2
Merge branch 'develop' of https://github.com/frappe/erpnext into patch_fixes
2022-02-17 23:20:29 +05:30
Deepesh Garg
3a966d4dbe
fix: Move patch to post sync
2022-02-17 23:18:07 +05:30
Deepesh Garg
1617e0d0e6
fix: Remove reload doc
2022-02-17 22:52:53 +05:30
Deepesh Garg
87b074ac09
fix: GSTIN filter for GSTR-1 report
2022-02-17 22:01:00 +05:30
Ankush Menat
c36bd7e1a6
fix: avoid creating bins without item-wh
...
Co-Authored-By: Shadrak Gurupnor <30501401+shadrak98@users.noreply.github.com>
Co-Authored-By: Saurabh <saurabh6790@gmail.com>
2022-02-17 19:52:01 +05:30
Deepesh Garg
555b1335f6
feat: Bank Reconciliation for loan documents
2022-02-17 19:15:30 +05:30
Rucha Mahabal
bef46e2b64
chore: remove unused code and fields related to workstation from Timesheet Detail
2022-02-17 17:48:18 +05:30
Rucha Mahabal
47ff968253
test: timesheet not overlapping with continuous timelogs
2022-02-17 17:48:18 +05:30
Rucha Mahabal
3ec9acf8f7
fix: convert overlap raw query to frappe.qb
2022-02-17 17:48:18 +05:30
Rucha Mahabal
e2e998fbd9
fix(Timesheet): convert time logs to datetime while checking for overlap
2022-02-17 17:48:18 +05:30
ChillarAnand
358734dcea
fix: Skip deletion if linked docs exists
2022-02-17 16:31:27 +05:30
Saqib Ansari
9a7f9c3668
Merge pull request #29859 from nextchamp-saqib/fix-pos-coupon-code
...
fix: coupon code is applied even if ignore_pricing_rule is enabled
2022-02-17 16:11:19 +05:30
Saqib Ansari
2743999785
fix: coupon code is applied even if ignore_pricing_rule is enabled
2022-02-17 16:03:43 +05:30
ChillarAnand
b3d4465db6
Merge branch 'develop' into remove-nonprofit
2022-02-17 15:30:11 +05:30
ChillarAnand
fb59247182
fix: Delete party type records in patch
2022-02-17 15:15:44 +05:30
Ankush Menat
db93f26f20
fix: production plan status should consider qty + WO status
2022-02-17 14:48:32 +05:30
rohitwaghchaure
0da39950d8
Merge pull request #29836 from rohitwaghchaure/minor-item-name-in-excel-sheet
...
feat (minor): added item name in the excel sheet
2022-02-17 14:37:51 +05:30
Saqib Ansari
680f8c4dc2
Merge pull request #29848 from nextchamp-saqib/fix-brt-currency
...
fix: currency in bank reconciliation tool
2022-02-17 14:27:07 +05:30
Saqib Ansari
60674e52b8
fix: currency in bank reconciliation tool
2022-02-17 14:19:42 +05:30
ChillarAnand
db1957ffe6
Merge branch 'develop' into remove-nonprofit
2022-02-17 13:00:58 +05:30
ChillarAnand
b5ff9b27bd
refactor: Clean up non-profit setup
2022-02-17 12:37:25 +05:30
Ankush Menat
d9fc3f3d90
test: putaway rule re-application shouldn't do anything
2022-02-17 12:26:51 +05:30
Ankush Menat
b000e93744
fix: avoid updating items table if no change due to putaway
2022-02-17 12:26:51 +05:30
ChillarAnand
72fe559031
refactor: Remove non profit templates
2022-02-17 08:42:32 +05:30
Rohit Waghchaure
02e77029fa
fix: added item name in the excel sheet
2022-02-16 18:15:57 +05:30
marination
06d36c6143
chore: Move patch that updates SO from WO to v13
2022-02-16 17:40:16 +05:30
Wolfram Schmidt
235b0715bf
fix: allow renaming and merging ( #29830 )
2022-02-16 17:20:07 +05:30
Deepesh Garg
d251bec380
Merge pull request #29137 from ruthra-kumar/payment_terms_report
...
feat: Payment Terms Status report
2022-02-16 14:15:24 +05:30
Marica
c3c9a8d445
Merge branch 'develop' into so-mr-wo-back-update
2022-02-16 13:39:58 +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
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
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
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
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
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
Deepesh Garg
2172ab2d37
fix: Update columns in new format
2022-02-11 14:48:39 +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
Deepesh Garg
da73685f71
fix: Multiple fixes in Gross Profit report
2022-02-10 13:07:51 +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
Devin Slauenwhite
49bee568a1
fix: get cart items for logged in user.
2022-02-09 12:03:05 -05:00
barredterra
5811d9e318
fix: encode filters for URI
2022-02-09 17:53:33 +01:00
Devin Slauenwhite
aeee334843
Merge remote-tracking branch 'upstream/develop' into feat-user-unique-cart
2022-02-09 11:08:24 -05:00
Devin Slauenwhite
34ad5b1abf
fix: get cart for logged in user.
2022-02-09 10:53:24 -05:00
Devin Slauenwhite
d636c3fb04
test: many users linked to customer shopping cart
2022-02-09 10:52:38 -05:00
Sagar Vora
2bc157a95c
fix: cleaner implementation for get_invoice_type
2022-02-09 17:48:24 +05:30
Smit Vora
6e679a5ad2
fix(India): Report GSTR-1 minor fixes
2022-02-09 17:48:24 +05:30
Sagar Vora
b68a99675d
fix: allow regional_overrides hook to be set in subsequent apps
2022-02-09 16:56:53 +05:30
Saqib Ansari
b35b637d01
Merge pull request #29701 from nextchamp-saqib/consolidation-round-off-err
...
fix(pos): incorrect grand_total in case of inclusive taxes on item
2022-02-09 16:42:30 +05:30
Saqib Ansari
0ebd32dc63
fix: cancelling of consolidated sales invoice that doesn't have closing entry
2022-02-09 16:08:28 +05:30
Saqib Ansari
4bb557dbd8
fix: flaky point of sale test
2022-02-09 16:07:42 +05:30
Saqib Ansari
75256863c6
fix(test): do not enable negative stock
2022-02-09 16:07:33 +05:30
Ankush Menat
2abc1c244e
Merge pull request #29715 from aaronmenezes/fix_reserved_for_production_calc
...
fix: Reserved for Production calculation considered closed work orders
2022-02-09 15:59:52 +05:30
Ankush Menat
89959976bd
fix: patch existing bins
2022-02-09 12:21:05 +05:30
Rucha Mahabal
89fa0bb73f
fix: consider based on DOJ config while calculating leaves for passed months
2022-02-09 11:28:14 +05:30
Ankush Menat
a8bf3a3f0d
refactor: move reserve quantity computation to work order
2022-02-09 11:26:03 +05:30
Ankush Menat
d2cc5f2482
test: remove dependency on other tests
2022-02-09 11:19:01 +05:30
Saqib Ansari
8ff7587aaa
Merge branch 'develop' into fix-ignore-pricing-rule
2022-02-09 10:31:22 +05:30
Saqib Ansari
ab36b27a94
fix: ignore pricing rule in all transactions
2022-02-09 10:10:17 +05:30
Deepesh Garg
6fd5281b46
Merge branch 'develop' into reverse_entry_dead_lock
2022-02-08 22:37:18 +05:30
aaronmenezes
6a8b7eeffe
fix: Reserved for Production calculation considered closed work orders
2022-02-08 19:25:49 +05:30
Saqib Ansari
07dc228e32
Merge branch 'develop' into consolidation-round-off-err
2022-02-08 18:06:41 +05:30
marination
eaccef6116
fix: Initialise pending qty as planned qty for independent item rows in Prod Plan
...
- Rows that are not fetched from MR or SO, had pending qty 0 throughout
- Initialise pending qty on save only.
- After submit this field will be updated by work order/stock entry
- Bring functions in `validate()` closer to the top
2022-02-08 17:55:38 +05:30
Saqib Ansari
6fa406dd04
fix(test): pass price_list_rate only if pricing rule has to be removed
2022-02-08 17:51:53 +05:30
Ankush Menat
befcca4183
Merge branch 'develop' into lifo_valuation
2022-02-08 17:38:06 +05:30
Saqib Ansari
c2b83a0283
fix(test): case if write off is calculated as negative amount
2022-02-08 17:36:39 +05:30
Rucha Mahabal
7326d57966
fix: Earned Leave allocation based on joining date not working
2022-02-08 17:14:11 +05:30
Saqib Ansari
b51a5d9225
Merge pull request #29709 from nextchamp-saqib/fix-bank-reco-currency
...
fix: currency in bank reconciliation chart
2022-02-08 16:32:35 +05:30
Saqib Ansari
afc5c26d1c
fix(test): ignore stock validation
2022-02-08 16:04:08 +05:30
Saqib Ansari
3f962739fb
Merge branch 'develop' of https://github.com/frappe/erpnext into consolidation-round-off-err
2022-02-08 16:02:18 +05:30
Saqib Ansari
0fc5d2278d
fix: currency in bank reconciliation chart
2022-02-08 15:50:41 +05:30
Rucha Mahabal
bdf38a33cc
Merge pull request #29650 from ruchamahabal/fix-earned-leaves-allocation
2022-02-08 15:47:43 +05:30
Saqib Ansari
4f4395545e
Merge branch 'develop' into fix-ignore-pricing-rule
2022-02-08 15:29:28 +05:30
Saqib Ansari
27ced4f082
Merge pull request #29560 from ruthra-kumar/bug_invoice_creation_throws_typeerror
...
fix: typeerror on invoice creation from SO/PO
2022-02-08 15:27:05 +05:30
Rucha Mahabal
b71283aa7d
Merge branch 'develop' into fix-earned-leaves-allocation
2022-02-08 14:39:55 +05:30
Rucha Mahabal
bd1555bd23
fix: handle carry forwarded leaves while checking for duplicate allocation
2022-02-08 14:36:31 +05:30
Ankush Menat
bb105a33b2
test: validate on save instead of on creation
...
(cherry picked from commit 0efd5577bd9bdc0bb900d4d23d85aa86fd09929a)
2022-02-08 14:01:41 +05:30
Bhavesh Maheshwari
3969840ee8
fix: ignore rate validation for work order
...
(cherry picked from commit f29aed7f7130b805810075db1e5e1003e997bef8)
2022-02-08 14:01:41 +05:30
marination
7116d7ae0e
fix: Set Pending Qty in Prod Plan after updating Work Order
2022-02-08 12:40:33 +05:30
