Commit Graph

5452 Commits

Author SHA1 Message Date
Sagar Vora
77c36f6d22
fix: set options for Currency field Incoming Rate (#30384) 2022-03-28 17:55:23 +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
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
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
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
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
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
7b0a97d679
fix(pos): loyalty points in case of returned pos invoice (#30242) 2022-03-15 15:54:37 +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
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
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
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