Deepesh Garg
1b186682ea
Merge branch 'develop' of https://github.com/frappe/erpnext into grant_commission_check
2022-02-28 12:42:21 +05:30
Deepesh Garg
4e9a9f35a6
test: add correct test case
2022-02-28 12:41:59 +05:30
Deepesh Garg
83ad8f9caa
Merge pull request #29928 from deepeshgarg007/psoa_account_filter
...
fix: Account filter in PSOA
2022-02-28 11:41:50 +05:30
Rucha Mahabal
a891c426b5
Merge branch 'develop' into remove-nonprofit
2022-02-28 09:50:45 +05:30
Deepesh Garg
5464ba6430
Merge branch 'develop' into psoa_account_filter
2022-02-25 15:55:06 +05:30
Saqib Ansari
69c34cd7ae
fix(pos): mode of payment disappears after save
2022-02-25 14:36:29 +05:30
Rucha Mahabal
d647de3782
Merge branch 'develop' into remove-nonprofit
2022-02-24 17:03:52 +05:30
Deepesh Garg
cbb5ffb6fe
fix: Multi-currency bank reconciliation fixes
2022-02-24 15:58:12 +05:30
Deepesh Garg
0373914704
fix: Commission not applied while making Sales Order from Quotation
2022-02-24 14:42:56 +05:30
Deepesh Garg
b1a46c80d5
fix: Total taxes and charges in payment entry for multicurrency payments
2022-02-24 13:11:17 +05:30
Ankush Menat
b44cead317
test: fix flaky stateful tests ( #29749 )
...
Co-Authored-By: Marica <maricadsouza221197@gmail.com>
2022-02-23 16:17:41 +05:30
Ankush Menat
9c7df2eec5
fix: ignore duplicates explicitly
2022-02-23 14:27:45 +05:30
Deepesh Garg
1bdcb73d5d
Merge pull request #29879 from deepeshgarg007/misc_fixes
...
fix: Validate party account with company
2022-02-23 11:22:08 +05:30
Deepesh Garg
bd80e04aa7
Merge pull request #29865 from deepeshgarg007/loan_bank_reco
...
feat: Bank Reconciliation for loan documents
2022-02-22 20:43:00 +05:30
Ankush Menat
5d403449bd
test: move report tests to subttest ( #29945 )
...
Basically failfast=False but for sub-tests
2022-02-22 19:24:49 +05:30
Deepesh Garg
70b960e650
fix: Account filter in PSOA
2022-02-22 09:16:08 +05:30
Deepesh Garg
0d8c24f488
Merge branch 'develop' of https://github.com/frappe/erpnext into loan_bank_reco
2022-02-21 22:22:02 +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
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
3a5dbfab50
fix: make cashflow mapping template child doctype
2022-02-21 15:32:28 +05:30
Deepesh Garg
a82cf7214e
fix: Total Credit amount in TDS Payable monthly report
2022-02-21 13:58:56 +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
5a2b571aa9
fix: Validate party account with company
2022-02-18 20:05:49 +05:30
Deepesh Garg
8b3d9088df
Merge branch 'develop' into consolidated_financial_statment_error
2022-02-17 23:32:50 +05:30
Deepesh Garg
555b1335f6
feat: Bank Reconciliation for loan documents
2022-02-17 19:15:30 +05:30
ChillarAnand
b3d4465db6
Merge branch 'develop' into remove-nonprofit
2022-02-17 15:30:11 +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
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
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
Deepesh Garg
973f6b1bbd
fix: Gross profit for credit notes
2022-02-14 22:14:17 +05:30
Deepesh Garg
04cbde2e52
fix: Filter out bank payment entries
2022-02-14 20:38:04 +05:30
Deepesh Garg
2ff6b3560e
fix: Fixes in TDS payable monthly report
2022-02-14 19:51:58 +05:30
Saqib Ansari
18d0a59a9d
fix: disable rounded total in opening invoice creation tool
2022-02-14 18:38:02 +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
Ankush Menat
eb8b424722
feat: item-wise negative stock setting ( #29761 )
2022-02-12 13:08:28 +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
78dd364b0b
fix: cannot jump to sales invoice in gross profit report
2022-02-11 12:32:45 +05:30
Deepesh Garg
da73685f71
fix: Multiple fixes in Gross Profit report
2022-02-10 13:07:51 +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
75256863c6
fix(test): do not enable negative stock
2022-02-09 16:07:33 +05:30
Saqib Ansari
8ff7587aaa
Merge branch 'develop' into fix-ignore-pricing-rule
2022-02-09 10:31:22 +05:30
Deepesh Garg
6fd5281b46
Merge branch 'develop' into reverse_entry_dead_lock
2022-02-08 22:37:18 +05:30
Saqib Ansari
07dc228e32
Merge branch 'develop' into consolidation-round-off-err
2022-02-08 18:06:41 +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
Saqib Ansari
c2b83a0283
fix(test): case if write off is calculated as negative amount
2022-02-08 17:36:39 +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
Saqib Ansari
4f4395545e
Merge branch 'develop' into fix-ignore-pricing-rule
2022-02-08 15:29:28 +05:30
Saqib Ansari
8eff2969b0
Merge pull request #29699 from nextchamp-saqib/improve-debit-to-err-msg
...
chore: show credit/debit-to account in error message
2022-02-08 11:42:57 +05:30
Saqib Ansari
4c3d751421
Merge branch 'develop' into fix-ignore-pricing-rule
2022-02-08 11:42:33 +05:30
Saqib Ansari
0452d7de20
fix(pos): incorrect grand_total in case of inclusive taxes on item
2022-02-08 11:26:23 +05:30
Saqib Ansari
e93bb8a336
chore: show credit/debit-to account in error message
2022-02-08 10:49:37 +05:30
Mohammed Yusuf Shaikh
a3e69cf75d
feat: Bulk Transaction Processing ( #28580 )
...
* feat: Bulk Transaction Processing
* fix: add flags to ignore validations and exception handling correction
* fix: remove duplicate code, added logger functionality and improved notifications
* fix: linting and sider issues
* test: added tests
* fix: linter issues
* fix: failing test case
* fix: sider issues and test cases
* refactor: mapping function calls to create order/invoice
* fix: added more test cases to increase coverage
* fix: test cases
* fix: sider issue
* fix: rename doctype, improve formatting and minor refactor
* fix: update doctype name in hooks and sider issues
* fix: entry log test case
* fix: typos, translations and company name in tests
* fix: linter issues and translations
* fix: linter issue
* fix: split into separate function for marking failed transaction
* fix: typos, retry failed transaction logic and make log read only
* fix: hide retry button when no failed transactions and remove test cases not rrelevant
* fix: sider issues and indentation to tabs
Co-authored-by: Ankush Menat <ankush@frappe.io>
2022-02-08 01:00:37 +05:30
Deepesh Garg
2280ae5554
Merge pull request #29549 from frappe/mergify/bp/develop/pr-29290
...
fix: billed amount in delivery note items (backport #29290 )
2022-02-07 23:49:19 +05:30
Deepesh Garg
cec971b5db
Merge pull request #29349 from alyf-de/disable-item-tax-category
...
feat: option to disable Item Tax Template and Tax Category
2022-02-07 11:01:03 +05:30
Umair Sayed
104a55aff1
feat: Tab views in Stocks and Accounts Settings ( #29638 )
...
* tab views in Stocks and Accounts Settings. Clean-up in Selling and Buying Settings.
* chore: undo changes to creation timestamp
happened because of a bug in fw
Co-authored-by: Umair Sayed <umairsayed@Umairs-MacBook-Air-2.local>
2022-02-07 10:42:55 +05:30
Chillar Anand
768e6b2e0e
Merge branch 'develop' into remove-nonprofit
2022-02-07 10:29:25 +05:30
Deepesh Garg
ff57450e77
fix: Replace ORM with query builder
2022-02-06 22:56:12 +05:30
Deepesh Garg
81b967851a
Merge pull request #29601 from deepeshgarg007/provisonal_loss_bs
...
fix: Incorrect provisional profit and loss in balance sheet
2022-02-06 19:33:12 +05:30
Deepesh Garg
3e6fade08d
Merge pull request #29641 from deepeshgarg007/jv_cancel_ignore
...
fix: Ignore linked invoices on Journal Entry cancel
2022-02-06 18:57:13 +05:30
Ankush Menat
8858c703a8
fix: ignore cancelled svd while updating GLE for PR
...
This happens because LCV cancels and reposts entries so unless filtered
by non-cancelled entries you can randomly get old values.
2022-02-05 20:58:56 +05:30
Raffael Meyer
b5242df15b
Merge branch 'develop' into disable-item-tax-category
2022-02-04 18:10:39 +01:00
Deepesh Garg
6f7ae62907
fix: Ignore linked invoices on Journal Entry cancel
2022-02-04 20:13:20 +05:30
Ankush Menat
ba847ef218
Merge branch 'develop' into provisonal_loss_bs
2022-02-03 17:18:00 +05:30
ChillarAnand
325dc92d37
Merge branch 'develop' into remove-nonprofit
2022-02-03 16:38:01 +05:30
Deepesh Garg
ed2c6b6637
fix: Incorrect provisional profit and loss in balance sheet
2022-02-02 22:36:45 +05:30
Saqib Ansari
5a7236efcd
Merge branch 'develop' into fix-ignore-pricing-rule
2022-02-02 21:47:51 +05:30
Deepesh Garg
ffec865e00
fix: Make a deep copy of GLE
2022-02-02 17:14:42 +05:30
Deepesh Garg
f1c3bcee1f
fix: Deadlock on making reverse GL Entries
2022-02-02 17:09:34 +05:30
marination
4b62d2d7fe
fix: (Linter) Write queries using QB/ORM and other minor lines for semgrep to skip
2022-02-02 12:58:31 +05:30
Marica
780e29b42e
Merge branch 'develop' into e-commerce-refactor-develop
2022-02-02 10:45:14 +05:30
Nabin Hait
008b331f49
Merge branch 'cc-allocation' into develop
2022-02-01 22:27:23 +05:30
Nabin Hait
81d1ad6059
fix: Allocation percentage fieldtype changed to percent
2022-02-01 22:26:39 +05:30
Saqib Ansari
4055cc76a7
Merge pull request #29556 from nextchamp-saqib/nemesis189-pos-service-items
...
feat: Allowing non stock items in POS
2022-02-01 16:36:10 +05:30
Deepesh Garg
528c71382f
feat: Provisional accounting for expenses ( #29451 )
...
* feat: Provisonal accounting for expenses
* fix: Method for provisional accounting entry
* chore: Add test case
* fix: Remove test case
* fix: Use company doctype
* fix: Add provisional expense account field in Purchase Receipt Item
* fix: Test case
* fix: Move provisional expense account to parent
* fix: Patch
2022-02-01 14:42:55 +05:30
Saqib Ansari
4557b6a150
Merge branch 'develop' into pos-service-items
2022-02-01 12:25:25 +05:30
Sagar Sharma
1fd8539873
fix: check so_detail before dn_detail
...
(cherry picked from commit 5de6b8dc4df407fd953efe69640e22bd4ea90b6e)
2022-02-01 05:39:38 +00:00
Marica
19e5dfbb7c
Merge branch 'develop' into e-commerce-refactor-develop
2022-02-01 00:56:11 +05:30
Nabin Hait
5b0ec6437b
fix: sider issues
2022-01-31 18:41:42 +05:30
Nabin Hait
6099af5d00
fix: Fixed test case and sider issues
2022-01-31 17:43:37 +05:30
Ankush Menat
6cd7c47409
Merge branch 'develop' into e-commerce-refactor-develop
2022-01-31 17:14:36 +05:30
Nabin Hait
3dadfc9048
patch: Removed files and code related to old distributed cost center feature
2022-01-31 15:58:40 +05:30
Nabin Hait
c09d5a613e
fix: Delete old fields from cost center related to distributed cost center
2022-01-31 13:26:09 +05:30
Nabin Hait
174104c0d4
feat: Workspace link for Cost Center Allocation
2022-01-31 13:24:18 +05:30
Nabin Hait
004c1ed094
feat: Split Gl Entry based on cost center allocation
2022-01-31 13:24:18 +05:30
Nabin Hait
ac2e19103f
Cost Center Allocation doctype, validations and test cases
2022-01-31 13:24:18 +05:30
Subin Tom
05bbb69d0e
fix: Validation for invalid serial nos at POS invoice level ( #29447 )
2022-01-31 13:08:19 +05:30
Saqib Ansari
1170bee951
Merge pull request #29480 from nextchamp-saqib/revert-drop-einvoicing
...
revert: "refactor!: drop e-invoicing integration from erpnext"
2022-01-31 11:35:48 +05:30
smehata
b818b93568
Update sales_invoice.js ( #29491 )
...
undefined issue
2022-01-30 17:27:20 +05:30
Deepesh Garg
2bf405d44c
fix:Add shipping charges to taxes only if applicable
...
(cherry picked from commit e8bc4f12a734ff286a008e6b31dffa9c6c946365)
2022-01-29 07:27:21 +00:00
Saqib Ansari
273fbe792c
Merge branch 'develop' into fix-ignore-pricing-rule
2022-01-29 12:44:19 +05:30
Saqib Ansari
452a809ef4
Merge pull request #28877 from nextchamp-saqib/multiple-pricing-rule-fix
...
fix: qty filter not working if apply_multiple_pricing_rules is enabled
2022-01-29 12:43:41 +05:30
Saqib Ansari
8a66a7ad46
Merge branch 'develop' into fix-ignore-pricing-rule
2022-01-29 12:42:00 +05:30
Saqib Ansari
2c100a5313
Merge branch 'develop' into revert-drop-einvoicing
2022-01-28 14:34:29 +05:30
Saqib
0b626816d0
feat(e-invoicing): dispatch address ( #28084 )
2022-01-27 20:19:37 +05:30
Saqib Ansari
c5782b0e71
revert: "refactor!: drop e-invoicing integration from erpnext ( #26940 )"
...
This reverts commit c335962827
2022-01-27 20:09:56 +05:30
Ankush Menat
b05287dea0
fix: drop six code ( #29479 )
2022-01-27 20:08:05 +05:30
ChillarAnand
16ca81d6a6
refactor: Remove non-profit code in ERPNext
2022-01-27 10:08:41 +05:30
Deepesh Garg
b72cdb4bca
fix: Previous document currency getting overriden
...
(cherry picked from commit ef782fd35b0717e3f7c50dbb6c5dde7c96ae9ef6)
2022-01-24 15:19:54 +00:00
Deepesh Garg
108d1045e6
Merge pull request #29360 from ruthra-kumar/test_case_deferred_report
...
test: unit test for deferred item with zero months
2022-01-24 12:41:37 +05:30
Deepesh Garg
34be90b396
Merge pull request #29407 from ruthra-kumar/dimension_in_opening_invoice
...
fix: opening invoice creation tool can fetch multiple accounting dimension
2022-01-24 12:36:20 +05:30
ruthra
f122a47d0d
refactor: fix failing test cases
2022-01-24 10:08:25 +05:30
ruthra
80ea163953
fix: linter issue
2022-01-23 21:49:02 +05:30
ruthra
88463dc494
test: validating custom accouting dimension in opening invoice tool
...
- create new dimension 'department'
- assign and validate department in opening invoices
2022-01-21 19:33:06 +05:30
ruthra
e2267cdba8
fix: opening invoice creation tool not taking in accouting dimension
2022-01-21 19:21:26 +05:30
Saqib Ansari
c7e75f9551
Merge pull request #29385 from nextchamp-saqib/asset-fix-depr-fix
...
fix: first depreciation amount in asset
2022-01-21 14:25:43 +05:30
Saqib Ansari
ae580d116c
fix: failing test cases
2022-01-21 12:19:53 +05:30
Noah Jacob
20216fa9f1
fix: updated packed_items getting fetched on Sales Return / Credit Note ( #28607 )
...
* fix: updated packed_items getting fetched on sales return
* fix: updated test cases for product bundle returns
* fix: moved calculate_mapped_packed_items_return to stock.utils
* fix: updated packed_items getting fetched on Return/Credit Note
* refactor: change var name to avoid `self`
* fix: check item code before assigning parent item
Co-authored-by: Ankush Menat <ankush@frappe.io>
2022-01-21 11:50:13 +05:30
Saqib Ansari
b8c41e3030
test: item price on remove pricing rule
2022-01-20 13:06:56 +05:30
Saqib Ansari
f6dda738dc
fix: ignore pricing rule in all transactions
2022-01-20 12:22:56 +05:30
Saqib Ansari
3da2cac772
chore: undo unnecessary changes
2022-01-20 12:09:04 +05:30
Deepesh Garg
e34da90653
fix: Cleanup empty rows on bank statement import
...
(cherry picked from commit 25398d017bca53f14c7ebb6c9f937ef7c1390093)
2022-01-20 05:55:43 +00:00
ruthra
1e0450ed17
test: unit test for deferred items with zero months
2022-01-19 15:51:40 +05:30
ruthra
ed0f9cc063
refactor: a more generalized way to clear old entries for test cases
2022-01-19 15:50:04 +05:30
barredterra
663c594ead
feat: option to disable tax category
2022-01-18 21:16:29 +01:00
barredterra
f60e040d69
feat: option to disable Item Tax Template
2022-01-18 21:15:27 +01:00
Saqib Ansari
0efdbae783
fix: minor onboarding fixes
2022-01-18 18:38:59 +05:30
Subin Tom
ac9a9fb229
fix: removing get_value call by returning is_stock_item in get_stock_availability method
2022-01-17 19:38:05 +05:30
Deepesh Garg
6bea91e9fe
Merge pull request #29182 from ruthra-kumar/project_in_purchase_invoice
...
fix: get project from PO into payment entry
2022-01-17 15:04:03 +05:30
Deepesh Garg
09172002e7
fix: Linting issues
2022-01-17 15:01:17 +05:30
Ankush Menat
3db8d908dc
Merge pull request #29278 from shariquerik/update-workspace-json
...
fix: Updating public workspace json based on new design
2022-01-17 13:25:16 +05:30
Deepesh Garg
1e34300f69
Merge branch 'develop' into project_in_purchase_invoice
2022-01-15 21:00:14 +05:30
Deepesh Garg
14e0d00a61
Merge pull request #29115 from deepeshgarg007/deferred_revenue_multi_currency_jv
...
fix: Deferred revenue booking for multi currency invoices via JV
2022-01-15 18:55:41 +05:30
Deepesh Garg
fd922f1617
fix: Remove unwanted test
2022-01-15 18:27:40 +05:30
Deepesh Garg
b9b4c9aff7
Merge pull request #29270 from nextchamp-saqib/change-fieldtype
...
fix: threshold fields shows incorrect currency
2022-01-14 14:50:45 +05:30
Deepesh Garg
08f26de3df
fix: Remove comment
2022-01-13 23:05:27 +05:30
Deepesh Garg
24bb1e8987
fix: Test case
2022-01-13 19:44:26 +05:30
Shariq Ansari
bc187c121a
fix: updated standard workspace json files
2022-01-13 19:24:11 +05:30
Saqib Ansari
0e1b8322c1
fix: threshold fields shows incorrect currency
2022-01-13 12:06:03 +05:30
Marica
b5abf68b0d
Merge branch 'develop' into e-commerce-refactor-develop
2022-01-12 02:52:03 +05:30
Deepesh Garg
d6ee678ec9
Merge pull request #29193 from ruthra-kumar/bug_deferred_report
...
fix: deferred report division by zero exception
2022-01-11 17:19:08 +05:30
Saqib Ansari
c45042c00e
feat: early payment discount on sales & purchase orders ( #29101 )
2022-01-11 15:03:07 +05:30
Saqib Ansari
75c8b2556e
fix(pos): cannot ignore pricing rule for one particular invoice ( #29222 )
2022-01-11 13:25:42 +05:30
Saqib Ansari
c62083653b
fix(gl-report): group by cost center only if include_dimensions is checked ( #28883 )
2022-01-11 12:45:40 +05:30
Deepesh Garg
93d784dde3
Merge branch 'develop' of https://github.com/frappe/erpnext into currency-exchange-settings
2022-01-10 21:28:53 +05:30
Deepesh Garg
ca5ea5f55f
fix: test cases
2022-01-10 21:28:29 +05:30
