Saqib Ansari
|
291415d255
|
Merge pull request #30453 from rahib-hassan/fix-paymentorder-row-delete
fix: enable row deletion in reference table
|
2022-03-30 15:00:16 +05:30 |
|
Deepesh Garg
|
d4cc7c553e
|
fix: Account currency validation
|
2022-03-30 12:43:18 +05:30 |
|
Saqib Ansari
|
6528218ac3
|
perf: skip warehouse validation for non-stock items
|
2022-03-29 18:43:33 +05:30 |
|
Saqib Ansari
|
b60fad6113
|
Merge branch 'develop' of https://github.com/frappe/erpnext into fix-asset-warehouse-validation
|
2022-03-29 10:50:21 +05:30 |
|
Saqib Ansari
|
136466d255
|
fix(asset): do not validate warehouse on asset purchase
|
2022-03-29 10:47:27 +05:30 |
|
Ankush Menat
|
3821a97a75
|
Merge branch 'develop' into mergify/bp/develop/pr-30395
|
2022-03-28 20:14:19 +05:30 |
|
Ankush Menat
|
494bd9ef78
|
style: format code with black
|
2022-03-28 18:52:46 +05:30 |
|
Sagar Vora
|
77c36f6d22
|
fix: set options for Currency field Incoming Rate (#30384)
|
2022-03-28 17:55:23 +05:30 |
|
rahib-hassan
|
500870b2b0
|
fix: enable row deletion in reference table
|
2022-03-28 15:25:01 +05:30 |
|
Deepesh Garg
|
19b1b1f4ba
|
test: test for auto write-off amount
(cherry picked from commit 6a50f36b3167d43b1e964d4f0cf96af587f1a4a2)
# Conflicts:
# erpnext/public/js/controllers/taxes_and_totals.js
|
2022-03-25 15:27:12 +00:00 |
|
Saqib Ansari
|
80c7d7064b
|
Merge branch 'develop' into fix-minor-custom-cash-flow
|
2022-03-25 17:16:42 +05:30 |
|
Saqib Ansari
|
5450542fdb
|
fix: unsupported operand type(s) for +=: 'int' and 'NoneType'
|
2022-03-25 16:44:37 +05:30 |
|
Saqib Ansari
|
33863cd6ab
|
Merge pull request #30324 from nextchamp-saqib/fix-pos-issues-again
fix: multiple pos issues
|
2022-03-25 15:34:54 +05:30 |
|
Deepesh Garg
|
a9d992ac9f
|
Merge pull request #30338 from deepeshgarg007/bank_transaction_currency_symbol_fixes
fix: Currency symbol in bank transactions
|
2022-03-25 14:39:01 +05:30 |
|
Saqib Ansari
|
1b556d1c53
|
fix: test cases
|
2022-03-24 17:59:34 +05:30 |
|
Saqib Ansari
|
cb4873c019
|
fix: sider issues
|
2022-03-24 17:56:27 +05:30 |
|
Saqib Ansari
|
cf51a0a1b8
|
fix(pos): cannot close the pos if sr. no. is sold & returned
|
2022-03-24 16:22:36 +05:30 |
|
Saqib Ansari
|
4aabe97565
|
Merge branch 'develop' into fix-pos-issues-again
|
2022-03-24 11:18:13 +05:30 |
|
Deepesh Garg
|
3a1e31592e
|
Merge branch 'develop' into ignore_price_list
|
2022-03-23 09:27:44 +05:30 |
|
Deepesh Garg
|
405dcb1d3c
|
fix: Add ignore pricelist for missing flows
|
2022-03-23 09:04:03 +05:30 |
|
Saqib Ansari
|
f2ae63cbfd
|
fix(pos): remove returned sr. nos. from pos reserved sr. nos. list
|
2022-03-22 17:41:49 +05:30 |
|
Deepesh Garg
|
ec04242d72
|
Merge pull request #30340 from deepeshgarg007/opening_too_field_fixes
fix: Opening invoice tool field placement
|
2022-03-22 16:17:12 +05:30 |
|
Deepesh Garg
|
749ab9b799
|
Merge branch 'develop' into bank_transaction_currency_symbol_fixes
|
2022-03-22 16:16:03 +05:30 |
|
Ankush Menat
|
f37316a266
|
refactor: use get_value instead of exists
|
2022-03-22 13:07:45 +05:30 |
|
barredterra
|
5c4eabf075
|
fix: usage of frappe.db.exists
|
2022-03-22 13:07:45 +05:30 |
|
Deepesh Garg
|
01cd9e7c2e
|
Merge branch 'develop' into opening_too_field_fixes
|
2022-03-22 11:53:06 +05:30 |
|
Deepesh Garg
|
69a4b8c80b
|
Merge branch 'develop' into bank_transaction_currency_symbol_fixes
|
2022-03-22 11:52:20 +05:30 |
|
HarryPaulo
|
3eb5440aa9
|
fix: linters erros on report sales payments summary (#30345)
* fix: wrong values for report and get change amout based on payment TYPE.
* charcase for select field.
* fix: linter check erros
* fix: linters errors
Co-authored-by: Ankush Menat <ankush@frappe.io>
|
2022-03-22 11:39:15 +05:30 |
|
Deepesh Garg
|
636e7f67eb
|
fix: Opening invoice tool field placement
|
2022-03-21 19:34:57 +05:30 |
|
Deepesh Garg
|
e78a445c24
|
fix: Currency symbol in bank transactions
|
2022-03-21 19:06:04 +05:30 |
|
HarryPaulo
|
01fd3adedf
|
fix: report sales payments summary (#30264)
|
2022-03-21 16:57:27 +05:30 |
|
Saqib Ansari
|
aff7408775
|
fix(pos): allow validating stock on save
|
2022-03-21 14:08:56 +05:30 |
|
Deepesh Garg
|
1daaf6be2a
|
Merge pull request #30317 from deepeshgarg007/opening_gl_validation
fix: P&L account validation on cancellation
|
2022-03-21 10:45:07 +05:30 |
|
Saqib Ansari
|
6dc7d6b085
|
Merge pull request #30287 from nextchamp-saqib/fix-cash-flow-query
fix: custom cash flow mapper doesn't show any data
|
2022-03-21 10:32:42 +05:30 |
|
Deepesh Garg
|
2ff6790283
|
fix: P&L account validation on cancellation
|
2022-03-21 09:43:31 +05:30 |
|
Ankush Menat
|
c2aad115c1
|
fix: disable deferred naming on SLE/GLE if hash method is used. (#30286)
* fix: dont rename GLE/SLE that dont have naming series
* test: tests for deferred naming of ledgers
|
2022-03-20 19:26:34 +05:30 |
|
Deepesh Garg
|
01638a01cb
|
Merge pull request #30292 from frappe/mergify/bp/develop/pr-30284
fix: Cleanup and fixes in Dimension-wise Accounts Balance Report (backport #30284)
|
2022-03-18 17:36:59 +05:30 |
|
Saqib Ansari
|
00bfee97c7
|
refactor: convert raw sql to frappe.qb
|
2022-03-18 14:31:30 +05:30 |
|
Deepesh Garg
|
8819ba07a9
|
Merge pull request #30266 from deepeshgarg007/expense_income_account_validation
fix: Validate income/expense account in sales and purchase invoice
|
2022-03-17 18:32:34 +05:30 |
|
Deepesh Garg
|
5390d5e65a
|
Merge branch 'develop' into mergify/bp/develop/pr-30284
|
2022-03-17 18:02:57 +05:30 |
|
Deepesh Garg
|
4237e5d928
|
fix: Test case
|
2022-03-17 18:00:39 +05:30 |
|
Deepesh Garg
|
a651a0ffc8
|
Merge pull request #30261 from deepeshgarg007/bank_reco_error
fix: Error in bank reconciliation statement
|
2022-03-17 17:29:15 +05:30 |
|
Deepesh Garg
|
5f89cb2cca
|
fix: Remove comments
(cherry picked from commit cab69fe1f298b44613be21c06591e868c24ee249)
|
2022-03-17 11:57:50 +00:00 |
|
Deepesh Garg
|
2dd0e20003
|
fix: Clean and fixes in Dimension-wise Accounts Balance Report
(cherry picked from commit 08a06ce5c68023c41f53b584082b5e1c4ddb1f59)
|
2022-03-17 11:57:50 +00:00 |
|
Saqib Ansari
|
119273e633
|
fix: custom cash flow mapper doesn't show any data
|
2022-03-17 14:47:50 +05:30 |
|
Ankush Menat
|
b781e8b7d1
|
revert: "fix: updated packed_items getting fetched on Sales Return / Credit Note (#28607)"
This reverts commit 20216fa9f1.
|
2022-03-16 13:36:53 +05:30 |
|
Deepesh Garg
|
2958f60b46
|
Merge pull request #30269 from deepeshgarg007/implicit_pricing_rule_enable_v2
fix: Do not update ignore pricing rule check implicitly
|
2022-03-16 12:32:25 +05:30 |
|
Deepesh Garg
|
1f79b47a17
|
fix: Do not update ignore prcing rule check implicitly
|
2022-03-16 11:55:43 +05:30 |
|
Deepesh Garg
|
06936cf1c0
|
fix: Validate income/expense account in sales and purchase invoice
|
2022-03-16 09:02:04 +05:30 |
|
Saqib Ansari
|
1797b6013e
|
Merge pull request #30244 from nextchamp-saqib/fix-gl-representation
fix: incorrect debit credit amount in presentation currency
|
2022-03-15 18:39:37 +05:30 |
|
Deepesh Garg
|
fbcb413d96
|
fix: Error in bank reco statement
|
2022-03-15 18:20:11 +05:30 |
|
Saqib Ansari
|
12d99ed69a
|
test: foreign_account_balance_after_exchange_rate_revaluation
|
2022-03-15 17:56:42 +05:30 |
|
Saqib Ansari
|
7b0a97d679
|
fix(pos): loyalty points in case of returned pos invoice (#30242)
|
2022-03-15 15:54:37 +05:30 |
|
Saqib Ansari
|
83a5fae591
|
fix: incorrect debit credit amount in presentation currency
|
2022-03-14 20:14:46 +05:30 |
|
Deepesh Garg
|
25a128220a
|
Merge pull request #30207 from deepeshgarg007/trail_balance_for_party
fix: Do not consider cancelled entries
|
2022-03-14 17:19:34 +05:30 |
|
Saqib Ansari
|
935218598a
|
Merge pull request #30198 from nextchamp-saqib/pos-fixes-#12
fix(pos): do not reset mode of payments in case of consolidation
|
2022-03-14 12:34:40 +05:30 |
|
Saqib Ansari
|
2e265d9bf6
|
test: mode of payments in case of consolidation
|
2022-03-14 11:02:33 +05:30 |
|
Deepesh Garg
|
835c029e53
|
Merge pull request #29979 from deepeshgarg007/bank_reco_multicurrency_fix
fix: Multi-currency bank reconciliation fixes
|
2022-03-13 20:27:04 +05:30 |
|
Ankush Menat
|
1a256c62c4
|
fix: attach sr no si standalone credit note
|
2022-03-13 19:00:34 +05:30 |
|
Ankush Menat
|
1c37d2711a
|
test: standalone SI creates and attaches serial nos
|
2022-03-13 19:00:34 +05:30 |
|
Deepesh Garg
|
6308e1be91
|
fix: Do not consider cancelled entries
|
2022-03-13 18:13:12 +05:30 |
|
mergify[bot]
|
b085e96a12
|
revert: "Merge pull request #29290 from s-aga-r/fix/delivery-note/billed-amount" (#29782) (#29807)
* Revert "Merge pull request #29290 from s-aga-r/fix/delivery-note/billed-amount"
This reverts commit 038f94955006c88209f9df28e3a785c59a4ddb28, reversing
changes made to c7b491843476bca89be02851ccafb7e409876609.
* fix: linter
(cherry picked from commit 7fa46f77e0bdbc516b3c0cb0fb20594ee7fa398b)
# Conflicts:
# erpnext/patches.txt
Co-authored-by: Sagar Sharma <sagarsharma.s312@gmail.com>
|
2022-03-11 18:28:50 +05:30 |
|
Deepesh Garg
|
13dce71c21
|
Merge pull request #30181 from deepeshgarg007/shipping_rule_application
fix: Shipping rule application fixes
|
2022-03-11 12:04:12 +05:30 |
|
Deepesh Garg
|
d596e0e4df
|
fix: Shipping rule application fixes
|
2022-03-10 20:56:36 +05:30 |
|
Saqib Ansari
|
e5fb871ef4
|
fix: Ignore missing customer group while fetching price list
|
2022-03-10 13:54:43 +05:30 |
|
Saqib Ansari
|
9dc9758522
|
Merge branch 'develop' of https://github.com/frappe/erpnext into party
|
2022-03-10 13:51:36 +05:30 |
|
Saqib Ansari
|
8021572432
|
Merge branch 'develop' into fix-psoa-template
|
2022-03-10 12:17:11 +05:30 |
|
Saqib Ansari
|
5d5ae16fe5
|
fix(psoa): no such element: dict object['account']
|
2022-03-10 11:12:33 +05:30 |
|
Saqib Ansari
|
45c1d83ea1
|
Merge pull request #30145 from nextchamp-saqib/add-filter-to-psoa
fix(psoa): add company filter to account
|
2022-03-10 10:53:52 +05:30 |
|
Saqib Ansari
|
fc42041f8f
|
fix(psoa): add company filter to account
|
2022-03-09 18:04:35 +05:30 |
|
Deepesh Garg
|
9b8258479c
|
fix: Update timestamp
|
2022-03-09 15:43:26 +05:30 |
|
Deepesh Garg
|
8a2fe7a2e3
|
fix: Remove tax invoice no field
|
2022-03-09 15:42:06 +05:30 |
|
Deepesh Garg
|
e192956520
|
Merge pull request #30096 from deepeshgarg007/debit_note_ux
fix(ux): Improve label for better understanding
|
2022-03-09 15:34:11 +05:30 |
|
Chillar Anand
|
282e9f83b9
|
Merge branch 'develop' into party
|
2022-03-08 09:53:03 +05:30 |
|
ChillarAnand
|
9ace7d606c
|
fix: Ignore missing customer group while fetching price list
|
2022-03-08 08:44:48 +05:30 |
|
Saqib Ansari
|
a13624d78b
|
Merge branch 'develop' into fix-pos-round-off
|
2022-03-07 18:24:13 +05:30 |
|
Saqib Ansari
|
17445c7e04
|
fix(pos): multiple pos round off cases
|
2022-03-07 18:01:07 +05:30 |
|
Deepesh Garg
|
f3a95d3c27
|
fix(ux): Improve label for better understanding
|
2022-03-07 16:10:26 +05:30 |
|
Deepesh Garg
|
629a296fb6
|
Merge branch 'develop' into bank_reco_multicurrency_fix
|
2022-03-06 18:09:30 +05:30 |
|
Deepesh Garg
|
2eb7921bff
|
fix: Exchange rate not getting set in payment entry
(cherry picked from commit 86e6bdf2c9ffc0a656c14663b6f790071a7f3afd)
|
2022-03-01 12:49:09 +00:00 |
|
Ankush Menat
|
65bb727030
|
fix: dont validate empty category
|
2022-03-01 17:47:47 +05:30 |
|
Saqib Ansari
|
6b494eed79
|
Merge pull request #30032 from nextchamp-saqib/fix-debit-credit-diff
fix: debit credit difference case with rounding adjustment
|
2022-03-01 14:12:31 +05:30 |
|
Saqib Ansari
|
ad2c64f3ff
|
fix: debit credit difference case with rounding adjustment
|
2022-03-01 13:32:34 +05:30 |
|
Deepesh Garg
|
0542416c47
|
Merge pull request #30026 from deepeshgarg007/deferred_revenue_post_accounts_freeze
fix: Deferred revenue booking
|
2022-03-01 12:41:41 +05:30 |
|
Deepesh Garg
|
366120ffee
|
fix: Deferred revenue booking
|
2022-03-01 11:57:34 +05:30 |
|
Deepesh Garg
|
785fcca957
|
Merge branch 'develop' of https://github.com/frappe/erpnext into payment_entry_total_taxes
|
2022-02-28 18:06:14 +05:30 |
|
Deepesh Garg
|
19fb7ead9f
|
test: Add test case for payment entry taxes
|
2022-02-28 18:05:58 +05:30 |
|
Ankush Menat
|
b0d1e6db54
|
test(refactor): use FrappeTestCase
|
2022-02-28 17:23:32 +05:30 |
|
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 |
|