Commit Graph

34419 Commits

Author SHA1 Message Date
anandbaburajan
cf7b43f7f0 fix: handle_post_depr_entries_fail, show error alert and send email 2023-01-16 23:10:02 +05:30
Rohit Waghchaure
1bcff80074 refactor: picked qty in sales order item 2023-01-16 22:50:16 +05:30
Devin Slauenwhite
179a31ed5e
feat: disable currency exchange api. (#33593) 2023-01-16 21:00:10 +05:30
anandbaburajan
61cd0f98fd fix: asset repair link and improve notes 2023-01-16 18:35:40 +05:30
Vishal Dhayagude
352dcddd6d
Merge branch 'develop' into fg_based_operating_cost 2023-01-16 17:02:31 +05:30
Sagar Sharma
1769b45d4b
Merge branch 'develop' into refactor/qb/pick-list 2023-01-16 16:04:20 +05:30
s-aga-r
0ed6552655 refactor: rewrite pick_list.py queries in QB 2023-01-16 16:01:40 +05:30
Deepesh Garg
adaeba1554
fix(minor): Label updates in Statement of Accounts (#33639)
fix(minor): Label updates in Satement of Accounts
2023-01-16 14:03:54 +05:30
Deepesh Garg
312625fdc5
fix: Patch to update reference_due_date in Journal Entry (#33616) 2023-01-16 13:43:54 +05:30
ruthra kumar
9627b46ee7
Merge pull request #33661 from ruthra-kumar/performance_tuning_payment_reconciliation
perf: improve reconciliation performance for JE with 100s of accounts
2023-01-16 09:41:17 +05:30
ruthra kumar
56aa1866da
Merge pull request #33663 from ruthra-kumar/attribute_error_on_repost_ple_tool
fix: attribute error while submitting Repost PLE
2023-01-16 09:36:22 +05:30
Raffael Meyer
dceef0397a
fix: allow to create sales order from expired quotation (#33582) 2023-01-16 08:53:37 +05:30
ruthra kumar
be382054e5
revert: Reverting changes done on 33495 (#33662)
'ordered_qty' will not be fetched from `tabBin`
2023-01-16 08:50:39 +05:30
ruthra kumar
333907b7a5
Revert "fix: Updating SO throws ordered_qty not allowed to change after submission" (#33646) 2023-01-16 08:49:35 +05:30
Poruri Sai Rahul
8119442c94
FIX: Remove usage of "six.string_types" (#33603)
FIX: Remove usage of six.string_types

six is no longer a dependency
2023-01-16 08:47:28 +05:30
s-aga-r
b3759890d7 chore: Sales Order link in Pick List 2023-01-15 21:09:16 +05:30
ruthra kumar
2c50f43cdd fix: attribute error while submitting Repost PLE 2023-01-15 20:51:54 +05:30
ruthra kumar
828eaf0930 fix: minor filter issue while reconciliation tool from bench console 2023-01-15 18:09:51 +05:30
ruthra kumar
11cf694d9a perf: improve reconciliation speed on JE's with 1000's of rows
1. No need to keep old PLE's on reconciliation.
2. Added Validation to catch debit-credit mismatch on JE's
3. Only update outstanding amount for newly reconciled invoices
2023-01-15 17:51:46 +05:30
Raffael Meyer
67cf7e1728
refactor: use DocStatus (#33594) 2023-01-15 17:34:16 +05:30
Deepesh Garg
906ad10d16
fix: Return against internal purchase invoice (#33635) 2023-01-15 17:32:57 +05:30
Sagar Sharma
bfbc9ea8f7
Merge branch 'develop' into item-attr-abbr-lowercase 2023-01-15 12:55:01 +05:30
s-aga-r
f70d757b82 fix: zero rm-cost in SCR 2023-01-14 22:24:18 +05:30
Vishal Dhayagude
736afdf85a
Merge branch 'develop' into fg_based_operating_cost 2023-01-13 10:03:50 +05:30
Sagar Sharma
c2b3843d80
Merge branch 'develop' into item-attr-abbr-lowercase 2023-01-13 00:49:21 +05:30
Ritwik Puri
e22d56484d
chore: reuse doc object in test_pick_list_grouping_before_print (#33636) 2023-01-13 00:47:26 +05:30
Vishal Dhayagude
d63258ee9b
Merge branch 'develop' into fg_based_operating_cost 2023-01-12 21:50:09 +05:30
unknown
2ca4d3fb71 fix: linting 2023-01-12 20:53:12 +05:30
Anand Baburajan
29088e1777
Merge branch 'develop' into fixed_asset_report_asset_value 2023-01-12 20:30:39 +05:30
Deepesh Garg
afb33f2049
Merge pull request #33271 from sonali8848/filters-on-bank-reconciliation
feat: Date filters on bank reconciliation tool
2023-01-12 18:25:05 +05:30
Deepesh Garg
232726288a chore: fix fieldnames and order 2023-01-12 17:44:07 +05:30
Ritwik Puri
cfb0bb1eaa
fix: only group similar items in print format if group_same_items is checked in pick list (#33627)
* fix: only group similar items if group same items is checked in pick list

* test: non grouping of locations if group_same_items is false

Co-authored-by: Sagar Sharma <sagarsharma.s312@gmail.com>
2023-01-12 17:25:50 +05:30
ruthra kumar
e0db2670f9
Merge pull request #33622 from ruthra-kumar/fix_change_after_submission_on_error
fix: Updating SO throws ordered_qty not allowed to change after submission
2023-01-12 16:59:08 +05:30
s-aga-r
b26e96cdf4 chore: linter 2023-01-12 13:41:53 +05:30
ruthra kumar
391f42db04 fix: Updating SO throws ordered_qty not allowed to change after submission 2023-01-12 13:18:03 +05:30
s-aga-r
f028bd6e69 fix: validate accepted and rejected qty in SCR Item 2023-01-12 12:23:40 +05:30
s-aga-r
a0e2a93f3f chore: update error msgs for Subcontracted PO 2023-01-12 12:09:28 +05:30
s-aga-r
6878f40d1d chore: add row-index in error msgs 2023-01-12 12:02:00 +05:30
s-aga-r
434aa594d5 fix: ZeroDivisionError: float division by zero in SCR 2023-01-12 11:49:41 +05:30
unknown
974e12c837 fix: rewrite logic for duplicate check in Item Attribute
Previously, Item Attribute values were not checked for case-insensitive duplicates, and Item tttribute abbreviations were forced to be uppercase. This commit fixes both problems.
2023-01-12 07:44:57 +05:30
Vishal Dhayagude
467a2b5cb4
Merge branch 'develop' into fg_based_operating_cost 2023-01-11 22:30:36 +05:30
Vishal
694fc3e20c fix: hide with_operation on selection on fg_based and vice versa 2023-01-11 18:52:30 +05:30
Sagar Sharma
887ae1c434
Merge branch 'develop' into fix-diff-value 2023-01-11 14:01:51 +05:30
Smit Vora
be05aea101 fix: better comparision of difference value between stock and account 2023-01-11 05:21:13 +00:00
anandbaburajan
aa1f2a7297 fix: asset value in fixed asset register 2023-01-10 23:05:09 +05:30
Smit Vora
e0f5ecdad6
fix: RFQ emails not sent with pdf attachment (#33604) 2023-01-10 20:40:12 +05:30
vr-greycube
0f0bc9a462
fix: customer selection not mandatory in purchase invoice to fetch item details (#33572) 2023-01-10 20:26:33 +05:30
Deepesh Garg
0ed938a490
fix: Incorrect exchange rate in payment entries (#33481)
* fix: Incorrect exchange rate in payment entries

* test: Update failing tests
2023-01-10 20:12:43 +05:30
rohitwaghchaure
58ad79d3e8
Merge pull request #33597 from rohitwaghchaure/do-not-check-other-warehouse
fix: don't check other warehouse ledgers to calculate valuation rate
2023-01-10 13:56:10 +05:30
Vishal
a5cbdea8e4 fix: minor change in bom.js added 2023-01-10 13:40:12 +05:30
Rohit Waghchaure
ef2bf3c223 fix: don't check other warehouse ledgers to calculate valuation rate 2023-01-10 10:59:50 +05:30
Ankush Menat
8a56df695d
perf: Drop name part from posting sort index (#33551) 2023-01-10 09:54:15 +05:30
Vishal
c51f9e0a97 fix: bom.json updated 2023-01-10 07:48:26 +05:30
Vishal
f0c0a64984 fix: test case added for FG_BASED OPERTING COST 2023-01-10 07:43:28 +05:30
Vishal
ddc0127e05 fix: minor changes added 2023-01-10 07:43:20 +05:30
Vishal
b559245f2a feat: Add operating cost based on bom quanity without creating job card 2023-01-10 07:43:05 +05:30
rohitwaghchaure
59628f1934
Merge pull request #33579 from rtdany10/repack-fg-valuation
fix(stock entry): wrong valuation rate in repack
2023-01-10 00:05:56 +05:30
rohitwaghchaure
a424acbfcb
Merge pull request #33577 from rohitwaghchaure/timeout-error-in-purchase-invoice
fix: Timeout error while saving the purchase invoice
2023-01-10 00:01:15 +05:30
rohitwaghchaure
d749c4aac2
Revert "feat: Add operating cost based on bom quanity without creating job card" 2023-01-09 23:35:11 +05:30
rohitwaghchaure
20fe1875e7
Merge pull request #33347 from vishdha/fb_based_operating_cost
feat: Add operating cost based on bom quanity without creating job card
2023-01-09 23:31:41 +05:30
Gughan Ravikumar
4d5067d6d4
fix(accounts): currency fields no longer read as strings by validation function in Payment Entry (#33535)
explicitly cast paid_amount and received_amount to float in the Payment Entry set_unallocated_amount validation function
2023-01-09 23:26:51 +05:30
ruthra kumar
bbe5e5d9d6
fix: incorrect warehouse and selling amount on bundled products (#33549) 2023-01-09 22:45:43 +05:30
Sagar Sharma
dd3b79b511
Merge pull request #33562 from ruthra-kumar/better_handling_of_duplicate_bundle_items
fix: better handling of duplicate bundle items
2023-01-09 22:22:57 +05:30
Devin Slauenwhite
6bc8bb26b6
fix: customer/supplier quick entry dialog (#33496)
* fix: readonly primary contact fields.

* refactor: supplier and customer quick entry form into common class.
2023-01-09 22:22:19 +05:30
Rohit Waghchaure
ec171fc7c1 test: test case to check disable last purchase rate 2023-01-09 22:02:35 +05:30
Sagar Sharma
b56c1ed050
Merge branch 'develop' into better_handling_of_duplicate_bundle_items 2023-01-09 21:48:48 +05:30
Deepesh Garg
f056e9e7c5
Merge pull request #33569 from ruthra-kumar/patch_to_update_new_je_type_in_property_setters
chore: patch property setters for JE with new entry type
2023-01-09 21:01:52 +05:30
Deepesh Garg
57a6c37833
Merge pull request #32933 from AnandBaburajan/asset_depreciation_schedule
feat: separating depreciation schedule from assets into a new doc
2023-01-09 20:47:21 +05:30
sonali
917b2190aa fix: remove comments 2023-01-09 20:07:24 +05:30
Ankush Menat
fa4af2acce
refactor: convert heatmap queries to QB (#33581)
Uses new `UnixTimestamp` function, don't backport.
2023-01-09 20:00:22 +05:30
safvanhuzain
99f5e869e0 fix(stock entry): wrong valuation rate in repack 2023-01-09 13:11:37 +00:00
Rohit Waghchaure
05df8579cd fix: linters issue 2023-01-09 18:23:22 +05:30
Rohit Waghchaure
d1d4671320 feat: provision to disable get last purchase rate
fix: set_incoming_rate condition
2023-01-09 18:10:52 +05:30
Rohit Waghchaure
7249657d15 fix: timeout error in the Purchase Invoice 2023-01-09 14:53:54 +05:30
ruthra kumar
789e448f0e chore: patch property setters for JE with new entry type 2023-01-08 11:45:28 +05:30
Devin Slauenwhite
e35ac4f8c2 fix: move include in manufacturing to manufacturing tab. 2023-01-07 22:47:16 -05:00
ruthra kumar
c717e87c9e fix: better handling of duplicate bundle items 2023-01-06 16:21:20 +05:30
rohitwaghchaure
525f054c45
Merge pull request #33548 from rohitwaghchaure/fixed-incorrect-wo-status
fix: incorrect status in the work order
2023-01-06 16:01:24 +05:30
Rohit Waghchaure
b0baba84a0 fix: incorrect status in the work order 2023-01-06 14:16:18 +05:30
ruthra kumar
51b082b43c
Merge pull request #33537 from ruthra-kumar/sales_partner_in_ar_report
refactor: Sales Partner column in AR and AR Summary Report
2023-01-06 12:07:50 +05:30
Vishal
9fd1c3efb4 fix: test case added for FG_BASED OPERTING COST 2023-01-06 11:18:09 +05:30
Vishal
6b0b49ee3f fix: minor changes added 2023-01-06 11:18:09 +05:30
Vishal
bc1bdd58a7 feat: Add operating cost based on bom quanity without creating job card 2023-01-06 11:18:09 +05:30
s-aga-r
348dc32514 chore: enable No Copy attribute for route in Item Group 2023-01-05 12:25:50 +05:30
rohitwaghchaure
f6da6ece0a
Merge pull request #33524 from rohitwaghchaure/revamp-process-loss-feature
refactor: revamp process loss feature & added tab breaks
2023-01-04 18:37:32 +05:30
ruthra kumar
ee94127974 refactor: Sales Partner column in AR and AR Summary Report 2023-01-04 12:41:02 +05:30
Anand Baburajan
3ae47ab32c
Merge branch 'develop' into asset_depreciation_schedule 2023-01-04 01:34:08 +05:30
Rohit Waghchaure
524c0994e0 test: test cases for process loss 2023-01-03 22:47:52 +05:30
Deepesh Garg
c78399c618
fix: Missing opening entry in general ledger (#33519) 2023-01-03 21:35:03 +05:30
Deepesh Garg
1a83a67d41
fix: Get payment entry button not visible in Bank Clearance doc (#33518) 2023-01-03 21:34:49 +05:30
Rohit Waghchaure
ae039777f9 refactor: revamp process loss feature & added tab breaks 2023-01-03 19:05:41 +05:30
Sagar Sharma
9f59330fa9
Merge branch 'develop' into fix/github-issue/33417 2023-01-03 18:51:27 +05:30
Deepesh Garg
a3ab8f973a
fix: Deferred revenue date comparison (#33515) 2023-01-03 17:51:41 +05:30
s-aga-r
751bdc98ed fix: set supplier details while mapping SE(Send to Subcontractor) 2023-01-03 17:17:23 +05:30
Deepesh Garg
9a3d947e89
fix: Exchange gain and loss booking on multi-currency invoice reconciliation (#32900)
* fix: Exchange gain and loss booking on multi-curreny invoice reconciliation

* test: Update test cases

* chore: Ignore SQL linting rule

* chore: Joural Entry for exchange gainand loss booking

* chore: Journal entry for exchange gain loss booking

* test: Update test case

* chore: Default exchange gain and loss account
2023-01-03 16:55:15 +05:30
Anand Baburajan
d9c91fa072
Merge branch 'develop' into asset_depreciation_schedule 2023-01-03 15:10:07 +05:30
anandbaburajan
312e51e8b2 chore: more refactoring and adding test for duplicate asset_depr_schedule 2023-01-03 15:09:04 +05:30
anandbaburajan
adb5249257 chore: fix patch 2023-01-03 13:03:12 +05:30
anandbaburajan
7b6b5ae581 chore: refactoring patch 2023-01-03 09:21:08 +05:30
anandbaburajan
e501c2db51 chore: just testing patch 2023-01-02 21:11:53 +05:30
anandbaburajan
357c17214d chore: fix patch 2023-01-02 20:32:29 +05:30
rohitwaghchaure
6a4e25c1f9
Merge pull request #33504 from rohitwaghchaure/fixed-incorrect-picked-qty-in-so
fix: [concurrency issue] incorrect picked qty in sales order
2023-01-02 20:12:05 +05:30
Rohit Waghchaure
aba83849a6 fix: [concurrency issue] incorrect picked qty in sales order 2023-01-02 18:46:22 +05:30
Anand Baburajan
72c2e77a5d
Merge branch 'develop' into asset_depreciation_schedule 2023-01-02 17:07:58 +05:30
anandbaburajan
7c5168eeac chore: allow manually submitting and cancelling asset depr schedule 2023-01-02 17:07:28 +05:30
ruthra kumar
914b23038c
refactor: Exchange rate revaluation to handle accounts with zero account balance (#33165)
* refactor: new type for JE - Exchange Gain or Loss

* refactor: skip few validations for Exchanage Gain Or Loss type Jour

* refactor: ERR create 2 journals for handling zero and non-zero compa

1. Additional check box accounts table to identify accounts with zero balance
2. Accounts with zero balance only in either of the 2 currencies will be handled on separate Journal

* refactor: skips few validation for allowing 0 debit/credit

* fix: General Ledger presentaion currency

* test: fix test case in general ledger

* test: fix failing test case in AR report
2023-01-02 14:33:14 +05:30
ruthra kumar
23fbe86d51 refactor: Show Balance in COA based on Accounts Settings 2023-01-02 13:32:01 +05:30
ruthra kumar
1b78fae6fc refactor: show balance checkbox in Accounts Settings 2023-01-02 13:31:56 +05:30
s-aga-r
b425c2d7ec Merge branch 'develop' into fix/github-issue/28766 2023-01-02 11:25:13 +05:30
Sagar Sharma
e18b0ebe92
Merge branch 'develop' into fix-get-bin-details 2023-01-02 10:49:29 +05:30
Sagar Sharma
49025db33c
Merge branch 'develop' into fix/github-issue/28766 2023-01-02 10:27:42 +05:30
Marc de Lima Lucio
3c393bfdc5
fix: javascript: execution blocked by undefined route options (#33405)
Some implementations of DocField.get_route_options_for_new_doc() returned no value instead of an empty object in some cases, which caused a JavaScript error.
2023-01-02 09:18:25 +05:30
MOHAMMED NIYAS
d054f37602
feat: calculate hours (#33464)
* feat: calculate hours

* chore: Linting Issues

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
2023-01-02 09:17:14 +05:30
Sabu Siyad
010718ffed
fix(ecommerce/cart): explicitly set frappe.boot (#33431)
related: https://github.com/frappe/frappe/pull/18323

Signed-off-by: Sabu Siyad <hello@ssiyad.com>

Signed-off-by: Sabu Siyad <hello@ssiyad.com>
2023-01-02 08:58:01 +05:30
Devin Slauenwhite
98c39c4f5f
fix: update payment entry references (#33274)
* fix: set_amounts after deductions and losses are set

* test: difference_amount changes after update_references_in_payment_entry

* chore: linter

* fix: use kwargs instad of destructing a dict

[skip ci]

* fix(test): test payment entry difference_amount after payment reconciliation.
2023-01-02 08:55:12 +05:30
Sagar Sharma
7126d71627
Merge branch 'develop' into fix/github-issue/28766 2023-01-01 22:24:47 +05:30
Devin Slauenwhite
239a5f8bf4 test: get_item_details contains bin details 2022-12-31 15:41:07 -05:00
Devin Slauenwhite
8d62cdfd5f fix: add missing 'ordered_qty' to get_bin_details 2022-12-31 14:14:25 -05:00
Deepesh Garg
bb4725e9b5
Merge pull request #33488 from deepeshgarg007/multi_currency_bank_reco
fix: Multi-currency issues in Bank Reconciliation Tool
2022-12-31 13:05:25 +05:30
sonali
12822f7c36 fix: data format 2022-12-30 14:06:19 +05:30
Deepesh Garg
ad53ecf2b4 fix: Multi-currency issues in Bank Recociliation Tool 2022-12-30 13:37:41 +05:30
Gughan Ravikumar
48a9cd5ef3
fix: allow arbitary items in Quotation ans Sales Order (#33430)
fix: allow arbitary items in Quotation ans Sales Order
2022-12-30 13:16:40 +05:30
rohitwaghchaure
728dc1acf4
Revert "fix: daily scheduler to identify and fix stock transfer entries having incorrect valuation" 2022-12-30 11:08:31 +05:30
Sagar Sharma
d072169340
Merge branch 'develop' into fix/github-issue/28766 2022-12-29 16:38:53 +05:30
s-aga-r
c3911a592a chore: use frappe.qb instead of frappe.db.get_value 2022-12-29 16:38:08 +05:30
sonali
d65243eb65 feat: consolidated auto bank reconciliation
Added a button of Auto Reconcile, to reconcile the bank entries as per the matching reference number with the bank transaction and count of transactions reconciled message will be pop up on clicking the auto reconcile button.
2022-12-29 16:12:25 +05:30
s-aga-r
c716dcc01e fix: consider child nodes while getting bin details 2022-12-29 14:01:42 +05:30
sonali
c764f14f53 fix: pre-commit 2022-12-29 13:58:06 +05:30
sonali
35c29e0226 fix: pre-commit 2022-12-29 13:45:15 +05:30
sonali
f1810803e1 fix: passing from_date and to_date filters in test cases
passing from_date and to_date filters in  test_linked_payments and test_debit_credit_output  for unit testing
2022-12-29 13:07:06 +05:30
sonali
e2614b8a21 fix: pre-commit 2022-12-29 12:21:45 +05:30
sonali
3aaa2f5326 fix: filtered as per reference date
On bank reconciliation, transactions will be filtered as per date selected in 'from_date' and 'to_date' fields , In dialog, all the bank entries will  be fetched as per the posting date selected and if filtered by reference date checkbox is tick then then there will be two fields 'from_reference_date' and 'to_reference_date' then all bank entries in dialog box came as per reference date, selected. And by default journal entry checkbox is tick.
Also sorted the bank transactions and bank entries as per ascending order date wise.
2022-12-29 12:05:22 +05:30
Deepesh Garg
617518389a
fix: Conversion factor error for invoices without item code (petty expenses) (#32714)
* fix: Set default uom conversion factor to 1 for invoices

* chore: set default conversion_factor as 1

* chore: remove print statements
2022-12-29 10:41:36 +05:30
Devin Slauenwhite
123920d0bc
feat: add after_refresh hook to item dashboard (#33372)
* fix: return promise

* fix: use after_refresh hook instead of promise

# Because there is already a before_refresh hook. I think it makes sense to do the same for after.
2022-12-29 10:31:26 +05:30
ruthra kumar
e3a0ce5d63
fix: use base_net_amount in case of missing stock qty (#33457) 2022-12-29 09:34:51 +05:30
Dany Robert
cabaed9ed2
fix(pricing rule): consider child tables in condition (#33469) 2022-12-28 18:05:55 +05:30
s-aga-r
6f5824cb21 fix: fg_item_qty in non-subcontracted PO 2022-12-28 14:54:24 +05:30
Sabu Siyad
8e271fd719
feat(exotel): make use of CustomField in API (#33338)
* feat(exotel): pass kwargs for `make_a_call`

https://developer.exotel.com/api/make-a-call-api#call-agent

Signed-off-by: Sabu Siyad <hello@ssiyad.com>

* feat(exotel): map custom field to doctype

Signed-off-by: Sabu Siyad <hello@ssiyad.com>

Signed-off-by: Sabu Siyad <hello@ssiyad.com>
2022-12-28 08:11:28 +05:30
Deepesh Garg
0b75aa5390
fix: Default dimensions on fetching items from BOM (#33439) 2022-12-27 17:53:43 +05:30
Deepesh Garg
d2686ce75b
fix: Multiple rows for same warehouse and batches in pick list (#33456) 2022-12-27 17:42:03 +05:30
anandbaburajan
21a09e7431 chore: fix patch 2022-12-27 15:01:42 +05:30
anandbaburajan
97f8588202 chore: fix patch name 2022-12-27 15:01:42 +05:30
anandbaburajan
c916fb0513 chore: fix module name in patch 2022-12-27 15:01:42 +05:30
anandbaburajan
57adcc0b03 chore: move patch to pre_model_sync 2022-12-27 15:01:42 +05:30
Anand Baburajan
4ff70db668
Merge branch 'develop' into asset_depreciation_schedule 2022-12-27 14:59:53 +05:30
Deepesh Garg
8263bf9a9a
fix: Random behaviour while picking items using picklist (#33449) 2022-12-27 14:59:35 +05:30
anandbaburajan
482116db9f chore: improve tests 2022-12-27 10:03:32 +05:30
Anand Baburajan
6f4e6fafa9
Merge branch 'develop' into asset_depreciation_schedule 2022-12-27 07:36:32 +05:30
anandbaburajan
6d791cabd1 chore: more refactoring 2022-12-26 22:13:11 +05:30
Sagar Sharma
88edc412e3
Merge branch 'develop' into fix/purchase-order/shipping_address 2022-12-26 12:00:39 +05:30
s-aga-r
67a7ccf3ce fix: shipping_address for non-drop shipping item 2022-12-26 11:57:50 +05:30
Deepesh Garg
8a79efab4b
feat: Accounting Dimension updation in Payment Request and Entry (#33411) 2022-12-26 10:17:55 +05:30
Solufyin
7d9f3f23dd
fix: Customer Primary Contact (#33424)
Co-authored-by: Nihantra C. Patel <n.patel.serpentcs@gmail.com>
2022-12-26 10:15:10 +05:30
Sagar Sharma
32f3b64a89
Merge branch 'develop' into fix/github-issue/32258 2022-12-25 18:12:08 +05:30
s-aga-r
7e1b6b3c2a fix: shipping_address in PO 2022-12-25 18:11:05 +05:30
anandbaburajan
03662be150 chore: have different functions for draft. active and cancelled depr schedules 2022-12-25 18:05:19 +05:30
ruthra kumar
a0484793c3 refactor: remove unrelated filters from Supplier Ledger Summary
Territory, Sales Partner and Sales Person doesn't belong in Supplier Ledger
2022-12-24 11:20:39 +05:30
ruthra kumar
89229d9b58 refactor: additional doctype access for 'Accounts User' role 2022-12-24 11:20:16 +05:30
ruthra kumar
bfa511cb65 refactor: hidden columns to help framework handle user permissions
'territory', 'supplier_group', 'customer_group' have been added as
hidden columns to handle 'user permission' based access control.
2022-12-24 10:30:30 +05:30
rohitwaghchaure
40769998c6
Merge pull request #33422 from rohitwaghchaure/fix-stock-entry-submit-performance
fix: timeout error while submitting stock entry
2022-12-23 13:57:25 +05:30
Rohit Waghchaure
a05c47e499 fix: timeout error while submitting stock entry
Co-authored-by: Ankush Menat <ankush@frappe.io>
2022-12-23 13:27:32 +05:30
Anand Baburajan
b17ef34042
Merge branch 'develop' into asset_depreciation_schedule 2022-12-23 11:02:17 +05:30
anandbaburajan
3e91a56c19 chore: only consider draft and active assets in patch, and allow asset depr schedule to be manually createed 2022-12-23 11:01:18 +05:30
ruthra kumar
8f5d8e0474
Merge pull request #33418 from ruthra-kumar/filter_issue_in_ar_ap_report
fix: payment terms and sales partner filter issue in Accounts Receivable report
2022-12-22 11:38:38 +05:30
ruthra kumar
13c4420f42 fix: payment terms and sales partner filter issue in AR/AP report 2022-12-22 10:55:22 +05:30
ruthra kumar
a26698b88e
Merge pull request #33410 from ruthra-kumar/typeerror_on_gp_due_to_incorrect_warehouse_on_bundle_item
fix: TypeError on GP Report due to multiple warehouse on bundled items
2022-12-21 18:26:40 +05:30
ruthra kumar
5918bb03f7 test: type error on bundled products with different warehouses 2022-12-21 17:47:57 +05:30
ruthra kumar
e684eb32d0 fix: typerror on multi warehouse in Packed Items
DN(with bundled item with varying warehouses)-> Sales Invoice.
2022-12-21 15:09:55 +05:30
sonali
81e5f71172 fix: json issue 2022-12-21 14:02:54 +05:30
sonali
6b5276398e fix: linters 2022-12-21 13:32:16 +05:30
sonali
645869e6ff feat: added arguments of posting date and reference date 2022-12-21 12:58:30 +05:30
Deepesh Garg
ade83cbab3 fix: Consolidated financial report 2022-12-20 16:45:46 +05:30
Deepesh Garg
1da14b7ec3
Merge pull request #33393 from deepeshgarg007/cc_filter_cashflow_report
fix: Cost center filter not working in cash flow report
2022-12-20 13:46:18 +05:30
Deepesh Garg
925387550e
Merge pull request #33350 from deepeshgarg007/payment_request_flow
fix: Payment Request flow fixes from Order to Payment Entry
2022-12-20 13:45:15 +05:30
Deepesh Garg
9dc1509cf5
Merge pull request #33358 from resilient-tech/fix-appointment-booking
fix: remove unnecessary permissions from Appointment and Appointment Booking Settings
2022-12-20 11:53:01 +05:30
Deepesh Garg
31c95deb88 chore: More fixes 2022-12-20 11:45:51 +05:30
Deepesh Garg
ff48634cbb Merge branch 'develop' of https://github.com/frappe/erpnext into payment_request_flow 2022-12-20 11:42:15 +05:30
Deepesh Garg
e25b98b620 chore: Update test case 2022-12-20 11:42:05 +05:30
Deepesh Garg
068df9f815 chore: remove print statement 2022-12-20 10:00:53 +05:30
Deepesh Garg
d0dbfec052 fix: Cost center filter not working in cash flow report 2022-12-20 09:59:27 +05:30
rohitwaghchaure
1ed2230e4c
Merge pull request #33382 from rohitwaghchaure/fixed-pick-list-issue
fix: unsupported operand type(s) for +=: 'int' and 'NoneType'
2022-12-20 09:47:29 +05:30
rohitwaghchaure
eaa04abe29
Merge pull request #33387 from rohitwaghchaure/audit-to-fix-incorrect-valuation-entry
fix: daily scheduler to identify and fix stock transfer entries having incorrect valuation
2022-12-20 09:46:57 +05:30
Rohit Waghchaure
f31612376a test: added test case to validate audit for incorrect entries 2022-12-20 00:14:41 +05:30
Rohit Waghchaure
b1721b79ce fix: daily scheduler to identify and fix stock transfer entries having incorrect valuation 2022-12-19 23:33:44 +05:30
rohitwaghchaure
7851adb49a
Merge branch 'develop' into fixed-pick-list-issue 2022-12-19 23:32:06 +05:30
Ankush Menat
88ce11f03d
fix: incorrect type hints (#33381)
[skip ci]
2022-12-19 16:44:19 +05:30
Rohit Waghchaure
2b4eae5f84 fix: unsupported operand type(s) for +=: 'int' and 'NoneType' 2022-12-19 16:24:55 +05:30
ruthra kumar
65db9cea25
Merge pull request #33380 from ruthra-kumar/err_for_invoices_should_reflect_in_ar_ap_report
fix: ERR journals should reported in AR/AP
2022-12-18 16:56:19 +05:30
ruthra kumar
2ed86760d7 test: err for party should be in AR/AP report 2022-12-18 12:40:07 +05:30
ruthra kumar
b09eade3e4 fix: ERR journals reported in AR/AP
Exchange Rate Revaluation on Receivable/Payable will included in AR/AP report
2022-12-18 06:38:23 +05:30
Gokulnath
4ecce242a8
feat: adding warehouse filter for sales order ananlysis report
feat: adding warehouse filter for sales order ananlysis report
2022-12-17 20:06:01 +05:30
Deepesh Garg
67c5cec505
Merge pull request #33339 from barredterra/print-rfq
feat: more control when printing RFQ
2022-12-17 19:24:57 +05:30
Deepesh Garg
6238fd9d9e
Merge pull request #33341 from deepeshgarg007/tds_tcs_cost_center
fix: Cost Center for tax withholding invoices
2022-12-17 19:24:34 +05:30
sonali
05b6fce03d feat:filters on bank reconciliation
Added date filters on bank transactions, payment entries and journal entries and sorted list as per date in ascending order.
2022-12-17 17:15:28 +05:30
Deepesh Garg
2a4eec245a
Merge pull request #33371 from deepeshgarg007/coa_import_srbnb
fix: Unable to import COA through importer
2022-12-17 16:42:37 +05:30
Deepesh Garg
3b66920342 fix: Unable to import COA through importer 2022-12-16 19:22:29 +05:30
Deepesh Garg
0e86cde64b
Merge branch 'develop' into print-rfq 2022-12-16 16:24:02 +05:30
Sagar Vora
9989ccbb02
Merge branch 'develop' into fix-appointment-booking 2022-12-16 10:36:48 +00:00
Daizy Modi
4802d719ed fix: removed unused data and minor changes 2022-12-16 15:55:58 +05:30
Deepesh Garg
6bb22c703a
Merge pull request #33275 from pps190/fix-pe-exchange-rate-precision
fix: use highest precision for exchange rate.
2022-12-16 15:43:36 +05:30
Deepesh Garg
50421b3d7d
Merge pull request #33315 from kunhimohamed/develop
fix: at create_customer_or_supplier on session creation
2022-12-16 15:04:10 +05:30
Deepesh Garg
b76129c1dd
Merge pull request #33286 from artykbasar/develop
Subscription Cost center value is fixed to Default value(Bug fix)
2022-12-16 14:44:51 +05:30
Deepesh Garg
5c50a46822
Merge pull request #33362 from deepeshgarg007/exclude_gst_credential_doctype
feat: Ignore company related doctype for other apps via hooks
2022-12-16 11:07:47 +05:30
Daizy Modi
5d0b5c8d2a fix: pass necessary params instead of args 2022-12-16 10:10:29 +05:30
Deepesh Garg
1a40c04b72 feat: Ignore company related doctype for other apps via hooks 2022-12-15 18:51:58 +05:30
sonali
408c89df03 Feat:Filter on Payment Entries and Journal Entries
Applying filters on Payement entries and Journal Entries as per reference  date and posting date
2022-12-15 18:09:57 +05:30
rohitwaghchaure
da1d8da355
Merge pull request #33355 from rohitwaghchaure/fixed-do-not-show-disabled-items
fix: disabled items showing in the report Itemwise Recommended Reorder Level
2022-12-15 18:08:05 +05:30
Daizy Modi
56f3ac15d8 fix: removed unncessary changes 2022-12-15 18:02:14 +05:30
Daizy Modi
4bfe2ea572 fix: agent assignment and permissions for appointment 2022-12-15 17:19:28 +05:30
rohitwaghchaure
5cbbb5d59e
Merge pull request #33354 from rohitwaghchaure/fixed-trivial-discount-amount
fix: unsupported operand type(s) for +: 'int' and 'NoneType'
2022-12-15 17:13:46 +05:30
Rohit Waghchaure
ae31ff1c48 fix: disabled items showing in the report 'Itemwise Recommended Reorder Level
'
2022-12-15 17:05:53 +05:30
Daizy Modi
ac51c27500 fix: fetch required details from appointment booking settings 2022-12-15 16:53:51 +05:30
Daizy Modi
9a00b3bdbd fix: format html of verify email for book appointment 2022-12-15 16:51:00 +05:30
Daizy Modi
25f0b26a17 fix: remove unused page book-appointment 2022-12-15 16:49:23 +05:30
Daizy Modi
ae8dd2b2bc fix: remove guest role from doctype 2022-12-15 16:47:27 +05:30
Rohit Waghchaure
0f28074e5a fix: unsupported operand type(s) for +: 'int' and 'NoneType' 2022-12-15 16:36:47 +05:30
ruthra kumar
d126c8030f
Merge pull request #33335 from ruthra-kumar/cost_center_issue_on_reconciliation_tool
fix: paid invoices shows up as outstanding when 'cost_center' filter is applied
2022-12-15 15:02:18 +05:30
Anand Baburajan
246d3b4075
Merge branch 'develop' into asset_depreciation_schedule 2022-12-15 14:51:16 +05:30
anandbaburajan
a358f77774 chore: move patch to post_model_sync and cancel asset depr schedule properly 2022-12-15 14:50:53 +05:30
ruthra kumar
a998a8a2da test: cost center should not affect outstanding calculation 2022-12-15 14:28:33 +05:30
Deepesh Garg
dc178984ae fix: Payment Request flow fixes from Order to Payment Entry 2022-12-15 14:15:20 +05:30
anandbaburajan
7f5e761c04 chore: add patch 2022-12-15 13:13:04 +05:30
Deepesh Garg
3a8a467edb
Merge pull request #33329 from Gokulnath17/Gokulnath_dev
fix: in gross profit report
2022-12-15 12:01:39 +05:30
Deepesh Garg
076527bb88
Merge pull request #33305 from barredterra/incoterm-named-place
feat: incoterm named place
2022-12-15 11:59:54 +05:30
Gokulnath
f73976946e
Merge branch 'develop' into Gokulnath_dev 2022-12-15 10:22:49 +05:30
Deepesh Garg
b7e9942681
Merge pull request #33309 from barredterra/refactor-validate_payment_against_negative_invoice
refactor: translatable strings and guard clause
2022-12-15 09:21:16 +05:30
rohitwaghchaure
9bf2682218
Merge pull request #33323 from barredterra/translate-overbilling-overdelivery
fix: translatability of warning on overbilling/-receipt/-delivery
2022-12-14 23:24:11 +05:30
Deepesh Garg
26277cfcf3 chore: resolve errors in test 2022-12-14 21:22:48 +05:30
Deepesh Garg
973ef33eb5 fix: Cost Center for tax withholding invoices 2022-12-14 20:41:00 +05:30
barredterra
8717148d9b feat: improve visibility of default values 2022-12-14 14:14:29 +01:00
barredterra
ce9626fead feat: more control when printing RFQ 2022-12-14 14:03:36 +01:00
Gokulnath
d404a03947
Merge branch 'develop' into Gokulnath_dev 2022-12-14 17:38:16 +05:30
ruthra kumar
8eb93004f7 fix: cost_center filter fix for 'Get Outstanding Invoice' in PE 2022-12-14 16:16:22 +05:30
rohitwaghchaure
21c86bd649
Merge pull request #33332 from rohitwaghchaure/fixed--missing-required-argument
fix: get_serial_nos_for_fg() missing 1 required positional argument: …
2022-12-14 16:06:58 +05:30
ruthra kumar
6d9d730759 fix: cost_center filter gives incorrect output
filtering on cost center gives invoices that are reconciled as having outstanding
2022-12-14 16:05:15 +05:30
Rohit Waghchaure
410a58b3de fix: get_serial_nos_for_fg() missing 1 required positional argument: 'args' 2022-12-14 15:33:36 +05:30
anandbaburajan
c99cd74a15 chore: handle some error cases and add empty patch file 2022-12-14 13:20:37 +05:30
Gokulnath17
41fc3be339 fixes in gross profit report 2022-12-14 10:46:11 +05:30
barredterra
36997d9788 fix: translation for warning on Overbilling/-receipt/-delivery 2022-12-13 18:59:20 +01:00
Anand Baburajan
8534390627
Merge branch 'develop' into asset_depreciation_schedule 2022-12-13 20:49:06 +05:30
anandbaburajan
22ef342ac7 chore: fixing all tests 2022-12-13 20:48:34 +05:30
anandbaburajan
df134c7c5b chore: fixing some tests 2022-12-13 16:26:33 +05:30
Nabin Hait
5ea6080a6e
Merge pull request #33300 from ssiyad/fix/pos/var_typo
fix(pos): variable typo: `s_pos` -> `is_pos`
2022-12-13 15:21:10 +05:30
Nabin Hait
c5d21b2461
Merge pull request #33314 from s-aga-r/fix/github-issue/33145
fix: `Enough Parts to Build` in `BOM Stock Report`
2022-12-13 15:19:40 +05:30
ruthra kumar
3db446e35a
Merge pull request #33313 from nabinhait/tax_detail_report_perm_issue
fix: Permission issue in Tax Detail report
2022-12-13 14:27:08 +05:30
kunhi
15e3b7f218 fix: at create_customer_or_supplier on session creation 2022-12-13 12:41:56 +04:00
Sagar Sharma
f9be137cf5
Merge branch 'develop' into fix/github-issue/33145 2022-12-13 14:00:51 +05:30
s-aga-r
723c64ba73 fix: Enough Parts to Build in BOM Stock Report 2022-12-13 14:00:30 +05:30
Nabin Hait
aa787e4030 fix: Permission issue in Tax Detail report 2022-12-13 13:16:24 +05:30
ruthra kumar
2175784142
Merge pull request #33303 from ruthra-kumar/incorrect_balance_on_consolidate_balance_sheet
fix: incorrect balance on parent company on consolidate Balance sheet due to key mismatch
2022-12-13 09:04:13 +05:30
barredterra
f20370c5ef refactor: translatable strings and guard clause 2022-12-13 02:36:12 +01:00
barredterra
e057e1dfe7 feat: incoterm named place 2022-12-12 18:49:47 +01:00
s-aga-r
78b438f6cf fix: Material Request reference in internal Sales Order 2022-12-12 22:41:44 +05:30
ruthra kumar
7b3316dc31 fix: incorrect balance on parent company due to key mismatch 2022-12-12 20:15:59 +05:30
rohitwaghchaure
5c0f8ee44f
Merge pull request #33281 from tundebabzy/29976
fix: maintain same rate throughout sales cycle doesn't work with quotation
2022-12-12 19:30:50 +05:30
Sabu Siyad
7d64bf78cf
fix(pos): variable typo: s_pos -> is_pos
Signed-off-by: Sabu Siyad <hello@ssiyad.com>
2022-12-12 19:09:00 +05:30
anandbaburajan
28d4942d6c chore: fix validation and add make_schedules_editable 2022-12-12 18:19:34 +05:30
anandbaburajan
1ea2ba0dea chore: handle some cases where asset_depr_schedule doesn't exist 2022-12-12 17:31:57 +05:30
anandbaburajan
b997d1eb87 chore: add some validation, shorten some function names 2022-12-12 17:25:38 +05:30
Anand Baburajan
f8cd424559
Merge branch 'develop' into asset_depreciation_schedule 2022-12-12 16:36:59 +05:30
anandbaburajan
ec6505d747 chore: fix some bugs, refactor some functions, add proper notes 2022-12-12 16:35:30 +05:30
Ankush Menat
915e0347b0
chore!: remove activity log feeds (#33294)
- This contains little to no information and practically no one uses this.
- Also causes a lot of problem by adding way too many feeds in activity
  log to the point where activity page doesn't even load.
2022-12-12 15:14:30 +05:30
Ankush Menat
593626f502
perf: add indexes on payment entry reference (#33288)
Adds index on:
1. reference doctype
2. reference name

*Why not composite index?*

There are three type of queries on this doctype

- filtering ref_doctype - doctype index helps here
- filtering ref_name - name index helps here
- filtering both - name index helps here too. Since it has sufficiently
  high cardinality. Composite index wont help in case where ref_doctype
  isn't specfied.


[skip ci]
2022-12-12 12:58:11 +05:30
artykbasar
d512919f5c
Subscription Cost center value is fixed to Default value(Bug fix)
self.cost_center 
    field value keeps changing to 
erpnext.get_default_cost_center(self.get("company"))
    after validation of this doctype. This overrides the user input.
simple fix, it will first check if the field is empty, if empty then puts the company's default cost center value if not then user input will be saved.
2022-12-11 08:51:34 +00:00
Tunde Akinyanmi
71aa8c5e1c test: refactor test case 2022-12-09 14:33:54 +01:00
Tunde Akinyanmi
d193a14b8f test: ensure test case sets Selling Settings 2022-12-09 14:09:54 +01:00
anandbaburajan
90e1b9cb3d chore: fix asset depr schedule notes 2022-12-09 16:18:40 +05:30
Tunde Akinyanmi
97ddfcfc7c fix: Maintain Same Rate Throughout Sales Cycle doesn't work
Issue #29976 was partly fixed by #32923 but the problem still persists.
The reason is because an incorrect fieldname was passed to the
`validate_rate_with_reference_doc` method.
This commit fixes it
2022-12-09 10:29:28 +01:00
anandbaburajan
16365bfca3 chore: more refactoring 2022-12-09 14:04:00 +05:30
Devin Slauenwhite
2010b1b6e8 fix: use highest precision for exchange rate. 2022-12-08 16:26:07 -05:00
anandbaburajan
77dc8e7966 fix: bug in posting depr entries 2022-12-09 00:58:19 +05:30
anandbaburajan
187e1a324a chore: refactor get_depreciable_assets 2022-12-09 00:46:56 +05:30
anandbaburajan
1fd73af744 chore: refactor some reports 2022-12-09 00:28:34 +05:30
Deepesh Garg
6db52930d8 Merge branch 'develop' of https://github.com/frappe/erpnext into buying_selling_pricing_rule 2022-12-08 18:05:05 +05:30
Deepesh Garg
6192af5cf0 chore: Update tests 2022-12-08 18:04:40 +05:30
sonali
8e7c8a6482 Update bank_reconciliation_tool.json
Adding fields in bank reconciliation tool
2022-12-08 17:23:08 +05:30
Deepesh Garg
b179514273
Merge pull request #33269 from ssiyad/fix/ecommerce/breadcrumb_base
fix(ecommerce): remove query parameters from referrer
2022-12-08 17:11:34 +05:30
Sabu Siyad
b6bd408f19
fix(ecommerce): remove query parameters from referer
inclusion of query parameters results in logic failure

example:
- logic check if referrer is `all-products`
- `http://shop.example/all-products` -> `all-products`, valid outcome
- `http://shop.example/all-products?start=1` -> `all-products?start=1`,
  invalid outcome

Signed-off-by: Sabu Siyad <hello@ssiyad.com>
2022-12-08 16:47:50 +05:30
Ankush Menat
0b86b1baca
refactor: make payments app a soft dependency (#33245)
refactor: make payment app a soft dependency
2022-12-08 16:40:13 +05:30
sonali
447272aa4d Filters on Bank Reconciliation
Applying date filter on transactions and all the bank entries and also gives the filter the bank entries as per reference date. Sorted all transactions and entries as per date in ascending order. Also added posting date columns in all bank entries and default checkbox tick of journal entry, hide the sales invoice and purchase invoice checkbox.
2022-12-08 16:11:53 +05:30
Deepesh Garg
07c815f35f
Merge pull request #33253 from niyazrazak/patch-9
feat: get lead with WhatsApp number
2022-12-08 15:19:13 +05:30
Deepesh Garg
81397ba3ee
Merge pull request #33227 from barredterra/add-translation-variable-order
fix: add translation variable index
2022-12-08 15:17:07 +05:30
Deepesh Garg
f0487451f7
Merge pull request #33248 from QwQuan/develop
fix: bugs in zh.csv
2022-12-08 15:16:16 +05:30
sonali
e5a1189bec Update bank_reconciliation_tool.py
Applying date filter on transactions and all the bank entries and also gives the filter the bank entries as per reference date. Sorted all transactions and entries as per date in ascending order.
Also added posting date columns in all bank entries and default checkbox tick of journal entry, hide the sales invoice and purchase invoice checkbox.
2022-12-08 13:29:28 +05:30
ruthra kumar
1d37c0143f
Merge pull request #33254 from ruthra-kumar/index_error_on_customer_master
fix: index error on customer master
2022-12-08 12:52:20 +05:30
Rohit Waghchaure
f598da7c81 fix: total value in Warehouse Wise Stock Balance 2022-12-08 00:55:45 +05:30
s-aga-r
632c08f7e0 fix: order status in Production Planning Report 2022-12-07 22:47:06 +05:30
ruthra kumar
cf1e3dc8ea fix: index error on customer master 2022-12-07 20:48:40 +05:30
MOHAMMED NIYAS
922375c3ba
feat: get lead with WhatsApp number 2022-12-07 17:50:35 +05:30
wuzhouquan
a6fe79f29d fix: bugs in zh.csv 2022-12-07 15:04:56 +08:00
anandbaburajan
18fc2b5695 chore: fix bug in unlink_asset_reference 2022-12-06 23:34:56 +05:30
anandbaburajan
2cd42dbb10 chore: refactor get_finance_book_value_map 2022-12-06 23:16:02 +05:30
anandbaburajan
e7d404a30a chore: remove finance_book and finance_book_id from depreciation_schedule and refactor some functions 2022-12-06 21:33:20 +05:30
anandbaburajan
8365d6bdb7 fix: refactor reverse_depreciation_entry_made_after_disposal and fix fb bug 2022-12-06 17:58:38 +05:30
rohitwaghchaure
7cbb6c4de9
Merge pull request #33236 from rohitwaghchaure/feat-warehouse-wise-stock-balance
feat: warehouse wise stock balance
2022-12-06 17:58:31 +05:30
Deepesh Garg
b602a0dcb0
Merge pull request #33146 from barredterra/reload-currency-exchange-settings
fix: reload Currency Exchange Settings in patch
2022-12-06 17:38:13 +05:30
Deepesh Garg
26adbc6282
Merge pull request #33192 from deepeshgarg007/bundle_item_rates
fix: Bundle item rates
2022-12-06 17:37:22 +05:30
Rohit Waghchaure
861aa9e08a feat: warehouse wise stock balance 2022-12-06 17:33:33 +05:30
Deepesh Garg
c1a82dc9e5
Merge pull request #33191 from ruthra-kumar/key_error_in_profit_loss_report
fix: key error while filtering on date range and reporting on foreign currency
2022-12-06 15:42:53 +05:30
Deepesh Garg
b1242bc56c chore: Update tests 2022-12-06 15:14:48 +05:30