Deepesh Garg
|
1f79b47a17
|
fix: Do not update ignore prcing rule check implicitly
|
2022-03-16 11:55:43 +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
|
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
|
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
|
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 |
|
Deepesh Garg
|
1bdcb73d5d
|
Merge pull request #29879 from deepeshgarg007/misc_fixes
fix: Validate party account with company
|
2022-02-23 11:22:08 +05:30 |
|
Deepesh Garg
|
70b960e650
|
fix: Account filter in PSOA
|
2022-02-22 09:16:08 +05:30 |
|
Deepesh Garg
|
a4c6cb9f12
|
fix: Remove print statements
|
2022-02-21 17:08:25 +05:30 |
|
Deepesh Garg
|
b7c388976d
|
Merge branch 'develop' of https://github.com/frappe/erpnext into loan_bank_reco
|
2022-02-21 16:58:52 +05:30 |
|
Ankush Menat
|
afc81351b7
|
test: only test erpnext doctypes
Co-authored-by: gavin <gavin18d@gmail.com>
|
2022-02-21 15:32:28 +05:30 |
|
Ankush Menat
|
3a5dbfab50
|
fix: make cashflow mapping template child doctype
|
2022-02-21 15:32:28 +05:30 |
|
Deepesh Garg
|
295cbb0ff2
|
fix: Update queries in Bank Reconciliation Tool
|
2022-02-21 11:45:23 +05:30 |
|
Deepesh Garg
|
5a2b571aa9
|
fix: Validate party account with company
|
2022-02-18 20:05:49 +05:30 |
|
Deepesh Garg
|
555b1335f6
|
feat: Bank Reconciliation for loan documents
|
2022-02-17 19:15:30 +05:30 |
|
ChillarAnand
|
b3d4465db6
|
Merge branch 'develop' into remove-nonprofit
|
2022-02-17 15:30:11 +05:30 |
|
Saqib Ansari
|
680f8c4dc2
|
Merge pull request #29848 from nextchamp-saqib/fix-brt-currency
fix: currency in bank reconciliation tool
|
2022-02-17 14:27:07 +05:30 |
|
Saqib Ansari
|
60674e52b8
|
fix: currency in bank reconciliation tool
|
2022-02-17 14:19:42 +05:30 |
|
ChillarAnand
|
db1957ffe6
|
Merge branch 'develop' into remove-nonprofit
|
2022-02-17 13:00:58 +05:30 |
|
Saqib Ansari
|
18d0a59a9d
|
fix: disable rounded total in opening invoice creation tool
|
2022-02-14 18:38:02 +05:30 |
|
Ankush Menat
|
eb8b424722
|
feat: item-wise negative stock setting (#29761)
|
2022-02-12 13:08:28 +05:30 |
|
Saqib Ansari
|
b35b637d01
|
Merge pull request #29701 from nextchamp-saqib/consolidation-round-off-err
fix(pos): incorrect grand_total in case of inclusive taxes on item
|
2022-02-09 16:42:30 +05:30 |
|
Saqib Ansari
|
0ebd32dc63
|
fix: cancelling of consolidated sales invoice that doesn't have closing entry
|
2022-02-09 16:08:28 +05:30 |
|
Saqib Ansari
|
75256863c6
|
fix(test): do not enable negative stock
|
2022-02-09 16:07:33 +05:30 |
|