Commit Graph

38383 Commits

Author SHA1 Message Date
Deepesh Garg
25d131a39f test: Improve test case for not coping payment terms 2021-08-07 17:39:40 +05:30
Deepesh Garg
a27ef14db6 fix: Override template only if setting is enabled 2021-08-07 00:12:57 +05:30
Deepesh Garg
a59a761f99 Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into backport-po-payment-terms 2021-08-06 23:55:01 +05:30
Deepesh Garg
0bba425fe3 fix: Ignore default payment term templates when coping payment terms from orders 2021-08-06 23:53:16 +05:30
Frappe PR Bot
aec7846407
test: fix pricelist tests (#26839) (#26840)
problem: exchange rate API is returning exchange rates for "_Test currency".
These tests were relying on failure of that function.

(cherry picked from commit 27a29eb6bc)

Co-authored-by: Ankush <ankush@iwebnotes.com>
2021-08-06 21:55:01 +05:30
Ankush
27a29eb6bc
test: fix pricelist tests (#26839)
problem: exchange rate API is returning exchange rates for "_Test currency".
These tests were relying on failure of that function.
2021-08-06 21:34:44 +05:30
Frappe PR Bot
9ea24db20a
test: use item that allows fractional UOM in test (#26837) (#26838)
(cherry picked from commit 614336fe1d)

Co-authored-by: Ankush <ankush@iwebnotes.com>
2021-08-06 21:14:40 +05:30
Ankush
614336fe1d
test: use item that allows fractional UOM in test (#26837) 2021-08-06 19:36:21 +05:30
GangaManoj
fcbd79b7d3 Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into backport-asset-repair-refactor 2021-08-06 18:12:24 +05:30
Saqib
f1141e7756
fix: failing budget test due to project naming (#26834) 2021-08-06 17:37:17 +05:30
Anupam
b4e720f8ec fix: test case 2021-08-06 14:39:13 +05:30
Anupam
59c971015a fix: test case 2021-08-06 14:02:57 +05:30
Saqib
668f442139
Merge branch 'develop' into po-payment-terms 2021-08-06 13:42:10 +05:30
Frappe PR Bot
c8e6c07032
fix(e-invoicing): cannot generate IRNs for standalone credit notes (#26824) (#26833) 2021-08-06 12:33:18 +05:30
Anupam
01a0585ba0 fix: removing organization_lead traceback 2021-08-06 12:21:02 +05:30
Anupam
4723e18f9e fix: sider issue 2021-08-06 11:16:55 +05:30
Noah Jacob
cb44aed78b test: get sales order with variant 2021-08-06 11:16:25 +05:30
Deepesh Garg
ffd7642de2
Merge pull request #26832 from deepeshgarg007/budget_test_case
test: Failing budget test due to project naming
2021-08-06 11:14:47 +05:30
Saqib
e7fa2e5826
fix(e-invoicing): cannot generate IRNs for standalone credit notes (#26824) 2021-08-06 11:03:57 +05:30
Frappe PR Bot
2e352834a2
fix: fetching of item tax from hsn code (#26736) (#26792)
* fix: fetching of item tax from hsn code

(cherry picked from commit 3a50490c04)

Co-authored-by: Saqib <nextchamp.saqib@gmail.com>
2021-08-06 10:59:29 +05:30
Deepesh Garg
6871c07685 test: Failing budget test due to project naming 2021-08-06 10:53:38 +05:30
Frappe PR Bot
b13e46071a
fix: Let all System Managers be able to delete Company transactions (#26815) (#26819)
(cherry picked from commit 884d8cf065)

Co-authored-by: Ganga Manoj <ganga.manoj98@gmail.com>
2021-08-06 10:39:58 +05:30
Nabin Hait
418d478dad
Merge pull request #26764 from nabinhait/addl_salary_fix
fix: Additional salary processing
2021-08-06 10:24:03 +05:30
Nabin Hait
894ed3a9a5
Merge pull request #26765 from frappe/revert-24206-additional_salary_tax_enhancements
Revert "fix: Tax calculation for Recurring additional salary"
2021-08-06 10:22:31 +05:30
GangaManoj
232c728636 Revert "fix: Only fetch default Payment Terms Template if present"
This reverts commit fb80ca9e06.
2021-08-05 23:04:58 +05:30
GangaManoj
fb80ca9e06 fix: Only fetch default Payment Terms Template if present 2021-08-05 22:04:11 +05:30
GangaManoj
5c21eea13d fix: Fetch discount details from Payment Terms only if Discount Type = Percentage 2021-08-05 21:50:09 +05:30
GangaManoj
e4a07d8ff3 fix: Stop fetching amount while fetching Payment Terms 2021-08-05 21:42:09 +05:30
Frappe PR Bot
6e07ec2617
fix: Do not fetch fully return issued purchase receipts (#26809) (#26825)
(cherry picked from commit 1d90f7684e)

Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
2021-08-05 20:13:28 +05:30
Deepesh Garg
1d90f7684e
fix: Do not fetch fully return issued purchase receipts (#26809) 2021-08-05 19:17:32 +05:30
Noah Jacob
041ac339b1 style: improved formatting of sql query 2021-08-05 16:37:22 +05:30
Noah Jacob
b10465eebe refactor: created function to get bom_item for query 2021-08-05 16:37:22 +05:30
noahjacob
9b0b2daf4a refactor: updated sql query for item variants 2021-08-05 16:37:22 +05:30
noahjacob
cf4078756d fix: fixed fetching sales order of item variant in production plan 2021-08-05 16:37:21 +05:30
Anupam
c35a526dd8 fix: adding test cases 2021-08-05 14:42:15 +05:30
Frappe PR Bot
5b5a365aaf
fix: POS payment modes displayed wrong total (#26808) 2021-08-05 11:15:16 +05:30
Ganga Manoj
884d8cf065
fix: Let all System Managers be able to delete Company transactions (#26815) 2021-08-05 11:14:46 +05:30
GangaManoj
4a6ef9ab0f fix: Compare Payment Schedules 2021-08-05 00:52:55 +05:30
GangaManoj
0b11420147 fix: Disable automcatically_fetch_payment_terms after running its associated tests 2021-08-05 00:35:45 +05:30
Anupam
2732490cbe fix: review changes 2021-08-05 00:30:01 +05:30
GangaManoj
23c104555b fix: Remove irrelevant code 2021-08-05 00:28:42 +05:30
Frappe PR Bot
bf8d0c256d
fix: typo in error message (#26816) (#26817)
(cherry picked from commit 005291e6dd)

Co-authored-by: François de Ryckel <f.deryckel@gmail.com>
2021-08-04 22:01:17 +05:30
François de Ryckel
005291e6dd
fix: typo in error message (#26816) 2021-08-04 21:59:18 +05:30
Noah Jacob
673bc58193 test: test case for over transfer of materials 2021-08-04 18:48:24 +05:30
Noah Jacob
8fced95f8c feat: over transfer allowance for material transfers 2021-08-04 18:48:24 +05:30
GangaManoj
8328f45230 fix: Rename test to reflect changes in code 2021-08-04 17:33:35 +05:30
Frappe PR Bot
13192e1db1
fix: trigger lost reason dialog when status is changed to lost (#26811) (#26812)
(cherry picked from commit e5d8ba65ca)

Co-authored-by: Mohammed Yusuf Shaikh <49878143+mohammedyusufshaikh@users.noreply.github.com>
2021-08-04 17:07:22 +05:30
Mohammed Yusuf Shaikh
e5d8ba65ca
fix: trigger lost reason dialog when status is changed to lost (#26811) 2021-08-04 16:35:38 +05:30
Anupam Kumar
df477dcae6
fix: bank remittance report issue (#26398) (#26766) 2021-08-04 14:02:43 +05:30
Subin Tom
035ce304fe
fix: POS payment modes displayed wrong total (#26708) 2021-08-04 13:57:55 +05:30