Commit Graph

240 Commits

Author SHA1 Message Date
Suraj Shetty
3593573ed2 Merge branch 'develop' of https://github.com/frappe/erpnext into move-exotel-to-separate-app 2022-07-22 12:24:20 +05:30
Rucha Mahabal
d8aa1c59f1
Merge branch 'develop' into hr-separation 2022-07-12 19:27:19 +05:30
Rucha Mahabal
ef02e58859 Merge branch 'develop' into hr-separation 2022-07-07 13:46:54 +05:30
Sagar Sharma
f9885746a8
Merge branch 'develop' into subcontracting 2022-07-07 09:56:23 +05:30
Rucha Mahabal
6a65c8aff4 Merge branch 'develop' into hr-separation 2022-06-28 11:51:59 +05:30
s-aga-r
f6ef3068d7 Merge branch 'develop' into subcontracting 2022-06-20 23:10:31 +05:30
Sagar Vora
ec9861266e Merge remote-tracking branch 'upstream/develop' into remove-india 2022-06-19 22:57:22 +05:30
Ankush Menat
6f2086d770
test: verify that all patches exist in patches.txt (#31371)
* chore: delete orphaned patches

* test: orphan/missing entries in patches.txt


[skip ci]
2022-06-16 22:15:06 +05:30
Rucha Mahabal
3fe2ef6790 chore: update import paths for HR 2022-06-15 12:43:45 +05:30
Marica
f5ebaed191
Merge branch 'develop' into subcontract-supplied-items 2022-06-13 18:32:43 +05:30
marination
b8f468cb4f test: PO Supplied Qty reset on cancel/submit 2022-06-13 18:31:35 +05:30
Sagar Sharma
f755430098
Merge branch 'develop' into subcontracting 2022-06-13 03:00:53 -07:00
Gavin D'souza
e9af68e947 test: Remove deprecated as_tuple kwarg in FrappeTestAPI.post 2022-06-13 14:26:59 +05:30
Rucha Mahabal
512c82f76d chore: Update imports/paths for doctypes moved to erpnext setup module 2022-06-10 15:06:54 +05:30
s-aga-r
992ba974e2 Merge branch 'develop' into subcontracting 2022-06-03 13:25:49 +05:30
Ankush Menat
c02598a51b chore: remove framework tests from erpnext
Similar tests exist in FW and this is failing because someone updated
the translations
2022-05-30 11:12:17 +05:30
Sagar Sharma
4ff734c25a
Merge branch 'develop' into subcontracting 2022-05-25 12:32:33 +05:30
Ankush Menat
a36174afdf
test: search test failing because of stale data (#31098) 2022-05-23 15:12:11 +05:30
Sagar Sharma
213113bc00 Merge branch 'develop' into subcontracting 2022-05-20 12:13:13 +05:30
Sagar Sharma
409df263e8 refactor!: change "is_subcontracted" field type from "Select" to "Check" 2022-05-20 10:45:33 +05:30
Ankush Menat
3263ecf54c
test: check translation files (#31006) 2022-05-13 16:38:04 +05:30
Suraj Shetty
ec1607e825 Merge branch 'develop' of https://github.com/frappe/erpnext into move-exotel-to-separate-app 2022-05-08 16:10:55 +05:30
Suraj Shetty
53e4fee4db refactor: Remove exotel
Move it to separate app
2022-05-08 16:04:14 +05:30
Ankush Menat
ad7c113c0d test: activation 2022-05-05 11:02:23 +05:30
Deepesh Garg
429361ce87 chore: Remove domains from Setup 2022-04-27 13:32:51 +05:30
Suraj Shetty
ff41b8da4e fix: Update received_by if "to" is changed 2022-04-13 20:12:08 +05:30
Suraj Shetty
cef28df8db test: Do not overwrite frappe.form_dict to retain proxy reference
Set frappe.local.form_dict instead
2022-04-13 19:10:19 +05:30
Suraj Shetty
7ff5bc9e3d test: Clean up form_dict
To avoid failures like
https://github.com/frappe/erpnext/runs/5887687369?check_suite_focus=true#step:12:783
2022-04-08 21:33:29 +05:30
Suraj Shetty
117e5d05a3
Merge branch 'develop' into exotel-fixes 2022-04-04 18:21:46 +05:30
Suraj Shetty
40d33b5fec test: Use FrappeAPITestCase to track coverage 2022-04-04 11:15:29 +05:30
Suraj Shetty
f4b8573e64 test: Fix erroneous code 2022-04-04 09:31:15 +05:30
Suraj Shetty
0e9ebad9c6 test: Refactor exotel test setup
- Remove unnecessary code
- Move test data to separate file
- Make proper test assertions
2022-04-04 07:23:08 +05:30
Subin Tom
e57e7bb02c fix: added tests(fixed) 2022-04-02 17:16:56 +05:30
Sagar Sharma
d074c93ac7 refactor!: change "is_subcontracted" field type from "Select" to "Check" 2022-04-01 13:22:44 +05:30
Ankush Menat
494bd9ef78 style: format code with black 2022-03-28 18:52:46 +05:30
Ankush Menat
10d5fb8cd1 test: check printviews for all docs 2022-03-25 10:51:19 +05:30
Sagar Vora
3d45f3a6a8 Merge remote-tracking branch 'upstream/develop' into remove-india 2022-03-03 10:20:50 +05:30
Saqib Ansari
056a0ec421
Merge pull request #30034 from nextchamp-saqib/fix-pos-flaky-test
fix(test): flaky test_point_of_sale
2022-03-01 15:32:33 +05:30
Saqib Ansari
47fe87a72f fix(test): flaky test_point_of_sale 2022-03-01 14:56:24 +05:30
Ankush Menat
b0d1e6db54 test(refactor): use FrappeTestCase 2022-02-28 17:23:32 +05:30
Marica
e8e9bc4daa
Merge pull request #29733 from dj12djdjs/fix-user-unique-cart
fix(e-commerce): Unique Shopping Cart Per Logged In User
2022-02-25 16:35:14 +05:30
Sagar Vora
5159e2e6c5 refactor: remove India specific code 2022-02-25 11:36:18 +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
e3ea431ef3 test: test all form loads 2022-02-21 15:32:28 +05:30
Devin Slauenwhite
aeee334843 Merge remote-tracking branch 'upstream/develop' into feat-user-unique-cart 2022-02-09 11:08:24 -05:00
Devin Slauenwhite
d636c3fb04 test: many users linked to customer shopping cart 2022-02-09 10:52:38 -05:00
Saqib Ansari
4bb557dbd8 fix: flaky point of sale test 2022-02-09 16:07:42 +05:30
Mohammed Yusuf Shaikh
a3e69cf75d
feat: Bulk Transaction Processing (#28580)
* feat: Bulk Transaction Processing

* fix: add flags to ignore validations and exception handling correction

* fix: remove duplicate code, added logger functionality and improved notifications

* fix: linting and sider issues

* test: added tests

* fix: linter issues

* fix: failing test case

* fix: sider issues and test cases

* refactor: mapping function calls to create order/invoice

* fix: added more test cases to increase coverage

* fix: test cases

* fix: sider issue

* fix: rename doctype, improve formatting and minor refactor

* fix: update doctype name in hooks and sider issues

* fix: entry log test case

* fix: typos, translations and company name in tests

* fix: linter issues and translations

* fix: linter issue

* fix: split into separate function for marking failed transaction

* fix: typos, retry failed transaction logic and make log read only

* fix: hide retry button when no failed transactions and remove test cases not rrelevant

* fix: sider issues and indentation to tabs

Co-authored-by: Ankush Menat <ankush@frappe.io>
2022-02-08 01:00:37 +05:30
Saqib Ansari
bf70feb7c9 fix: flaky test 2022-02-01 15:26:33 +05:30
Saqib Ansari
4e4159ec06 chore: remove unused import 2022-02-01 14:02:52 +05:30