Deepesh Garg
|
e2fa9f708e
|
Merge pull request #30710 from deepeshgarg007/advance_jv_allocation
fix: Exchange gain and loss on advance Journal Entry allocation
|
2022-04-14 15:10:04 +05:30 |
|
Deepesh Garg
|
c38be53ce8
|
test: Update customer in Sales Invoice
|
2022-04-14 13:26:47 +05:30 |
|
Deepesh Garg
|
31883b699d
|
fix: Exchange gain and loss on advance jv allocation
|
2022-04-13 20:52:25 +05:30 |
|
Deepesh Garg
|
9bf5f76ac8
|
fix: Deferred Revenue/Expense Account validation
|
2022-04-06 17:33:46 +05:30 |
|
Sagar Sharma
|
d074c93ac7
|
refactor!: change "is_subcontracted" field type from "Select" to "Check"
|
2022-04-01 13:22:44 +05:30 |
|
Saqib Ansari
|
199a6da960
|
perf: skip warehouse validation for non-stock items
|
2022-03-31 11:41:52 +05:30 |
|
Saqib Ansari
|
6528218ac3
|
perf: skip warehouse validation for non-stock items
|
2022-03-29 18:43:33 +05:30 |
|
Ankush Menat
|
494bd9ef78
|
style: format code with black
|
2022-03-28 18:52:46 +05:30 |
|
Deepesh Garg
|
06936cf1c0
|
fix: Validate income/expense account in sales and purchase invoice
|
2022-03-16 09:02:04 +05:30 |
|
Deepesh Garg
|
a61790c00f
|
fix: Remove unintended changes
|
2022-02-22 20:58:10 +05:30 |
|
Deepesh Garg
|
5a2b571aa9
|
fix: Validate party account with company
|
2022-02-18 20:05:49 +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 |
|
Saqib Ansari
|
ab36b27a94
|
fix: ignore pricing rule in all transactions
|
2022-02-09 10:10:17 +05:30 |
|
Saqib Ansari
|
4f4395545e
|
Merge branch 'develop' into fix-ignore-pricing-rule
|
2022-02-08 15:29:28 +05:30 |
|
Saqib Ansari
|
9432d8edd1
|
Merge branch 'develop' into bug_invoice_creation_throws_typeerror
|
2022-02-04 10:20:43 +05:30 |
|
Saqib Ansari
|
5a7236efcd
|
Merge branch 'develop' into fix-ignore-pricing-rule
|
2022-02-02 21:47:51 +05:30 |
|
ruthra kumar
|
9bd56b0f79
|
fix: typeerror on invoice creation from SO/PO
|
2022-02-01 14:14:04 +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 |
|
Saqib Ansari
|
b8c41e3030
|
test: item price on remove pricing rule
|
2022-01-20 13:06:56 +05:30 |
|
Deepesh Garg
|
30a647ff80
|
fix: Handle frozen books while handling
|
2022-01-07 19:52:38 +05:30 |
|
Deepesh Garg
|
b83608b029
|
Merge pull request #28994 from nextchamp-saqib/zero-qty-debit-note
fix: cannot create debit note with zero qty
|
2022-01-07 18:35:24 +05:30 |
|
Ankush Menat
|
733c9defdf
|
fix: update idx after updating items in so/po (#29134)
|
2022-01-04 18:39:30 +05:30 |
|
Saqib Ansari
|
79ccf80faf
|
Merge branch 'develop' into zero-qty-debit-note
|
2021-12-29 17:32:16 +05:30 |
|
Pruthvi Patel
|
fc0dd3fcd7
|
Merge branch 'develop' into fix-invoice-statuses
|
2021-12-29 13:45:35 +05:45 |
|
Deepesh Garg
|
7ad149f9fe
|
fix: Start date validation for deferred invoices
|
2021-12-23 14:39:20 +05:30 |
|
Saqib Ansari
|
2be5104848
|
fix: cannot save debit note with zero quantity
|
2021-12-23 11:52:10 +05:30 |
|
Pruthvi Patel
|
16a90d3e60
|
Update erpnext/controllers/accounts_controller.py
Co-authored-by: Saqib <nextchamp.saqib@gmail.com>
|
2021-12-20 13:24:19 +05:30 |
|
Pruthvi Patel
|
0799f378b4
|
fix: consider Discounted status
|
2021-12-20 13:18:42 +05:30 |
|
Pruthvi Patel
|
6c96ed4e11
|
refactor: update_invoice_status with query builder
|
2021-12-20 13:18:42 +05:30 |
|
Deepesh Garg
|
a7f15a0eea
|
Merge branch 'develop' of https://github.com/frappe/erpnext into party_account_currency_check
|
2021-12-12 21:09:11 +05:30 |
|
Ankush Menat
|
bb00d38dd7
|
Merge branch 'develop' into asset-capitalization
|
2021-11-30 19:32:11 +05:30 |
|
Raffael Meyer
|
e10ab1626c
|
feat: Grant commission on certain items only (#27467)
Co-authored-by: Sagar Vora <sagar@resilient.tech>
|
2021-11-30 17:54:18 +05:30 |
|
Deepesh Garg
|
38dfb60243
|
Merge pull request #27348 from deepeshgarg007/advance_tds_allocation_gl
fix (refactor): Tax Withholding for Advances using Payment Entry against suppliers
|
2021-11-26 14:28:50 +05:30 |
|
Saqib
|
9c913c9b2d
|
fix: over billing validation (#28218)
|
2021-11-26 12:00:13 +05:30 |
|
Deepesh Garg
|
7f06c8ca57
|
fix: Incorrect indentation
|
2021-11-26 10:27:57 +05:30 |
|
Deepesh Garg
|
f07f010962
|
fix: Add tests
|
2021-11-25 23:58:16 +05:30 |
|
Deepesh Garg
|
5ba3b28d69
|
fix(refactor): Advance tds allocation to purchase invoice
|
2021-11-25 15:42:30 +05:30 |
|
Deepesh Garg
|
6ca5f228f8
|
Merge branch 'develop' of https://github.com/frappe/erpnext into advance_tds_allocation_gl
|
2021-11-24 10:45:02 +05:30 |
|
Deepesh Garg
|
88648570d7
|
fix: Default party account getting overriden in invoices
|
2021-11-12 12:39:30 +05:30 |
|
Saif Ur Rehman
|
13f8edd43f
|
Merge remote-tracking branch 'upstream/develop' into asset-capitalization
# Conflicts:
# erpnext/accounts/doctype/sales_invoice/sales_invoice.py
|
2021-11-09 12:17:17 +05:00 |
|
Ankush Menat
|
8fe5feb6a4
|
chore: remove all six compat code
|
2021-11-05 11:16:29 +05:30 |
|
Ankush Menat
|
6098e92ba9
|
chore: remove utf-8 compat code
|
2021-11-05 11:16:29 +05:30 |
|
Saif Ur Rehman
|
dc3c27fd1b
|
fix(Asset Capitalization): update code for changes in depreciation logic
|
2021-11-04 13:47:33 +05:00 |
|
Saif Ur Rehman
|
2d9da22721
|
Merge branch 'develop' of https://github.com/frappe/erpnext into asset-capitalization
# Conflicts:
# erpnext/accounts/doctype/sales_invoice/sales_invoice.py
# erpnext/assets/doctype/asset/test_asset.py
# erpnext/assets/workspace/assets/assets.json
|
2021-11-04 12:48:33 +05:00 |
|
Deepesh Garg
|
051aaa708d
|
fix: Ignore PO on So cancel
|
2021-10-29 11:35:34 +05:30 |
|
GangaManoj
|
d24cfff388
|
fix: Remove unused imports
|
2021-10-28 20:06:48 +05:30 |
|
GangaManoj
|
8844fdbf23
|
fix: Remove print statements
|
2021-10-28 19:26:09 +05:30 |
|
Deepesh Garg
|
8e2b4ef456
|
Merge branch 'develop' into unlink-po-on-cancelling-so
|
2021-10-28 14:44:34 +05:30 |
|
Deepesh Garg
|
af9ead84e9
|
Merge pull request #28080 from deepeshgarg007/payment_terms_precision_validate
fix: Payment Terms validation precision
|
2021-10-27 11:48:23 +05:30 |
|
Ankush Menat
|
6ec047cba9
|
fix(ux): overbiling message in SO->SI, PO->PI (#28088)
|
2021-10-27 10:30:05 +05:30 |
|
Deepesh Garg
|
9c1705205f
|
fix: Payment Terms validation precision
|
2021-10-25 20:06:24 +05:30 |
|
Sagar Vora
|
8d9d0987fe
|
fix: incorrect status being set in Invoices (#28019)
Co-authored-by: Pruthvi Patel <pruthvipatel145@gmail.com>
|
2021-10-20 19:15:35 +05:30 |
|
Saqib
|
e8ff649298
|
Merge branch 'develop' into fix-32644
|
2021-09-26 17:07:46 +05:30 |
|
Saqib Ansari
|
78ad50efc2
|
fix: cost center in exchange gain loss gl entry
|
2021-09-26 16:08:15 +05:30 |
|
Saqib Ansari
|
64efe8bf15
|
fix: setting of gain/loss if party account is in company currency
|
2021-09-26 15:46:13 +05:30 |
|
Sagar Vora
|
c8b9a55e96
|
feat: add Partly Paid status in Invoices (#27625)
|
2021-09-22 12:11:35 +05:30 |
|
GangaManoj
|
e77534fe13
|
fix: Unlink PO on cancelling SO
|
2021-09-20 21:18:18 +05:30 |
|
Ganga Manoj
|
41678faeee
|
Merge branch 'develop' into unlink-po-on-cancelling-so
|
2021-09-20 21:16:31 +05:30 |
|
GangaManoj
|
8396f24e70
|
fix: Unlink PO on cancelling SO
|
2021-09-20 19:01:46 +05:30 |
|
Ankush Menat
|
21a955d20b
|
fix(ux): better error message
Co-authored-by: Saqib <nextchamp.saqib@gmail.com>
|
2021-09-20 17:14:35 +05:30 |
|
Ankush Menat
|
5e4fbba753
|
refactor: add guard clause in for loop
Reduce overly indented code/improve readability.
|
2021-09-20 16:40:51 +05:30 |
|
Ankush Menat
|
43bf82b58b
|
fix: warn when overbilling checks are skipped.
|
2021-09-20 16:31:20 +05:30 |
|
Ankush Menat
|
648b2d72a5
|
perf: extract loop invariant db calls
|
2021-09-20 15:27:12 +05:30 |
|
Saif Ur Rehman
|
e832944dfe
|
fix(Asset): On Depreciation reversal, remove Journal Entry reference
|
2021-09-16 23:22:31 +05:00 |
|
Saif Ur Rehman
|
9ae0380a96
|
chore(Asset Capitalization): isort linting
|
2021-09-14 15:09:58 +05:00 |
|
Saif Ur Rehman
|
7a5d75b68d
|
feat(Asset Capitalization): Submission and Cancellation
|
2021-09-13 23:01:52 +05:00 |
|
Deepesh Garg
|
25d208aa8a
|
fix: GL Entries on advance TDS allocation
|
2021-09-06 10:37:41 +05:30 |
|
Chillar Anand
|
915b34391c
|
chore: Clean up imports (#27302)
* chore: Added isort to pre-commit config
* chore: Sort imports with isort
* chore: Clean up imports with pycln
* chore: Sort imports with isort
* chore: Fix import issues
* chore: Clean up sider issues
* chore: Remove import errors from flake8 ignore list
* chore: Clean up lint issues
|
2021-09-02 16:44:59 +05:30 |
|
Frappe PR Bot
|
81fb493850
|
fix: payment terms on Sales Order when Invoice Portion field is empty (#27259)
|
2021-08-31 19:01:03 +05:30 |
|
Anuja Pawar
|
3e404f15ff
|
refactor: payment reconciliation tool (#27128)
|
2021-08-31 18:59:29 +05:30 |
|
Deepesh Garg
|
27ca9866e3
|
Merge branch 'develop' of https://github.com/frappe/erpnext into party_account_currency_check
|
2021-08-25 20:47:16 +05:30 |
|
Saqib Ansari
|
c6c7a8b5cf
|
fix: cost center & naming series
|
2021-08-25 20:17:04 +05:30 |
|
Saqib Ansari
|
7254368fc5
|
perf: reduce number of queries to get party link
|
2021-08-25 20:15:23 +05:30 |
|
Saqib Ansari
|
881301ca9b
|
Merge branch 'develop' of https://github.com/frappe/erpnext into common-party-acc
|
2021-08-25 20:02:27 +05:30 |
|
Nabin Hait
|
b99a8cb96e
|
Merge pull request #27087 from deepeshgarg007/validate_due_date_fix
fix: Ignore due date validations if payment terms are copied from orders/receipts
|
2021-08-24 21:10:44 +05:30 |
|
Saqib
|
1db812ab9f
|
Merge branch 'develop' into common-party-acc
|
2021-08-24 17:27:43 +05:30 |
|
Ankush Menat
|
6de7b8ea93
|
fix: discard empty rows from update items (#27021)
|
2021-08-24 12:18:40 +05:30 |
|
Deepesh Garg
|
bd709f8ab0
|
fix: Ignore due date validations if payment terms are copied from orders/receipts
|
2021-08-23 19:05:52 +05:30 |
|
Deepesh Garg
|
60915e874d
|
test: Update test cases for currency change validation
|
2021-08-21 23:05:48 +05:30 |
|
Deepesh Garg
|
1435800249
|
Merge branch 'develop' of https://github.com/frappe/erpnext into party_account_currency_check
|
2021-08-21 20:14:17 +05:30 |
|
Saqib
|
5395f56c88
|
Merge branch 'develop' into common-party-acc
|
2021-08-20 20:42:50 +05:30 |
|
Saqib
|
c335962827
|
refactor!: drop e-invoicing integration from erpnext (#26940)
|
2021-08-20 11:10:46 +05:30 |
|
Saqib Ansari
|
977b09b6ba
|
feat: auto create advance entry on invoice submission
|
2021-08-19 18:09:35 +05:30 |
|
Ankush Menat
|
4551d7d602
|
chore: mass trailing whitespace and EOF fixes
|
2021-08-19 13:43:28 +05:30 |
|
Frappe PR Bot
|
44434ff70f
|
fix: date_unchanged calculation in "Update Items" (#26992) (#27011)
Branch corrected https://github.com/frappe/erpnext/pull/26058
ERPNext generates "Cannot set quantity less than delivered quantity" error even the delivered qty is zero when user clicks "Update Items".
"date_unchanged" variable gets false value because of new_date is string.
"getdate(new_date)" corrects the date comparison.
![ERPNext_PR](https://user-images.githubusercontent.com/710051/121928377-c0263180-cd48-11eb-8cd9-eda7dace09d6.gif)
(cherry picked from commit d8a7abcd02f674bf6c4270a817ae9762a0b57140)
Co-authored-by: Türker Tunalı <turkert@hotmail.com>
|
2021-08-18 18:33:06 +05:30 |
|
Deepesh Garg
|
fa79e94b49
|
Merge branch 'develop' of https://github.com/frappe/erpnext into party_account_currency_check
|
2021-08-15 18:59:08 +05:30 |
|
Deepesh Garg
|
5122948450
|
Merge branch 'develop' of https://github.com/frappe/erpnext into enable-discount-accounting
|
2021-08-13 16:00:20 +05:30 |
|
Deepesh Garg
|
80c85dd17c
|
fix: Account currency validation for first transaction
|
2021-08-12 15:39:07 +05:30 |
|
Deepesh Garg
|
a7054560da
|
Merge branch 'develop' into po-payment-terms
|
2021-08-11 19:31:30 +05:30 |
|
Deepesh Garg
|
bff3b0962a
|
fix: Override template only if setting is enabled
|
2021-08-10 23:58:27 +05:30 |
|
Anuja Pawar
|
0e337be065
|
fix: cost center & account validation in Sales/Purchase Taxes and Charges (#25929)
|
2021-08-10 17:26:35 +05:30 |
|
Afshan
|
f5b5be9644
|
Merge branch 'develop' into po-payment-terms
|
2021-08-10 09:32:08 +05:30 |
|
Deepesh Garg
|
bcf56e64ba
|
fix: Ignore default payment term templates when coping payment terms from orders
|
2021-08-09 18:53:14 +05:30 |
|
GangaManoj
|
5b33e75c65
|
fix: Fetch discount details from Payment Terms only if Discount Type = Percentage
|
2021-08-09 18:53:14 +05:30 |
|
GangaManoj
|
0588382c38
|
fix: Stop fetching amount while fetching Payment Terms
|
2021-08-09 18:53:14 +05:30 |
|
GangaManoj
|
54d1336d11
|
fix: Condition for fetching Payment Terms from Sales/Purchase Orders
|
2021-08-09 18:53:13 +05:30 |
|
Afshan
|
b3bbebd27c
|
fix: add parameter for db insert while adding item tax (#26855)
|
2021-08-09 14:39:32 +05:30 |
|
Saqib
|
668f442139
|
Merge branch 'develop' into po-payment-terms
|
2021-08-06 13:42:10 +05:30 |
|
Deepesh Garg
|
ad7bb316c1
|
fix: GL Entries for discount amount with item qty greater than 1
|
2021-08-02 12:41:06 +05:30 |
|
Deepesh Garg
|
92f7a5a390
|
fix: GL For taxes if discount applied on Grand Total
|
2021-08-02 12:39:43 +05:30 |
|