nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-04 12:49:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into redisearch-app-install

Browse Source
This commit is contained in:
Marica
2022-04-04 18:00:56 +05:30
committed by GitHub
parent 569eff4f27 de83511091
commit 0a592e085c
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
README.md
View File

@@ -6,6 +6,7 @@
</p> </p>
[![CI](https://github.com/frappe/erpnext/actions/workflows/server-tests.yml/badge.svg?branch=develop)](https://github.com/frappe/erpnext/actions/workflows/server-tests.yml) [![CI](https://github.com/frappe/erpnext/actions/workflows/server-tests.yml/badge.svg?branch=develop)](https://github.com/frappe/erpnext/actions/workflows/server-tests.yml)
[![UI](https://github.com/erpnext/erpnext_ui_tests/actions/workflows/ui-tests.yml/badge.svg?branch=develop&event=schedule)](https://github.com/erpnext/erpnext_ui_tests/actions/workflows/ui-tests.yml)
[![Open Source Helpers](https://www.codetriage.com/frappe/erpnext/badges/users.svg)](https://www.codetriage.com/frappe/erpnext) [![Open Source Helpers](https://www.codetriage.com/frappe/erpnext/badges/users.svg)](https://www.codetriage.com/frappe/erpnext)
[![codecov](https://codecov.io/gh/frappe/erpnext/branch/develop/graph/badge.svg?token=0TwvyUg3I5)](https://codecov.io/gh/frappe/erpnext) [![codecov](https://codecov.io/gh/frappe/erpnext/branch/develop/graph/badge.svg?token=0TwvyUg3I5)](https://codecov.io/gh/frappe/erpnext)
[![docker pulls](https://img.shields.io/docker/pulls/frappe/erpnext-worker.svg)](https://hub.docker.com/r/frappe/erpnext-worker) [![docker pulls](https://img.shields.io/docker/pulls/frappe/erpnext-worker.svg)](https://hub.docker.com/r/frappe/erpnext-worker)

2
erpnext/stock/doctype/stock_entry/stock_entry.js
View File

@@ -633,7 +633,7 @@ frappe.ui.form.on('Stock Entry Detail', {
// set allow_zero_valuation_rate to 0 if s_warehouse is selected. // set allow_zero_valuation_rate to 0 if s_warehouse is selected.
let item = frappe.get_doc(cdt, cdn); let item = frappe.get_doc(cdt, cdn);
if (item.s_warehouse) { if (item.s_warehouse) {
item.allow_zero_valuation_rate = 0; frappe.model.set_value(cdt, cdn, "allow_zero_valuation_rate", 0);
} }
}, },

4
requirements.txt
View File

@@ -1,7 +1,7 @@
# frappe # https://github.com/frappe/frappe is installed during bench-init # frappe # https://github.com/frappe/frappe is installed during bench-init
gocardless-pro~=1.22.0 gocardless-pro~=1.22.0
googlemaps googlemaps
pandas~=1.1.5 pandas>=1.1.5,<2.0.0
plaid-python~=7.2.1 plaid-python~=7.2.1
pycountry~=20.7.3 pycountry~=20.7.3
PyGithub~=1.55 PyGithub~=1.55
@@ -10,4 +10,4 @@ python-youtube~=0.8.0
taxjar~=1.9.2 taxjar~=1.9.2
tweepy~=3.10.0 tweepy~=3.10.0
Unidecode~=1.2.0 Unidecode~=1.2.0
redisearch==2.0.0 redisearch~=2.1.0