Commit Graph

4758 Commits

Author SHA1 Message Date
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
Frappe PR Bot
0fb112107f fix: not able to submit stock entry with 350 items (#27523) (#27526)
(cherry picked from commit e6a1ad8016)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
2021-09-15 21:06:44 +05:30
Frappe PR Bot
a87cc12024 feat: provision to add scrap item in job card (#27483) (#27512)
(cherry picked from commit c5a77f60ed)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
2021-09-15 17:17:59 +05:30
Marica
d76e5dcb93 Merge pull request #27486 from marination/job-card-excess-transfer-hotfix
fix: Handle Excess/Multiple Item Transfer against Job Card
2021-09-14 17:57:39 +05:30
Nabin Hait
10754831c3 fix: Maintain same rate in Stock Ledger until stock become positive (#27227)
* fix: Maintain same rate in Stock Ledger until stock become positive

* fix: Maintain same rate in Stock Ledger until stock become positive
2021-09-14 13:34:36 +05:30
Saqib
bb8d90d741 feat: (get_items_from) filter material request item in purchase order (#24725) 2021-09-13 11:46:00 +05:30
Frappe PR Bot
00c4e346c7 fix(ux): clean invalid fields from variant setting (#27442)
* fix(ux): clean invalid fields from variant setting (#27412)

(cherry picked from commit 6ef879fca2)

# Conflicts:
#	erpnext/stock/doctype/item_variant_settings/item_variant_settings.js

* fix: resolve conflicts

Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
2021-09-12 16:41:31 +05:30
Frappe PR Bot
74fa6fab4c fix(ux): apply proper filtering in stock reports (#27411) (#27443)
* fix(ux): apply proper filtering in stock reports

Stock Balance: apply company filter to warehouse field
Stock Ageing: apply company filter to warehouse field

* fix: unnecessary parens

Co-authored-by: Alan <2.alan.tom@gmail.com>
(cherry picked from commit d743c41b54)

Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
2021-09-12 16:41:17 +05:30
Deepesh Garg
70c5533646 fix: Website item patch fixes 2021-09-09 09:47:18 +05:30
Marica
255155c5b8 fix: Check if Item is serialised before trying to fetch SN and set SO in it (#27358)
(cherry picked from commit 61a1356109)
2021-09-07 09:13:34 +00:00
Frappe PR Bot
61e71d45fa fix: Dont fetch Stopped/Cancelled MRs in Stock Entry Get Items dialog (#27326) (#27354)
(cherry picked from commit 0f2a52078c)

Co-authored-by: Marica <maricadsouza221197@gmail.com>
2021-09-06 13:34:50 +05:30
Frappe PR Bot
e9da4ed34d fix: manually added weight per unit reset to zero after save (#27330) (#27338)
(cherry picked from commit 7b4a65484a)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
2021-09-03 22:54:49 +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
Marica
853f479f58 Merge branch 'version-13-hotfix' into e-commerce-refactor 2021-09-03 13:47:30 +05:30
GangaManoj
debffbfb2d fix: Trim trailing whitespaces 2021-09-02 20:53:53 +05:30
GangaManoj
17bf32d8dc fix: Add Product Bundle field in Items table 2021-09-02 20:04:51 +05:30
GangaManoj
c757198d8b fix: Make Rate read-only by default 2021-09-02 20:04:25 +05:30
GangaManoj
18680990bf fix: Display Packed/Bundle Items table only if it exists 2021-09-02 20:03:50 +05:30
GangaManoj
bb7ad885da fix: Hide Rate of Bundle Items while printing 2021-09-02 20:02:35 +05:30
GangaManoj
288d0191ab fix: Make Rate column read only by default 2021-09-02 20:02:35 +05:30
GangaManoj
1ecec7154b fix: Enable Fetch If Empty for Rate 2021-09-02 20:02:35 +05:30
GangaManoj
2b56e62805 fix: Calculate Product Bundle price based on the prices of its child items 2021-09-02 20:02:35 +05:30
GangaManoj
084b27bb34 fix: Return if there are no Items 2021-09-02 20:02:35 +05:30
GangaManoj
8478a83148 fix: Only update Product Bundle prices if 'Calculate Product Bundle Price based on Child Items' Rates' is enabled 2021-09-02 19:58:47 +05:30
GangaManoj
58ef1e30a5 fix: Update Product Bundle rate based on its updated amount 2021-09-02 19:51:16 +05:30
GangaManoj
c37dc7ca33 fix: Update Product Bundle price based on the rates of its child Items 2021-09-02 19:51:16 +05:30
GangaManoj
0967d226ed fix: Add editable Rate column 2021-09-02 19:51:16 +05:30
Marica
7c09a79dd4 Merge branch 'version-13-hotfix' into e-commerce-refactor 2021-09-02 10:25:14 +05:30
Ankush Menat
f0bcb753fb chore: whitespace trimming 2021-09-01 20:23:48 +05:30
Ankush Menat
81391ed54f refactor: itemgetter instead of assigned lambda 2021-09-01 20:16:31 +05:30
Ankush Menat
76f1ed624a fix: remove bare excepts 2021-09-01 20:15:54 +05:30
Marica
d382c3c101 fix: Zero division error while fetching unconsumed materials (#27293)
`

(cherry picked from commit 9506c14d35)
2021-09-01 13:20:16 +00:00
Frappe PR Bot
883e1394ba fix: translate labels (#27282) (#27283)
[skip ci]

(cherry picked from commit 9dc0843cbd)

Co-authored-by: Alan <2.alan.tom@gmail.com>
2021-09-01 13:00:48 +05:30
Frappe PR Bot
1b338d678a fix: revert "refactor: simplify initialize_previous_data" (#27270) (#27272)
This reverts commit 2f5624e588.

(cherry picked from commit c1d986a0c6)

Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
2021-08-31 19:46:25 +05:30
Alan
c1354047a3 fix: pass labels through translation function (#27254) 2021-08-31 15:16:50 +05:30
marination
fd44b6b340 Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into e-commerce-refactor 2021-08-30 22:30:02 +05:30
Frappe PR Bot
076e8e9da0 fix: Stock Ageing report issues for serialized items (#27228) (#27239)
* fix: incorrect calculation in get_range_age

* fix: remove serial numbers not in stock from fifo_queue

* refactor: make serial_no condition explicit

* refactor: reduce code duplication


Co-authored-by: Dany Robert <rtdany10@gmail.com>
Co-authored-by: Ankush Menat <ankush@iwebnotes.com>

(cherry picked from commit 5fd04101d4)
2021-08-30 18:35:52 +05:30
Frappe PR Bot
8dae084f23 chore: remove deprecated and empty QUnit tests (#27179) (#27181)
* chore: remove deprecated and empty QUnit tests

* ci: fix UI test config

Testing library was added on Frappe, in order to reuse command testing
library has to be installed during setup process.

(cherry picked from commit ae55eab599)

Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
2021-08-26 21:08:08 +05:30
marination
d3702947b8 fix: Sider and CI
- Incorrect path and Settings in price_list.py import due to merge
- Extra space removed in website_item.py
- Changed client side namespace to `erpnext.e_commerce.*`
2021-08-26 20:58:13 +05:30
Frappe PR Bot
a9e78e2d3a fix(ux): hide irrelevant fields for asset items (#26274) (#27180)
(cherry picked from commit a9852a5483)

Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
2021-08-26 20:12:26 +05:30
Ganga Manoj
6d28507def feat: Handle Asset on Issuing Credit Note (#26519)
* fix(Sales Invoice): Let invoice be created for Sold Assets if it's a return invoice

* fix(Sales Invoice): Print appropriate message if item.asset is missing when the Item is a Fixed Asset

* fix(Sales Invoice): Fix GL Entry creation for Return Invoices linked with Assets

* fix(Sales Invoice): Print appropriate message if Asset isn't specified when the Item is a Fixed Asset

* fix(Sales Invoice): Let invoice be created for Sold Assets if it's a return invoice

* fix(Sales Invoice): Reset disposal_date on returning the Asset

* fix: Rename get_gl_entries_on_asset_movement to get_gl_entries_on_asset_disposal_and_regain

* fix: Make functions more readable

* fix: Let create_item() make items that are fixed assets

* fix: Test GL Entries made when an Asset is returned

* fix: Create asset data

* fix: Test

Co-authored-by: Saqib <nextchamp.saqib@gmail.com>
2021-08-26 20:11:18 +05:30
Frappe PR Bot
2ad531f66b fix: negative qty validation on stock reco cancellation (#27170) (#27171)
* test: negative stock validation on SR cancel

* fix: negative stock setting ignored in stock reco

In stock reconcilation cancellation negative stock setting is ignored as
`db.get_value` is returning string `'0'` which is not casted to int/bool
for further logic. This causes negative qty, which evantually gets
caught by reposting but by design this should stop cancellation.

* test: typo and minor refactor

(cherry picked from commit e7109c18db)

Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
2021-08-26 17:14:17 +05:30
marination
06a6fd512a Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into e-commerce-refactor 2021-08-26 16:53:59 +05:30
Marica
6ed52799d7 Merge pull request #27166 from frappe-pr-bot/backport/version-13-hotfix/27086
fix: Don't create inward SLE against SI unless is internal customer enabled
2021-08-26 16:43:14 +05:30
marination
614ee71778 fix: internal customer util returns 'str' not doc object 2021-08-26 16:22:35 +05:30
Marica
8db44189b6 Merge branch 'version-13-hotfix' into feat-bom-process-loss 2021-08-26 16:11:24 +05:30
Marica
57972cab48 Merge branch 'version-13-hotfix' into backport/version-13-hotfix/27086 2021-08-26 15:55:48 +05:30
marination
55ff6277a7 fix: Merge conflicts and place internal customer creation util in test_customer.py 2021-08-26 15:42:23 +05:30
Frappe PR Bot
c3b1376517 fix: allow to change incoming rate manually in case of stand-alone credit note (#27164)
* fix: allow to change rate manually in case of stand-alone credit note (#27036)

Co-authored-by: Marica <maricadsouza221197@gmail.com>
(cherry picked from commit fe4540d74d)

# Conflicts:
#	erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json

* fix: resolve conflicts

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
2021-08-26 14:36:42 +05:30
Marica
6636d857f7 fix: Don't create inward SLE against SI unless is internal customer enabled (#27086)
* fix: Dont create inward SLE against SI unless is internal customer enabled

- Check if is internal customer enabled apart from target warehouse
- Test to check if inward SLE is made if target warehouse is accidentally set but customer is not internal

* test: Use internal customer for delivery of bundle items to target warehouse

- created `create_internal_customer` util
- reused it in delivery note and sales invoice tests
- use internal customer for target warehouse test in delivery note

(cherry picked from commit f4dc9ee2aa)

# Conflicts:
#	erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py
2021-08-26 07:47:13 +00:00