nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-08-27 22:05:19 +00:00
Code Issues Packages Projects Releases Wiki Activity
40,712 Commits 623 Branches 1,804 Tags
2045df19f99eb7886b20645fac9a210223d663b0
Commit Graph

200 Commits

Author SHA1 Message Date
Marica
6064ca6fed test: Pass "yes" instead of 1 for is_subcontracted in create_purchase_order 2022-06-13 21:06:04 +05:30
marination
86a0ba5c9f test: PO Supplied Qty reset on cancel/submit 
(cherry picked from commit b8f468cb4f)
 2022-06-13 15:13:54 +00:00
Ankush Menat
eb8d30fe06 chore: remove framework tests from erpnext 
Similar tests exist in FW and this is failing because someone updated
the translations
 2022-05-30 15:42:34 +05:30
mergify[bot]
f6b2f36ca8 test: search test failing because of stale data (backport #31098) (#31099) 
test: search test failing because of stale data (#31098)

(cherry picked from commit a36174afdf)

Co-authored-by: Ankush Menat <me@ankush.dev>
 2022-05-23 15:13:13 +05:30
mergify[bot]
6adeaa1de6 test: check translation files (backport #31006) (#31007) 
This is an automatic backport of pull request #31006 done by [Mergify](https://mergify.com).


---


<details>
<summary>Mergify commands and options</summary>

<br />

More conditions and actions can be found in the [documentation](https://docs.mergify.com/).

You can also trigger Mergify actions by commenting on this pull request:

- `@Mergifyio refresh` will re-evaluate the rules
- `@Mergifyio rebase` will rebase this PR on its base branch
- `@Mergifyio update` will merge the base branch into this PR
- `@Mergifyio backport <destination>` will backport this PR on `<destination>` branch

Additionally, on Mergify [dashboard](https://dashboard.mergify.com/) you can:

- look at your merge queues
- generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com
</details>
 2022-05-16 06:13:32 +00:00
Ankush Menat
c07713b860 style: bulk format code with black 
v13 port because otherwise backports will result in conflicts always
 2022-03-29 17:29:34 +05:30
Ankush Menat
1fd96f379f test(refactor): use FrappeTestCase 
(cherry picked from commit b0d1e6db54)
 2022-03-14 16:20:04 +05:30
mergify[bot]
c7539ae416 fix(test): flaky test_point_of_sale (#30035) 
(cherry picked from commit 47fe87a72f)

Co-authored-by: Saqib Ansari <nextchamp.saqib@gmail.com>
 2022-03-01 17:51:40 +05:30
Devin Slauenwhite
a067aabb3c test: many users linked to customer shopping cart 2022-02-25 16:43:04 +05:30
Saqib Ansari
02cf4e9f25 fix: flaky point of sale test 
(cherry picked from commit 4bb557dbd8)
 2022-02-09 11:13:05 +00:00
Saqib Ansari
4778f16c56 fix: flaky test 
(cherry picked from commit bf70feb7c9)
 2022-02-01 11:07:33 +00:00
Saqib Ansari
33e8cd9cde chore: remove unused import 
(cherry picked from commit 4e4159ec06)
 2022-02-01 11:07:33 +00:00
Saqib Ansari
04acbea93d chore: remove useless rollback 
(cherry picked from commit 2aca54eb38)
 2022-02-01 11:07:32 +00:00
Saqib Ansari
c8f2a7fc69 test: point of sale search 
(cherry picked from commit 650d44a714)
 2022-02-01 11:07:32 +00:00
mergify[bot]
d361e23a59 test: clear singles cache for changed settings (#29430) (#29431) 
(cherry picked from commit 3d3f0139fd)

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2022-01-24 18:46:20 +05:30
mergify[bot]
ef47570977 test: remove unnecessary creation of companies #28965 (#28967) 
test: remove unnecessary creation of companies
(cherry picked from commit d7148adee5)

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2021-12-20 23:22:34 +05:30
Ankush Menat
25fd11e24f test: timeout certain tests in work order to avoid stuck tests (#28666) 2021-12-14 18:21:48 +05:30
Ankush Menat
fbfaf75b66 chore: remove __future__ py2 compatibility imports 2021-11-25 17:42:24 +05:30
mergify[bot]
a33ebbdc54 test: remove unnecessary creation of new company (#28137) (#28140) 
(cherry picked from commit afe09d4e80)

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2021-10-29 14:19:25 +05:30
Ankush Menat
5bdb6041b9 refactor: rollback after full test 
(cherry picked from commit acdb26a4bb)
 2021-10-12 16:41:48 +05:30
Ankush Menat
89828defc5 test: add custom TestCase class and use in stock 
(cherry picked from commit 06fa35a9c1)
 2021-10-12 16:41:48 +05:30
mergify[bot]
05374cb8b2 fix(Org Chart): use attribute selectors instead of ID selector for node IDs with special characters (#27717) (#27718) 
* fix(Org Chart): use attribute selectors instead of ID selector for node IDs with special chars

* fix: UI tests

(cherry picked from commit 9e08229b7b)

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2021-09-30 18:45:22 +05:30
mergify[bot]
10cffe81b0 fix: Webform Permission for custom doctype (backport #26232) (#27592) 
* fix: Webform Permission for custom doctype (#26232)

* fix: Webform Permission for custom doctype

* fix: sider fix

* fix: app check condition for getting correct list_context

* chore: Better naming convention

* test: Added test case to check permission for webform of custom doctype

* chore: linting issue

* chore: linting issue

* fix: sider fix

* test: minor changes

* chore: linter and better naming method

* chore: linter fix

(cherry picked from commit 9aa6f52edd)

# Conflicts:
#	erpnext/hooks.py

* chore: Resolved Conflicts

Co-authored-by: Shariq Ansari <30859809+shariquerik@users.noreply.github.com>
 2021-09-20 20:28:29 +05:30
Frappe PR Bot
8b3ef8e96e test: automated test for running all stock reports (#27510) (#27522) 
* test: automated test for running all stock reports

These test do not assert correctness, they just check that "execute" function
is working with sane filters.

* test: make report execution test modular

(cherry picked from commit 70c203d19e)

Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
 2021-09-15 22:23:07 +05:30
Chillar Anand
4b2be2999f chore: Cleanup imports (#27320) 
* chore: Added isort to pre-commit config

* chore: Sort imports with isort

* chore: Remove imports with pycln

* chore: Sort imports with isort

* chore: Fix import issues

* chore: Fix sider issues

* chore: linting

* chore: linting / sorting import

from ecommerce refactor merge

* ci: dont allow unused imports

* chore: sort / clean ecommerce imports

Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
 2021-09-03 18:57:43 +05:30
Ankush Menat
9bb69e711a chore: whitespace cleanup from codebase 2021-08-19 14:33:03 +05:30
Rucha Mahabal
89c5bb6066 fix: tests 2021-07-19 22:19:28 +05:30
Rucha Mahabal
8961a267f6 fix: sider 2021-07-15 19:32:15 +05:30
Rucha Mahabal
ee7eaf9c70 test: UI tests for org chart mobile 
fix(mobile): detach node before emptying hierarchy

fix(mobile): sibling group not rendering for first level
 2021-07-15 19:19:09 +05:30
Rucha Mahabal
f004b404d1 test: UI tests for org chart desktop 2021-07-14 23:50:54 +05:30
Rohit Waghchaure
f5db407461 fix: available qty for consumption 2021-06-19 23:19:45 +05:30
Rohit Waghchaure
5cc3f14506 fix: purchase invoice qty change not recalculate the consumed qty and added test cases for purchase invoice 2021-06-19 23:16:23 +05:30
Rohit Waghchaure
a94b89727c feat: subcontract code refactor and enhancement 2021-06-19 23:16:22 +05:30
Marica
7437748a1d Merge pull request #25805 from ankush/refactor_item 
refactor: item doctype
 2021-06-03 14:23:18 +05:30
Suraj Shetty
ab8816e11d test: Fix test dependency 2021-05-28 09:09:36 +05:30
Suraj Shetty
7b74985a54 test: Fix test_dependencies 2021-05-28 09:07:57 +05:30
Suraj Shetty
34e620fb5b test: Fix dependency 2021-05-28 09:07:57 +05:30
Ankush Menat
76dd6e9046 test: contextmanager to change settings 2021-05-24 17:55:39 +05:30
Rushabh Mehta
f8a6dde8d8 fix(minor): routing 2021-01-08 14:37:38 +05:30
Shivam Mishra
a788ab281e fix: typo in function name 2020-05-08 15:13:48 +05:30
Suraj Shetty
8e08698c15 test: Fix wrong test for search function (#21588) 2020-05-05 12:06:58 +05:30
Nabin Hait
1aa8c2ecc4 fix: delete contact email and phone along with contact 2020-03-26 13:15:31 +05:30
Rucha Mahabal
b455318f01 fix(Integration): Woocommerce issues (#19487) 
* fix: Delivery URL returned response code 500

* fix: set default company in Woocommerce Settings

* fix: remove redundant function calls

* fix: make offset configurable for delivery date in sales order

* fix: remove redundant code from woocommerce_settings.py

* fix: import create_custom_field

* fix: added ignore_mandatory for saving item, customer and sales order

* fix: remove unused woocommerce_check custom field

* fix: do not delete custom fields or item group when sync is disabled
 2019-11-07 18:20:32 +05:30
Himanshu
25ab1e41df fix(Contact): mobile_no re-introduced and travis fixes (#19009) 
* fix: mobile_no re-introduced

* fix: test cases

* fix: set email as primary

* fix: add primary email and phone

* fix: utils for contact creation

* chore: remove = from dict
 2019-09-30 10:08:15 +05:30
Mangesh-Khairnar
7c7e9ecfcd test: translation fix 2019-08-09 14:48:36 +05:30
Aditya Hase
0ae786adec perf(tests): Do not unnecessarily create companies 2019-07-26 00:38:51 +05:30
deepeshgarg007
723e76f2ac fix: fix for test test_contact_search_in_foreign_language 2019-07-02 21:01:57 +05:30
karthikeyan5
605a0a0570 fix(woocommerce integration): travis fix 
(cherry picked from commit 2518a2ab16)
 2019-04-15 19:47:13 +05:30
karthikeyan5
2b0a8de74f fix(woocommerce integration): fixing 403 error 
(cherry picked from commit 6784335e2c)
 2019-04-15 19:45:38 +05:30
Aditya Hase
f3c22f342c fix(unicode): Import unicode_literals in every file 2019-01-22 18:36:10 +05:30