Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
43,961 Commits 3 Branches 0 Tags 1 GiB
6a4e25c1f9
Commit Graph

33999 Commits

Author SHA1 Message Date
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
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
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
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
s-aga-r
c716dcc01e fix: consider child nodes while getting bin details 2022-12-29 14:01:42 +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
Deepesh Garg
8263bf9a9a
fix: Random behaviour while picking items using picklist (#33449) 2022-12-27 14:59:35 +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
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
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
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