schuetz3/schuetz3-erpnext
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
41,242 Commits 322 Branches 1,581 Tags
dd26ef96e0c1baeb650dab1fa07e3c2b6ef172b0
Commit Graph

222 Commits

Author SHA1 Message Date
Deepesh Garg
dd26ef96e0 fix: Hanlde rounding loss for internal transfer 
(cherry picked from commit 6e47fd54a0)
 2022-10-12 10:54:07 +00:00
Rohit Waghchaure
7ee75ff762 fix: not able to issue expired batches 
(cherry picked from commit 795c94384a)

# Conflicts:
#	erpnext/stock/doctype/stock_entry/test_stock_entry.py
 2022-08-17 09:16:37 +00:00
Ankush Menat
8a4cd2aba1 fix: internal transfer GLE validation 
(cherry picked from commit 65b21ee7d6)
 2022-06-21 09:02:02 +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
870799c4e2 fix: repost items with repeating item-warehouses 
(cherry picked from commit 3638fbf06b)
 2022-03-02 14:08:57 +05:30
mergify[bot]
cc5107eab3 fix: ignore cancelled SLEs (#29679) (#29698) 
(cherry picked from commit 0ca60afc3f)

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2022-02-08 13:52:28 +05:30
Ankush Menat
eeb8f4874d refactor: simplify get_items_and_warehouses 
Also remove dead code related to stock reconciliation_json.

(cherry picked from commit e6ab8df8f2)
 2022-02-07 23:16:18 +05:30
Ankush Menat
bd401810e4 fix: consider packed items too when reposting 
(cherry picked from commit c56d07dee3)
 2022-02-07 23:16:18 +05:30
Deepesh Garg
a54c84728f feat: Provisional accounting for expenses (#29451) 
* feat: Provisonal accounting for expenses

* fix: Method for provisional accounting entry

* chore: Add test case

* fix: Remove test case

* fix: Use company doctype

* fix: Add provisional expense account field in Purchase Receipt Item

* fix: Test case

* fix: Move provisional expense account to parent

* fix: Patch

(cherry picked from commit 528c71382f)

# Conflicts:
#	erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py
#	erpnext/patches.txt
#	erpnext/setup/doctype/company/company.json
#	erpnext/stock/doctype/purchase_receipt/purchase_receipt.py
#	erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py
 2022-02-01 09:13:47 +00:00
Ankush Menat
db3eef9a8b fix: extend sr_no cleanup to packed items too 
(cherry picked from commit e177c5277f)
 2022-01-29 14:27:09 +05:30
Ankush Menat
cc08125f39 refactor: reusable clean_serial_nos 
(cherry picked from commit b20df3745e)
 2022-01-29 14:27:09 +05:30
Ankush Menat
f336b5d586 perf: single query to update serial nos 
(cherry picked from commit ea5efd0791)
 2022-01-21 16:11:32 +05:30
Ankush Menat
3b0f80b865 fix: dont update sle values from get_gl_entries 
(cherry picked from commit 8f5772463c)
 2022-01-17 13:21:48 +05:30
mergify[bot]
3621ee234e fix(ux): allow translations (#28455) (#28590) 
* Translation

* Translations

(cherry picked from commit cdaf0a04cf)

Co-authored-by: xdlumertz <alexandrelumertz@gmail.com>
 2021-11-27 15:11:25 +00:00
Ankush Menat
ccb8defc0b fix: ignore permissions while creating reposts 
(cherry picked from commit 0a2964dc82)
 2021-11-25 16:43:13 +05:30
Ankush Menat
7ae5bc8911 feat: option to select reposting method 
In current implementation selecting Item-Warehouse based reposting is
better for few users, who don't use depenent SLEs but have frequent
transactions involving same items.

This change lets them switch to item-warehouse based reposting if
required.

Only use this if you understand technicalities of stock reposting. This
is experimental but will become mainstream in coming days.

(cherry picked from commit 45dd46be3d)
 2021-11-25 11:08:10 +00:00
Ankush Menat
db22859b54 refactor: reuse get_items_to_be_repost function 
(cherry picked from commit d220e08ba4)
 2021-11-25 11:08:09 +00:00
Ankush Menat
876c85fbf7 test: item-wh repost creation 
(cherry picked from commit a36c249d3d)
 2021-11-25 11:08:09 +00:00
Ankush Menat
0032ee46be refactor: item-wh wise reposting by default 
(cherry picked from commit 6dc9b822bc)
 2021-11-25 11:08:08 +00:00
Ankush Menat
636a6fcae0 fix: ignore permissions while creating repost 
If user reached this code then they already have permission to create
stock transaction, hence ignore permission checks while
creating/cancelling repost item valuation entries.

(cherry picked from commit aa024fc9da)
 2021-11-22 13:08:21 +05:30
Marica
db9f56bee8 fix: Use strip instead of lstrip and rstrip 
Co-authored-by: Ankush Menat <ankushmenat@gmail.com>
(cherry picked from commit 8cf188d9c0)
 2021-10-14 14:48:24 +00:00
marination
2e9d08f8b1 fix: Retain space inside Serial no string while cleaning serial nos 
(cherry picked from commit 41035b0330)
 2021-10-14 14:48:24 +00:00
Deepesh Garg
10b239ec50 perf: Add indexes in stock queries and speed up bin updation #27758 
perf: Add indexes in stock queries and speed up bin updation
(cherry picked from commit 6f107da165)
 2021-10-12 14:46:26 +00:00
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
marination
f22b858253 fix: Clean Serial No input on Server Side 2021-08-10 14:35:41 +05:30
Rohit Waghchaure
45d506c489 fix: serial no and batch validation 2021-07-23 16:40:45 +05:30
marination
c8a825c478 chore: Test case for QI Rejection in Stock Entry 
- Use `get_single_value` instead of `get_doc` in validation
- Test Case to check impact of stock settings on SE with rejected qi
 2021-07-10 18:26:36 +05:30
Marica
01be96adb2 Merge branch 'version-13-hotfix' into qi-rejection 2021-07-09 13:30:21 +05:30
Rohit Waghchaure
170f2ad056 fix: removed values out of sync validation from stock transactions 2021-06-26 21:42:47 +05:30
Marica
703c30f5f8 fix: Consistent alert indicators 2021-06-22 11:20:17 +05:30
marination
ea0dea46e0 fix: sider and semgrep 2021-06-21 16:51:12 +05:30
marination
49ec0e5ac3 feat: Optionally allow rejected quality inspection on submission 2021-06-21 16:18:35 +05:30
Rohit Waghchaure
8520edc952 fix: time out while submitting the stock transactions with more than 50 items 2021-06-19 00:55:35 +05:30
Noah Jacob
b5a1491176 fix: escaped warehouse value for sql query (#26049) 2021-06-15 12:44:04 +05:30
Ankush Menat
a9c84f749a perf(minor): remove unnecessary comprehensions (#25645) 2021-06-11 16:00:48 +05:30
Rohan Bansal
a06ec03efc test: add test for new QI function 2021-06-02 14:55:31 +05:30
Rohan Bansal
1cdf5a0dba fix: add requested changes 2021-05-26 14:42:15 +05:30
Rohan Bansal
c5b074269a Merge remote-tracking branch 'upstream/version-13-hotfix' into dev-quality-inspection-accounts 2021-05-26 14:32:14 +05:30
rohitwaghchaure
2aa401826e fix: validation message of quality inspection in purchase receipt (#25666) 2021-05-14 12:34:50 +05:30
Ankush Menat
ad6a2657ae chore: minor translation fixes 2021-04-17 16:56:09 +05:30
Ankush Menat
dedf2c1b61 fix: remove duplicate keys from dictionaries 2021-04-17 16:56:08 +05:30
Marica
4e25aa77dd Merge branch 'develop' into dev-quality-inspection-accounts 2021-04-14 19:06:14 +05:30
Rohan Bansal
7f8b95efe8 fix: move QI logic to stock module 2021-04-14 14:15:45 +05:30
Rohit Waghchaure
1358443cdb fix: patch 2021-04-10 10:42:08 +05:30
Sagar Vora
868c0bf45b perf: reduce no of queries for checking if future sl entry exists (#24881) 2021-03-27 16:10:20 +05:30
Anupam Kumar
77eaf2939a fix: rate of stock uom division by zero error (#24829) 2021-03-10 12:04:54 +05:30
Nabin Hait
19f8fa59d3 fix: optimize reposting of sle and gle (#24694) 
* fix: optimize update_gl_entries_after method

* fix: Optimized reposting patch

* fix: accounting dimensions

* added reload_doc in patch

* Update item_reposting_for_incorrect_sl_and_gl.py

Co-authored-by: Rohit Waghchaure <rohitw1991@gmail.com>
 2021-02-22 22:27:22 +05:30
Nabin Hait
9b178bcd10 fix: stock and account balance syncing (#24644) 
* fix: stock and account balance syncing

* fix: stock and account balance syncing

* fix: stock and account balance syncing

* fix: minor fix
 2021-02-16 14:57:00 +05:30
Anupam Kumar
7e1dcf911d feat: capture Rate of stock UOM in purchase (#24315) 
* feat: capture Rate of stock UOM in purchase

* fix: review changes

* added server side code

* added stock uom rate in sales transactions

* fix: review changes

* fix: resolving conflicts

* adding patch

* fix: removing patch
 2021-02-11 20:19:30 +05:30
Jannat Patel
30c8873f24 fix: validation for disabled warehouse (#24539) 
* fix: validation for disabled warehouse

* fix: better function name

* fix: validation in stock ledger entry
 2021-02-11 11:46:48 +05:30